From 782b722303f034a461653e6ca9e3ce4d79492292 Mon Sep 17 00:00:00 2001
From: jamesgeorge007 <jamesgeorge998001@gmail.com>
Date: Wed, 5 Jun 2024 18:16:00 +0530
Subject: [PATCH] chore: address CR comments

- Grid layout updates improving responsiveness.
- Reply on placeholder for the Label input element in the generate modal instead of a label appearing below.
- Add empty and error states for the access tokens list view.
- Cleanup

Co-authored-by: Nivedin <53208152+nivedin@users.noreply.github.com>
---
 packages/hoppscotch-common/locales/en.json    |  6 ++-
 .../components/accessTokens/GenerateModal.vue | 14 +++----
 .../src/components/accessTokens/List.vue      | 38 ++++++++++++++++---
 .../src/components/accessTokens/index.vue     | 22 ++++++++---
 .../hoppscotch-common/src/pages/profile.vue   |  6 +--
 5 files changed, 60 insertions(+), 26 deletions(-)

diff --git a/packages/hoppscotch-common/locales/en.json b/packages/hoppscotch-common/locales/en.json
index ef00204aed..ce2c5708aa 100644
--- a/packages/hoppscotch-common/locales/en.json
+++ b/packages/hoppscotch-common/locales/en.json
@@ -271,7 +271,8 @@
     "subscription": "Subscriptions are empty",
     "team_name": "Workspace name empty",
     "teams": "You don't belong to any workspaces",
-    "tests": "There are no tests for this request"
+    "tests": "There are no tests for this request",
+    "access_tokens": "Access tokens are empty"
   },
   "environment": {
     "add_to_global": "Add to Global",
@@ -1056,6 +1057,7 @@
     "no_expiration_verbose": "This token will never expire!",
     "token_expires_on": "This token will expire on",
     "generate_new_token": "Generate new token",
-    "generate_modal_title": "New Personal Access Token"
+    "generate_modal_title": "New Personal Access Token",
+    "deletion_success": "The access token {label} has been deleted"
   }
 }
diff --git a/packages/hoppscotch-common/src/components/accessTokens/GenerateModal.vue b/packages/hoppscotch-common/src/components/accessTokens/GenerateModal.vue
index eac7b800f0..b368d75660 100644
--- a/packages/hoppscotch-common/src/components/accessTokens/GenerateModal.vue
+++ b/packages/hoppscotch-common/src/components/accessTokens/GenerateModal.vue
@@ -30,12 +30,8 @@
           </div>
           <HoppSmartInput
             v-model="accessTokenLabel"
-            placeholder=" "
-            class="floating-input"
+            :placeholder="t('access_tokens.token_purpose')"
           />
-          <div class="text-secondaryLight">
-            {{ t("access_tokens.token_purpose") }}
-          </div>
         </div>
 
         <div class="space-y-2">
@@ -48,7 +44,7 @@
               interactive
               trigger="click"
               theme="popover"
-              :on-shown="tippyActions?.focus()"
+              :on-shown="() => tippyActions?.focus()"
             >
               <HoppSmartSelectWrapper>
                 <input
@@ -138,8 +134,8 @@
 import { useI18n } from "@composables/i18n"
 import { useToast } from "@composables/toast"
 import { refAutoReset } from "@vueuse/core"
-import { computed, ref } from "vue"
-import { TippyComponent } from "vue-tippy"
+import { VNodeRef, computed, ref } from "vue"
+
 import { copyToClipboard } from "~/helpers/utils/clipboard"
 import { shortDateTime } from "~/helpers/utils/date"
 
@@ -165,7 +161,7 @@ const emit = defineEmits<{
 }>()
 
 // Template refs
