@hmcts/rpx-xui-common-lib 3.2.22-exui-5389-rc2 → 3.2.23

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

@@ -2150,12 +2150,8 @@ 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;
@@ -2167,33 +2163,14 @@ class FilterService {
     }
     get(id) {
         if (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);
+            return this.filterSettings[id];
         }
-        const sessionSetting = sessionStorage.getItem(id);
-        if (sessionSetting) {
-            return JSON.parse(sessionSetting);
+        const storedSetting = sessionStorage.getItem(id);
+        if (storedSetting) {
+            return JSON.parse(storedSetting);
         }
         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));
@@ -2202,7 +2179,6 @@ class FilterService {
     }
     clearSessionAndLocalPersistance(id) {
         sessionStorage.removeItem(id);
-        localStorage.removeItem(id);
         if (this.filterSettings[id] !== undefined) {
             this.filterSettings[id] = null;
         }
@@ -2210,21 +2186,8 @@ 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;
@@ -4689,6 +4652,7 @@ 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();