fix: cleanup/remove unnecessary parts

vinci-ohdsi · May 15, 2024 · 1b4b8e7 · 1b4b8e7
1 parent 550ccb2
commit 1b4b8e7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 62 deletions.
diff --git a/js/const.js b/js/const.js
@@ -192,7 +192,6 @@ define([
 		const apiPaths = {
 			role: (id = '') => `${config.api.url}role/${id}`,
 			roleUsers: roleId => `${config.api.url}role/${roleId}/users`,
-			userRoles: userId => `${config.api.url}user/${userId}/roles`,
 			permissions: () => `${config.api.url}permission`,
 			rolePermissions: roleId => `${config.api.url}role/${roleId}/permissions`,
 			relations: (roleId, relation, ids = []) => `${config.api.url}role/${roleId}/${relation}/${ids.join('+')}`,

diff --git a/js/pages/cohort-definitions/cohort-definition-manager.js b/js/pages/cohort-definitions/cohort-definition-manager.js
@@ -2,7 +2,6 @@ define(['jquery', 'knockout', 'text!./cohort-definition-manager.html',
 	'appConfig',
 	'components/cohortbuilder/CohortDefinition',
 	'services/CohortDefinition',
-	'services/ShareRoleCheck',
 	'services/MomentAPI',
 	'services/ConceptSet',
 	'services/Permission',
@@ -66,8 +65,7 @@ define(['jquery', 'knockout', 'text!./cohort-definition-manager.html',
 	view,
 	config,
 	CohortDefinition,
-        cohortDefinitionService,
-        shareRoleCheck,
+	cohortDefinitionService,
 	momentApi,
 	conceptSetService,
 	PermissionService,
@@ -201,15 +199,14 @@ define(['jquery', 'knockout', 'text!./cohort-definition-manager.html',
 			this.authApi = authApi;
 			this.config = config;
 
-		        this.enablePermissionManagement = ko.observable(false);
- 		        this.enablePermissionManagement(config.enablePermissionManagement);
-
-		        this.userCanShare = ko.observable(false);
-		        if (config.permissionManagementRoleId === "") {
-			   this.userCanShare(true);
-		        } else {
-					this.userCanShare(authApi.isPermittedGlobalShareCohort());
-				}
+			this.enablePermissionManagement = ko.observable(config.enablePermissionManagement);
+			if (config.enablePermissionManagement) {
+				this.userCanShare = ko.observable(
+						!config.limitedPermissionManagement ||
+						authApi.isPermittedGlobalShareCohort());
+			} else {
+				this.userCanShare = ko.observable(false);
+			}
 
 			this.relatedSourcecodesOptions = globalConstants.relatedSourcecodesOptions;
 			this.commonUtils = commonUtils;

diff --git a/js/pages/concept-sets/conceptset-manager.js b/js/pages/concept-sets/conceptset-manager.js
@@ -8,8 +8,7 @@ define([
 	'./const',
 	'const',
 	'components/conceptset/utils',
-        'services/Vocabulary',
-    	'services/ShareRoleCheck',
+	'services/Vocabulary',
 	'services/Permission',
 	'services/Tags',
 	'components/security/access/const',
@@ -56,8 +55,7 @@ define([
 	constants,
 	globalConstants,
 	utils,
-        vocabularyAPI,
-        shareRoleCheck,
+	vocabularyAPI,
 	GlobalPermissionService,
 	TagsService,
 	{ entityType },
@@ -177,17 +175,15 @@ define([
 				return this.currentConceptSet() && this.currentConceptSet().id > 0;
 			});
 
-		        this.enablePermissionManagement = ko.observable(false);
- 		        this.enablePermissionManagement(config.enablePermissionManagement);
-
-		        this.userCanShare = ko.observable(false);
-		        if (config.permissionManagementRoleId === "") {
-			   this.userCanShare(true);
-		        } else {
-					this.userCanShare(authApi.isPermittedGlobalShareCohort());
-				}
+			this.enablePermissionManagement = ko.observable(config.enablePermissionManagement);
+			if (config.enablePermissionManagement) {
+				this.userCanShare = ko.observable(
+						!config.limitedPermissionManagement ||
+						authApi.isPermittedGlobalShareCohort());
+			} else {
+				this.userCanShare = ko.observable(false);
+			}
 
-
 			this.isSaving = ko.observable(false);
 			this.isDeleting = ko.observable(false);
 			this.isOptimizing = ko.observable(false);

diff --git a/js/services/AuthAPI.js b/js/services/AuthAPI.js
@@ -62,7 +62,6 @@ define(function(require, exports) {
     var subject = ko.observable();
     var permissions = ko.observable();
     var fullName = ko.observable();
-    var userId = ko.observable();
     const authProvider = ko.observable();
 
     authProvider.subscribe(provider => {
@@ -83,7 +82,6 @@ define(function(require, exports) {
                 subject(info.login);
                 authProvider(jqXHR.getResponseHeader('x-auth-provider'));
                 fullName(info.name ? info.name : info.login);
-                userId(info.id);
                 resolve();
             },
             error: function (err) {
@@ -568,7 +566,6 @@ define(function(require, exports) {
         reloginRequired: reloginRequired,
         subject: subject,
         fullName,
-        userId,
         tokenExpirationDate: tokenExpirationDate,
         tokenExpired: tokenExpired,
         authProvider: authProvider,

diff --git a/js/services/ShareRoleCheck.js b/js/services/ShareRoleCheck.js