From 7a6859d6de5c9f575d202facc613ffdb940d747f Mon Sep 17 00:00:00 2001 From: afwillia Date: Tue, 4 Jun 2024 12:20:43 -0700 Subject: [PATCH] check config for enabling schematic validate cross manifest validation. Remove project scope from validation query --- server.R | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server.R b/server.R index d28a88f3..2e6bdf00 100644 --- a/server.R +++ b/server.R @@ -806,7 +806,10 @@ shinyServer(function(input, output, session) { # asset view must be NULL to avoid cross-manifest validation. # doing this in a verbose way to avoid warning with ifelse .asset_view <- NULL - if (!is.null(.project_scope)) .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() + } promises::future_promise({ annotation_status <- switch(dca_schematic_api, @@ -822,7 +825,7 @@ shinyServer(function(input, output, session) { data_type = .schema, file_name = .datapath, restrict_rules = .restrict_rules, - project_scope = .project_scope, + #project_scope = .project_scope, access_token = .access_token, data_model_labels = .data_model_labels, asset_view = .asset_view