Merge pull request #121 from Rapporteket/consolidate

Consolidate

.github/workflows/doc-consistency.yaml

@@ -44,4 +44,5 @@ jobs:
         run: |
           git config --local user.email "actions@github.com"
           git config --local user.name "GitHub Actions"
-          Rscript -e 'testthat::expect_warning(pkgdown::build_reference(preview = FALSE), regexp = NA)'
+          Rscript -e "pkgdown::init_site()"
+          Rscript -e "testthat::expect_warning(pkgdown::build_reference(preview = FALSE), regexp = NA)"

.github/workflows/lint.yaml

@@ -41,11 +41,13 @@ jobs:
 
       - name: Install dependencies
         run: |
-          install.packages(c("remotes"))
+          install.packages(c("remotes", "devtools"))
           remotes::install_deps(dependencies = TRUE)
           remotes::install_cran("lintr")
         shell: Rscript {0}
 
       - name: Lint
-        run: lintr::lint_package()
-        shell: Rscript {0}
+        run: |
+          devtools::load_all()
+          lintr::lint_package()
+        shell: Rscript {0}

DESCRIPTION

@@ -36,7 +36,7 @@ Imports:
     kableExtra,
     knitr,
     magrittr,
-    purrr,
+    openssl,
     readr,
     remotes,
     rlang,

NAMESPACE

@@ -4,7 +4,6 @@ export("%>%")
 export(.data)
 export(.getFun)
 export(.testAutoReport)
-export(LoadRegData)
 export(appLogger)
 export(appNavbarUserWidget)
 export(autLogger)
@@ -35,10 +34,6 @@ export(getConfig)
 export(getGithub)
 export(getRapPackages)
 export(getRegs)
-export(getShinyUserGroups)
-export(getShinyUserName)
-export(getShinyUserReshId)
-export(getShinyUserRole)
 export(getUserEmail)
 export(getUserFullName)
 export(getUserGroups)
@@ -57,16 +52,14 @@ export(logFormat)
 export(logTimeFrame)
 export(makeAutoReportTab)
 export(makeRunDayOfYearSequence)
-export(makeUserSubscriptionTab)
-export(makeUserSubscriptionTabV2)
-export(makeUserSubscriptionTab_v2)
 export(mst)
 export(mtimeStagingData)
 export(navbarWidgetApp)
 export(navbarWidgetInput)
 export(navbarWidgetServer)
 export(noOptOutOk)
 export(orgList2df)
+export(pubkey_filter)
 export(rapCloseDbConnection)
 export(rapOpenDbConnection)
 export(readAutoReportData)
@@ -77,13 +70,8 @@ export(runBulletin)
 export(runNoweb)
 export(runShinyApp)
 export(saveStagingData)
-export(selectByOrganization)
-export(selectByOwner)
-export(selectByReg)
-export(selectByType)
 export(selectListPubkey)
 export(sendEmail)
-export(shinySessionInfo)
 export(statsApp)
 export(statsGuideApp)
 export(statsGuideServer)

NEWS.md

@@ -1,3 +1,9 @@
+# rapbase 1.23.0
+
+* Added database as an optional log backend and function for (scheduled) clean of logs ([#112](https://github.com/Rapporteket/rapbase/pull/112))
+* For logging to a database backend format set to json ([#120](https://github.com/Rapporteket/rapbase/pull/120))
+* Reorganized and consolidated R files, removed deprecated and unused function and applied minor fixes to function flaws ([#121](https://github.com/Rapporteket/rapbase/pull/121))
+
 # rapbase 1.22.0
 
 * Improved first page graphics and hyperlinking in default latex template ([#104](https://github.com/Rapporteket/rapbase/pull/104))