Merge pull request #2180 from abilpraju-aot/bugfix/FWF-3552-permission

updated the multi-tenancy condition
AOT-Technologies · Aug 8, 2024 · e37bf8a · e37bf8a
2 parents 587ca83 + 867a1ce
commit e37bf8a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js b/forms-flow-web/src/components/ServiceFlow/list/sort/CreateNewFilter.js
@@ -53,6 +53,7 @@ import {
 import { fetchAllForms } from "../../../../apiManager/services/bpmFormServices";
 import { fetchUserList } from "../../../../apiManager/services/bpmTaskServices";
 import { filterSelectOptionByLabel } from "../../../../helper/helper";
+import { removeTenantKey } from "../../../../helper/helper";
 
 const initialValueOfTaskAttribute = {
   applicationId: true,
@@ -115,7 +116,7 @@ export default function CreateNewFilterDrawer({
   const [selectedForm, setSelectedForm] = useState(null);
   const [taskVariablesKeys, setTaskVariablesKeys] = useState({});
   const [processLoading, setProcessLoading] = useState(false);
-  const loginedUserRoles = useSelector((state) => state.user.roles || []);
+  //const loginedUserRoles = useSelector((state) => state.user.roles || []);
 
   const [overlayGroupShow, setOverlayGroupShow] = useState(false);
   const [overlayUserShow, setOverlayUserShow] = useState(false);
@@ -398,7 +399,7 @@ export default function CreateNewFilterDrawer({
         processDefinitionKey: definitionKeyId,
         candidateGroup:
           MULTITENANCY_ENABLED && candidateGroup
-            ? tenantKey + "-" + candidateGroup
+            ? tenantKey + "-" + trimFirstSlash(candidateGroup)
             : candidateGroup,
         assignee: assignee,
         includeAssignedTasks:
@@ -420,6 +421,7 @@ export default function CreateNewFilterDrawer({
       isTasksForCurrentUserGroupsEnabled: isTasksForCurrentUserGroupsEnabled,
       isMyTasksEnabled: isMyTasksEnabled,
     };
+
     /**
      * If a form is selected, set the formId property in the data object
      * to the id of the selected form.
@@ -543,19 +545,19 @@ export default function CreateNewFilterDrawer({
       label: `${user.username}`,
     }));
   }, [userList]);
-
+  
   const candidateOptions = useMemo(() => {
     return MULTITENANCY_ENABLED
-      ? loginedUserRoles.map((role) => ({
-          value: role,
-          label: role,
+      ? candidateGroups.map((group) => ({
+          value: removeTenantKey(group, tenantKey),
+          label: removeTenantKey(group, tenantKey),
         }))
       : candidateGroups.map((group) => ({
           value: trimFirstSlash(group),
           label: group,
         }));
-  }, [candidateGroups, loginedUserRoles, MULTITENANCY_ENABLED]);
-
+  }, [candidateGroups, MULTITENANCY_ENABLED]);
+  
   const handleAssignee = (selectedOption) => {
     setAssignee(selectedOption ? selectedOption.value : null);
   };

diff --git a/forms-flow-web/src/helper/helper.js b/forms-flow-web/src/helper/helper.js
@@ -19,7 +19,7 @@ const addTenantkey = (value, tenantkey) => {
 const removeTenantKey = (value, tenantkey) => {
   const tenantKeyCheck = value.match(`${tenantkey}-`);
   if (
-    tenantKeyCheck &&
+    tenantKeyCheck &&  tenantKeyCheck.length &&
     tenantKeyCheck[0].toLowerCase() === `${tenantkey.toLowerCase()}-`
   ) {
     return value.replace(`${tenantkey.toLowerCase()}-`, "");