@hmcts/rpx-xui-common-lib 3.2.17-exui-4454-2 → 3.2.17-tar-upscale

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

@@ -2152,6 +2152,8 @@ class FilterService {
     persist(setting, persistence) {
         switch (persistence) {
             case 'local':
+                this.persistLocal(setting);
+                break;
             case 'session':
                 this.persistSession(setting);
                 break;
@@ -2165,12 +2167,23 @@ class FilterService {
         if (this.filterSettings[id]) {
             return this.filterSettings[id];
         }
-        const storedSetting = sessionStorage.getItem(id);
-        if (storedSetting) {
-            return JSON.parse(storedSetting);
+        if (sessionStorage.getItem(id)) {
+            return JSON.parse(sessionStorage.getItem(id));
+        }
+        if (localStorage.getItem(id)) {
+            if (this.isSameUser(id)) {
+                return JSON.parse(window.localStorage.getItem(id));
+            }
+            else {
+                return null;
+            }
         }
         return null;
     }
+    isSameUser(id) {
+        const filterSetting = JSON.parse(window.localStorage.getItem(id));
+        return !!filterSetting.idamId && filterSetting.idamId === this.getUserId();
+    }
     getStream(id) {
         if (!this.streams[id]) {
             this.streams[id] = new BehaviorSubject(this.get(id));
@@ -2179,6 +2192,7 @@ class FilterService {
     }
     clearSessionAndLocalPersistance(id) {
         sessionStorage.removeItem(id);
+        localStorage.removeItem(id);
         if (this.filterSettings[id] !== undefined) {
             this.filterSettings[id] = null;
         }
@@ -2186,6 +2200,10 @@ class FilterService {
             this.streams[id].next(null);
         }
     }
+    persistLocal(setting) {
+        setting.idamId = this.getUserId();
+        window.localStorage.setItem(setting.id, JSON.stringify(setting));
+    }
     persistSession(setting) {
         sessionStorage.setItem(setting.id, JSON.stringify(setting));
     }