Skip to content

Commit

Permalink
Merge pull request #599 from Sage-Bionetworks/FDS-1981-cross-manifest…
Browse files Browse the repository at this point in the history
…-validation

check config for enabling schematic validate cross manifest validatio…
  • Loading branch information
afwillia authored Jun 6, 2024
2 parents acc8e63 + 7a6859d commit 486a221
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions server.R
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down

0 comments on commit 486a221

Please sign in to comment.