@idsoftsource/initial-process 3.3.1 → 3.3.2

package/fesm2022/idsoftsource-initial-process.mjs

@@ -3440,15 +3440,68 @@ class PreviewComponent {
     professionTypeServerIds = {};
     professionSavedSnapshots = {};
     professionSelections = {};
+    normalizeProfessionTypeId(id) {
+        if (id == null)
+            return null;
+        const normalized = String(id).trim();
+        return normalized || null;
+    }
+    resolveProfessionTypeIdFromSavedItem(item) {
+        const fromProfessionId = this.normalizeProfessionTypeId(item?.professionId);
+        if (fromProfessionId && this.professionTypes.some((p) => this.normalizeProfessionTypeId(p.id) === fromProfessionId)) {
+            return fromProfessionId;
+        }
+        const name = (item?.professionName || '').trim().toLowerCase();
+        if (!name)
+            return fromProfessionId;
+        const match = this.professionTypes.find((p) => (p.professionName || '').trim().toLowerCase() === name);
+        return this.normalizeProfessionTypeId(match?.id) ?? fromProfessionId;
+    }
+    isProfessionTypeSaved(id) {
+        const typeId = this.normalizeProfessionTypeId(id);
+        return !!typeId && this.savedProfessionTypeIds.has(typeId);
+    }
+    markProfessionSelectionSaved(id, serverRecordId) {
+        const typeId = this.normalizeProfessionTypeId(id);
+        if (!typeId)
+            return;
+        this.savedProfessionTypeIds.add(typeId);
+        const sel = this.professionSelections[id] ?? this.professionSelections[typeId];
+        if (sel) {
+            this.professionSavedSnapshots[typeId] = {
+                starRating: sel.starRating ?? 0,
+                year: sel.year ?? null,
+                profileVisibility: !!sel.profileVisibility,
+                notes: sel.notes ?? '',
+            };
+        }
+        if (serverRecordId) {
+            this.professionTypeServerIds[typeId] = serverRecordId;
+        }
+    }
+    markProfessionsCreated(newIds, res) {
+        const createdRecords = Array.isArray(res)
+            ? res
+            : (Array.isArray(res?.data) ? res.data : (Array.isArray(res?.value) ? res.value : null));
+        newIds.forEach((id, index) => {
+            if (this.isManualProfessionType(id))
+                return;
+            const serverRecordId = this.getEntityId(createdRecords?.[index]) ?? (index === 0 ? this.getCreatedId(res) : null);
+            this.markProfessionSelectionSaved(id, serverRecordId);
+        });
+    }
     applySavedProfessionsToTable() {
         this.professionTypeServerIds = {};
         this.professionSavedSnapshots = {};
+        const savedTypeIds = new Set();
         (this.userProfessionOptions ?? []).forEach((item) => {
-            const typeId = item?.professionId;
+            const typeId = this.resolveProfessionTypeIdFromSavedItem(item);
             if (!typeId)
                 return;
-            this.savedProfessionTypeIds.add(typeId);
-            this.professionTypeServerIds[typeId] = item.id;
+            savedTypeIds.add(typeId);
+            const serverId = this.getEntityId(item);
+            if (serverId)
+                this.professionTypeServerIds[typeId] = serverId;
             const snapshot = {
                 starRating: item.starRating ?? 0,
                 year: item.year ?? null,
@@ -3458,10 +3511,14 @@ class PreviewComponent {
             this.professionSavedSnapshots[typeId] = snapshot;
             this.professionSelections[typeId] = { selected: true, ...snapshot };
         });
+        this.savedProfessionTypeIds = savedTypeIds;
     }
     hasProfessionRowChanged(id) {
-        const snap = this.professionSavedSnapshots[id];
-        const sel = this.professionSelections[id];
+        const typeId = this.normalizeProfessionTypeId(id);
+        if (!typeId)
+            return false;
+        const snap = this.professionSavedSnapshots[typeId];
+        const sel = this.professionSelections[id] ?? this.professionSelections[typeId];
         if (!snap || !sel)
             return false;
         return snap.starRating !== (sel.starRating ?? 0)
@@ -3507,8 +3564,8 @@ class PreviewComponent {
     }
     get professionSubmitLabel() {
         const selectedIds = Object.keys(this.professionSelections).filter(id => this.professionSelections[id].selected);
-        const hasNew = selectedIds.some(id => !this.savedProfessionTypeIds.has(id) && this.isManualRowReady(id));
-        const hasChanged = selectedIds.some(id => this.savedProfessionTypeIds.has(id) && this.hasProfessionRowChanged(id));
+        const hasNew = selectedIds.some(id => !this.isProfessionTypeSaved(id) && this.isManualRowReady(id));
+        const hasChanged = selectedIds.some(id => this.isProfessionTypeSaved(id) && this.hasProfessionRowChanged(id));
         if (hasNew && hasChanged)
             return 'Save Changes';
         if (hasChanged)
@@ -3516,14 +3573,14 @@ class PreviewComponent {
         return 'Save Profession';
     }
     isProfessionSaved(id) {
-        return this.savedProfessionTypeIds.has(id);
+        return this.isProfessionTypeSaved(id);
     }
     get selectedProfessionCount() {
         return Object.keys(this.professionSelections).filter(id => {
             const sel = this.professionSelections[id];
             if (!sel.selected)
                 return false;
-            if (!this.savedProfessionTypeIds.has(id))
+            if (!this.isProfessionTypeSaved(id))
                 return this.isManualRowReady(id);
             return this.hasProfessionRowChanged(id);
         }).length;
@@ -3584,7 +3641,7 @@ class PreviewComponent {
     buildNewProfessionCreatePayload(id) {
         const profType = this.professionTypes.find((p) => p.id === id) || {};
         const sel = this.professionSelections[id];
-        return {
+        const payload = {
             forUser: ForUser.ForProducer,
             professionName: profType.professionName,
             notes: sel.notes ?? '',
@@ -3595,11 +3652,15 @@ class PreviewComponent {
             professionGroup: profType.professionGroup ?? '',
             residentialCommercial: profType.residentialCommercial ?? '',
         };
+        if (!profType.isManual) {
+            payload.professionId = id;
+        }
+        return payload;
     }
     async submitProfessions() {
         const allSelectedIds = Object.keys(this.professionSelections).filter(id => this.professionSelections[id].selected);
-        const newIds = allSelectedIds.filter(id => !this.savedProfessionTypeIds.has(id) && this.isManualRowReady(id));
-        const changedSavedIds = allSelectedIds.filter(id => this.savedProfessionTypeIds.has(id) && this.hasProfessionRowChanged(id));
+        const newIds = allSelectedIds.filter(id => !this.isProfessionTypeSaved(id) && this.isManualRowReady(id));
+        const changedSavedIds = allSelectedIds.filter(id => this.isProfessionTypeSaved(id) && this.hasProfessionRowChanged(id));
         if ((!newIds.length && !changedSavedIds.length) || this.isSavingProfessionsTable)
             return;
         this.isSavingProfessionsTable = true;
@@ -3611,9 +3672,17 @@ class PreviewComponent {
                     console.error('Unable to create user profession(s)', res.failures);
                     return;
                 }
+                this.markProfessionsCreated(newIds, res);
+                const manualIds = newIds.filter(id => this.isManualProfessionType(id));
+                if (manualIds.length) {
+                    const manualIdSet = new Set(manualIds);
+                    this.professionTypes = this.professionTypes.filter((p) => !manualIdSet.has(p.id));
+                    manualIds.forEach(id => delete this.professionSelections[id]);
+                }
             }
             for (const id of changedSavedIds) {
-                const payload = { ...this.buildProfessionPayload(id), id: this.professionTypeServerIds[id] };
+                const typeId = this.normalizeProfessionTypeId(id);
+                const payload = { ...this.buildProfessionPayload(id), id: typeId ? this.professionTypeServerIds[typeId] : undefined };
                 const res = await firstValueFrom(this.userProfessionService.updateUserProfession(payload));
                 if (res?.failed) {
                     console.error('Unable to update user profession', res.failures);