fix: set userSettings if does not exist

frappe · Dec 29, 2024 · bd3c685 · bd3c685
1 parent 2ffd729
commit bd3c685
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/frontend/src/components/Controls/Grid.vue b/frontend/src/components/Controls/Grid.vue
@@ -251,7 +251,9 @@ const fields = computed(() => {
     )
     return d
   }
-  return gridFields?.map((f) => getFieldObj(f)) || []
+  return (
+    gridFields?.filter((f) => f.in_list_view).map((f) => getFieldObj(f)) || []
+  )
 })
 
 function getFieldObj(field) {

diff --git a/frontend/src/components/Controls/GridFieldsEditorModal.vue b/frontend/src/components/Controls/GridFieldsEditorModal.vue
@@ -176,7 +176,14 @@ function update() {
   saveUserSettings(props.parentDoctype, 'GridView', updateFields, () => {
     loading.value = false
     show.value = false
-    userSettings[props.parentDoctype]['GridView'][props.doctype] = updateFields
+    if (userSettings[props.parentDoctype]?['GridView']) {
+      userSettings[props.parentDoctype]['GridView'][props.doctype] =
+        updateFields
+    } else {
+      userSettings[props.parentDoctype] = {
+        GridView: { [props.doctype]: updateFields },
+      }
+    }
   })
 }
 

diff --git a/frontend/src/stores/meta.js b/frontend/src/stores/meta.js
@@ -80,7 +80,11 @@ export function getMeta(doctype) {
     let oldUserSettings = userSettings[parentDoctype]
     let newUserSettings = JSON.parse(JSON.stringify(oldUserSettings))
 
-    newUserSettings[key][doctype] = value
+    if (newUserSettings[key] === undefined) {
+      newUserSettings[key] = { [doctype]: value }
+    } else {
+      newUserSettings[key][doctype] = value
+    }
 
     if (JSON.stringify(oldUserSettings) !== JSON.stringify(newUserSettings)) {
       return createResource({