ISTE-8 Modification in Multiselect dropdown (#782)

ISTE-8 Modification in Multiselect dropdown
egovernments · Apr 26, 2024 · 2b54487 · 2b54487
2 parents f2ae513 + 175514d
commit 2b54487
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/Multiselect.js b/...web/micro-ui-internals/packages/modules/hrms/src/components/pageComponents/Multiselect.js
@@ -88,10 +88,9 @@ const MultiSelectDropdown = ({
   }, [selected?.length]);
 
   function fnToSelectOptionThroughProvidedSelection(selected) {
-
     return selected?.map((e) => (
       { 
-        [optionsKey]: `ACCESSCONTROL_ROLES_ROLES_${e.code}`,
+        [optionsKey]: e?.i18text? e.i18text : `ACCESSCONTROL_ROLES_ROLES_${e.code}`,
         propsData: [null, e] 
       }
     ));

diff --git a/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js b/frontend/micro-ui/web/micro-ui-internals/packages/modules/hrms/src/pages/createEmployee.js
@@ -113,7 +113,7 @@ const CreateEmployee = () => {
       formData?.SelectEmployeeName?.employeeName &&
       formData?.SelectEmployeePhoneNumber?.mobileNumber &&
       formData?.Jurisdictions.length &&
-      formData?.Jurisdictions.filter((juris) => juris?.roles?.length).length > 0 &&
+      (formData?.Jurisdictions.filter((juris) => juris?.roles?.length).length > 0 || formData?.Jurisdictions.filter((juris) => juris?.divisionBoundary?.length).length > 0) &&
       checkfield &&
       phonecheck &&
       checkMailNameNum(formData)