Add CButtonSubmit and apply it to webapps

cortezaproject · Oct 5, 2023 · 502e755 · 502e755
1 parent c36a1e5
commit 502e755
Show file tree

Hide file tree

Showing 65 changed files with 755 additions and 291 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,9 +66,10 @@
 </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'
+import { components } from '@cortezaproject/corteza-vue'
+const { CButtonSubmit } = components
 
 const mapKindToStep = {
   prefilter: 0,
@@ -78,31 +80,37 @@ const mapKindToStep = {
 export default {
   components: {
     CFilterModal,
-    CSubmitButton,
+    CButtonSubmit,
     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,8 @@
 <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'
+import { components } from '@cortezaproject/corteza-vue'
+const { CButtonSubmit } = components
 
 export default {
   name: 'CRouteEditorInfo',
@@ -173,7 +175,7 @@ export default {
 
   components: {
     ConfirmationToggle,
-    CSubmitButton,
+    CButtonSubmit,
   },
 
   props: {

diff --git a/client/web/admin/src/components/Apigw/CSettingsEditor.vue b/client/web/admin/src/components/Apigw/CSettingsEditor.vue
@@ -52,18 +52,20 @@
     </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'
+import { components } from '@cortezaproject/corteza-vue'
+const { CButtonSubmit } = components
 
 export default {
   name: 'CSettingsEditor',
@@ -74,7 +76,7 @@ export default {
   },
 
   components: {
-    CSubmitButton,
+    CButtonSubmit,
   },
 
   props: {

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,8 @@
 <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'
+import { components } from '@cortezaproject/corteza-vue'
+const { CButtonSubmit } = components
 
 export default {
   name: 'CApplicationEditorInfo',
@@ -137,7 +138,7 @@ export default {
 
   components: {
     ConfirmationToggle,
-    CSubmitButton,
+    CButtonSubmit,
   },
 
   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,8 @@
 
 <script>
 import { NoID } from '@cortezaproject/corteza-js'
-import CSubmitButton from 'corteza-webapp-admin/src/components/CSubmitButton'
+import { components } from '@cortezaproject/corteza-vue'
+const { CButtonSubmit } = components
 
 export default {
   name: 'CApplicationEditorUnify',
@@ -159,7 +160,7 @@ export default {
   },
 
   components: {
-    CSubmitButton,
+    CButtonSubmit,
   },
 
   props: {

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,13 +480,12 @@ 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'
 import axios from 'axios'
 
-const { CInputDateTime } = components
+const { CInputDateTime, CButtonSubmit } = components
 
 export default {
   name: 'CAuthclientEditorInfo',
@@ -497,7 +497,7 @@ export default {
 
   components: {
     ConfirmationToggle,
-    CSubmitButton,
+    CButtonSubmit,
     CRolePicker,
     CSelectUser,
     CInputDateTime,

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,8 @@
 <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'
+import { components } from '@cortezaproject/corteza-vue'
+const { CButtonSubmit } = components
 
 export default {
   name: 'CFederationEditorInfo',
@@ -166,7 +168,7 @@ export default {
 
   components: {
     ConfirmationToggle,
-    CSubmitButton,
+    CButtonSubmit,
   },
 
   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,17 +261,18 @@
 </template>
 
 <script>
-import CSubmitButton from 'corteza-webapp-admin/src/components/CSubmitButton'
 import { VueSelect } from 'vue-select'
+import { components } from '@cortezaproject/corteza-vue'
 import _ from 'lodash'
+const { CButtonSubmit } = components
 
 export default {
   i18nOptions: {
     namespaces: 'permissions',
   },
 
   components: {
-    CSubmitButton,
+    CButtonSubmit,
     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)"
       />
 
@@ -117,9 +118,9 @@
 
 <script>
 import { NoID } from '@cortezaproject/corteza-js'
-import { handle } from '@cortezaproject/corteza-vue'
+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'
+const { CButtonSubmit } = components
 
 export default {
   name: 'CQueueEditorInfo',
@@ -131,7 +132,7 @@ export default {
 
   components: {
     ConfirmationToggle,
-    CSubmitButton,
+    CButtonSubmit,
   },
 
   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()"
       />
 
@@ -189,9 +190,9 @@
 
 <script>
 import { system, NoID } from '@cortezaproject/corteza-js'
-import { handle } from '@cortezaproject/corteza-vue'
+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'
+const { CButtonSubmit } = components
 
 export default {
   name: 'CRoleEditorInfo',
@@ -203,7 +204,7 @@ export default {
 
   components: {
     ConfirmationToggle,
-    CSubmitButton,
+    CButtonSubmit,
   },
 
   props: {