Merge pull request #42 from fhdsl/ITN

ITN

Author: carriewright11

.github/workflows/build-collection.yml

@@ -69,7 +69,7 @@ jobs:
           Rscript --vanilla "scripts/query_collection.R" --git_pat "$GH_PAT"
 
       - name: Archive collection
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4.6.2
         with:
           name: collection
           path: resources/collection.tsv

.github/workflows/pull_request.yml

@@ -80,7 +80,7 @@ jobs:
     with:
       check_type: spelling
       error_min: 3
-      gh_pat: secrets.GH_PAT
+      gh_pat: ${{ secrets.GH_PAT }}
 
   url-check:
     name: Check URLs
@@ -90,7 +90,7 @@ jobs:
     with:
       check_type: urls
       error_min: 0
-      gh_pat: secrets.GH_PAT
+      gh_pat: ${{ secrets.GH_PAT }}
 
   render-preview:
     name: Render preview

resources/images/ITNlogo.png

@@ -56,7 +56,7 @@ for (page in 1:last){
     jsonlite::fromJSON(httr::content(req, as = "text"), flatten = TRUE)
   message(paste("... Gathered", nrow(repo_dat$items), "repositories."))
 
-  repo_dat$items$funding <- lapply(repo_dat$items$topics, function(x) x[x %in% c("anvil", "itn", "daseh", "gdscn", "hutch-course")])
+  repo_dat$items$funding <- lapply(repo_dat$items$topics, function(x) x[x %in% c("anvil", "itn-course", "daseh", "gdscn", "hutch-course")])
   repo_dat$items$funding <- lapply(repo_dat$items$funding, function(x) replace(x, rlang::is_empty(x), NA) )
 
   repo_df <-

scripts/query_collection.R

@@ -61,6 +61,14 @@ make_collection_table <- function(exclude = NULL, include = NULL, kable = FALSE)
           ),
           TRUE ~ funding
         )) %>%
+        mutate(funding = case_when(
+          stringr::str_detect(funding, "itn-course") ~ paste0(
+            funding,
+            '<a href =\"https://www.itcrtraining.org/\" target=\"_blank\"<div title =\"About ITN\"></div><img src=\"https://raw.githubusercontent.com/fhdsl/DaSL_Collection/main/resources/images/ITNlogo.png\" height=\"40\"></img><p class=\"image-name\">ITN</p></a>'
+          ),
+          TRUE ~ funding
+        )) %>%
+      
         mutate(funding = gsub("^.*?<a href", "<a href", funding)) # trim any leading funding sources
 
       # Rename and clip unnecessary columns