Some minor updates to analytics and github actions

prisma-flowdiagram · Oct 29, 2022 · 7996a78 · 7996a78
1 parent 9cdaf42
commit 7996a78
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/check-and-deploy.yml b/.github/workflows/check-and-deploy.yml
@@ -34,7 +34,7 @@ jobs:
       rsconnect-account-token: ${{ secrets.TOKEN }}
       rsconnect-account-secret: ${{ secrets.SECRET }}
   deploy-release:
-    needs: R-CMD-check
+    needs: R-CMD-Check
     if: github.event_name == 'release'
     uses: prisma-flowdiagram/r-workflows/.github/workflows/deploy.yml@v1
     with:
@@ -64,9 +64,9 @@ jobs:
   get-pull-ref:
     runs-on: ubuntu-latest
     needs: check-pr-deploy
-    if: github.event_name == 'issue_comment'
+    if: (github.event_name == 'issue_comment'  && github.event.issue.pull_request == 'true')
     outputs:
-      repository: ${{ steps.get-repo.outputs.repository }}
+      repository: ${{ fromJson(steps.get-repo.outputs.data).head.repo.full_name }}
       ref: ${{ fromJson(steps.get-repo.outputs.data).head.ref }}
     steps:
       - name: get-pull-request-ref

diff --git a/CITATION.cff b/CITATION.cff
@@ -11,7 +11,7 @@ authors:
     given-names: Chris C
     orcid: https://orcid.org/0000-0002-1143-9751
 title: "PRISMA2020: R package and ShinyApp for producing PRISMA 2020 compliant flow diagrams"
-version: 1.0.0
+version: 1.0.1
 doi: 10.5281/zenodo.4287834
 date-released: 2022-07-02
 license: MIT

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: PRISMA2020
 Title: Make Interactive 'PRISMA' Flow Diagrams
-Version: 1.0.0
+Version: 1.0.1
 Authors@R: c(
     person(given = "Neal",
            family = "Haddaway",

diff --git a/R/PRISMA_flowdiagram.R b/R/PRISMA_flowdiagram.R
@@ -1738,7 +1738,7 @@ PRISMA_save <- function( #nolint
   filetype = NA,
   overwrite = FALSE
 ) {
-  if (!file.exists(filename) | overwrite == TRUE) {
+  if (!file.exists(filename) || overwrite == TRUE) {
     format_real <- PRISMA_calc_filetype_(filename, filetype) #nolint
     switch(
       format_real,

diff --git a/inst/shiny-examples/PRISMA_flowdiagram/app.R b/inst/shiny-examples/PRISMA_flowdiagram/app.R
@@ -35,7 +35,8 @@ ui <- tagList(
         "defer",
         "data-website-id" = "72f80a48-0dea-4914-9619-465de3df82a4",
         "data-do-not-track" = "true",
-        "data-host-url" = "https://umami.christopherpritchard.co.uk"
+        "data-host-url" = "https://umami.christopherpritchard.co.uk",
+        "data-domains" = "estech.shinyapps.io"
       )
     }
   ),

diff --git a/inst/shiny-examples/PRISMA_flowdiagram/www/labels.js b/inst/shiny-examples/PRISMA_flowdiagram/www/labels.js
@@ -42,4 +42,4 @@ function createLabels(nodeMap) {
 			renderLabel(node, label)
 		})
 	}
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,4 +42,4 @@ function createLabels(nodeMap) { @@
     			renderLabel(node, label)
     		})
     	}
-    }
+    }