[PLA-1454] [PLA-1479] add revoke confirmation (#60)

enjin · Dec 6, 2023 · 6072db7 · 6072db7
1 parent c50799b
commit 6072db7
Show file tree

Hide file tree

Showing 39 changed files with 76 additions and 50 deletions.
diff --git a/resources/js/components/ConfirmModal.vue b/resources/js/components/ConfirmModal.vue
@@ -1,17 +1,15 @@
 <template>
     <Modal :is-open="isOpen" :close="closeModal">
-        <DialogTitle as="h3" class="text-lg font-medium leading-6 text-gray-900"> Disclaimer </DialogTitle>
+        <DialogTitle as="h3" class="text-lg font-medium leading-6 text-gray-900"> {{ title }} </DialogTitle>
         <div class="mt-2">
             <p class="text-sm text-gray-500">
-                Retries transactions that have failed or otherwise not been included on-chain after some time. Use with
-                caution and ensure the transactions really aren't yet on-chain (or likely to be) to make sure they are
-                not accidentally included twice.
+                {{ description }}
             </p>
         </div>
 
-        <div class="flex space-x-4 mt-4">
+        <div class="flex space-x-4 mt-6">
             <Btn @click="closeModal">Cancel</Btn>
-            <Btn primary @click="confirm">Retry transaction</Btn>
+            <Btn primary @click="confirm">Confirm</Btn>
         </div>
     </Modal>
 </template>
@@ -21,7 +19,7 @@ import { DialogTitle } from '@headlessui/vue';
 import Btn from '~/components/Btn.vue';
 import Modal from '~/components/Modal.vue';
 
-defineProps<{ isOpen: boolean }>();
+defineProps<{ isOpen: boolean; title: string; description: string }>();
 
 const emit = defineEmits(['closed', 'confirm']);
 

diff --git a/resources/js/components/batch/BatchMint.vue b/resources/js/components/batch/BatchMint.vue
@@ -54,7 +54,7 @@
                         >
                             Cancel
                         </RouterLink>
-                        <Btn :loading="isLoading" primary is-submit>Batch Mint</Btn>
+                        <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Batch Mint</Btn>
                     </div>
                 </div>
             </Form>

diff --git a/resources/js/components/batch/BatchSetAttribute.vue b/resources/js/components/batch/BatchSetAttribute.vue
@@ -97,7 +97,7 @@
                     >
                         Cancel
                     </RouterLink>
-                    <Btn :loading="isLoading" primary is-submit>Batch Set Attribute</Btn>
+                    <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Batch Set Attribute</Btn>
                 </div>
             </Form>
         </div>

diff --git a/resources/js/components/batch/BatchTransfer.vue b/resources/js/components/batch/BatchTransfer.vue
@@ -61,7 +61,7 @@
                         >
                             Cancel
                         </RouterLink>
-                        <Btn :loading="isLoading" primary is-submit>Batch Transfer</Btn>
+                        <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Batch Transfer</Btn>
                     </div>
                 </div>
             </Form>

diff --git a/resources/js/components/pages/Settings.vue b/resources/js/components/pages/Settings.vue
@@ -68,7 +68,9 @@
                                         />
                                     </span>
                                 </div>
-                                <Btn :id="`revoke-api-button__${token.name}`" error @click="revokeToken(token.name)">Revoke</Btn>
+                                <Btn :id="`revoke-api-button__${token.name}`" error @click="confirmRevoke(token.name)">
+                                    Revoke
+                                </Btn>
                             </div>
                         </div>
                     </div>
@@ -90,6 +92,13 @@
                 </div>
             </template>
         </div>
+        <ConfirmModal
+            :is-open="confirmModal"
+            title="Revoke API Token"
+            description="Do you want to revoke this API token?"
+            @closed="confirmModal = false"
+            @confirm="revokeToken"
+        />
     </div>
 </template>
 
@@ -105,6 +114,7 @@ import FormInput from '../FormInput.vue';
 import { shortString, snackbarErrors } from '~/util';
 import CopyTextIcon from '../CopyTextIcon.vue';
 import LoadingCircle from '../LoadingCircle.vue';
+import ConfirmModal from '../ConfirmModal.vue';
 
 const router = useRouter();
 const appStore = useAppStore();
@@ -114,6 +124,8 @@ const tokenName = ref();
 const enableTokenCreate = ref(false);
 const loading = ref(appStore.user || !appStore.hasMultiTenantPackage ? false : true);
 const creating = ref(false);
+const confirmModal = ref(false);
+const confirmModalName = ref();
 
 const tokens = computed(() => appStore.user?.apiTokens);
 
@@ -138,17 +150,27 @@ const createApiToken = async () => {
     }
 };
 
