Feature/global sharing

js/components/security/access/configure-access-modal.html

@@ -14,13 +14,18 @@
 										    readRoleOptions: readRoleOptions,
 										    readRoleSearch: readRoleSearch,
 		                                                                    writeRoleOptions: writeRoleOptions,
-										    writeRoleSearch: writeRoleSearch
+										    writeRoleSearch: writeRoleSearch,
+                                                                                    shareFlag: shareFlag,
+		                                                                    grantGlobalReadAccess: grantGlobalReadAccess,
+                                                                                    revokeGlobalReadAccess: revokeGlobalReadAccess,
 										 }">
     <loading data-bind="css: classes('loading-panel'), visible: isLoading()" params="status: ko.i18n('common.configureAccessModal.loadingAccessList', 'Loading access list...')"></loading>
+
+
     <div data-bind="css: classes()">
         <div data-bind="if: !isLoading()">
             <div data-bind="css: classes('new-access')">
-                <label data-bind="css: classes('new-access-label'), text: ko.i18n('common.configureAccessModal.addWriteAccessToRole', 'Add WRITE access to role:')"></label>
+                <label data-bind="css: classes('new-access-label'), text: ko.i18n('common.configureAccessModal.addWriteAccessToRole', 'Grant WRITE access to role:')"></label>
                 <div class="input-group"
                      data-bind="css: classes({ element: 'new-access-btn-group', extra: ['new-access-btn-group'] })">
                     <input
@@ -48,8 +53,10 @@
                     </div>
                 </div>
 	    </div>
+
+	    <div>	   	
 	    <div data-bind="css: classes('new-access')">
-		<label data-bind="css: classes('new-access-label'), text: ko.i18n('common.configureAccessModal.addReadAccessToRole', 'Add READ access to role:')"></label>
+		<label data-bind="css: classes('new-access-label'), text: ko.i18n('common.configureAccessModal.addReadAccessToRole', 'Grant READ access to role:')"></label>
                 <div class="input-group"
                      data-bind="css: classes({ element: 'new-access-btn-group', extra: ['new-access-btn-group'] })">
                     <input
@@ -77,6 +84,34 @@
                     </div>
 		</div>
 	    </div>
