Skip to content

Commit 648c77e

Browse files
committed
fix logic for preloadData
1 parent 15aefc3 commit 648c77e

File tree

1 file changed

+16
-2
lines changed

1 file changed

+16
-2
lines changed

R/options.R

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -297,8 +297,22 @@ parsePreloadDataFromDescriptionQml <- function(analysisName) {
297297

298298
description <- parseDescriptionQmlFromAnalysisName(analysisName)
299299

300-
preloadData <- isTRUE(description[["Description"]][["preloadData"]]) || isTRUE(description[[analysisName]][["preloadData"]])
301-
if (!preloadData)
300+
# is the preloadData globally set to TRUE?
301+
preloadDataGlobal <- isTRUE(description[["Description"]][["preloadData"]])
302+
# is the preloadData even set for this specific analysis?
303+
specifiedPreloadData <- "preloadData" %in% names(description[[analysisName]])
304+
# is the preloadData set to TRUE for this specific analysis?
305+
preloadDataAnalysis <- specifiedPreloadData && isTRUE(description[[analysisName]][["preloadData"]])
306+
# preloadData if set to TRUE for the analysis or if set globally to TRUE and not set for the analysis
307+
preloadData <- preloadDataAnalysis || (preloadDataGlobal && !specifiedPreloadData)
308+
309+
# global analysis -> result warning
310+
# preloadData TRUE TRUE -> TRUE
311+
# TRUE FALSE -> FALSE
312+
# FALSE TRUE -> TRUE
313+
# FALSE FALSE -> FALSE
314+
315+
if (!preloadData && !specifiedPreloadData)
302316
lifecycle::deprecate_warn(
303317
when = "0.19.2",
304318
what = I(sprintf("The analysis `%s` does not preload data. Please update inst/Description.qml, add `preloadData: true`, and fix any minor issues.", analysisName))

0 commit comments

Comments
 (0)