From 9aecc36a280094b266a761b8f17b9240b7cd60b4 Mon Sep 17 00:00:00 2001 From: rkboyce Date: Sun, 25 Jun 2023 00:08:52 +0000 Subject: [PATCH] carried forward the filtering of the permission manager button based on the new configLocal.enablePermissionManagement variable to the other applications in Atlas --- .../characterizations/characterization-view-edit.html | 8 ++++++-- .../characterizations/characterization-view-edit.js | 4 ++++ .../feature-analyses/feature-analysis-view-edit.html | 6 +++++- .../feature-analyses/feature-analysis-view-edit.js | 4 ++++ .../cohort-definitions/cohort-definition-manager.html | 9 ++++++--- js/pages/cohort-definitions/cohort-definition-manager.js | 7 +++++-- js/pages/concept-sets/conceptset-manager.html | 3 ++- js/pages/estimation/cca-manager.html | 6 ++++-- js/pages/estimation/cca-manager.js | 7 +++++-- js/pages/prediction/prediction-manager.html | 5 ++++- js/pages/prediction/prediction-manager.js | 9 ++++++--- js/pages/reusables/components/manager.html | 2 ++ js/pages/reusables/components/manager.js | 4 ++++ 13 files changed, 57 insertions(+), 17 deletions(-) diff --git a/js/pages/characterizations/components/characterizations/characterization-view-edit.html b/js/pages/characterizations/components/characterizations/characterization-view-edit.html index a7ab7c349..b670757c5 100644 --- a/js/pages/characterizations/components/characterizations/characterization-view-edit.html +++ b/js/pages/characterizations/components/characterizations/characterization-view-edit.html @@ -20,10 +20,14 @@ + + - + + + @@ -103,4 +107,4 @@ loadAvailableTagsFn: $component.loadAvailableTags, checkAssignPermissionFn: $component.checkAssignPermission, checkUnassignPermissionFn: $component.checkUnassignPermission -"> \ No newline at end of file +"> diff --git a/js/pages/characterizations/components/characterizations/characterization-view-edit.js b/js/pages/characterizations/components/characterizations/characterization-view-edit.js index c7042f914..e336ebc66 100644 --- a/js/pages/characterizations/components/characterizations/characterization-view-edit.js +++ b/js/pages/characterizations/components/characterizations/characterization-view-edit.js @@ -71,6 +71,10 @@ define([ this.areStratasNamesEmpty = ko.observable(); this.duplicatedStrataNames = ko.observable([]); + this.enablePermissionManagement = ko.pureComputed(() => { + return config.enablePermissionManagement; + }); + this.designDirtyFlag = sharedState.CohortCharacterization.dirtyFlag; this.loading = ko.observable(false); this.defaultName = ko.unwrap(constants.newEntityNames.characterization); diff --git a/js/pages/characterizations/components/feature-analyses/feature-analysis-view-edit.html b/js/pages/characterizations/components/feature-analyses/feature-analysis-view-edit.html index 3ec6c84c7..85d579285 100644 --- a/js/pages/characterizations/components/feature-analyses/feature-analysis-view-edit.html +++ b/js/pages/characterizations/components/feature-analyses/feature-analysis-view-edit.html @@ -17,9 +17,13 @@ + + + + @@ -53,4 +57,4 @@ grantAccessFn: $component.grantAccess, revokeAccessFn: $component.revokeAccess, loadRoleSuggestionsFn: $component.loadAccessRoleSuggestions -"> \ No newline at end of file +"> diff --git a/js/pages/characterizations/components/feature-analyses/feature-analysis-view-edit.js b/js/pages/characterizations/components/feature-analyses/feature-analysis-view-edit.js index 01679cf52..9a6097d5c 100644 --- a/js/pages/characterizations/components/feature-analyses/feature-analysis-view-edit.js +++ b/js/pages/characterizations/components/feature-analyses/feature-analysis-view-edit.js @@ -153,6 +153,10 @@ define([ }); this.editorClasses = ko.computed(() => this.classes({ element: 'content', modifiers: this.canEdit() ? '' : 'disabled' })) + this.enablePermissionManagement = ko.pureComputed(() => { + return config.enablePermissionManagement; + }); + this.selectedTabKey = ko.observable(); this.componentParams = ko.observable({ ...params, diff --git a/js/pages/cohort-definitions/cohort-definition-manager.html b/js/pages/cohort-definitions/cohort-definition-manager.html index 9b00a6f37..2665a0ca7 100644 --- a/js/pages/cohort-definitions/cohort-definition-manager.html +++ b/js/pages/cohort-definitions/cohort-definition-manager.html @@ -31,12 +31,15 @@ data-bind="visible: !previewVersion(), title: ko.i18n('cohortDefinitions.cohortDefinitionManager.createCopyCohortTitle', 'Create a copy of this cohort definition'), click: copy, enable: canCopy() && !isProcessing()"> + data-bind="visible: !previewVersion(), title: ko.i18n('cohortDefinitions.cohortDefinitionManager.getLinkCohortTitle', 'Get a link to this cohort definition'), enable: !dirtyFlag().isDirty() && !isProcessing(), click: function () { $component.cohortLinkModalOpened(true) }"> + + + + + - diff --git a/js/pages/estimation/cca-manager.html b/js/pages/estimation/cca-manager.html index ebed9b528..05b1d6a02 100644 --- a/js/pages/estimation/cca-manager.html +++ b/js/pages/estimation/cca-manager.html @@ -15,10 +15,12 @@ - + + + @@ -75,4 +77,4 @@ loadRoleSuggestionsFn: $component.loadAccessRoleSuggestions "> - \ No newline at end of file + diff --git a/js/pages/estimation/cca-manager.js b/js/pages/estimation/cca-manager.js index d80a2f699..74aadeb79 100644 --- a/js/pages/estimation/cca-manager.js +++ b/js/pages/estimation/cca-manager.js @@ -71,7 +71,10 @@ define([ this.cohortMethodAnalysisList = null; this.defaultCovariateSettings = ko.observable(); this.options = constants.options; - this.config = config; + this.config = config; + this.enablePermissionManagement = ko.pureComputed(() => { + return config.enablePermissionManagement; + }); this.loading = ko.observable(true); this.isAuthenticated = ko.pureComputed(() => { return authApi.isAuthenticated(); @@ -592,4 +595,4 @@ define([ } return commonUtils.build('cca-manager', ComparativeCohortAnalysisManager, view); -}); \ No newline at end of file +}); diff --git a/js/pages/prediction/prediction-manager.html b/js/pages/prediction/prediction-manager.html index df62a2342..bbbe2754d 100644 --- a/js/pages/prediction/prediction-manager.html +++ b/js/pages/prediction/prediction-manager.html @@ -26,10 +26,13 @@ + + + @@ -88,4 +91,4 @@ loadRoleSuggestionsFn: $component.loadAccessRoleSuggestions "> - \ No newline at end of file + diff --git a/js/pages/prediction/prediction-manager.js b/js/pages/prediction/prediction-manager.js index 57de6e748..093b9e090 100644 --- a/js/pages/prediction/prediction-manager.js +++ b/js/pages/prediction/prediction-manager.js @@ -5,7 +5,7 @@ define([ 'pages/Router', 'utils/CommonUtils', 'assets/ohdsi.util', - 'appConfig', + 'appConfig', './const', 'const', 'atlas-state', @@ -80,7 +80,10 @@ define([ }); this.options = constants.options; - this.config = config; + this.config = config; + this.enablePermissionManagement = ko.pureComputed(() => { + return config.enablePermissionManagement; + }); this.loading = ko.observable(true); this.patientLevelPredictionAnalysis = sharedState.predictionAnalysis.current; this.selectedAnalysisId = sharedState.predictionAnalysis.selectedId; @@ -491,4 +494,4 @@ define([ } return commonUtils.build('prediction-manager', PatientLevelPredictionManager, view); -}); \ No newline at end of file +}); diff --git a/js/pages/reusables/components/manager.html b/js/pages/reusables/components/manager.html index 7964dc20b..55eb76054 100644 --- a/js/pages/reusables/components/manager.html +++ b/js/pages/reusables/components/manager.html @@ -21,7 +21,9 @@ + + diff --git a/js/pages/reusables/components/manager.js b/js/pages/reusables/components/manager.js index faa02c0fb..01ae7cc71 100644 --- a/js/pages/reusables/components/manager.js +++ b/js/pages/reusables/components/manager.js @@ -89,6 +89,10 @@ define([ this.selectedTabKey = ko.observable("design"); + this.enablePermissionManagement = ko.pureComputed(() => { + return config.enablePermissionManagement; + }); + this.componentParams = ko.observable({ design: this.previewVersion() ? this.previewVersion : this.design, designId: this.designId,