receiver push patch

mhpob · Nov 21, 2023 · 54fbd7e · 54fbd7e
1 parent 9689a34
commit 54fbd7e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: otndo
 Title: Understand your OTN data
-Version: 0.1.03
+Version: 0.1.04
 Authors@R: 
     person("Michael", "O'Brien", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-1420-6395"))

diff --git a/inst/qmd_template/make_receiver_push_summary.qmd b/inst/qmd_template/make_receiver_push_summary.qmd
@@ -46,7 +46,7 @@ push_log <- data.table::fread(params$push_log)
 #| label: n-pis
 #| warning: false
 
-pis <-  unique(qualified, by = c('trackercode', 'tag_contact_pi'))
+pis <-  unique(qualified, by = c('trackercode'))
 pis[, ':='(PI = strsplit(tag_contact_pi, ' \\(|\\)(, )?'),
             POC = strsplit(tag_contact_poc, ' \\(|\\)(, )?'))]
 pis[, ':='(PI = lapply(X = PI, function(.) .[!grepl('@', .)]),
@@ -105,7 +105,8 @@ otn_metadata_query <- paste0(
 
 otn_tables <- lapply(otn_metadata_query, fread)
 
-otn_tables <- lapply(otn_tables, function(.) .[!grepl('\\.', collectioncode), collectioncode := paste0('OTN.', collectioncode)])
+# otn_tables <- lapply(otn_tables, function(.) .[!grepl('\\.', collectioncode), collectioncode := paste0('OTN.', collectioncode)])
+otn_tables <- lapply(otn_tables, function(.) .[, collectioncode := gsub('.*\\.', '', collectioncode)])
 ```
 
 
@@ -144,8 +145,9 @@ mt <- merge(
 
 # mt <- merge(mt, pis[, .(trackercode, PI, POC, emails)])
 mt <- merge(mt, pis[, .(trackercode, PI, POC, PI_emails, POC_emails)])
-mt[, trackercode := ifelse(!grepl('^ACT|^FACT|^OTN', trackercode),
-                          paste0('OTN.', trackercode), trackercode)]
+# mt[, trackercode := ifelse(!grepl('^ACT|^FACT|^OTN', trackercode),
+#                           paste0('OTN.', trackercode), trackercode)]
+mt[, trackercode := gsub('.*\\.', '', trackercode)]
 
 mt <- merge(mt, otn_tables[[1]][, .(resource_full_name, trackercode = collectioncode)])
 
@@ -359,8 +361,9 @@ new_mt <- merge(
 )
 
 new_mt <- merge(new_mt, pis[, .(trackercode, PI, POC, PI_emails, POC_emails)])
-new_mt[, trackercode := ifelse(!grepl('^ACT|^FACT|^OTN', trackercode),
-                          paste0('ACT.', trackercode), trackercode)]
+# new_mt[, trackercode := ifelse(!grepl('^ACT|^FACT|^OTN', trackercode),
+#                           paste0('ACT.', trackercode), trackercode)]
+new_mt[, trackercode := gsub('.*\\.', '', trackercode)]
 
 new_mt <- merge(new_mt, otn_tables[[1]][, .(resource_full_name, trackercode = collectioncode)])
 
@@ -378,13 +381,13 @@ reactable(new_mt,
             PI = colDef(html = T,
                          cell = function(value, index){
                            sprintf('<a href=mailto:%s target="_blank">%s</a>',
-                                   mt$PI_emails[index], value)
+                                   new_mt$PI_emails[index], value)
                          },
                         minWidth = 150),
             POC = colDef(html = T,
                          cell = function(value, index){
                            sprintf('<a href=mailto:%s target="_blank">%s</a>',
-                                   mt$POC_emails[index], value)
+                                   new_mt$POC_emails[index], value)
                          },
                          minWidth = 150),
             PI_emails = colDef(show = F),