From 526db414415c89f9db770df00e0a6394fe10a148 Mon Sep 17 00:00:00 2001
From: Katrin Yordanova <katrin.yordanova@crust.tech>
Date: Thu, 26 Oct 2023 13:09:15 +0300
Subject: [PATCH] Fix CButtonSubmit conflict resolve issues

---
 .../src/components/Application/CApplicationEditorInfo.vue     | 1 +
 client/web/admin/src/components/index.js                      | 4 ++--
 lib/vue/src/components/input/button/CButtonSubmit.vue         | 4 ----
 lib/vue/src/components/permissions/CPermissionsModal.vue      | 4 ++--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/client/web/admin/src/components/Application/CApplicationEditorInfo.vue b/client/web/admin/src/components/Application/CApplicationEditorInfo.vue
index 1100c5840..c2de3ca36 100644
--- a/client/web/admin/src/components/Application/CApplicationEditorInfo.vue
+++ b/client/web/admin/src/components/Application/CApplicationEditorInfo.vue
@@ -109,6 +109,7 @@
 
     <template #footer>
       <c-button-submit
+        :disabled="saveDisabled"
         :processing="processing"
         :success="success"
         :text="$t('admin:general.label.submit')"
diff --git a/client/web/admin/src/components/index.js b/client/web/admin/src/components/index.js
index 276e61658..3a87123af 100644
--- a/client/web/admin/src/components/index.js
+++ b/client/web/admin/src/components/index.js
@@ -24,7 +24,7 @@ import {
   TooltipComponent,
 } from 'echarts/components'
 
-const { CCorredorManualButtons, CPermissionsButton, CInputConfirm } = components
+const { CCorredorManualButtons, CPermissionsButton, CInputConfirm, CButtonSubmit } = components
 
 Vue.use(PortalVue)
 Vue.component('c-corredor-manual-buttons', CCorredorManualButtons)
@@ -33,7 +33,7 @@ Vue.component('font-awesome-icon', FontAwesomeIcon)
 Vue.component('c-content-header', CContentHeader)
 Vue.component('c-resource-list-status-filter', CResourceListStatusFilter)
 Vue.component('c-input-confirm', CInputConfirm)
-Vue.component('c-button-submit', components.CButtonSubmit)
+Vue.component('c-button-submit', CButtonSubmit)
 
 // Map things
 Vue.component('l-map', LMap)
diff --git a/lib/vue/src/components/input/button/CButtonSubmit.vue b/lib/vue/src/components/input/button/CButtonSubmit.vue
index b278cda8f..55d25576b 100644
--- a/lib/vue/src/components/input/button/CButtonSubmit.vue
+++ b/lib/vue/src/components/input/button/CButtonSubmit.vue
@@ -47,10 +47,6 @@
 export default {
   name: 'CButtonSubmit',
 
-  i18nOptions: {
-    namespaces: 'admin',
-  },
-
   props: {
     processing: {
       type: Boolean,
diff --git a/lib/vue/src/components/permissions/CPermissionsModal.vue b/lib/vue/src/components/permissions/CPermissionsModal.vue
index fc80c4837..96e467bfe 100644
--- a/lib/vue/src/components/permissions/CPermissionsModal.vue
+++ b/lib/vue/src/components/permissions/CPermissionsModal.vue
@@ -174,7 +174,7 @@
           data-test-id="button-save"
           :disabled="submitDisabled"
           :processing="processing"
-          :button-text="labels.save"
+          :text="labels.save"
           @submit="onSubmit"
         />
       </template>
@@ -246,7 +246,7 @@
           data-test-id="button-save"
           :disabled="submitDisabled"
           :processing="processing"
-          :button-text="labels.save"
+          :text="labels.save"
           @submit="onSubmit"
         />
       </template>