+
+
+	    <div><br></div>
+	    <!-- A BUTTON TO SHARE GLOBALLY -->
+	    <div>
+		<label data-bind="css: classes('new-access-label'), text: ko.i18n('common.configureAccessModal.globalReadStatus', 'Status of global READ access:')"></label>
+		<div/>
+		<div class="btn-group" data-toggle="buttons">
+		    <label data-bind="css: { active: !shareFlag()},
+				      click: function () { shareFlag(false); grantGlobalReadAccess();},
+				      clickBubble: false,
+				      text: ko.i18n('common.configureAccessModal.globalReadStatusNotGranted', 'Granted')
+				      "
+			   class="btn btn-primary",		   
+		    />
+		    <label data-bind="css: { 
+				      active: shareFlag()}, 
+				      click: function () { shareFlag(true); revokeGlobalReadAccess();},
+				      clickBubble: false,
+				      text: ko.i18n('common.configureAccessModal.globalReadStatusIsGranted', 'Not Granted')
+				      " 
+			   class="btn btn-primary",		   		   
+		    />
+		</div>	
+	    </div>
+
+	    <div><br></div>
+
         </div>
     </div>
 </atlas-modal>

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
@@ -34,6 +34,8 @@ define([
 			this.readRoleSearch = ko.observable();
 			this.readRoleSearch.subscribe(str => this.loadReadRoleSuggestions(str));
 
+		        this.shareFlag = ko.observable(true);
+
 			this.isOwnerFn = params.isOwnerFn;
 			this.grantAccessFn = params.grantAccessFn;
 			this.loadAccessListFn = params.loadAccessListFn;
@@ -109,7 +111,14 @@ define([
 			} catch (ex) {
 				console.log(ex);
 			}
-			this.isLoading(false);
+		       this.isLoading(false);
+
+		       // update shareFlag depending on if the shared artifacts reader role is in readAccessList
+		       function testForGlobalRead(value, index, array) {
+			   return value.id === 1; // the 'public' role that every use should have
+		       }
+		       let tst = this.readAccessList().some(testForGlobalRead);
+		       this.shareFlag(tst);
 		}
 
 		async grantAccess(perm_type) {
@@ -124,7 +133,6 @@ define([
 				   const role = this.readRoleSuggestions().find(r => r.name === this.readRoleName());
 			   	   await this.grantAccessFn(role.id,'READ');
 				   await this._loadReadAccessList();
-				   this.readRoleName('');
 			       }
 			} catch (ex) {
 				console.log(ex);
@@ -142,6 +150,31 @@ define([
 			}
 			this.isLoading(false);
 		}
+
+
+  	        async grantGlobalReadAccess() {
+		    this.isLoading(true);
+		    try {
+			console.log('grantGlobalReadAccess  function  called to grant read permissions!! shareflag: ' + this.shareFlag());
+			await this.grantAccessFn('1','READ'); // 1 is the 'public' role, a SYSTEM role every user should have
+			await this.loadAccessList();
+		    } catch (ex) {
+			console.log(ex);
+		    }
+		    this.isLoading(false);
+		}
+
+  	        async revokeGlobalReadAccess() {	    
+		    this.isLoading(true);
+		    try {
+			console.log('revokeGlobalReadAccess  function  called to REVOKE read permissions!! shareflag: ' + this.shareFlag());
+			await this.revokeAccessFn('1','READ'); // 1 is the 'public' role, a SYSTEM role every user should have
+			await this.loadAccessList();
+		    } catch (ex) {
+			console.log(ex);
+		    }
+		    this.isLoading(false);
+		}
 	}
 
 	return commonUtils.build('configure-access-modal', ConfigureAccessModal, view);

js/pages/cohort-definitions/cohort-definition-manager.html

@@ -33,7 +33,7 @@
 					<button class="btn btn-primary"
 						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) }"><i class="fa fa-link"></i></button>
 
-					<!-- ko if: enablePermissionManagement -->
+					<!-- ko if: (enablePermissionManagement() === true && userCanShare() === true) -->
 					<button class="btn btn-primary"
 						data-bind="title: ko.i18n('common.configureAccess', 'Configure access'), visible: isOwner() && !previewVersion(), click: () => isAccessModalShown(!isAccessModalShown())">
 						<i class="fa fa-lock"></i>
@@ -77,20 +77,20 @@
 			</li>
 
 			<li role="presentation"
-				data-bind="visible: !previewVersion(), css: { active: $component.tabMode() == 'samples' }, click: clickSampleTab">
-				<a data-bind="text: ko.i18n('cohortDefinitions.cohortDefinitionManager.tabs.samples', 'Samples')"></a>
+			    data-bind="visible: !previewVersion(), css: { active: $component.tabMode() == 'samples' }, click: clickSampleTab">
+			    <a data-bind="text: ko.i18n('cohortDefinitions.cohortDefinitionManager.tabs.samples', 'Samples')"></a>
 			</li>
 
 			<li role="presentation"
 				data-bind="visible: !previewVersion(), css: { active: $component.tabMode() == 'reporting' }, click: function() { $component.selectTab('reporting'); }">
 				<a data-bind="text: ko.i18n('cohortDefinitions.cohortDefinitionManager.tabs.reporting', 'Reporting')"></a>
 			</li>
-			<!--
+
 			<li role="presentation"
-				data-bind="visible: !previewVersion(), css: { active: $component.tabMode() == 'explore' }, click: function() { $component.selectTab('explore'); }">
-				<a data-bind="text: ko.i18n('cohortDefinitions.cohortDefinitionManager.tabs.explore', 'Explore')"></a>
+				  data-bind="visible: !previewVersion(), css: { active: $component.tabMode() == 'explore' }, click: function() { $component.selectTab('explore'); }">
+			    <a data-bind="text: ko.i18n('cohortDefinitions.cohortDefinitionManager.tabs.explore', 'Explore')"></a>
 			</li>
-			-->
+
 			<li role="presentation"
 				data-bind="visible: !previewVersion(), css: { active: $component.tabMode() == 'export' }, click: () => { $component.selectTab('export'); refreshPrintFriendly(); }">
 				<a data-bind="text: ko.i18n('cohortDefinitions.cohortDefinitionManager.tabs.export', 'Export')"></a>

js/pages/cohort-definitions/cohort-definition-manager.js

@@ -2,6 +2,7 @@ define(['jquery', 'knockout', 'text!./cohort-definition-manager.html',
 	'appConfig',
 	'components/cohortbuilder/CohortDefinition',
 	'services/CohortDefinition',
+	'services/ShareRoleCheck',
 	'services/MomentAPI',
 	'services/ConceptSet',
 	'services/Permission',
@@ -58,14 +59,15 @@ define(['jquery', 'knockout', 'text!./cohort-definition-manager.html',
 	'utilities/sql',
 	'components/conceptset/conceptset-list',
 	'components/name-validation',
-	'components/versions/versions'
+	'components/versions/versions',
 ], function (
 	$,
 	ko,
 	view,
 	config,
 	CohortDefinition,
-	cohortDefinitionService,
+        cohortDefinitionService,
+        shareRoleCheck,
 	momentApi,
 	conceptSetService,
 	PermissionService,
@@ -99,7 +101,7 @@ define(['jquery', 'knockout', 'text!./cohort-definition-manager.html',
 	globalConstants,
 	constants,
 	{ entityType },
-	conceptSetUtils,
+        conceptSetUtils,
 ) {
 	const includeKeys = ["UseEventEnd"];
 	function pruneJSON(key, value) {
@@ -198,7 +200,24 @@ define(['jquery', 'knockout', 'text!./cohort-definition-manager.html',
 			this.pollTimeoutId = null;
 			this.authApi = authApi;
 			this.config = config;
-			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('cohortDefinitions.cohortDefinitionManager.shareRoleCheck', 'Error when determining if user can share cohorts')());
+				});
+			}		        
+
 			this.relatedSourcecodesOptions = globalConstants.relatedSourcecodesOptions;
 			this.commonUtils = commonUtils;
 			this.isLoading = ko.observable(false);
@@ -914,7 +933,7 @@ define(['jquery', 'knockout', 'text!./cohort-definition-manager.html',
 		}
 
 		// METHODS
-
+	    
 		startPolling(cd, source) {
 			this.pollId = PollService.add({
 				callback: () => this.queryHeraclesJob(cd, source),

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>

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 concept sets')());
+				});
+			}		        
+
+
 			this.isSaving = ko.observable(false);
 			this.isDeleting = ko.observable(false);
 			this.isOptimizing = ko.observable(false);

js/services/AuthAPI.js

@@ -407,8 +407,18 @@ define(function(require, exports) {
     }
 
     var isPermittedGenerateCohort = function(cohortId, sourceKey) {
-        return isPermitted('cohortdefinition:' + cohortId + ':generate:' + sourceKey + ':get') &&
-            isPermitted('cohortdefinition:' + cohortId + ':info:get');
+	var v = isPermitted('cohortdefinition:' + cohortId + ':generate:' + sourceKey + ':get') &&
+		isPermitted('cohortdefinition:' + cohortId + ':info:get');
+
+	// By default, everyone can generate any artifact they have
+	// permission to read. If a permissionManagementRoleId has
+	// been assigned, (non- empty string assignment), the default
+	// generate functionality is not desired. Rather, users will have to
+	// have a role that allows them to update the specific cohort definition. 
+	if (config.permissionManagementRoleId !== ""){
+	    v = v && isPermitted('cohortdefinition:' + cohortId + ':put')
+	}
+        return v
     }
 
     var isPermittedReadCohortReport = function(cohortId, sourceKey) {

js/services/ShareRoleCheck.js

@@ -0,0 +1,32 @@
+define(function (require, exports) {
+    var $ = require('jquery');
+    var constants = require('const');
+    const httpService = require('services/http');
+
+    async function getRoleUsers(subject, permissionManagementRoleId) {
+	return await httpService.doGet(constants.apiPaths.roleUsers(permissionManagementRoleId))
+	      .then(({ data = [] }) => data)
+	      .catch((er) => {
+		  console.error('ERROR: Can\'t find users with permissionManagementRoleId: ' + permissionManagementRoleId);
+	      });
+    };
+
+    async function checkIfRoleCanShare(subject, permissionManagementRoleId) {
+	var isAbleToShare = false;
+	const roleUsers = await getRoleUsers(subject, permissionManagementRoleId);
+	console.log("INFO: roleUsers:" + roleUsers.toString());
+
+	roleUsers.forEach((user) => {
+	    console.log("INFO: user.login of user that has the permissionManagementRoleId " + permissionManagementRoleId + ": " + user.login + "; subject (currently logged in user): " + subject);
+            if (subject == user.login){
+		isAbleToShare = true;		
+	    }
+        });
+	console.log("INFO: isAbleToShare: " + isAbleToShare);
+	return isAbleToShare;
+    };
+
+    return {
+	checkIfRoleCanShare,
+    };
+});