Add CButtonSubmit and apply it to webapps

cortezaproject · Oct 20, 2023 · 0da3ad3 · 0da3ad3
1 parent c36a1e5
commit 0da3ad3
Show file tree

Hide file tree

Showing 71 changed files with 632 additions and 297 deletions.
diff --git a/client/web/admin/src/components/Apigw/CFiltersStepper.vue b/client/web/admin/src/components/Apigw/CFiltersStepper.vue
@@ -53,10 +53,11 @@
           :filters="getSelectedFiltersByStep"
           @addFilter="onAddFilter"
         />
-        <c-submit-button
+        <c-button-submit
+          :disabled="disabled"
           :processing="processing"
           :success="success"
-          :disabled="disabled"
+          :text="$t('admin:general.label.submit')"
           @submit="$emit('submit')"
         />
       </div>
@@ -65,7 +66,6 @@
 </template>
 <script>
 import CFilterModal from 'corteza-webapp-admin/src/components/Apigw/CFilterModal'
-import CSubmitButton from 'corteza-webapp-admin/src/components/CSubmitButton'
 import CFiltersTable from 'corteza-webapp-admin/src/components/Apigw/CFiltersTable'
 import CFiltersDropdown from 'corteza-webapp-admin/src/components/Apigw/CFiltersDropdown'
 
