diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index 514de84..bc2784d 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -29,14 +29,14 @@ jobs: - uses: r-lib/actions/setup-r@v2 with: use-public-rspm: true + extra-repositories: | + https://Pandora-IsoMemo.github.io/drat/ - uses: r-lib/actions/setup-r-dependencies@v2 with: extra-packages: | any::pkgdown local::. - extra-repositories: | - https://Pandora-IsoMemo.github.io/drat/ needs: website - name: Build site diff --git a/DESCRIPTION b/DESCRIPTION index 0fddb2a..31541fe 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,15 +1,15 @@ Package: MapR Title: Display temporal and temperature graphical files for Isomemo -Version: 24.3.0 +Version: 24.3.0.1 Authors@R: c(person("Lukas", "Fuchs", email = "lukas.fuchs@inwt-statistics.de", role = c("aut", "cre"))) Description: An App to display temporal and temperature graphical files for Isomemo. License: GPL (>= 3) Encoding: UTF-8 Roxygen: list(markdown = TRUE) -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.1 Imports: colourpicker, - DataTools (>= 23.12.2), + DataTools (>= 24.04.1), DT, magrittr, pastclim, diff --git a/NAMESPACE b/NAMESPACE index 20e0d7b..a5df943 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -7,6 +7,7 @@ export(startApplication) import(shiny) importFrom(DataTools,importDataServer) importFrom(DataTools,importDataUI) +importFrom(DataTools,importOptions) importFrom(magrittr,"%>%") importFrom(rjson,fromJSON) importFrom(shinyTools,dataExportButton) diff --git a/NEWS.md b/NEWS.md index ab7e837..351a4d8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -13,6 +13,11 @@ ## New Features - adds header with Pandora, IsoMemo and help links +# MapR 24.1.2 + +## Bug Fixes +- apply most recent DataTools version to fix the broken path to the example zip files + # MapR 24.1.1 ## New Features diff --git a/R/00-Namespace.R b/R/00-Namespace.R index d9f8148..45f0d8f 100644 --- a/R/00-Namespace.R +++ b/R/00-Namespace.R @@ -14,7 +14,7 @@ #' @rawNamespace import(shiny) #' @importFrom rjson fromJSON -#' @importFrom DataTools importDataUI importDataServer +#' @importFrom DataTools importDataUI importDataServer importOptions #' @importFrom shinyTools dataExportButton dataExportServer headerButtonsUI includeShinyToolsCSS #' @importFrom yaml read_yaml diff --git a/R/01-mapPanelModule.R b/R/01-mapPanelModule.R index 6cc0de8..114f4c3 100644 --- a/R/01-mapPanelModule.R +++ b/R/01-mapPanelModule.R @@ -69,8 +69,7 @@ mapPanelServer <- function(id) { defaultSource = config()[["defaultSource"]], ckanFileTypes = config()[["ckanFileTypes"]], fileExtension = config()[["fileExtension"]], - mainFolder = config()[["mainFolder"]], - rPackageName = config()[["rPackageName"]] + options = importOptions(rPackageName = config()[["rPackageName"]]) # expectedFileInZip = config()[["expectedFileInZip"]] # currently image list is not required if a questionnaire.json is included ) diff --git a/inst/config.yaml b/inst/config.yaml index 3b959f4..10b4a6d 100644 --- a/inst/config.yaml +++ b/inst/config.yaml @@ -3,6 +3,5 @@ defaultSource: "file" # for import of data ckanFileTypes: - "zipm" - "zip" -mainFolder: "exampleZip" # for import of models -fileExtension: "zipm" +fileExtension: "zipm" # for import of models rPackageName: "MapR"