Merge branch 'master' into 2222

navikt · Aug 21, 2023 · 0320bf6 · 0320bf6
2 parents ca33611 + 7037469
commit 0320bf6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/force-app/main/freelanceCommunity/lwc/hot_interestedResourcesList/columns.js b/force-app/main/freelanceCommunity/lwc/hot_interestedResourcesList/columns.js
@@ -47,12 +47,6 @@ export let mobileColumns = [
         label: 'Tema',
         name: 'ServiceAppointmentFreelanceSubject__c',
         type: 'String'
-    },
-    {
-        name: 'IsUnreadMessage',
-        label: '',
-        type: 'String',
-        svg: true
     }
 ];
 

diff --git a/...pp/main/freelanceCommunity/lwc/hot_openServiceAppointments/hot_openServiceAppointments.js b/...pp/main/freelanceCommunity/lwc/hot_openServiceAppointments/hot_openServiceAppointments.js
@@ -406,9 +406,11 @@ export default class Hot_openServiceAppointments extends LightningElement {
         let setRecords = event.detail.setRecords;
         this.filters = event.detail.filterArray;
         let filterFromSessionStorage = JSON.parse(sessionStorage.getItem('openSessionFilter'));
-        sessionStorage.setItem('openSessionFilter', JSON.stringify(this.filters));
         let sameValues = true;
-        if (this.filters.length !== filterFromSessionStorage.length) {
+        let sessionUndefined = false;
+        if (filterFromSessionStorage === null || filterFromSessionStorage === undefined) {
+            sessionUndefined = true;
+        } else if (this.filters.length !== filterFromSessionStorage.length && sessionUndefined == false) {
             sameValues = false;
         } else {
             for (let i = 0; i < this.filters.length; i++) {
@@ -418,6 +420,7 @@ export default class Hot_openServiceAppointments extends LightningElement {
                 }
             }
         }
+        sessionStorage.setItem('openSessionFilter', JSON.stringify(this.filters));
         if (sameValues) {
             let filteredRecords = [];
             let records = this.initialServiceAppointments;