@hmcts/rpx-xui-common-lib 3.2.25 → 3.2.26-ts-node-update

package/fesm2022/hmcts-rpx-xui-common-lib.mjs

@@ -2149,8 +2149,12 @@ class FilterService {
         this.streams = {};
     }
     persist(setting, persistence) {
+        setting = { ...setting };
+        delete setting.idamId;
         switch (persistence) {
             case 'local':
+                this.persistLocal(setting);
+                break;
             case 'session':
                 this.persistSession(setting);
                 break;
@@ -2162,14 +2166,33 @@ class FilterService {
     }
     get(id) {
         if (this.filterSettings[id]) {
-            return this.filterSettings[id];
+            const setting = this.filterSettings[id];
+            return !setting.ownerHash || this.isSameUser(setting) ? setting : null;
+        }
+        const localSetting = localStorage.getItem(id);
+        if (localSetting) {
+            const setting = JSON.parse(localSetting);
+            if (this.isSameUser(setting)) {
+                // A legacy session entry must not override the restored local filter.
+                sessionStorage.removeItem(id);
+                return setting;
+            }
+            localStorage.removeItem(id);
         }
-        const storedSetting = sessionStorage.getItem(id);
-        if (storedSetting) {
-            return JSON.parse(storedSetting);
+        const sessionSetting = sessionStorage.getItem(id);
+        if (sessionSetting) {
+            return JSON.parse(sessionSetting);
         }
         return null;
     }
+    isSameUser(setting) {
+        const ownerHash = this.getOwnerHash();
+        return !!ownerHash && setting.ownerHash === ownerHash;
+    }
+    getOwnerHash() {
+        const userInfoStr = window.sessionStorage.getItem('userDetails');
+        return userInfoStr ? JSON.parse(userInfoStr).filterOwnerHash : undefined;
+    }
     getStream(id) {
         if (!this.streams[id]) {
             this.streams[id] = new BehaviorSubject(this.get(id));
@@ -2178,6 +2201,7 @@ class FilterService {
     }
     clearSessionAndLocalPersistance(id) {
         sessionStorage.removeItem(id);
+        localStorage.removeItem(id);
         if (this.filterSettings[id] !== undefined) {
             this.filterSettings[id] = null;
         }
@@ -2185,8 +2209,21 @@ class FilterService {
             this.streams[id].next(null);
         }
     }
+    persistLocal(setting) {
+        const ownerHash = this.getOwnerHash();
+        if (!ownerHash) {
+            // Without an owner reference, retain selections only in this session.
+            delete setting.ownerHash;
+            this.persistSession(setting);
+            return;
+        }
+        setting.ownerHash = ownerHash;
+        window.localStorage.setItem(setting.id, JSON.stringify(setting));
+        sessionStorage.removeItem(setting.id);
+    }
     persistSession(setting) {
         sessionStorage.setItem(setting.id, JSON.stringify(setting));
+        localStorage.removeItem(setting.id);
     }
     persistMemory(setting) {
         this.filterSettings[setting.id] = setting;
@@ -4651,7 +4688,6 @@ class GenericFilterComponent {
         if (form.valid) {
             this._settings = {
                 id: this.config.id,
-                idamId: this.filterService.getUserId(),
                 fields: this.getSelectedValues(form.value, this.config)
             };
             this.cdr.markForCheck();