vcomply-workflow-engine 7.4.4 → 7.4.5

package/fesm2022/vcomply-workflow-engine.mjs

@@ -47929,6 +47929,7 @@ class AddMultipleResponsibilityWithTabComponent {
             assigneesList: [],
             reviewerList: [],
             parentResponsibility: [],
+            peopleDropdownNames: [],
             memberId: '',
         };
         this.isLoader = false;
@@ -48009,6 +48010,7 @@ class AddMultipleResponsibilityWithTabComponent {
                 assigneesList: [],
                 reviewerList: [],
                 parentResponsibility: [],
+                peopleDropdownNames: [],
                 memberId: '',
             };
             this.uploadedFiles = [];
@@ -48501,6 +48503,7 @@ class AddMultipleResponsibilityWithTabComponent {
             assignorsList: [],
             assigneesList: [],
             reviewerList: [],
+            peopleDropdownNames: [],
             memberId: '',
         };
         this.isFileEmpty = false;
@@ -48595,23 +48598,26 @@ class AddMultipleResponsibilityWithTabComponent {
                 this.templateInfo.rcList.push(rc);
             }
             // Assignee
+            if (this.hasValue(element[RESPONSIBILITY.assigneeIndex.name])) {
+                this.addPeopleDropdownName(element[RESPONSIBILITY.assigneeIndex.name]);
+            }
             if (element[RESPONSIBILITY.assigneeIndex.id]) {
+                const people = this.parsePeopleListCell(element[RESPONSIBILITY.assigneeIndex.name]);
                 const assignee = {
-                    nameAndEmail: element[RESPONSIBILITY.assigneeIndex.name],
-                    // name: element[11].split(' (')[0],
-                    name: element[RESPONSIBILITY.assigneeIndex.name].split(' (')[0],
-                    email: element[RESPONSIBILITY.assigneeIndex.email].split(' (')[1].replace(')', ''),
+                    nameAndEmail: people.nameAndEmail,
+                    name: people.name,
+                    email: people.email,
                     member_id: element[RESPONSIBILITY.assigneeIndex.id],
                 };
                 this.templateInfo.assigneesList.push(assignee);
             }
             // Reviewer
             if (element[RESPONSIBILITY.reviewerIndex.id]) {
+                const people = this.parsePeopleListCell(element[RESPONSIBILITY.reviewerIndex.name]);
                 const reviewer = {
-                    nameAndEmail: element[RESPONSIBILITY.reviewerIndex.name],
-                    // name: element[11].split(' (')[0],
-                    name: element[RESPONSIBILITY.reviewerIndex.name].split(' (')[0],
-                    email: element[RESPONSIBILITY.reviewerIndex.email].split(' (')[1].replace(')', ''),
+                    nameAndEmail: people.nameAndEmail,
+                    name: people.name,
+                    email: people.email,
                     employee_id: element[RESPONSIBILITY.reviewerIndex.id],
                     my_member_id: element[RESPONSIBILITY.reviewerIndex.id],
                 };
@@ -48619,6 +48625,13 @@ class AddMultipleResponsibilityWithTabComponent {
             }
             /* Checking if the element[2] is not empty and not equal to space. If it is not empty and not
             equal to space, it will create an object and push it to the assignorsList array. */
+            if (this.hasValue(element[RESPONSIBILITY.assignorIndex.name])) {
+                this.addPeopleDropdownName(element[RESPONSIBILITY.assignorIndex.name]);
+                if (this.hasValue(element[RESPONSIBILITY.assignorIndex.email])) {
+                    this.addPeopleDropdownName(element[RESPONSIBILITY.assignorIndex.email]);
+                    this.addPeopleDropdownName(`${String(element[RESPONSIBILITY.assignorIndex.name]).trim()} (${String(element[RESPONSIBILITY.assignorIndex.email]).trim()})`);
+                }
+            }
             if (element[RESPONSIBILITY.assignorIndex.id]) {
                 const assignor = {
                     nameAndEmail: element[RESPONSIBILITY.assignorIndex.name],
@@ -48631,12 +48644,12 @@ class AddMultipleResponsibilityWithTabComponent {
                 this.templateInfo.assignorsList.push(assignor);
             }
         });
+        this.collectEmailDisplayNamesFromSheet(tempList);
         /* Creating a list of child categories and attaching them to their parent program */
         if (this.templateInfo.categoryList?.length) {
             this.templateInfo.categoryList.forEach((program, i) => {
-                const index = (tempList[0] || []).findIndex((cell) => cell == program?.programId);
-                if (index !== -1) {
-                    const childCategory = [];
+                const childCategory = [];
+                this.getProgramCategoryIdColumns(tempList[0], program?.programId).forEach((index) => {
                     for (let j = 1; true; j++) {
                         if (tempList[j] && tempList[j][index]) {
                             childCategory.push({
@@ -48648,11 +48661,69 @@ class AddMultipleResponsibilityWithTabComponent {
                             break;
                         }
                     }
-                    this.templateInfo.categoryList[i]['childCategory'] = childCategory;
-                }
+                });
+                this.templateInfo.categoryList[i]['childCategory'] = childCategory;
             });
         }
     }
+    /**
+     * Child categories live in later Data-sheet columns whose header is the program id.
+     * Skip the program listing id columns (22-29 area) — those same ids also appear there
+     * for the first program of each type, which would attach the wrong names.
+     */
+    getProgramCategoryIdColumns(headerRow = [], programId) {
+        if (programId == null || programId === '') {
+            return [];
+        }
+        const programListingIdColumns = new Set([
+            RESPONSIBILITY.programIndex.regulations.id,
+            RESPONSIBILITY.programIndex.standards.id,
+            RESPONSIBILITY.programIndex.internalControls.id,
+            RESPONSIBILITY.programIndex.others.id,
+        ]);
+        const indexes = [];
+        (headerRow || []).forEach((cell, index) => {
+            if (!programListingIdColumns.has(index) && cell == programId) {
+                indexes.push(index);
+            }
+        });
+        return indexes;
+    }
+    parsePeopleListCell(value) {
+        const nameAndEmail = value == null ? '' : String(value).trim();
+        const emailMatch = nameAndEmail.match(/\(([^)]*@[^)]*)\)\s*$/);
+        return {
+            nameAndEmail,
+            name: nameAndEmail.replace(/\s*\([^)]*@[^)]*\)\s*$/, '').trim() || nameAndEmail,
+            email: emailMatch ? emailMatch[1].trim() : '',
+        };
+    }
+    addPeopleDropdownName(value) {
+        if (!this.hasValue(value)) {
+            return;
+        }
+        if (!this.templateInfo.peopleDropdownNames) {
+            this.templateInfo.peopleDropdownNames = [];
+        }
+        const name = String(value).trim();
+        const alreadyAdded = this.templateInfo.peopleDropdownNames.some((existing) => this.normalizeDropdownValue(existing) === this.normalizeDropdownValue(name));
+        if (!alreadyAdded) {
+            this.templateInfo.peopleDropdownNames.push(name);
+        }
+    }
+    collectEmailDisplayNamesFromSheet(tempList = []) {
+        (tempList || []).forEach((row) => {
+            (row || []).forEach((cell) => {
+                if (cell == null) {
+                    return;
+                }
+                const text = String(cell);
+                if (/\([^)]*@[^)]*\)/.test(text)) {
+                    this.addPeopleDropdownName(text);
+                }
+            });
+        });
+    }
     getProgramDetails(element, index, type) {
         if (element[index.id] && typeof element[index.id] === 'number') {
             return {
@@ -49164,21 +49235,6 @@ class AddMultipleResponsibilityWithTabComponent {
         });
         return names;
     }
-    getAssignorDropdownNames() {
-        const names = [];
-        (this.templateInfo?.assignorsList || []).forEach((assignor) => {
-            if (this.hasValue(assignor?.nameAndEmail)) {
-                names.push(String(assignor.nameAndEmail).trim());
-            }
-            if (this.hasValue(assignor?.name)) {
-                names.push(String(assignor.name).trim());
-            }
-            if (this.hasValue(assignor?.name) && this.hasValue(assignor?.email)) {
-                names.push(`${String(assignor.name).trim()} (${String(assignor.email).trim()})`);
-            }
-        });
-        return names;
-    }
     /**
      * Entrusted By in the xlsx dropdown is the people list in `Name (email)` form
      * (same source as Entrusted To / Reviewer), not the assignor name-only column.
@@ -49187,33 +49243,79 @@ class AddMultipleResponsibilityWithTabComponent {
         if (!this.hasValue(value)) {
             return true;
         }
-        if (this.returnIds(value, 'entrusted_to')) {
+        const normalized = this.normalizeDropdownValue(value);
+        const valueEmail = this.extractDropdownEmail(value);
+        const valueName = this.extractDropdownName(value);
+        const dropdownNames = this.templateInfo?.peopleDropdownNames || [];
+        if (dropdownNames.some((name) => this.normalizeDropdownValue(name) === normalized)) {
             return true;
         }
-        if (this.returnIds(value, 'reviewer')?.name) {
+        if (valueEmail &&
+            dropdownNames.some((name) => {
+                const nameEmail = this.extractDropdownEmail(name);
+                return (nameEmail === valueEmail ||
+                    this.normalizeDropdownValue(name) === valueEmail);
+            })) {
             return true;
         }
-        const peopleNames = [
-            ...this.getAssignorDropdownNames(),
-            ...this.getTemplateListNames(this.templateInfo?.assigneesList, 'nameAndEmail'),
-            ...this.getTemplateListNames(this.templateInfo?.reviewerList, 'nameAndEmail'),
+        const users = [
+            ...(this.templateInfo?.assignorsList || []),
+            ...(this.templateInfo?.assigneesList || []),
+            ...(this.templateInfo?.reviewerList || []),
         ];
-        const normalized = String(value).trim().toLowerCase();
-        return peopleNames.some((name) => String(name).trim().toLowerCase() === normalized);
+        return users.some((user) => {
+            const constructed = this.hasValue(user?.name) && this.hasValue(user?.email)
+                ? `${String(user.name).trim()} (${String(user.email).trim()})`
+                : '';
+            const candidates = [
+                user?.nameAndEmail,
+                user?.name,
+                user?.email,
+                constructed,
+            ];
+            if (candidates.some((candidate) => this.hasValue(candidate) &&
+                this.normalizeDropdownValue(candidate) === normalized)) {
+                return true;
+            }
+            if (valueEmail &&
+                this.hasValue(user?.email) &&
+                this.normalizeDropdownValue(user.email) === valueEmail) {
+                return true;
+            }
+            if (valueName &&
+                this.hasValue(user?.name) &&
+                this.normalizeDropdownValue(user.name) === valueName) {
+                return true;
+            }
+            return (!!valueEmail &&
+                candidates.some((candidate) => this.hasValue(candidate) &&
+                    this.extractDropdownEmail(candidate) === valueEmail));
+        });
+    }
+    normalizeDropdownValue(value) {
+        return String(value ?? '')
+            .replace(/[\u200B-\u200D\uFEFF]/g, '')
+            .replace(/\u00a0/g, ' ')
+            .replace(/\s+/g, ' ')
+            .trim()
+            .toLowerCase();
+    }
+    extractDropdownEmail(value) {
+        const match = String(value ?? '').match(/\(([^)]*@[^)]*)\)\s*$/);
+        return match ? this.normalizeDropdownValue(match[1]) : '';
+    }
+    extractDropdownName(value) {
+        return this.normalizeDropdownValue(String(value ?? '').replace(/\s*\([^)]*@[^)]*\)\s*$/, ''));
     }
     isInStaticDropdown(value, options) {
-        if (!this.hasValue(value)) {
-            return true;
-        }
-        const normalized = String(value).trim().toLowerCase();
-        return options.some((option) => option.toLowerCase() === normalized);
+        return this.isInDropdownList(value, options);
     }
     isInDropdownList(value, options) {
         if (!this.hasValue(value)) {
             return true;
         }
-        const normalized = String(value).trim();
-        return options.some((option) => option === normalized);
+        const normalized = this.normalizeDropdownValue(value);
+        return (options || []).some((option) => this.normalizeDropdownValue(option) === normalized);
     }
     isValidDropdownDay(value) {
         if (!this.hasValue(value)) {