fix: Refactor notExistent variables (#599)

aeternity · Dec 11, 2023 · a115b2d · a115b2d
1 parent 1004010
commit a115b2d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 19 deletions.
diff --git a/src/components/AccountDetailsPanel.vue b/src/components/AccountDetailsPanel.vue
@@ -17,7 +17,7 @@
         class="u-hidden-desktop"/>
     </template>
     <p
-      v-if="accountDetails.notExistent"
+      v-if="accountDetails.isExistent === false"
       class="account-details-panel__not-existent">
       The account has never been seen in the network.
       <br>

diff --git a/src/components/KeyblockDetailsPanel.vue b/src/components/KeyblockDetailsPanel.vue
@@ -4,7 +4,7 @@
       DETAILS
     </template>
     <template #header>
-      <div v-if="!keyblockDetails.notExistent">
+      <div v-if="!!keyblockDetails.isExistent">
         <copy-chip
           :label="keyblockDetails.hash"
           class="u-hidden-mobile"/>
@@ -15,7 +15,7 @@
       </div>
     </template>
     <p
-      v-if="keyblockDetails.notExistent"
+      v-if="keyblockDetails.isExistent === false"
       class="keyblock-details-panel__not-existent">
       Requested keyblock has never been seen in the network.
       <br>
@@ -230,7 +230,7 @@ const isNextKeyblockMined = computed(() =>
   }
 
   &__not-existent {
-    margin: var(--space-3) 0;
+    margin: 0 0 var(--space-3) 0;
   }
 
   &__controls {

diff --git a/src/pages/accounts/[id].vue b/src/pages/accounts/[id].vue
@@ -65,11 +65,11 @@ const { fetchAccount } = accountStore
 const route = useRoute()
 
 const isTabsVisible = computed(() => process.client &&
-    ((accountDetails.value && !accountDetails.value?.notExistent) ||
+    ((accountDetails.value && !!accountDetails.value.isExistent) ||
         !!accountTokens.value?.data.length))
 
 const isTokensTabSelected = computed(() => process.client &&
-    accountDetails.value?.notExistent &&
+    accountDetails.value?.isExistent === false &&
     !!accountTokens.value?.data.length)
 
 const activeTabIndex = computed({

diff --git a/src/pages/keyblocks/[id].vue b/src/pages/keyblocks/[id].vue
@@ -44,22 +44,13 @@ const route = useRoute()
 
 const { isLoading } = useLoading()
 
-const isKeyblockExistent = computed(() => keyblockDetails.value && !keyblockDetails.value.notExistent)
+const isKeyblockExistent = computed(() => keyblockDetails.value && !!keyblockDetails.value.isExistent)
 
-const { error } = await useAsyncData(async() => {
+await useAsyncData(async() => {
   await fetchKeyblock(route.params.id)
   return true
 })
 
-if (error.value) {
-  throw showError({
-    data: {
-      entityId: route.params.id,
-      entityName: 'Keyblock',
-    },
-    statusMessage: 'EntityDetailsNotFound',
-  })
-}
 </script>
 
 <style scoped>

diff --git a/src/stores/accountDetails.js b/src/stores/accountDetails.js
@@ -83,7 +83,7 @@ export const useAccountStore = defineStore('account', () => {
       rawAccountDetails.value = data
     } catch (e) {
       if ([400, 404].includes(e.response.status)) {
-        rawAccountDetails.value = { id: accountId, notExistent: true }
+        rawAccountDetails.value = { id: accountId, isExistent: false }
       }
     }
   }

diff --git a/src/stores/keyblockDetails.js b/src/stores/keyblockDetails.js
@@ -28,7 +28,7 @@ export const useKeyblockDetailsStore = defineStore('keyblockDetails', () => {
       rawKeyblock.value = data
     } catch (error) {
       if (error.response?.status === 404) {
-        rawKeyblock.value = { notExistent: true }
+        rawKeyblock.value = { isExistent: false }
         return
       }
       throw error