From fc58070b427121f2600a6ff8254d6bf561fbbb3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C5=BEe=20Fortun?= <joze.fortun@gmail.com>
Date: Mon, 13 Nov 2023 15:17:56 +0100
Subject: [PATCH] Fix potential alterations modal loop

---
 .../Admin/Module/DalSchemaAlterations.vue     | 28 +++++++------------
 .../compose/src/views/Admin/Modules/Edit.vue  | 21 ++++++--------
 locale/en/corteza-webapp-compose/module.yaml  |  2 +-
 3 files changed, 19 insertions(+), 32 deletions(-)

diff --git a/client/web/compose/src/components/Admin/Module/DalSchemaAlterations.vue b/client/web/compose/src/components/Admin/Module/DalSchemaAlterations.vue
index 172abc795..e18e9eb02 100644
--- a/client/web/compose/src/components/Admin/Module/DalSchemaAlterations.vue
+++ b/client/web/compose/src/components/Admin/Module/DalSchemaAlterations.vue
@@ -6,8 +6,7 @@
     body-class="p-0 border-top-0 position-relative"
     header-class="p-3 pb-0 border-bottom-0"
     no-fade
-    @hide="$emit('hide')"
-    @change="$emit('change', $event)"
+    v-on="$listeners"
   >
     <b-table-simple
       borderless
@@ -138,11 +137,10 @@
 
     <template #modal-footer>
       <b-button
-        variant="link"
-        size="sm"
+        variant="outline-light"
         :disabled="processing"
-        class="text-decoration-none"
-        @click="$emit('cancel')"
+        class="text-primary border-0"
+        @click="showModal = false"
       >
         {{ canResolveAlterations ? $t('general:label.cancel') : $t('general:label.close') }}
       </b-button>
@@ -151,7 +149,7 @@
         v-if="canResolveAlterations"
         variant="primary"
         :disabled="processing"
-        :borderless="false"
+        size="md"
         @confirmed="onResolve()"
       >
         {{ $t('resolveAuto') }}
@@ -217,17 +215,11 @@ export default {
   },
 
   watch: {
-    modal: {
-      immediate: true,
-      handler (show = false) {
-        this.showModal = show
-      },
-    },
-
     batch: {
-      immediate: true,
       handler (batch) {
-        this.load(batch)
+        if (batch) {
+          this.load(batch)
+        }
       },
     },
   },
@@ -290,8 +282,8 @@ export default {
       return this.$SystemAPI.dalSchemaAlterationList({ batchID }).then(({ set }) => {
         this.alterations = set
 
-        if (!this.alterations.length) {
-          this.$emit('hide')
+        if (this.alterations.length) {
+          this.showModal = true
         }
       }).catch(this.toastErrorHandler(this.$t('notification:module.schemaAlterations.load.error')))
         .finally(() => {
diff --git a/client/web/compose/src/views/Admin/Modules/Edit.vue b/client/web/compose/src/views/Admin/Modules/Edit.vue
index 3cadf6785..2628c78c1 100644
--- a/client/web/compose/src/views/Admin/Modules/Edit.vue
+++ b/client/web/compose/src/views/Admin/Modules/Edit.vue
@@ -417,11 +417,9 @@
       </b-modal>
 
       <dal-schema-alterations
-        :modal="dalSchemaAlterations.modal"
         :batch="dalSchemaAlterations.batchID"
         :module="module"
-        @hide="fetchModuleWithAlterations"
-        @cancel="dalSchemaAlterations.modal = ($event || false)"
+        @hide="onDalAlterationsHide"
       />
 
       <federation-settings
@@ -828,9 +826,9 @@ export default {
       }
     },
 
-    async fetchModuleWithAlterations () {
+    async onDalAlterationsHide () {
       await this.fetchModule(this.moduleID)
-      this.checkAlterations()
+      this.dalSchemaAlterations.batchID = undefined
     },
 
     async fetchModule (moduleID = this.moduleID) {
@@ -881,23 +879,20 @@ export default {
     },
 
     checkAlterations () {
-      if (!this.module) {
+      const { issues = [] } = this.module || {}
+
+      if (!issues.length) {
         return
       }
 
       // Check if module has Alterations to resolve
-      let modal = false
-      let batchID
+      this.dalSchemaAlterations.batchID = undefined
       for (const i of this.module.issues) {
         if (i.meta.batchID) {
-          modal = true
-          batchID = i.meta.batchID
+          this.dalSchemaAlterations.batchID = i.meta.batchID
           break
         }
       }
-
-      this.dalSchemaAlterations.modal = modal
-      this.dalSchemaAlterations.batchID = batchID
     },
 
     handleDelete () {
diff --git a/locale/en/corteza-webapp-compose/module.yaml b/locale/en/corteza-webapp-compose/module.yaml
index 546c3da27..5fb66e4fd 100644
--- a/locale/en/corteza-webapp-compose/module.yaml
+++ b/locale/en/corteza-webapp-compose/module.yaml
@@ -92,7 +92,7 @@ edit:
     resolveAuto: Resolve automatically
     resolved: Resolved
     dismiss: Dismiss
-    waitingFor: Waiting for {{id}}
+    waitingFor: 'Waiting for {{id}}'
     noAlterations: No schema alterations need to be resolved
     params:
       attribute: