From 7b40471f3577e22212103ccc2abb957ef2d5717d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= <joze.fortun@gmail.com>
Date: Wed, 11 Dec 2024 11:42:31 +0100
Subject: [PATCH] Fix module meta admin fields breaking module in edge cases

---
 .../src/components/PageBlocks/RecordListBase.vue   |  4 ++--
 .../PageBlocks/RecordListConfigurator.vue          |  2 +-
 .../src/views/Admin/Modules/Records/List.vue       |  4 ++--
 lib/js/src/compose/types/module.ts                 | 14 +++++++++++---
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/client/web/compose/src/components/PageBlocks/RecordListBase.vue b/client/web/compose/src/components/PageBlocks/RecordListBase.vue
index bdd0ab7ac..32b9ef1d9 100644
--- a/client/web/compose/src/components/PageBlocks/RecordListBase.vue
+++ b/client/web/compose/src/components/PageBlocks/RecordListBase.vue
@@ -106,7 +106,7 @@
             <column-picker
               v-if="!options.hideConfigureFieldsButton"
               :module="recordListModule"
-              :fields="fields"
+              :fields="fields.map(({ moduleField }) => moduleField)"
               @updateFields="onUpdateFields"
             />
           </div>
@@ -1310,7 +1310,7 @@ export default {
 
     onUpdateFields (fields = []) {
       this.options.fields = [...fields]
-      this.customConfiguredFields = fields.map((f) => f.isSystem ? f.name : f.fieldID)
+      this.customConfiguredFields = fields.map((f) => f.isSystem ? f.name : f.fieldID).filter(f => !!f)
       this.setStorageRecordListConfiguredFields()
 
       this.$emit('save-fields', this.options.fields)
diff --git a/client/web/compose/src/components/PageBlocks/RecordListConfigurator.vue b/client/web/compose/src/components/PageBlocks/RecordListConfigurator.vue
index e0430ee80..0a13f502a 100644
--- a/client/web/compose/src/components/PageBlocks/RecordListConfigurator.vue
+++ b/client/web/compose/src/components/PageBlocks/RecordListConfigurator.vue
@@ -1065,7 +1065,7 @@ export default {
 
     onUpdateTextWrapOption (fields = []) {
       if (this.options.textStyles.wrappedFields) {
-        this.options.textStyles.wrappedFields = fields.map(f => f.fieldID)
+        this.options.textStyles.wrappedFields = fields.map(f => f.fieldID && f.fieldID !== NoID ? f.fieldID : f.name).filter(f => !!f)
       }
     },
   },
diff --git a/client/web/compose/src/views/Admin/Modules/Records/List.vue b/client/web/compose/src/views/Admin/Modules/Records/List.vue
index 1f7cd5852..57d65a18e 100644
--- a/client/web/compose/src/views/Admin/Modules/Records/List.vue
+++ b/client/web/compose/src/views/Admin/Modules/Records/List.vue
@@ -44,7 +44,7 @@
 <script>
 
 import { mapGetters, mapActions } from 'vuex'
-import { compose } from '@cortezaproject/corteza-js'
+import { compose, NoID } from '@cortezaproject/corteza-js'
 import RecordListBase from 'corteza-webapp-compose/src/components/PageBlocks/RecordListBase'
 
 export default {
@@ -190,7 +190,7 @@ export default {
     }),
 
     handleFieldsSave (fields = []) {
-      fields = fields.map((f) => f.fieldID)
+      fields = fields.map((f) => f.fieldID && f.fieldID !== NoID ? f.fieldID : f.name).filter(f => !!f)
 
       if (!this.module.meta.ui) {
         this.module.meta.ui = { admin: { fields } }
diff --git a/lib/js/src/compose/types/module.ts b/lib/js/src/compose/types/module.ts
index 633a6170b..ab4fe2e56 100644
--- a/lib/js/src/compose/types/module.ts
+++ b/lib/js/src/compose/types/module.ts
@@ -178,7 +178,14 @@ export class Module {
     },
   }
 
-  public meta: object = {};
+  public meta: Meta = {
+    ui: {
+      admin: {
+        fields: [],
+      },
+    },
+  };
+
   public labels: object = {};
 
   public createdAt?: Date = undefined;
@@ -227,11 +234,12 @@ export class Module {
     if (IsOf(m, 'meta')) {
       if (m.meta.ui && m.meta.ui.admin && m.meta.ui.admin.fields) {
         if (!AreStrings(m.meta.ui.admin.fields)) {
-          m.meta.ui.admin.fields = m.meta.ui.admin.fields.map((f: any) => f.fieldID)
+          const fields = m.meta.ui.admin.fields || []
+          m.meta.ui.admin.fields = fields.map((f: any) => f.fieldID && f.fieldID !== NoID ? f.fieldID : f.name).filter((f: any) => !!f)
         }
       }
 
-      this.meta = { ...m.meta }
+      this.meta = merge({}, this.meta, m.meta)
     }
 
     if (IsOf(m, 'config')) {