-const revokeToken = async (name: string) => {
-    if (!name) return;
+const revokeToken = async () => {
+    if (!confirmModalName.value) return;
+
     try {
-        await appStore.revokeToken(name);
-        snackbar.info({ title: 'Token revoked', text: `Your token ${name} has been revoked.` });
+        await appStore.revokeToken(confirmModalName.value);
+        snackbar.info({ title: 'Token revoked', text: `Your token ${confirmModalName.value} has been revoked.` });
+        confirmModalName.value = null;
     } catch (e: any) {
         if (snackbarErrors(e)) return;
         snackbar.error({ title: 'Token revocation failed' });
+    } finally {
+        confirmModal.value = false;
+        confirmModalName.value = null;
     }
 };
 
+const confirmRevoke = (name: string) => {
+    confirmModal.value = true;
+    confirmModalName.value = name;
+};
+
 const logout = async () => {
     await appStore.logout();
     router.push({ name: 'platform.auth.login' });

diff --git a/resources/js/components/pages/create/CreateBeam.vue b/resources/js/components/pages/create/CreateBeam.vue
@@ -82,7 +82,7 @@
                         >
                             Cancel
                         </RouterLink>
-                        <Btn :loading="isLoading" primary is-submit>Create</Btn>
+                        <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Create</Btn>
                     </div>
                 </div>
             </Form>

diff --git a/resources/js/components/pages/create/CreateCollection.vue b/resources/js/components/pages/create/CreateCollection.vue
@@ -205,7 +205,7 @@
                     >
                         Cancel
                     </RouterLink>
-                    <Btn :loading="isLoading" primary is-submit>Create</Btn>
+                    <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Create</Btn>
                 </div>
             </Form>
         </div>

diff --git a/resources/js/components/pages/create/CreateFuelTank.vue b/resources/js/components/pages/create/CreateFuelTank.vue
@@ -120,7 +120,7 @@
                         >
                             Cancel
                         </RouterLink>
-                        <Btn :loading="isLoading" primary is-submit>Create</Btn>
+                        <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Create</Btn>
                     </div>
                 </div>
 

diff --git a/resources/js/components/pages/create/CreateListing.vue b/resources/js/components/pages/create/CreateListing.vue
@@ -143,7 +143,7 @@
                     >
                         Cancel
                     </RouterLink>
-                    <Btn :loading="isLoading" primary is-submit>Create</Btn>
+                    <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Create</Btn>
                 </div>
             </Form>
         </div>

diff --git a/resources/js/components/pages/create/CreateToken.vue b/resources/js/components/pages/create/CreateToken.vue
@@ -211,7 +211,7 @@
                     >
                         Cancel
                     </RouterLink>
-                    <Btn :loading="isLoading" primary is-submit>Create</Btn>
+                    <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Create</Btn>
                 </div>
             </Form>
         </div>

diff --git a/resources/js/components/slideovers/beam/DeleteBeamSlideover.vue b/resources/js/components/slideovers/beam/DeleteBeamSlideover.vue
@@ -24,7 +24,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Delete</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Delete</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/beam/ExpireBeamSlideover.vue b/resources/js/components/slideovers/beam/ExpireBeamSlideover.vue
@@ -25,7 +25,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Expire</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Expire</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/beam/UpdateBeamSlideover.vue b/resources/js/components/slideovers/beam/UpdateBeamSlideover.vue
@@ -64,7 +64,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Update</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Update</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/collection/ApproveCollectionSlideover.vue b/resources/js/components/slideovers/collection/ApproveCollectionSlideover.vue
@@ -55,7 +55,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Approve</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Approve</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/collection/AttributesCollectionSlideover.vue b/resources/js/components/slideovers/collection/AttributesCollectionSlideover.vue
@@ -82,7 +82,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>
                 {{ attributeActions.find((a) => a.value === attributeAction)?.btnText }}
             </Btn>
         </div>

diff --git a/resources/js/components/slideovers/collection/DestroyCollectionSlideover.vue b/resources/js/components/slideovers/collection/DestroyCollectionSlideover.vue
@@ -41,7 +41,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Destroy</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Destroy</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/collection/MutateCollectionSlideover.vue b/resources/js/components/slideovers/collection/MutateCollectionSlideover.vue
@@ -99,7 +99,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Mutate</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Mutate</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/collection/UnapproveCollectionSlideover.vue b/resources/js/components/slideovers/collection/UnapproveCollectionSlideover.vue
@@ -48,7 +48,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Unapprove</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Unapprove</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/common/FreezeSlideover.vue b/resources/js/components/slideovers/common/FreezeSlideover.vue
@@ -81,7 +81,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Freeze</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Freeze</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/common/RetryTransactionSlideover.vue b/resources/js/components/slideovers/common/RetryTransactionSlideover.vue
@@ -25,10 +25,16 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Retry</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Retry</Btn>
         </div>
     </Form>
-    <ConfirmModal :is-open="modal" @closed="modal = false" @confirm="retryTransaction" />
+    <ConfirmModal
+        :is-open="modal"
+        title="Disclaimer"
+        description="Retries transactions that have failed or otherwise not been included on-chain after some time. Use with caution and ensure the transactions really aren't yet on-chain (or likely to be) to make sure they are not accidentally included twice."
+        @closed="modal = false"
+        @confirm="retryTransaction"
+    />
 </template>
 
 <script setup lang="ts">

diff --git a/resources/js/components/slideovers/common/ThawSlideover.vue b/resources/js/components/slideovers/common/ThawSlideover.vue
@@ -73,7 +73,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Thaw</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Thaw</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/fueltank/AccountsFuelTankSlideover.vue b/resources/js/components/slideovers/fueltank/AccountsFuelTankSlideover.vue
@@ -110,7 +110,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4" v-if="actionType !== 'list'">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>
                 {{ actionType === 'add' ? 'Add' : 'Remove' }}
             </Btn>
         </div>

diff --git a/resources/js/components/slideovers/fueltank/ConsumptionFuelTankSlideover.vue b/resources/js/components/slideovers/fueltank/ConsumptionFuelTankSlideover.vue
@@ -62,7 +62,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Set consumption</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Set consumption</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/fueltank/DestroyFuelTankSlideover.vue b/resources/js/components/slideovers/fueltank/DestroyFuelTankSlideover.vue
@@ -33,7 +33,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Destroy</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Destroy</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/fueltank/DispatchFuelTankSlideover.vue b/resources/js/components/slideovers/fueltank/DispatchFuelTankSlideover.vue
@@ -102,7 +102,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Dispatch</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Dispatch</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/fueltank/FreezeFuelTankSlideover.vue b/resources/js/components/slideovers/fueltank/FreezeFuelTankSlideover.vue
@@ -46,7 +46,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Freeze</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Freeze</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/fueltank/MutateFuelTankSlideover.vue b/resources/js/components/slideovers/fueltank/MutateFuelTankSlideover.vue
@@ -95,7 +95,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Mutate</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Mutate</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/fueltank/RuleSetsFuelTankSlideover.vue b/resources/js/components/slideovers/fueltank/RuleSetsFuelTankSlideover.vue
@@ -68,7 +68,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4" v-if="actionType !== 'list'">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>
                 {{ actionType === 'add' ? 'Add' : 'Remove' }}
             </Btn>
         </div>

diff --git a/resources/js/components/slideovers/marketplace/CancelListingSlideover.vue b/resources/js/components/slideovers/marketplace/CancelListingSlideover.vue
@@ -33,7 +33,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Close</Btn>
-            <Btn :loading="isLoading" primary is-submit>Cancel Listing</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Cancel Listing</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/marketplace/FillListingSlideover.vue b/resources/js/components/slideovers/marketplace/FillListingSlideover.vue
@@ -41,7 +41,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Close</Btn>
-            <Btn :loading="isLoading" primary is-submit>Fill</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Fill</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/marketplace/FinalizeAuctionSlideover.vue b/resources/js/components/slideovers/marketplace/FinalizeAuctionSlideover.vue
@@ -33,7 +33,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Close</Btn>
-            <Btn :loading="isLoading" primary is-submit>Finalize Auction</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Finalize Auction</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/marketplace/PlaceBidSlideover.vue b/resources/js/components/slideovers/marketplace/PlaceBidSlideover.vue
@@ -42,7 +42,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Close</Btn>
-            <Btn :loading="isLoading" primary is-submit>Place Bid</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Place Bid</Btn>
         </div>
     </Form>
 </template>

diff --git a/resources/js/components/slideovers/token/ApproveTokenSlideover.vue b/resources/js/components/slideovers/token/ApproveTokenSlideover.vue
@@ -78,7 +78,7 @@
         </div>
         <div class="flex space-x-3 flex-shrink-0 justify-end px-4 py-4">
             <Btn @click="closeSlide">Cancel</Btn>
-            <Btn :loading="isLoading" primary is-submit>Approve</Btn>
+            <Btn :loading="isLoading" :disabled="isLoading" primary is-submit>Approve</Btn>
         </div>
     </Form>
 </template>