fixes #38

laravel-enso · Mar 13, 2018 · 5769158 · 5769158
1 parent 0e83ef2
commit 5769158
Showing 1 changed file with 19 additions and 8 deletions.
diff --git a/src/resources/assets/js/components/enso/vuedatatable/VueTable.vue b/src/resources/assets/js/components/enso/vuedatatable/VueTable.vue
@@ -242,15 +242,26 @@ export default {
         },
         setPreferences() {
             this.setDefaultPreferences();
-
-            if (localStorage.getItem(this.preferencesKey) !== null) {
-                this.setUserPreferences();
-            }
+            this.checkSavedPreferences();
 
             this.$nextTick(() => {
                 this.initialised = true;
             });
         },
+        checkSavedPreferences() {
+            if (localStorage.getItem(this.preferencesKey) === null) {
+                return;
+            }
+
+            const prefs = JSON.parse(localStorage.getItem(this.preferencesKey));
+
+            if (prefs.columns.length !== this.template.columns.length) {
+                localStorage.removeItem(this.preferencesKey);
+                return;
+            }
+
+            this.setUserPreferences(prefs);
+        },
         setDefaultPreferences() {
             this.template.columns.forEach(({ meta }) => {
                 this.$set(meta, 'sort', null);
@@ -259,15 +270,15 @@ export default {
 
             this.$set(this.template, 'sort', false);
         },
-        setUserPreferences() {
-            const prefs = JSON.parse(localStorage.getItem(this.preferencesKey));
-
+        setUserPreferences(prefs) {
             Object.keys(prefs.global).forEach((key) => {
                 this.$set(this, key, prefs.global[key]);
             });
 
             Object.keys(prefs.template).forEach((key) => {
-                this.$set(this.template, key, prefs.template[key]);
+                if (this.template[key] !== undefined) {
+                    this.$set(this.template, key, prefs.template[key]);
+                }
             });
 
             prefs.columns.forEach((column, index) => {