-const tippyActions = ref<TippyComponent[] | null>(null)
+const tippyActions = ref<VNodeRef | null>(null)
 
 const copyIcon = refAutoReset<typeof IconCopy | typeof IconCheck>(
   IconCopy,
diff --git a/packages/hoppscotch-common/src/components/accessTokens/List.vue b/packages/hoppscotch-common/src/components/accessTokens/List.vue
index 1739f6e3c4..eb97c3568f 100644
--- a/packages/hoppscotch-common/src/components/accessTokens/List.vue
+++ b/packages/hoppscotch-common/src/components/accessTokens/List.vue
@@ -1,15 +1,34 @@
 <template>
-  <div class="grid gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
+  <div
+    v-if="hasError && !hasMoreTokens"
+    class="flex flex-col items-center py-4"
+  >
+    <icon-lucide-help-circle class="mb-4 svg-icons" />
+    {{ t("error.something_went_wrong") }}
+  </div>
+
+  <HoppSmartPlaceholder
+    v-else-if="accessTokens.length === 0"
+    :src="`/images/states/${colorMode}/pack.svg`"
+    :alt="`${t('empty.access_tokens')}`"
+    :text="t('empty.access_tokens')"
+    @drop.stop
+  />
+
+  <div
+    v-else
+    class="grid gap-4 p-4 sm:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4"
+  >
     <div
       v-for="{ id, label, lastUsedOn, expiresOn } in accessTokens"
       :key="id"
-      class="flex items-center justify-between p-4 border rounded md:items-baseline md:flex-col md:gap-4 md:justify-normal border-divider"
+      class="flex flex-col items-center gap-4 p-4 border rounded border-divider"
     >
       <div class="w-full text-sm font-semibold truncate text-secondaryDark">
         {{ label }}
       </div>
 
-      <div class="flex items-center gap-x-4">
+      <div class="flex items-center justify-between w-full gap-x-4">
         <div class="space-y-1 text-secondaryLight">
           <div class="space-x-1">
             <span class="font-semibold"
@@ -53,23 +72,32 @@
     v-if="hasMoreTokens"
     @intersecting="emit('fetch-more-tokens')"
   >
-    <div v-if="tokensListLoading" class="flex flex-col items-center py-3">
+    <div v-if="loading" class="flex flex-col items-center py-3">
       <HoppSmartSpinner />
     </div>
+
+    <div v-else-if="hasError" class="flex flex-col items-center py-4">
+      <icon-lucide-help-circle class="mb-4 svg-icons" />
+      {{ t("error.something_went_wrong") }}
+    </div>
   </HoppSmartIntersection>
 </template>
 
 <script setup lang="ts">
 import { useI18n } from "@composables/i18n"
+import { useColorMode } from "@vueuse/core"
+
 import { shortDateTime } from "~/helpers/utils/date"
 import { AccessToken } from "~/pages/profile.vue"
 
+const colorMode = useColorMode()
 const t = useI18n()
 
 defineProps<{
   accessTokens: AccessToken[]
   hasMoreTokens: boolean
-  tokensListLoading: boolean
+  loading: boolean
+  hasError: boolean
 }>()
 
 const emit = defineEmits<{
diff --git a/packages/hoppscotch-common/src/components/accessTokens/index.vue b/packages/hoppscotch-common/src/components/accessTokens/index.vue
index e9e627e37d..1ad91464a8 100644
--- a/packages/hoppscotch-common/src/components/accessTokens/index.vue
+++ b/packages/hoppscotch-common/src/components/accessTokens/index.vue
@@ -5,8 +5,9 @@
 
   <AccessTokensList
     :access-tokens="accessTokens"
+    :has-error="tokensListFetchErrored"
     :has-more-tokens="hasMoreTokens"
-    :tokens-list-loading="tokensListLoading"
+    :loading="tokensListLoading"
     @delete-access-token="displayDeleteAccessTokenConfirmationModal"
     @fetch-more-tokens="fetchAccessTokens"
   />
@@ -26,7 +27,7 @@
       t('confirm.delete_access_token', { tokenLabel: tokenToDelete?.label })
     "
     @hide-modal="confirmDeleteAccessToken = false"
-    @resolve="() => deleteAccessToken()"
+    @resolve="deleteAccessToken"
   />
 </template>
 
@@ -50,10 +51,11 @@ const t = useI18n()
 const toast = useToast()
 
 const confirmDeleteAccessToken = ref(false)
-const hasMoreTokens = ref(true)
+const hasMoreTokens = ref(false)
 const showAccessTokensGenerateModal = ref(false)
 const tokenDeleteActionLoading = ref(false)
 const tokenGenerateActionLoading = ref(false)
+const tokensListFetchErrored = ref(false)
 const tokensListLoading = ref(false)
 
 const accessToken: Ref<string | null> = ref(null)
@@ -90,8 +92,13 @@ const fetchAccessTokens = async () => {
     }
 
     hasMoreTokens.value = data.length === limit
+
+    if (tokensListFetchErrored.value) {
+      tokensListFetchErrored.value = false
+    }
   } catch (err) {
     toast.error(t("error.fetching_access_tokens_list"))
+    tokensListFetchErrored.value = true
   } finally {
     tokensListLoading.value = false
   }
@@ -126,6 +133,7 @@ const generateAccessToken = async ({
     offset += 1
   } catch (err) {
     toast.error(t("error.generate_access_token"))
+    showAccessTokensGenerateModal.value = false
   } finally {
     tokenGenerateActionLoading.value = false
   }
@@ -133,11 +141,11 @@ const generateAccessToken = async ({
 
 const deleteAccessToken = async () => {
   if (tokenToDelete.value === null) {
-    toast.error("error.something_went_wrong")
+    toast.error(t("error.something_went_wrong"))
     return
   }
 
-  const { id: tokenIdToDelete } = tokenToDelete.value
+  const { id: tokenIdToDelete, label: tokenLabelToDelete } = tokenToDelete.value
 
   tokenDeleteActionLoading.value = true
 
@@ -154,6 +162,10 @@ const deleteAccessToken = async () => {
 
     // Decreasing the offset value by 1 to account for the deleted token
     offset = offset > 0 ? offset - 1 : offset
+
+    toast.success(
+      t("access_tokens.deletion_success", { label: tokenLabelToDelete })
+    )
   } catch (err) {
     toast.error(t("error.delete_access_token"))
   } finally {
diff --git a/packages/hoppscotch-common/src/pages/profile.vue b/packages/hoppscotch-common/src/pages/profile.vue
index f30cff6fcb..ead22d39d8 100644
--- a/packages/hoppscotch-common/src/pages/profile.vue
+++ b/packages/hoppscotch-common/src/pages/profile.vue
@@ -185,11 +185,7 @@
               <Teams :modal="false" class="p-4" />
             </HoppSmartTab>
 
-            <HoppSmartTab
-              id="tokens"
-              :label="t('access_tokens.tab_title')"
-              class="space-y-4"
-            >
+            <HoppSmartTab id="tokens" :label="t('access_tokens.tab_title')">
               <AccessTokens />
             </HoppSmartTab>
           </HoppSmartTabs>