@@ -78,31 +78,36 @@ const mapKindToStep = {
 export default {
   components: {
     CFilterModal,
-    CSubmitButton,
     CFiltersTable,
     CFiltersDropdown,
   },
+
   props: {
     fetching: {
       type: Boolean,
       value: false,
     },
+
     processing: {
       type: Boolean,
       value: false,
     },
+
     success: {
       type: Boolean,
       value: false,
     },
+
     filters: {
       type: Array,
       required: true,
     },
+
     availableFilters: {
       type: Array,
       required: true,
     },
+
     steps: {
       type: Array,
       required: true,

diff --git a/client/web/admin/src/components/Apigw/CRouteEditorInfo.vue b/client/web/admin/src/components/Apigw/CRouteEditorInfo.vue
@@ -139,11 +139,12 @@
     </template>
 
     <template #footer>
-      <c-submit-button
-        class="float-right"
+      <c-button-submit
+        :disabled="saveDisabled"
         :processing="processing"
         :success="success"
-        :disabled="saveDisabled"
+        :text="$t('admin:general.label.submit')"
+        class="float-right"
         @submit="$emit('submit', route)"
       />
 
@@ -161,7 +162,6 @@
 <script>
 import { NoID } from '@cortezaproject/corteza-js'
 import ConfirmationToggle from 'corteza-webapp-admin/src/components/ConfirmationToggle'
-import CSubmitButton from 'corteza-webapp-admin/src/components/CSubmitButton'
 
 export default {
   name: 'CRouteEditorInfo',
@@ -173,7 +173,6 @@ export default {
 
   components: {
     ConfirmationToggle,
-    CSubmitButton,
   },
 
   props: {

diff --git a/client/web/admin/src/components/Apigw/CSettingsEditor.vue b/client/web/admin/src/components/Apigw/CSettingsEditor.vue
@@ -52,18 +52,18 @@
     </b-form-row>
 
     <template #footer>
-      <c-submit-button
-        class="float-right"
+      <c-button-submit
         :processing="processing"
         :success="success"
+        :text="$t('admin:general.label.submit')"
+        class="float-right"
         @submit="$emit('submit', settings)"
       />
     </template>
   </b-card>
 </template>
 
 <script>
-import CSubmitButton from 'corteza-webapp-admin/src/components/CSubmitButton'
 
 export default {
   name: 'CSettingsEditor',
@@ -73,10 +73,6 @@ export default {
     keyPrefix: 'settings',
   },
 
-  components: {
-    CSubmitButton,
-  },
-
   props: {
     settings: {
       type: Object,

diff --git a/client/web/admin/src/components/Application/CApplicationEditorInfo.vue b/client/web/admin/src/components/Application/CApplicationEditorInfo.vue
@@ -103,11 +103,11 @@
     </template>
 
     <template #footer>
-      <c-submit-button
-        class="float-right"
+      <c-button-submit
         :processing="processing"
         :success="success"
-        :disabled="saveDisabled"
+        :text="$t('admin:general.label.submit')"
+        class="float-right"
         @submit="$emit('submit', application)"
       />
 
@@ -125,7 +125,6 @@
 <script>
 import { NoID } from '@cortezaproject/corteza-js'
 import ConfirmationToggle from 'corteza-webapp-admin/src/components/ConfirmationToggle'
-import CSubmitButton from 'corteza-webapp-admin/src/components/CSubmitButton'
 
 export default {
   name: 'CApplicationEditorInfo',
@@ -137,7 +136,6 @@ export default {
 
   components: {
     ConfirmationToggle,
-    CSubmitButton,
   },
 
   props: {

diff --git a/client/web/admin/src/components/Application/CApplicationEditorUnify.vue b/client/web/admin/src/components/Application/CApplicationEditorUnify.vue
@@ -134,12 +134,12 @@
     </template>
 
     <template #footer>
-      <c-submit-button
-        data-test-id="button-submit"
-        class="float-right"
+      <c-button-submit
+        :disabled="disabled"
         :processing="processing"
         :success="success"
-        :disabled="disabled"
+        :text="$t('admin:general.label.submit')"
+        class="float-right"
         @submit="$emit('submit', { unify, unifyAssets })"
       />
     </template>
@@ -148,7 +148,6 @@
 
 <script>
 import { NoID } from '@cortezaproject/corteza-js'
-import CSubmitButton from 'corteza-webapp-admin/src/components/CSubmitButton'
 
 export default {
   name: 'CApplicationEditorUnify',
@@ -158,10 +157,6 @@ export default {
     keyPrefix: 'editor.unify',
   },
 
-  components: {
-    CSubmitButton,
-  },
-
   props: {
     unify: {
       type: Object,

diff --git a/client/web/admin/src/components/Authclient/CAuthclientEditorInfo.vue b/client/web/admin/src/components/Authclient/CAuthclientEditorInfo.vue
@@ -443,11 +443,12 @@ curl -X POST {{ curlURL }} \
     </template>
 
     <template #footer>
-      <c-submit-button
-        class="float-right"
+      <c-button-submit
         :disabled="saveDisabled"
         :processing="processing"
         :success="success"
+        :text="$t('admin:general.label.submit')"
+        class="float-right"
         @submit="submit"
       />
 
@@ -479,7 +480,6 @@ curl -X POST {{ curlURL }} \
 import { NoID } from '@cortezaproject/corteza-js'
 import { handle, components } from '@cortezaproject/corteza-vue'
 import ConfirmationToggle from 'corteza-webapp-admin/src/components/ConfirmationToggle'
-import CSubmitButton from 'corteza-webapp-admin/src/components/CSubmitButton'
 import CRolePicker from 'corteza-webapp-admin/src/components/CRolePicker'
 import CSelectUser from 'corteza-webapp-admin/src/components/Authclient/CSelectUser'
 import copy from 'copy-to-clipboard'
@@ -497,7 +497,6 @@ export default {
 
   components: {
     ConfirmationToggle,
-    CSubmitButton,
     CRolePicker,
     CSelectUser,
     CInputDateTime,

diff --git a/client/web/admin/src/components/CRolePicker.vue b/client/web/admin/src/components/CRolePicker.vue
@@ -48,6 +48,7 @@ import { debounce } from 'lodash'
 import { VueSelect } from 'vue-select'
 import { components } from '@cortezaproject/corteza-vue/'
 const { CInputConfirm } = components
+
 function roleSorter (a, b) {
   return `${a.name} ${a.handle} ${a.roleID}`.localeCompare(`${b.name} ${b.handle} ${b.roleID}`)
 }

diff --git a/client/web/admin/src/components/Federation/CFederationEditorInfo.vue b/client/web/admin/src/components/Federation/CFederationEditorInfo.vue
@@ -133,11 +133,12 @@
     </template>
 
     <template #footer>
-      <c-submit-button
-        class="float-right"
+      <c-button-submit
         :disabled="saveDisabled"
         :processing="processing"
         :success="success"
+        :text="$t('admin:general.label.submit')"
+        class="float-right"
         @submit="$emit('submit', node)"
       />
 
@@ -154,7 +155,6 @@
 <script>
 import { NoID } from '@cortezaproject/corteza-js'
 import ConfirmationToggle from 'corteza-webapp-admin/src/components/ConfirmationToggle'
-import CSubmitButton from 'corteza-webapp-admin/src/components/CSubmitButton'
 
 export default {
   name: 'CFederationEditorInfo',
@@ -166,7 +166,6 @@ export default {
 
   components: {
     ConfirmationToggle,
-    CSubmitButton,
   },
 
   props: {

diff --git a/client/web/admin/src/components/Permissions/CPermissionList.vue b/client/web/admin/src/components/Permissions/CPermissionList.vue
@@ -179,14 +179,13 @@
         v-if="loaded && canGrant"
         #footer
       >
-        <c-submit-button
-          class="float-right"
+        <c-button-submit
           :processing="processing"
           :success="success"
+          :text="$t('ui.save')"
+          class="float-right"
           @submit="onSubmit"
-        >
-          {{ $t('ui.save') }}
-        </c-submit-button>
+        />
       </template>
     </b-card>
 
@@ -262,7 +261,6 @@
 </template>
 
 <script>
-import CSubmitButton from 'corteza-webapp-admin/src/components/CSubmitButton'
 import { VueSelect } from 'vue-select'
 import _ from 'lodash'
 
@@ -272,7 +270,6 @@ export default {
   },
 
   components: {
-    CSubmitButton,
     VueSelect,
   },
 

diff --git a/client/web/admin/src/components/Queues/CQueueEditorInfo.vue b/client/web/admin/src/components/Queues/CQueueEditorInfo.vue
@@ -96,11 +96,12 @@
     </template>
 
     <template #footer>
-      <c-submit-button
-        class="float-right"
+      <c-button-submit
+        :disabled="saveDisabled"
         :processing="processing"
         :success="success"
-        :disabled="saveDisabled"
+        :text="$t('admin:general.label.submit')"
+        class="float-right"
         @submit="$emit('submit', queue)"
       />
 
@@ -119,7 +120,6 @@
 import { NoID } from '@cortezaproject/corteza-js'
 import { handle } from '@cortezaproject/corteza-vue'
 import ConfirmationToggle from 'corteza-webapp-admin/src/components/ConfirmationToggle'
-import CSubmitButton from 'corteza-webapp-admin/src/components/CSubmitButton'
 
 export default {
   name: 'CQueueEditorInfo',
@@ -131,7 +131,6 @@ export default {
 
   components: {
     ConfirmationToggle,
-    CSubmitButton,
   },
 
   props: {

diff --git a/client/web/admin/src/components/Role/CRoleEditorInfo.vue b/client/web/admin/src/components/Role/CRoleEditorInfo.vue
@@ -158,11 +158,12 @@
     </template>
 
     <template #footer>
-      <c-submit-button
-        class="float-right"
+      <c-button-submit
+        :disabled="saveDisabled"
         :processing="processing"
         :success="success"
-        :disabled="saveDisabled"
+        :text="$t('admin:general.label.submit')"
+        class="float-right"
         @submit="submit()"
       />
 
@@ -191,7 +192,6 @@
 import { system, NoID } from '@cortezaproject/corteza-js'
 import { handle } from '@cortezaproject/corteza-vue'
 import ConfirmationToggle from 'corteza-webapp-admin/src/components/ConfirmationToggle'
-import CSubmitButton from 'corteza-webapp-admin/src/components/CSubmitButton'
 
 export default {
   name: 'CRoleEditorInfo',
@@ -203,7 +203,6 @@ export default {
 
   components: {
     ConfirmationToggle,
-    CSubmitButton,
   },
 
   props: {

diff --git a/client/web/admin/src/components/Role/CRoleEditorMembers.vue b/client/web/admin/src/components/Role/CRoleEditorMembers.vue
@@ -55,10 +55,11 @@
     </template>
 
     <template #footer>
-      <c-submit-button
-        class="float-right"
+      <c-button-submit
         :processing="processing"
         :success="success"
+        :text="$t('admin:general.label.submit')"
+        class="float-right"
         @submit="$emit('submit')"
       />
     </template>
@@ -68,7 +69,6 @@
 <script>
 import { debounce } from 'lodash'
 import { VueSelect } from 'vue-select'
-import CSubmitButton from 'corteza-webapp-admin/src/components/CSubmitButton'
 import { components } from '@cortezaproject/corteza-vue/'
 const { CInputConfirm } = components
 
@@ -79,7 +79,6 @@ export default {
   },
 
   components: {
-    CSubmitButton,
     VueSelect,
     CInputConfirm,
   },