From cde713400f61bbf61fa5ab42a0007229d2999694 Mon Sep 17 00:00:00 2001 From: afwillia Date: Thu, 3 Oct 2024 10:42:52 -0700 Subject: [PATCH] Always pass asset view to the validation endpoint. This will enable both cross-manifest validation and filename validation IF the data model supports those rules. This change is to make DCA compatible with filename validation rules. --- server.R | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server.R b/server.R index 55743aed..f624d983 100644 --- a/server.R +++ b/server.R @@ -810,11 +810,12 @@ shinyServer(function(input, output, session) { .access_token <- access_token .data_model_labels <- dcc_config_react()$schematic$global$data_model_labels # asset view must be NULL to avoid cross-manifest validation. + # however, it is necessary for filename validation + # always pass asset view, let the data model decide which validations are run # doing this in a verbose way to avoid warning with ifelse - .asset_view <- NULL + .asset_view <- selected$master_asset_view() if (!is.null(dcc_config_react()$schematic$model_validate$enable_cross_manifest_validation) & isTRUE(dcc_config_react()$schematic$model_validate$enable_cross_manifest_validation)) { - .asset_view <- selected$master_asset_view() .project_scope <- selected$project() }