@idsoftsource/initial-process 3.6.5 → 3.6.8

package/fesm2022/idsoftsource-initial-process.mjs

@@ -3310,10 +3310,6 @@ class PreviewComponent {
                 sessionStorage.removeItem('providerId');
                 sessionStorage.removeItem('providerUserMappingId');
                 sessionStorage.removeItem('ip_provider_owner');
-                // Don't trust any companyDetails still sitting on the in-memory profile
-                // signal either — CredentialingStore is a root singleton, so it can be
-                // carrying over another user's company data from earlier in this same
-                // browser session (e.g. a previous signup that never hit a full reload).
                 const current = this.store.profileSignal();
                 if (current?.companyDetails) {
                     this.commitProfile({ ...current, companyDetails: undefined });
@@ -4322,7 +4318,6 @@ class PreviewComponent {
             pageSize: 100,
             filter: includeForUser ? `forUser=${this.resolvedForUser}` : ``,
             targetUserId: this.effectiveTargetUserId,
-            targetProviderId: this.effectiveTargetProviderId ?? undefined,
             orderBy,
         };
     }
@@ -4480,6 +4475,8 @@ class PreviewComponent {
             issueDate: item?.issueDate ? this.toMonthInput(item.issueDate) : null,
             expiryDate: item?.expiryDate ? this.toMonthInput(item.expiryDate) : null,
             credentialId: item?.number ? String(item.number) : null,
+            professionId: item?.userProfessionId ?? null,
+            professionName: item?.professionName ?? '',
             fileId: item?.fileId ?? null,
             fileUrl: item?.fileUrl ?? null,
             fileName: item?.fileName ?? null,
@@ -4869,6 +4866,8 @@ class PreviewComponent {
                     this.skillServerIds[index] = id;
                 nextSkillMeta[index] = {
                     providerName: item?.providerName ?? undefined,
+                    professionId: item?.professionId ?? null,
+                    professionName: item?.professionName ?? '',
                     starRating: item?.starRating ?? null,
                     year: item?.year ?? null,
                     profileVisibility: !!item?.profileVisibility,
@@ -4899,6 +4898,8 @@ class PreviewComponent {
                     this.toolServerIds[index] = id;
                 nextToolMeta[index] = {
                     providerName: item?.providerName ?? undefined,
+                    professionId: item?.professionId ?? null,
+                    professionName: item?.professionName ?? '',
                     starRating: item?.starRating ?? null,
                     year: item?.year ?? null,
                     profileVisibility: !!item?.profileVisibility,
@@ -7477,19 +7478,12 @@ class PreviewComponent {
         }
         return false;
     }
-    // Combines the two sources: try the backend first (works across any device/browser),
-    // then fall back to the local per-device cache if that fails or comes back empty.
     async restoreProviderId() {
         const restoredFromServer = await this.restoreProviderMappingFromServer();
         if (!restoredFromServer) {
             this.restoreProviderIdFromLocalCache();
         }
     }
-    // Restores providerId/providerUserMappingId into sessionStorage from the local,
-    // per-user cache when they're missing (e.g. sessionStorage was cleared, or the
-    // server lookup didn't find anything) but this user already created a provider
-    // earlier on this same device. Prevents saveProvider() from mistakenly creating a
-    // duplicate provider for a returning user.
     restoreProviderIdFromLocalCache() {
         const key = this.providerCacheKey();
         if (!key)
@@ -7510,8 +7504,6 @@ class PreviewComponent {
             console.error('Unable to restore provider id from local cache', err);
         }
     }
-    // Persists the current provider id/mapping so a future session on this device
-    // (even after sessionStorage is cleared) can find it again instead of recreating it.
     cacheProviderIdLocally(providerId, providerUserMappingId) {
         const key = this.providerCacheKey();
         if (!key || !providerId)
@@ -10252,9 +10244,8 @@ class SkillsComponent {
         this.isEditMode = true;
         this.model = { ...skill };
         const group = this.createGroup(skill.skillSetId, skill.skillSetName);
-        // GetUserSkillSet returns the real saved-profession link under userProfessionId;
-        // professionId comes back as an unused empty-GUID placeholder on this endpoint.
-        const linkedProfessionId = skill.userProfessionId ?? null;
+        // GetUserSkillSet returns the real saved-profession link under professionId.
+        const linkedProfessionId = skill.professionId ?? skill.userProfessionId ?? null;
         const linkedProfessionName = skill.professionName ?? '';
         // ng-select can only display a label for a value that exists in [items]. If this
         // skill's saved profession isn't in the currently loaded userProfessionOptions
@@ -11451,9 +11442,8 @@ class ToolsComponent {
             serialNumber: tool.serialNumber,
             notes: tool.notes,
             profileVisibility: tool.profileVisibility,
-            // GetUserTool returns the real saved-profession link under userProfessionId;
-            // professionId comes back as an unused empty-GUID placeholder on this endpoint.
-            professionId: tool.userProfessionId ?? null,
+            // GetUserTool returns the real saved-profession link under professionId.
+            professionId: tool.professionId ?? tool.userProfessionId ?? null,
             professionName: tool.professionName ?? '',
         });
         if (!this.tab)
@@ -12207,9 +12197,84 @@ class RoleSelectComponent {
             sessionStorage.removeItem('ip_provider_owner');
         }
         if (this.roleData.role.name == 'Provider') {
+            if (!sessionStorage.getItem('providerId')) {
+                await this.restoreProviderId();
+            }
             this.getprovider();
         }
     }
+    // Keyed by userId — the same stable identifier already used for
+    // ip_provider_owner and every other targetUserId call in this component.
+    providerCacheKey() {
+        const normalized = (this.userId || '').toString().trim();
+        return normalized ? `ip_provider_cache::${normalized}` : null;
+    }
+    // Authoritative, cross-device source of truth: ask the backend whether this user
+    // already has a provider mapping. Falls back to the local per-device cache if the
+    // call fails or the user genuinely has no mapping there either.
+    async restoreProviderMappingFromServer() {
+        if (!this.userId)
+            return false;
+        try {
+            const res = await firstValueFrom(this.providerdetail.getProviderUserMapping({
+                TargetUserId: this.userId,
+                Page: 1,
+                PageSize: 1,
+            }));
+            const mapping = res?.data?.[0];
+            const providerId = mapping?.providerId ?? null;
+            const providerUserMappingId = mapping?.id ?? null;
+            if (providerId) {
+                sessionStorage.setItem('providerId', providerId);
+                if (providerUserMappingId)
+                    sessionStorage.setItem('providerUserMappingId', providerUserMappingId);
+                sessionStorage.setItem('ip_provider_owner', this.userId);
+                this.cacheProviderIdLocally(providerId, providerUserMappingId);
+                return true;
+            }
+        }
+        catch (err) {
+            console.error('Unable to look up existing provider mapping from server', err);
+        }
+        return false;
+    }
+    async restoreProviderId() {
+        const restoredFromServer = await this.restoreProviderMappingFromServer();
+        if (!restoredFromServer) {
+            this.restoreProviderIdFromLocalCache();
+        }
+    }
+    restoreProviderIdFromLocalCache() {
+        const key = this.providerCacheKey();
+        if (!key)
+            return;
+        try {
+            const raw = localStorage.getItem(key);
+            if (!raw)
+                return;
+            const cached = JSON.parse(raw);
+            if (cached?.providerId) {
+                sessionStorage.setItem('providerId', cached.providerId);
+                if (cached.providerUserMappingId)
+                    sessionStorage.setItem('providerUserMappingId', cached.providerUserMappingId);
+                sessionStorage.setItem('ip_provider_owner', this.userId);
+            }
+        }
+        catch (err) {
+            console.error('Unable to restore provider id from local cache', err);
+        }
+    }
+    cacheProviderIdLocally(providerId, providerUserMappingId) {
+        const key = this.providerCacheKey();
+        if (!key || !providerId)
+            return;
+        try {
+            localStorage.setItem(key, JSON.stringify({ providerId, providerUserMappingId: providerUserMappingId ?? null }));
+        }
+        catch (err) {
+            console.error('Unable to cache provider id locally', err);
+        }
+    }
     getprovider() {
         console.log(sessionStorage.getItem('providerId'));
         if (sessionStorage.getItem('providerId')) {
@@ -12400,27 +12465,13 @@ class RoleSelectComponent {
         };
     }
     async saveProvider() {
-        this.provider = this.bindProviderDetails();
+        if (!sessionStorage.getItem('providerId')) {
+            await this.restoreProviderId();
+        }
         const existingProviderId = sessionStorage.getItem('providerId');
+        this.provider = this.bindProviderDetails();
         if (existingProviderId) {
-            let providerUserMappingId = sessionStorage.getItem('providerUserMappingId');
-            if (!providerUserMappingId) {
-                try {
-                    const mappingRes = await firstValueFrom(this.providerdetail.getProviderUserMapping({
-                        TargetUserId: this.userId,
-                        Page: 1,
-                        PageSize: 1,
-                    }));
-                    const mapping = mappingRes?.data?.[0];
-                    if (mapping?.id) {
-                        providerUserMappingId = mapping.id;
-                        sessionStorage.setItem('providerUserMappingId', providerUserMappingId);
-                    }
-                }
-                catch (err) {
-                    console.error('Unable to look up existing provider mapping from server', err);
-                }
-            }
+            const providerUserMappingId = sessionStorage.getItem('providerUserMappingId');
             const updatePayload = { ...this.provider, providerId: existingProviderId, providerUserMappingId: providerUserMappingId };
             const data = await firstValueFrom(this.providerService.updateInitialSetUpProvider(updatePayload));
             if (data?.failed) {
@@ -12429,6 +12480,7 @@ class RoleSelectComponent {
                 this.userError = message;
                 throw new Error(message || 'Provider update failed');
             }
+            this.cacheProviderIdLocally(existingProviderId, providerUserMappingId);
             return existingProviderId;
         }
         const data = await firstValueFrom(this.providerService.adminCreateProvider(this.provider));
@@ -12443,11 +12495,11 @@ class RoleSelectComponent {
             sessionStorage.setItem('providerId', providerId);
             sessionStorage.setItem('providerUserMappingId', data?.value[1]);
             sessionStorage.setItem('ip_provider_owner', this.userId);
+            this.cacheProviderIdLocally(providerId, data?.value[1]);
             this.providerId = providerId;
         }
         return providerId;
     }
-    /** address1 itself is owned by im-address-verify-field; patch the sibling fields it resolved. */
     onCompanyAddressResolved(address) {
         this.companyForm.patchValue({
             city: address.city,
@@ -12459,7 +12511,6 @@ class RoleSelectComponent {
             longitude: address.longitude,
         });
     }
-    /** Hand-typed edits invalidate the previously resolved coordinates so a stale lat/lng isn't saved. */
     onCompanyAddressManualEdit() {
         this.companyForm.patchValue({ latitude: null, longitude: null });
     }
@@ -12849,7 +12900,6 @@ class RoleSelectComponent {
             this.userForm.patchValue({ phoneNumber: formatted }, { emitEvent: false });
         }
     }
-    /** address1 itself is owned by im-address-verify-field; patch the sibling fields it resolved. */
     onUserAddressResolved(address) {
         this.userForm.patchValue({
             address2: address.address2,
@@ -12862,7 +12912,6 @@ class RoleSelectComponent {
             longitude: address.longitude,
         });
     }
-    /** Hand-typed edits invalidate the previously resolved coordinates so a stale lat/lng isn't saved. */
     onUserAddressManualEdit() {
         this.userForm.patchValue({ latitude: null, longitude: null });
     }