From d1aedde472d238cc1f9763caaf6807661f44c1d2 Mon Sep 17 00:00:00 2001
From: renonick87 <renonick87@gmail.com>
Date: Wed, 9 Mar 2022 11:40:11 -0500
Subject: [PATCH] Fix Safari still showing save button for messages and groups
 with an empty name field

---
 src/components/ConsumerMessageDetails.vue | 14 +++++---------
 src/components/FunctionalGroupDetails.vue | 14 +++++---------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/components/ConsumerMessageDetails.vue b/src/components/ConsumerMessageDetails.vue
index 5fd97e96..f3c9d79f 100644
--- a/src/components/ConsumerMessageDetails.vue
+++ b/src/components/ConsumerMessageDetails.vue
@@ -41,7 +41,7 @@
                         </div>
                     </div>
                     <!-- save button -->
-                    <div v-if="!isNameDefined()">
+                    <div v-if="!isNameDefined">
                         <br>
                         <p class="alert color-bg-red color-white d-table" role="alert">
                             The name field must be defined.
@@ -53,7 +53,7 @@
                             type="submit"
                             class="btn btn-card"
                             data-style="zoom-in"
-                            v-if="!fieldsDisabled && isNameDefined()"
+                            v-if="!fieldsDisabled && isNameDefined"
                             v-on:click="saveGroup()"
                             v-bind:loading="save_button_loading"
                             v-bind:class="{ 'btn-style-green': !message.is_deleted, 'btn-danger': message.is_deleted }">
@@ -225,15 +225,11 @@
                     }
                 });
             },
-            "isNameDefined": function () {
-                if (!this.message.message_category) {
-                    return false; //no name defined
-                }
-
-                return true; //no issues
-            },
         },
         computed: {
+            isNameDefined: function () {
+                return !!this.message.message_category;
+            },
             fieldsDisabled: function () {
                 return (this.message.is_deleted || this.environment != 'STAGING');
             },
diff --git a/src/components/FunctionalGroupDetails.vue b/src/components/FunctionalGroupDetails.vue
index 4211efd5..0f86c13e 100644
--- a/src/components/FunctionalGroupDetails.vue
+++ b/src/components/FunctionalGroupDetails.vue
@@ -128,7 +128,7 @@
                     </div>
                     <!-- save button -->
 
-                    <div v-if="!isNameDefined()">
+                    <div v-if="!isNameDefined">
                         <br>
                         <p class="alert color-bg-red color-white d-table" role="alert">
                             The name field must be defined.
@@ -140,7 +140,7 @@
                             type="submit"
                             class="btn btn-card"
                             data-style="zoom-in"
-                            v-if="!fieldsDisabled && isNameDefined()"
+                            v-if="!fieldsDisabled && isNameDefined"
                             v-on:click="saveGroup()"
                             v-bind:loading="save_button_loading"
                             v-bind:class="{ 'btn-style-green': !fg.is_deleted, 'btn-danger': fg.is_deleted }">
@@ -384,15 +384,11 @@ import { eventBus } from '../main.js';
                     }
                 });
             },
-            "isNameDefined": function () {
-                if (!this.fg.name) {
-                    return false; //no name defined
-                }
-
-                return true; //no issues
-            },
         },
         computed: {
+            isNameDefined: function () {
+                return !!this.fg.name;
+            },
             consentPromptOptions: function () {
                 return this.consent_prompts.map(function (consentPrompt) {
                     return consentPrompt.name;