started to implement the ability to hide the share-global buttons but…

… then decided not to
OHDSI · Apr 23, 2024 · b99d5d5 · b99d5d5
1 parent 8f46884
commit b99d5d5
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 10 deletions.
diff --git a/js/components/security/access/configure-access-modal.html b/js/components/security/access/configure-access-modal.html
@@ -106,9 +106,9 @@
 				      " 
 			   class="btn btn-primary",		   
 		    />
-		</div>
-		
-	    </div>    
+		</div>	
+	    </div>
+
 	    <div><br></div>
 
         </div>

diff --git a/js/components/security/access/configure-access-modal.js b/js/components/security/access/configure-access-modal.js
@@ -1,14 +1,14 @@
 define([
 	'knockout',
-	'text!./configure-access-modal.html',
+        'text!./configure-access-modal.html',
 	'components/Component',
 	'utils/CommonUtils',
 	'utils/AutoBind',
 	'less!./configure-access-modal.less',
 	'databindings',
 ], function (
 	ko,
-	view,
+        view,
 	Component,
 	commonUtils,
 	AutoBind
@@ -33,7 +33,7 @@ define([
 			this.readRoleOptions = ko.computed(() => this.readRoleSuggestions().map(r => r.name));
 			this.readRoleSearch = ko.observable();
 			this.readRoleSearch.subscribe(str => this.loadReadRoleSuggestions(str));
-		    
+
 		        this.shareFlag = ko.observable(true);
 
 			this.isOwnerFn = params.isOwnerFn;

diff --git a/js/pages/concept-sets/conceptset-manager.html b/js/pages/concept-sets/conceptset-manager.html
@@ -27,7 +27,7 @@
         <button type="button" class="btn btn-primary" data-bind="click: () => isTagsModalShown(!isTagsModalShown()), visible: canEdit() && !previewVersion(), css: { disabled: isProcessing() }, title: ko.i18n('common.tags', 'Tags')"><i class="fa fa-tags"></i></button>
         <button type="button" class="btn btn-primary" data-bind="visible: !previewVersion(), click: optimize, css: { disabled: !canOptimize() || isProcessing() }, text: ko.i18n('cs.manager.optimize', 'Optimize')"></button>
 
-	<!-- ko if: enablePermissionManagement -->
+	<!-- ko if: (enablePermissionManagement() === true && userCanShare() === true)  -->
         <button class="btn btn-primary" data-bind="visible: !previewVersion() && isOwner(), click: () => isAccessModalShown(!isAccessModalShown()), title: ko.i18n('common.configureAccess', 'Configure access')">
             <i class="fa fa-lock"></i>
         </button>

diff --git a/js/pages/concept-sets/conceptset-manager.js b/js/pages/concept-sets/conceptset-manager.js
@@ -8,7 +8,8 @@ define([
 	'./const',
 	'const',
 	'components/conceptset/utils',
-	'services/Vocabulary',
+        'services/Vocabulary',
+    	'services/ShareRoleCheck',
 	'services/Permission',
 	'services/Tags',
 	'components/security/access/const',
@@ -55,7 +56,8 @@ define([
 	constants,
 	globalConstants,
 	utils,
-	vocabularyAPI,
+        vocabularyAPI,
+        shareRoleCheck,
 	GlobalPermissionService,
 	TagsService,
 	{ entityType },
@@ -174,7 +176,25 @@ define([
 			this.canCopy = ko.computed(() => {
 				return this.currentConceptSet() && this.currentConceptSet().id > 0;
 			});
-			this.enablePermissionManagement = config.enablePermissionManagement;	    
+
+		        this.enablePermissionManagement = ko.observable(false);
+ 		        this.enablePermissionManagement(config.enablePermissionManagement);
+
+		        this.userCanShare = ko.observable(false);
+		        if (config.permissionManagementRoleId === "") {
+			   this.userCanShare(true);
+		        } else {
+			   shareRoleCheck.checkIfRoleCanShare(authApi.subject(), config.permissionManagementRoleId)
+				.then(res=>{
+				    this.userCanShare(res);
+				})
+				.catch(error => {
+				    console.error(error);
+				    alert(ko.i18n('conceptSets.conceptSetManager.shareRoleCheck', 'Error when determining if user can share cohorts')());
+				});
+			}		        
+
+
 			this.isSaving = ko.observable(false);
 			this.isDeleting = ko.observable(false);
 			this.isOptimizing = ko.observable(false);