From 8809c3b77920eb1352b43197ad282a4f08ff6b12 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Mon, 5 Feb 2024 11:13:53 +0530
Subject: [PATCH 01/60] feat: new mutations for bulk delete, and enabling and
 disabling of the admin status

---
 .../helpers/backend/gql/mutations/MakeUsersAdmin.graphql   | 3 +++
 .../backend/gql/mutations/RemoveUsersAsAdmin.graphql       | 3 +++
 .../backend/gql/mutations/RemoveUsersByAdmin.graphql       | 7 +++++++
 3 files changed, 13 insertions(+)
 create mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/MakeUsersAdmin.graphql
 create mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersAsAdmin.graphql
 create mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersByAdmin.graphql

diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/MakeUsersAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/MakeUsersAdmin.graphql
new file mode 100644
index 0000000000..f936562da1
--- /dev/null
+++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/MakeUsersAdmin.graphql
@@ -0,0 +1,3 @@
+mutation MakeUsersAdmin($userUIDs: [ID!]!) {
+  makeUsersAdmin(userUIDs: $userUIDs)
+}
diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersAsAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersAsAdmin.graphql
new file mode 100644
index 0000000000..a37bafdf80
--- /dev/null
+++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersAsAdmin.graphql
@@ -0,0 +1,3 @@
+mutation RemoveUsersAsAdmin($userUIDs: [ID!]!) {
+  removeUsersAsAdmin(userUIDs: $userUIDs)
+}
diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersByAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersByAdmin.graphql
new file mode 100644
index 0000000000..7933f1a5e8
--- /dev/null
+++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersByAdmin.graphql
@@ -0,0 +1,7 @@
+mutation RemoveUsersByAdmin($userUIDs: [ID!]!) {
+  removeUsersByAdmin(userUIDs: $userUIDs) {
+    userUID
+    success
+    errorMessage
+  }
+}

From 23ceb116b9ece1b0e1f9f93bf49ead80e55fa064 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Mon, 5 Feb 2024 11:16:39 +0530
Subject: [PATCH 02/60] refactor: implemented bulk actions in users page

---
 .../src/pages/users/index.vue                 | 341 ++++++++++++------
 1 file changed, 238 insertions(+), 103 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 30c6c26721..abad9f9d43 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -27,113 +27,140 @@
 
         <div v-else-if="error">{{ t('users.load_list_error') }}</div>
 
-        <HoppSmartTable v-else-if="usersList.length" :list="usersList">
+        <UsersTable
+          v-else-if="usersList.length"
+          :headings="headings"
+          :list="usersList"
+          :checkbox="true"
+          :selectedRows="selectedRows"
+          :search-bar="{ debounce: 300 }"
+          @onRowClicked="goToUserDetails"
+          @onRowToggled="handleToggle"
+          @search="handleInput"
+        >
           <template #head>
-            <tr
-              class="text-secondary border-b border-dividerDark text-sm text-left bg-primaryLight"
-            >
-              <th class="px-6 py-2">{{ t('users.id') }}</th>
-              <th class="px-6 py-2">{{ t('users.name') }}</th>
-              <th class="px-6 py-2">{{ t('users.email') }}</th>
-              <th class="px-6 py-2">{{ t('users.date') }}</th>
-              <!-- Empty header for Action Button -->
-              <th class="px-6 py-2"></th>
-            </tr>
+            <th class="px-6 py-2">{{ t('users.id') }}</th>
+            <th class="px-6 py-2">{{ t('users.name') }}</th>
+            <th class="px-6 py-2">{{ t('users.email') }}</th>
+            <th class="px-6 py-2">{{ t('users.date') }}</th>
+            <!-- Empty header for Action Button -->
+            <th class="px-6 py-2"></th>
           </template>
 
-          <template #body="{ list }">
-            <tr
-              v-for="user in list"
-              :key="user.uid"
-              class="text-secondaryDark hover:bg-divider hover:cursor-pointer rounded-xl"
-              @click="goToUserDetails(user.uid)"
-            >
-              <td class="py-2 px-7 max-w-[8rem] truncate">
-                {{ user.uid }}
-              </td>
-
-              <td class="py-2 px-7">
-                <div class="flex items-center space-x-2">
-                  <span>
-                    {{ user.displayName ?? t('users.unnamed') }}
-                  </span>
-
-                  <span
-                    v-if="user.isAdmin"
-                    class="text-xs font-medium px-3 py-0.5 rounded-full bg-green-900 text-green-300"
-                  >
-                    {{ t('users.admin') }}
-                  </span>
-                </div>
-              </td>
-
-              <td class="py-2 px-7">
-                {{ user.email }}
-              </td>
-
-              <td class="py-2 px-7">
-                {{ getCreatedDate(user.createdOn) }}
-                <div class="text-gray-400 text-tiny">
-                  {{ getCreatedTime(user.createdOn) }}
-                </div>
-              </td>
-
-              <td @click.stop>
-                <div class="relative">
-                  <tippy interactive trigger="click" theme="popover">
-                    <HoppButtonSecondary
-                      v-tippy="{ theme: 'tooltip' }"
-                      :icon="IconMoreHorizontal"
-                    />
-                    <template #content="{ hide }">
-                      <div
-                        ref="tippyActions"
-                        class="flex flex-col focus:outline-none"
-                        tabindex="0"
-                        @keyup.escape="hide()"
-                      >
-                        <HoppSmartItem
-                          :icon="user.isAdmin ? IconUserMinus : IconUserCheck"
-                          :label="
+          <template #body="{ row: user }">
+            <td class="py-2 px-7 max-w-[8rem] truncate">
+              {{ user.uid }}
+            </td>
+
+            <td class="py-2 px-7">
+              <div class="flex items-center space-x-2">
+                <span>
+                  {{ user.displayName ?? t('users.unnamed') }}
+                </span>
+
+                <span
+                  v-if="user.isAdmin"
+                  class="text-xs font-medium px-3 py-0.5 rounded-full bg-green-900 text-green-300"
+                >
+                  {{ t('users.admin') }}
+                </span>
+              </div>
+            </td>
+
+            <td class="py-2 px-7">
+              {{ user.email }}
+            </td>
+
+            <td class="py-2 px-7">
+              {{ getCreatedDate(user.createdOn) }}
+              <div class="text-gray-400 text-tiny">
+                {{ getCreatedTime(user.createdOn) }}
+              </div>
+            </td>
+
+            <td @click.stop>
+              <div class="relative">
+                <tippy interactive trigger="click" theme="popover">
+                  <HoppButtonSecondary
+                    v-tippy="{ theme: 'tooltip' }"
+                    :icon="IconMoreHorizontal"
+                  />
+                  <template #content="{ hide }">
+                    <div
+                      ref="tippyActions"
+                      class="flex flex-col focus:outline-none"
+                      tabindex="0"
+                      @keyup.escape="hide()"
+                    >
+                      <HoppSmartItem
+                        :icon="user.isAdmin ? IconUserMinus : IconUserCheck"
+                        :label="
+                          user.isAdmin
+                            ? t('users.remove_admin_status')
+                            : t('users.make_admin')
+                        "
+                        class="!hover:bg-emerald-600"
+                        @click="
+                          () => {
                             user.isAdmin
-                              ? t('users.remove_admin_status')
-                              : t('users.make_admin')
-                          "
-                          class="!hover:bg-emerald-600"
-                          @click="
-                            () => {
-                              user.isAdmin
-                                ? makeAdminToUser(user.uid)
-                                : makeUserAdmin(user.uid);
-                              hide();
-                            }
-                          "
-                        />
-                        <HoppSmartItem
-                          v-if="!user.isAdmin"
-                          :icon="IconTrash"
-                          :label="t('users.delete_user')"
-                          class="!hover:bg-red-600"
-                          @click="
-                            () => {
-                              deleteUser(user.uid);
-                              hide();
-                            }
-                          "
-                        />
-                      </div>
-                    </template>
-                  </tippy>
-                </div>
-              </td>
-            </tr>
+                              ? makeAdminToUser(user.uid)
+                              : makeUserAdmin(user.uid);
+                            hide();
+                          }
+                        "
+                      />
+                      <HoppSmartItem
+                        v-if="!user.isAdmin"
+                        :icon="IconTrash"
+                        :label="t('users.delete_user')"
+                        class="!hover:bg-red-600"
+                        @click="
+                          () => {
+                            deleteUser(user.uid);
+                            hide();
+                          }
+                        "
+                      />
+                    </div>
+                  </template>
+                </tippy>
+              </div>
+            </td>
           </template>
-        </HoppSmartTable>
+        </UsersTable>
 
         <div v-else-if="usersList.length === 0" class="flex justify-center">
           {{ t('users.no_users') }}
         </div>
 
+        <div
+          v-if="selectedRows.length"
+          class="fixed m-2 bottom-0 left-32 right-0 w-min mx-auto"
+        >
+          <div
+            class="flex justify-center items-end bg-primaryLight border border-divider rounded-md mb-5"
+          >
+            <HoppButtonSecondary
+              :icon="IconUserCheck"
+              label="Make Admin"
+              class="py-4 border-divider border-r-1 hover:bg-emerald-500"
+              @click="confirmUsersToAdmin = true"
+            />
+            <HoppButtonSecondary
+              :icon="IconUserMinus"
+              label="Remove Admin"
+              class="py-4 border-divider border-r-1 hover:bg-orange-400"
+              @click="confirmAdminsToUsers = true"
+            />
+            <HoppButtonSecondary
+              :icon="IconTrash"
+              label="Delete User"
+              class="py-4 border-divider hover:bg-red-500"
+              @click="confirmUsersDeletion = true"
+            />
+          </div>
+        </div>
+
         <div
           v-if="hasNextPage && usersList.length >= usersPerPage"
           class="flex justify-center my-5 px-3 py-2 cursor-pointer font-semibold rounded-3xl bg-dividerDark hover:bg-divider transition mx-auto w-38 text-secondaryDark"
@@ -168,6 +195,24 @@
       @hide-modal="confirmAdminToUser = false"
       @resolve="makeAdminToUserMutation(adminToUserUID)"
     />
+    <HoppSmartConfirmModal
+      :show="confirmUsersToAdmin"
+      :title="t('users.confirm_user_to_admin')"
+      @hide-modal="confirmUsersToAdmin = false"
+      @resolve="makeUsersToAdmin"
+    />
+    <HoppSmartConfirmModal
+      :show="confirmAdminsToUsers"
+      :title="t('users.confirm_admin_to_user')"
+      @hide-modal="confirmAdminsToUsers = false"
+      @resolve="makeAdminsToUsers"
+    />
+    <HoppSmartConfirmModal
+      :show="confirmUsersDeletion"
+      :title="t('users.confirm_user_deletion')"
+      @hide-modal="confirmUsersDeletion = false"
+      @resolve="deleteUsers"
+    />
   </div>
 </template>
 
@@ -187,9 +232,14 @@ import IconAddUser from '~icons/lucide/user-plus';
 import {
   InviteNewUserDocument,
   MakeUserAdminDocument,
+  MakeUsersAdminDocument,
   RemoveUserAsAdminDocument,
+  RemoveUsersAsAdminDocument,
   RemoveUserByAdminDocument,
+  RemoveUsersByAdminDocument,
   UsersListDocument,
+  UsersListQuery,
+  UserInfoQuery,
 } from '~/helpers/backend/graphql';
 
 // Get Proper Date Formats
@@ -199,6 +249,14 @@ const toast = useToast();
 const getCreatedDate = (date: string) => format(new Date(date), 'dd-MM-yyyy');
 const getCreatedTime = (date: string) => format(new Date(date), 'hh:mm a');
 
+// Table Headings
+const headings = [
+  { key: 'uid', label: t('users.id') },
+  { key: 'displayName', label: t('users.name') },
+  { key: 'email', label: t('users.email') },
+  { key: 'createdOn', label: t('users.date') },
+];
+
 // Get Paginated Results of all the users in the infra
 const usersPerPage = 20;
 const {
@@ -236,13 +294,19 @@ const sendInvite = async (email: string) => {
 
 // Go to Individual User Details Page
 const router = useRouter();
-const goToUserDetails = (uid: string) => router.push('/users/' + uid);
+const goToUserDetails = (user: UserInfoQuery['infra']['userInfo']) =>
+  router.push('/users/' + user.uid);
 
 // User Deletion
 const userDeletion = useMutation(RemoveUserByAdminDocument);
 const confirmDeletion = ref(false);
 const deleteUserUID = ref<string | null>(null);
 
+const deleteUser = (id: string) => {
+  confirmDeletion.value = true;
+  deleteUserUID.value = id;
+};
+
 const deleteUserMutation = async (id: string | null) => {
   if (!id) {
     confirmDeletion.value = false;
@@ -302,11 +366,6 @@ const makeAdminToUser = (id: string) => {
   adminToUserUID.value = id;
 };
 
-const deleteUser = (id: string) => {
-  confirmDeletion.value = true;
-  deleteUserUID.value = id;
-};
-
 const makeAdminToUserMutation = async (id: string | null) => {
   if (!id) {
     confirmAdminToUser.value = false;
@@ -327,4 +386,80 @@ const makeAdminToUserMutation = async (id: string | null) => {
   confirmAdminToUser.value = false;
   adminToUserUID.value = null;
 };
+
+const selectedRows = ref<UsersListQuery['infra']['allUsers']>([]);
+
+const usersToAdmin = useMutation(MakeUsersAdminDocument);
+const confirmUsersToAdmin = ref(false);
+
+const makeUsersToAdmin = async () => {
+  const userUIDs = selectedRows.value.map((user) => user.uid);
+  console.log(userUIDs);
+
+  const variables = { userUIDs };
+  const result = await usersToAdmin.executeMutation(variables);
+  if (result.error) {
+    toast.error(t('state.admin_failure'));
+  } else {
+    toast.success(t('state.admin_success'));
+    usersList.value = usersList.value.map((user) => ({
+      ...user,
+      isAdmin: userUIDs.includes(user.uid) ? true : user.isAdmin,
+    }));
+    selectedRows.value = [];
+  }
+  confirmUsersToAdmin.value = false;
+};
+
+const adminsToUser = useMutation(RemoveUsersAsAdminDocument);
+const confirmAdminsToUsers = ref(false);
+
+const makeAdminsToUsers = async () => {
+  const userUIDs = selectedRows.value.map((user) => user.uid);
+  console.log(userUIDs);
+
+  const variables = { userUIDs };
+  const result = await adminsToUser.executeMutation(variables);
+  if (result.error) {
+    toast.error(t('state.remove_admin_failure'));
+  } else {
+    toast.success(t('state.remove_admin_success'));
+    usersList.value = usersList.value.map((user) => ({
+      ...user,
+      isAdmin: userUIDs.includes(user.uid) ? false : user.isAdmin,
+    }));
+    selectedRows.value = [];
+  }
+  confirmAdminsToUsers.value = false;
+};
+
+const usersDeletion = useMutation(RemoveUsersByAdminDocument);
+const confirmUsersDeletion = ref(false);
+
+const deleteUsers = async () => {
+  const userUIDs = selectedRows.value.map((user) => user.uid);
+  console.log(userUIDs);
+
+  const variables = { userUIDs };
+  const result = await usersDeletion.executeMutation(variables);
+  if (result.error) {
+    toast.error(t('state.delete_user_failure'));
+  } else {
+    toast.success(t('state.delete_user_success'));
+    usersList.value = usersList.value.filter(
+      (user) => !userUIDs.includes(user.uid)
+    );
+    selectedRows.value = [];
+  }
+  confirmUsersDeletion.value = false;
+};
+
+const handleToggle = (selected: UsersListQuery['infra']['allUsers']) => {
+  selectedRows.value = selected;
+  console.log(selectedRows.value);
+};
+
+const handleInput = (input) => {
+  console.log(input);
+};
 </script>

From 0083cb767264d1e70fcf64999313b2629e6c52e8 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Mon, 5 Feb 2024 13:06:15 +0530
Subject: [PATCH 03/60] refactor: updated index component to support selected
 rows as a useVmodel

---
 .../src/pages/users/index.vue                 | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index abad9f9d43..c496c96e31 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -32,10 +32,9 @@
           :headings="headings"
           :list="usersList"
           :checkbox="true"
-          :selectedRows="selectedRows"
+          :selected-rows="selectedRows"
           :search-bar="{ debounce: 300 }"
           @onRowClicked="goToUserDetails"
-          @onRowToggled="handleToggle"
           @search="handleInput"
         >
           <template #head>
@@ -394,7 +393,8 @@ const confirmUsersToAdmin = ref(false);
 
 const makeUsersToAdmin = async () => {
   const userUIDs = selectedRows.value.map((user) => user.uid);
-  console.log(userUIDs);
+
+  console.log(selectedRows.value);
 
   const variables = { userUIDs };
   const result = await usersToAdmin.executeMutation(variables);
@@ -406,7 +406,9 @@ const makeUsersToAdmin = async () => {
       ...user,
       isAdmin: userUIDs.includes(user.uid) ? true : user.isAdmin,
     }));
-    selectedRows.value = [];
+    console.log(selectedRows.value);
+
+    selectedRows.value.splice(0, selectedRows.value.length);
   }
   confirmUsersToAdmin.value = false;
 };
@@ -416,7 +418,6 @@ const confirmAdminsToUsers = ref(false);
 
 const makeAdminsToUsers = async () => {
   const userUIDs = selectedRows.value.map((user) => user.uid);
-  console.log(userUIDs);
 
   const variables = { userUIDs };
   const result = await adminsToUser.executeMutation(variables);
@@ -428,7 +429,8 @@ const makeAdminsToUsers = async () => {
       ...user,
       isAdmin: userUIDs.includes(user.uid) ? false : user.isAdmin,
     }));
-    selectedRows.value = [];
+
+    selectedRows.value.splice(0, selectedRows.value.length);
   }
   confirmAdminsToUsers.value = false;
 };
@@ -438,7 +440,6 @@ const confirmUsersDeletion = ref(false);
 
 const deleteUsers = async () => {
   const userUIDs = selectedRows.value.map((user) => user.uid);
-  console.log(userUIDs);
 
   const variables = { userUIDs };
   const result = await usersDeletion.executeMutation(variables);
@@ -449,16 +450,12 @@ const deleteUsers = async () => {
     usersList.value = usersList.value.filter(
       (user) => !userUIDs.includes(user.uid)
     );
-    selectedRows.value = [];
+
+    selectedRows.value.splice(0, selectedRows.value.length);
   }
   confirmUsersDeletion.value = false;
 };
 
-const handleToggle = (selected: UsersListQuery['infra']['allUsers']) => {
-  selectedRows.value = selected;
-  console.log(selectedRows.value);
-};
-
 const handleInput = (input) => {
   console.log(input);
 };

From 50f488828aeb43e18ada5bb04ee5c4092252d51d Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Mon, 5 Feb 2024 19:33:40 +0530
Subject: [PATCH 04/60] feat: new users list mutation

---
 .../helpers/backend/gql/queries/UsersListV2.graphql  | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/queries/UsersListV2.graphql

diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/queries/UsersListV2.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/queries/UsersListV2.graphql
new file mode 100644
index 0000000000..f4313fea41
--- /dev/null
+++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/queries/UsersListV2.graphql
@@ -0,0 +1,12 @@
+query UsersListV2($searchString: String, $skip: Int, $take: Int) {
+  infra {
+    allUsersV2(searchString: $searchString, skip: $skip, take: $take) {
+      uid
+      displayName
+      email
+      isAdmin
+      photoURL
+      createdOn
+    }
+  }
+}

From fdeb4b1a1cda57f1fb8c4e7b50ee6760574f5962 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Mon, 5 Feb 2024 20:46:20 +0530
Subject: [PATCH 05/60] refactor: updated index to support new search operation
 in users table

---
 .../src/pages/users/index.vue                 | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index c496c96e31..d85e86ac84 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -28,12 +28,12 @@
         <div v-else-if="error">{{ t('users.load_list_error') }}</div>
 
         <UsersTable
-          v-else-if="usersList.length"
+          v-if="usersList.length >= 0"
           :headings="headings"
           :list="usersList"
           :checkbox="true"
           :selected-rows="selectedRows"
-          :search-bar="{ debounce: 300 }"
+          :search-bar="{ debounce: 500 }"
           @onRowClicked="goToUserDetails"
           @search="handleInput"
         >
@@ -128,9 +128,9 @@
           </template>
         </UsersTable>
 
-        <div v-else-if="usersList.length === 0" class="flex justify-center">
+        <!-- <div v-else-if="usersList.length === 0" class="flex justify-center">
           {{ t('users.no_users') }}
-        </div>
+        </div> -->
 
         <div
           v-if="selectedRows.length"
@@ -139,22 +139,26 @@
           <div
             class="flex justify-center items-end bg-primaryLight border border-divider rounded-md mb-5"
           >
+            <HoppButtonSecondary
+              :label="`${selectedRows.length} selected`"
+              class="py-4 border-divider rounded-r-none bg-yellow-700 text-secondaryDark"
+            />
             <HoppButtonSecondary
               :icon="IconUserCheck"
               label="Make Admin"
-              class="py-4 border-divider border-r-1 hover:bg-emerald-500"
+              class="py-4 border-divider border-r-1 rounded-none hover:bg-emerald-500"
               @click="confirmUsersToAdmin = true"
             />
             <HoppButtonSecondary
               :icon="IconUserMinus"
               label="Remove Admin"
-              class="py-4 border-divider border-r-1 hover:bg-orange-400"
+              class="py-4 border-divider border-r-1 rounded-none hover:bg-orange-400"
               @click="confirmAdminsToUsers = true"
             />
             <HoppButtonSecondary
               :icon="IconTrash"
               label="Delete User"
-              class="py-4 border-divider hover:bg-red-500"
+              class="py-4 border-divider rounded-l-none hover:bg-red-500"
               @click="confirmUsersDeletion = true"
             />
           </div>
@@ -236,7 +240,7 @@ import {
   RemoveUsersAsAdminDocument,
   RemoveUserByAdminDocument,
   RemoveUsersByAdminDocument,
-  UsersListDocument,
+  UsersListV2Document,
   UsersListQuery,
   UserInfoQuery,
 } from '~/helpers/backend/graphql';
@@ -256,22 +260,31 @@ const headings = [
   { key: 'createdOn', label: t('users.date') },
 ];
 
+const searchQuery = ref('');
+
 // Get Paginated Results of all the users in the infra
 const usersPerPage = 20;
 const {
   fetching,
   error,
   goToNextPage: fetchNextUsers,
+  refetch,
   list: usersList,
   hasNextPage,
 } = usePagedQuery(
-  UsersListDocument,
-  (x) => x.infra.allUsers,
-  (x) => x.uid,
+  UsersListV2Document,
+  (x) => x.infra.allUsersV2,
   usersPerPage,
-  { cursor: undefined, take: usersPerPage }
+  { searchString: searchQuery.value, take: usersPerPage, skip: 0 }
 );
 
+const handleInput = async (input: string) => {
+  searchQuery.value = input;
+  await refetch(searchQuery.value);
+};
+
+const selectedRows = ref<UsersListQuery['infra']['allUsers']>([]);
+
 // Send Invitation through Email
 const sendInvitation = useMutation(InviteNewUserDocument);
 const showInviteUserModal = ref(false);
@@ -386,8 +399,6 @@ const makeAdminToUserMutation = async (id: string | null) => {
   adminToUserUID.value = null;
 };
 
-const selectedRows = ref<UsersListQuery['infra']['allUsers']>([]);
-
 const usersToAdmin = useMutation(MakeUsersAdminDocument);
 const confirmUsersToAdmin = ref(false);
 
@@ -455,8 +466,4 @@ const deleteUsers = async () => {
   }
   confirmUsersDeletion.value = false;
 };
-
-const handleInput = (input) => {
-  console.log(input);
-};
 </script>

From 9702b2e5aec6a5b3f7ed9fbafc24c87e7e1ce91a Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Tue, 6 Feb 2024 11:42:56 +0530
Subject: [PATCH 06/60] feat: new pagination system implemented in users table

---
 .../src/pages/users/index.vue                 | 64 ++++++++++++-------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index d85e86ac84..1d3dbff21b 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -5,7 +5,7 @@
       <h1 class="text-lg font-bold text-secondaryDark">
         {{ t('users.users') }}
       </h1>
-      <div class="flex items-center space-x-4 py-10">
+      <div class="flex items-center space-x-4 mt-10 mb-5">
         <HoppButtonPrimary
           :label="t('users.invite_user')"
           @click="showInviteUserModal = true"
@@ -33,9 +33,14 @@
           :list="usersList"
           :checkbox="true"
           :selected-rows="selectedRows"
-          :search-bar="{ debounce: 500 }"
+          :search-bar="{
+            debounce: 500,
+            placeholder: 'Search by name or email..',
+          }"
+          :pagination="{ totalPages: totalPages }"
           @onRowClicked="goToUserDetails"
           @search="handleInput"
+          @pageNumber="handlePageChange"
         >
           <template #head>
             <th class="px-6 py-2">{{ t('users.id') }}</th>
@@ -128,10 +133,6 @@
           </template>
         </UsersTable>
 
-        <!-- <div v-else-if="usersList.length === 0" class="flex justify-center">
-          {{ t('users.no_users') }}
-        </div> -->
-
         <div
           v-if="selectedRows.length"
           class="fixed m-2 bottom-0 left-32 right-0 w-min mx-auto"
@@ -163,15 +164,6 @@
             />
           </div>
         </div>
-
-        <div
-          v-if="hasNextPage && usersList.length >= usersPerPage"
-          class="flex justify-center my-5 px-3 py-2 cursor-pointer font-semibold rounded-3xl bg-dividerDark hover:bg-divider transition mx-auto w-38 text-secondaryDark"
-          @click="fetchNextUsers"
-        >
-          <span>{{ t('users.show_more') }}</span>
-          <icon-lucide-chevron-down class="ml-2 text-lg" />
-        </div>
       </div>
     </div>
 
@@ -222,8 +214,9 @@
 <script setup lang="ts">
 import { useMutation } from '@urql/vue';
 import { format } from 'date-fns';
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { useRouter } from 'vue-router';
+import { useQuery } from '@urql/vue';
 import { useI18n } from '~/composables/i18n';
 import { useToast } from '~/composables/toast';
 import { usePagedQuery } from '~/composables/usePagedQuery';
@@ -236,6 +229,7 @@ import {
   InviteNewUserDocument,
   MakeUserAdminDocument,
   MakeUsersAdminDocument,
+  MetricsDocument,
   RemoveUserAsAdminDocument,
   RemoveUsersAsAdminDocument,
   RemoveUserByAdminDocument,
@@ -260,30 +254,52 @@ const headings = [
   { key: 'createdOn', label: t('users.date') },
 ];
 
-const searchQuery = ref('');
-
 // Get Paginated Results of all the users in the infra
-const usersPerPage = 20;
+const usersPerPage = 3;
 const {
   fetching,
   error,
-  goToNextPage: fetchNextUsers,
   refetch,
   list: usersList,
-  hasNextPage,
 } = usePagedQuery(
   UsersListV2Document,
   (x) => x.infra.allUsersV2,
   usersPerPage,
-  { searchString: searchQuery.value, take: usersPerPage, skip: 0 }
+  { searchString: '', take: usersPerPage, skip: 0 }
 );
 
+const selectedRows = ref<UsersListQuery['infra']['allUsers']>([]);
+
+// Search
+const searchQuery = ref('');
 const handleInput = async (input: string) => {
   searchQuery.value = input;
-  await refetch(searchQuery.value);
+  await refetch({ searchString: input, take: usersPerPage, skip: 0 });
 };
 
-const selectedRows = ref<UsersListQuery['infra']['allUsers']>([]);
+// Pagination
+const { data } = useQuery({ query: MetricsDocument });
+const usersCount = computed(() => data?.value?.infra.usersCount);
+
+const totalPages = computed(() => {
+  if (!usersCount.value) return 0;
+  if (searchQuery.value.length > 0) {
+    return usersList.value.length;
+  }
+  return Math.ceil(usersCount.value / usersPerPage);
+});
+
+const handlePageChange = async (page: number) => {
+  if (page < 1 || page > totalPages.value) {
+    return;
+  } else {
+    await refetch({
+      searchString: searchQuery.value,
+      take: usersPerPage,
+      skip: (page - 1) * usersPerPage,
+    });
+  }
+};
 
 // Send Invitation through Email
 const sendInvitation = useMutation(InviteNewUserDocument);

From f66c78f0c9e35dd39bcffca1b5d053f4c02694c3 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Tue, 6 Feb 2024 20:50:22 +0530
Subject: [PATCH 07/60] feat: ability to revoke user invitations

---
 .../RevokeUserInvitationByAdmin.graphql       |  3 +
 .../src/pages/users/invited.vue               | 89 ++++++++++++++++---
 2 files changed, 81 insertions(+), 11 deletions(-)
 create mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RevokeUserInvitationByAdmin.graphql

diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RevokeUserInvitationByAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RevokeUserInvitationByAdmin.graphql
new file mode 100644
index 0000000000..2a16e9978d
--- /dev/null
+++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RevokeUserInvitationByAdmin.graphql
@@ -0,0 +1,3 @@
+mutation RevokeUserInvitationByAdmin($inviteeEmail: ID!) {
+  revokeUserInvitationByAdmin(inviteeEmail: $inviteeEmail)
+}
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
index a8e861d27e..5840fc18f7 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
@@ -6,12 +6,13 @@
       </button>
     </div>
 
-    <h3 class="text-lg font-bold text-accentContrast py-6">
-      {{ t('users.invited_users') }}
+    <h3 class="text-lg font-bold text-accentContrast pt-6 pb-4">
+      <!-- {{ t('users.invited_users') }} -->
+      Pending Invites
     </h3>
 
     <div class="flex flex-col">
-      <div class="py-2 overflow-x-auto">
+      <div class="relative py-2 overflow-x-auto">
         <div v-if="fetching" class="flex justify-center">
           <HoppSmartSpinner />
         </div>
@@ -20,10 +21,10 @@
           {{ t('users.invite_load_list_error') }}
         </div>
 
-        <HoppSmartTable
-          v-else-if="invitedUsers?.length"
-          :list="invitedUsers"
+        <UsersTable
+          v-if="invitedUsers?.length"
           :headings="headings"
+          :list="invitedUsers"
         >
           <template #invitedOn="{ item }">
             <div v-if="item" class="pr-2 truncate">
@@ -37,23 +38,46 @@
             </div>
             <span v-else> - </span>
           </template>
-        </HoppSmartTable>
+          <template #action="{ item }">
+            <div v-if="item" class="my-1">
+              <HoppButtonPrimary
+                :icon="IconTrash"
+                label="Revoke Invitation"
+                class="bg-red-500 hover:bg-red-600"
+                @click="deleteInvite(item.inviteeEmail)"
+              />
+            </div>
+          </template>
+        </UsersTable>
 
         <div v-else class="text-lg">{{ t('users.no_invite') }}</div>
       </div>
     </div>
+    <HoppSmartConfirmModal
+      :show="confirmDeletion"
+      :title="t('state.confirm_delete_invites')"
+      @hide-modal="confirmDeletion = false"
+      @resolve="deleteUserInvitation(inviteToBeDeleted)"
+    />
   </div>
 </template>
 
 <script setup lang="ts">
-import { useQuery } from '@urql/vue';
+import { computed, ref } from 'vue';
+import { useQuery, useMutation } from '@urql/vue';
+import {
+  InvitedUsersDocument,
+  RevokeUserInvitationByAdminDocument,
+} from '../../helpers/backend/graphql';
 import { format } from 'date-fns';
-import { computed } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from '~/composables/i18n';
-import { InvitedUsersDocument } from '~/helpers/backend/graphql';
+import IconTrash from '~icons/lucide/trash';
+import { useToast } from '~/composables/toast';
+import { HoppButtonPrimary } from '@hoppscotch/ui';
 
 const t = useI18n();
+const toast = useToast();
 const router = useRouter();
 
 // Get Proper Date Formats
@@ -62,7 +86,7 @@ const getCreatedTime = (date: string) => format(new Date(date), 'hh:mm a');
 
 // Get Invited Users
 const { fetching, error, data } = useQuery({ query: InvitedUsersDocument });
-const invitedUsers = computed(() => data?.value?.infra.invitedUsers);
+// const invitedUsers = computed(() => data?.value?.infra.invitedUsers);
 
 // Table Headings
 const headings = [
@@ -70,5 +94,48 @@ const headings = [
   { key: 'adminEmail', label: t('users.admin_email') },
   { key: 'inviteeEmail', label: t('users.invitee_email') },
   { key: 'invitedOn', label: t('users.invited_on') },
+  { key: 'action', label: 'Action' },
 ];
+
+// Invited Users
+const invitedUsers = computed({
+  get: () => data.value?.infra.invitedUsers,
+  set: (value) => {
+    if (!value) return;
+    data.value!.infra.invitedUsers = value;
+  },
+});
+
+// Delete Invite
+const confirmDeletion = ref(false);
+const inviteToBeDeleted = ref<string | null>(null);
+const deleteInvitationMutation = useMutation(
+  RevokeUserInvitationByAdminDocument
+);
+
+const deleteInvite = (inviteeEmail: string) => {
+  confirmDeletion.value = true;
+  inviteToBeDeleted.value = inviteeEmail;
+};
+
+const deleteUserInvitation = async (inviteeEmail: string | null) => {
+  if (!inviteeEmail) {
+    confirmDeletion.value = false;
+    toast.error(t('state.delete_invites_failure'));
+    return;
+  }
+  const variables = { inviteeEmail };
+  const result = await deleteInvitationMutation.executeMutation(variables);
+  if (result.error) {
+    toast.error(t('state.delete_invites_failure'));
+  } else {
+    invitedUsers.value = invitedUsers.value?.filter(
+      (request) => request.inviteeEmail !== inviteeEmail
+    );
+    toast.success(t('state.delete_invites_success'));
+  }
+
+  confirmDeletion.value = false;
+  inviteToBeDeleted.value = null;
+};
 </script>

From 7021feb55299e981697d6e047693553c68b1ffb2 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Tue, 6 Feb 2024 20:51:39 +0530
Subject: [PATCH 08/60] style: ui fixes in users page

---
 .../hoppscotch-sh-admin/src/components.d.ts   | 91 ++++++++++---------
 .../src/pages/teams/index.vue                 |  8 +-
 .../src/pages/users/index.vue                 | 21 +++--
 3 files changed, 66 insertions(+), 54 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/components.d.ts b/packages/hoppscotch-sh-admin/src/components.d.ts
index 671efba5f9..e1ab284047 100644
--- a/packages/hoppscotch-sh-admin/src/components.d.ts
+++ b/packages/hoppscotch-sh-admin/src/components.d.ts
@@ -1,53 +1,56 @@
 // generated by unplugin-vue-components
 // We suggest you to commit this file into source control
 // Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core'
+import '@vue/runtime-core';
 
-export {}
+export {};
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AppHeader: typeof import('./components/app/Header.vue')['default']
-    AppLogin: typeof import('./components/app/Login.vue')['default']
-    AppLogout: typeof import('./components/app/Logout.vue')['default']
-    AppModal: typeof import('./components/app/Modal.vue')['default']
-    AppSidebar: typeof import('./components/app/Sidebar.vue')['default']
-    AppToast: typeof import('./components/app/Toast.vue')['default']
-    DashboardMetricsCard: typeof import('./components/dashboard/MetricsCard.vue')['default']
-    HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary']
-    HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary']
-    HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor']
-    HoppSmartAutoComplete: typeof import('@hoppscotch/ui')['HoppSmartAutoComplete']
-    HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal']
-    HoppSmartInput: typeof import('@hoppscotch/ui')['HoppSmartInput']
-    HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem']
-    HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink']
-    HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal']
-    HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture']
-    HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner']
-    HoppSmartTab: typeof import('@hoppscotch/ui')['HoppSmartTab']
-    HoppSmartTable: typeof import('@hoppscotch/ui')['HoppSmartTable']
-    HoppSmartTabs: typeof import('@hoppscotch/ui')['HoppSmartTabs']
-    HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle']
-    IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
-    IconLucideInbox: typeof import('~icons/lucide/inbox')['default']
-    SettingsAuthProvider: typeof import('./components/settings/AuthProvider.vue')['default']
-    SettingsConfigurations: typeof import('./components/settings/Configurations.vue')['default']
-    SettingsDataSharing: typeof import('./components/settings/DataSharing.vue')['default']
-    SettingsReset: typeof import('./components/settings/Reset.vue')['default']
-    SettingsServerRestart: typeof import('./components/settings/ServerRestart.vue')['default']
-    SettingsSmtpConfiguration: typeof import('./components/settings/SmtpConfiguration.vue')['default']
-    SetupDataSharingAndNewsletter: typeof import('./components/setup/DataSharingAndNewsletter.vue')['default']
-    TeamsAdd: typeof import('./components/teams/Add.vue')['default']
-    TeamsDetails: typeof import('./components/teams/Details.vue')['default']
-    TeamsInvite: typeof import('./components/teams/Invite.vue')['default']
-    TeamsMembers: typeof import('./components/teams/Members.vue')['default']
-    TeamsPendingInvites: typeof import('./components/teams/PendingInvites.vue')['default']
-    Tippy: typeof import('vue-tippy')['Tippy']
-    UiAutoResetIcon: typeof import('./components/ui/AutoResetIcon.vue')['default']
-    UsersDetails: typeof import('./components/users/Details.vue')['default']
-    UsersInviteModal: typeof import('./components/users/InviteModal.vue')['default']
-    UsersSharedRequests: typeof import('./components/users/SharedRequests.vue')['default']
+    AppHeader: typeof import('./components/app/Header.vue')['default'];
+    AppLogin: typeof import('./components/app/Login.vue')['default'];
+    AppLogout: typeof import('./components/app/Logout.vue')['default'];
+    AppModal: typeof import('./components/app/Modal.vue')['default'];
+    AppSidebar: typeof import('./components/app/Sidebar.vue')['default'];
+    AppToast: typeof import('./components/app/Toast.vue')['default'];
+    DashboardMetricsCard: typeof import('./components/dashboard/MetricsCard.vue')['default'];
+    HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary'];
+    HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary'];
+    HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor'];
+    HoppSmartAutoComplete: typeof import('@hoppscotch/ui')['HoppSmartAutoComplete'];
+    HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal'];
+    HoppSmartInput: typeof import('@hoppscotch/ui')['HoppSmartInput'];
+    HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem'];
+    HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink'];
+    HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal'];
+    HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture'];
+    HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner'];
+    HoppSmartTab: typeof import('@hoppscotch/ui')['HoppSmartTab'];
+    HoppSmartTable: typeof import('@hoppscotch/ui')['HoppSmartTable'];
+    HoppSmartTabs: typeof import('@hoppscotch/ui')['HoppSmartTabs'];
+    HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle'];
+    IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default'];
+    IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default'];
+    IconLucideInbox: typeof import('~icons/lucide/inbox')['default'];
+    IconLucideSearch: typeof import('~icons/lucide/search')['default'];
+    IconLucideUser: typeof import('~icons/lucide/user')['default'];
+    SettingsAuthProvider: typeof import('./components/settings/AuthProvider.vue')['default'];
+    SettingsConfigurations: typeof import('./components/settings/Configurations.vue')['default'];
+    SettingsDataSharing: typeof import('./components/settings/DataSharing.vue')['default'];
+    SettingsReset: typeof import('./components/settings/Reset.vue')['default'];
+    SettingsServerRestart: typeof import('./components/settings/ServerRestart.vue')['default'];
+    SettingsSmtpConfiguration: typeof import('./components/settings/SmtpConfiguration.vue')['default'];
+    SetupDataSharingAndNewsletter: typeof import('./components/setup/DataSharingAndNewsletter.vue')['default'];
+    TeamsAdd: typeof import('./components/teams/Add.vue')['default'];
+    TeamsDetails: typeof import('./components/teams/Details.vue')['default'];
+    TeamsInvite: typeof import('./components/teams/Invite.vue')['default'];
+    TeamsMembers: typeof import('./components/teams/Members.vue')['default'];
+    TeamsPendingInvites: typeof import('./components/teams/PendingInvites.vue')['default'];
+    Tippy: typeof import('vue-tippy')['Tippy'];
+    UiAutoResetIcon: typeof import('./components/ui/AutoResetIcon.vue')['default'];
+    UsersDetails: typeof import('./components/users/Details.vue')['default'];
+    UsersInviteModal: typeof import('./components/users/InviteModal.vue')['default'];
+    UsersSharedRequests: typeof import('./components/users/SharedRequests.vue')['default'];
+    UsersTable: typeof import('./components/users/Table.vue')['default'];
   }
-
 }
diff --git a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
index 6543d6c134..12b988ef35 100644
--- a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
@@ -149,9 +149,9 @@ const usersPerPage = computed(() => data.value?.infra.usersCount || 10000);
 const { list: usersList } = usePagedQuery(
   UsersListDocument,
   (x) => x.infra.allUsers,
-  (x) => x.uid,
   usersPerPage.value,
-  { cursor: undefined, take: usersPerPage.value }
+  { cursor: undefined, take: usersPerPage.value },
+  (x) => x.uid
 );
 
 const allUsersEmail = computed(() => usersList.value.map((user) => user.email));
@@ -168,9 +168,9 @@ const {
 } = usePagedQuery(
   TeamListDocument,
   (x) => x.infra.allTeams,
-  (x) => x.id,
   teamsPerPage,
-  { cursor: undefined, take: teamsPerPage }
+  { cursor: undefined, take: teamsPerPage },
+  (x) => x.id
 );
 
 // Create Team
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 1d3dbff21b..e53ad19b67 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -15,20 +15,20 @@
           <HoppButtonSecondary
             outline
             filled
-            :label="t('users.invited_users')"
+            label="Pending Invites"
             :to="'/users/invited'"
           />
         </div>
       </div>
       <div class="overflow-x-auto">
-        <div v-if="fetching" class="flex justify-center">
+        <div v-if="fetching" class="w-5 h-5 text-center mx-auto">
           <HoppSmartSpinner />
         </div>
 
         <div v-else-if="error">{{ t('users.load_list_error') }}</div>
 
         <UsersTable
-          v-if="usersList.length >= 0"
+          v-else-if="usersList.length > 0"
           :headings="headings"
           :list="usersList"
           :checkbox="true"
@@ -41,6 +41,7 @@
           @onRowClicked="goToUserDetails"
           @search="handleInput"
           @pageNumber="handlePageChange"
+          class="w-full h-full"
         >
           <template #head>
             <th class="px-6 py-2">{{ t('users.id') }}</th>
@@ -133,6 +134,13 @@
           </template>
         </UsersTable>
 
+        <!-- <div
+          v-if="usersList.length === 0"
+          class="w-full border-x-2 border-b-2 border-divider text-center p-3 rounded-b-md"
+        >
+          No users found...
+        </div> -->
+
         <div
           v-if="selectedRows.length"
           class="fixed m-2 bottom-0 left-32 right-0 w-min mx-auto"
@@ -147,13 +155,13 @@
             <HoppButtonSecondary
               :icon="IconUserCheck"
               label="Make Admin"
-              class="py-4 border-divider border-r-1 rounded-none hover:bg-emerald-500"
+              class="py-4 border-divider border-r-1 rounded-none hover:bg-emerald-600"
               @click="confirmUsersToAdmin = true"
             />
             <HoppButtonSecondary
               :icon="IconUserMinus"
               label="Remove Admin"
-              class="py-4 border-divider border-r-1 rounded-none hover:bg-orange-400"
+              class="py-4 border-divider border-r-1 rounded-none hover:bg-yellow-600"
               @click="confirmAdminsToUsers = true"
             />
             <HoppButtonSecondary
@@ -255,7 +263,7 @@ const headings = [
 ];
 
 // Get Paginated Results of all the users in the infra
-const usersPerPage = 3;
+const usersPerPage = 2;
 const {
   fetching,
   error,
@@ -271,6 +279,7 @@ const {
 const selectedRows = ref<UsersListQuery['infra']['allUsers']>([]);
 
 // Search
+
 const searchQuery = ref('');
 const handleInput = async (input: string) => {
   searchQuery.value = input;

From 94d77a18ca724895de7bbe8e0374088852d449e6 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 8 Feb 2024 12:06:25 +0530
Subject: [PATCH 09/60] chore: updated debounce value for users table

---
 .../src/pages/users/index.vue                  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index e53ad19b67..f468c0e059 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -21,20 +21,20 @@
         </div>
       </div>
       <div class="overflow-x-auto">
-        <div v-if="fetching" class="w-5 h-5 text-center mx-auto">
+        <!-- <div v-if="fetching" class="w-5 h-5 text-center mx-auto">
           <HoppSmartSpinner />
-        </div>
+        </div> -->
 
-        <div v-else-if="error">{{ t('users.load_list_error') }}</div>
+        <!-- <div v-else-if="error">{{ t('users.load_list_error') }}</div> -->
 
         <UsersTable
-          v-else-if="usersList.length > 0"
+          v-if="usersList.length >= 0"
           :headings="headings"
           :list="usersList"
           :checkbox="true"
           :selected-rows="selectedRows"
           :search-bar="{
-            debounce: 500,
+            debounce: 1000,
             placeholder: 'Search by name or email..',
           }"
           :pagination="{ totalPages: totalPages }"
@@ -135,7 +135,7 @@
         </UsersTable>
 
         <!-- <div
-          v-if="usersList.length === 0"
+          v-if="fetchQuery"
           class="w-full border-x-2 border-b-2 border-divider text-center p-3 rounded-b-md"
         >
           No users found...
@@ -143,14 +143,14 @@
 
         <div
           v-if="selectedRows.length"
-          class="fixed m-2 bottom-0 left-32 right-0 w-min mx-auto"
+          class="fixed m-2 bottom-0 left-32 right-0 w-min mx-auto shadow-2xl"
         >
           <div
             class="flex justify-center items-end bg-primaryLight border border-divider rounded-md mb-5"
           >
             <HoppButtonSecondary
               :label="`${selectedRows.length} selected`"
-              class="py-4 border-divider rounded-r-none bg-yellow-700 text-secondaryDark"
+              class="py-4 border-divider rounded-r-none bg-emerald-800 text-secondaryDark"
             />
             <HoppButtonSecondary
               :icon="IconUserCheck"
@@ -161,7 +161,7 @@
             <HoppButtonSecondary
               :icon="IconUserMinus"
               label="Remove Admin"
-              class="py-4 border-divider border-r-1 rounded-none hover:bg-yellow-600"
+              class="py-4 border-divider border-r-1 rounded-none hover:bg-orange-500"
               @click="confirmAdminsToUsers = true"
             />
             <HoppButtonSecondary

From f107c186c3a5e04f0eba9c29698816222521104c Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 8 Feb 2024 17:32:12 +0530
Subject: [PATCH 10/60] feat: new error messages in dashboard

---
 packages/hoppscotch-sh-admin/src/helpers/errors.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/hoppscotch-sh-admin/src/helpers/errors.ts b/packages/hoppscotch-sh-admin/src/helpers/errors.ts
index 5473ec5282..4ff2d11fe1 100644
--- a/packages/hoppscotch-sh-admin/src/helpers/errors.ts
+++ b/packages/hoppscotch-sh-admin/src/helpers/errors.ts
@@ -7,3 +7,10 @@ export const UNAUTHORIZED = 'Unauthorized' as const;
 
 // Sometimes the backend returns Unauthorized error message as follows:
 export const GRAPHQL_UNAUTHORIZED = '[GraphQL] Unauthorized' as const;
+
+export const DELETE_USER_FAILED_ONLY_ONE_ADMIN =
+  'admin/only_one_admin_account_found' as const;
+
+// When trying to invite a user that is already invited
+export const USER_ALREADY_INVITED =
+  '[GraphQL] admin/user_already_invited' as const;

From 799c80a3b80659391af811b3b118028dda54fb64 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 8 Feb 2024 17:42:48 +0530
Subject: [PATCH 11/60] refactor: new i18n strings for different new aspects in
 users module

---
 packages/hoppscotch-sh-admin/locales/en.json  | 28 ++++--
 .../src/pages/users/index.vue                 | 85 ++++++++++---------
 .../src/pages/users/invited.vue               |  6 +-
 3 files changed, 68 insertions(+), 51 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/locales/en.json b/packages/hoppscotch-sh-admin/locales/en.json
index a9f2bdfeb4..cfaf128889 100644
--- a/packages/hoppscotch-sh-admin/locales/en.json
+++ b/packages/hoppscotch-sh-admin/locales/en.json
@@ -107,7 +107,14 @@
     "admin_success": "User is now an admin!!",
     "and": "and",
     "configure_auth": "Check out the documentation to configure auth providers.",
+    "confirm_admin_to_user": "Do you want to remove admin status from this user?",
+    "confirm_admins_to_users": "Do you want to remove admin status from selected users?",
+    "confirm_user_deletion": "Confirm user deletion?",
+    "confirm_users_deletion": "Do you want to delete selected users?",
+    "confirm_user_to_admin": "Do you want to make this user into an admin?",
+    "confirm_users_to_admin": "Do you want to make selected users into admins?",
     "confirm_logout": "Confirm Logout",
+    "created_on": "Created On",
     "continue_email": "Continue with Email",
     "continue_github": "Continue with Github",
     "continue_google": "Continue with Google",
@@ -120,8 +127,11 @@
     "delete_request_success": "Shared Request deleted successfully!!",
     "delete_team_failure": "Workspace deletion failed!!",
     "delete_team_success": "Workspace deleted successfully!!",
+    "delete_user_failed_only_one_admin": "Failed to delete user. There should be atleast one admin!!",
     "delete_user_failure": "User deletion failed!!",
+    "delete_users_failure": "Failed to delete selected users!!",
     "delete_user_success": "User deleted successfully!!",
+    "delete_users_success": "Selected users deleted successfully!!",
     "email": "Email",
     "email_failure": "Failed to send invitation",
     "email_signin_failure": "Failed to login with Email",
@@ -146,6 +156,8 @@
     "reenter_email": "Re-enter email",
     "remove_admin_failure": "Failed to remove admin status!!",
     "remove_admin_success": "Admin status removed!!",
+    "remove_admin_from_users_failure": "Failed to remove admin status from selected users!!",
+    "remove_admin_from_users_success": "Admin status removed from selected users!!",
     "remove_admin_to_delete_user": "Remove admin privilege to delete the user!!",
     "remove_invitee_failure": "Removal of invitee failed!!",
     "remove_invitee_success": "Removal of invitee is successfull!!",
@@ -156,6 +168,7 @@
     "require_auth_provider": "You need to set atleast one authentication provider to log in.",
     "role_update_failed": "Roles updation has failed!!",
     "role_update_success": "Roles updated successfully!!",
+    "selected": "{count} selected",
     "self_host_docs": "Self Host Documentation",
     "send_magic_link": "Send magic link",
     "setup_failure": "Setup has failed!!",
@@ -164,7 +177,11 @@
     "sign_in_options": "All sign in option",
     "sign_out": "Sign out",
     "team_name_too_short": "Workspace name should be atleast 6 characters long!!",
-    "user_not_found": "User not found in the infra!!"
+    "team_name_long": "Workspace name should be atleast 6 characters long!!",
+    "user_already_invited": "Failed to send invite. User is already invited!!",
+    "user_not_found": "User not found in the infra!!",
+    "users_to_admin_success": "Selected users are elevated to admin status!!",
+    "users_to_admin_failure": "Failed to elevate selected users to admin status!!"
   },
   "teams": {
     "add_member": "Add Member",
@@ -226,13 +243,10 @@
     "admin": "Admin",
     "admin_email": "Admin Email",
     "admin_id": "Admin ID",
-    "confirm_admin_to_user": "Do you want to remove admin status from this user?",
-    "confirm_user_deletion": "Confirm user deletion?",
-    "confirm_user_to_admin": "Do you want to make this user into an admin?",
-    "created_on": "Created On",
     "date": "Date",
     "delete": "Delete",
     "delete_user": "Delete User",
+    "delete_users": "Delete Users",
     "details": "Details",
     "email": "Email",
     "email_address": "Email Address",
@@ -245,14 +259,16 @@
     "invitee_email": "Invitee Email",
     "load_info_error": "Unable to load user info",
     "load_list_error": "Unable to Load Users List",
-    "make_admin": "Make admin",
+    "make_admin": "Make Admin",
     "name": "Name",
     "no_invite": "No invited users found",
     "no_shared_requests": "No shared requests created by the user",
     "no_users": "No users found",
     "not_found": "User not found",
+    "pending_invites": "Pending Invites",
     "remove_admin_privilege": "Remove Admin Privilege",
     "remove_admin_status": "Remove Admin Status",
+    "searchbar_placeholder": "Search by name or email..",
     "send_invite": "Send Invite",
     "show_more": "Show more",
     "uid": "UID",
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index f468c0e059..c5f9859afa 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -15,17 +15,13 @@
           <HoppButtonSecondary
             outline
             filled
-            label="Pending Invites"
+            :label="t('users.pending_invites')"
             :to="'/users/invited'"
           />
         </div>
       </div>
       <div class="overflow-x-auto">
-        <!-- <div v-if="fetching" class="w-5 h-5 text-center mx-auto">
-          <HoppSmartSpinner />
-        </div> -->
-
-        <!-- <div v-else-if="error">{{ t('users.load_list_error') }}</div> -->
+        <div v-if="error">{{ t('users.load_list_error') }}</div>
 
         <UsersTable
           v-if="usersList.length >= 0"
@@ -35,7 +31,7 @@
           :selected-rows="selectedRows"
           :search-bar="{
             debounce: 1000,
-            placeholder: 'Search by name or email..',
+            placeholder: t('users.searchbar_placeholder'),
           }"
           :pagination="{ totalPages: totalPages }"
           @onRowClicked="goToUserDetails"
@@ -149,24 +145,24 @@
             class="flex justify-center items-end bg-primaryLight border border-divider rounded-md mb-5"
           >
             <HoppButtonSecondary
-              :label="`${selectedRows.length} selected`"
+              :label="t('state.selected', { count: selectedRows.length })"
               class="py-4 border-divider rounded-r-none bg-emerald-800 text-secondaryDark"
             />
             <HoppButtonSecondary
               :icon="IconUserCheck"
-              label="Make Admin"
+              :label="t('users.make_admin')"
               class="py-4 border-divider border-r-1 rounded-none hover:bg-emerald-600"
               @click="confirmUsersToAdmin = true"
             />
             <HoppButtonSecondary
               :icon="IconUserMinus"
-              label="Remove Admin"
+              :label="t('users.remove_admin_status')"
               class="py-4 border-divider border-r-1 rounded-none hover:bg-orange-500"
               @click="confirmAdminsToUsers = true"
             />
             <HoppButtonSecondary
               :icon="IconTrash"
-              label="Delete User"
+              :label="t('users.delete_users')"
               class="py-4 border-divider rounded-l-none hover:bg-red-500"
               @click="confirmUsersDeletion = true"
             />
@@ -182,37 +178,37 @@
     />
     <HoppSmartConfirmModal
       :show="confirmDeletion"
-      :title="t('users.confirm_user_deletion')"
+      :title="t('state.confirm_user_deletion')"
       @hide-modal="confirmDeletion = false"
       @resolve="deleteUserMutation(deleteUserUID)"
     />
     <HoppSmartConfirmModal
       :show="confirmUserToAdmin"
-      :title="t('users.confirm_user_to_admin')"
+      :title="t('state.confirm_user_to_admin')"
       @hide-modal="confirmUserToAdmin = false"
       @resolve="makeUserAdminMutation(userToAdminUID)"
     />
     <HoppSmartConfirmModal
       :show="confirmAdminToUser"
-      :title="t('users.confirm_admin_to_user')"
+      :title="t('state.confirm_admin_to_user')"
       @hide-modal="confirmAdminToUser = false"
       @resolve="makeAdminToUserMutation(adminToUserUID)"
     />
     <HoppSmartConfirmModal
       :show="confirmUsersToAdmin"
-      :title="t('users.confirm_user_to_admin')"
+      :title="t('state.confirm_users_to_admin')"
       @hide-modal="confirmUsersToAdmin = false"
       @resolve="makeUsersToAdmin"
     />
     <HoppSmartConfirmModal
       :show="confirmAdminsToUsers"
-      :title="t('users.confirm_admin_to_user')"
+      :title="t('state.confirm_admins_to_users')"
       @hide-modal="confirmAdminsToUsers = false"
       @resolve="makeAdminsToUsers"
     />
     <HoppSmartConfirmModal
       :show="confirmUsersDeletion"
-      :title="t('users.confirm_user_deletion')"
+      :title="t('state.confirm_users_deletion')"
       @hide-modal="confirmUsersDeletion = false"
       @resolve="deleteUsers"
     />
@@ -220,32 +216,35 @@
 </template>
 
 <script setup lang="ts">
-import { useMutation } from '@urql/vue';
+import { useMutation, useQuery } from '@urql/vue';
 import { format } from 'date-fns';
-import { ref, computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useRouter } from 'vue-router';
-import { useQuery } from '@urql/vue';
 import { useI18n } from '~/composables/i18n';
 import { useToast } from '~/composables/toast';
 import { usePagedQuery } from '~/composables/usePagedQuery';
-import IconMoreHorizontal from '~icons/lucide/more-horizontal';
-import IconTrash from '~icons/lucide/trash';
-import IconUserCheck from '~icons/lucide/user-check';
-import IconUserMinus from '~icons/lucide/user-minus';
-import IconAddUser from '~icons/lucide/user-plus';
 import {
   InviteNewUserDocument,
   MakeUserAdminDocument,
   MakeUsersAdminDocument,
   MetricsDocument,
   RemoveUserAsAdminDocument,
-  RemoveUsersAsAdminDocument,
   RemoveUserByAdminDocument,
+  RemoveUsersAsAdminDocument,
   RemoveUsersByAdminDocument,
-  UsersListV2Document,
-  UsersListQuery,
   UserInfoQuery,
+  UsersListQuery,
+  UsersListV2Document,
 } from '~/helpers/backend/graphql';
+import {
+  DELETE_USER_FAILED_ONLY_ONE_ADMIN,
+  USER_ALREADY_INVITED,
+} from '~/helpers/errors';
+import IconMoreHorizontal from '~icons/lucide/more-horizontal';
+import IconTrash from '~icons/lucide/trash';
+import IconUserCheck from '~icons/lucide/user-check';
+import IconUserMinus from '~icons/lucide/user-minus';
+import IconAddUser from '~icons/lucide/user-plus';
 
 // Get Proper Date Formats
 const t = useI18n();
@@ -263,9 +262,8 @@ const headings = [
 ];
 
 // Get Paginated Results of all the users in the infra
-const usersPerPage = 2;
+const usersPerPage = 20;
 const {
-  fetching,
   error,
   refetch,
   list: usersList,
@@ -322,7 +320,11 @@ const sendInvite = async (email: string) => {
   const variables = { inviteeEmail: email.trim() };
   const result = await sendInvitation.executeMutation(variables);
   if (result.error) {
-    toast.error(t('state.email_failure'));
+    console.log(result.error.message);
+
+    if (result.error.message === USER_ALREADY_INVITED)
+      toast.error(t('state.user_already_invited'));
+    else toast.error(t('state.email_failure'));
   } else {
     toast.success(t('state.email_success'));
     showInviteUserModal.value = false;
@@ -353,7 +355,9 @@ const deleteUserMutation = async (id: string | null) => {
   const variables = { uid: id };
   const result = await userDeletion.executeMutation(variables);
   if (result.error) {
-    toast.error(t('state.delete_user_failure'));
+    if (result.error.message === DELETE_USER_FAILED_ONLY_ONE_ADMIN) {
+      toast.error(t('state.delete_user_failed_only_one_admin'));
+    } else toast.error(t('state.delete_user_failure'));
   } else {
     toast.success(t('state.delete_user_success'));
     usersList.value = usersList.value.filter((user) => user.uid !== id);
@@ -424,31 +428,29 @@ const makeAdminToUserMutation = async (id: string | null) => {
   adminToUserUID.value = null;
 };
 
+// Make Multiple Users Admin
 const usersToAdmin = useMutation(MakeUsersAdminDocument);
 const confirmUsersToAdmin = ref(false);
 
 const makeUsersToAdmin = async () => {
   const userUIDs = selectedRows.value.map((user) => user.uid);
 
-  console.log(selectedRows.value);
-
   const variables = { userUIDs };
   const result = await usersToAdmin.executeMutation(variables);
   if (result.error) {
-    toast.error(t('state.admin_failure'));
+    toast.error(t('state.users_to_admin_failure'));
   } else {
-    toast.success(t('state.admin_success'));
+    toast.success(t('state.users_to_admin_success'));
     usersList.value = usersList.value.map((user) => ({
       ...user,
       isAdmin: userUIDs.includes(user.uid) ? true : user.isAdmin,
     }));
-    console.log(selectedRows.value);
-
     selectedRows.value.splice(0, selectedRows.value.length);
   }
   confirmUsersToAdmin.value = false;
 };
 
+// Remove Admin Status from Multiple Users
 const adminsToUser = useMutation(RemoveUsersAsAdminDocument);
 const confirmAdminsToUsers = ref(false);
 
@@ -458,9 +460,9 @@ const makeAdminsToUsers = async () => {
   const variables = { userUIDs };
   const result = await adminsToUser.executeMutation(variables);
   if (result.error) {
-    toast.error(t('state.remove_admin_failure'));
+    toast.error(t('state.remove_admin_from_users_failure'));
   } else {
-    toast.success(t('state.remove_admin_success'));
+    toast.success(t('state.remove_admin_from_users_success'));
     usersList.value = usersList.value.map((user) => ({
       ...user,
       isAdmin: userUIDs.includes(user.uid) ? false : user.isAdmin,
@@ -471,6 +473,7 @@ const makeAdminsToUsers = async () => {
   confirmAdminsToUsers.value = false;
 };
 
+// Delete Multiple Users
 const usersDeletion = useMutation(RemoveUsersByAdminDocument);
 const confirmUsersDeletion = ref(false);
 
@@ -480,7 +483,7 @@ const deleteUsers = async () => {
   const variables = { userUIDs };
   const result = await usersDeletion.executeMutation(variables);
   if (result.error) {
-    toast.error(t('state.delete_user_failure'));
+    toast.error(t('state.delete_users_failure'));
   } else {
     toast.success(t('state.delete_user_success'));
     usersList.value = usersList.value.filter(
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
index 5840fc18f7..66bec95cd1 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
@@ -7,8 +7,7 @@
     </div>
 
     <h3 class="text-lg font-bold text-accentContrast pt-6 pb-4">
-      <!-- {{ t('users.invited_users') }} -->
-      Pending Invites
+      {{ t('users.pending_invites') }}
     </h3>
 
     <div class="flex flex-col">
@@ -39,7 +38,7 @@
             <span v-else> - </span>
           </template>
           <template #action="{ item }">
-            <div v-if="item" class="my-1">
+            <div v-if="item" class="my-1 mr-2">
               <HoppButtonPrimary
                 :icon="IconTrash"
                 label="Revoke Invitation"
@@ -86,7 +85,6 @@ const getCreatedTime = (date: string) => format(new Date(date), 'hh:mm a');
 
 // Get Invited Users
 const { fetching, error, data } = useQuery({ query: InvitedUsersDocument });
-// const invitedUsers = computed(() => data?.value?.infra.invitedUsers);
 
 // Table Headings
 const headings = [

From f66235e8231f03c6de1ba6072ab27bb899608c53 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 8 Feb 2024 19:16:12 +0530
Subject: [PATCH 12/60] feat: introduced ability to rename a user

---
 .../src/components/users/Details.vue          | 105 +++++++++++++++++-
 .../UpdateUserDisplayNameByAdmin.graphql      |   3 +
 .../src/pages/users/_id.vue                   |  18 ++-
 3 files changed, 118 insertions(+), 8 deletions(-)
 create mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/UpdateUserDisplayNameByAdmin.graphql

diff --git a/packages/hoppscotch-sh-admin/src/components/users/Details.vue b/packages/hoppscotch-sh-admin/src/components/users/Details.vue
index 197649c005..df468739c0 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/Details.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/Details.vue
@@ -24,11 +24,45 @@
       </div>
 
       <template v-for="(info, key) in userInfo" :key="key">
-        <div v-if="info.condition">
-          <label class="text-secondaryDark" :for="key">{{ info.label }}</label>
+        <div
+          v-if="info.label === t('users.name')"
+          class="flex flex-col space-y-3"
+        >
+          <label class="text-accentContrast" for="teamname"
+            >{{ t('users.name') }}
+          </label>
           <div
-            class="w-full p-3 mt-2 bg-divider border-gray-600 rounded-md focus:border-emerald-600 focus:ring focus:ring-opacity-40 focus:ring-emerald-500"
+            class="flex bg-divider rounded-md items-stretch flex-1 border border-divider"
+            :class="{
+              '!border-accent': isNameBeingEdited,
+            }"
           >
+            <HoppSmartInput
+              v-model="updatedUserName"
+              styles="bg-transparent flex-1 rounded-md !rounded-r-none disabled:select-none border-r-0 disabled:cursor-default disabled:opacity-50"
+              :placeholder="t('users.name')"
+              :disabled="!isNameBeingEdited"
+            >
+              <template #button>
+                <HoppButtonPrimary
+                  class="!rounded-l-none"
+                  filled
+                  :icon="isNameBeingEdited ? IconSave : IconEdit"
+                  :label="
+                    isNameBeingEdited
+                      ? `${t('users.rename')}`
+                      : `${t('users.edit')}`
+                  "
+                  @click="handleTeamNameEdit"
+                />
+              </template>
+            </HoppSmartInput>
+          </div>
+        </div>
+
+        <div v-else-if="info.condition">
+          <label class="text-secondaryDark" :for="key">{{ info.label }}</label>
+          <div class="w-full p-3 mt-2 bg-divider border-gray-600 rounded-md">
             <span>{{ info.value }}</span>
           </div>
         </div>
@@ -71,12 +105,19 @@
 
 <script setup lang="ts">
 import { format } from 'date-fns';
+import { useMutation } from '@urql/vue';
+import { ref, computed, onMounted } from 'vue';
 import { useI18n } from '~/composables/i18n';
 import { useToast } from '~/composables/toast';
-import { UserInfoQuery } from '~/helpers/backend/graphql';
+import {
+  UserInfoQuery,
+  UpdateUserDisplayNameByAdminDocument,
+} from '~/helpers/backend/graphql';
 import IconTrash from '~icons/lucide/trash';
 import IconUserCheck from '~icons/lucide/user-check';
 import IconUserMinus from '~icons/lucide/user-minus';
+import IconEdit from '~icons/lucide/edit';
+import IconSave from '~icons/lucide/save';
 
 const t = useI18n();
 const toast = useToast();
@@ -89,6 +130,7 @@ const emit = defineEmits<{
   (event: 'delete-user', userID: string): void;
   (event: 'make-admin', userID: string): void;
   (event: 'remove-admin', userID: string): void;
+  (event: 'update-user-name', newName: string): void;
 }>();
 
 // Get Proper Date Formats
@@ -120,4 +162,59 @@ const userInfo = {
     value: getCreatedDateAndTime(createdOn),
   },
 };
+
+const userName = computed({
+  get: () => props.user.displayName,
+  set: (value) => {
+    props.user.displayName = value;
+  },
+});
+
+// Contains the user name that is being edited
+const currentUserName = ref(displayName);
+
+const updatedUserName = computed({
+  get: () => currentUserName.value,
+  set: (value) => {
+    currentUserName.value = value;
+  },
+});
+
+onMounted(() => {
+  currentUserName.value = displayName;
+});
+
+// Rename the user
+const isNameBeingEdited = ref(false);
+const userRename = useMutation(UpdateUserDisplayNameByAdminDocument);
+
+const handleTeamNameEdit = () => {
+  if (isNameBeingEdited.value) {
+    // If the name is not changed, then return control
+    if (userName.value !== updatedUserName.value) {
+      renameUserName();
+    } else isNameBeingEdited.value = false;
+  } else {
+    isNameBeingEdited.value = true;
+  }
+};
+
+const renameUserName = async () => {
+  if (updatedUserName.value?.trim() === '') {
+    toast.error(t('users.empty_name'));
+    return;
+  }
+
+  const variables = { userUID: uid, name: updatedUserName.value as string };
+  const result = await userRename.executeMutation(variables);
+
+  if (result.error) {
+    toast.error(t('state.rename_user_failure'));
+  } else {
+    isNameBeingEdited.value = false;
+    toast.success(t('state.rename_user_success'));
+    emit('update-user-name', updatedUserName.value as string);
+    userName.value = updatedUserName.value;
+  }
+};
 </script>
diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/UpdateUserDisplayNameByAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/UpdateUserDisplayNameByAdmin.graphql
new file mode 100644
index 0000000000..5776dc3977
--- /dev/null
+++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/UpdateUserDisplayNameByAdmin.graphql
@@ -0,0 +1,3 @@
+mutation UpdateUserDisplayNameByAdmin($userUID: ID!, $name: String!) {
+  updateUserDisplayNameByAdmin(userUID: $userUID, displayName: $name)
+}
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/_id.vue b/packages/hoppscotch-sh-admin/src/pages/users/_id.vue
index 11090138ed..8d7acdae6d 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/_id.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/_id.vue
@@ -12,7 +12,7 @@
 
       <div class="flex items-center space-x-3">
         <h1 class="text-lg text-accentContrast">
-          {{ user.displayName }}
+          {{ userName }}
         </h1>
         <span>/</span>
         <h2 class="text-lg text-accentContrast">
@@ -29,6 +29,7 @@
             @delete-user="deleteUser"
             @make-admin="makeUserAdmin"
             @remove-admin="makeAdminToUser"
+            @update-user-name="(name: string) => (userName = name)"
             class="py-8 px-4"
           />
         </HoppSmartTab>
@@ -40,19 +41,19 @@
 
     <HoppSmartConfirmModal
       :show="confirmDeletion"
-      :title="t('users.confirm_user_deletion')"
+      :title="t('state.confirm_user_deletion')"
       @hide-modal="confirmDeletion = false"
       @resolve="deleteUserMutation(deleteUserUID)"
     />
     <HoppSmartConfirmModal
       :show="confirmUserToAdmin"
-      :title="t('users.confirm_user_to_admin')"
+      :title="t('state.confirm_user_to_admin')"
       @hide-modal="confirmUserToAdmin = false"
       @resolve="makeUserAdminMutation(userToAdminUID)"
     />
     <HoppSmartConfirmModal
       :show="confirmAdminToUser"
-      :title="t('users.confirm_admin_to_user')"
+      :title="t('state.confirm_admin_to_user')"
       @hide-modal="confirmAdminToUser = false"
       @resolve="makeAdminToUserMutation(adminToUserUID)"
     />
@@ -104,6 +105,15 @@ onMounted(async () => {
   await fetchData();
 });
 
+const userName = computed({
+  get: () => data.value?.infra.userInfo.displayName,
+  set: (value) => {
+    if (value) {
+      data.value!.infra.userInfo.displayName = value;
+    }
+  },
+});
+
 const user = computed({
   get: () => data.value?.infra.userInfo,
   set: (value) => {

From c1d3e06c8ca48912b1fc50ee881db5144597f8e6 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 8 Feb 2024 20:20:12 +0530
Subject: [PATCH 13/60] refactor: updated i18n strings

---
 packages/hoppscotch-sh-admin/locales/en.json          | 11 +++++++++++
 .../hoppscotch-sh-admin/src/pages/users/index.vue     |  1 -
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/hoppscotch-sh-admin/locales/en.json b/packages/hoppscotch-sh-admin/locales/en.json
index cfaf128889..cb1fbbc383 100644
--- a/packages/hoppscotch-sh-admin/locales/en.json
+++ b/packages/hoppscotch-sh-admin/locales/en.json
@@ -163,8 +163,15 @@
     "remove_invitee_success": "Removal of invitee is successfull!!",
     "remove_member_failure": "Member couldn't be removed!!",
     "remove_member_success": "Member removed successfully!!",
+<<<<<<< HEAD
     "rename_team_failure": "Failed to rename workspace!!",
     "rename_team_success": "Workspace renamed successfully!",
+=======
+    "rename_team_failure": "Failed to rename team!!",
+    "rename_team_success": "Team renamed successfully!",
+    "rename_user_failure": "Failed to rename user!!",
+    "rename_user_success": "User renamed successfully!!",
+>>>>>>> 75ca9848 (refactor: updated i18n strings)
     "require_auth_provider": "You need to set atleast one authentication provider to log in.",
     "role_update_failed": "Roles updation has failed!!",
     "role_update_success": "Roles updated successfully!!",
@@ -243,13 +250,16 @@
     "admin": "Admin",
     "admin_email": "Admin Email",
     "admin_id": "Admin ID",
+    "created_on": "Created On",
     "date": "Date",
     "delete": "Delete",
     "delete_user": "Delete User",
     "delete_users": "Delete Users",
     "details": "Details",
+    "edit": "Edit",
     "email": "Email",
     "email_address": "Email Address",
+    "empty_name": "Name cannot be empty!!",
     "id": "User ID",
     "invalid_user": "Invalid User",
     "invite_load_list_error": "Unable to Load Invited Users List",
@@ -268,6 +278,7 @@
     "pending_invites": "Pending Invites",
     "remove_admin_privilege": "Remove Admin Privilege",
     "remove_admin_status": "Remove Admin Status",
+    "rename": "Rename",
     "searchbar_placeholder": "Search by name or email..",
     "send_invite": "Send Invite",
     "show_more": "Show more",
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index c5f9859afa..4f3d906d20 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -277,7 +277,6 @@ const {
 const selectedRows = ref<UsersListQuery['infra']['allUsers']>([]);
 
 // Search
-
 const searchQuery = ref('');
 const handleInput = async (input: string) => {
   searchQuery.value = input;

From 0818eb17ebc89d5051aaec7f2204f79b6324f4a9 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Fri, 9 Feb 2024 10:32:18 +0530
Subject: [PATCH 14/60] chore: cleaned up code in details component

---
 packages/hoppscotch-sh-admin/locales/en.json  |  5 ---
 .../src/components/users/Details.vue          | 40 +++++++++----------
 2 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/locales/en.json b/packages/hoppscotch-sh-admin/locales/en.json
index cb1fbbc383..da7db24f54 100644
--- a/packages/hoppscotch-sh-admin/locales/en.json
+++ b/packages/hoppscotch-sh-admin/locales/en.json
@@ -163,15 +163,10 @@
     "remove_invitee_success": "Removal of invitee is successfull!!",
     "remove_member_failure": "Member couldn't be removed!!",
     "remove_member_success": "Member removed successfully!!",
-<<<<<<< HEAD
     "rename_team_failure": "Failed to rename workspace!!",
     "rename_team_success": "Workspace renamed successfully!",
-=======
-    "rename_team_failure": "Failed to rename team!!",
-    "rename_team_success": "Team renamed successfully!",
     "rename_user_failure": "Failed to rename user!!",
     "rename_user_success": "User renamed successfully!!",
->>>>>>> 75ca9848 (refactor: updated i18n strings)
     "require_auth_provider": "You need to set atleast one authentication provider to log in.",
     "role_update_failed": "Roles updation has failed!!",
     "role_update_success": "Roles updated successfully!!",
diff --git a/packages/hoppscotch-sh-admin/src/components/users/Details.vue b/packages/hoppscotch-sh-admin/src/components/users/Details.vue
index df468739c0..fe1ffbd01b 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/Details.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/Details.vue
@@ -24,10 +24,7 @@
       </div>
 
       <template v-for="(info, key) in userInfo" :key="key">
-        <div
-          v-if="info.label === t('users.name')"
-          class="flex flex-col space-y-3"
-        >
+        <div v-if="key === 'displayName'" class="flex flex-col space-y-3">
           <label class="text-accentContrast" for="teamname"
             >{{ t('users.name') }}
           </label>
@@ -49,11 +46,9 @@
                   filled
                   :icon="isNameBeingEdited ? IconSave : IconEdit"
                   :label="
-                    isNameBeingEdited
-                      ? `${t('users.rename')}`
-                      : `${t('users.edit')}`
+                    isNameBeingEdited ? t('users.rename') : t('users.edit')
                   "
-                  @click="handleTeamNameEdit"
+                  @click="handleNameEdit"
                 />
               </template>
             </HoppSmartInput>
@@ -104,20 +99,20 @@
 </template>
 
 <script setup lang="ts">
-import { format } from 'date-fns';
 import { useMutation } from '@urql/vue';
-import { ref, computed, onMounted } from 'vue';
+import { format } from 'date-fns';
+import { computed, onMounted, ref } from 'vue';
 import { useI18n } from '~/composables/i18n';
 import { useToast } from '~/composables/toast';
 import {
-  UserInfoQuery,
   UpdateUserDisplayNameByAdminDocument,
+  UserInfoQuery,
 } from '~/helpers/backend/graphql';
+import IconEdit from '~icons/lucide/edit';
+import IconSave from '~icons/lucide/save';
 import IconTrash from '~icons/lucide/trash';
 import IconUserCheck from '~icons/lucide/user-check';
 import IconUserMinus from '~icons/lucide/user-minus';
-import IconEdit from '~icons/lucide/edit';
-import IconSave from '~icons/lucide/save';
 
 const t = useI18n();
 const toast = useToast();
@@ -163,16 +158,23 @@ const userInfo = {
   },
 };
 
+// Contains the actual user name
 const userName = computed({
   get: () => props.user.displayName,
   set: (value) => {
-    props.user.displayName = value;
+    return value;
   },
 });
 
-// Contains the user name that is being edited
-const currentUserName = ref(displayName);
+// Contains the stored user name from the actual name before being edited
+const currentUserName = ref('');
+
+// Set the current user name to the actual user name
+onMounted(() => {
+  if (displayName) currentUserName.value = displayName;
+});
 
+// Contains the user name that is being edited
 const updatedUserName = computed({
   get: () => currentUserName.value,
   set: (value) => {
@@ -180,15 +182,11 @@ const updatedUserName = computed({
   },
 });
 
-onMounted(() => {
-  currentUserName.value = displayName;
-});
-
 // Rename the user
 const isNameBeingEdited = ref(false);
 const userRename = useMutation(UpdateUserDisplayNameByAdminDocument);
 
-const handleTeamNameEdit = () => {
+const handleNameEdit = () => {
   if (isNameBeingEdited.value) {
     // If the name is not changed, then return control
     if (userName.value !== updatedUserName.value) {

From a91a3843845459fe7da9a6b66eacce09c0cc2da5 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Fri, 9 Feb 2024 12:27:33 +0530
Subject: [PATCH 15/60] fix: shared requests now adheres to new changes in
 usePagedQuery

---
 .../src/components/users/SharedRequests.vue   | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue b/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
index b6f3b0768c..0f37b7e23a 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
@@ -136,9 +136,9 @@ const {
 } = usePagedQuery(
   SharedRequestsDocument,
   (x) => x.infra.allShortcodes,
-  (x) => x.id,
   sharedRequestsPerPage,
-  { cursor: undefined, take: sharedRequestsPerPage, email: props.email }
+  { cursor: undefined, take: sharedRequestsPerPage, email: props.email },
+  (x) => x.id
 );
 
 // Return request endpoint from the request object
@@ -174,17 +174,17 @@ const deleteSharedRequestMutation = async (id: string | null) => {
     return;
   }
   const variables = { codeID: id };
-  await sharedRequestDeletion.executeMutation(variables).then((result) => {
-    if (result.error) {
-      toast.error(t('state.delete_request_failure'));
-    } else {
-      sharedRequests.value = sharedRequests.value.filter(
-        (request) => request.id !== id
-      );
-      refetch();
-      toast.success(t('state.delete_request_success'));
-    }
-  });
+  const result = await sharedRequestDeletion.executeMutation(variables);
+  if (result.error) {
+    toast.error(t('state.delete_request_failure'));
+  } else {
+    sharedRequests.value = sharedRequests.value.filter(
+      (request) => request.id !== id
+    );
+    refetch();
+    toast.success(t('state.delete_request_success'));
+  }
+
   confirmDeletion.value = false;
   deleteSharedRequestID.value = null;
 };

From 0cffedbbd4f5d77dc6507aa41a737f97bce144aa Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Fri, 9 Feb 2024 12:29:09 +0530
Subject: [PATCH 16/60] chore: cleaned up index component

---
 .../src/pages/users/index.vue                 | 93 +++++++++----------
 1 file changed, 42 insertions(+), 51 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 4f3d906d20..881ef9dd0a 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -35,9 +35,8 @@
           }"
           :pagination="{ totalPages: totalPages }"
           @onRowClicked="goToUserDetails"
-          @search="handleInput"
+          @search="handleSearch"
           @pageNumber="handlePageChange"
-          class="w-full h-full"
         >
           <template #head>
             <th class="px-6 py-2">{{ t('users.id') }}</th>
@@ -130,16 +129,10 @@
           </template>
         </UsersTable>
 
-        <!-- <div
-          v-if="fetchQuery"
-          class="w-full border-x-2 border-b-2 border-divider text-center p-3 rounded-b-md"
-        >
-          No users found...
-        </div> -->
-
+        <!-- Actions for Selected Rows -->
         <div
           v-if="selectedRows.length"
-          class="fixed m-2 bottom-0 left-32 right-0 w-min mx-auto shadow-2xl"
+          class="fixed m-2 bottom-0 left-40 right-0 w-min mx-auto shadow-2xl"
         >
           <div
             class="flex justify-center items-end bg-primaryLight border border-divider rounded-md mb-5"
@@ -274,11 +267,12 @@ const {
   { searchString: '', take: usersPerPage, skip: 0 }
 );
 
+// Selected Rows
 const selectedRows = ref<UsersListQuery['infra']['allUsers']>([]);
 
 // Search
 const searchQuery = ref('');
-const handleInput = async (input: string) => {
+const handleSearch = async (input: string) => {
   searchQuery.value = input;
   await refetch({ searchString: input, take: usersPerPage, skip: 0 });
 };
@@ -307,6 +301,11 @@ const handlePageChange = async (page: number) => {
   }
 };
 
+// Go to Individual User Details Page
+const router = useRouter();
+const goToUserDetails = (user: UserInfoQuery['infra']['userInfo']) =>
+  router.push('/users/' + user.uid);
+
 // Send Invitation through Email
 const sendInvitation = useMutation(InviteNewUserDocument);
 const showInviteUserModal = ref(false);
@@ -319,8 +318,6 @@ const sendInvite = async (email: string) => {
   const variables = { inviteeEmail: email.trim() };
   const result = await sendInvitation.executeMutation(variables);
   if (result.error) {
-    console.log(result.error.message);
-
     if (result.error.message === USER_ALREADY_INVITED)
       toast.error(t('state.user_already_invited'));
     else toast.error(t('state.email_failure'));
@@ -330,42 +327,7 @@ const sendInvite = async (email: string) => {
   }
 };
 
-// Go to Individual User Details Page
-const router = useRouter();
-const goToUserDetails = (user: UserInfoQuery['infra']['userInfo']) =>
-  router.push('/users/' + user.uid);
-
-// User Deletion
-const userDeletion = useMutation(RemoveUserByAdminDocument);
-const confirmDeletion = ref(false);
-const deleteUserUID = ref<string | null>(null);
-
-const deleteUser = (id: string) => {
-  confirmDeletion.value = true;
-  deleteUserUID.value = id;
-};
-
-const deleteUserMutation = async (id: string | null) => {
-  if (!id) {
-    confirmDeletion.value = false;
-    toast.error(t('state.delete_user_failure'));
-    return;
-  }
-  const variables = { uid: id };
-  const result = await userDeletion.executeMutation(variables);
-  if (result.error) {
-    if (result.error.message === DELETE_USER_FAILED_ONLY_ONE_ADMIN) {
-      toast.error(t('state.delete_user_failed_only_one_admin'));
-    } else toast.error(t('state.delete_user_failure'));
-  } else {
-    toast.success(t('state.delete_user_success'));
-    usersList.value = usersList.value.filter((user) => user.uid !== id);
-  }
-  confirmDeletion.value = false;
-  deleteUserUID.value = null;
-};
-
-// Make User Admin
+// Make a single user an admin
 const userToAdmin = useMutation(MakeUserAdminDocument);
 const confirmUserToAdmin = ref(false);
 const userToAdminUID = ref<string | null>(null);
@@ -396,7 +358,7 @@ const makeUserAdminMutation = async (id: string | null) => {
   userToAdminUID.value = null;
 };
 
-// Remove Admin Status from a current Admin
+// Remove Admin Status from a Current Admin
 const adminToUser = useMutation(RemoveUserAsAdminDocument);
 const confirmAdminToUser = ref(false);
 const adminToUserUID = ref<string | null>(null);
@@ -427,6 +389,36 @@ const makeAdminToUserMutation = async (id: string | null) => {
   adminToUserUID.value = null;
 };
 
+// Delete a single user
+const userDeletion = useMutation(RemoveUserByAdminDocument);
+const confirmDeletion = ref(false);
+const deleteUserUID = ref<string | null>(null);
+
+const deleteUser = (id: string) => {
+  confirmDeletion.value = true;
+  deleteUserUID.value = id;
+};
+
+const deleteUserMutation = async (id: string | null) => {
+  if (!id) {
+    confirmDeletion.value = false;
+    toast.error(t('state.delete_user_failure'));
+    return;
+  }
+  const variables = { uid: id };
+  const result = await userDeletion.executeMutation(variables);
+  if (result.error) {
+    if (result.error.message === DELETE_USER_FAILED_ONLY_ONE_ADMIN) {
+      toast.error(t('state.delete_user_failed_only_one_admin'));
+    } else toast.error(t('state.delete_user_failure'));
+  } else {
+    toast.success(t('state.delete_user_success'));
+    usersList.value = usersList.value.filter((user) => user.uid !== id);
+  }
+  confirmDeletion.value = false;
+  deleteUserUID.value = null;
+};
+
 // Make Multiple Users Admin
 const usersToAdmin = useMutation(MakeUsersAdminDocument);
 const confirmUsersToAdmin = ref(false);
@@ -488,7 +480,6 @@ const deleteUsers = async () => {
     usersList.value = usersList.value.filter(
       (user) => !userUIDs.includes(user.uid)
     );
-
     selectedRows.value.splice(0, selectedRows.value.length);
   }
   confirmUsersDeletion.value = false;

From bd1021e52a7f0373caea2e86902069bb812d5028 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Fri, 9 Feb 2024 17:40:47 +0530
Subject: [PATCH 17/60] refactor: updated shared requests to adhere to the new
 table

---
 .../src/components/users/SharedRequests.vue   | 123 +++++++++---------
 1 file changed, 60 insertions(+), 63 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue b/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
index 0f37b7e23a..9c8b36ef12 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="px-4">
+  <div class="px-4 mt-7">
     <div v-if="fetching" class="flex justify-center">
       <HoppSmartSpinner />
     </div>
@@ -10,71 +10,61 @@
       {{ t('users.no_shared_requests') }}
     </div>
 
-    <HoppSmartTable v-else class="mt-8" :list="sharedRequests">
+    <UsersTable v-else :headings="headings" :list="sharedRequests">
       <template #head>
-        <tr
-          class="text-secondary border-b border-dividerDark text-sm text-left bg-primaryLight"
-        >
-          <th class="px-6 py-2">{{ t('shared_requests.id') }}</th>
-          <th class="px-6 py-2 w-30">{{ t('shared_requests.url') }}</th>
-          <th class="px-6 py-2">{{ t('shared_requests.created_on') }}</th>
-          <!-- Empty Heading for the Action Button -->
-          <th class="px-6 py-2 text-center">
-            {{ t('shared_requests.action') }}
-          </th>
-        </tr>
+        <th class="px-6 py-2">{{ t('shared_requests.id') }}</th>
+        <th class="px-6 py-2 w-30">{{ t('shared_requests.url') }}</th>
+        <th class="px-6 py-2">{{ t('shared_requests.created_on') }}</th>
+        <!-- Empty Heading for the Action Button -->
+        <th class="px-6 py-2 text-center">
+          {{ t('shared_requests.action') }}
+        </th>
       </template>
-      <template #body="{ list: sharedRequests }">
-        <tr
-          v-for="request in sharedRequests"
-          :key="request.id"
-          class="text-secondaryDark hover:bg-divider hover:cursor-pointer rounded-xl"
-        >
-          <td class="flex py-4 px-7 max-w-50">
-            <span class="truncate">
-              {{ request.id }}
-            </span>
-          </td>
-
-          <td class="py-4 px-7 w-96">
-            {{ sharedRequestURL(request.request) }}
-          </td>
-
-          <td class="py-2 px-7">
-            {{ getCreatedDate(request.createdOn) }}
-            <div class="text-gray-400 text-tiny">
-              {{ getCreatedTime(request.createdOn) }}
-            </div>
-          </td>
-
-          <td class="flex justify-center">
-            <HoppButtonSecondary
-              v-tippy="{ theme: 'tooltip' }"
-              :title="t('shared_requests.open_request')"
-              :to="`${shortcodeBaseURL}/r/${request.id}`"
-              :blank="true"
-              :icon="IconExternalLink"
-              class="px-3 text-emerald-500 hover:text-accent"
-            />
-
-            <UiAutoResetIcon
-              :title="t('shared_requests.copy')"
-              :icon="{ default: IconCopy, temporary: IconCheck }"
-              @click="copySharedRequest(request.id)"
-            />
-
-            <HoppButtonSecondary
-              v-tippy="{ theme: 'tooltip' }"
-              :title="t('shared_requests.delete')"
-              :icon="IconTrash"
-              color="red"
-              class="px-3"
-              @click="deleteSharedRequest(request.id)"
-            />
-          </td>
-        </tr>
+      <template #body="{ row: request }">
+        <td class="flex py-4 px-7 max-w-50">
+          <span class="truncate">
+            {{ request.id }}
+          </span>
+        </td>
+
+        <td class="py-4 px-7 w-96">
+          {{ sharedRequestURL(request.request) }}
+        </td>
+
+        <td class="py-2 px-7">
+          {{ getCreatedDate(request.createdOn) }}
+          <div class="text-gray-400 text-tiny">
+            {{ getCreatedTime(request.createdOn) }}
+          </div>
+        </td>
+
+        <td class="flex justify-center">
+          <HoppButtonSecondary
+            v-tippy="{ theme: 'tooltip' }"
+            :title="t('shared_requests.open_request')"
+            :to="`${shortcodeBaseURL}/r/${request.id}`"
+            :blank="true"
+            :icon="IconExternalLink"
+            class="px-3 text-emerald-500 hover:text-accent"
+          />
+
+          <UiAutoResetIcon
+            :title="t('shared_requests.copy')"
+            :icon="{ default: IconCopy, temporary: IconCheck }"
+            @click="copySharedRequest(request.id)"
+          />
+
+          <HoppButtonSecondary
+            v-tippy="{ theme: 'tooltip' }"
+            :title="t('shared_requests.delete')"
+            :icon="IconTrash"
+            color="red"
+            class="px-3"
+            @click="deleteSharedRequest(request.id)"
+          />
+        </td>
       </template>
-    </HoppSmartTable>
+    </UsersTable>
 
     <!-- Pagination -->
     <div
@@ -141,6 +131,13 @@ const {
   (x) => x.id
 );
 
+const headings = [
+  { key: 'id', label: t('shared_requests.id') },
+  { key: 'request', label: t('shared_requests.url') },
+  { key: 'createdOn', label: t('shared_requests.created_on') },
+  { key: 'action', label: t('shared_requests.action') },
+];
+
 // Return request endpoint from the request object
 const sharedRequestURL = (request: string) => {
   const parsedRequest = JSON.parse(request);

From cdb3ecc6b3e9b200feabf3e25ac2fe2a3451702c Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Fri, 9 Feb 2024 17:52:58 +0530
Subject: [PATCH 18/60] refactor: updated teams table to adhere to the new
 table

---
 .../src/pages/teams/index.vue                 | 146 +++++++++---------
 1 file changed, 75 insertions(+), 71 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
index 12b988ef35..1d0e97eb32 100644
--- a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
@@ -18,77 +18,71 @@
 
         <div v-else-if="error">{{ t('teams.load_list_error') }}</div>
 
-        <HoppSmartTable v-else-if="teamsList.length" :list="teamsList">
+        <UsersTable
+          v-else-if="teamsList.length"
+          :headings="headings"
+          :list="teamsList"
+          @onRowClicked="goToTeamDetails"
+        >
           <template #head>
-            <tr
-              class="text-secondary border-b border-dividerDark text-sm text-left bg-primaryLight"
-            >
-              <th class="px-6 py-2">{{ t('teams.id') }}</th>
-              <th class="px-6 py-2">{{ t('teams.name') }}</th>
-              <th class="px-6 py-2">{{ t('teams.members') }}</th>
-              <!-- Empty Heading for the Action Button -->
-              <th class="px-6 py-2"></th>
-            </tr>
+            <th class="px-6 py-2">{{ t('teams.id') }}</th>
+            <th class="px-6 py-2">{{ t('teams.name') }}</th>
+            <th class="px-6 py-2">{{ t('teams.members') }}</th>
+            <!-- Empty Heading for the Action Button -->
+            <th class="px-6 py-2"></th>
           </template>
-          <template #body="{ list }">
-            <tr
-              v-for="team in list"
-              :key="team.id"
-              class="text-secondaryDark hover:bg-divider hover:cursor-pointer rounded-xl"
-              @click="goToTeamDetails(team.id)"
-            >
-              <td class="flex py-4 px-7 max-w-[16rem]">
-                <span class="truncate">
-                  {{ team.id }}
-                </span>
-              </td>
-
-              <td class="py-4 px-7 min-w-[20rem]">
-                <span
-                  class="flex items-center truncate"
-                  :class="{ truncate: team.name }"
-                >
-                  {{ team.name ?? t('teams.unnamed') }}
-                </span>
-              </td>
-
-              <td class="py-4 px-7">
-                {{ team.members?.length }}
-              </td>
-
-              <td @click.stop>
-                <div class="relative">
-                  <tippy interactive trigger="click" theme="popover">
-                    <HoppButtonSecondary
-                      v-tippy="{ theme: 'tooltip' }"
-                      :icon="IconMoreHorizontal"
-                    />
-                    <template #content="{ hide }">
-                      <div
-                        ref="tippyActions"
-                        class="flex flex-col focus:outline-none"
-                        tabindex="0"
-                        @keyup.escape="hide()"
-                      >
-                        <HoppSmartItem
-                          :icon="IconTrash"
-                          :label="t('teams.delete_team')"
-                          class="!hover:bg-red-600 w-full"
-                          @click="
-                            () => {
-                              deleteTeam(team.id);
-                              hide();
-                            }
-                          "
-                        />
-                      </div>
-                    </template>
-                  </tippy>
-                </div>
-              </td>
-            </tr>
+          <template #body="{ row: team }">
+            <td class="flex py-4 px-7 max-w-[16rem]">
+              <span class="truncate">
+                {{ team.id }}
+              </span>
+            </td>
+
+            <td class="py-4 px-7 min-w-[20rem]">
+              <span
+                class="flex items-center truncate"
+                :class="{ truncate: team.name }"
+              >
+                {{ team.name ?? t('teams.unnamed') }}
+              </span>
+            </td>
+
+            <td class="py-4 px-7">
+              {{ team.members?.length }}
+            </td>
+
+            <td @click.stop>
+              <div class="relative">
+                <tippy interactive trigger="click" theme="popover">
+                  <HoppButtonSecondary
+                    v-tippy="{ theme: 'tooltip' }"
+                    :icon="IconMoreHorizontal"
+                  />
+                  <template #content="{ hide }">
+                    <div
+                      ref="tippyActions"
+                      class="flex flex-col focus:outline-none"
+                      tabindex="0"
+                      @keyup.escape="hide()"
+                    >
+                      <HoppSmartItem
+                        :icon="IconTrash"
+                        :label="t('teams.delete_team')"
+                        class="!hover:bg-red-600 w-full"
+                        @click="
+                          () => {
+                            deleteTeam(team.id);
+                            hide();
+                          }
+                        "
+                      />
+                    </div>
+                  </template>
+                </tippy>
+              </div>
+            </td>
           </template>
-        </HoppSmartTable>
+        </UsersTable>
 
         <div v-else class="px-2 text-lg">
           {{ t('teams.no_teams') }}
@@ -96,11 +90,11 @@
 
         <div
           v-if="hasNextPage && teamsList.length >= teamsPerPage"
-          class="flex justify-center my-5 px-3 py-2 cursor-pointer font-semibold rounded-3xl bg-dividerDark hover:bg-divider transition mx-auto w-38 text-secondaryDark"
+          class="flex items-center w-28 px-3 py-2 mt-5 mx-auto font-semibold text-secondaryDark bg-divider hover:bg-dividerDark rounded-3xl cursor-pointer"
           @click="fetchNextTeams"
         >
           <span>{{ t('teams.show_more') }}</span>
-          <icon-lucide-chevron-down class="ml-2 text-lg" />
+          <icon-lucide-chevron-down class="ml-2" />
         </div>
       </div>
     </div>
@@ -135,6 +129,7 @@ import {
   CreateTeamDocument,
   MetricsDocument,
   RemoveTeamDocument,
+  TeamInfoQuery,
   TeamListDocument,
   UsersListDocument,
 } from '../../helpers/backend/graphql';
@@ -173,6 +168,14 @@ const {
   (x) => x.id
 );
 
+// Table Headings
+const headings = [
+  { key: 'id', label: t('teams.id') },
+  { key: 'name', label: t('teams.name') },
+  { key: 'members', label: t('teams.members') },
+  { key: 'actions', label: '' },
+];
+
 // Create Team
 const showCreateTeamModal = ref(false);
 const createTeamLoading = ref(false);
@@ -212,7 +215,8 @@ const createTeam = async (newTeamName: string, ownerEmail: string) => {
 
 // Go To Individual Team Details Page
 const router = useRouter();
-const goToTeamDetails = (teamId: string) => router.push('/teams/' + teamId);
+const goToTeamDetails = (team: TeamInfoQuery['infra']['teamInfo']) =>
+  router.push('/teams/' + team.id);
 
 // Team Deletion
 const confirmDeletion = ref(false);

From 84cd92affdfcd795322360300bed40d562c9ac45 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Fri, 9 Feb 2024 18:46:43 +0530
Subject: [PATCH 19/60] chore: updated i18n strings for invited components

---
 packages/hoppscotch-sh-admin/locales/en.json  |   3 +
 .../src/components/users/Table.vue            | 301 ++++++++++++++++++
 .../src/pages/users/invited.vue               |   6 +-
 3 files changed, 307 insertions(+), 3 deletions(-)
 create mode 100644 packages/hoppscotch-sh-admin/src/components/users/Table.vue

diff --git a/packages/hoppscotch-sh-admin/locales/en.json b/packages/hoppscotch-sh-admin/locales/en.json
index da7db24f54..8f59704d9d 100644
--- a/packages/hoppscotch-sh-admin/locales/en.json
+++ b/packages/hoppscotch-sh-admin/locales/en.json
@@ -109,6 +109,7 @@
     "configure_auth": "Check out the documentation to configure auth providers.",
     "confirm_admin_to_user": "Do you want to remove admin status from this user?",
     "confirm_admins_to_users": "Do you want to remove admin status from selected users?",
+    "confirm_delete_invites": "Do you want to revoke the selected invite?",
     "confirm_user_deletion": "Confirm user deletion?",
     "confirm_users_deletion": "Do you want to delete selected users?",
     "confirm_user_to_admin": "Do you want to make this user into an admin?",
@@ -123,6 +124,8 @@
     "create_team_failure": "Failed to create workspace!!",
     "create_team_success": "Workspace created successfully!!",
     "data_sharing_failure": "Failed to update data sharing settings",
+    "delete_invite_failure": "Failed to delete invite!!",
+    "delete_invite_success": "Invite deleted successfully!!",
     "delete_request_failure": "Shared Request deletion failed!!",
     "delete_request_success": "Shared Request deleted successfully!!",
     "delete_team_failure": "Workspace deletion failed!!",
diff --git a/packages/hoppscotch-sh-admin/src/components/users/Table.vue b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
new file mode 100644
index 0000000000..5edde47f7e
--- /dev/null
+++ b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
@@ -0,0 +1,301 @@
+<template>
+  <div v-if="pagination" class="flex justify-end mb-3">
+    <div class="flex w-min">
+      <HoppButtonSecondary
+        outline
+        filled
+        :icon="IconLeft"
+        :disabled="page === 1"
+        @click="changePage(PageDirection.Previous)"
+      />
+
+      <div class="w-10 flex justify-center items-center h-full">
+        <p>{{ page }}</p>
+      </div>
+
+      <HoppButtonSecondary
+        outline
+        filled
+        :icon="IconRight"
+        :disabled="page === pagination.totalPages"
+        @click="changePage(PageDirection.Next)"
+      />
+    </div>
+  </div>
+
+  <div class="overflow-auto rounded-md border border-dividerDark shadow-md">
+    <div v-if="searchBar" class="flex w-full items-center bg-primary">
+      <icon-lucide-search class="ml-3 text-xs" />
+      <input
+        v-model="searchQuery"
+        class="bg-primary p-3 w-full h-full"
+        :placeholder="searchBar.placeholder ?? 'Search...'"
+      />
+    </div>
+
+    <div v-if="isSpinnerEnabled" class="w-5 h-5 text-center mx-auto my-3">
+      <HoppSmartSpinner />
+    </div>
+
+    <table v-else class="w-full">
+      <thead>
+        <tr
+          class="border-b border-dividerDark bg-primaryLight text-left text-sm text-secondary"
+        >
+          <th v-if="checkbox" class="pl-6 pt-1 w-5">
+            <input
+              ref="selectAllCheckbox"
+              type="checkbox"
+              :checked="areAllRowsSelected"
+              @click.stop="toggleAllRows"
+            />
+          </th>
+          <slot name="head">
+            <th v-for="th in headings" scope="col" class="px-6 py-3">
+              {{ th.label ?? th.key }}
+            </th>
+          </slot>
+        </tr>
+      </thead>
+
+      <tbody class="divide-y divide-divider">
+        <tr
+          v-for="(rowData, rowIndex) in workingList"
+          :key="rowIndex"
+          class="rounded-xl text-secondaryDark hover:cursor-pointer hover:bg-divider"
+          :class="{ 'divide-x divide-divider': showYBorder }"
+          @click="onRowClicked(rowData)"
+        >
+          <td v-if="checkbox" class="my-auto pl-6">
+            <input
+              type="checkbox"
+              :checked="isRowSelected(rowData)"
+              @click.stop="toggleRow(rowData)"
+            />
+          </td>
+          <slot name="body" :row="rowData">
+            <td
+              v-for="cellHeading in headings"
+              :key="cellHeading.key"
+              @click="!cellHeading.preventClick && onRowClicked(rowData)"
+              class="max-w-[10rem] py-1 pl-6"
+            >
+              <!-- Dynamic column slot -->
+              <slot :name="cellHeading.key" :item="rowData">
+                <!-- Generic implementation of the column -->
+                <div class="flex flex-col truncate">
+                  <span class="truncate">
+                    {{ rowData[cellHeading.key] ?? '-' }}
+                  </span>
+                </div>
+              </slot>
+            </td>
+          </slot>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { useVModel } from '@vueuse/core';
+import { isEqual } from 'lodash-es';
+import { computed, ref, watch } from 'vue';
+import IconLeft from '~icons/lucide/arrow-left';
+import IconRight from '~icons/lucide/arrow-right';
+
+export type CellHeading = {
+  key: string;
+  label?: string;
+  preventClick?: boolean;
+};
+
+export type Item = Record<string, unknown>;
+
+const props = withDefaults(
+  defineProps<{
+    /** Whether to show the vertical border between columns */
+    showYBorder?: boolean;
+    /**  The list of items to be displayed in the table */
+    list: Item[];
+    /** The headings of the table */
+    headings?: CellHeading[];
+    /** Whether to show the search bar */
+    searchBar?: {
+      /** Whether to debounce the search query event */
+      debounce?: number;
+      placeholder?: string;
+    };
+    /** Whether to show the checkbox column
+     * This will be overriden if custom implementation for body slot is provided
+     */
+    checkbox?: boolean;
+
+    selectedRows?: Item[];
+    /** Whether to enable sorting */
+    sort?: {
+      /** The key to sort the list by */
+      key: string;
+      direction: Direction;
+    };
+
+    /** Whether to enable pagination */
+    pagination?: {
+      totalPages: number;
+    };
+  }>(),
+  {
+    showYBorder: false,
+    search: undefined,
+    checkbox: false,
+    sort: undefined,
+    selectedRows: undefined,
+  }
+);
+
+const emit = defineEmits<{
+  (event: 'onRowClicked', item: Item): void;
+  (event: 'update:list', list: Item[]): void;
+  (event: 'search', query: string): void;
+  (event: 'update:selectedRows', selectedRows: Item[]): void;
+  (event: 'pageNumber', page: number): void;
+}>();
+
+// Pagination functionality
+const page = ref(1);
+
+enum PageDirection {
+  Previous,
+  Next,
+}
+
+const changePage = (direction: PageDirection) => {
+  if (direction === PageDirection.Previous && page.value > 1) {
+    showSpinner(300);
+    page.value -= 1;
+  } else if (
+    direction === PageDirection.Next &&
+    page.value < props.pagination!.totalPages
+  ) {
+    showSpinner(300);
+    page.value += 1;
+  }
+
+  emit('pageNumber', page.value);
+};
+
+// The working version of the list that is used to perform operations upon
+const workingList = useVModel(props, 'list', emit);
+
+// Checkbox functionality
+const selectedRows = useVModel(props, 'selectedRows', emit);
+
+watch(workingList.value, (updatedList) => {
+  if (props.checkbox) {
+    updatedList = updatedList.map((item) => ({
+      ...item,
+      selected: false,
+    }));
+  }
+});
+
+const onRowClicked = (item: Item) => emit('onRowClicked', item);
+
+const isRowSelected = (item: Item) => {
+  const { selected, ...data } = item;
+  return selectedRows.value?.some((row) => isEqual(row, data));
+};
+
+const toggleRow = (item: Item) => {
+  item.selected = !item.selected;
+  const { selected, ...data } = item;
+
+  const index =
+    selectedRows.value?.findIndex((row) => isEqual(row, data)) ?? -1;
+
+  if (item.selected && !isRowSelected(data)) selectedRows.value!.push(data);
+  else if (index !== -1) selectedRows.value?.splice(index, 1);
+};
+
+const selectAllCheckbox = ref<HTMLInputElement | null>(null);
+
+const toggleAllRows = () => {
+  const isChecked = selectAllCheckbox.value?.checked;
+  workingList.value.forEach((item) => (item.selected = isChecked));
+
+  if (isChecked) {
+    workingList.value.forEach((item) => {
+      const { selected, ...data } = item;
+      if (!isRowSelected(item)) selectedRows.value!.push(data);
+    });
+  } else {
+    workingList.value.forEach((item) => {
+      const { selected, ...data } = item;
+      const index =
+        selectedRows.value?.findIndex((row) => isEqual(row, data)) ?? -1;
+      selectedRows.value!.splice(index, 1);
+    });
+  }
+};
+
+const areAllRowsSelected = computed(() => {
+  if (workingList.value.length === 0 || selectedRows.value?.length === 0)
+    return false;
+
+  let count = 0;
+  workingList.value.forEach((item) => {
+    const { selected, ...data } = item;
+    if (selectedRows.value?.findIndex((row) => isEqual(row, data)) !== -1) {
+      count += 1;
+    }
+  });
+  return count === workingList.value.length;
+});
+
+// Sort List by key and direction which can set to ascending or descending
+export type Direction = 'ascending' | 'descending';
+
+const sortList = (key: string, direction: Direction) => {
+  workingList.value = workingList.value?.sort((a, b) => {
+    const valueA = a[key] as string;
+    const valueB = b[key] as string;
+    return direction === 'ascending'
+      ? valueA.localeCompare(valueB)
+      : valueB.localeCompare(valueA);
+  });
+};
+
+watch(workingList.value, () => {
+  if (props.sort) {
+    sortList(props.sort.key, props.sort.direction);
+  }
+});
+
+// Searchbar functionality with optional debouncer
+const searchQuery = ref('');
+let debounceTimeout: NodeJS.Timeout;
+const isSpinnerEnabled = ref(false);
+
+const debounce = (func: () => void, delay: number) => {
+  clearTimeout(debounceTimeout);
+  debounceTimeout = setTimeout(func, delay);
+};
+
+const showSpinner = (duration: number = 500) => {
+  isSpinnerEnabled.value = true;
+  setTimeout(() => {
+    isSpinnerEnabled.value = false;
+  }, duration);
+};
+
+watch(searchQuery, () => {
+  if (props.searchBar?.debounce) {
+    debounce(() => {
+      showSpinner();
+      emit('search', searchQuery.value);
+    }, props.searchBar.debounce);
+  } else {
+    emit('search', searchQuery.value);
+  }
+});
+</script>
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
index 66bec95cd1..41802a7fbd 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
@@ -119,18 +119,18 @@ const deleteInvite = (inviteeEmail: string) => {
 const deleteUserInvitation = async (inviteeEmail: string | null) => {
   if (!inviteeEmail) {
     confirmDeletion.value = false;
-    toast.error(t('state.delete_invites_failure'));
+    toast.error(t('state.delete_invite_failure'));
     return;
   }
   const variables = { inviteeEmail };
   const result = await deleteInvitationMutation.executeMutation(variables);
   if (result.error) {
-    toast.error(t('state.delete_invites_failure'));
+    toast.error(t('state.delete_invite_failure'));
   } else {
     invitedUsers.value = invitedUsers.value?.filter(
       (request) => request.inviteeEmail !== inviteeEmail
     );
-    toast.success(t('state.delete_invites_success'));
+    toast.success(t('state.delete_invite_success'));
   }
 
   confirmDeletion.value = false;

From 8510e64a9f6b2076bccc4ab3599403e8b24dc61c Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Tue, 13 Feb 2024 11:42:24 +0530
Subject: [PATCH 20/60] refactor: updated mutations to adhere to the new format
 introduced in the backend

---
 .../helpers/backend/gql/mutations/DemoteUsersByAdmin.graphql   | 3 +++
 .../helpers/backend/gql/mutations/RemoveUsersAsAdmin.graphql   | 3 ---
 .../helpers/backend/gql/mutations/RemoveUsersByAdmin.graphql   | 2 +-
 .../backend/gql/mutations/RevokeUserInvitationByAdmin.graphql  | 3 ---
 .../backend/gql/mutations/RevokeUserInvitationsByAdmin.graphql | 3 +++
 5 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/DemoteUsersByAdmin.graphql
 delete mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersAsAdmin.graphql
 delete mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RevokeUserInvitationByAdmin.graphql
 create mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RevokeUserInvitationsByAdmin.graphql

diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/DemoteUsersByAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/DemoteUsersByAdmin.graphql
new file mode 100644
index 0000000000..b91992ce0f
--- /dev/null
+++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/DemoteUsersByAdmin.graphql
@@ -0,0 +1,3 @@
+mutation DemoteUsersByAdmin($userUIDs: [ID!]!) {
+  demoteUsersByAdmin(userUIDs: $userUIDs)
+}
diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersAsAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersAsAdmin.graphql
deleted file mode 100644
index a37bafdf80..0000000000
--- a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersAsAdmin.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation RemoveUsersAsAdmin($userUIDs: [ID!]!) {
-  removeUsersAsAdmin(userUIDs: $userUIDs)
-}
diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersByAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersByAdmin.graphql
index 7933f1a5e8..d3649e5f5f 100644
--- a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersByAdmin.graphql
+++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUsersByAdmin.graphql
@@ -1,7 +1,7 @@
 mutation RemoveUsersByAdmin($userUIDs: [ID!]!) {
   removeUsersByAdmin(userUIDs: $userUIDs) {
     userUID
-    success
+    isDeleted
     errorMessage
   }
 }
diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RevokeUserInvitationByAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RevokeUserInvitationByAdmin.graphql
deleted file mode 100644
index 2a16e9978d..0000000000
--- a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RevokeUserInvitationByAdmin.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation RevokeUserInvitationByAdmin($inviteeEmail: ID!) {
-  revokeUserInvitationByAdmin(inviteeEmail: $inviteeEmail)
-}
diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RevokeUserInvitationsByAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RevokeUserInvitationsByAdmin.graphql
new file mode 100644
index 0000000000..98ccac4c71
--- /dev/null
+++ b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RevokeUserInvitationsByAdmin.graphql
@@ -0,0 +1,3 @@
+mutation RevokeUserInvitationsByAdmin($inviteeEmails: [String!]!) {
+  revokeUserInvitationsByAdmin(inviteeEmails: $inviteeEmails)
+}

From fbe83104722c5abe545adecf3f8d3b682ed4db4e Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Tue, 13 Feb 2024 11:52:42 +0530
Subject: [PATCH 21/60] refactor: updated invited component to adhere to the
 new backend changes

---
 packages/hoppscotch-sh-admin/src/pages/users/invited.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
index 41802a7fbd..7aa67d3d68 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
@@ -66,7 +66,7 @@ import { computed, ref } from 'vue';
 import { useQuery, useMutation } from '@urql/vue';
 import {
   InvitedUsersDocument,
-  RevokeUserInvitationByAdminDocument,
+  RevokeUserInvitationsByAdminDocument,
 } from '../../helpers/backend/graphql';
 import { format } from 'date-fns';
 import { useRouter } from 'vue-router';
@@ -108,7 +108,7 @@ const invitedUsers = computed({
 const confirmDeletion = ref(false);
 const inviteToBeDeleted = ref<string | null>(null);
 const deleteInvitationMutation = useMutation(
-  RevokeUserInvitationByAdminDocument
+  RevokeUserInvitationsByAdminDocument
 );
 
 const deleteInvite = (inviteeEmail: string) => {
@@ -122,7 +122,7 @@ const deleteUserInvitation = async (inviteeEmail: string | null) => {
     toast.error(t('state.delete_invite_failure'));
     return;
   }
-  const variables = { inviteeEmail };
+  const variables = { inviteeEmails: [inviteeEmail] };
   const result = await deleteInvitationMutation.executeMutation(variables);
   if (result.error) {
     toast.error(t('state.delete_invite_failure'));

From 5d496a638bf659414868b04999028c350df800d5 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Tue, 13 Feb 2024 11:53:42 +0530
Subject: [PATCH 22/60] refactor: updated make users to admin and remove admin
 status to use only specific mutation each

---
 .../src/pages/users/index.vue                 | 234 +++++++++---------
 1 file changed, 116 insertions(+), 118 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 881ef9dd0a..70437365d9 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -103,8 +103,8 @@
                         @click="
                           () => {
                             user.isAdmin
-                              ? makeAdminToUser(user.uid)
-                              : makeUserAdmin(user.uid);
+                              ? makeAdminsUsers(user.uid)
+                              : makeUsersAdmin(user.uid);
                             hide();
                           }
                         "
@@ -175,29 +175,25 @@
       @hide-modal="confirmDeletion = false"
       @resolve="deleteUserMutation(deleteUserUID)"
     />
-    <HoppSmartConfirmModal
-      :show="confirmUserToAdmin"
-      :title="t('state.confirm_user_to_admin')"
-      @hide-modal="confirmUserToAdmin = false"
-      @resolve="makeUserAdminMutation(userToAdminUID)"
-    />
-    <HoppSmartConfirmModal
-      :show="confirmAdminToUser"
-      :title="t('state.confirm_admin_to_user')"
-      @hide-modal="confirmAdminToUser = false"
-      @resolve="makeAdminToUserMutation(adminToUserUID)"
-    />
     <HoppSmartConfirmModal
       :show="confirmUsersToAdmin"
-      :title="t('state.confirm_users_to_admin')"
+      :title="
+        AreMultipleUsersSelected
+          ? t('state.confirm_users_to_admin')
+          : t('state.confirm_user_to_admin')
+      "
       @hide-modal="confirmUsersToAdmin = false"
-      @resolve="makeUsersToAdmin"
+      @resolve="makeUsersToAdmin(usersToAdminUID)"
     />
     <HoppSmartConfirmModal
       :show="confirmAdminsToUsers"
-      :title="t('state.confirm_admins_to_users')"
+      :title="
+        AreMultipleUsersSelectedToAdmin
+          ? t('state.confirm_admins_to_users')
+          : t('state.confirm_admin_to_user')
+      "
       @hide-modal="confirmAdminsToUsers = false"
-      @resolve="makeAdminsToUsers"
+      @resolve="makeAdminsToUsers(adminsToUserUID)"
     />
     <HoppSmartConfirmModal
       :show="confirmUsersDeletion"
@@ -217,13 +213,12 @@ import { useI18n } from '~/composables/i18n';
 import { useToast } from '~/composables/toast';
 import { usePagedQuery } from '~/composables/usePagedQuery';
 import {
+  DemoteUsersByAdminDocument,
   InviteNewUserDocument,
-  MakeUserAdminDocument,
   MakeUsersAdminDocument,
   MetricsDocument,
   RemoveUserAsAdminDocument,
   RemoveUserByAdminDocument,
-  RemoveUsersAsAdminDocument,
   RemoveUsersByAdminDocument,
   UserInfoQuery,
   UsersListQuery,
@@ -327,111 +322,94 @@ const sendInvite = async (email: string) => {
   }
 };
 
-// Make a single user an admin
-const userToAdmin = useMutation(MakeUserAdminDocument);
-const confirmUserToAdmin = ref(false);
-const userToAdminUID = ref<string | null>(null);
-
-const makeUserAdmin = (id: string) => {
-  confirmUserToAdmin.value = true;
-  userToAdminUID.value = id;
-};
-
-const makeUserAdminMutation = async (id: string | null) => {
-  if (!id) {
-    confirmUserToAdmin.value = false;
-    toast.error(t('state.admin_failure'));
-    return;
-  }
-  const variables = { uid: id };
-  const result = await userToAdmin.executeMutation(variables);
-  if (result.error) {
-    toast.error(t('state.admin_failure'));
-  } else {
-    toast.success(t('state.admin_success'));
-    usersList.value = usersList.value.map((user) => ({
-      ...user,
-      isAdmin: user.uid === id ? true : user.isAdmin,
-    }));
-  }
-  confirmUserToAdmin.value = false;
-  userToAdminUID.value = null;
-};
-
 // Remove Admin Status from a Current Admin
-const adminToUser = useMutation(RemoveUserAsAdminDocument);
-const confirmAdminToUser = ref(false);
-const adminToUserUID = ref<string | null>(null);
-
-const makeAdminToUser = (id: string) => {
-  confirmAdminToUser.value = true;
-  adminToUserUID.value = id;
-};
-
-const makeAdminToUserMutation = async (id: string | null) => {
-  if (!id) {
-    confirmAdminToUser.value = false;
-    toast.error(t('state.remove_admin_failure'));
-    return;
-  }
-  const variables = { uid: id };
-  const result = await adminToUser.executeMutation(variables);
-  if (result.error) {
-    toast.error(t('state.remove_admin_failure'));
-  } else {
-    toast.success(t('state.remove_admin_success'));
-    usersList.value = usersList.value.map((user) => ({
-      ...user,
-      isAdmin: user.uid === id ? false : user.isAdmin,
-    }));
-  }
-  confirmAdminToUser.value = false;
-  adminToUserUID.value = null;
-};
+// const adminToUser = useMutation(RemoveUserAsAdminDocument);
+// const confirmAdminToUser = ref(false);
+// const adminToUserUID = ref<string | null>(null);
+
+// const makeAdminToUser = (id: string) => {
+//   confirmAdminToUser.value = true;
+//   adminToUserUID.value = id;
+// };
+
+// const makeAdminToUserMutation = async (id: string | null) => {
+//   if (!id) {
+//     confirmAdminToUser.value = false;
+//     toast.error(t('state.remove_admin_failure'));
+//     return;
+//   }
+//   const variables = { uid: id };
+//   const result = await adminToUser.executeMutation(variables);
+//   if (result.error) {
+//     toast.error(t('state.remove_admin_failure'));
+//   } else {
+//     toast.success(t('state.remove_admin_success'));
+//     usersList.value = usersList.value.map((user) => ({
+//       ...user,
+//       isAdmin: user.uid === id ? false : user.isAdmin,
+//     }));
+//   }
+//   confirmAdminToUser.value = false;
+//   adminToUserUID.value = null;
+// };
 
 // Delete a single user
-const userDeletion = useMutation(RemoveUserByAdminDocument);
-const confirmDeletion = ref(false);
-const deleteUserUID = ref<string | null>(null);
-
-const deleteUser = (id: string) => {
-  confirmDeletion.value = true;
-  deleteUserUID.value = id;
-};
-
-const deleteUserMutation = async (id: string | null) => {
-  if (!id) {
-    confirmDeletion.value = false;
-    toast.error(t('state.delete_user_failure'));
-    return;
-  }
-  const variables = { uid: id };
-  const result = await userDeletion.executeMutation(variables);
-  if (result.error) {
-    if (result.error.message === DELETE_USER_FAILED_ONLY_ONE_ADMIN) {
-      toast.error(t('state.delete_user_failed_only_one_admin'));
-    } else toast.error(t('state.delete_user_failure'));
-  } else {
-    toast.success(t('state.delete_user_success'));
-    usersList.value = usersList.value.filter((user) => user.uid !== id);
-  }
-  confirmDeletion.value = false;
-  deleteUserUID.value = null;
-};
+// const userDeletion = useMutation(RemoveUserByAdminDocument);
+// const confirmDeletion = ref(false);
+// const deleteUserUID = ref<string | null>(null);
+
+// const deleteUser = (id: string) => {
+//   confirmDeletion.value = true;
+//   deleteUserUID.value = id;
+// };
+
+// const deleteUserMutation = async (id: string | null) => {
+//   if (!id) {
+//     confirmDeletion.value = false;
+//     toast.error(t('state.delete_user_failure'));
+//     return;
+//   }
+//   const variables = { uid: id };
+//   const result = await userDeletion.executeMutation(variables);
+//   if (result.error) {
+//     if (result.error.message === DELETE_USER_FAILED_ONLY_ONE_ADMIN) {
+//       toast.error(t('state.delete_user_failed_only_one_admin'));
+//     } else toast.error(t('state.delete_user_failure'));
+//   } else {
+//     toast.success(t('state.delete_user_success'));
+//     usersList.value = usersList.value.filter((user) => user.uid !== id);
+//   }
+//   confirmDeletion.value = false;
+//   deleteUserUID.value = null;
+// };
 
 // Make Multiple Users Admin
-const usersToAdmin = useMutation(MakeUsersAdminDocument);
 const confirmUsersToAdmin = ref(false);
+const usersToAdminUID = ref<string | null>(null);
+const usersToAdmin = useMutation(MakeUsersAdminDocument);
 
-const makeUsersToAdmin = async () => {
-  const userUIDs = selectedRows.value.map((user) => user.uid);
+const AreMultipleUsersSelected = computed(
+  () => usersToAdminUID.value === null && selectedRows.value.length > 0
+);
+
+const makeUsersAdmin = (id: string | null) => {
+  confirmUsersToAdmin.value = true;
+  usersToAdminUID.value = id;
+};
 
+const makeUsersToAdmin = async (id: string | null) => {
+  const userUIDs = id ? [id] : selectedRows.value.map((user) => user.uid);
   const variables = { userUIDs };
   const result = await usersToAdmin.executeMutation(variables);
+
   if (result.error) {
-    toast.error(t('state.users_to_admin_failure'));
+    toast.error(
+      id ? t('state.admin_failure') : t('state.users_to_admin_failure')
+    );
   } else {
-    toast.success(t('state.users_to_admin_success'));
+    toast.success(
+      id ? t('state.admin_success') : t('state.users_to_admin_success')
+    );
     usersList.value = usersList.value.map((user) => ({
       ...user,
       isAdmin: userUIDs.includes(user.uid) ? true : user.isAdmin,
@@ -439,21 +417,40 @@ const makeUsersToAdmin = async () => {
     selectedRows.value.splice(0, selectedRows.value.length);
   }
   confirmUsersToAdmin.value = false;
+  usersToAdminUID.value = null;
 };
 
 // Remove Admin Status from Multiple Users
-const adminsToUser = useMutation(RemoveUsersAsAdminDocument);
+const adminsToUser = useMutation(DemoteUsersByAdminDocument);
 const confirmAdminsToUsers = ref(false);
+const adminsToUserUID = ref<string | null>(null);
 
-const makeAdminsToUsers = async () => {
-  const userUIDs = selectedRows.value.map((user) => user.uid);
+const makeAdminsUsers = (id: string | null) => {
+  confirmAdminsToUsers.value = true;
+  adminsToUserUID.value = id;
+};
+
+const AreMultipleUsersSelectedToAdmin = computed(
+  () => adminsToUserUID.value === null && selectedRows.value.length > 0
+);
+
+const makeAdminsToUsers = async (id: string | null) => {
+  const userUIDs = id ? [id] : selectedRows.value.map((user) => user.uid);
 
   const variables = { userUIDs };
   const result = await adminsToUser.executeMutation(variables);
   if (result.error) {
-    toast.error(t('state.remove_admin_from_users_failure'));
+    toast.error(
+      id
+        ? t('state.remove_admin_failure')
+        : t('state.remove_admin_from_users_failure')
+    );
   } else {
-    toast.success(t('state.remove_admin_from_users_success'));
+    toast.success(
+      id
+        ? t('state.remove_admin_success')
+        : t('state.remove_admin_from_users_success')
+    );
     usersList.value = usersList.value.map((user) => ({
       ...user,
       isAdmin: userUIDs.includes(user.uid) ? false : user.isAdmin,
@@ -462,6 +459,7 @@ const makeAdminsToUsers = async () => {
     selectedRows.value.splice(0, selectedRows.value.length);
   }
   confirmAdminsToUsers.value = false;
+  adminsToUserUID.value = null;
 };
 
 // Delete Multiple Users

From f75106772faa359ed0bd633a74d12b6257a25416 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Tue, 13 Feb 2024 11:55:16 +0530
Subject: [PATCH 23/60] refactor: removed decprecated mutations

---
 .../src/helpers/backend/gql/mutations/MakeUserAdmin.graphql    | 3 ---
 .../helpers/backend/gql/mutations/RemoveUserAsAdmin.graphql    | 3 ---
 2 files changed, 6 deletions(-)
 delete mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/MakeUserAdmin.graphql
 delete mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserAsAdmin.graphql

diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/MakeUserAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/MakeUserAdmin.graphql
deleted file mode 100644
index 89c31c37f1..0000000000
--- a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/MakeUserAdmin.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation MakeUserAdmin($uid: ID!) {
-  makeUserAdmin(userUID: $uid)
-}
diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserAsAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserAsAdmin.graphql
deleted file mode 100644
index 3fc2374bb3..0000000000
--- a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserAsAdmin.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation RemoveUserAsAdmin($uid: ID!) {
-  removeUserAsAdmin(userUID: $uid)
-}

From 5bb5fbf477bac6f65ad045cd5e11475681a37524 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Tue, 13 Feb 2024 12:04:27 +0530
Subject: [PATCH 24/60] refactor: updated deletion of users operation to use
 only one mutation

---
 .../gql/mutations/RemoveUserByAdmin.graphql   |   3 -
 .../src/pages/users/index.vue                 | 104 +++++-------------
 2 files changed, 29 insertions(+), 78 deletions(-)
 delete mode 100644 packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserByAdmin.graphql

diff --git a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserByAdmin.graphql b/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserByAdmin.graphql
deleted file mode 100644
index 2ee09541ff..0000000000
--- a/packages/hoppscotch-sh-admin/src/helpers/backend/gql/mutations/RemoveUserByAdmin.graphql
+++ /dev/null
@@ -1,3 +0,0 @@
-mutation RemoveUserByAdmin($uid: ID!) {
-  removeUserByAdmin(userUID: $uid)
-}
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 70437365d9..c68e2dfc15 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -169,12 +169,6 @@
       @hide-modal="showInviteUserModal = false"
       @send-invite="sendInvite"
     />
-    <HoppSmartConfirmModal
-      :show="confirmDeletion"
-      :title="t('state.confirm_user_deletion')"
-      @hide-modal="confirmDeletion = false"
-      @resolve="deleteUserMutation(deleteUserUID)"
-    />
     <HoppSmartConfirmModal
       :show="confirmUsersToAdmin"
       :title="
@@ -197,9 +191,13 @@
     />
     <HoppSmartConfirmModal
       :show="confirmUsersDeletion"
-      :title="t('state.confirm_users_deletion')"
+      :title="
+        AreMultipleUsersSelectedForDeletion
+          ? t('state.confirm_users_deletion')
+          : t('state.confirm_user_deletion')
+      "
       @hide-modal="confirmUsersDeletion = false"
-      @resolve="deleteUsers"
+      @resolve="deleteUsers(deleteUserUID)"
     />
   </div>
 </template>
@@ -217,8 +215,6 @@ import {
   InviteNewUserDocument,
   MakeUsersAdminDocument,
   MetricsDocument,
-  RemoveUserAsAdminDocument,
-  RemoveUserByAdminDocument,
   RemoveUsersByAdminDocument,
   UserInfoQuery,
   UsersListQuery,
@@ -322,67 +318,6 @@ const sendInvite = async (email: string) => {
   }
 };
 
-// Remove Admin Status from a Current Admin
-// const adminToUser = useMutation(RemoveUserAsAdminDocument);
-// const confirmAdminToUser = ref(false);
-// const adminToUserUID = ref<string | null>(null);
-
-// const makeAdminToUser = (id: string) => {
-//   confirmAdminToUser.value = true;
-//   adminToUserUID.value = id;
-// };
-
-// const makeAdminToUserMutation = async (id: string | null) => {
-//   if (!id) {
-//     confirmAdminToUser.value = false;
-//     toast.error(t('state.remove_admin_failure'));
-//     return;
-//   }
-//   const variables = { uid: id };
-//   const result = await adminToUser.executeMutation(variables);
-//   if (result.error) {
-//     toast.error(t('state.remove_admin_failure'));
-//   } else {
-//     toast.success(t('state.remove_admin_success'));
-//     usersList.value = usersList.value.map((user) => ({
-//       ...user,
-//       isAdmin: user.uid === id ? false : user.isAdmin,
-//     }));
-//   }
-//   confirmAdminToUser.value = false;
-//   adminToUserUID.value = null;
-// };
-
-// Delete a single user
-// const userDeletion = useMutation(RemoveUserByAdminDocument);
-// const confirmDeletion = ref(false);
-// const deleteUserUID = ref<string | null>(null);
-
-// const deleteUser = (id: string) => {
-//   confirmDeletion.value = true;
-//   deleteUserUID.value = id;
-// };
-
-// const deleteUserMutation = async (id: string | null) => {
-//   if (!id) {
-//     confirmDeletion.value = false;
-//     toast.error(t('state.delete_user_failure'));
-//     return;
-//   }
-//   const variables = { uid: id };
-//   const result = await userDeletion.executeMutation(variables);
-//   if (result.error) {
-//     if (result.error.message === DELETE_USER_FAILED_ONLY_ONE_ADMIN) {
-//       toast.error(t('state.delete_user_failed_only_one_admin'));
-//     } else toast.error(t('state.delete_user_failure'));
-//   } else {
-//     toast.success(t('state.delete_user_success'));
-//     usersList.value = usersList.value.filter((user) => user.uid !== id);
-//   }
-//   confirmDeletion.value = false;
-//   deleteUserUID.value = null;
-// };
-
 // Make Multiple Users Admin
 const confirmUsersToAdmin = ref(false);
 const usersToAdminUID = ref<string | null>(null);
@@ -465,21 +400,40 @@ const makeAdminsToUsers = async (id: string | null) => {
 // Delete Multiple Users
 const usersDeletion = useMutation(RemoveUsersByAdminDocument);
 const confirmUsersDeletion = ref(false);
+const deleteUserUID = ref<string | null>(null);
+
+const deleteUser = (id: string | null) => {
+  confirmUsersDeletion.value = true;
+  deleteUserUID.value = id;
+};
+
+const AreMultipleUsersSelectedForDeletion = computed(
+  () => deleteUserUID.value === null && selectedRows.value.length > 0
+);
 
-const deleteUsers = async () => {
-  const userUIDs = selectedRows.value.map((user) => user.uid);
+const deleteUsers = async (id: string | null) => {
+  const userUIDs = id ? [id] : selectedRows.value.map((user) => user.uid);
 
   const variables = { userUIDs };
   const result = await usersDeletion.executeMutation(variables);
   if (result.error) {
-    toast.error(t('state.delete_users_failure'));
+    if (result.error.message === DELETE_USER_FAILED_ONLY_ONE_ADMIN) {
+      toast.error(t('state.delete_user_failed_only_one_admin'));
+    } else {
+      toast.error(
+        id ? t('state.delete_user_failure') : t('state.delete_users_failure')
+      );
+    }
   } else {
-    toast.success(t('state.delete_user_success'));
+    toast.success(
+      id ? t('state.delete_user_success') : t('state.delete_users_success')
+    );
     usersList.value = usersList.value.filter(
       (user) => !userUIDs.includes(user.uid)
     );
     selectedRows.value.splice(0, selectedRows.value.length);
   }
   confirmUsersDeletion.value = false;
+  deleteUserUID.value = null;
 };
 </script>

From 2b4d08dee113fd80d6da68672eabc8098dd4ec80 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Tue, 13 Feb 2024 18:30:48 +0530
Subject: [PATCH 25/60] style: removed padding for shared request error message

---
 .../hoppscotch-sh-admin/src/components/users/SharedRequests.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue b/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
index 9c8b36ef12..4d3bb0407f 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
@@ -6,7 +6,7 @@
 
     <div v-else-if="error">{{ t('shared_requests.load_list_error') }}</div>
 
-    <div v-else-if="sharedRequests.length === 0" class="mt-5">
+    <div v-else-if="sharedRequests.length === 0">
       {{ t('users.no_shared_requests') }}
     </div>
 

From c118393d07d2846a3c9378169512c472860dcb3f Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Tue, 13 Feb 2024 18:33:08 +0530
Subject: [PATCH 26/60] refactor: deletion of a single user now uses the new
 mutation

---
 .../src/pages/users/index.vue                 | 44 ++++++++++++++-----
 1 file changed, 33 insertions(+), 11 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index c68e2dfc15..f73c7bf40c 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -413,24 +413,46 @@ const AreMultipleUsersSelectedForDeletion = computed(
 
 const deleteUsers = async (id: string | null) => {
   const userUIDs = id ? [id] : selectedRows.value.map((user) => user.uid);
-
   const variables = { userUIDs };
   const result = await usersDeletion.executeMutation(variables);
+
   if (result.error) {
-    if (result.error.message === DELETE_USER_FAILED_ONLY_ONE_ADMIN) {
-      toast.error(t('state.delete_user_failed_only_one_admin'));
-    } else {
-      toast.error(
-        id ? t('state.delete_user_failure') : t('state.delete_users_failure')
-      );
-    }
+    const errorMessage =
+      result.error.message === DELETE_USER_FAILED_ONLY_ONE_ADMIN
+        ? t('state.delete_user_failed_only_one_admin')
+        : id
+        ? t('state.delete_user_failure')
+        : t('state.delete_users_failure');
+    toast.error(errorMessage);
   } else {
-    toast.success(
-      id ? t('state.delete_user_success') : t('state.delete_users_success')
+    const deletedUsers = result.data?.removeUsersByAdmin || [];
+    const deletedIDs = deletedUsers
+      .filter((user) => user.isDeleted)
+      .map((user) => user.userUID);
+
+    const isAdminError = deletedUsers.some(
+      (user) => user.errorMessage === 'admin/admin_can_not_be_deleted'
     );
+
     usersList.value = usersList.value.filter(
-      (user) => !userUIDs.includes(user.uid)
+      (user) => !deletedIDs.includes(user.uid)
     );
+
+    if (isAdminError) {
+      toast.success(
+        `Number of Users Deleted Successfully: ${deletedIDs.length}`
+      );
+      toast.error(
+        `Users Not Deleted Due to Admin Status: ${
+          deletedUsers.length - deletedIDs.length
+        }. \nPlease remove admin status before deleting users`
+      );
+    } else {
+      toast.success(
+        id ? t('state.delete_user_success') : t('state.delete_users_success')
+      );
+    }
+
     selectedRows.value.splice(0, selectedRows.value.length);
   }
   confirmUsersDeletion.value = false;

From 1e3272fce517c7c311eee90325833009f023a615 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Tue, 13 Feb 2024 18:40:35 +0530
Subject: [PATCH 27/60] refactor: updated styles and i18n strings in invited
 components

---
 packages/hoppscotch-sh-admin/locales/en.json             | 2 +-
 packages/hoppscotch-sh-admin/src/pages/users/invited.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/locales/en.json b/packages/hoppscotch-sh-admin/locales/en.json
index 8f59704d9d..ff1e3bed2a 100644
--- a/packages/hoppscotch-sh-admin/locales/en.json
+++ b/packages/hoppscotch-sh-admin/locales/en.json
@@ -269,7 +269,7 @@
     "load_list_error": "Unable to Load Users List",
     "make_admin": "Make Admin",
     "name": "Name",
-    "no_invite": "No invited users found",
+    "no_invite": "No pending invites found",
     "no_shared_requests": "No shared requests created by the user",
     "no_users": "No users found",
     "not_found": "User not found",
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
index 7aa67d3d68..2583e8a8eb 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
@@ -16,7 +16,7 @@
           <HoppSmartSpinner />
         </div>
 
-        <div v-else-if="error" class="text-xl">
+        <div v-else-if="error">
           {{ t('users.invite_load_list_error') }}
         </div>
 
@@ -49,7 +49,7 @@
           </template>
         </UsersTable>
 
-        <div v-else class="text-lg">{{ t('users.no_invite') }}</div>
+        <div v-else>{{ t('users.no_invite') }}</div>
       </div>
     </div>
     <HoppSmartConfirmModal

From e24b961a7a407384e13364534d5608d362912049 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Tue, 13 Feb 2024 18:42:07 +0530
Subject: [PATCH 28/60] refactor: updated individual user components to adhere
 to the new backend changes

---
 .../src/pages/users/_id.vue                   | 98 +++++++++++--------
 1 file changed, 55 insertions(+), 43 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/_id.vue b/packages/hoppscotch-sh-admin/src/pages/users/_id.vue
index 8d7acdae6d..162875a73b 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/_id.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/_id.vue
@@ -68,9 +68,9 @@ import { useI18n } from '~/composables/i18n';
 import { useToast } from '~/composables/toast';
 import { useClientHandler } from '~/composables/useClientHandler';
 import {
-  MakeUserAdminDocument,
-  RemoveUserAsAdminDocument,
-  RemoveUserByAdminDocument,
+  DemoteUsersByAdminDocument,
+  MakeUsersAdminDocument,
+  RemoveUsersByAdminDocument,
   UserInfoDocument,
 } from '~/helpers/backend/graphql';
 
@@ -123,43 +123,11 @@ const user = computed({
   },
 });
 
-// User Deletion
-const router = useRouter();
-const userDeletion = useMutation(RemoveUserByAdminDocument);
-const confirmDeletion = ref(false);
-const deleteUserUID = ref<string | null>(null);
-
-const deleteUser = (id: string) => {
-  confirmDeletion.value = true;
-  deleteUserUID.value = id;
-};
-
-const deleteUserMutation = async (id: string | null) => {
-  if (!id) {
-    confirmDeletion.value = false;
-    toast.error(t('state.delete_user_failure'));
-    return;
-  }
-  const variables = { uid: id };
-  const result = await userDeletion.executeMutation(variables);
-
-  if (result.error) {
-    toast.error(t('state.delete_user_failure'));
-  } else {
-    toast.success(t('state.delete_user_success'));
-  }
-
-  confirmDeletion.value = false;
-  deleteUserUID.value = null;
-  router.push('/users');
-};
-
-// Make User Admin
-const userToAdmin = useMutation(MakeUserAdminDocument);
 const confirmUserToAdmin = ref(false);
 const userToAdminUID = ref<string | null>(null);
+const usersToAdmin = useMutation(MakeUsersAdminDocument);
 
-const makeUserAdmin = (id: string) => {
+const makeUserAdmin = (id: string | null) => {
   confirmUserToAdmin.value = true;
   userToAdminUID.value = id;
 };
@@ -170,20 +138,23 @@ const makeUserAdminMutation = async (id: string | null) => {
     toast.error(t('state.admin_failure'));
     return;
   }
-  const variables = { uid: id };
-  const result = await userToAdmin.executeMutation(variables);
+
+  const userUIDs = [id];
+  const variables = { userUIDs };
+  const result = await usersToAdmin.executeMutation(variables);
+
   if (result.error) {
     toast.error(t('state.admin_failure'));
   } else {
-    user.value!.isAdmin = true;
     toast.success(t('state.admin_success'));
+    user.value!.isAdmin = true;
   }
   confirmUserToAdmin.value = false;
   userToAdminUID.value = null;
 };
 
 // Remove Admin Status from a current admin user
-const adminToUser = useMutation(RemoveUserAsAdminDocument);
+const adminToUser = useMutation(DemoteUsersByAdminDocument);
 const confirmAdminToUser = ref(false);
 const adminToUserUID = ref<string | null>(null);
 
@@ -198,15 +169,56 @@ const makeAdminToUserMutation = async (id: string | null) => {
     toast.error(t('state.remove_admin_failure'));
     return;
   }
-  const variables = { uid: id };
+
+  const userUIDs = [id];
+  const variables = { userUIDs };
   const result = await adminToUser.executeMutation(variables);
   if (result.error) {
     toast.error(t('state.remove_admin_failure'));
   } else {
+    toast.success(t('state.remove_admin_success'));
     user.value!.isAdmin = false;
-    toast.error(t('state.remove_admin_success'));
   }
   confirmAdminToUser.value = false;
   adminToUserUID.value = null;
 };
+
+// User Deletion
+const router = useRouter();
+const userDeletion = useMutation(RemoveUsersByAdminDocument);
+const confirmDeletion = ref(false);
+const deleteUserUID = ref<string | null>(null);
+
+const deleteUser = (id: string) => {
+  confirmDeletion.value = true;
+  deleteUserUID.value = id;
+};
+
+const deleteUserMutation = async (id: string | null) => {
+  if (!id) {
+    confirmDeletion.value = false;
+    toast.error(t('state.delete_user_failure'));
+    return;
+  }
+  const userUIDs = [id];
+  const variables = { userUIDs };
+  const result = await userDeletion.executeMutation(variables);
+
+  if (result.error) {
+    toast.error(t('state.delete_user_failure'));
+  } else {
+    const deletedUsers = result.data?.removeUsersByAdmin || [];
+
+    const isAdminError = deletedUsers.some(
+      (user) => user.errorMessage === 'admin/admin_can_not_be_deleted'
+    );
+
+    isAdminError
+      ? toast.error(t('state.delete_user_failed_only_one_admin'))
+      : toast.success(t('state.delete_user_success'));
+  }
+  confirmDeletion.value = false;
+  deleteUserUID.value = null;
+  router.push('/users');
+};
 </script>

From 42a2e37183f9041a952a53c043c44e91c76ae6be Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Wed, 14 Feb 2024 09:31:21 +0530
Subject: [PATCH 29/60] feat: added spinner functionality to the users table

---
 .../src/components/users/Table.vue            | 52 ++++++++++++-------
 .../src/pages/users/index.vue                 |  2 +
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/components/users/Table.vue b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
index 5edde47f7e..a5095c1639 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/Table.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
@@ -100,7 +100,7 @@
 <script lang="ts" setup>
 import { useVModel } from '@vueuse/core';
 import { isEqual } from 'lodash-es';
-import { computed, ref, watch } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import IconLeft from '~icons/lucide/arrow-left';
 import IconRight from '~icons/lucide/arrow-right';
 
@@ -143,6 +143,12 @@ const props = withDefaults(
     pagination?: {
       totalPages: number;
     };
+
+    /** Whether to show the spinner */
+    spinner?: {
+      enabled: boolean;
+      duration?: number;
+    };
   }>(),
   {
     showYBorder: false,
@@ -170,15 +176,12 @@ enum PageDirection {
 }
 
 const changePage = (direction: PageDirection) => {
-  if (direction === PageDirection.Previous && page.value > 1) {
-    showSpinner(300);
-    page.value -= 1;
-  } else if (
-    direction === PageDirection.Next &&
-    page.value < props.pagination!.totalPages
+  const isPrevious = direction === PageDirection.Previous;
+  if (
+    (isPrevious && page.value > 1) ||
+    (!isPrevious && page.value < props.pagination!.totalPages)
   ) {
-    showSpinner(300);
-    page.value += 1;
+    page.value += isPrevious ? -1 : 1;
   }
 
   emit('pageNumber', page.value);
@@ -187,6 +190,28 @@ const changePage = (direction: PageDirection) => {
 // The working version of the list that is used to perform operations upon
 const workingList = useVModel(props, 'list', emit);
 
+// Spinner functionality
+const isSpinnerEnabled = ref(false);
+const showSpinner = (duration: number = 500) => {
+  isSpinnerEnabled.value = true;
+  setTimeout(() => {
+    isSpinnerEnabled.value = false;
+  }, duration);
+};
+
+watch(
+  () => props.spinner,
+  () => {
+    if (props.spinner?.enabled === true) {
+      showSpinner(props.spinner.duration);
+    }
+  }
+);
+
+onMounted(() => {
+  isSpinnerEnabled.value = props.spinner?.enabled ?? false;
+});
+
 // Checkbox functionality
 const selectedRows = useVModel(props, 'selectedRows', emit);
 
@@ -274,24 +299,15 @@ watch(workingList.value, () => {
 // Searchbar functionality with optional debouncer
 const searchQuery = ref('');
 let debounceTimeout: NodeJS.Timeout;
-const isSpinnerEnabled = ref(false);
 
 const debounce = (func: () => void, delay: number) => {
   clearTimeout(debounceTimeout);
   debounceTimeout = setTimeout(func, delay);
 };
 
-const showSpinner = (duration: number = 500) => {
-  isSpinnerEnabled.value = true;
-  setTimeout(() => {
-    isSpinnerEnabled.value = false;
-  }, duration);
-};
-
 watch(searchQuery, () => {
   if (props.searchBar?.debounce) {
     debounce(() => {
-      showSpinner();
       emit('search', searchQuery.value);
     }, props.searchBar.debounce);
   } else {
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index f73c7bf40c..dc03c72bc8 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -33,6 +33,7 @@
             debounce: 1000,
             placeholder: t('users.searchbar_placeholder'),
           }"
+          :spinner="{ enabled: fetching, duration: 1000 }"
           :pagination="{ totalPages: totalPages }"
           @onRowClicked="goToUserDetails"
           @search="handleSearch"
@@ -248,6 +249,7 @@ const headings = [
 // Get Paginated Results of all the users in the infra
 const usersPerPage = 20;
 const {
+  fetching,
   error,
   refetch,
   list: usersList,

From 156baa16a11631b6034242ba2fd1bd69b5c8ff8a Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Wed, 14 Feb 2024 11:15:14 +0530
Subject: [PATCH 30/60] feat: bulk actions are now possible with pending
 invites

---
 .../src/pages/users/invited.vue               | 59 ++++++++++++++-----
 1 file changed, 43 insertions(+), 16 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
index 2583e8a8eb..f8cd9393d0 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
@@ -24,6 +24,9 @@
           v-if="invitedUsers?.length"
           :headings="headings"
           :list="invitedUsers"
+          :checkbox="true"
+          :spinner="{ enabled: fetching, duration: 1000 }"
+          :selectedRows="selectedRows"
         >
           <template #invitedOn="{ item }">
             <div v-if="item" class="pr-2 truncate">
@@ -49,7 +52,28 @@
           </template>
         </UsersTable>
 
-        <div v-else>{{ t('users.no_invite') }}</div>
+        <div
+          v-if="selectedRows.length"
+          class="fixed m-2 bottom-0 left-40 right-0 w-min mx-auto shadow-2xl"
+        >
+          <div
+            class="flex justify-center items-end bg-primaryLight border border-divider rounded-md mb-5"
+          >
+            <HoppButtonSecondary
+              :label="t('state.selected', { count: selectedRows.length })"
+              class="py-4 border-divider rounded-r-none bg-emerald-800 text-secondaryDark"
+            />
+
+            <HoppButtonSecondary
+              :icon="IconTrash"
+              label="Revoke Invitation"
+              class="py-4 border-divider rounded-l-none hover:bg-red-500"
+              @click="confirmDeletion = true"
+            />
+          </div>
+        </div>
+
+        <div v-if="invitedUsers?.length === 0">{{ t('users.no_invite') }}</div>
       </div>
     </div>
     <HoppSmartConfirmModal
@@ -62,18 +86,18 @@
 </template>
 
 <script setup lang="ts">
+import { useMutation, useQuery } from '@urql/vue';
+import { format } from 'date-fns';
 import { computed, ref } from 'vue';
-import { useQuery, useMutation } from '@urql/vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from '~/composables/i18n';
+import { useToast } from '~/composables/toast';
+import IconTrash from '~icons/lucide/trash';
 import {
   InvitedUsersDocument,
+  InvitedUsersQuery,
   RevokeUserInvitationsByAdminDocument,
 } from '../../helpers/backend/graphql';
-import { format } from 'date-fns';
-import { useRouter } from 'vue-router';
-import { useI18n } from '~/composables/i18n';
-import IconTrash from '~icons/lucide/trash';
-import { useToast } from '~/composables/toast';
-import { HoppButtonPrimary } from '@hoppscotch/ui';
 
 const t = useI18n();
 const toast = useToast();
@@ -95,6 +119,9 @@ const headings = [
   { key: 'action', label: 'Action' },
 ];
 
+// Selected Rows
+const selectedRows = ref<InvitedUsersQuery['infra']['invitedUsers']>([]);
+
 // Invited Users
 const invitedUsers = computed({
   get: () => data.value?.infra.invitedUsers,
@@ -111,25 +138,25 @@ const deleteInvitationMutation = useMutation(
   RevokeUserInvitationsByAdminDocument
 );
 
-const deleteInvite = (inviteeEmail: string) => {
+const deleteInvite = (inviteeEmail: string | null) => {
   confirmDeletion.value = true;
   inviteToBeDeleted.value = inviteeEmail;
 };
 
 const deleteUserInvitation = async (inviteeEmail: string | null) => {
-  if (!inviteeEmail) {
-    confirmDeletion.value = false;
-    toast.error(t('state.delete_invite_failure'));
-    return;
-  }
-  const variables = { inviteeEmails: [inviteeEmail] };
+  const inviteeEmails = inviteeEmail
+    ? [inviteeEmail]
+    : selectedRows.value.map((row) => row.inviteeEmail);
+
+  const variables = { inviteeEmails };
   const result = await deleteInvitationMutation.executeMutation(variables);
   if (result.error) {
     toast.error(t('state.delete_invite_failure'));
   } else {
     invitedUsers.value = invitedUsers.value?.filter(
-      (request) => request.inviteeEmail !== inviteeEmail
+      (user) => !inviteeEmails.includes(user.inviteeEmail)
     );
+    selectedRows.value.splice(0, selectedRows.value.length);
     toast.success(t('state.delete_invite_success'));
   }
 

From 90309c0799b2956cc458afd50b3d44c8fa8713e1 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Wed, 14 Feb 2024 11:16:10 +0530
Subject: [PATCH 31/60] refactor: fixed infinite spinner issue

---
 packages/hoppscotch-sh-admin/src/components/users/Table.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/components/users/Table.vue b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
index a5095c1639..0ecfc7ca0a 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/Table.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
@@ -208,10 +208,6 @@ watch(
   }
 );
 
-onMounted(() => {
-  isSpinnerEnabled.value = props.spinner?.enabled ?? false;
-});
-
 // Checkbox functionality
 const selectedRows = useVModel(props, 'selectedRows', emit);
 

From 46f9c6ef202c503aad041cef5360e4faf43ade12 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Wed, 14 Feb 2024 11:27:53 +0530
Subject: [PATCH 32/60] fix: spinner issue in table

---
 packages/hoppscotch-sh-admin/src/components/users/Table.vue | 2 +-
 packages/hoppscotch-sh-admin/src/pages/users/index.vue      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/components/users/Table.vue b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
index 0ecfc7ca0a..df83888755 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/Table.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
@@ -37,7 +37,7 @@
       <HoppSmartSpinner />
     </div>
 
-    <table v-else class="w-full">
+    <table v-else-if="list" class="w-full">
       <thead>
         <tr
           class="border-b border-dividerDark bg-primaryLight text-left text-sm text-secondary"
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index dc03c72bc8..0941d704fe 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -24,7 +24,7 @@
         <div v-if="error">{{ t('users.load_list_error') }}</div>
 
         <UsersTable
-          v-if="usersList.length >= 0"
+          v-if="usersList"
           :headings="headings"
           :list="usersList"
           :checkbox="true"
@@ -247,7 +247,7 @@ const headings = [
 ];
 
 // Get Paginated Results of all the users in the infra
-const usersPerPage = 20;
+const usersPerPage = 2;
 const {
   fetching,
   error,

From b26f67f97cf8fe7de6d7af5ad515595ec863c33b Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 15 Feb 2024 16:50:40 +0530
Subject: [PATCH 33/60] refactor: code improvements and new i18n strings for
 invited component

---
 packages/hoppscotch-sh-admin/locales/en.json  |  8 +++-
 .../src/pages/users/invited.vue               | 45 ++++++++++++-------
 2 files changed, 35 insertions(+), 18 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/locales/en.json b/packages/hoppscotch-sh-admin/locales/en.json
index ff1e3bed2a..a6858176b6 100644
--- a/packages/hoppscotch-sh-admin/locales/en.json
+++ b/packages/hoppscotch-sh-admin/locales/en.json
@@ -109,7 +109,8 @@
     "configure_auth": "Check out the documentation to configure auth providers.",
     "confirm_admin_to_user": "Do you want to remove admin status from this user?",
     "confirm_admins_to_users": "Do you want to remove admin status from selected users?",
-    "confirm_delete_invites": "Do you want to revoke the selected invite?",
+    "confirm_delete_invite": "Do you want to revoke the selected invite?",
+    "confirm_delete_invites": "Do you want to revoke selected invites?",
     "confirm_user_deletion": "Confirm user deletion?",
     "confirm_users_deletion": "Do you want to delete selected users?",
     "confirm_user_to_admin": "Do you want to make this user into an admin?",
@@ -125,11 +126,15 @@
     "create_team_success": "Workspace created successfully!!",
     "data_sharing_failure": "Failed to update data sharing settings",
     "delete_invite_failure": "Failed to delete invite!!",
+    "delete_invites_failure": "Failed to delete selected invites!!",
     "delete_invite_success": "Invite deleted successfully!!",
+    "delete_invites_success": "Selected invites deleted successfully!!",
     "delete_request_failure": "Shared Request deletion failed!!",
     "delete_request_success": "Shared Request deleted successfully!!",
     "delete_team_failure": "Workspace deletion failed!!",
     "delete_team_success": "Workspace deleted successfully!!",
+    "delete_some_users_failure": "Users Not Deleted Due to Admin Status: {count}. Please remove admin status before deleting users",
+    "delete_some_users_success": "Number of Users Deleted Successfully: {count}",
     "delete_user_failed_only_one_admin": "Failed to delete user. There should be atleast one admin!!",
     "delete_user_failure": "User deletion failed!!",
     "delete_users_failure": "Failed to delete selected users!!",
@@ -277,6 +282,7 @@
     "remove_admin_privilege": "Remove Admin Privilege",
     "remove_admin_status": "Remove Admin Status",
     "rename": "Rename",
+    "revoke_invitation": "Revoke Invitation",
     "searchbar_placeholder": "Search by name or email..",
     "send_invite": "Send Invite",
     "show_more": "Show more",
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
index f8cd9393d0..f578d9e77f 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
@@ -21,11 +21,11 @@
         </div>
 
         <UsersTable
-          v-if="invitedUsers?.length"
+          v-if="pendingInvites"
           :headings="headings"
-          :list="invitedUsers"
+          :list="pendingInvites"
           :checkbox="true"
-          :spinner="{ enabled: fetching, duration: 1000 }"
+          :spinner="{ enabled: fetching, duration: 500 }"
           :selectedRows="selectedRows"
         >
           <template #invitedOn="{ item }">
@@ -44,9 +44,9 @@
             <div v-if="item" class="my-1 mr-2">
               <HoppButtonPrimary
                 :icon="IconTrash"
-                label="Revoke Invitation"
+                :label="t('users.revoke_invitation')"
                 class="bg-red-500 hover:bg-red-600"
-                @click="deleteInvite(item.inviteeEmail)"
+                @click="confirmInviteDeletion(item.inviteeEmail)"
               />
             </div>
           </template>
@@ -66,21 +66,27 @@
 
             <HoppButtonSecondary
               :icon="IconTrash"
-              label="Revoke Invitation"
+              :label="t('users.revoke_invitation')"
               class="py-4 border-divider rounded-l-none hover:bg-red-500"
               @click="confirmDeletion = true"
             />
           </div>
         </div>
 
-        <div v-if="invitedUsers?.length === 0">{{ t('users.no_invite') }}</div>
+        <div v-if="pendingInvites?.length === 0">
+          {{ t('users.no_invite') }}
+        </div>
       </div>
     </div>
     <HoppSmartConfirmModal
       :show="confirmDeletion"
-      :title="t('state.confirm_delete_invites')"
+      :title="
+        selectedRows.length > 0
+          ? t('state.confirm_delete_invites')
+          : t('state.confirm_delete_invite')
+      "
       @hide-modal="confirmDeletion = false"
-      @resolve="deleteUserInvitation(inviteToBeDeleted)"
+      @resolve="deleteInvitation(inviteToBeDeleted)"
     />
   </div>
 </template>
@@ -123,7 +129,7 @@ const headings = [
 const selectedRows = ref<InvitedUsersQuery['infra']['invitedUsers']>([]);
 
 // Invited Users
-const invitedUsers = computed({
+const pendingInvites = computed({
   get: () => data.value?.infra.invitedUsers,
   set: (value) => {
     if (!value) return;
@@ -138,26 +144,31 @@ const deleteInvitationMutation = useMutation(
   RevokeUserInvitationsByAdminDocument
 );
 
-const deleteInvite = (inviteeEmail: string | null) => {
+const confirmInviteDeletion = (inviteeEmail: string | null) => {
   confirmDeletion.value = true;
   inviteToBeDeleted.value = inviteeEmail;
 };
 
-const deleteUserInvitation = async (inviteeEmail: string | null) => {
-  const inviteeEmails = inviteeEmail
-    ? [inviteeEmail]
+const deleteInvitation = async (email: string | null) => {
+  const inviteeEmails = email
+    ? [email]
     : selectedRows.value.map((row) => row.inviteeEmail);
 
   const variables = { inviteeEmails };
   const result = await deleteInvitationMutation.executeMutation(variables);
+
   if (result.error) {
-    toast.error(t('state.delete_invite_failure'));
+    email
+      ? toast.error(t('state.delete_invite_failure'))
+      : toast.error(t('state.delete_invites_failure'));
   } else {
-    invitedUsers.value = invitedUsers.value?.filter(
+    pendingInvites.value = pendingInvites.value?.filter(
       (user) => !inviteeEmails.includes(user.inviteeEmail)
     );
     selectedRows.value.splice(0, selectedRows.value.length);
-    toast.success(t('state.delete_invite_success'));
+    email
+      ? toast.success(t('state.delete_invite_success'))
+      : toast.success(t('state.delete_invites_success'));
   }
 
   confirmDeletion.value = false;

From ff512f1156da0170f4b06d80e1c6f4674793a651 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 15 Feb 2024 16:55:13 +0530
Subject: [PATCH 34/60] chore: code improvements to invite modal

---
 packages/hoppscotch-sh-admin/locales/en.json              | 1 +
 .../src/components/users/InviteModal.vue                  | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/hoppscotch-sh-admin/locales/en.json b/packages/hoppscotch-sh-admin/locales/en.json
index a6858176b6..38a5c73104 100644
--- a/packages/hoppscotch-sh-admin/locales/en.json
+++ b/packages/hoppscotch-sh-admin/locales/en.json
@@ -253,6 +253,7 @@
     "admin": "Admin",
     "admin_email": "Admin Email",
     "admin_id": "Admin ID",
+    "cancel": "Cancel",
     "created_on": "Created On",
     "date": "Date",
     "delete": "Delete",
diff --git a/packages/hoppscotch-sh-admin/src/components/users/InviteModal.vue b/packages/hoppscotch-sh-admin/src/components/users/InviteModal.vue
index c231e03c6e..36c536d4f7 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/InviteModal.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/InviteModal.vue
@@ -10,6 +10,7 @@
         v-model="email"
         :label="t('users.email_address')"
         input-styles="floating-input"
+        @submit="sendInvite"
       />
     </template>
     <template #footer>
@@ -18,7 +19,12 @@
           :label="t('users.send_invite')"
           @click="sendInvite"
         />
-        <HoppButtonSecondary label="Cancel" outline filled @click="hideModal" />
+        <HoppButtonSecondary
+          :label="t('users.cancel')"
+          outline
+          filled
+          @click="hideModal"
+        />
       </span>
     </template>
   </HoppSmartModal>

From 1d597be37504ff61a3eea27fee1d293842232a2d Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 15 Feb 2024 17:19:27 +0530
Subject: [PATCH 35/60] refactor: improvements to index component and updated
 i18n strings

---
 packages/hoppscotch-sh-admin/locales/en.json  |  5 +-
 .../src/components/users/Table.vue            |  2 +-
 .../src/pages/users/index.vue                 | 59 +++++++++++++------
 3 files changed, 44 insertions(+), 22 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/locales/en.json b/packages/hoppscotch-sh-admin/locales/en.json
index 38a5c73104..af67e55d99 100644
--- a/packages/hoppscotch-sh-admin/locales/en.json
+++ b/packages/hoppscotch-sh-admin/locales/en.json
@@ -133,8 +133,8 @@
     "delete_request_success": "Shared Request deleted successfully!!",
     "delete_team_failure": "Workspace deletion failed!!",
     "delete_team_success": "Workspace deleted successfully!!",
-    "delete_some_users_failure": "Users Not Deleted Due to Admin Status: {count}. Please remove admin status before deleting users",
-    "delete_some_users_success": "Number of Users Deleted Successfully: {count}",
+    "delete_some_users_failure": "Users Not Deleted: {count}",
+    "delete_some_users_success": "Number of Users Deleted: {count}",
     "delete_user_failed_only_one_admin": "Failed to delete user. There should be atleast one admin!!",
     "delete_user_failure": "User deletion failed!!",
     "delete_users_failure": "Failed to delete selected users!!",
@@ -167,6 +167,7 @@
     "remove_admin_from_users_failure": "Failed to remove admin status from selected users!!",
     "remove_admin_from_users_success": "Admin status removed from selected users!!",
     "remove_admin_to_delete_user": "Remove admin privilege to delete the user!!",
+    "remove_admin_for_deletion": "Remove admin status before attempting deletion!!",
     "remove_invitee_failure": "Removal of invitee failed!!",
     "remove_invitee_success": "Removal of invitee is successfull!!",
     "remove_member_failure": "Member couldn't be removed!!",
diff --git a/packages/hoppscotch-sh-admin/src/components/users/Table.vue b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
index df83888755..6c6751694c 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/Table.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
@@ -100,7 +100,7 @@
 <script lang="ts" setup>
 import { useVModel } from '@vueuse/core';
 import { isEqual } from 'lodash-es';
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import IconLeft from '~icons/lucide/arrow-left';
 import IconRight from '~icons/lucide/arrow-right';
 
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 0941d704fe..c70c758802 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -30,10 +30,10 @@
           :checkbox="true"
           :selected-rows="selectedRows"
           :search-bar="{
-            debounce: 1000,
+            debounce: 500,
             placeholder: t('users.searchbar_placeholder'),
           }"
-          :spinner="{ enabled: fetching, duration: 1000 }"
+          :spinner="{ enabled: fetching, duration: 500 }"
           :pagination="{ totalPages: totalPages }"
           @onRowClicked="goToUserDetails"
           @search="handleSearch"
@@ -104,8 +104,8 @@
                         @click="
                           () => {
                             user.isAdmin
-                              ? makeAdminsUsers(user.uid)
-                              : makeUsersAdmin(user.uid);
+                              ? confirmAdminToUser(user.uid)
+                              : confirmUserToAdmin(user.uid);
                             hide();
                           }
                         "
@@ -117,7 +117,7 @@
                         class="!hover:bg-red-600"
                         @click="
                           () => {
-                            deleteUser(user.uid);
+                            confirmUserDeletion(user.uid);
                             hide();
                           }
                         "
@@ -177,7 +177,7 @@
           ? t('state.confirm_users_to_admin')
           : t('state.confirm_user_to_admin')
       "
-      @hide-modal="confirmUsersToAdmin = false"
+      @hide-modal="resetConfirmUserToAdmin"
       @resolve="makeUsersToAdmin(usersToAdminUID)"
     />
     <HoppSmartConfirmModal
@@ -187,7 +187,7 @@
           ? t('state.confirm_admins_to_users')
           : t('state.confirm_admin_to_user')
       "
-      @hide-modal="confirmAdminsToUsers = false"
+      @hide-modal="resetConfirmAdminToUser"
       @resolve="makeAdminsToUsers(adminsToUserUID)"
     />
     <HoppSmartConfirmModal
@@ -197,7 +197,7 @@
           ? t('state.confirm_users_deletion')
           : t('state.confirm_user_deletion')
       "
-      @hide-modal="confirmUsersDeletion = false"
+      @hide-modal="resetConfirmUserDeletion"
       @resolve="deleteUsers(deleteUserUID)"
     />
   </div>
@@ -247,7 +247,7 @@ const headings = [
 ];
 
 // Get Paginated Results of all the users in the infra
-const usersPerPage = 2;
+const usersPerPage = 20;
 const {
   fetching,
   error,
@@ -300,8 +300,8 @@ const goToUserDetails = (user: UserInfoQuery['infra']['userInfo']) =>
   router.push('/users/' + user.uid);
 
 // Send Invitation through Email
-const sendInvitation = useMutation(InviteNewUserDocument);
 const showInviteUserModal = ref(false);
+const sendInvitation = useMutation(InviteNewUserDocument);
 
 const sendInvite = async (email: string) => {
   if (!email.trim()) {
@@ -329,11 +329,17 @@ const AreMultipleUsersSelected = computed(
   () => usersToAdminUID.value === null && selectedRows.value.length > 0
 );
 
-const makeUsersAdmin = (id: string | null) => {
+const confirmUserToAdmin = (id: string | null) => {
   confirmUsersToAdmin.value = true;
   usersToAdminUID.value = id;
 };
 
+// Resets variables if user cancels the confirmation
+const resetConfirmUserToAdmin = () => {
+  confirmUsersToAdmin.value = false;
+  usersToAdminUID.value = null;
+};
+
 const makeUsersToAdmin = async (id: string | null) => {
   const userUIDs = id ? [id] : selectedRows.value.map((user) => user.uid);
   const variables = { userUIDs };
@@ -358,15 +364,21 @@ const makeUsersToAdmin = async (id: string | null) => {
 };
 
 // Remove Admin Status from Multiple Users
-const adminsToUser = useMutation(DemoteUsersByAdminDocument);
 const confirmAdminsToUsers = ref(false);
 const adminsToUserUID = ref<string | null>(null);
+const adminsToUser = useMutation(DemoteUsersByAdminDocument);
 
-const makeAdminsUsers = (id: string | null) => {
+const confirmAdminToUser = (id: string | null) => {
   confirmAdminsToUsers.value = true;
   adminsToUserUID.value = id;
 };
 
+// Resets variables if user cancels the confirmation
+const resetConfirmAdminToUser = () => {
+  confirmAdminsToUsers.value = false;
+  adminsToUserUID.value = null;
+};
+
 const AreMultipleUsersSelectedToAdmin = computed(
   () => adminsToUserUID.value === null && selectedRows.value.length > 0
 );
@@ -400,15 +412,21 @@ const makeAdminsToUsers = async (id: string | null) => {
 };
 
 // Delete Multiple Users
-const usersDeletion = useMutation(RemoveUsersByAdminDocument);
 const confirmUsersDeletion = ref(false);
 const deleteUserUID = ref<string | null>(null);
+const usersDeletion = useMutation(RemoveUsersByAdminDocument);
 
-const deleteUser = (id: string | null) => {
+const confirmUserDeletion = (id: string | null) => {
   confirmUsersDeletion.value = true;
   deleteUserUID.value = id;
 };
 
+// Resets variables if user cancels the confirmation
+const resetConfirmUserDeletion = () => {
+  confirmUsersDeletion.value = false;
+  deleteUserUID.value = null;
+};
+
 const AreMultipleUsersSelectedForDeletion = computed(
   () => deleteUserUID.value === null && selectedRows.value.length > 0
 );
@@ -442,13 +460,16 @@ const deleteUsers = async (id: string | null) => {
 
     if (isAdminError) {
       toast.success(
-        `Number of Users Deleted Successfully: ${deletedIDs.length}`
+        t('state.delete_some_users_success', { count: deletedIDs.length })
       );
       toast.error(
-        `Users Not Deleted Due to Admin Status: ${
-          deletedUsers.length - deletedIDs.length
-        }. \nPlease remove admin status before deleting users`
+        t('state.delete_some_users_failure', {
+          count: deletedUsers.length - deletedIDs.length,
+        })
       );
+      setTimeout(() => {
+        toast.error(t('state.remove_admin_for_deletion'));
+      }, 2000);
     } else {
       toast.success(
         id ? t('state.delete_user_success') : t('state.delete_users_success')

From 81fdeddb8f490c7423c47b538a4bcf3ed5783c25 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 15 Feb 2024 17:38:06 +0530
Subject: [PATCH 36/60] refactor: updated error check with new error types

---
 packages/hoppscotch-sh-admin/locales/en.json           | 2 +-
 packages/hoppscotch-sh-admin/src/helpers/errors.ts     | 3 +++
 packages/hoppscotch-sh-admin/src/pages/users/_id.vue   | 3 ++-
 packages/hoppscotch-sh-admin/src/pages/users/index.vue | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/locales/en.json b/packages/hoppscotch-sh-admin/locales/en.json
index af67e55d99..0b67d96cfa 100644
--- a/packages/hoppscotch-sh-admin/locales/en.json
+++ b/packages/hoppscotch-sh-admin/locales/en.json
@@ -133,7 +133,7 @@
     "delete_request_success": "Shared Request deleted successfully!!",
     "delete_team_failure": "Workspace deletion failed!!",
     "delete_team_success": "Workspace deleted successfully!!",
-    "delete_some_users_failure": "Users Not Deleted: {count}",
+    "delete_some_users_failure": "Number of Users Not Deleted: {count}",
     "delete_some_users_success": "Number of Users Deleted: {count}",
     "delete_user_failed_only_one_admin": "Failed to delete user. There should be atleast one admin!!",
     "delete_user_failure": "User deletion failed!!",
diff --git a/packages/hoppscotch-sh-admin/src/helpers/errors.ts b/packages/hoppscotch-sh-admin/src/helpers/errors.ts
index 4ff2d11fe1..cd45cea93f 100644
--- a/packages/hoppscotch-sh-admin/src/helpers/errors.ts
+++ b/packages/hoppscotch-sh-admin/src/helpers/errors.ts
@@ -11,6 +11,9 @@ export const GRAPHQL_UNAUTHORIZED = '[GraphQL] Unauthorized' as const;
 export const DELETE_USER_FAILED_ONLY_ONE_ADMIN =
   'admin/only_one_admin_account_found' as const;
 
+export const ADMIN_CANNOT_BE_DELETED =
+  'admin/admin_can_not_be_deleted' as const;
+
 // When trying to invite a user that is already invited
 export const USER_ALREADY_INVITED =
   '[GraphQL] admin/user_already_invited' as const;
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/_id.vue b/packages/hoppscotch-sh-admin/src/pages/users/_id.vue
index 162875a73b..d01c2c6f69 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/_id.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/_id.vue
@@ -73,6 +73,7 @@ import {
   RemoveUsersByAdminDocument,
   UserInfoDocument,
 } from '~/helpers/backend/graphql';
+import { ADMIN_CANNOT_BE_DELETED } from '~/helpers/errors';
 
 const t = useI18n();
 const toast = useToast();
@@ -210,7 +211,7 @@ const deleteUserMutation = async (id: string | null) => {
     const deletedUsers = result.data?.removeUsersByAdmin || [];
 
     const isAdminError = deletedUsers.some(
-      (user) => user.errorMessage === 'admin/admin_can_not_be_deleted'
+      (user) => user.errorMessage === ADMIN_CANNOT_BE_DELETED
     );
 
     isAdminError
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index c70c758802..4efdfb523b 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -222,6 +222,7 @@ import {
   UsersListV2Document,
 } from '~/helpers/backend/graphql';
 import {
+  ADMIN_CANNOT_BE_DELETED,
   DELETE_USER_FAILED_ONLY_ONE_ADMIN,
   USER_ALREADY_INVITED,
 } from '~/helpers/errors';
@@ -451,7 +452,7 @@ const deleteUsers = async (id: string | null) => {
       .map((user) => user.userUID);
 
     const isAdminError = deletedUsers.some(
-      (user) => user.errorMessage === 'admin/admin_can_not_be_deleted'
+      (user) => user.errorMessage === ADMIN_CANNOT_BE_DELETED
     );
 
     usersList.value = usersList.value.filter(

From 172a6fe73a2d35e0ac595d7afaebfebb243c538b Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 15 Feb 2024 17:56:20 +0530
Subject: [PATCH 37/60] fix: the header showing up on reload when list is empty

---
 packages/hoppscotch-sh-admin/src/components/users/Table.vue | 2 +-
 packages/hoppscotch-sh-admin/src/pages/users/index.vue      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/components/users/Table.vue b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
index 6c6751694c..8eca18b014 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/Table.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
@@ -38,7 +38,7 @@
     </div>
 
     <table v-else-if="list" class="w-full">
-      <thead>
+      <thead v-if="list.length > 0">
         <tr
           class="border-b border-dividerDark bg-primaryLight text-left text-sm text-secondary"
         >
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 4efdfb523b..d0736e8a07 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -24,7 +24,7 @@
         <div v-if="error">{{ t('users.load_list_error') }}</div>
 
         <UsersTable
-          v-if="usersList"
+          v-else-if="usersList"
           :headings="headings"
           :list="usersList"
           :checkbox="true"

From a110ded2d49143db079fc51e8b71c18704f2db19 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Mon, 26 Feb 2024 09:37:31 +0530
Subject: [PATCH 38/60] refactor: better responsiveness for invited page

---
 packages/hoppscotch-sh-admin/locales/en.json  |  2 +-
 .../src/pages/teams/index.vue                 |  2 +-
 .../src/pages/users/invited.vue               | 28 ++++++++++++++-----
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/locales/en.json b/packages/hoppscotch-sh-admin/locales/en.json
index 0b67d96cfa..eca7207886 100644
--- a/packages/hoppscotch-sh-admin/locales/en.json
+++ b/packages/hoppscotch-sh-admin/locales/en.json
@@ -229,7 +229,7 @@
     "name": "Workspace Name",
     "no_members": "No members in this workspace. Add members to this workspace to collaborate",
     "no_pending_invites": "No pending invites",
-    "no_teams": "No workspaces found",
+    "no_teams": "No workspaces found..",
     "pending_invites": "Pending invites",
     "roles": "Roles",
     "roles_description": "Roles are used to control access to the shared collections.",
diff --git a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
index 1d0e97eb32..88f9329a76 100644
--- a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
@@ -84,7 +84,7 @@
           </template>
         </UsersTable>
 
-        <div v-else class="px-2 text-lg">
+        <div v-else class="px-2">
           {{ t('teams.no_teams') }}
         </div>
 
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
index f578d9e77f..207f7846ff 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
@@ -20,8 +20,12 @@
           {{ t('users.invite_load_list_error') }}
         </div>
 
+        <div v-else-if="pendingInvites?.length === 0">
+          {{ t('users.no_invite') }}
+        </div>
+
         <UsersTable
-          v-if="pendingInvites"
+          v-else
           :headings="headings"
           :list="pendingInvites"
           :checkbox="true"
@@ -42,10 +46,19 @@
           </template>
           <template #action="{ item }">
             <div v-if="item" class="my-1 mr-2">
-              <HoppButtonPrimary
+              <HoppButtonSecondary
+                v-if="xlAndLarger"
                 :icon="IconTrash"
                 :label="t('users.revoke_invitation')"
-                class="bg-red-500 hover:bg-red-600"
+                class="text-secondaryDark bg-red-500 hover:bg-red-600"
+                @click="confirmInviteDeletion(item.inviteeEmail)"
+              />
+              <HoppButtonSecondary
+                v-else
+                v-tippy="{ theme: 'tooltip' }"
+                :icon="IconTrash"
+                :title="t('users.revoke_invitation')"
+                class="ml-2 !text-red-500"
                 @click="confirmInviteDeletion(item.inviteeEmail)"
               />
             </div>
@@ -72,12 +85,9 @@
             />
           </div>
         </div>
-
-        <div v-if="pendingInvites?.length === 0">
-          {{ t('users.no_invite') }}
-        </div>
       </div>
     </div>
+
     <HoppSmartConfirmModal
       :show="confirmDeletion"
       :title="
@@ -93,6 +103,7 @@
 
 <script setup lang="ts">
 import { useMutation, useQuery } from '@urql/vue';
+import { breakpointsTailwind, useBreakpoints } from '@vueuse/core';
 import { format } from 'date-fns';
 import { computed, ref } from 'vue';
 import { useRouter } from 'vue-router';
@@ -109,6 +120,9 @@ const t = useI18n();
 const toast = useToast();
 const router = useRouter();
 
+const breakpoints = useBreakpoints(breakpointsTailwind);
+const xlAndLarger = breakpoints.greater('xl');
+
 // Get Proper Date Formats
 const getCreatedDate = (date: string) => format(new Date(date), 'dd-MM-yyyy');
 const getCreatedTime = (date: string) => format(new Date(date), 'hh:mm a');

From 7ed8256853e6d8755a335db0a928a59f0dd639a2 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 29 Feb 2024 12:50:51 +0530
Subject: [PATCH 39/60] refactor: updated table component layout and removed
 unused searchbar feature

---
 .../src/components/users/Table.vue            | 263 +++++++-----------
 1 file changed, 108 insertions(+), 155 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/components/users/Table.vue b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
index 8eca18b014..85208087e3 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/Table.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
@@ -1,6 +1,6 @@
 <template>
-  <div v-if="pagination" class="flex justify-end mb-3">
-    <div class="flex w-min">
+  <div class="flex flex-1 flex-col">
+    <div v-if="pagination" class="mb-3 flex items-center justify-end">
       <HoppButtonSecondary
         outline
         filled
@@ -9,7 +9,7 @@
         @click="changePage(PageDirection.Previous)"
       />
 
-      <div class="w-10 flex justify-center items-center h-full">
+      <div class="flex h-full w-10 items-center justify-center">
         <p>{{ page }}</p>
       </div>
 
@@ -21,79 +21,74 @@
         @click="changePage(PageDirection.Next)"
       />
     </div>
-  </div>
 
-  <div class="overflow-auto rounded-md border border-dividerDark shadow-md">
-    <div v-if="searchBar" class="flex w-full items-center bg-primary">
-      <icon-lucide-search class="ml-3 text-xs" />
-      <input
-        v-model="searchQuery"
-        class="bg-primary p-3 w-full h-full"
-        :placeholder="searchBar.placeholder ?? 'Search...'"
-      />
-    </div>
+    <div class="overflow-auto rounded-md border border-dividerDark shadow-md">
+      <slot name="options"></slot>
 
-    <div v-if="isSpinnerEnabled" class="w-5 h-5 text-center mx-auto my-3">
-      <HoppSmartSpinner />
-    </div>
+      <div v-if="spinner" class="mx-auto my-3 h-5 w-5 text-center">
+        <HoppSmartSpinner />
+      </div>
 
-    <table v-else-if="list" class="w-full">
-      <thead v-if="list.length > 0">
-        <tr
-          class="border-b border-dividerDark bg-primaryLight text-left text-sm text-secondary"
-        >
-          <th v-if="checkbox" class="pl-6 pt-1 w-5">
-            <input
-              ref="selectAllCheckbox"
-              type="checkbox"
-              :checked="areAllRowsSelected"
-              @click.stop="toggleAllRows"
-            />
-          </th>
-          <slot name="head">
-            <th v-for="th in headings" scope="col" class="px-6 py-3">
-              {{ th.label ?? th.key }}
+      <table v-else-if="list.length" class="w-full">
+        <thead>
+          <tr
+            class="border-b border-dividerDark bg-primaryLight text-left text-sm text-secondary"
+          >
+            <th v-if="checkbox" class="px-3">
+              <input
+                ref="selectAllCheckbox"
+                type="checkbox"
+                :checked="areAllRowsSelected"
+                class="flex h-full w-full items-center justify-center"
+                @click.stop="toggleAllRows"
+              />
             </th>
-          </slot>
-        </tr>
-      </thead>
-
-      <tbody class="divide-y divide-divider">
-        <tr
-          v-for="(rowData, rowIndex) in workingList"
-          :key="rowIndex"
-          class="rounded-xl text-secondaryDark hover:cursor-pointer hover:bg-divider"
-          :class="{ 'divide-x divide-divider': showYBorder }"
-          @click="onRowClicked(rowData)"
-        >
-          <td v-if="checkbox" class="my-auto pl-6">
-            <input
-              type="checkbox"
-              :checked="isRowSelected(rowData)"
-              @click.stop="toggleRow(rowData)"
-            />
-          </td>
-          <slot name="body" :row="rowData">
-            <td
-              v-for="cellHeading in headings"
-              :key="cellHeading.key"
-              @click="!cellHeading.preventClick && onRowClicked(rowData)"
-              class="max-w-[10rem] py-1 pl-6"
-            >
-              <!-- Dynamic column slot -->
-              <slot :name="cellHeading.key" :item="rowData">
-                <!-- Generic implementation of the column -->
-                <div class="flex flex-col truncate">
-                  <span class="truncate">
-                    {{ rowData[cellHeading.key] ?? '-' }}
-                  </span>
-                </div>
-              </slot>
+            <slot name="head">
+              <th v-for="th in headings" scope="col" class="px-6 py-3">
+                {{ th.label ?? th.key }}
+              </th>
+            </slot>
+          </tr>
+        </thead>
+
+        <tbody class="divide-y divide-divider">
+          <tr
+            v-for="(rowData, rowIndex) in workingList"
+            :key="rowIndex"
+            class="rounded-xl text-secondaryDark hover:cursor-pointer hover:bg-divider"
+            :class="{ 'divide-x divide-divider': showYBorder }"
+            @click="onRowClicked(rowData)"
+          >
+            <td v-if="checkbox" class="px-3">
+              <input
+                type="checkbox"
+                :checked="isRowSelected(rowData)"
+                class="flex h-full w-full items-center justify-center"
+                @click.stop="toggleRow(rowData)"
+              />
             </td>
-          </slot>
-        </tr>
-      </tbody>
-    </table>
+            <slot name="body" :row="rowData">
+              <td
+                v-for="cellHeading in headings"
+                :key="cellHeading.key"
+                class="px-4 py-2"
+                @click="!cellHeading.preventClick && onRowClicked(rowData)"
+              >
+                <!-- Dynamic column slot -->
+                <slot :name="cellHeading.key" :item="rowData">
+                  <!-- Generic implementation of the column -->
+                  <div class="flex flex-col truncate">
+                    <span class="truncate">
+                      {{ rowData[cellHeading.key] ?? '-' }}
+                    </span>
+                  </div>
+                </slot>
+              </td>
+            </slot>
+          </tr>
+        </tbody>
+      </table>
+    </div>
   </div>
 </template>
 
@@ -120,12 +115,6 @@ const props = withDefaults(
     list: Item[];
     /** The headings of the table */
     headings?: CellHeading[];
-    /** Whether to show the search bar */
-    searchBar?: {
-      /** Whether to debounce the search query event */
-      debounce?: number;
-      placeholder?: string;
-    };
     /** Whether to show the checkbox column
      * This will be overriden if custom implementation for body slot is provided
      */
@@ -145,24 +134,20 @@ const props = withDefaults(
     };
 
     /** Whether to show the spinner */
-    spinner?: {
-      enabled: boolean;
-      duration?: number;
-    };
+    spinner?: boolean;
   }>(),
   {
     showYBorder: false,
-    search: undefined,
     checkbox: false,
     sort: undefined,
     selectedRows: undefined,
+    spinner: false,
   }
 );
 
 const emit = defineEmits<{
   (event: 'onRowClicked', item: Item): void;
   (event: 'update:list', list: Item[]): void;
-  (event: 'search', query: string): void;
   (event: 'update:selectedRows', selectedRows: Item[]): void;
   (event: 'pageNumber', page: number): void;
 }>();
@@ -177,37 +162,21 @@ enum PageDirection {
 
 const changePage = (direction: PageDirection) => {
   const isPrevious = direction === PageDirection.Previous;
-  if (
-    (isPrevious && page.value > 1) ||
-    (!isPrevious && page.value < props.pagination!.totalPages)
-  ) {
+
+  const isValidPreviousAction = isPrevious && page.value > 1;
+  const isValidNextAction =
+    !isPrevious && page.value < props.pagination!.totalPages;
+
+  if (isValidNextAction || isValidPreviousAction) {
     page.value += isPrevious ? -1 : 1;
-  }
 
-  emit('pageNumber', page.value);
+    emit('pageNumber', page.value);
+  }
 };
 
 // The working version of the list that is used to perform operations upon
 const workingList = useVModel(props, 'list', emit);
 
-// Spinner functionality
-const isSpinnerEnabled = ref(false);
-const showSpinner = (duration: number = 500) => {
-  isSpinnerEnabled.value = true;
-  setTimeout(() => {
-    isSpinnerEnabled.value = false;
-  }, duration);
-};
-
-watch(
-  () => props.spinner,
-  () => {
-    if (props.spinner?.enabled === true) {
-      showSpinner(props.spinner.duration);
-    }
-  }
-);
-
 // Checkbox functionality
 const selectedRows = useVModel(props, 'selectedRows', emit);
 
@@ -234,80 +203,64 @@ const toggleRow = (item: Item) => {
   const index =
     selectedRows.value?.findIndex((row) => isEqual(row, data)) ?? -1;
 
-  if (item.selected && !isRowSelected(data)) selectedRows.value!.push(data);
-  else if (index !== -1) selectedRows.value?.splice(index, 1);
+  if (item.selected && !isRowSelected(data)) {
+    selectedRows.value!.push(data);
+  } else if (index !== -1) {
+    selectedRows.value?.splice(index, 1);
+  }
 };
 
 const selectAllCheckbox = ref<HTMLInputElement | null>(null);
 
 const toggleAllRows = () => {
   const isChecked = selectAllCheckbox.value?.checked;
-  workingList.value.forEach((item) => (item.selected = isChecked));
-
-  if (isChecked) {
-    workingList.value.forEach((item) => {
-      const { selected, ...data } = item;
-      if (!isRowSelected(item)) selectedRows.value!.push(data);
-    });
-  } else {
-    workingList.value.forEach((item) => {
-      const { selected, ...data } = item;
-      const index =
-        selectedRows.value?.findIndex((row) => isEqual(row, data)) ?? -1;
-      selectedRows.value!.splice(index, 1);
-    });
-  }
+  workingList.value.forEach((item) => {
+    item.selected = isChecked;
+    const { selected, ...data } = item;
+    if (isChecked) {
+      if (!isRowSelected(item)) {
+        selectedRows.value!.push(data);
+      }
+      return;
+    }
+    const index =
+      selectedRows.value?.findIndex((row) => isEqual(row, data)) ?? -1;
+    selectedRows.value!.splice(index, 1);
+  });
 };
 
 const areAllRowsSelected = computed(() => {
   if (workingList.value.length === 0 || selectedRows.value?.length === 0)
     return false;
-
-  let count = 0;
-  workingList.value.forEach((item) => {
+  return workingList.value.every((item) => {
     const { selected, ...data } = item;
-    if (selectedRows.value?.findIndex((row) => isEqual(row, data)) !== -1) {
-      count += 1;
-    }
+    return selectedRows.value?.some((row) => isEqual(row, data));
   });
-  return count === workingList.value.length;
 });
 
 // Sort List by key and direction which can set to ascending or descending
 export type Direction = 'ascending' | 'descending';
 
 const sortList = (key: string, direction: Direction) => {
-  workingList.value = workingList.value?.sort((a, b) => {
+  const sortedList = [...workingList.value];
+  sortedList.sort((a, b) => {
     const valueA = a[key] as string;
     const valueB = b[key] as string;
     return direction === 'ascending'
       ? valueA.localeCompare(valueB)
       : valueB.localeCompare(valueA);
   });
-};
 
-watch(workingList.value, () => {
-  if (props.sort) {
-    sortList(props.sort.key, props.sort.direction);
-  }
-});
-
-// Searchbar functionality with optional debouncer
-const searchQuery = ref('');
-let debounceTimeout: NodeJS.Timeout;
-
-const debounce = (func: () => void, delay: number) => {
-  clearTimeout(debounceTimeout);
-  debounceTimeout = setTimeout(func, delay);
+  workingList.value = sortedList;
 };
 
-watch(searchQuery, () => {
-  if (props.searchBar?.debounce) {
-    debounce(() => {
-      emit('search', searchQuery.value);
-    }, props.searchBar.debounce);
-  } else {
-    emit('search', searchQuery.value);
-  }
-});
+watch(
+  workingList.value,
+  () => {
+    if (props.sort) {
+      sortList(props.sort.key, props.sort.direction);
+    }
+  },
+  { immediate: true }
+);
 </script>

From 29cc15bf529b1ab200dd1d2cc22e9a27d6f9ee29 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 29 Feb 2024 12:52:42 +0530
Subject: [PATCH 40/60] refactor: updated users table to adhere to removal of
 search and debouncer feature from smart table

---
 .../src/pages/users/index.vue                 | 52 +++++++++++++++----
 1 file changed, 42 insertions(+), 10 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index d0736e8a07..b987cb1436 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -28,17 +28,23 @@
           :headings="headings"
           :list="usersList"
           :checkbox="true"
+          :spinner="showSpinner"
           :selected-rows="selectedRows"
-          :search-bar="{
-            debounce: 500,
-            placeholder: t('users.searchbar_placeholder'),
-          }"
-          :spinner="{ enabled: fetching, duration: 500 }"
-          :pagination="{ totalPages: totalPages }"
-          @onRowClicked="goToUserDetails"
-          @search="handleSearch"
+          :pagination="{ totalPages }"
           @pageNumber="handlePageChange"
+          @onRowClicked="goToUserDetails"
         >
+          <template #options>
+            <div class="flex w-full items-center bg-primary">
+              <icon-lucide-search class="mx-3 text-xs" />
+              <HoppSmartInput
+                v-model="searchQuery"
+                styles="w-full bg-primary py-1"
+                input-styles="h-full border-none"
+                placeholder="Search by name or email"
+              />
+            </div>
+          </template>
           <template #head>
             <th class="px-6 py-2">{{ t('users.id') }}</th>
             <th class="px-6 py-2">{{ t('users.name') }}</th>
@@ -206,7 +212,7 @@
 <script setup lang="ts">
 import { useMutation, useQuery } from '@urql/vue';
 import { format } from 'date-fns';
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from '~/composables/i18n';
 import { useToast } from '~/composables/toast';
@@ -248,7 +254,7 @@ const headings = [
 ];
 
 // Get Paginated Results of all the users in the infra
-const usersPerPage = 20;
+const usersPerPage = 2;
 const {
   fetching,
   error,
@@ -264,13 +270,39 @@ const {
 // Selected Rows
 const selectedRows = ref<UsersListQuery['infra']['allUsers']>([]);
 
+// Debounce Function
+const debounce = (func: () => void, delay: number) => {
+  let debounceTimeout: ReturnType<typeof setTimeout> | null = null;
+  if (debounceTimeout) clearTimeout(debounceTimeout);
+  debounceTimeout = setTimeout(func, delay);
+};
+
 // Search
 const searchQuery = ref('');
+
 const handleSearch = async (input: string) => {
   searchQuery.value = input;
   await refetch({ searchString: input, take: usersPerPage, skip: 0 });
 };
 
+watch(searchQuery, () => {
+  debounce(() => {
+    handleSearch(searchQuery.value);
+  }, 500);
+});
+
+// Spinner
+const showSpinner = ref(false);
+
+watch(fetching, (fetching) => {
+  if (fetching) {
+    showSpinner.value = true;
+    debounce(() => {
+      showSpinner.value = false;
+    }, 500);
+  }
+});
+
 // Pagination
 const { data } = useQuery({ query: MetricsDocument });
 const usersCount = computed(() => data?.value?.infra.usersCount);

From 353088388d77224b4cfab670a4ff28b0b73db6da Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Fri, 1 Mar 2024 11:48:11 +0530
Subject: [PATCH 41/60] refactor: updated table and users page to adhere to the
 new changes

---
 .../src/components/users/Table.vue             | 18 ++++++++----------
 .../src/pages/users/index.vue                  |  4 ++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/components/users/Table.vue b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
index 85208087e3..9de5d6fc72 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/Table.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
@@ -10,7 +10,7 @@
       />
 
       <div class="flex h-full w-10 items-center justify-center">
-        <p>{{ page }}</p>
+        <span>{{ page }}</span>
       </div>
 
       <HoppButtonSecondary
@@ -23,9 +23,10 @@
     </div>
 
     <div class="overflow-auto rounded-md border border-dividerDark shadow-md">
-      <slot name="options"></slot>
+      <!-- An Extension Slot to extend the table functionality such as search   -->
+      <slot name="extension"></slot>
 
-      <div v-if="spinner" class="mx-auto my-3 h-5 w-5 text-center">
+      <div v-if="loading" class="mx-auto my-3 h-5 w-5 text-center">
         <HoppSmartSpinner />
       </div>
 
@@ -133,8 +134,8 @@ const props = withDefaults(
       totalPages: number;
     };
 
-    /** Whether to show the spinner */
-    spinner?: boolean;
+    /** Whether to show a loading spinner */
+    loading?: boolean;
   }>(),
   {
     showYBorder: false,
@@ -242,20 +243,17 @@ const areAllRowsSelected = computed(() => {
 export type Direction = 'ascending' | 'descending';
 
 const sortList = (key: string, direction: Direction) => {
-  const sortedList = [...workingList.value];
-  sortedList.sort((a, b) => {
+  workingList.value.sort((a, b) => {
     const valueA = a[key] as string;
     const valueB = b[key] as string;
     return direction === 'ascending'
       ? valueA.localeCompare(valueB)
       : valueB.localeCompare(valueA);
   });
-
-  workingList.value = sortedList;
 };
 
 watch(
-  workingList.value,
+  () => props.sort?.direction,
   () => {
     if (props.sort) {
       sortList(props.sort.key, props.sort.direction);
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index b987cb1436..becbadfeb7 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -28,13 +28,13 @@
           :headings="headings"
           :list="usersList"
           :checkbox="true"
-          :spinner="showSpinner"
+          :loading="showSpinner"
           :selected-rows="selectedRows"
           :pagination="{ totalPages }"
           @pageNumber="handlePageChange"
           @onRowClicked="goToUserDetails"
         >
-          <template #options>
+          <template #extension>
             <div class="flex w-full items-center bg-primary">
               <icon-lucide-search class="mx-3 text-xs" />
               <HoppSmartInput

From 097d8c654ab122afb215b8270de143aa58a4d473 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Fri, 1 Mar 2024 19:15:47 +0530
Subject: [PATCH 42/60] refactor: updated users and teams table to adhere to
 new loading and empty state changes

---
 .../src/components/users/Table.vue            | 112 +++++++++++-------
 .../src/pages/teams/index.vue                 |   2 +-
 .../src/pages/users/index.vue                 |   6 +-
 3 files changed, 71 insertions(+), 49 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/components/users/Table.vue b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
index 9de5d6fc72..defaa3693e 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/Table.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
@@ -26,26 +26,28 @@
       <!-- An Extension Slot to extend the table functionality such as search   -->
       <slot name="extension"></slot>
 
-      <div v-if="loading" class="mx-auto my-3 h-5 w-5 text-center">
-        <HoppSmartSpinner />
-      </div>
-
-      <table v-else-if="list.length" class="w-full">
+      <table class="w-full table-fixed">
         <thead>
           <tr
             class="border-b border-dividerDark bg-primaryLight text-left text-sm text-secondary"
           >
-            <th v-if="checkbox" class="px-3">
+            <th v-if="selectedRows" class="w-24">
               <input
                 ref="selectAllCheckbox"
                 type="checkbox"
                 :checked="areAllRowsSelected"
+                :disabled="loading"
                 class="flex h-full w-full items-center justify-center"
                 @click.stop="toggleAllRows"
               />
             </th>
             <slot name="head">
-              <th v-for="th in headings" scope="col" class="px-6 py-3">
+              <th
+                v-for="th in headings"
+                :key="th.key"
+                scope="col"
+                class="px-6 py-3"
+              >
                 {{ th.label ?? th.key }}
               </th>
             </slot>
@@ -53,40 +55,60 @@
         </thead>
 
         <tbody class="divide-y divide-divider">
-          <tr
-            v-for="(rowData, rowIndex) in workingList"
-            :key="rowIndex"
-            class="rounded-xl text-secondaryDark hover:cursor-pointer hover:bg-divider"
-            :class="{ 'divide-x divide-divider': showYBorder }"
-            @click="onRowClicked(rowData)"
-          >
-            <td v-if="checkbox" class="px-3">
-              <input
-                type="checkbox"
-                :checked="isRowSelected(rowData)"
-                class="flex h-full w-full items-center justify-center"
-                @click.stop="toggleRow(rowData)"
-              />
-            </td>
-            <slot name="body" :row="rowData">
-              <td
-                v-for="cellHeading in headings"
-                :key="cellHeading.key"
-                class="px-4 py-2"
-                @click="!cellHeading.preventClick && onRowClicked(rowData)"
-              >
-                <!-- Dynamic column slot -->
-                <slot :name="cellHeading.key" :item="rowData">
-                  <!-- Generic implementation of the column -->
-                  <div class="flex flex-col truncate">
-                    <span class="truncate">
-                      {{ rowData[cellHeading.key] ?? '-' }}
-                    </span>
-                  </div>
-                </slot>
+          <tr v-if="loading">
+            <slot name="loading-state">
+              <td :colspan="columnSpan">
+                <div class="mx-auto my-3 h-5 w-5 text-center">
+                  <HoppSmartSpinner />
+                </div>
               </td>
             </slot>
           </tr>
+
+          <tr v-else-if="!list.length">
+            <slot name="empty-state">
+              <td :colspan="columnSpan" class="py-3 text-center">
+                <p>No data available</p>
+              </td>
+            </slot>
+          </tr>
+
+          <template v-else>
+            <tr
+              v-for="(rowData, rowIndex) in workingList"
+              :key="rowIndex"
+              class="rounded-xl text-secondaryDark hover:cursor-pointer hover:bg-divider"
+              :class="{ 'divide-x divide-divider': showYBorder }"
+              @click="onRowClicked(rowData)"
+            >
+              <td v-if="selectedRows">
+                <input
+                  type="checkbox"
+                  :checked="isRowSelected(rowData)"
+                  class="flex h-full w-full items-center justify-center"
+                  @click.stop="toggleRow(rowData)"
+                />
+              </td>
+              <slot name="body" :row="rowData">
+                <td
+                  v-for="cellHeading in headings"
+                  :key="cellHeading.key"
+                  class="px-4 py-2"
+                  @click="!cellHeading.preventClick && onRowClicked(rowData)"
+                >
+                  <!-- Dynamic column slot -->
+                  <slot :name="cellHeading.key" :item="rowData">
+                    <!-- Generic implementation of the column -->
+                    <div class="flex flex-col truncate">
+                      <span class="truncate">
+                        {{ rowData[cellHeading.key] ?? '-' }}
+                      </span>
+                    </div>
+                  </slot>
+                </td>
+              </slot>
+            </tr>
+          </template>
         </tbody>
       </table>
     </div>
@@ -97,6 +119,7 @@
 import { useVModel } from '@vueuse/core';
 import { isEqual } from 'lodash-es';
 import { computed, ref, watch } from 'vue';
+
 import IconLeft from '~icons/lucide/arrow-left';
 import IconRight from '~icons/lucide/arrow-right';
 
@@ -116,10 +139,6 @@ const props = withDefaults(
     list: Item[];
     /** The headings of the table */
     headings?: CellHeading[];
-    /** Whether to show the checkbox column
-     * This will be overriden if custom implementation for body slot is provided
-     */
-    checkbox?: boolean;
 
     selectedRows?: Item[];
     /** Whether to enable sorting */
@@ -139,10 +158,9 @@ const props = withDefaults(
   }>(),
   {
     showYBorder: false,
-    checkbox: false,
     sort: undefined,
     selectedRows: undefined,
-    spinner: false,
+    loading: false,
   }
 );
 
@@ -182,7 +200,7 @@ const workingList = useVModel(props, 'list', emit);
 const selectedRows = useVModel(props, 'selectedRows', emit);
 
 watch(workingList.value, (updatedList) => {
-  if (props.checkbox) {
+  if (props.selectedRows) {
     updatedList = updatedList.map((item) => ({
       ...item,
       selected: false,
@@ -261,4 +279,8 @@ watch(
   },
   { immediate: true }
 );
+
+const columnSpan = computed(
+  () => (props.headings?.length ?? 0) + (props.selectedRows ? 1 : 0)
+);
 </script>
diff --git a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
index 88f9329a76..ea0c058d9f 100644
--- a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
@@ -51,7 +51,7 @@
               {{ team.members?.length }}
             </td>
 
-            <td @click.stop>
+            <td @click.stop class="flex justify-end mr-10">
               <div class="relative">
                 <tippy interactive trigger="click" theme="popover">
                   <HoppButtonSecondary
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index becbadfeb7..411a691fb1 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -27,7 +27,6 @@
           v-else-if="usersList"
           :headings="headings"
           :list="usersList"
-          :checkbox="true"
           :loading="showSpinner"
           :selected-rows="selectedRows"
           :pagination="{ totalPages }"
@@ -74,7 +73,7 @@
               </div>
             </td>
 
-            <td class="py-2 px-7">
+            <td class="py-2 px-7 truncate">
               {{ user.email }}
             </td>
 
@@ -85,7 +84,7 @@
               </div>
             </td>
 
-            <td @click.stop>
+            <td @click.stop class="flex justify-end items-center mr-10">
               <div class="relative">
                 <tippy interactive trigger="click" theme="popover">
                   <HoppButtonSecondary
@@ -251,6 +250,7 @@ const headings = [
   { key: 'displayName', label: t('users.name') },
   { key: 'email', label: t('users.email') },
   { key: 'createdOn', label: t('users.date') },
+  { key: '', label: '' },
 ];
 
 // Get Paginated Results of all the users in the infra

From 7f44862431381d140e7bded5800ef6c18e951e87 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Tue, 5 Mar 2024 11:29:30 +0530
Subject: [PATCH 43/60] refactor: added a placeholder and empty-state in users
 table

---
 packages/hoppscotch-sh-admin/src/components.d.ts   |  3 +++
 .../src/components/users/Table.vue                 |  6 +++---
 .../hoppscotch-sh-admin/src/pages/users/index.vue  | 14 +++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/components.d.ts b/packages/hoppscotch-sh-admin/src/components.d.ts
index e1ab284047..76edcdbada 100644
--- a/packages/hoppscotch-sh-admin/src/components.d.ts
+++ b/packages/hoppscotch-sh-admin/src/components.d.ts
@@ -24,6 +24,8 @@ declare module '@vue/runtime-core' {
     HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink'];
     HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal'];
     HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture'];
+    HoppSmartPlaceholder: typeof import('@hoppscotch/ui')['HoppSmartPlaceholder'];
+    HoppSmartSelectWrapper: typeof import('@hoppscotch/ui')['HoppSmartSelectWrapper'];
     HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner'];
     HoppSmartTab: typeof import('@hoppscotch/ui')['HoppSmartTab'];
     HoppSmartTable: typeof import('@hoppscotch/ui')['HoppSmartTable'];
@@ -31,6 +33,7 @@ declare module '@vue/runtime-core' {
     HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle'];
     IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default'];
     IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default'];
+    IconLucideHelpCircle: typeof import('~icons/lucide/help-circle')['default'];
     IconLucideInbox: typeof import('~icons/lucide/inbox')['default'];
     IconLucideSearch: typeof import('~icons/lucide/search')['default'];
     IconLucideUser: typeof import('~icons/lucide/user')['default'];
diff --git a/packages/hoppscotch-sh-admin/src/components/users/Table.vue b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
index defaa3693e..401e473b61 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/Table.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
@@ -9,9 +9,9 @@
         @click="changePage(PageDirection.Previous)"
       />
 
-      <div class="flex h-full w-10 items-center justify-center">
-        <span>{{ page }}</span>
-      </div>
+      <span class="flex h-full w-10 items-center justify-center">{{
+        page
+      }}</span>
 
       <HoppButtonSecondary
         outline
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 411a691fb1..e41561406d 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -50,7 +50,15 @@
             <th class="px-6 py-2">{{ t('users.email') }}</th>
             <th class="px-6 py-2">{{ t('users.date') }}</th>
             <!-- Empty header for Action Button -->
-            <th class="px-6 py-2"></th>
+            <th class="w-20 px-6 py-2"></th>
+          </template>
+
+          <template #empty-state>
+            <td colspan="6">
+              <span class="flex justify-center p-3">
+                {{ t('users.no_users') }}
+              </span>
+            </td>
           </template>
 
           <template #body="{ row: user }">
@@ -84,8 +92,8 @@
               </div>
             </td>
 
-            <td @click.stop class="flex justify-end items-center mr-10">
-              <div class="relative">
+            <td @click.stop class="flex justify-end w-20">
+              <div class="mt-2 mr-5">
                 <tippy interactive trigger="click" theme="popover">
                   <HoppButtonSecondary
                     v-tippy="{ theme: 'tooltip' }"

From bd1be2037fe1c764e3fedb0e7be40b4569d7f5f7 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Tue, 5 Mar 2024 11:36:21 +0530
Subject: [PATCH 44/60] refactor: removed unnecessary props to invited table

---
 packages/hoppscotch-sh-admin/src/pages/teams/index.vue   | 2 +-
 packages/hoppscotch-sh-admin/src/pages/users/invited.vue | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
index ea0c058d9f..8ca5349552 100644
--- a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
@@ -47,7 +47,7 @@
               </span>
             </td>
 
-            <td class="py-4 px-7">
+            <td class="py-4 px-8">
               {{ team.members?.length }}
             </td>
 
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
index 207f7846ff..4a3d1835d7 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
@@ -28,9 +28,7 @@
           v-else
           :headings="headings"
           :list="pendingInvites"
-          :checkbox="true"
-          :spinner="{ enabled: fetching, duration: 500 }"
-          :selectedRows="selectedRows"
+          :selected-rows="selectedRows"
         >
           <template #invitedOn="{ item }">
             <div v-if="item" class="pr-2 truncate">

From fa605d876b5a9359fc9a4eced549709cef87331c Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 7 Mar 2024 19:11:59 +0530
Subject: [PATCH 45/60] chore: updated @hoppscotch/ui version to 0.1.2

---
 packages/hoppscotch-sh-admin/package.json |    2 +-
 pnpm-lock.yaml                            | 2932 ++++++++++-----------
 2 files changed, 1415 insertions(+), 1519 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/package.json b/packages/hoppscotch-sh-admin/package.json
index 923f0053a2..16a28aa362 100644
--- a/packages/hoppscotch-sh-admin/package.json
+++ b/packages/hoppscotch-sh-admin/package.json
@@ -78,4 +78,4 @@
     "singleQuote": true,
     "semi": true
   }
-}
\ No newline at end of file
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6ff56e8530..28ad9194d3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,7 +21,7 @@ importers:
         version: 16.2.4
       '@hoppscotch/ui':
         specifier: 0.1.0
-        version: 0.1.0(eslint@8.55.0)(terser@5.28.1)(vite@3.2.4)(vue@3.3.9)
+        version: 0.1.0(eslint@8.55.0)(terser@5.27.0)(vite@3.2.4)(vue@3.3.9)
       '@types/node':
         specifier: 17.0.27
         version: 17.0.27
@@ -284,10 +284,10 @@ importers:
         version: 6.3.2
       ts-jest:
         specifier: 29.0.5
-        version: 29.0.5(@babel/core@7.24.0)(jest@29.4.1)(typescript@4.9.3)
+        version: 29.0.5(@babel/core@7.23.9)(jest@29.4.1)(typescript@4.9.3)
       ts-loader:
         specifier: 9.4.2
-        version: 9.4.2(typescript@4.9.3)(webpack@5.90.3)
+        version: 9.4.2(typescript@4.9.3)(webpack@5.90.0)
       ts-node:
         specifier: 10.9.1
         version: 10.9.1(@types/node@18.11.10)(typescript@4.9.3)
@@ -354,7 +354,7 @@ importers:
         version: 3.2.5
       ts-jest:
         specifier: 29.1.2
-        version: 29.1.2(@babel/core@7.24.0)(esbuild@0.19.12)(jest@29.7.0)(typescript@5.3.3)
+        version: 29.1.2(@babel/core@7.23.9)(esbuild@0.19.5)(jest@29.7.0)(typescript@5.3.3)
       tsup:
         specifier: 8.0.2
         version: 8.0.2(@swc/core@1.4.2)(typescript@5.3.3)
@@ -411,7 +411,7 @@ importers:
         version: link:../hoppscotch-js-sandbox
       '@hoppscotch/ui':
         specifier: 0.1.0
-        version: 0.1.0(eslint@8.55.0)(terser@5.28.1)(vite@4.5.0)(vue@3.3.9)
+        version: 0.1.0(eslint@8.55.0)(terser@5.27.0)(vite@4.5.0)(vue@3.3.9)
       '@hoppscotch/vue-toasted':
         specifier: 0.1.0
         version: 0.1.0(vue@3.3.9)
@@ -435,7 +435,7 @@ importers:
         version: 6.4.0(graphql@16.8.1)
       '@vitejs/plugin-legacy':
         specifier: 4.1.1
-        version: 4.1.1(terser@5.28.1)(vite@4.5.0)
+        version: 4.1.1(terser@5.27.0)(vite@4.5.0)
       '@vueuse/core':
         specifier: 10.7.0
         version: 10.7.0(vue@3.3.9)
@@ -607,10 +607,10 @@ importers:
     devDependencies:
       '@esbuild-plugins/node-globals-polyfill':
         specifier: 0.2.3
-        version: 0.2.3(esbuild@0.20.1)
+        version: 0.2.3(esbuild@0.20.0)
       '@esbuild-plugins/node-modules-polyfill':
         specifier: 0.2.2
-        version: 0.2.2(esbuild@0.20.1)
+        version: 0.2.2(esbuild@0.20.0)
       '@graphql-codegen/add':
         specifier: 5.0.0
         version: 5.0.0(graphql@16.8.1)
@@ -754,7 +754,7 @@ importers:
         version: 0.25.2(rollup@3.29.4)(vue@3.3.9)
       vite:
         specifier: 4.5.0
-        version: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+        version: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
       vite-plugin-checker:
         specifier: 0.6.2
         version: 0.6.2(eslint@8.55.0)(typescript@5.3.2)(vite@4.5.0)(vue-tsc@1.8.24)
@@ -781,7 +781,7 @@ importers:
         version: 0.8.0(vite@4.5.0)(vue-router@4.2.5)(vue@3.3.9)
       vitest:
         specifier: 0.34.6
-        version: 0.34.6(sass@1.69.5)(terser@5.28.1)
+        version: 0.34.6(sass@1.69.5)(terser@5.27.0)
       vue-tsc:
         specifier: 1.8.24
         version: 1.8.24(typescript@5.3.2)
@@ -815,7 +815,7 @@ importers:
         version: 5.2.2
       vite:
         specifier: 4.5.0
-        version: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+        version: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
 
   packages/hoppscotch-js-sandbox:
     dependencies:
@@ -876,13 +876,13 @@ importers:
         version: 2.8.4
       ts-jest:
         specifier: 27.1.5
-        version: 27.1.5(@babel/core@7.24.0)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5)
+        version: 27.1.5(@babel/core@7.23.9)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5)
       typescript:
         specifier: 4.9.5
         version: 4.9.5
       vite:
         specifier: 5.0.5
-        version: 5.0.5(@types/node@17.0.45)(terser@5.28.1)
+        version: 5.0.5(@types/node@17.0.45)(terser@5.27.0)
 
   packages/hoppscotch-selfhost-desktop:
     dependencies:
@@ -1003,7 +1003,7 @@ importers:
         version: 5.62.0(eslint@8.47.0)(typescript@4.9.5)
       '@vitejs/plugin-legacy':
         specifier: 2.3.0
-        version: 2.3.0(terser@5.28.1)(vite@4.5.0)
+        version: 2.3.0(terser@5.27.0)(vite@4.5.0)
       '@vitejs/plugin-vue':
         specifier: 4.3.1
         version: 4.3.1(vite@4.5.0)(vue@3.3.9)
@@ -1048,7 +1048,7 @@ importers:
         version: 0.21.0(rollup@2.79.1)(vite@4.5.0)(vue@3.3.9)
       vite:
         specifier: 4.5.0
-        version: 4.5.0(@types/node@18.18.8)(terser@5.28.1)
+        version: 4.5.0(@types/node@18.18.8)(terser@5.27.0)
       vite-plugin-html-config:
         specifier: 1.0.11
         version: 1.0.11(vite@4.5.0)
@@ -1093,7 +1093,7 @@ importers:
         version: link:../hoppscotch-data
       '@hoppscotch/ui':
         specifier: 0.1.0
-        version: 0.1.0(eslint@8.55.0)(terser@5.28.1)(vite@4.5.0)(vue@3.3.9)
+        version: 0.1.0(eslint@8.55.0)(terser@5.27.0)(vite@4.5.0)(vue@3.3.9)
       '@import-meta-env/unplugin':
         specifier: 0.4.10
         version: 0.4.10(dotenv@16.3.1)
@@ -1166,7 +1166,7 @@ importers:
         version: 6.13.2(eslint@8.55.0)(typescript@5.3.2)
       '@vitejs/plugin-legacy':
         specifier: 4.1.1
-        version: 4.1.1(terser@5.28.1)(vite@4.5.0)
+        version: 4.1.1(terser@5.27.0)(vite@4.5.0)
       '@vitejs/plugin-vue':
         specifier: 4.5.1
         version: 4.5.1(vite@4.5.0)(vue@3.3.9)
@@ -1214,7 +1214,7 @@ importers:
         version: 0.25.2(rollup@2.79.1)(vue@3.3.9)
       vite:
         specifier: 4.5.0
-        version: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+        version: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
       vite-plugin-fonts:
         specifier: 0.7.0
         version: 0.7.0(vite@4.5.0)
@@ -1259,7 +1259,7 @@ importers:
         version: 3.1.1(graphql@16.6.0)
       '@hoppscotch/ui':
         specifier: 0.1.0
-        version: 0.1.0(eslint@8.55.0)(terser@5.28.1)(vite@3.2.4)(vue@3.3.9)
+        version: 0.1.0(eslint@8.55.0)(terser@5.27.0)(vite@3.2.4)(vue@3.3.9)
       '@hoppscotch/vue-toasted':
         specifier: 0.1.0
         version: 0.1.0(vue@3.3.9)
@@ -1347,7 +1347,7 @@ importers:
     devDependencies:
       '@graphql-codegen/cli':
         specifier: 3.0.0
-        version: 3.0.0(@babel/core@7.24.0)(@types/node@18.18.8)(graphql@16.6.0)(typescript@4.9.3)
+        version: 3.0.0(@babel/core@7.23.9)(@types/node@18.18.8)(graphql@16.6.0)(typescript@4.9.3)
       '@graphql-codegen/client-preset':
         specifier: 2.1.0
         version: 2.1.0(graphql@16.6.0)
@@ -1410,7 +1410,7 @@ importers:
         version: 1.0.3(vite@3.2.4)
       vite:
         specifier: 3.2.4
-        version: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.28.1)
+        version: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.27.0)
       vite-plugin-pages:
         specifier: 0.26.0
         version: 0.26.0(@vue/compiler-sfc@3.2.45)(vite@3.2.4)
@@ -1452,12 +1452,12 @@ packages:
     resolution: {integrity: sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==}
     engines: {node: '>=10'}
 
-  /@ampproject/remapping@2.3.0:
-    resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
+  /@ampproject/remapping@2.2.1:
+    resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==}
     engines: {node: '>=6.0.0'}
     dependencies:
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
+      '@jridgewell/gen-mapping': 0.3.3
+      '@jridgewell/trace-mapping': 0.3.22
 
   /@angular-devkit/core@16.2.8(chokidar@3.5.3):
     resolution: {integrity: sha512-PTGozYvh1Bin5lB15PwcXa26Ayd17bWGLS3H8Rs0s+04mUDvfNofmweaX1LgumWWy3nCUTDuwHxX10M3G0wE2g==}
@@ -1788,15 +1788,15 @@ packages:
     peerDependencies:
       graphql: '*'
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/generator': 7.23.6
-      '@babel/parser': 7.24.0
-      '@babel/runtime': 7.24.0
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
-      babel-preset-fbjs: 3.4.0(@babel/core@7.24.0)
+      '@babel/parser': 7.23.9
+      '@babel/runtime': 7.23.9
+      '@babel/traverse': 7.23.9
+      '@babel/types': 7.23.9
+      babel-preset-fbjs: 3.4.0(@babel/core@7.23.9)
       chalk: 4.1.2
-      fb-watchman: 2.0.2
+      fb-watchman: 2.0.1
       fbjs: 3.0.4
       glob: 7.2.3
       graphql: 16.6.0
@@ -1817,15 +1817,15 @@ packages:
     peerDependencies:
       graphql: '*'
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/generator': 7.23.6
-      '@babel/parser': 7.24.0
-      '@babel/runtime': 7.24.0
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
-      babel-preset-fbjs: 3.4.0(@babel/core@7.24.0)
+      '@babel/parser': 7.23.9
+      '@babel/runtime': 7.23.9
+      '@babel/traverse': 7.23.9
+      '@babel/types': 7.23.9
+      babel-preset-fbjs: 3.4.0(@babel/core@7.23.9)
       chalk: 4.1.2
-      fb-watchman: 2.0.2
+      fb-watchman: 2.0.1
       fbjs: 3.0.4
       glob: 7.2.3
       graphql: 16.8.1
@@ -1859,20 +1859,20 @@ packages:
     resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/core@7.24.0:
-    resolution: {integrity: sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==}
+  /@babel/core@7.23.9:
+    resolution: {integrity: sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@ampproject/remapping': 2.3.0
+      '@ampproject/remapping': 2.2.1
       '@babel/code-frame': 7.23.5
       '@babel/generator': 7.23.6
       '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
-      '@babel/helpers': 7.24.0
-      '@babel/parser': 7.24.0
-      '@babel/template': 7.24.0
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.9)
+      '@babel/helpers': 7.23.9
+      '@babel/parser': 7.23.9
+      '@babel/template': 7.23.9
+      '@babel/traverse': 7.23.9
+      '@babel/types': 7.23.9
       convert-source-map: 2.0.0
       debug: 4.3.4(supports-color@9.2.2)
       gensync: 1.0.0-beta.2
@@ -1885,7 +1885,7 @@ packages:
     resolution: {integrity: sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.23.9
       '@jridgewell/gen-mapping': 0.3.2
       '@jridgewell/trace-mapping': 0.3.17
       jsesc: 2.5.2
@@ -1895,22 +1895,22 @@ packages:
     resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.24.0
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
+      '@babel/types': 7.23.9
+      '@jridgewell/gen-mapping': 0.3.3
+      '@jridgewell/trace-mapping': 0.3.22
       jsesc: 2.5.2
 
   /@babel/helper-annotate-as-pure@7.22.5:
     resolution: {integrity: sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.23.9
 
   /@babel/helper-builder-binary-assignment-operator-visitor@7.22.15:
     resolution: {integrity: sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.23.9
 
   /@babel/helper-compilation-targets@7.23.6:
     resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==}
@@ -1918,46 +1918,46 @@ packages:
     dependencies:
       '@babel/compat-data': 7.23.5
       '@babel/helper-validator-option': 7.23.5
-      browserslist: 4.23.0
+      browserslist: 4.22.3
       lru-cache: 5.1.1
       semver: 6.3.1
 
-  /@babel/helper-create-class-features-plugin@7.24.0(@babel/core@7.24.0):
-    resolution: {integrity: sha512-QAH+vfvts51BCsNZ2PhY6HAggnlS6omLLFTsIpeqZk/MmJ6cW7tgz5yRv0fMJThcr6FmbMrENh1RgrWPTYA76g==}
+  /@babel/helper-create-class-features-plugin@7.23.9(@babel/core@7.23.9):
+    resolution: {integrity: sha512-B2L9neXTIyPQoXDm+NtovPvG6VOLWnaXu3BIeVDWwdKFgG30oNa6CqVGiJPDWQwIAK49t9gnQI9c6K6RzabiKw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-member-expression-to-functions': 7.23.0
       '@babel/helper-optimise-call-expression': 7.22.5
-      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.24.0)
+      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.9)
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
       semver: 6.3.1
 
-  /@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.24.0):
+  /@babel/helper-create-regexp-features-plugin@7.22.15(@babel/core@7.23.9):
     resolution: {integrity: sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-annotate-as-pure': 7.22.5
       regexpu-core: 5.3.2
       semver: 6.3.1
 
-  /@babel/helper-define-polyfill-provider@0.5.0(@babel/core@7.24.0):
+  /@babel/helper-define-polyfill-provider@0.5.0(@babel/core@7.23.9):
     resolution: {integrity: sha512-NovQquuQLAQ5HuyjCz7WQP9MjRj7dx++yspwiyUiGl9ZyadHRSql1HZh5ogRd8W8w6YM6EQ/NTB8rgjLt5W65Q==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
       debug: 4.3.4(supports-color@9.2.2)
       lodash.debounce: 4.0.8
       resolve: 1.22.8
@@ -1972,34 +1972,34 @@ packages:
     resolution: {integrity: sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/template': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/template': 7.23.9
+      '@babel/types': 7.23.9
 
   /@babel/helper-hoist-variables@7.22.5:
     resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.23.9
 
   /@babel/helper-member-expression-to-functions@7.23.0:
     resolution: {integrity: sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.23.9
 
   /@babel/helper-module-imports@7.22.15:
     resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.23.9
 
-  /@babel/helper-module-transforms@7.23.3(@babel/core@7.24.0):
+  /@babel/helper-module-transforms@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-module-imports': 7.22.15
       '@babel/helper-simple-access': 7.22.5
@@ -2010,30 +2010,30 @@ packages:
     resolution: {integrity: sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.23.9
 
-  /@babel/helper-plugin-utils@7.24.0:
-    resolution: {integrity: sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==}
+  /@babel/helper-plugin-utils@7.22.5:
+    resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.24.0):
+  /@babel/helper-remap-async-to-generator@7.22.20(@babel/core@7.23.9):
     resolution: {integrity: sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-wrap-function': 7.22.20
 
-  /@babel/helper-replace-supers@7.22.20(@babel/core@7.24.0):
+  /@babel/helper-replace-supers@7.22.20(@babel/core@7.23.9):
     resolution: {integrity: sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-member-expression-to-functions': 7.23.0
       '@babel/helper-optimise-call-expression': 7.22.5
@@ -2042,19 +2042,19 @@ packages:
     resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.23.9
 
   /@babel/helper-skip-transparent-expression-wrappers@7.22.5:
     resolution: {integrity: sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.23.9
 
   /@babel/helper-split-export-declaration@7.22.6:
     resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.23.9
 
   /@babel/helper-string-parser@7.19.4:
     resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==}
@@ -2078,16 +2078,16 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/helper-function-name': 7.23.0
-      '@babel/template': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/template': 7.23.9
+      '@babel/types': 7.23.9
 
-  /@babel/helpers@7.24.0:
-    resolution: {integrity: sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==}
+  /@babel/helpers@7.23.9:
+    resolution: {integrity: sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/template': 7.24.0
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/template': 7.23.9
+      '@babel/traverse': 7.23.9
+      '@babel/types': 7.23.9
     transitivePeerDependencies:
       - supports-color
 
@@ -2099,900 +2099,900 @@ packages:
       chalk: 2.4.2
       js-tokens: 4.0.0
 
-  /@babel/parser@7.24.0:
-    resolution: {integrity: sha512-QuP/FxEAzMSjXygs8v4N9dvdXzEHN4W1oF3PxuWAtPo08UdM17u89RDMgjLn/mlc56iM0HlLmVkO/wgR+rDgHg==}
+  /@babel/parser@7.23.9:
+    resolution: {integrity: sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==}
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.23.9
 
-  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-iRkKcCqb7iGnq9+3G6rZ+Ciz5VywC4XNRHe57lKM+jOeYAoR0lVqdeeDRfh0tQcTfw/+vBhHn926FmQhLtlFLQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-WwlxbfMNdVEpQjZmK5mhm7oSwD3dS6eU+Iwsi4Knl9wAletWem7kaRsGOG+8UEbRyqxY4SS5zvtfXwX+jMxUwQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.13.0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.24.0)
+      '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.23.9)
 
-  /@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.23.7(@babel/core@7.24.0):
+  /@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.23.7(@babel/core@7.23.9):
     resolution: {integrity: sha512-LlRT7HgaifEpQA1ZgLVOIJZZFVPWN5iReq/7/JixwBtwcoeVGDBD53ZV28rrsLYOZs1Y/EHhA8N/Z6aazHR8cw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.24.0):
+  /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.23.9):
     resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-create-class-features-plugin': 7.23.9(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-proposal-object-rest-spread@7.18.6(@babel/core@7.24.0):
+  /@babel/plugin-proposal-object-rest-spread@7.18.6(@babel/core@7.23.9):
     resolution: {integrity: sha512-9yuM6wr4rIsKa1wlUAbZEazkCrgw2sMPEXCr4Rnwetu7cEW1NydkCWytLuYletbf8vFxdJxFhwEZqMpOx2eZyw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/compat-data': 7.23.5
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.0):
+  /@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.9):
     resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
 
-  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.0):
+  /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.24.0):
+  /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.24.0):
+  /@babel/plugin-syntax-class-properties@7.12.13(@babel/core@7.23.9):
     resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.24.0):
+  /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.24.0):
+  /@babel/plugin-syntax-dynamic-import@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.24.0):
+  /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-flow@7.18.6(@babel/core@7.24.0):
+  /@babel/plugin-syntax-flow@7.18.6(@babel/core@7.23.9):
     resolution: {integrity: sha512-LUbR+KNTBWCUAqRG9ex5Gnzu2IOkt8jRJbHHXFT9q+L9zm7M/QQbEqXyw1n1pohYvOyWC8CjeyjrSaIwiYjK7A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-import-assertions@7.20.0(@babel/core@7.24.0):
+  /@babel/plugin-syntax-import-assertions@7.20.0(@babel/core@7.23.9):
     resolution: {integrity: sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-import-assertions@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-syntax-import-assertions@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-import-attributes@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-syntax-import-attributes@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-pawnE0P9g10xgoP7yKr6CK63K2FMsTE+FZidZO/1PwRdzmAPVs+HS1mAURUsgaoxammTJvULUdIkEK0gOcU2tA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.0):
+  /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.0):
+  /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.24.0):
-    resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==}
+  /@babel/plugin-syntax-jsx@7.18.6(@babel/core@7.23.9):
+    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.24.0):
+  /@babel/plugin-syntax-logical-assignment-operators@7.10.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.0):
+  /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.0):
+  /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.0):
+  /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.0):
+  /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.0):
+  /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.24.0):
+  /@babel/plugin-syntax-private-property-in-object@7.14.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.0):
+  /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.24.0):
-    resolution: {integrity: sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==}
+  /@babel/plugin-syntax-typescript@7.18.6(@babel/core@7.23.9):
+    resolution: {integrity: sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.24.0):
+  /@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.23.9):
     resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-arrow-functions@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-arrow-functions@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-async-generator-functions@7.23.9(@babel/core@7.24.0):
+  /@babel/plugin-transform-async-generator-functions@7.23.9(@babel/core@7.23.9):
     resolution: {integrity: sha512-8Q3veQEDGe14dTYuwagbRtwxQDnytyg1JFu4/HwEMETeofocrB0U0ejBJIXoeG/t2oXZ8kzCyI0ZZfbT80VFNQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-environment-visitor': 7.22.20
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.0)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.9)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.9)
 
-  /@babel/plugin-transform-async-to-generator@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-async-to-generator@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-A7LFsKi4U4fomjqXJlZg/u0ft/n8/7n7lpffUP/ZULx/DtV9SGlNKZolHH6PE8Xl1ngCc0M11OaeZptXVkfKSw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-module-imports': 7.22.15
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-remap-async-to-generator': 7.22.20(@babel/core@7.23.9)
 
-  /@babel/plugin-transform-block-scoped-functions@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-block-scoped-functions@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-block-scoping@7.23.4(@babel/core@7.24.0):
+  /@babel/plugin-transform-block-scoping@7.23.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-class-properties@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-class-properties@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-uM+AN8yCIjDPccsKGlw271xjJtGii+xQIF/uMPS8H15L12jZTsLfF4o5vNO7d/oUguOyfdikHGc/yi9ge4SGIg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-create-class-features-plugin': 7.23.9(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-class-static-block@7.23.4(@babel/core@7.24.0):
+  /@babel/plugin-transform-class-static-block@7.23.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-nsWu/1M+ggti1SOALj3hfx5FXzAY06fwPJsUZD4/A5e1bWi46VUIWtD+kOX6/IdhXGsXBWllLFDSnqSCdUNydQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.12.0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-create-class-features-plugin': 7.23.9(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.9)
 
-  /@babel/plugin-transform-classes@7.23.8(@babel/core@7.24.0):
+  /@babel/plugin-transform-classes@7.23.8(@babel/core@7.23.9):
     resolution: {integrity: sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-function-name': 7.23.0
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.9)
       '@babel/helper-split-export-declaration': 7.22.6
       globals: 11.12.0
 
-  /@babel/plugin-transform-computed-properties@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-computed-properties@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/template': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/template': 7.23.9
 
-  /@babel/plugin-transform-destructuring@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-destructuring@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-dotall-regex@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-dotall-regex@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-vgnFYDHAKzFaTVp+mneDsIEbnJ2Np/9ng9iviHw3P/KVcgONxpNULEW/51Z/BaFojG2GI2GwwXck5uV1+1NOYQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-duplicate-keys@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-duplicate-keys@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-RrqQ+BQmU3Oyav3J+7/myfvRCq7Tbz+kKLLshUmMwNlDHExbGL7ARhajvoBJEvc+fCguPPu887N+3RRXBVKZUA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-dynamic-import@7.23.4(@babel/core@7.24.0):
+  /@babel/plugin-transform-dynamic-import@7.23.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-V6jIbLhdJK86MaLh4Jpghi8ho5fGzt3imHOBu/x0jlBaPYqDoWz4RDXjmMOfnh+JWNaQleEAByZLV0QzBT4YQQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.9)
 
-  /@babel/plugin-transform-exponentiation-operator@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-exponentiation-operator@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-5fhCsl1odX96u7ILKHBj4/Y8vipoqwsJMh4csSA8qFfxrZDEA4Ssku2DyNvMJSmZNOEBT750LfFPbtrnTP90BQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-builder-binary-assignment-operator-visitor': 7.22.15
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-export-namespace-from@7.23.4(@babel/core@7.24.0):
+  /@babel/plugin-transform-export-namespace-from@7.23.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-GzuSBcKkx62dGzZI1WVgTWvkkz84FZO5TC5T8dl/Tht/rAla6Dg/Mz9Yhypg+ezVACf/rgDuQt3kbWEv7LdUDQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.9)
 
-  /@babel/plugin-transform-flow-strip-types@7.18.6(@babel/core@7.24.0):
+  /@babel/plugin-transform-flow-strip-types@7.18.6(@babel/core@7.23.9):
     resolution: {integrity: sha512-wE0xtA7csz+hw4fKPwxmu5jnzAsXPIO57XnRwzXP3T19jWh1BODnPGoG9xKYwvAwusP7iUktHayRFbMPGtODaQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.24.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.23.9)
     dev: true
 
-  /@babel/plugin-transform-for-of@7.23.6(@babel/core@7.24.0):
+  /@babel/plugin-transform-for-of@7.23.6(@babel/core@7.23.9):
     resolution: {integrity: sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
 
-  /@babel/plugin-transform-function-name@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-function-name@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-function-name': 7.23.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-json-strings@7.23.4(@babel/core@7.24.0):
+  /@babel/plugin-transform-json-strings@7.23.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-81nTOqM1dMwZ/aRXQ59zVubN9wHGqk6UtqRK+/q+ciXmRy8fSolhGVvG09HHRGo4l6fr/c4ZhXUQH0uFW7PZbg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.9)
 
-  /@babel/plugin-transform-literals@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-literals@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-logical-assignment-operators@7.23.4(@babel/core@7.24.0):
+  /@babel/plugin-transform-logical-assignment-operators@7.23.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-Mc/ALf1rmZTP4JKKEhUwiORU+vcfarFVLfcFiolKUo6sewoxSEgl36ak5t+4WamRsNr6nzjZXQjM35WsU+9vbg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.9)
 
-  /@babel/plugin-transform-member-expression-literals@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-member-expression-literals@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-modules-amd@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-modules-amd@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-vJYQGxeKM4t8hYCKVBlZX/gtIY2I7mRGFNcm85sgXGMTBcoV3QdVtdpbcWEbzbfUIUZKwvgFT82mRvaQIebZzw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-simple-access': 7.22.5
 
-  /@babel/plugin-transform-modules-systemjs@7.23.9(@babel/core@7.24.0):
+  /@babel/plugin-transform-modules-systemjs@7.23.9(@babel/core@7.23.9):
     resolution: {integrity: sha512-KDlPRM6sLo4o1FkiSlXoAa8edLXFsKKIda779fbLrvmeuc3itnjCtaO6RrtoaANsIJANj+Vk1zqbZIMhkCAHVw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-hoist-variables': 7.22.5
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-validator-identifier': 7.22.20
 
-  /@babel/plugin-transform-modules-umd@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-modules-umd@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-zHsy9iXX2nIsCBFPud3jKn1IRPWg3Ing1qOZgeKV39m1ZgIdpJqvlWVeiHBZC6ITRG0MfskhYe9cLgntfSFPIg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.24.0):
+  /@babel/plugin-transform-named-capturing-groups-regex@7.22.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-new-target@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-new-target@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-YJ3xKqtJMAT5/TIZnpAR3I+K+WaDowYbN3xyxI8zxx/Gsypwf9B9h0VB+1Nh6ACAAPRS5NSRje0uVv5i79HYGQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-nullish-coalescing-operator@7.23.4(@babel/core@7.24.0):
+  /@babel/plugin-transform-nullish-coalescing-operator@7.23.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-jHE9EVVqHKAQx+VePv5LLGHjmHSJR76vawFPTdlxR/LVJPfOEGxREQwQfjuZEOPTwG92X3LINSh3M40Rv4zpVA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.9)
 
-  /@babel/plugin-transform-numeric-separator@7.23.4(@babel/core@7.24.0):
+  /@babel/plugin-transform-numeric-separator@7.23.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-mps6auzgwjRrwKEZA05cOwuDc9FAzoyFS4ZsG/8F43bTLf/TgkJg7QXOrPO1JO599iA3qgK9MXdMGOEC8O1h6Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.9)
 
-  /@babel/plugin-transform-object-rest-spread@7.24.0(@babel/core@7.24.0):
-    resolution: {integrity: sha512-y/yKMm7buHpFFXfxVFS4Vk1ToRJDilIa6fKRioB9Vjichv58TDGXTvqV0dN7plobAmTW5eSEGXDngE+Mm+uO+w==}
+  /@babel/plugin-transform-object-rest-spread@7.23.4(@babel/core@7.23.9):
+    resolution: {integrity: sha512-9x9K1YyeQVw0iOXJlIzwm8ltobIIv7j2iLyP2jIhEbqPRQ7ScNgwQufU2I0Gq11VjyG4gI4yMXt2VFags+1N3g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/compat-data': 7.23.5
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.24.0)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.9)
 
-  /@babel/plugin-transform-object-super@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-object-super@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.24.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/helper-replace-supers': 7.22.20(@babel/core@7.23.9)
 
-  /@babel/plugin-transform-optional-catch-binding@7.23.4(@babel/core@7.24.0):
+  /@babel/plugin-transform-optional-catch-binding@7.23.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-XIq8t0rJPHf6Wvmbn9nFxU6ao4c7WhghTR5WyV8SrJfUFzyxhCm4nhC+iAp3HFhbAKLfYpgzhJ6t4XCtVwqO5A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.9)
 
-  /@babel/plugin-transform-optional-chaining@7.23.4(@babel/core@7.24.0):
+  /@babel/plugin-transform-optional-chaining@7.23.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-ZU8y5zWOfjM5vZ+asjgAPwDaBjJzgufjES89Rs4Lpq63O300R/kOz30WCLo6BxxX6QVEilwSlpClnG5cZaikTA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.0)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.9)
 
-  /@babel/plugin-transform-parameters@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-parameters@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-private-methods@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-private-methods@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-UzqRcRtWsDMTLrRWFvUBDwmw06tCQH9Rl1uAjfh6ijMSmGYQ+fpdB+cnqRC8EMh5tuuxSv0/TejGL+7vyj+50g==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-create-class-features-plugin': 7.23.9(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-private-property-in-object@7.23.4(@babel/core@7.24.0):
+  /@babel/plugin-transform-private-property-in-object@7.23.4(@babel/core@7.23.9):
     resolution: {integrity: sha512-9G3K1YqTq3F4Vt88Djx1UZ79PDyj+yKRnUy7cZGSMe+a7jkwD259uKKuUzQlPkGam7R+8RJwh5z4xO27fA1o2A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-annotate-as-pure': 7.22.5
-      '@babel/helper-create-class-features-plugin': 7.24.0(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.0)
+      '@babel/helper-create-class-features-plugin': 7.23.9(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.9)
 
-  /@babel/plugin-transform-property-literals@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-property-literals@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-react-display-name@7.18.6(@babel/core@7.24.0):
+  /@babel/plugin-transform-react-display-name@7.18.6(@babel/core@7.23.9):
     resolution: {integrity: sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
     dev: true
 
-  /@babel/plugin-transform-react-jsx@7.18.6(@babel/core@7.24.0):
+  /@babel/plugin-transform-react-jsx@7.18.6(@babel/core@7.23.9):
     resolution: {integrity: sha512-Mz7xMPxoy9kPS/JScj6fJs03TZ/fZ1dJPlMjRAgTaxaS0fUBk8FV/A2rRgfPsVCZqALNwMexD+0Uaf5zlcKPpw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-annotate-as-pure': 7.22.5
       '@babel/helper-module-imports': 7.22.15
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.24.0)
-      '@babel/types': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.23.9)
+      '@babel/types': 7.23.9
     dev: true
 
-  /@babel/plugin-transform-regenerator@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-regenerator@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-KP+75h0KghBMcVpuKisx3XTu9Ncut8Q8TuvGO4IhY+9D5DFEckQefOuIsB/gQ2tG71lCke4NMrtIPS8pOj18BQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
       regenerator-transform: 0.15.2
 
-  /@babel/plugin-transform-reserved-words@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-reserved-words@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-QnNTazY54YqgGxwIexMZva9gqbPa15t/x9VS+0fsEFWplwVpXYZivtgl43Z1vMpc1bdPP2PP8siFeVcnFvA3Cg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-shorthand-properties@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-shorthand-properties@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-spread@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-spread@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-skip-transparent-expression-wrappers': 7.22.5
 
-  /@babel/plugin-transform-sticky-regex@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-sticky-regex@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-HZOyN9g+rtvnOU3Yh7kSxXrKbzgrm5X4GncPY1QOquu7epga5MxKHVpYu2hvQnry/H+JjckSYRb93iNfsioAGg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-template-literals@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-template-literals@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-typeof-symbol@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-typeof-symbol@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-4t15ViVnaFdrPC74be1gXBSMzXk3B4Us9lP7uLRQHTFpV5Dvt33pn+2MyyNxmN3VTTm3oTrZVMUmuw3oBnQ2oQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-unicode-escapes@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-unicode-escapes@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-OMCUx/bU6ChE3r4+ZdylEqAjaQgHAgipgW8nsCfu5pGqDcFytVd91AwRvUJSBZDz0exPGgnjoqhgRYLRjFZc9Q==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-unicode-property-regex@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-unicode-property-regex@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-KcLIm+pDZkWZQAFJ9pdfmh89EwVfmNovFBcXko8szpBeF8z68kWIPeKlmSOkT9BXJxs2C0uk+5LxoxIv62MROA==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-unicode-regex@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-unicode-regex@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-wMHpNA4x2cIA32b/ci3AfwNgheiva2W0WUKWTK7vBHBhDKfPsc5cFGNWm69WBqpwd86u1qwZ9PWevKqm1A3yAw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/plugin-transform-unicode-sets-regex@7.23.3(@babel/core@7.24.0):
+  /@babel/plugin-transform-unicode-sets-regex@7.23.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-W7lliA/v9bNR83Qc3q1ip9CQMZ09CcHDbHfbLRDNuAhn1Mvkr1ZNF7hPmztMQvtTGVLJ9m8IZqWsTkXOml8dbw==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.24.0)
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-create-regexp-features-plugin': 7.22.15(@babel/core@7.23.9)
+      '@babel/helper-plugin-utils': 7.22.5
 
-  /@babel/preset-env@7.24.0(@babel/core@7.24.0):
-    resolution: {integrity: sha512-ZxPEzV9IgvGn73iK0E6VB9/95Nd7aMFpbE0l8KQFDG70cOV9IxRP7Y2FUPmlK0v6ImlLqYX50iuZ3ZTVhOF2lA==}
+  /@babel/preset-env@7.23.9(@babel/core@7.23.9):
+    resolution: {integrity: sha512-3kBGTNBBk9DQiPoXYS0g0BYlwTQYUTifqgKTjxUwEUkduRT2QOa0FPGBJ+NROQhGyYO5BuTJwGvBnqKDykac6A==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/compat-data': 7.23.5
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-compilation-targets': 7.23.6
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
       '@babel/helper-validator-option': 7.23.5
-      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.23.7(@babel/core@7.24.0)
-      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.24.0)
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.0)
-      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.24.0)
-      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-import-attributes': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.24.0)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.0)
-      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.24.0)
-      '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-async-generator-functions': 7.23.9(@babel/core@7.24.0)
-      '@babel/plugin-transform-async-to-generator': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-class-static-block': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-classes': 7.23.8(@babel/core@7.24.0)
-      '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-dotall-regex': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-duplicate-keys': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-dynamic-import': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-exponentiation-operator': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-export-namespace-from': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-for-of': 7.23.6(@babel/core@7.24.0)
-      '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-json-strings': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-logical-assignment-operators': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-modules-amd': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-modules-systemjs': 7.23.9(@babel/core@7.24.0)
-      '@babel/plugin-transform-modules-umd': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.24.0)
-      '@babel/plugin-transform-new-target': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-numeric-separator': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-object-rest-spread': 7.24.0(@babel/core@7.24.0)
-      '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-optional-catch-binding': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-private-methods': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-private-property-in-object': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-regenerator': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-reserved-words': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-sticky-regex': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-typeof-symbol': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-unicode-escapes': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-unicode-property-regex': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-unicode-regex': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-unicode-sets-regex': 7.23.3(@babel/core@7.24.0)
-      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.24.0)
-      babel-plugin-polyfill-corejs2: 0.4.8(@babel/core@7.24.0)
-      babel-plugin-polyfill-corejs3: 0.9.0(@babel/core@7.24.0)
-      babel-plugin-polyfill-regenerator: 0.5.5(@babel/core@7.24.0)
-      core-js-compat: 3.36.0
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.23.7(@babel/core@7.23.9)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.23.9)
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.9)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.9)
+      '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.23.9)
+      '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-import-attributes': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.9)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.9)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.9)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.23.9)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.23.9)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.23.9)
+      '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-async-generator-functions': 7.23.9(@babel/core@7.23.9)
+      '@babel/plugin-transform-async-to-generator': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.23.9)
+      '@babel/plugin-transform-class-properties': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-class-static-block': 7.23.4(@babel/core@7.23.9)
+      '@babel/plugin-transform-classes': 7.23.8(@babel/core@7.23.9)
+      '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-dotall-regex': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-duplicate-keys': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-dynamic-import': 7.23.4(@babel/core@7.23.9)
+      '@babel/plugin-transform-exponentiation-operator': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-export-namespace-from': 7.23.4(@babel/core@7.23.9)
+      '@babel/plugin-transform-for-of': 7.23.6(@babel/core@7.23.9)
+      '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-json-strings': 7.23.4(@babel/core@7.23.9)
+      '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-logical-assignment-operators': 7.23.4(@babel/core@7.23.9)
+      '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-modules-amd': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-modules-systemjs': 7.23.9(@babel/core@7.23.9)
+      '@babel/plugin-transform-modules-umd': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.22.5(@babel/core@7.23.9)
+      '@babel/plugin-transform-new-target': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.23.4(@babel/core@7.23.9)
+      '@babel/plugin-transform-numeric-separator': 7.23.4(@babel/core@7.23.9)
+      '@babel/plugin-transform-object-rest-spread': 7.23.4(@babel/core@7.23.9)
+      '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-optional-catch-binding': 7.23.4(@babel/core@7.23.9)
+      '@babel/plugin-transform-optional-chaining': 7.23.4(@babel/core@7.23.9)
+      '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-private-methods': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-private-property-in-object': 7.23.4(@babel/core@7.23.9)
+      '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-regenerator': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-reserved-words': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-sticky-regex': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-typeof-symbol': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-unicode-escapes': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-unicode-property-regex': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-unicode-regex': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-unicode-sets-regex': 7.23.3(@babel/core@7.23.9)
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.23.9)
+      babel-plugin-polyfill-corejs2: 0.4.8(@babel/core@7.23.9)
+      babel-plugin-polyfill-corejs3: 0.9.0(@babel/core@7.23.9)
+      babel-plugin-polyfill-regenerator: 0.5.5(@babel/core@7.23.9)
+      core-js-compat: 3.35.1
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.24.0):
+  /@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.23.9):
     resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==}
     peerDependencies:
       '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/types': 7.23.9
       esutils: 2.0.3
 
   /@babel/regjsgen@0.8.0:
     resolution: {integrity: sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==}
 
-  /@babel/runtime@7.24.0:
-    resolution: {integrity: sha512-Chk32uHMg6TnQdvw2e9IlqPpFX/6NLuK0Ys2PqLb7/gL5uFn9mXvK715FGLlOLQrcO4qIkNHkvPGktzzXexsFw==}
+  /@babel/runtime@7.23.9:
+    resolution: {integrity: sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==}
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.14.1
@@ -3006,20 +3006,20 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.23.5
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.23.9
+      '@babel/types': 7.23.9
     dev: true
 
-  /@babel/template@7.24.0:
-    resolution: {integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==}
+  /@babel/template@7.23.9:
+    resolution: {integrity: sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.23.5
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.23.9
+      '@babel/types': 7.23.9
 
-  /@babel/traverse@7.24.0:
-    resolution: {integrity: sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==}
+  /@babel/traverse@7.23.9:
+    resolution: {integrity: sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.23.5
@@ -3028,8 +3028,8 @@ packages:
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-hoist-variables': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.23.9
+      '@babel/types': 7.23.9
       debug: 4.3.4(supports-color@9.2.2)
       globals: 11.12.0
     transitivePeerDependencies:
@@ -3044,8 +3044,8 @@ packages:
       to-fast-properties: 2.0.0
     dev: true
 
-  /@babel/types@7.24.0:
-    resolution: {integrity: sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==}
+  /@babel/types@7.23.9:
+    resolution: {integrity: sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/helper-string-parser': 7.23.4
@@ -3339,7 +3339,7 @@ packages:
     hasBin: true
     dependencies:
       '@digitak/grubber': 3.1.2
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       esbuild: 0.14.48
     dev: true
 
@@ -3363,35 +3363,26 @@ packages:
     resolution: {integrity: sha512-8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA==}
     dev: true
 
-  /@esbuild-plugins/node-globals-polyfill@0.2.3(esbuild@0.20.1):
+  /@esbuild-plugins/node-globals-polyfill@0.2.3(esbuild@0.20.0):
     resolution: {integrity: sha512-r3MIryXDeXDOZh7ih1l/yE9ZLORCd5e8vWg02azWRGj5SPTuoh69A2AIyn0Z31V/kHBfZ4HgWJ+OK3GTTwLmnw==}
     peerDependencies:
       esbuild: '*'
     dependencies:
-      esbuild: 0.20.1
+      esbuild: 0.20.0
     dev: true
 
-  /@esbuild-plugins/node-modules-polyfill@0.2.2(esbuild@0.20.1):
+  /@esbuild-plugins/node-modules-polyfill@0.2.2(esbuild@0.20.0):
     resolution: {integrity: sha512-LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA==}
     peerDependencies:
       esbuild: '*'
     dependencies:
-      esbuild: 0.20.1
+      esbuild: 0.20.0
       escape-string-regexp: 4.0.0
       rollup-plugin-node-polyfills: 0.2.1
     dev: true
 
-  /@esbuild/aix-ppc64@0.19.12:
-    resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [aix]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/aix-ppc64@0.20.1:
-    resolution: {integrity: sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==}
+  /@esbuild/aix-ppc64@0.20.0:
+    resolution: {integrity: sha512-fGFDEctNh0CcSwsiRPxiaqX0P5rq+AqE0SRhYGZ4PX46Lg1FNR6oCxJghf8YgY0WQEgQuh3lErUFE4KxLeRmmw==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [aix]
@@ -3407,8 +3398,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/android-arm64@0.19.12:
-    resolution: {integrity: sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==}
+  /@esbuild/android-arm64@0.19.5:
+    resolution: {integrity: sha512-5d1OkoJxnYQfmC+Zd8NBFjkhyCNYwM4n9ODrycTFY6Jk1IGiZ+tjVJDDSwDt77nK+tfpGP4T50iMtVi4dEGzhQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
@@ -3416,8 +3407,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-arm64@0.20.1:
-    resolution: {integrity: sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==}
+  /@esbuild/android-arm64@0.20.0:
+    resolution: {integrity: sha512-aVpnM4lURNkp0D3qPoAzSG92VXStYmoVPOgXveAUoQBWRSuQzt51yvSju29J6AHPmwY1BjH49uR29oyfH1ra8Q==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
@@ -3441,8 +3432,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/android-arm@0.19.12:
-    resolution: {integrity: sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==}
+  /@esbuild/android-arm@0.19.5:
+    resolution: {integrity: sha512-bhvbzWFF3CwMs5tbjf3ObfGqbl/17ict2/uwOSfr3wmxDE6VdS2GqY/FuzIPe0q0bdhj65zQsvqfArI9MY6+AA==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
@@ -3450,8 +3441,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-arm@0.20.1:
-    resolution: {integrity: sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==}
+  /@esbuild/android-arm@0.20.0:
+    resolution: {integrity: sha512-3bMAfInvByLHfJwYPJRlpTeaQA75n8C/QKpEaiS4HrFWFiJlNI0vzq/zCjBrhAYcPyVPG7Eo9dMrcQXuqmNk5g==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
@@ -3467,8 +3458,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/android-x64@0.19.12:
-    resolution: {integrity: sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==}
+  /@esbuild/android-x64@0.19.5:
+    resolution: {integrity: sha512-9t+28jHGL7uBdkBjL90QFxe7DVA+KGqWlHCF8ChTKyaKO//VLuoBricQCgwhOjA1/qOczsw843Fy4cbs4H3DVA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
@@ -3476,8 +3467,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-x64@0.20.1:
-    resolution: {integrity: sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==}
+  /@esbuild/android-x64@0.20.0:
+    resolution: {integrity: sha512-uK7wAnlRvjkCPzh8jJ+QejFyrP8ObKuR5cBIsQZ+qbMunwR8sbd8krmMbxTLSrDhiPZaJYKQAU5Y3iMDcZPhyQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
@@ -3493,8 +3484,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/darwin-arm64@0.19.12:
-    resolution: {integrity: sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==}
+  /@esbuild/darwin-arm64@0.19.5:
+    resolution: {integrity: sha512-mvXGcKqqIqyKoxq26qEDPHJuBYUA5KizJncKOAf9eJQez+L9O+KfvNFu6nl7SCZ/gFb2QPaRqqmG0doSWlgkqw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
@@ -3502,8 +3493,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-arm64@0.20.1:
-    resolution: {integrity: sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==}
+  /@esbuild/darwin-arm64@0.20.0:
+    resolution: {integrity: sha512-AjEcivGAlPs3UAcJedMa9qYg9eSfU6FnGHJjT8s346HSKkrcWlYezGE8VaO2xKfvvlZkgAhyvl06OJOxiMgOYQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
@@ -3519,8 +3510,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/darwin-x64@0.19.12:
-    resolution: {integrity: sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==}
+  /@esbuild/darwin-x64@0.19.5:
+    resolution: {integrity: sha512-Ly8cn6fGLNet19s0X4unjcniX24I0RqjPv+kurpXabZYSXGM4Pwpmf85WHJN3lAgB8GSth7s5A0r856S+4DyiA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
@@ -3528,8 +3519,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-x64@0.20.1:
-    resolution: {integrity: sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==}
+  /@esbuild/darwin-x64@0.20.0:
+    resolution: {integrity: sha512-bsgTPoyYDnPv8ER0HqnJggXK6RyFy4PH4rtsId0V7Efa90u2+EifxytE9pZnsDgExgkARy24WUQGv9irVbTvIw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
@@ -3545,8 +3536,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/freebsd-arm64@0.19.12:
-    resolution: {integrity: sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==}
+  /@esbuild/freebsd-arm64@0.19.5:
+    resolution: {integrity: sha512-GGDNnPWTmWE+DMchq1W8Sd0mUkL+APvJg3b11klSGUDvRXh70JqLAO56tubmq1s2cgpVCSKYywEiKBfju8JztQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
@@ -3554,8 +3545,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-arm64@0.20.1:
-    resolution: {integrity: sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==}
+  /@esbuild/freebsd-arm64@0.20.0:
+    resolution: {integrity: sha512-kQ7jYdlKS335mpGbMW5tEe3IrQFIok9r84EM3PXB8qBFJPSc6dpWfrtsC/y1pyrz82xfUIn5ZrnSHQQsd6jebQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
@@ -3571,8 +3562,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/freebsd-x64@0.19.12:
-    resolution: {integrity: sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==}
+  /@esbuild/freebsd-x64@0.19.5:
+    resolution: {integrity: sha512-1CCwDHnSSoA0HNwdfoNY0jLfJpd7ygaLAp5EHFos3VWJCRX9DMwWODf96s9TSse39Br7oOTLryRVmBoFwXbuuQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
@@ -3580,8 +3571,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-x64@0.20.1:
-    resolution: {integrity: sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==}
+  /@esbuild/freebsd-x64@0.20.0:
+    resolution: {integrity: sha512-uG8B0WSepMRsBNVXAQcHf9+Ko/Tr+XqmK7Ptel9HVmnykupXdS4J7ovSQUIi0tQGIndhbqWLaIL/qO/cWhXKyQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
@@ -3597,8 +3588,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-arm64@0.19.12:
-    resolution: {integrity: sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==}
+  /@esbuild/linux-arm64@0.19.5:
+    resolution: {integrity: sha512-o3vYippBmSrjjQUCEEiTZ2l+4yC0pVJD/Dl57WfPwwlvFkrxoSO7rmBZFii6kQB3Wrn/6GwJUPLU5t52eq2meA==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
@@ -3606,8 +3597,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm64@0.20.1:
-    resolution: {integrity: sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==}
+  /@esbuild/linux-arm64@0.20.0:
+    resolution: {integrity: sha512-uTtyYAP5veqi2z9b6Gr0NUoNv9F/rOzI8tOD5jKcCvRUn7T60Bb+42NDBCWNhMjkQzI0qqwXkQGo1SY41G52nw==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
@@ -3623,8 +3614,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-arm@0.19.12:
-    resolution: {integrity: sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==}
+  /@esbuild/linux-arm@0.19.5:
+    resolution: {integrity: sha512-lrWXLY/vJBzCPC51QN0HM71uWgIEpGSjSZZADQhq7DKhPcI6NH1IdzjfHkDQws2oNpJKpR13kv7/pFHBbDQDwQ==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
@@ -3632,8 +3623,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm@0.20.1:
-    resolution: {integrity: sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==}
+  /@esbuild/linux-arm@0.20.0:
+    resolution: {integrity: sha512-2ezuhdiZw8vuHf1HKSf4TIk80naTbP9At7sOqZmdVwvvMyuoDiZB49YZKLsLOfKIr77+I40dWpHVeY5JHpIEIg==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
@@ -3649,8 +3640,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-ia32@0.19.12:
-    resolution: {integrity: sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==}
+  /@esbuild/linux-ia32@0.19.5:
+    resolution: {integrity: sha512-MkjHXS03AXAkNp1KKkhSKPOCYztRtK+KXDNkBa6P78F8Bw0ynknCSClO/ztGszILZtyO/lVKpa7MolbBZ6oJtQ==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
@@ -3658,8 +3649,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ia32@0.20.1:
-    resolution: {integrity: sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==}
+  /@esbuild/linux-ia32@0.20.0:
+    resolution: {integrity: sha512-c88wwtfs8tTffPaoJ+SQn3y+lKtgTzyjkD8NgsyCtCmtoIC8RDL7PrJU05an/e9VuAke6eJqGkoMhJK1RY6z4w==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
@@ -3683,8 +3674,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-loong64@0.19.12:
-    resolution: {integrity: sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==}
+  /@esbuild/linux-loong64@0.19.5:
+    resolution: {integrity: sha512-42GwZMm5oYOD/JHqHska3Jg0r+XFb/fdZRX+WjADm3nLWLcIsN27YKtqxzQmGNJgu0AyXg4HtcSK9HuOk3v1Dw==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
@@ -3692,8 +3683,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-loong64@0.20.1:
-    resolution: {integrity: sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==}
+  /@esbuild/linux-loong64@0.20.0:
+    resolution: {integrity: sha512-lR2rr/128/6svngnVta6JN4gxSXle/yZEZL3o4XZ6esOqhyR4wsKyfu6qXAL04S4S5CgGfG+GYZnjFd4YiG3Aw==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
@@ -3709,8 +3700,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-mips64el@0.19.12:
-    resolution: {integrity: sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==}
+  /@esbuild/linux-mips64el@0.19.5:
+    resolution: {integrity: sha512-kcjndCSMitUuPJobWCnwQ9lLjiLZUR3QLQmlgaBfMX23UEa7ZOrtufnRds+6WZtIS9HdTXqND4yH8NLoVVIkcg==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
@@ -3718,8 +3709,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-mips64el@0.20.1:
-    resolution: {integrity: sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==}
+  /@esbuild/linux-mips64el@0.20.0:
+    resolution: {integrity: sha512-9Sycc+1uUsDnJCelDf6ZNqgZQoK1mJvFtqf2MUz4ujTxGhvCWw+4chYfDLPepMEvVL9PDwn6HrXad5yOrNzIsQ==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
@@ -3735,8 +3726,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-ppc64@0.19.12:
-    resolution: {integrity: sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==}
+  /@esbuild/linux-ppc64@0.19.5:
+    resolution: {integrity: sha512-yJAxJfHVm0ZbsiljbtFFP1BQKLc8kUF6+17tjQ78QjqjAQDnhULWiTA6u0FCDmYT1oOKS9PzZ2z0aBI+Mcyj7Q==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
@@ -3744,8 +3735,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ppc64@0.20.1:
-    resolution: {integrity: sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==}
+  /@esbuild/linux-ppc64@0.20.0:
+    resolution: {integrity: sha512-CoWSaaAXOZd+CjbUTdXIJE/t7Oz+4g90A3VBCHLbfuc5yUQU/nFDLOzQsN0cdxgXd97lYW/psIIBdjzQIwTBGw==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
@@ -3761,8 +3752,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-riscv64@0.19.12:
-    resolution: {integrity: sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==}
+  /@esbuild/linux-riscv64@0.19.5:
+    resolution: {integrity: sha512-5u8cIR/t3gaD6ad3wNt1MNRstAZO+aNyBxu2We8X31bA8XUNyamTVQwLDA1SLoPCUehNCymhBhK3Qim1433Zag==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
@@ -3770,8 +3761,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-riscv64@0.20.1:
-    resolution: {integrity: sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==}
+  /@esbuild/linux-riscv64@0.20.0:
+    resolution: {integrity: sha512-mlb1hg/eYRJUpv8h/x+4ShgoNLL8wgZ64SUr26KwglTYnwAWjkhR2GpoKftDbPOCnodA9t4Y/b68H4J9XmmPzA==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
@@ -3787,8 +3778,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-s390x@0.19.12:
-    resolution: {integrity: sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==}
+  /@esbuild/linux-s390x@0.19.5:
+    resolution: {integrity: sha512-Z6JrMyEw/EmZBD/OFEFpb+gao9xJ59ATsoTNlj39jVBbXqoZm4Xntu6wVmGPB/OATi1uk/DB+yeDPv2E8PqZGw==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
@@ -3796,8 +3787,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-s390x@0.20.1:
-    resolution: {integrity: sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==}
+  /@esbuild/linux-s390x@0.20.0:
+    resolution: {integrity: sha512-fgf9ubb53xSnOBqyvWEY6ukBNRl1mVX1srPNu06B6mNsNK20JfH6xV6jECzrQ69/VMiTLvHMicQR/PgTOgqJUQ==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
@@ -3813,8 +3804,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-x64@0.19.12:
-    resolution: {integrity: sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==}
+  /@esbuild/linux-x64@0.19.5:
+    resolution: {integrity: sha512-psagl+2RlK1z8zWZOmVdImisMtrUxvwereIdyJTmtmHahJTKb64pAcqoPlx6CewPdvGvUKe2Jw+0Z/0qhSbG1A==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
@@ -3822,8 +3813,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-x64@0.20.1:
-    resolution: {integrity: sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==}
+  /@esbuild/linux-x64@0.20.0:
+    resolution: {integrity: sha512-H9Eu6MGse++204XZcYsse1yFHmRXEWgadk2N58O/xd50P9EvFMLJTQLg+lB4E1cF2xhLZU5luSWtGTb0l9UeSg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
@@ -3839,8 +3830,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/netbsd-x64@0.19.12:
-    resolution: {integrity: sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==}
+  /@esbuild/netbsd-x64@0.19.5:
+    resolution: {integrity: sha512-kL2l+xScnAy/E/3119OggX8SrWyBEcqAh8aOY1gr4gPvw76la2GlD4Ymf832UCVbmuWeTf2adkZDK+h0Z/fB4g==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
@@ -3848,8 +3839,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/netbsd-x64@0.20.1:
-    resolution: {integrity: sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==}
+  /@esbuild/netbsd-x64@0.20.0:
+    resolution: {integrity: sha512-lCT675rTN1v8Fo+RGrE5KjSnfY0x9Og4RN7t7lVrN3vMSjy34/+3na0q7RIfWDAj0e0rCh0OL+P88lu3Rt21MQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
@@ -3865,8 +3856,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/openbsd-x64@0.19.12:
-    resolution: {integrity: sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==}
+  /@esbuild/openbsd-x64@0.19.5:
+    resolution: {integrity: sha512-sPOfhtzFufQfTBgRnE1DIJjzsXukKSvZxloZbkJDG383q0awVAq600pc1nfqBcl0ice/WN9p4qLc39WhBShRTA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
@@ -3874,8 +3865,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/openbsd-x64@0.20.1:
-    resolution: {integrity: sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==}
+  /@esbuild/openbsd-x64@0.20.0:
+    resolution: {integrity: sha512-HKoUGXz/TOVXKQ+67NhxyHv+aDSZf44QpWLa3I1lLvAwGq8x1k0T+e2HHSRvxWhfJrFxaaqre1+YyzQ99KixoA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
@@ -3891,8 +3882,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/sunos-x64@0.19.12:
-    resolution: {integrity: sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==}
+  /@esbuild/sunos-x64@0.19.5:
+    resolution: {integrity: sha512-dGZkBXaafuKLpDSjKcB0ax0FL36YXCvJNnztjKV+6CO82tTYVDSH2lifitJ29jxRMoUhgkg9a+VA/B03WK5lcg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
@@ -3900,8 +3891,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/sunos-x64@0.20.1:
-    resolution: {integrity: sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==}
+  /@esbuild/sunos-x64@0.20.0:
+    resolution: {integrity: sha512-GDwAqgHQm1mVoPppGsoq4WJwT3vhnz/2N62CzhvApFD1eJyTroob30FPpOZabN+FgCjhG+AgcZyOPIkR8dfD7g==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
@@ -3917,8 +3908,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-arm64@0.19.12:
-    resolution: {integrity: sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==}
+  /@esbuild/win32-arm64@0.19.5:
+    resolution: {integrity: sha512-dWVjD9y03ilhdRQ6Xig1NWNgfLtf2o/STKTS+eZuF90fI2BhbwD6WlaiCGKptlqXlURVB5AUOxUj09LuwKGDTg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
@@ -3926,8 +3917,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-arm64@0.20.1:
-    resolution: {integrity: sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==}
+  /@esbuild/win32-arm64@0.20.0:
+    resolution: {integrity: sha512-0vYsP8aC4TvMlOQYozoksiaxjlvUcQrac+muDqj1Fxy6jh9l9CZJzj7zmh8JGfiV49cYLTorFLxg7593pGldwQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
@@ -3943,8 +3934,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-ia32@0.19.12:
-    resolution: {integrity: sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==}
+  /@esbuild/win32-ia32@0.19.5:
+    resolution: {integrity: sha512-4liggWIA4oDgUxqpZwrDhmEfAH4d0iljanDOK7AnVU89T6CzHon/ony8C5LeOdfgx60x5cnQJFZwEydVlYx4iw==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
@@ -3952,8 +3943,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-ia32@0.20.1:
-    resolution: {integrity: sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==}
+  /@esbuild/win32-ia32@0.20.0:
+    resolution: {integrity: sha512-p98u4rIgfh4gdpV00IqknBD5pC84LCub+4a3MO+zjqvU5MVXOc3hqR2UgT2jI2nh3h8s9EQxmOsVI3tyzv1iFg==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
@@ -3969,8 +3960,8 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-x64@0.19.12:
-    resolution: {integrity: sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==}
+  /@esbuild/win32-x64@0.19.5:
+    resolution: {integrity: sha512-czTrygUsB/jlM8qEW5MD8bgYU2Xg14lo6kBDXW6HdxKjh8M5PzETGiSHaz9MtbXBYDloHNUAUW2tMiKW4KM9Mw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
@@ -3978,8 +3969,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-x64@0.20.1:
-    resolution: {integrity: sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==}
+  /@esbuild/win32-x64@0.20.0:
+    resolution: {integrity: sha512-NgJnesu1RtWihtTtXGFMU5YSE6JyyHPMxCwBZK7a6/8d31GuSo9l0Ss7w1Jw5QnKUawG6UEehs883kcXf5fYwg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
@@ -4018,7 +4009,7 @@ packages:
       debug: 4.3.4(supports-color@9.2.2)
       espree: 9.6.1
       globals: 13.24.0
-      ignore: 5.3.1
+      ignore: 5.3.0
       import-fresh: 3.3.0
       js-yaml: 4.1.0
       minimatch: 3.1.2
@@ -4035,7 +4026,7 @@ packages:
       debug: 4.3.4(supports-color@9.2.2)
       espree: 9.6.1
       globals: 13.24.0
-      ignore: 5.3.1
+      ignore: 5.3.0
       import-fresh: 3.3.0
       js-yaml: 4.1.0
       minimatch: 3.1.2
@@ -4047,8 +4038,8 @@ packages:
     resolution: {integrity: sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
-  /@eslint/js@8.57.0:
-    resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==}
+  /@eslint/js@8.56.0:
+    resolution: {integrity: sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
@@ -4101,7 +4092,7 @@ packages:
       tslib: 2.5.3
     dev: true
 
-  /@graphql-codegen/cli@3.0.0(@babel/core@7.24.0)(@types/node@18.18.8)(graphql@16.6.0)(typescript@4.9.3):
+  /@graphql-codegen/cli@3.0.0(@babel/core@7.23.9)(@types/node@18.18.8)(graphql@16.6.0)(typescript@4.9.3):
     resolution: {integrity: sha512-16nuFabHCfPQ/d+v52OvR1ueL8eiJvS/nRuvuEV8d9T1fkborHKRw4lhyKVebu9izFBs6G0CvVCLhgVzQwHSLw==}
     hasBin: true
     peerDependencies:
@@ -4113,9 +4104,9 @@ packages:
       '@graphql-codegen/core': 3.1.0(graphql@16.6.0)
       '@graphql-codegen/plugin-helpers': 4.0.0(graphql@16.6.0)
       '@graphql-tools/apollo-engine-loader': 7.3.26(graphql@16.6.0)
-      '@graphql-tools/code-file-loader': 7.3.21(@babel/core@7.24.0)(graphql@16.6.0)
-      '@graphql-tools/git-loader': 7.2.20(@babel/core@7.24.0)(graphql@16.6.0)
-      '@graphql-tools/github-loader': 7.3.27(@babel/core@7.24.0)(graphql@16.6.0)
+      '@graphql-tools/code-file-loader': 7.3.21(@babel/core@7.23.9)(graphql@16.6.0)
+      '@graphql-tools/git-loader': 7.2.20(@babel/core@7.23.9)(graphql@16.6.0)
+      '@graphql-tools/github-loader': 7.3.27(@babel/core@7.23.9)(graphql@16.6.0)
       '@graphql-tools/graphql-file-loader': 7.5.16(graphql@16.6.0)
       '@graphql-tools/json-file-loader': 7.4.17(graphql@16.6.0)
       '@graphql-tools/load': 7.8.12(graphql@16.6.0)
@@ -4168,8 +4159,8 @@ packages:
         optional: true
     dependencies:
       '@babel/generator': 7.23.6
-      '@babel/template': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/template': 7.23.9
+      '@babel/types': 7.23.9
       '@graphql-codegen/core': 4.0.0(graphql@16.8.1)
       '@graphql-codegen/plugin-helpers': 5.0.1(graphql@16.8.1)
       '@graphql-tools/apollo-engine-loader': 8.0.0(graphql@16.8.1)
@@ -4223,8 +4214,8 @@ packages:
         optional: true
     dependencies:
       '@babel/generator': 7.23.6
-      '@babel/template': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/template': 7.23.9
+      '@babel/types': 7.23.9
       '@graphql-codegen/core': 4.0.0(graphql@16.8.1)
       '@graphql-codegen/plugin-helpers': 5.0.1(graphql@16.8.1)
       '@graphql-tools/apollo-engine-loader': 8.0.0(graphql@16.8.1)
@@ -4272,8 +4263,8 @@ packages:
     peerDependencies:
       graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0
     dependencies:
-      '@babel/helper-plugin-utils': 7.24.0
-      '@babel/template': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
+      '@babel/template': 7.23.9
       '@graphql-codegen/add': 4.0.1(graphql@16.6.0)
       '@graphql-codegen/gql-tag-operations': 2.0.1(graphql@16.6.0)
       '@graphql-codegen/plugin-helpers': 4.2.0(graphql@16.6.0)
@@ -4913,12 +4904,12 @@ packages:
       value-or-promise: 1.0.12
     dev: true
 
-  /@graphql-tools/code-file-loader@7.3.21(@babel/core@7.24.0)(graphql@16.6.0):
+  /@graphql-tools/code-file-loader@7.3.21(@babel/core@7.23.9)(graphql@16.6.0):
     resolution: {integrity: sha512-dj+OLnz1b8SYkXcuiy0CUQ25DWnOEyandDlOcdBqU3WVwh5EEVbn0oXUYm90fDlq2/uut00OrtC5Wpyhi3tAvA==}
     peerDependencies:
       graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
     dependencies:
-      '@graphql-tools/graphql-tag-pluck': 7.5.0(@babel/core@7.24.0)(graphql@16.6.0)
+      '@graphql-tools/graphql-tag-pluck': 7.5.0(@babel/core@7.23.9)(graphql@16.6.0)
       '@graphql-tools/utils': 9.2.1(graphql@16.6.0)
       globby: 11.1.0
       graphql: 16.6.0
@@ -5215,12 +5206,12 @@ packages:
       value-or-promise: 1.0.12
     dev: true
 
-  /@graphql-tools/git-loader@7.2.20(@babel/core@7.24.0)(graphql@16.6.0):
+  /@graphql-tools/git-loader@7.2.20(@babel/core@7.23.9)(graphql@16.6.0):
     resolution: {integrity: sha512-D/3uwTzlXxG50HI8BEixqirT4xiUp6AesTdfotRXAs2d4CT9wC6yuIWOHkSBqgI1cwKWZb6KXZr467YPS5ob1w==}
     peerDependencies:
       graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
     dependencies:
-      '@graphql-tools/graphql-tag-pluck': 7.5.0(@babel/core@7.24.0)(graphql@16.6.0)
+      '@graphql-tools/graphql-tag-pluck': 7.5.0(@babel/core@7.23.9)(graphql@16.6.0)
       '@graphql-tools/utils': 9.2.1(graphql@16.6.0)
       graphql: 16.6.0
       is-glob: 4.0.3
@@ -5249,13 +5240,13 @@ packages:
       - supports-color
     dev: true
 
-  /@graphql-tools/github-loader@7.3.27(@babel/core@7.24.0)(graphql@16.6.0):
+  /@graphql-tools/github-loader@7.3.27(@babel/core@7.23.9)(graphql@16.6.0):
     resolution: {integrity: sha512-fFFC35qenyhjb8pfcYXKknAt0CXP5CkQYtLfJXgTXSgBjIsfAVMrqxQ/Y0ejeM19XNF/C3VWJ7rE308yOX6ywA==}
     peerDependencies:
       graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
     dependencies:
       '@ardatan/sync-fetch': 0.0.1
-      '@graphql-tools/graphql-tag-pluck': 7.5.0(@babel/core@7.24.0)(graphql@16.6.0)
+      '@graphql-tools/graphql-tag-pluck': 7.5.0(@babel/core@7.23.9)(graphql@16.6.0)
       '@graphql-tools/utils': 9.2.1(graphql@16.6.0)
       '@whatwg-node/fetch': 0.8.8
       graphql: 16.6.0
@@ -5346,15 +5337,15 @@ packages:
       unixify: 1.0.0
     dev: true
 
-  /@graphql-tools/graphql-tag-pluck@7.5.0(@babel/core@7.24.0)(graphql@16.6.0):
+  /@graphql-tools/graphql-tag-pluck@7.5.0(@babel/core@7.23.9)(graphql@16.6.0):
     resolution: {integrity: sha512-76SYzhSlH50ZWkhWH6OI94qrxa8Ww1ZeOU04MdtpSeQZVT2rjGWeTb3xM3kjTVWQJsr/YJBhDeNPGlwNUWfX4Q==}
     peerDependencies:
       graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
     dependencies:
-      '@babel/parser': 7.24.0
-      '@babel/plugin-syntax-import-assertions': 7.20.0(@babel/core@7.24.0)
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.23.9
+      '@babel/plugin-syntax-import-assertions': 7.20.0(@babel/core@7.23.9)
+      '@babel/traverse': 7.23.9
+      '@babel/types': 7.23.9
       '@graphql-tools/utils': 9.2.1(graphql@16.6.0)
       graphql: 16.6.0
       tslib: 2.6.2
@@ -5369,11 +5360,11 @@ packages:
     peerDependencies:
       graphql: ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/parser': 7.24.0
-      '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.24.0)
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/parser': 7.23.9
+      '@babel/plugin-syntax-import-assertions': 7.23.3(@babel/core@7.23.9)
+      '@babel/traverse': 7.23.9
+      '@babel/types': 7.23.9
       '@graphql-tools/utils': 10.0.6(graphql@16.8.1)
       graphql: 16.8.1
       tslib: 2.6.2
@@ -6007,7 +5998,7 @@ packages:
     dependencies:
       graphql: 16.8.1
 
-  /@hoppscotch/ui@0.1.0(eslint@8.55.0)(terser@5.28.1)(vite@3.2.4)(vue@3.3.9):
+  /@hoppscotch/ui@0.1.0(eslint@8.55.0)(terser@5.27.0)(vite@3.2.4)(vue@3.3.9):
     resolution: {integrity: sha512-+4iHdfO7gRn7l3vpnPcQZbgdA+uE/K1KQX0/eUFcCWvja/C3eSM0db31MRX2cz1KYGwiezzhhVe21mIT4a0CZQ==}
     engines: {node: '>=16'}
     peerDependencies:
@@ -6018,7 +6009,7 @@ packages:
       '@fontsource-variable/material-symbols-rounded': 5.0.16
       '@fontsource-variable/roboto-mono': 5.0.16
       '@hoppscotch/vue-toasted': 0.1.0(vue@3.3.9)
-      '@vitejs/plugin-legacy': 2.3.0(terser@5.28.1)(vite@3.2.4)
+      '@vitejs/plugin-legacy': 2.3.0(terser@5.27.0)(vite@3.2.4)
       '@vueuse/core': 8.7.5(vue@3.3.9)
       fp-ts: 2.16.2
       lodash-es: 4.17.21
@@ -6032,7 +6023,7 @@ packages:
       - terser
       - vite
 
-  /@hoppscotch/ui@0.1.0(eslint@8.55.0)(terser@5.28.1)(vite@4.5.0)(vue@3.3.9):
+  /@hoppscotch/ui@0.1.0(eslint@8.55.0)(terser@5.27.0)(vite@4.5.0)(vue@3.3.9):
     resolution: {integrity: sha512-+4iHdfO7gRn7l3vpnPcQZbgdA+uE/K1KQX0/eUFcCWvja/C3eSM0db31MRX2cz1KYGwiezzhhVe21mIT4a0CZQ==}
     engines: {node: '>=16'}
     peerDependencies:
@@ -6043,7 +6034,7 @@ packages:
       '@fontsource-variable/material-symbols-rounded': 5.0.16
       '@fontsource-variable/roboto-mono': 5.0.16
       '@hoppscotch/vue-toasted': 0.1.0(vue@3.3.9)
-      '@vitejs/plugin-legacy': 2.3.0(terser@5.28.1)(vite@4.5.0)
+      '@vitejs/plugin-legacy': 2.3.0(terser@5.27.0)(vite@4.5.0)
       '@vueuse/core': 8.7.5(vue@3.3.9)
       fp-ts: 2.16.2
       lodash-es: 4.17.21
@@ -6172,7 +6163,7 @@ packages:
         optional: true
     dependencies:
       dotenv: 16.3.1
-      magic-string: 0.30.8
+      magic-string: 0.30.5
       object-hash: 3.0.0
       picocolors: 1.0.0
       unplugin: 1.5.1
@@ -6190,7 +6181,7 @@ packages:
     dependencies:
       '@import-meta-env/cli': 0.6.3(@import-meta-env/unplugin@0.4.8)(dotenv@16.3.1)
       dotenv: 16.3.1
-      magic-string: 0.30.8
+      magic-string: 0.30.5
       object-hash: 3.0.0
       picocolors: 1.0.0
       unplugin: 1.2.0
@@ -6234,8 +6225,8 @@ packages:
       escodegen: 2.1.0
       estree-walker: 2.0.2
       jsonc-eslint-parser: 1.4.1
-      magic-string: 0.30.8
-      mlly: 1.6.1
+      magic-string: 0.30.5
+      mlly: 1.5.0
       source-map: 0.6.1
       yaml-eslint-parser: 0.3.2
     dev: true
@@ -6258,8 +6249,8 @@ packages:
       escodegen: 2.1.0
       estree-walker: 2.0.2
       jsonc-eslint-parser: 2.3.0
-      magic-string: 0.30.8
-      mlly: 1.6.1
+      magic-string: 0.30.5
+      mlly: 1.5.0
       source-map-js: 1.0.2
       vue-i18n: 9.2.2(vue@3.3.9)
       yaml-eslint-parser: 1.2.2
@@ -6393,7 +6384,7 @@ packages:
       debug: 4.3.4(supports-color@9.2.2)
       fast-glob: 3.3.2
       source-map: 0.6.1
-      vite: 4.5.0(@types/node@18.18.8)(terser@5.28.1)
+      vite: 4.5.0(@types/node@18.18.8)(terser@5.27.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -6420,7 +6411,7 @@ packages:
       debug: 4.3.4(supports-color@9.2.2)
       fast-glob: 3.3.2
       source-map: 0.6.1
-      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
       vue-i18n: 9.8.0(vue@3.3.9)
     transitivePeerDependencies:
       - supports-color
@@ -6640,7 +6631,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@sinonjs/fake-timers': 10.3.0
+      '@sinonjs/fake-timers': 10.0.2
       '@types/node': 18.18.8
       jest-message-util: 29.7.0
       jest-mock: 29.7.0
@@ -6684,15 +6675,15 @@ packages:
       '@jest/types': 27.5.1
       '@types/node': 18.18.8
       chalk: 4.1.2
-      collect-v8-coverage: 1.0.2
+      collect-v8-coverage: 1.0.1
       exit: 0.1.2
       glob: 7.2.3
       graceful-fs: 4.2.11
-      istanbul-lib-coverage: 3.2.2
+      istanbul-lib-coverage: 3.2.0
       istanbul-lib-instrument: 5.2.0
-      istanbul-lib-report: 3.0.1
+      istanbul-lib-report: 3.0.0
       istanbul-lib-source-maps: 4.0.1
-      istanbul-reports: 3.1.7
+      istanbul-reports: 3.1.4
       jest-haste-map: 27.5.1
       jest-resolve: 27.5.1
       jest-util: 27.5.1
@@ -6720,25 +6711,25 @@ packages:
       '@jest/test-result': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      '@jridgewell/trace-mapping': 0.3.25
+      '@jridgewell/trace-mapping': 0.3.22
       '@types/node': 18.18.8
       chalk: 4.1.2
-      collect-v8-coverage: 1.0.2
+      collect-v8-coverage: 1.0.1
       exit: 0.1.2
       glob: 7.2.3
       graceful-fs: 4.2.11
-      istanbul-lib-coverage: 3.2.2
-      istanbul-lib-instrument: 6.0.2
-      istanbul-lib-report: 3.0.1
+      istanbul-lib-coverage: 3.2.0
+      istanbul-lib-instrument: 6.0.1
+      istanbul-lib-report: 3.0.0
       istanbul-lib-source-maps: 4.0.1
-      istanbul-reports: 3.1.7
+      istanbul-reports: 3.1.4
       jest-message-util: 29.7.0
       jest-util: 29.7.0
       jest-worker: 29.7.0
       slash: 3.0.0
       string-length: 4.0.2
       strip-ansi: 6.0.1
-      v8-to-istanbul: 9.2.0
+      v8-to-istanbul: 9.0.1
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -6777,7 +6768,7 @@ packages:
     resolution: {integrity: sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.25
+      '@jridgewell/trace-mapping': 0.3.22
       callsites: 3.1.0
       graceful-fs: 4.2.11
     dev: true
@@ -6788,8 +6779,8 @@ packages:
     dependencies:
       '@jest/console': 27.5.1
       '@jest/types': 27.5.1
-      '@types/istanbul-lib-coverage': 2.0.6
-      collect-v8-coverage: 1.0.2
+      '@types/istanbul-lib-coverage': 2.0.4
+      collect-v8-coverage: 1.0.1
     dev: true
 
   /@jest/test-result@29.7.0:
@@ -6798,8 +6789,8 @@ packages:
     dependencies:
       '@jest/console': 29.7.0
       '@jest/types': 29.6.3
-      '@types/istanbul-lib-coverage': 2.0.6
-      collect-v8-coverage: 1.0.2
+      '@types/istanbul-lib-coverage': 2.0.4
+      collect-v8-coverage: 1.0.1
     dev: true
 
   /@jest/test-sequencer@27.5.1:
@@ -6828,7 +6819,7 @@ packages:
     resolution: {integrity: sha512-ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@jest/types': 27.5.1
       babel-plugin-istanbul: 6.1.1
       chalk: 4.1.2
@@ -6839,7 +6830,7 @@ packages:
       jest-regex-util: 27.5.1
       jest-util: 27.5.1
       micromatch: 4.0.5
-      pirates: 4.0.6
+      pirates: 4.0.5
       slash: 3.0.0
       source-map: 0.6.1
       write-file-atomic: 3.0.3
@@ -6851,9 +6842,9 @@ packages:
     resolution: {integrity: sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@jest/types': 29.6.3
-      '@jridgewell/trace-mapping': 0.3.25
+      '@jridgewell/trace-mapping': 0.3.22
       babel-plugin-istanbul: 6.1.1
       chalk: 4.1.2
       convert-source-map: 2.0.0
@@ -6863,7 +6854,7 @@ packages:
       jest-regex-util: 29.6.3
       jest-util: 29.7.0
       micromatch: 4.0.5
-      pirates: 4.0.6
+      pirates: 4.0.5
       slash: 3.0.0
       write-file-atomic: 4.0.2
     transitivePeerDependencies:
@@ -6874,8 +6865,8 @@ packages:
     resolution: {integrity: sha512-Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
-      '@types/istanbul-lib-coverage': 2.0.6
-      '@types/istanbul-reports': 3.0.4
+      '@types/istanbul-lib-coverage': 2.0.4
+      '@types/istanbul-reports': 3.0.1
       '@types/node': 18.18.8
       '@types/yargs': 16.0.4
       chalk: 4.1.2
@@ -6886,10 +6877,10 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || ^16.10.0 || >=17.0.0}
     dependencies:
       '@jest/schemas': 28.0.2
-      '@types/istanbul-lib-coverage': 2.0.6
-      '@types/istanbul-reports': 3.0.4
+      '@types/istanbul-lib-coverage': 2.0.4
+      '@types/istanbul-reports': 3.0.1
       '@types/node': 18.18.8
-      '@types/yargs': 17.0.32
+      '@types/yargs': 17.0.10
       chalk: 4.1.2
     dev: true
 
@@ -6910,10 +6901,10 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/schemas': 29.6.3
-      '@types/istanbul-lib-coverage': 2.0.6
-      '@types/istanbul-reports': 3.0.4
+      '@types/istanbul-lib-coverage': 2.0.4
+      '@types/istanbul-reports': 3.0.1
       '@types/node': 18.18.8
-      '@types/yargs': 17.0.32
+      '@types/yargs': 17.0.10
       chalk: 4.1.2
     dev: true
 
@@ -6931,40 +6922,35 @@ packages:
     dependencies:
       '@jridgewell/set-array': 1.1.2
       '@jridgewell/sourcemap-codec': 1.4.15
-      '@jridgewell/trace-mapping': 0.3.25
+      '@jridgewell/trace-mapping': 0.3.22
     dev: true
 
-  /@jridgewell/gen-mapping@0.3.5:
-    resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==}
+  /@jridgewell/gen-mapping@0.3.3:
+    resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==}
     engines: {node: '>=6.0.0'}
     dependencies:
-      '@jridgewell/set-array': 1.2.1
+      '@jridgewell/set-array': 1.1.2
       '@jridgewell/sourcemap-codec': 1.4.15
-      '@jridgewell/trace-mapping': 0.3.25
+      '@jridgewell/trace-mapping': 0.3.22
 
   /@jridgewell/resolve-uri@3.1.0:
     resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
     engines: {node: '>=6.0.0'}
     dev: true
 
-  /@jridgewell/resolve-uri@3.1.2:
-    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
+  /@jridgewell/resolve-uri@3.1.1:
+    resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==}
     engines: {node: '>=6.0.0'}
 
   /@jridgewell/set-array@1.1.2:
     resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==}
     engines: {node: '>=6.0.0'}
-    dev: true
-
-  /@jridgewell/set-array@1.2.1:
-    resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
-    engines: {node: '>=6.0.0'}
 
   /@jridgewell/source-map@0.3.5:
     resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==}
     dependencies:
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
+      '@jridgewell/gen-mapping': 0.3.3
+      '@jridgewell/trace-mapping': 0.3.22
 
   /@jridgewell/sourcemap-codec@1.4.14:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
@@ -6980,16 +6966,16 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.14
     dev: true
 
-  /@jridgewell/trace-mapping@0.3.25:
-    resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
+  /@jridgewell/trace-mapping@0.3.22:
+    resolution: {integrity: sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==}
     dependencies:
-      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/resolve-uri': 3.1.1
       '@jridgewell/sourcemap-codec': 1.4.15
 
   /@jridgewell/trace-mapping@0.3.9:
     resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
     dependencies:
-      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/resolve-uri': 3.1.1
       '@jridgewell/sourcemap-codec': 1.4.15
 
   /@jsdevtools/ono@7.1.3:
@@ -7058,7 +7044,7 @@ packages:
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
-      semver: 7.6.0
+      semver: 7.5.4
       tar: 6.1.13
     transitivePeerDependencies:
       - encoding
@@ -7669,7 +7655,7 @@ packages:
   /@repeaterjs/repeater@3.0.4:
     resolution: {integrity: sha512-AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA==}
 
-  /@rollup/plugin-babel@5.3.1(@babel/core@7.24.0)(rollup@2.79.1):
+  /@rollup/plugin-babel@5.3.1(@babel/core@7.23.9)(rollup@2.79.1):
     resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==}
     engines: {node: '>= 10.0.0'}
     peerDependencies:
@@ -7680,7 +7666,7 @@ packages:
       '@types/babel__core':
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/helper-module-imports': 7.22.15
       '@rollup/pluginutils': 3.1.0(rollup@2.79.1)
       rollup: 2.79.1
@@ -7697,7 +7683,7 @@ packages:
     dependencies:
       '@rollup/pluginutils': 5.1.0(rollup@3.29.4)
       estree-walker: 2.0.2
-      magic-string: 0.30.8
+      magic-string: 0.30.5
       rollup: 3.29.4
     dev: true
 
@@ -7774,104 +7760,96 @@ packages:
       rollup: 3.29.4
     dev: true
 
-  /@rollup/rollup-android-arm-eabi@4.12.0:
-    resolution: {integrity: sha512-+ac02NL/2TCKRrJu2wffk1kZ+RyqxVUlbjSagNgPm94frxtr+XDL12E5Ll1enWskLrtrZ2r8L3wED1orIibV/w==}
+  /@rollup/rollup-android-arm-eabi@4.6.1:
+    resolution: {integrity: sha512-0WQ0ouLejaUCRsL93GD4uft3rOmB8qoQMU05Kb8CmMtMBe7XUDLAltxVZI1q6byNqEtU7N1ZX1Vw5lIpgulLQA==}
     cpu: [arm]
     os: [android]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-android-arm64@4.12.0:
-    resolution: {integrity: sha512-OBqcX2BMe6nvjQ0Nyp7cC90cnumt8PXmO7Dp3gfAju/6YwG0Tj74z1vKrfRz7qAv23nBcYM8BCbhrsWqO7PzQQ==}
+  /@rollup/rollup-android-arm64@4.6.1:
+    resolution: {integrity: sha512-1TKm25Rn20vr5aTGGZqo6E4mzPicCUD79k17EgTLAsXc1zysyi4xXKACfUbwyANEPAEIxkzwue6JZ+stYzWUTA==}
     cpu: [arm64]
     os: [android]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-darwin-arm64@4.12.0:
-    resolution: {integrity: sha512-X64tZd8dRE/QTrBIEs63kaOBG0b5GVEd3ccoLtyf6IdXtHdh8h+I56C2yC3PtC9Ucnv0CpNFJLqKFVgCYe0lOQ==}
+  /@rollup/rollup-darwin-arm64@4.6.1:
+    resolution: {integrity: sha512-cEXJQY/ZqMACb+nxzDeX9IPLAg7S94xouJJCNVE5BJM8JUEP4HeTF+ti3cmxWeSJo+5D+o8Tc0UAWUkfENdeyw==}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-darwin-x64@4.12.0:
-    resolution: {integrity: sha512-cc71KUZoVbUJmGP2cOuiZ9HSOP14AzBAThn3OU+9LcA1+IUqswJyR1cAJj3Mg55HbjZP6OLAIscbQsQLrpgTOg==}
+  /@rollup/rollup-darwin-x64@4.6.1:
+    resolution: {integrity: sha512-LoSU9Xu56isrkV2jLldcKspJ7sSXmZWkAxg7sW/RfF7GS4F5/v4EiqKSMCFbZtDu2Nc1gxxFdQdKwkKS4rwxNg==}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-arm-gnueabihf@4.12.0:
-    resolution: {integrity: sha512-a6w/Y3hyyO6GlpKL2xJ4IOh/7d+APaqLYdMf86xnczU3nurFTaVN9s9jOXQg97BE4nYm/7Ga51rjec5nfRdrvA==}
+  /@rollup/rollup-linux-arm-gnueabihf@4.6.1:
+    resolution: {integrity: sha512-EfI3hzYAy5vFNDqpXsNxXcgRDcFHUWSx5nnRSCKwXuQlI5J9dD84g2Usw81n3FLBNsGCegKGwwTVsSKK9cooSQ==}
     cpu: [arm]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-arm64-gnu@4.12.0:
-    resolution: {integrity: sha512-0fZBq27b+D7Ar5CQMofVN8sggOVhEtzFUwOwPppQt0k+VR+7UHMZZY4y+64WJ06XOhBTKXtQB/Sv0NwQMXyNAA==}
+  /@rollup/rollup-linux-arm64-gnu@4.6.1:
+    resolution: {integrity: sha512-9lhc4UZstsegbNLhH0Zu6TqvDfmhGzuCWtcTFXY10VjLLUe4Mr0Ye2L3rrtHaDd/J5+tFMEuo5LTCSCMXWfUKw==}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-arm64-musl@4.12.0:
-    resolution: {integrity: sha512-eTvzUS3hhhlgeAv6bfigekzWZjaEX9xP9HhxB0Dvrdbkk5w/b+1Sxct2ZuDxNJKzsRStSq1EaEkVSEe7A7ipgQ==}
+  /@rollup/rollup-linux-arm64-musl@4.6.1:
+    resolution: {integrity: sha512-FfoOK1yP5ksX3wwZ4Zk1NgyGHZyuRhf99j64I5oEmirV8EFT7+OhUZEnP+x17lcP/QHJNWGsoJwrz4PJ9fBEXw==}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-riscv64-gnu@4.12.0:
-    resolution: {integrity: sha512-ix+qAB9qmrCRiaO71VFfY8rkiAZJL8zQRXveS27HS+pKdjwUfEhqo2+YF2oI+H/22Xsiski+qqwIBxVewLK7sw==}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@rollup/rollup-linux-x64-gnu@4.12.0:
-    resolution: {integrity: sha512-TenQhZVOtw/3qKOPa7d+QgkeM6xY0LtwzR8OplmyL5LrgTWIXpTQg2Q2ycBf8jm+SFW2Wt/DTn1gf7nFp3ssVA==}
+  /@rollup/rollup-linux-x64-gnu@4.6.1:
+    resolution: {integrity: sha512-DNGZvZDO5YF7jN5fX8ZqmGLjZEXIJRdJEdTFMhiyXqyXubBa0WVLDWSNlQ5JR2PNgDbEV1VQowhVRUh+74D+RA==}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-x64-musl@4.12.0:
-    resolution: {integrity: sha512-LfFdRhNnW0zdMvdCb5FNuWlls2WbbSridJvxOvYWgSBOYZtgBfW9UGNJG//rwMqTX1xQE9BAodvMH9tAusKDUw==}
+  /@rollup/rollup-linux-x64-musl@4.6.1:
+    resolution: {integrity: sha512-RkJVNVRM+piYy87HrKmhbexCHg3A6Z6MU0W9GHnJwBQNBeyhCJG9KDce4SAMdicQnpURggSvtbGo9xAWOfSvIQ==}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-win32-arm64-msvc@4.12.0:
-    resolution: {integrity: sha512-JPDxovheWNp6d7AHCgsUlkuCKvtu3RB55iNEkaQcf0ttsDU/JZF+iQnYcQJSk/7PtT4mjjVG8N1kpwnI9SLYaw==}
+  /@rollup/rollup-win32-arm64-msvc@4.6.1:
+    resolution: {integrity: sha512-v2FVT6xfnnmTe3W9bJXl6r5KwJglMK/iRlkKiIFfO6ysKs0rDgz7Cwwf3tjldxQUrHL9INT/1r4VA0n9L/F1vQ==}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-win32-ia32-msvc@4.12.0:
-    resolution: {integrity: sha512-fjtuvMWRGJn1oZacG8IPnzIV6GF2/XG+h71FKn76OYFqySXInJtseAqdprVTDTyqPxQOG9Exak5/E9Z3+EJ8ZA==}
+  /@rollup/rollup-win32-ia32-msvc@4.6.1:
+    resolution: {integrity: sha512-YEeOjxRyEjqcWphH9dyLbzgkF8wZSKAKUkldRY6dgNR5oKs2LZazqGB41cWJ4Iqqcy9/zqYgmzBkRoVz3Q9MLw==}
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-win32-x64-msvc@4.12.0:
-    resolution: {integrity: sha512-ZYmr5mS2wd4Dew/JjT0Fqi2NPB/ZhZ2VvPp7SmvPZb4Y1CG/LRcS6tcRo2cYU7zLK5A7cdbhWnnWmUjoI4qapg==}
+  /@rollup/rollup-win32-x64-msvc@4.6.1:
+    resolution: {integrity: sha512-0zfTlFAIhgz8V2G8STq8toAjsYYA6eci1hnXuyOTUFnymrtJwnS6uGKiv3v5UrPZkBlamLvrLV2iiaeqCKzb0A==}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
@@ -7911,16 +7889,16 @@ packages:
       type-detect: 4.0.8
     dev: true
 
-  /@sinonjs/commons@3.0.1:
-    resolution: {integrity: sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==}
+  /@sinonjs/commons@2.0.0:
+    resolution: {integrity: sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==}
     dependencies:
       type-detect: 4.0.8
     dev: true
 
-  /@sinonjs/fake-timers@10.3.0:
-    resolution: {integrity: sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==}
+  /@sinonjs/fake-timers@10.0.2:
+    resolution: {integrity: sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==}
     dependencies:
-      '@sinonjs/commons': 3.0.1
+      '@sinonjs/commons': 2.0.0
     dev: true
 
   /@sinonjs/fake-timers@8.1.0:
@@ -8042,7 +8020,7 @@ packages:
       '@swc/helpers':
         optional: true
     dependencies:
-      '@swc/counter': 0.1.3
+      '@swc/counter': 0.1.2
       '@swc/types': 0.1.5
     optionalDependencies:
       '@swc/core-darwin-arm64': 1.4.2
@@ -8057,8 +8035,8 @@ packages:
       '@swc/core-win32-x64-msvc': 1.4.2
     dev: true
 
-  /@swc/counter@0.1.3:
-    resolution: {integrity: sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==}
+  /@swc/counter@0.1.2:
+    resolution: {integrity: sha512-9F4ys4C74eSTEUNndnER3VJ15oru2NumfQxS8geE+f3eB5xvfxpWyqE5XlVnxb/R14uoXi6SLbBwwiDSkv+XEw==}
     dev: true
 
   /@swc/types@0.1.5:
@@ -8208,33 +8186,33 @@ packages:
       - supports-color
     dev: true
 
-  /@types/babel__core@7.20.5:
-    resolution: {integrity: sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==}
+  /@types/babel__core@7.1.19:
+    resolution: {integrity: sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==}
     dependencies:
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
-      '@types/babel__generator': 7.6.8
-      '@types/babel__template': 7.4.4
-      '@types/babel__traverse': 7.20.5
+      '@babel/parser': 7.23.9
+      '@babel/types': 7.23.9
+      '@types/babel__generator': 7.6.4
+      '@types/babel__template': 7.4.1
+      '@types/babel__traverse': 7.17.1
     dev: true
 
-  /@types/babel__generator@7.6.8:
-    resolution: {integrity: sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==}
+  /@types/babel__generator@7.6.4:
+    resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.23.9
     dev: true
 
-  /@types/babel__template@7.4.4:
-    resolution: {integrity: sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==}
+  /@types/babel__template@7.4.1:
+    resolution: {integrity: sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==}
     dependencies:
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.23.9
+      '@babel/types': 7.23.9
     dev: true
 
-  /@types/babel__traverse@7.20.5:
-    resolution: {integrity: sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==}
+  /@types/babel__traverse@7.17.1:
+    resolution: {integrity: sha512-kVzjari1s2YVi77D3w1yuvohV2idweYXMCDzqBiVNN63TcDWrIlTVOYpqVrvbbyOE/IyzBoTKF0fdnLPEORFxA==}
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.23.9
     dev: true
 
   /@types/bcrypt@5.0.0:
@@ -8303,12 +8281,12 @@ packages:
   /@types/eslint-scope@3.7.7:
     resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==}
     dependencies:
-      '@types/eslint': 8.56.5
+      '@types/eslint': 8.56.2
       '@types/estree': 1.0.5
     dev: true
 
-  /@types/eslint@8.56.5:
-    resolution: {integrity: sha512-u5/YPJHo1tvkSF2CE0USEkxon82Z5DBy2xR+qfyYNszpX9qcs4sT6uq2kBbj4BXY1+DBGDPnrhMZV3pKWGNukw==}
+  /@types/eslint@8.56.2:
+    resolution: {integrity: sha512-uQDwm1wFHmbBbCZCqAlq6Do9LYwByNZHWzXppSnay9SuwJ+VRbjkbLABer54kcPnMSlG6Fdiy2yaFXm/z9Z5gw==}
     dependencies:
       '@types/estree': 1.0.5
       '@types/json-schema': 7.0.15
@@ -8344,8 +8322,8 @@ packages:
       '@types/qs': 6.9.12
       '@types/serve-static': 1.15.0
 
-  /@types/graceful-fs@4.1.9:
-    resolution: {integrity: sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==}
+  /@types/graceful-fs@4.1.5:
+    resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==}
     dependencies:
       '@types/node': 18.18.8
     dev: true
@@ -8358,20 +8336,10 @@ packages:
     resolution: {integrity: sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==}
     dev: true
 
-  /@types/istanbul-lib-coverage@2.0.6:
-    resolution: {integrity: sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==}
-    dev: true
-
   /@types/istanbul-lib-report@3.0.0:
     resolution: {integrity: sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==}
     dependencies:
-      '@types/istanbul-lib-coverage': 2.0.6
-    dev: true
-
-  /@types/istanbul-lib-report@3.0.3:
-    resolution: {integrity: sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==}
-    dependencies:
-      '@types/istanbul-lib-coverage': 2.0.6
+      '@types/istanbul-lib-coverage': 2.0.4
     dev: true
 
   /@types/istanbul-reports@3.0.1:
@@ -8380,12 +8348,6 @@ packages:
       '@types/istanbul-lib-report': 3.0.0
     dev: true
 
-  /@types/istanbul-reports@3.0.4:
-    resolution: {integrity: sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==}
-    dependencies:
-      '@types/istanbul-lib-report': 3.0.3
-    dev: true
-
   /@types/jest@27.5.2:
     resolution: {integrity: sha512-mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA==}
     dependencies:
@@ -8630,8 +8592,8 @@ packages:
       - typescript
     dev: true
 
-  /@types/stack-utils@2.0.3:
-    resolution: {integrity: sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==}
+  /@types/stack-utils@2.0.1:
+    resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
     dev: true
 
   /@types/strip-bom@3.0.0:
@@ -8706,12 +8668,6 @@ packages:
       '@types/yargs-parser': 21.0.3
     dev: true
 
-  /@types/yargs@17.0.32:
-    resolution: {integrity: sha512-xQ67Yc/laOG5uMfX/093MRlGGCIBzZMarVa+gfNKJxWAIgykYpVGkBdbqEzGDDfCrVUj6Hiff4mTZ5BA6TmAog==}
-    dependencies:
-      '@types/yargs-parser': 21.0.3
-    dev: true
-
   /@typescript-eslint/eslint-plugin@5.30.6(@typescript-eslint/parser@5.30.6)(eslint@8.19.0)(typescript@4.9.5):
     resolution: {integrity: sha512-J4zYMIhgrx4MgnZrSDD7sEnQp7FmhKNOaqaOpaoQ/SfdMfRB/0yvK74hTnvH+VQxndZynqs5/Hn4t+2/j9bADg==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -8730,9 +8686,9 @@ packages:
       debug: 4.3.4(supports-color@9.2.2)
       eslint: 8.19.0
       functional-red-black-tree: 1.0.1
-      ignore: 5.3.1
+      ignore: 5.3.0
       regexpp: 3.2.0
-      semver: 7.6.0
+      semver: 7.5.4
       tsutils: 3.21.0(typescript@4.9.5)
       typescript: 4.9.5
     transitivePeerDependencies:
@@ -8756,10 +8712,10 @@ packages:
       '@typescript-eslint/utils': 5.45.0(eslint@8.29.0)(typescript@4.9.3)
       debug: 4.3.4(supports-color@9.2.2)
       eslint: 8.29.0
-      ignore: 5.3.1
+      ignore: 5.3.0
       natural-compare-lite: 1.4.0
       regexpp: 3.2.0
-      semver: 7.6.0
+      semver: 7.5.4
       tsutils: 3.21.0(typescript@4.9.3)
       typescript: 4.9.3
     transitivePeerDependencies:
@@ -8785,9 +8741,9 @@ packages:
       debug: 4.3.4(supports-color@9.2.2)
       eslint: 8.47.0
       graphemer: 1.4.0
-      ignore: 5.3.1
+      ignore: 5.3.0
       natural-compare-lite: 1.4.0
-      semver: 7.6.0
+      semver: 7.5.4
       tsutils: 3.21.0(typescript@4.9.5)
       typescript: 4.9.5
     transitivePeerDependencies:
@@ -8814,9 +8770,9 @@ packages:
       debug: 4.3.4(supports-color@9.2.2)
       eslint: 8.55.0
       graphemer: 1.4.0
-      ignore: 5.3.1
+      ignore: 5.3.0
       natural-compare: 1.4.0
-      semver: 7.6.0
+      semver: 7.5.4
       ts-api-utils: 1.0.2(typescript@5.3.2)
       typescript: 5.3.2
     transitivePeerDependencies:
@@ -9049,7 +9005,7 @@ packages:
       debug: 4.3.4(supports-color@9.2.2)
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.6.0
+      semver: 7.5.4
       tsutils: 3.21.0(typescript@4.9.5)
       typescript: 4.9.5
     transitivePeerDependencies:
@@ -9070,7 +9026,7 @@ packages:
       debug: 4.3.4(supports-color@9.2.2)
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.6.0
+      semver: 7.5.4
       tsutils: 3.21.0(typescript@4.9.3)
       typescript: 4.9.3
     transitivePeerDependencies:
@@ -9091,7 +9047,7 @@ packages:
       debug: 4.3.4(supports-color@9.2.2)
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.6.0
+      semver: 7.5.4
       tsutils: 3.21.0(typescript@4.9.5)
       typescript: 4.9.5
     transitivePeerDependencies:
@@ -9112,7 +9068,7 @@ packages:
       debug: 4.3.4(supports-color@9.2.2)
       globby: 11.1.0
       is-glob: 4.0.3
-      semver: 7.6.0
+      semver: 7.5.4
       ts-api-utils: 1.0.2(typescript@5.3.2)
       typescript: 5.3.2
     transitivePeerDependencies:
@@ -9151,7 +9107,7 @@ packages:
       eslint: 8.29.0
       eslint-scope: 5.1.1
       eslint-utils: 3.0.0(eslint@8.29.0)
-      semver: 7.6.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -9171,7 +9127,7 @@ packages:
       '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.9.5)
       eslint: 8.47.0
       eslint-scope: 5.1.1
-      semver: 7.6.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -9190,7 +9146,7 @@ packages:
       '@typescript-eslint/types': 6.13.2
       '@typescript-eslint/typescript-estree': 6.13.2(typescript@5.3.2)
       eslint: 8.55.0
-      semver: 7.6.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -9360,7 +9316,7 @@ packages:
       - graphql
     dev: false
 
-  /@vitejs/plugin-legacy@2.3.0(terser@5.28.1)(vite@3.2.4):
+  /@vitejs/plugin-legacy@2.3.0(terser@5.27.0)(vite@3.2.4):
     resolution: {integrity: sha512-Bh62i0gzQvvT8AeAAb78nOnqSYXypkRmQmOTImdPZ39meHR9e2une3AIFmVo4s1SDmcmJ6qj18Sa/lRc/14KaA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -9372,10 +9328,10 @@ packages:
       magic-string: 0.26.7
       regenerator-runtime: 0.13.11
       systemjs: 6.14.2
-      terser: 5.28.1
-      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.28.1)
+      terser: 5.27.0
+      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.27.0)
 
-  /@vitejs/plugin-legacy@2.3.0(terser@5.28.1)(vite@4.5.0):
+  /@vitejs/plugin-legacy@2.3.0(terser@5.27.0)(vite@4.5.0):
     resolution: {integrity: sha512-Bh62i0gzQvvT8AeAAb78nOnqSYXypkRmQmOTImdPZ39meHR9e2une3AIFmVo4s1SDmcmJ6qj18Sa/lRc/14KaA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -9387,25 +9343,25 @@ packages:
       magic-string: 0.26.7
       regenerator-runtime: 0.13.11
       systemjs: 6.14.2
-      terser: 5.28.1
-      vite: 4.5.0(@types/node@18.18.8)(terser@5.28.1)
+      terser: 5.27.0
+      vite: 4.5.0(@types/node@18.18.8)(terser@5.27.0)
 
-  /@vitejs/plugin-legacy@4.1.1(terser@5.28.1)(vite@4.5.0):
+  /@vitejs/plugin-legacy@4.1.1(terser@5.27.0)(vite@4.5.0):
     resolution: {integrity: sha512-um3gbVouD2Q/g19C0qpDfHwveXDCAHzs8OC3e9g6aXpKoD1H14himgs7wkMnhAynBJy7QqUoZNAXDuqN8zLR2g==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       terser: ^5.4.0
       vite: ^4.0.0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/preset-env': 7.24.0(@babel/core@7.24.0)
-      browserslist: 4.23.0
+      '@babel/core': 7.23.9
+      '@babel/preset-env': 7.23.9(@babel/core@7.23.9)
+      browserslist: 4.22.3
       core-js: 3.32.1
-      magic-string: 0.30.8
+      magic-string: 0.30.5
       regenerator-runtime: 0.13.11
       systemjs: 6.14.2
-      terser: 5.28.1
-      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+      terser: 5.27.0
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -9416,7 +9372,7 @@ packages:
       vite: ^3.0.0
       vue: 3.3.9
     dependencies:
-      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.28.1)
+      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.27.0)
       vue: 3.3.9(typescript@4.9.3)
     dev: true
 
@@ -9427,7 +9383,7 @@ packages:
       vite: ^4.0.0
       vue: 3.3.9
     dependencies:
-      vite: 4.5.0(@types/node@18.18.8)(terser@5.28.1)
+      vite: 4.5.0(@types/node@18.18.8)(terser@5.27.0)
       vue: 3.3.9(typescript@4.9.5)
     dev: true
 
@@ -9438,7 +9394,7 @@ packages:
       vite: ^4.0.0 || ^5.0.0
       vue: 3.3.9
     dependencies:
-      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
       vue: 3.3.9(typescript@5.3.2)
     dev: true
 
@@ -9461,7 +9417,7 @@ packages:
   /@vitest/snapshot@0.34.6:
     resolution: {integrity: sha512-B3OZqYn6k4VaN011D+ve+AA4whM4QkcwcrwaKwAbyyvS/NB1hCWjFIBQxAQQSQir9/RtyAAGuq+4RJmbn2dH4w==}
     dependencies:
-      magic-string: 0.30.8
+      magic-string: 0.30.5
       pathe: 1.1.2
       pretty-format: 29.7.0
     dev: true
@@ -9568,7 +9524,7 @@ packages:
   /@vue/compiler-core@3.2.45:
     resolution: {integrity: sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==}
     dependencies:
-      '@babel/parser': 7.24.0
+      '@babel/parser': 7.23.9
       '@vue/shared': 3.2.45
       estree-walker: 2.0.2
       source-map: 0.6.1
@@ -9576,7 +9532,7 @@ packages:
   /@vue/compiler-core@3.3.10:
     resolution: {integrity: sha512-doe0hODR1+i1menPkRzJ5MNR6G+9uiZHIknK3Zn5OcIztu6GGw7u0XUzf3AgB8h/dfsZC9eouzoLo3c3+N/cVA==}
     dependencies:
-      '@babel/parser': 7.24.0
+      '@babel/parser': 7.23.9
       '@vue/shared': 3.3.10
       estree-walker: 2.0.2
       source-map-js: 1.0.2
@@ -9584,7 +9540,7 @@ packages:
   /@vue/compiler-core@3.3.9:
     resolution: {integrity: sha512-+/Lf68Vr/nFBA6ol4xOtJrW+BQWv3QWKfRwGSm70jtXwfhZNF4R/eRgyVJYoxFRhdCTk/F6g99BP0ffPgZihfQ==}
     dependencies:
-      '@babel/parser': 7.24.0
+      '@babel/parser': 7.23.9
       '@vue/shared': 3.3.9
       estree-walker: 2.0.2
       source-map-js: 1.0.2
@@ -9610,7 +9566,7 @@ packages:
   /@vue/compiler-sfc@3.2.45:
     resolution: {integrity: sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==}
     dependencies:
-      '@babel/parser': 7.24.0
+      '@babel/parser': 7.23.9
       '@vue/compiler-core': 3.2.45
       '@vue/compiler-dom': 3.2.45
       '@vue/compiler-ssr': 3.2.45
@@ -9624,28 +9580,28 @@ packages:
   /@vue/compiler-sfc@3.3.10:
     resolution: {integrity: sha512-xpcTe7Rw7QefOTRFFTlcfzozccvjM40dT45JtrE3onGm/jBLZ0JhpKu3jkV7rbDFLeeagR/5RlJ2Y9SvyS0lAg==}
     dependencies:
-      '@babel/parser': 7.24.0
+      '@babel/parser': 7.23.9
       '@vue/compiler-core': 3.3.10
       '@vue/compiler-dom': 3.3.10
       '@vue/compiler-ssr': 3.3.10
       '@vue/reactivity-transform': 3.3.10
       '@vue/shared': 3.3.10
       estree-walker: 2.0.2
-      magic-string: 0.30.8
+      magic-string: 0.30.5
       postcss: 8.4.32
       source-map-js: 1.0.2
 
   /@vue/compiler-sfc@3.3.9:
     resolution: {integrity: sha512-wy0CNc8z4ihoDzjASCOCsQuzW0A/HP27+0MDSSICMjVIFzk/rFViezkR3dzH+miS2NDEz8ywMdbjO5ylhOLI2A==}
     dependencies:
-      '@babel/parser': 7.24.0
+      '@babel/parser': 7.23.9
       '@vue/compiler-core': 3.3.9
       '@vue/compiler-dom': 3.3.9
       '@vue/compiler-ssr': 3.3.9
       '@vue/reactivity-transform': 3.3.9
       '@vue/shared': 3.3.9
       estree-walker: 2.0.2
-      magic-string: 0.30.8
+      magic-string: 0.30.5
       postcss: 8.4.32
       source-map-js: 1.0.2
 
@@ -9667,8 +9623,8 @@ packages:
       '@vue/compiler-dom': 3.3.9
       '@vue/shared': 3.3.9
 
-  /@vue/devtools-api@6.6.1:
-    resolution: {integrity: sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==}
+  /@vue/devtools-api@6.5.1:
+    resolution: {integrity: sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==}
 
   /@vue/eslint-config-typescript@11.0.3(eslint-plugin-vue@9.17.0)(eslint@8.47.0)(typescript@4.9.5):
     resolution: {integrity: sha512-dkt6W0PX6H/4Xuxg/BlFj5xHvksjpSlVjtkQCpaYJBIEuKj2hOVU7r+TIe+ysCwRYFz/lGqvklntRkCAibsbPw==}
@@ -9754,7 +9710,7 @@ packages:
   /@vue/reactivity-transform@3.2.45:
     resolution: {integrity: sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==}
     dependencies:
-      '@babel/parser': 7.24.0
+      '@babel/parser': 7.23.9
       '@vue/compiler-core': 3.2.45
       '@vue/shared': 3.2.45
       estree-walker: 2.0.2
@@ -9763,20 +9719,20 @@ packages:
   /@vue/reactivity-transform@3.3.10:
     resolution: {integrity: sha512-0xBdk+CKHWT+Gev8oZ63Tc0qFfj935YZx+UAynlutnrDZ4diFCVFMWixn65HzjE3S1iJppWOo6Tt1OzASH7VEg==}
     dependencies:
-      '@babel/parser': 7.24.0
+      '@babel/parser': 7.23.9
       '@vue/compiler-core': 3.3.10
       '@vue/shared': 3.3.10
       estree-walker: 2.0.2
-      magic-string: 0.30.8
+      magic-string: 0.30.5
 
   /@vue/reactivity-transform@3.3.9:
     resolution: {integrity: sha512-HnUFm7Ry6dFa4Lp63DAxTixUp8opMtQr6RxQCpDI1vlh12rkGIeYqMvJtK+IKyEfEOa2I9oCkD1mmsPdaGpdVg==}
     dependencies:
-      '@babel/parser': 7.24.0
+      '@babel/parser': 7.23.9
       '@vue/compiler-core': 3.3.9
       '@vue/shared': 3.3.9
       estree-walker: 2.0.2
-      magic-string: 0.30.8
+      magic-string: 0.30.5
 
   /@vue/reactivity@3.3.10:
     resolution: {integrity: sha512-H5Z7rOY/JLO+e5a6/FEXaQ1TMuOvY4LDVgT+/+HKubEAgs9qeeZ+NhADSeEtrNQeiKLDuzeKc8v0CUFpB6Pqgw==}
@@ -10434,12 +10390,11 @@ packages:
   /argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
-  /array-buffer-byte-length@1.0.1:
-    resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
-    engines: {node: '>= 0.4'}
+  /array-buffer-byte-length@1.0.0:
+    resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==}
     dependencies:
-      call-bind: 1.0.7
-      is-array-buffer: 3.0.4
+      call-bind: 1.0.5
+      is-array-buffer: 3.0.2
     dev: true
 
   /array-flatten@1.1.1:
@@ -10457,18 +10412,17 @@ packages:
     resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
     engines: {node: '>=8'}
 
-  /arraybuffer.prototype.slice@1.0.3:
-    resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
+  /arraybuffer.prototype.slice@1.0.2:
+    resolution: {integrity: sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==}
     engines: {node: '>= 0.4'}
     dependencies:
-      array-buffer-byte-length: 1.0.1
-      call-bind: 1.0.7
+      array-buffer-byte-length: 1.0.0
+      call-bind: 1.0.5
       define-properties: 1.2.1
-      es-abstract: 1.22.5
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      is-array-buffer: 3.0.4
-      is-shared-array-buffer: 1.0.3
+      es-abstract: 1.22.3
+      get-intrinsic: 1.2.2
+      is-array-buffer: 3.0.2
+      is-shared-array-buffer: 1.0.2
     dev: true
 
   /arraybuffer.slice@0.0.7:
@@ -10547,8 +10501,8 @@ packages:
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      browserslist: 4.23.0
-      caniuse-lite: 1.0.30001593
+      browserslist: 4.22.3
+      caniuse-lite: 1.0.30001581
       fraction.js: 4.3.7
       normalize-range: 0.1.2
       picocolors: 1.0.0
@@ -10563,8 +10517,8 @@ packages:
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      browserslist: 4.23.0
-      caniuse-lite: 1.0.30001593
+      browserslist: 4.22.3
+      caniuse-lite: 1.0.30001581
       fraction.js: 4.3.7
       normalize-range: 0.1.2
       picocolors: 1.0.0
@@ -10572,11 +10526,9 @@ packages:
       postcss-value-parser: 4.2.0
     dev: true
 
-  /available-typed-arrays@1.0.7:
-    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
+  /available-typed-arrays@1.0.5:
+    resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
     engines: {node: '>= 0.4'}
-    dependencies:
-      possible-typed-array-names: 1.0.0
 
   /axios@0.21.4:
     resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
@@ -10606,18 +10558,18 @@ packages:
       - debug
     dev: false
 
-  /babel-jest@27.5.1(@babel/core@7.24.0):
+  /babel-jest@27.5.1(@babel/core@7.23.9):
     resolution: {integrity: sha512-cdQ5dXjGRd0IBRATiQ4mZGlGlRE8kJpjPOixdNRdT+m3UcNqmYWN6rK6nvtXYfY3D76cb8s/O1Ss8ea24PIwcg==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     peerDependencies:
       '@babel/core': ^7.8.0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@jest/transform': 27.5.1
       '@jest/types': 27.5.1
-      '@types/babel__core': 7.20.5
+      '@types/babel__core': 7.1.19
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 27.5.1(@babel/core@7.24.0)
+      babel-preset-jest: 27.5.1(@babel/core@7.23.9)
       chalk: 4.1.2
       graceful-fs: 4.2.11
       slash: 3.0.0
@@ -10625,17 +10577,17 @@ packages:
       - supports-color
     dev: true
 
-  /babel-jest@29.7.0(@babel/core@7.24.0):
+  /babel-jest@29.7.0(@babel/core@7.23.9):
     resolution: {integrity: sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.8.0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@jest/transform': 29.7.0
-      '@types/babel__core': 7.20.5
+      '@types/babel__core': 7.1.19
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.6.3(@babel/core@7.24.0)
+      babel-preset-jest: 29.6.3(@babel/core@7.23.9)
       chalk: 4.1.2
       graceful-fs: 4.2.11
       slash: 3.0.0
@@ -10647,7 +10599,7 @@ packages:
     resolution: {integrity: sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==}
     engines: {node: '>=8'}
     dependencies:
-      '@babel/helper-plugin-utils': 7.24.0
+      '@babel/helper-plugin-utils': 7.22.5
       '@istanbuljs/load-nyc-config': 1.1.0
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-instrument: 5.2.0
@@ -10660,52 +10612,52 @@ packages:
     resolution: {integrity: sha512-50wCwD5EMNW4aRpOwtqzyZHIewTYNxLA4nhB+09d8BIssfNfzBRhkBIHiaPv1Si226TQSvp8gxAJm2iY2qs2hQ==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
-      '@babel/template': 7.24.0
-      '@babel/types': 7.24.0
-      '@types/babel__core': 7.20.5
-      '@types/babel__traverse': 7.20.5
+      '@babel/template': 7.23.9
+      '@babel/types': 7.23.9
+      '@types/babel__core': 7.1.19
+      '@types/babel__traverse': 7.17.1
     dev: true
 
   /babel-plugin-jest-hoist@29.6.3:
     resolution: {integrity: sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/template': 7.24.0
-      '@babel/types': 7.24.0
-      '@types/babel__core': 7.20.5
-      '@types/babel__traverse': 7.20.5
+      '@babel/template': 7.23.9
+      '@babel/types': 7.23.9
+      '@types/babel__core': 7.1.19
+      '@types/babel__traverse': 7.17.1
     dev: true
 
-  /babel-plugin-polyfill-corejs2@0.4.8(@babel/core@7.24.0):
+  /babel-plugin-polyfill-corejs2@0.4.8(@babel/core@7.23.9):
     resolution: {integrity: sha512-OtIuQfafSzpo/LhnJaykc0R/MMnuLSSVjVYy9mHArIZ9qTCSZ6TpWCuEKZYVoN//t8HqBNScHrOtCrIK5IaGLg==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
       '@babel/compat-data': 7.23.5
-      '@babel/core': 7.24.0
-      '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.24.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.23.9)
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
 
-  /babel-plugin-polyfill-corejs3@0.9.0(@babel/core@7.24.0):
+  /babel-plugin-polyfill-corejs3@0.9.0(@babel/core@7.23.9):
     resolution: {integrity: sha512-7nZPG1uzK2Ymhy/NbaOWTg3uibM2BmGASS4vHS4szRZAIR8R6GwA/xAujpdrXU5iyklrimWnLWU+BLF9suPTqg==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.24.0)
-      core-js-compat: 3.36.0
+      '@babel/core': 7.23.9
+      '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.23.9)
+      core-js-compat: 3.35.1
     transitivePeerDependencies:
       - supports-color
 
-  /babel-plugin-polyfill-regenerator@0.5.5(@babel/core@7.24.0):
+  /babel-plugin-polyfill-regenerator@0.5.5(@babel/core@7.23.9):
     resolution: {integrity: sha512-OJGYZlhLqBh2DDHeqAxWB1XIvr49CxiJ2gIt61/PU55CQK4Z58OzMqjDe1zwQdQk+rBYsRc+1rJmdajM3gimHg==}
     peerDependencies:
       '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.24.0)
+      '@babel/core': 7.23.9
+      '@babel/helper-define-polyfill-provider': 0.5.0(@babel/core@7.23.9)
     transitivePeerDependencies:
       - supports-color
 
@@ -10713,81 +10665,81 @@ packages:
     resolution: {integrity: sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==}
     dev: true
 
-  /babel-preset-current-node-syntax@1.0.1(@babel/core@7.24.0):
+  /babel-preset-current-node-syntax@1.0.1(@babel/core@7.23.9):
     resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.0)
-      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.0)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.24.0)
-    dev: true
-
-  /babel-preset-fbjs@3.4.0(@babel/core@7.24.0):
+      '@babel/core': 7.23.9
+      '@babel/plugin-syntax-async-generators': 7.8.4(@babel/core@7.23.9)
+      '@babel/plugin-syntax-bigint': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.9)
+      '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.9)
+      '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.23.9)
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.23.9)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-syntax-top-level-await': 7.14.5(@babel/core@7.23.9)
+    dev: true
+
+  /babel-preset-fbjs@3.4.0(@babel/core@7.23.9):
     resolution: {integrity: sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.24.0)
-      '@babel/plugin-proposal-object-rest-spread': 7.18.6(@babel/core@7.24.0)
-      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.24.0)
-      '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.24.0)
-      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.24.0)
-      '@babel/plugin-transform-classes': 7.23.8(@babel/core@7.24.0)
-      '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-flow-strip-types': 7.18.6(@babel/core@7.24.0)
-      '@babel/plugin-transform-for-of': 7.23.6(@babel/core@7.24.0)
-      '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-react-display-name': 7.18.6(@babel/core@7.24.0)
-      '@babel/plugin-transform-react-jsx': 7.18.6(@babel/core@7.24.0)
-      '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.24.0)
+      '@babel/core': 7.23.9
+      '@babel/plugin-proposal-class-properties': 7.18.6(@babel/core@7.23.9)
+      '@babel/plugin-proposal-object-rest-spread': 7.18.6(@babel/core@7.23.9)
+      '@babel/plugin-syntax-class-properties': 7.12.13(@babel/core@7.23.9)
+      '@babel/plugin-syntax-flow': 7.18.6(@babel/core@7.23.9)
+      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.23.9)
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-arrow-functions': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-block-scoped-functions': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-block-scoping': 7.23.4(@babel/core@7.23.9)
+      '@babel/plugin-transform-classes': 7.23.8(@babel/core@7.23.9)
+      '@babel/plugin-transform-computed-properties': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-destructuring': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-flow-strip-types': 7.18.6(@babel/core@7.23.9)
+      '@babel/plugin-transform-for-of': 7.23.6(@babel/core@7.23.9)
+      '@babel/plugin-transform-function-name': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-literals': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-member-expression-literals': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-object-super': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-parameters': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-property-literals': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-react-display-name': 7.18.6(@babel/core@7.23.9)
+      '@babel/plugin-transform-react-jsx': 7.18.6(@babel/core@7.23.9)
+      '@babel/plugin-transform-shorthand-properties': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-spread': 7.23.3(@babel/core@7.23.9)
+      '@babel/plugin-transform-template-literals': 7.23.3(@babel/core@7.23.9)
       babel-plugin-syntax-trailing-function-commas: 7.0.0-beta.0
     dev: true
 
-  /babel-preset-jest@27.5.1(@babel/core@7.24.0):
+  /babel-preset-jest@27.5.1(@babel/core@7.23.9):
     resolution: {integrity: sha512-Nptf2FzlPCWYuJg41HBqXVT8ym6bXOevuCTbhxlUpjwtysGaIWFvDEjp4y+G7fl13FgOdjs7P/DmErqH7da0Ag==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       babel-plugin-jest-hoist: 27.5.1
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.0)
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.23.9)
     dev: true
 
-  /babel-preset-jest@29.6.3(@babel/core@7.24.0):
+  /babel-preset-jest@29.6.3(@babel/core@7.23.9):
     resolution: {integrity: sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       babel-plugin-jest-hoist: 29.6.3
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.0)
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.23.9)
     dev: true
 
   /babel-walk@3.0.0-canary-5:
@@ -10795,7 +10747,7 @@ packages:
     engines: {node: '>= 10.0.0'}
     requiresBuild: true
     dependencies:
-      '@babel/types': 7.24.0
+      '@babel/types': 7.23.9
 
   /backo2@1.0.2:
     resolution: {integrity: sha512-zj6Z6M7Eq+PBZ7PQxl5NT665MvJdAkzp0f60nAJ+sLaSCBPMwVak5ZegFbgVCzFcCJTKFoMizvM5Ld7+JrRJHA==}
@@ -10946,23 +10898,23 @@ packages:
       '@types/object-path': 0.11.1
       '@types/semver': 7.5.0
       '@types/ua-parser-js': 0.7.36
-      browserslist: 4.23.0
-      caniuse-lite: 1.0.30001593
+      browserslist: 4.22.3
+      caniuse-lite: 1.0.30001581
       isbot: 3.7.0
       object-path: 0.11.8
-      semver: 7.6.0
+      semver: 7.5.4
       ua-parser-js: 1.0.36
     dev: true
 
-  /browserslist@4.23.0:
-    resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==}
+  /browserslist@4.22.3:
+    resolution: {integrity: sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
     dependencies:
-      caniuse-lite: 1.0.30001593
-      electron-to-chromium: 1.4.690
+      caniuse-lite: 1.0.30001581
+      electron-to-chromium: 1.4.650
       node-releases: 2.0.14
-      update-browserslist-db: 1.0.13(browserslist@4.23.0)
+      update-browserslist-db: 1.0.13(browserslist@4.22.3)
 
   /bs-logger@0.2.6:
     resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
@@ -11013,14 +10965,14 @@ packages:
       run-applescript: 5.0.0
     dev: true
 
-  /bundle-require@4.0.2(esbuild@0.19.12):
+  /bundle-require@4.0.2(esbuild@0.19.5):
     resolution: {integrity: sha512-jwzPOChofl67PSTW2SGubV9HBQAhhR2i6nskiOThauo9dzwDUgOWQScFVaJkjEfYX+UXiD+LEx8EblQMc2wIag==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     peerDependencies:
       esbuild: '>=0.17'
     dependencies:
-      esbuild: 0.19.12
-      load-tsconfig: 0.2.5
+      esbuild: 0.19.5
+      load-tsconfig: 0.2.3
     dev: true
 
   /busboy@1.6.0:
@@ -11038,15 +10990,12 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /call-bind@1.0.7:
-    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
-    engines: {node: '>= 0.4'}
+  /call-bind@1.0.5:
+    resolution: {integrity: sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==}
     dependencies:
-      es-define-property: 1.0.0
-      es-errors: 1.3.0
       function-bind: 1.1.2
-      get-intrinsic: 1.2.4
-      set-function-length: 1.2.1
+      get-intrinsic: 1.2.2
+      set-function-length: 1.1.1
 
   /call-me-maybe@1.0.2:
     resolution: {integrity: sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ==}
@@ -11092,8 +11041,8 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /caniuse-lite@1.0.30001593:
-    resolution: {integrity: sha512-UWM1zlo3cZfkpBysd7AS+z+v007q9G1+fLTUU42rQnY6t2axoogPW/xol6T7juU5EUoOhML4WgBIdG+9yYqAjQ==}
+  /caniuse-lite@1.0.30001581:
+    resolution: {integrity: sha512-whlTkwhqV2tUmP3oYhtNfaWGYHDdS3JYFQBKXxcUR9qqPWsRhFHhoISO2Xnl/g0xyKzht9mI1LZpiNWfMzHixQ==}
 
   /capital-case@1.0.4:
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
@@ -11257,20 +11206,6 @@ packages:
     optionalDependencies:
       fsevents: 2.3.3
 
-  /chokidar@3.6.0:
-    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
-    engines: {node: '>= 8.10.0'}
-    dependencies:
-      anymatch: 3.1.3
-      braces: 3.0.2
-      glob-parent: 5.1.2
-      is-binary-path: 2.1.0
-      is-glob: 4.0.3
-      normalize-path: 3.0.0
-      readdirp: 3.6.0
-    optionalDependencies:
-      fsevents: 2.3.3
-
   /chownr@2.0.0:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
     engines: {node: '>=10'}
@@ -11288,8 +11223,8 @@ packages:
     resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
     engines: {node: '>=8'}
 
-  /cjs-module-lexer@1.2.3:
-    resolution: {integrity: sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==}
+  /cjs-module-lexer@1.2.2:
+    resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
     dev: true
 
   /clean-css@4.2.4:
@@ -11386,8 +11321,8 @@ packages:
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
     dev: true
 
-  /collect-v8-coverage@1.0.2:
-    resolution: {integrity: sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==}
+  /collect-v8-coverage@1.0.1:
+    resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==}
     dev: true
 
   /collection-utils@1.0.1:
@@ -11541,8 +11476,8 @@ packages:
     resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==}
     requiresBuild: true
     dependencies:
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.23.9
+      '@babel/types': 7.23.9
 
   /content-disposition@0.5.4:
     resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
@@ -11623,10 +11558,10 @@ packages:
   /cookiejar@2.1.4:
     resolution: {integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==}
 
-  /core-js-compat@3.36.0:
-    resolution: {integrity: sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw==}
+  /core-js-compat@3.35.1:
+    resolution: {integrity: sha512-sftHa5qUJY3rs9Zht1WEnmkvXputCyDBczPnr7QDgL8n3qrF3CMXY4VPSYtOLLiOUJcah2WNXREd48iOl6mQIw==}
     dependencies:
-      browserslist: 4.23.0
+      browserslist: 4.22.3
 
   /core-js@3.32.1:
     resolution: {integrity: sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==}
@@ -12008,24 +11943,24 @@ packages:
   /deep-equal@2.2.2:
     resolution: {integrity: sha512-xjVyBf0w5vH0I42jdAZzOKVldmPgSulmiyPRywoyq7HXC9qdgo17kxJE+rdnif5Tz6+pIrpJI8dCpMNLIGkUiA==}
     dependencies:
-      array-buffer-byte-length: 1.0.1
-      call-bind: 1.0.7
+      array-buffer-byte-length: 1.0.0
+      call-bind: 1.0.5
       es-get-iterator: 1.1.3
-      get-intrinsic: 1.2.4
+      get-intrinsic: 1.2.2
       is-arguments: 1.1.1
-      is-array-buffer: 3.0.4
+      is-array-buffer: 3.0.2
       is-date-object: 1.0.5
       is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.3
+      is-shared-array-buffer: 1.0.2
       isarray: 2.0.5
       object-is: 1.1.5
       object-keys: 1.1.1
       object.assign: 4.1.5
-      regexp.prototype.flags: 1.5.2
-      side-channel: 1.0.6
+      regexp.prototype.flags: 1.5.1
+      side-channel: 1.0.4
       which-boxed-primitive: 1.0.2
       which-collection: 1.0.1
-      which-typed-array: 1.1.14
+      which-typed-array: 1.1.13
     dev: true
 
   /deep-extend@0.6.0:
@@ -12064,13 +11999,13 @@ packages:
       clone: 1.0.4
     dev: true
 
-  /define-data-property@1.1.4:
-    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
+  /define-data-property@1.1.1:
+    resolution: {integrity: sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      es-define-property: 1.0.0
-      es-errors: 1.3.0
+      get-intrinsic: 1.2.2
       gopd: 1.0.1
+      has-property-descriptors: 1.0.1
 
   /define-lazy-prop@3.0.0:
     resolution: {integrity: sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==}
@@ -12081,8 +12016,8 @@ packages:
     resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      define-data-property: 1.1.4
-      has-property-descriptors: 1.0.2
+      define-data-property: 1.1.1
+      has-property-descriptors: 1.0.1
       object-keys: 1.1.1
 
   /degenerator@3.0.2:
@@ -12340,8 +12275,8 @@ packages:
     dependencies:
       jake: 10.8.5
 
-  /electron-to-chromium@1.4.690:
-    resolution: {integrity: sha512-+2OAGjUx68xElQhydpcbqH50hE8Vs2K6TkAeLhICYfndb67CVH0UsZaijmRUE3rHlIxU1u0jxwhgVe6fK3YANA==}
+  /electron-to-chromium@1.4.650:
+    resolution: {integrity: sha512-sYSQhJCJa4aGA1wYol5cMQgekDBlbVfTRavlGZVr3WZpDdOPcp6a6xUnFfrt8TqZhsBYYbDxJZCjGfHuGupCRQ==}
 
   /emittery@0.13.1:
     resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
@@ -12470,8 +12405,8 @@ packages:
       tapable: 0.2.9
     dev: false
 
-  /enhanced-resolve@5.15.1:
-    resolution: {integrity: sha512-3d3JRbwsCLJsYgvb6NuWEG44jjPSOMuS73L/6+7BZuoKm3W+qXnSoIYVHi8dG7Qcg4inAY4jbzkZ7MnskePeDg==}
+  /enhanced-resolve@5.15.0:
+    resolution: {integrity: sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==}
     engines: {node: '>=10.13.0'}
     dependencies:
       graceful-fs: 4.2.11
@@ -12502,68 +12437,56 @@ packages:
     resolution: {integrity: sha512-g/9rfnvnagiNf+DRMHEVGuGuIBlCIMDFoTA616HaP2l9PlCjGjVhD98PNbVSJvmK4TttqT5mV5tInMhoFgi+aA==}
     dev: true
 
-  /es-abstract@1.22.5:
-    resolution: {integrity: sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w==}
+  /es-abstract@1.22.3:
+    resolution: {integrity: sha512-eiiY8HQeYfYH2Con2berK+To6GrK2RxbPawDkGq4UiCQQfZHb6wX9qQqkbpPqaxQFcl8d9QzZqo0tGE0VcrdwA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      array-buffer-byte-length: 1.0.1
-      arraybuffer.prototype.slice: 1.0.3
-      available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      es-define-property: 1.0.0
-      es-errors: 1.3.0
-      es-set-tostringtag: 2.0.3
+      array-buffer-byte-length: 1.0.0
+      arraybuffer.prototype.slice: 1.0.2
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.5
+      es-set-tostringtag: 2.0.2
       es-to-primitive: 1.2.1
       function.prototype.name: 1.1.6
-      get-intrinsic: 1.2.4
-      get-symbol-description: 1.0.2
+      get-intrinsic: 1.2.2
+      get-symbol-description: 1.0.0
       globalthis: 1.0.3
       gopd: 1.0.1
-      has-property-descriptors: 1.0.2
-      has-proto: 1.0.3
+      has-property-descriptors: 1.0.1
+      has-proto: 1.0.1
       has-symbols: 1.0.3
-      hasown: 2.0.1
-      internal-slot: 1.0.7
-      is-array-buffer: 3.0.4
+      hasown: 2.0.0
+      internal-slot: 1.0.6
+      is-array-buffer: 3.0.2
       is-callable: 1.2.7
-      is-negative-zero: 2.0.3
+      is-negative-zero: 2.0.2
       is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.3
+      is-shared-array-buffer: 1.0.2
       is-string: 1.0.7
-      is-typed-array: 1.1.13
+      is-typed-array: 1.1.12
       is-weakref: 1.0.2
       object-inspect: 1.13.1
       object-keys: 1.1.1
       object.assign: 4.1.5
-      regexp.prototype.flags: 1.5.2
+      regexp.prototype.flags: 1.5.1
       safe-array-concat: 1.1.0
-      safe-regex-test: 1.0.3
+      safe-regex-test: 1.0.2
       string.prototype.trim: 1.2.8
       string.prototype.trimend: 1.0.7
       string.prototype.trimstart: 1.0.7
-      typed-array-buffer: 1.0.2
-      typed-array-byte-length: 1.0.1
-      typed-array-byte-offset: 1.0.2
-      typed-array-length: 1.0.5
+      typed-array-buffer: 1.0.0
+      typed-array-byte-length: 1.0.0
+      typed-array-byte-offset: 1.0.0
+      typed-array-length: 1.0.4
       unbox-primitive: 1.0.2
-      which-typed-array: 1.1.14
+      which-typed-array: 1.1.13
     dev: true
 
-  /es-define-property@1.0.0:
-    resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      get-intrinsic: 1.2.4
-
-  /es-errors@1.3.0:
-    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
-    engines: {node: '>= 0.4'}
-
   /es-get-iterator@1.1.3:
     resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==}
     dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
       has-symbols: 1.0.3
       is-arguments: 1.1.1
       is-map: 2.0.2
@@ -12577,13 +12500,13 @@ packages:
     resolution: {integrity: sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==}
     dev: true
 
-  /es-set-tostringtag@2.0.3:
-    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
+  /es-set-tostringtag@2.0.2:
+    resolution: {integrity: sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==}
     engines: {node: '>= 0.4'}
     dependencies:
-      get-intrinsic: 1.2.4
-      has-tostringtag: 1.0.2
-      hasown: 2.0.1
+      get-intrinsic: 1.2.2
+      has-tostringtag: 1.0.0
+      hasown: 2.0.0
     dev: true
 
   /es-to-primitive@1.2.1:
@@ -13021,66 +12944,65 @@ packages:
       '@esbuild/win32-ia32': 0.18.20
       '@esbuild/win32-x64': 0.18.20
 
-  /esbuild@0.19.12:
-    resolution: {integrity: sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==}
+  /esbuild@0.19.5:
+    resolution: {integrity: sha512-bUxalY7b1g8vNhQKdB24QDmHeY4V4tw/s6Ak5z+jJX9laP5MoQseTOMemAr0gxssjNcH0MCViG8ONI2kksvfFQ==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.19.12
-      '@esbuild/android-arm': 0.19.12
-      '@esbuild/android-arm64': 0.19.12
-      '@esbuild/android-x64': 0.19.12
-      '@esbuild/darwin-arm64': 0.19.12
-      '@esbuild/darwin-x64': 0.19.12
-      '@esbuild/freebsd-arm64': 0.19.12
-      '@esbuild/freebsd-x64': 0.19.12
-      '@esbuild/linux-arm': 0.19.12
-      '@esbuild/linux-arm64': 0.19.12
-      '@esbuild/linux-ia32': 0.19.12
-      '@esbuild/linux-loong64': 0.19.12
-      '@esbuild/linux-mips64el': 0.19.12
-      '@esbuild/linux-ppc64': 0.19.12
-      '@esbuild/linux-riscv64': 0.19.12
-      '@esbuild/linux-s390x': 0.19.12
-      '@esbuild/linux-x64': 0.19.12
-      '@esbuild/netbsd-x64': 0.19.12
-      '@esbuild/openbsd-x64': 0.19.12
-      '@esbuild/sunos-x64': 0.19.12
-      '@esbuild/win32-arm64': 0.19.12
-      '@esbuild/win32-ia32': 0.19.12
-      '@esbuild/win32-x64': 0.19.12
-    dev: true
-
-  /esbuild@0.20.1:
-    resolution: {integrity: sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==}
+      '@esbuild/android-arm': 0.19.5
+      '@esbuild/android-arm64': 0.19.5
+      '@esbuild/android-x64': 0.19.5
+      '@esbuild/darwin-arm64': 0.19.5
+      '@esbuild/darwin-x64': 0.19.5
+      '@esbuild/freebsd-arm64': 0.19.5
+      '@esbuild/freebsd-x64': 0.19.5
+      '@esbuild/linux-arm': 0.19.5
+      '@esbuild/linux-arm64': 0.19.5
+      '@esbuild/linux-ia32': 0.19.5
+      '@esbuild/linux-loong64': 0.19.5
+      '@esbuild/linux-mips64el': 0.19.5
+      '@esbuild/linux-ppc64': 0.19.5
+      '@esbuild/linux-riscv64': 0.19.5
+      '@esbuild/linux-s390x': 0.19.5
+      '@esbuild/linux-x64': 0.19.5
+      '@esbuild/netbsd-x64': 0.19.5
+      '@esbuild/openbsd-x64': 0.19.5
+      '@esbuild/sunos-x64': 0.19.5
+      '@esbuild/win32-arm64': 0.19.5
+      '@esbuild/win32-ia32': 0.19.5
+      '@esbuild/win32-x64': 0.19.5
+    dev: true
+
+  /esbuild@0.20.0:
+    resolution: {integrity: sha512-6iwE3Y2RVYCME1jLpBqq7LQWK3MW6vjV2bZy6gt/WrqkY+WE74Spyc0ThAOYpMtITvnjX09CrC6ym7A/m9mebA==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      '@esbuild/aix-ppc64': 0.20.1
-      '@esbuild/android-arm': 0.20.1
-      '@esbuild/android-arm64': 0.20.1
-      '@esbuild/android-x64': 0.20.1
-      '@esbuild/darwin-arm64': 0.20.1
-      '@esbuild/darwin-x64': 0.20.1
-      '@esbuild/freebsd-arm64': 0.20.1
-      '@esbuild/freebsd-x64': 0.20.1
-      '@esbuild/linux-arm': 0.20.1
-      '@esbuild/linux-arm64': 0.20.1
-      '@esbuild/linux-ia32': 0.20.1
-      '@esbuild/linux-loong64': 0.20.1
-      '@esbuild/linux-mips64el': 0.20.1
-      '@esbuild/linux-ppc64': 0.20.1
-      '@esbuild/linux-riscv64': 0.20.1
-      '@esbuild/linux-s390x': 0.20.1
-      '@esbuild/linux-x64': 0.20.1
-      '@esbuild/netbsd-x64': 0.20.1
-      '@esbuild/openbsd-x64': 0.20.1
-      '@esbuild/sunos-x64': 0.20.1
-      '@esbuild/win32-arm64': 0.20.1
-      '@esbuild/win32-ia32': 0.20.1
-      '@esbuild/win32-x64': 0.20.1
+      '@esbuild/aix-ppc64': 0.20.0
+      '@esbuild/android-arm': 0.20.0
+      '@esbuild/android-arm64': 0.20.0
+      '@esbuild/android-x64': 0.20.0
+      '@esbuild/darwin-arm64': 0.20.0
+      '@esbuild/darwin-x64': 0.20.0
+      '@esbuild/freebsd-arm64': 0.20.0
+      '@esbuild/freebsd-x64': 0.20.0
+      '@esbuild/linux-arm': 0.20.0
+      '@esbuild/linux-arm64': 0.20.0
+      '@esbuild/linux-ia32': 0.20.0
+      '@esbuild/linux-loong64': 0.20.0
+      '@esbuild/linux-mips64el': 0.20.0
+      '@esbuild/linux-ppc64': 0.20.0
+      '@esbuild/linux-riscv64': 0.20.0
+      '@esbuild/linux-s390x': 0.20.0
+      '@esbuild/linux-x64': 0.20.0
+      '@esbuild/netbsd-x64': 0.20.0
+      '@esbuild/openbsd-x64': 0.20.0
+      '@esbuild/sunos-x64': 0.20.0
+      '@esbuild/win32-arm64': 0.20.0
+      '@esbuild/win32-ia32': 0.20.0
+      '@esbuild/win32-x64': 0.20.0
     dev: true
 
   /escalade@3.1.1:
@@ -13256,7 +13178,7 @@ packages:
       natural-compare: 1.4.0
       nth-check: 2.1.1
       postcss-selector-parser: 6.0.13
-      semver: 7.6.0
+      semver: 7.5.4
       vue-eslint-parser: 9.3.1(eslint@8.47.0)
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
@@ -13274,7 +13196,7 @@ packages:
       natural-compare: 1.4.0
       nth-check: 2.1.1
       postcss-selector-parser: 6.0.13
-      semver: 7.6.0
+      semver: 7.5.4
       vue-eslint-parser: 9.3.1(eslint@8.55.0)
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
@@ -13361,7 +13283,7 @@ packages:
       functional-red-black-tree: 1.0.1
       glob-parent: 6.0.2
       globals: 13.24.0
-      ignore: 5.3.1
+      ignore: 5.3.0
       import-fresh: 3.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
@@ -13408,7 +13330,7 @@ packages:
       glob-parent: 6.0.2
       globals: 13.24.0
       grapheme-splitter: 1.0.4
-      ignore: 5.3.1
+      ignore: 5.3.0
       import-fresh: 3.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
@@ -13437,7 +13359,7 @@ packages:
       '@eslint-community/eslint-utils': 4.4.0(eslint@8.47.0)
       '@eslint-community/regexpp': 4.10.0
       '@eslint/eslintrc': 2.1.4
-      '@eslint/js': 8.57.0
+      '@eslint/js': 8.56.0
       '@humanwhocodes/config-array': 0.11.14
       '@humanwhocodes/module-importer': 1.0.1
       '@nodelib/fs.walk': 1.2.8
@@ -13458,7 +13380,7 @@ packages:
       glob-parent: 6.0.2
       globals: 13.24.0
       graphemer: 1.4.0
-      ignore: 5.3.1
+      ignore: 5.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
       is-path-inside: 3.0.3
@@ -13505,7 +13427,7 @@ packages:
       glob-parent: 6.0.2
       globals: 13.24.0
       graphemer: 1.4.0
-      ignore: 5.3.1
+      ignore: 5.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
       is-path-inside: 3.0.3
@@ -13887,8 +13809,8 @@ packages:
     dependencies:
       reusify: 1.0.4
 
-  /fb-watchman@2.0.2:
-    resolution: {integrity: sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==}
+  /fb-watchman@2.0.1:
+    resolution: {integrity: sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==}
     dependencies:
       bser: 2.1.1
     dev: true
@@ -14042,7 +13964,7 @@ packages:
     dependencies:
       '@babel/code-frame': 7.23.5
       chalk: 4.1.2
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       cosmiconfig: 8.2.0
       deepmerge: 4.3.1
       fs-extra: 10.1.0
@@ -14050,7 +13972,7 @@ packages:
       minimatch: 3.1.2
       node-abort-controller: 3.1.1
       schema-utils: 3.3.0
-      semver: 7.6.0
+      semver: 7.5.4
       tapable: 2.2.1
       typescript: 5.2.2
       webpack: 5.89.0
@@ -14181,9 +14103,9 @@ packages:
     resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.5
       define-properties: 1.2.1
-      es-abstract: 1.22.5
+      es-abstract: 1.22.3
       functions-have-names: 1.2.3
     dev: true
 
@@ -14221,15 +14143,13 @@ packages:
     resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==}
     dev: true
 
-  /get-intrinsic@1.2.4:
-    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
-    engines: {node: '>= 0.4'}
+  /get-intrinsic@1.2.2:
+    resolution: {integrity: sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==}
     dependencies:
-      es-errors: 1.3.0
       function-bind: 1.1.2
-      has-proto: 1.0.3
+      has-proto: 1.0.1
       has-symbols: 1.0.3
-      hasown: 2.0.1
+      hasown: 2.0.0
 
   /get-own-enumerable-property-symbols@3.0.2:
     resolution: {integrity: sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==}
@@ -14260,13 +14180,12 @@ packages:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
     engines: {node: '>=10'}
 
-  /get-symbol-description@1.0.2:
-    resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
+  /get-symbol-description@1.0.0:
+    resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
     dev: true
 
   /get-uri@3.0.2:
@@ -14333,6 +14252,7 @@ packages:
       minimatch: 9.0.3
       minipass: 6.0.2
       path-scurry: 1.10.1
+    dev: true
 
   /glob@10.3.3:
     resolution: {integrity: sha512-92vPiMb/iqpmEgsOoIDvTjc50wf9CCCvMzsi6W0JLPeUKE8TWP1a73PgqSrqy7iAZxaSD1YdzU7QZR5LF51MJw==}
@@ -14346,6 +14266,16 @@ packages:
       path-scurry: 1.10.1
     dev: false
 
+  /glob@7.1.6:
+    resolution: {integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==}
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 3.1.2
+      once: 1.4.0
+      path-is-absolute: 1.0.1
+
   /glob@7.2.0:
     resolution: {integrity: sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==}
     dependencies:
@@ -14367,8 +14297,8 @@ packages:
       once: 1.4.0
       path-is-absolute: 1.0.1
 
-  /glob@8.1.0:
-    resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
+  /glob@8.0.3:
+    resolution: {integrity: sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==}
     engines: {node: '>=12'}
     dependencies:
       fs.realpath: 1.0.0
@@ -14418,14 +14348,14 @@ packages:
       array-union: 2.1.0
       dir-glob: 3.0.1
       fast-glob: 3.3.2
-      ignore: 5.3.1
+      ignore: 5.3.0
       merge2: 1.4.1
       slash: 3.0.0
 
   /gopd@1.0.1:
     resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
     dependencies:
-      get-intrinsic: 1.2.4
+      get-intrinsic: 1.2.2
 
   /graceful-fs@4.2.10:
     resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
@@ -14802,21 +14732,21 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /has-property-descriptors@1.0.2:
-    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
+  /has-property-descriptors@1.0.1:
+    resolution: {integrity: sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==}
     dependencies:
-      es-define-property: 1.0.0
+      get-intrinsic: 1.2.2
 
-  /has-proto@1.0.3:
-    resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
+  /has-proto@1.0.1:
+    resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
     engines: {node: '>= 0.4'}
 
   /has-symbols@1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
 
-  /has-tostringtag@1.0.2:
-    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+  /has-tostringtag@1.0.0:
+    resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==}
     engines: {node: '>= 0.4'}
     dependencies:
       has-symbols: 1.0.3
@@ -14824,8 +14754,8 @@ packages:
   /has-unicode@2.0.1:
     resolution: {integrity: sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==}
 
-  /hasown@2.0.1:
-    resolution: {integrity: sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==}
+  /hasown@2.0.0:
+    resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==}
     engines: {node: '>= 0.4'}
     dependencies:
       function-bind: 1.1.2
@@ -15106,8 +15036,8 @@ packages:
   /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
-  /ignore@5.3.1:
-    resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==}
+  /ignore@5.3.0:
+    resolution: {integrity: sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==}
     engines: {node: '>= 4'}
 
   /immediate@3.0.6:
@@ -15245,13 +15175,13 @@ packages:
       - openapi-types
     dev: false
 
-  /internal-slot@1.0.7:
-    resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
+  /internal-slot@1.0.6:
+    resolution: {integrity: sha512-Xj6dv+PsbtwyPpEflsejS+oIZxmMlV44zAhG479uYu89MsjcYOhCFnNyKrkJrihbsiasQyY0afoCl/9BLR65bg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      es-errors: 1.3.0
-      hasown: 2.0.1
-      side-channel: 1.0.6
+      get-intrinsic: 1.2.2
+      hasown: 2.0.0
+      side-channel: 1.0.4
     dev: true
 
   /interpret@1.4.0:
@@ -15338,15 +15268,15 @@ packages:
     resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.7
-      has-tostringtag: 1.0.2
+      call-bind: 1.0.5
+      has-tostringtag: 1.0.0
 
-  /is-array-buffer@3.0.4:
-    resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
-    engines: {node: '>= 0.4'}
+  /is-array-buffer@3.0.2:
+    resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
     dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
+      is-typed-array: 1.1.12
     dev: true
 
   /is-arrayish@0.2.1:
@@ -15368,8 +15298,8 @@ packages:
     resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.7
-      has-tostringtag: 1.0.2
+      call-bind: 1.0.5
+      has-tostringtag: 1.0.0
     dev: true
 
   /is-buffer@1.1.6:
@@ -15383,13 +15313,13 @@ packages:
   /is-core-module@2.13.1:
     resolution: {integrity: sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==}
     dependencies:
-      hasown: 2.0.1
+      hasown: 2.0.0
 
   /is-date-object@1.0.5:
     resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      has-tostringtag: 1.0.2
+      has-tostringtag: 1.0.0
     dev: true
 
   /is-docker@2.2.1:
@@ -15432,7 +15362,7 @@ packages:
     resolution: {integrity: sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==}
     engines: {node: '>= 0.4'}
     dependencies:
-      has-tostringtag: 1.0.2
+      has-tostringtag: 1.0.0
     dev: false
 
   /is-glob@4.0.3:
@@ -15468,8 +15398,8 @@ packages:
     resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==}
     dev: true
 
-  /is-negative-zero@2.0.3:
-    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
+  /is-negative-zero@2.0.2:
+    resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
     engines: {node: '>= 0.4'}
     dev: true
 
@@ -15477,7 +15407,7 @@ packages:
     resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      has-tostringtag: 1.0.2
+      has-tostringtag: 1.0.0
     dev: true
 
   /is-number@7.0.0:
@@ -15519,8 +15449,8 @@ packages:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.7
-      has-tostringtag: 1.0.2
+      call-bind: 1.0.5
+      has-tostringtag: 1.0.0
 
   /is-regexp@1.0.0:
     resolution: {integrity: sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==}
@@ -15537,11 +15467,10 @@ packages:
     resolution: {integrity: sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==}
     dev: true
 
-  /is-shared-array-buffer@1.0.3:
-    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
-    engines: {node: '>= 0.4'}
+  /is-shared-array-buffer@1.0.2:
+    resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.5
     dev: true
 
   /is-stream@1.1.0:
@@ -15562,7 +15491,7 @@ packages:
     resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      has-tostringtag: 1.0.2
+      has-tostringtag: 1.0.0
     dev: true
 
   /is-symbol@1.0.4:
@@ -15579,11 +15508,11 @@ packages:
       text-extensions: 1.9.0
     dev: true
 
-  /is-typed-array@1.1.13:
-    resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
+  /is-typed-array@1.1.12:
+    resolution: {integrity: sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      which-typed-array: 1.1.14
+      which-typed-array: 1.1.13
 
   /is-typedarray@1.0.0:
     resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
@@ -15618,14 +15547,14 @@ packages:
   /is-weakref@1.0.2:
     resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.5
     dev: true
 
   /is-weakset@2.0.2:
     resolution: {integrity: sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==}
     dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
     dev: true
 
   /is-windows@1.0.2:
@@ -15693,8 +15622,8 @@ packages:
     dependencies:
       ws: 8.14.2
 
-  /istanbul-lib-coverage@3.2.2:
-    resolution: {integrity: sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==}
+  /istanbul-lib-coverage@3.2.0:
+    resolution: {integrity: sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==}
     engines: {node: '>=8'}
     dev: true
 
@@ -15702,34 +15631,34 @@ packages:
     resolution: {integrity: sha512-6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A==}
     engines: {node: '>=8'}
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/parser': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/parser': 7.23.9
       '@istanbuljs/schema': 0.1.3
-      istanbul-lib-coverage: 3.2.2
+      istanbul-lib-coverage: 3.2.0
       semver: 6.3.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /istanbul-lib-instrument@6.0.2:
-    resolution: {integrity: sha512-1WUsZ9R1lA0HtBSohTkm39WTPlNKSJ5iFk7UwqXkBLoHQT+hfqPsfsTDVuZdKGaBwn7din9bS7SsnoAr943hvw==}
+  /istanbul-lib-instrument@6.0.1:
+    resolution: {integrity: sha512-EAMEJBsYuyyztxMxW3g7ugGPkrZsV57v0Hmv3mm1uQsmB+QnZuepg731CRaIgeUVSdmsTngOkSnauNF8p7FIhA==}
     engines: {node: '>=10'}
     dependencies:
-      '@babel/core': 7.24.0
-      '@babel/parser': 7.24.0
+      '@babel/core': 7.23.9
+      '@babel/parser': 7.23.9
       '@istanbuljs/schema': 0.1.3
-      istanbul-lib-coverage: 3.2.2
-      semver: 7.6.0
+      istanbul-lib-coverage: 3.2.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /istanbul-lib-report@3.0.1:
-    resolution: {integrity: sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==}
-    engines: {node: '>=10'}
+  /istanbul-lib-report@3.0.0:
+    resolution: {integrity: sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==}
+    engines: {node: '>=8'}
     dependencies:
-      istanbul-lib-coverage: 3.2.2
-      make-dir: 4.0.0
+      istanbul-lib-coverage: 3.2.0
+      make-dir: 3.1.0
       supports-color: 7.2.0
     dev: true
 
@@ -15738,18 +15667,18 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       debug: 4.3.4(supports-color@9.2.2)
-      istanbul-lib-coverage: 3.2.2
+      istanbul-lib-coverage: 3.2.0
       source-map: 0.6.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /istanbul-reports@3.1.7:
-    resolution: {integrity: sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==}
+  /istanbul-reports@3.1.4:
+    resolution: {integrity: sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==}
     engines: {node: '>=8'}
     dependencies:
       html-escaper: 2.0.2
-      istanbul-lib-report: 3.0.1
+      istanbul-lib-report: 3.0.0
     dev: true
 
   /iterall@1.3.0:
@@ -15818,7 +15747,7 @@ packages:
       jest-util: 27.5.1
       pretty-format: 27.5.1
       slash: 3.0.0
-      stack-utils: 2.0.6
+      stack-utils: 2.0.5
       throat: 6.0.1
     transitivePeerDependencies:
       - supports-color
@@ -15847,7 +15776,7 @@ packages:
       pretty-format: 29.7.0
       pure-rand: 6.0.4
       slash: 3.0.0
-      stack-utils: 2.0.6
+      stack-utils: 2.0.5
     transitivePeerDependencies:
       - babel-plugin-macros
       - supports-color
@@ -15948,10 +15877,10 @@ packages:
       ts-node:
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@jest/test-sequencer': 27.5.1
       '@jest/types': 27.5.1
-      babel-jest: 27.5.1(@babel/core@7.24.0)
+      babel-jest: 27.5.1(@babel/core@7.23.9)
       chalk: 4.1.2
       ci-info: 3.9.0
       deepmerge: 4.3.1
@@ -15991,11 +15920,11 @@ packages:
       ts-node:
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@jest/test-sequencer': 29.7.0
       '@jest/types': 29.6.3
       '@types/node': 17.0.27
-      babel-jest: 29.7.0(@babel/core@7.24.0)
+      babel-jest: 29.7.0(@babel/core@7.23.9)
       chalk: 4.1.2
       ci-info: 3.9.0
       deepmerge: 4.3.1
@@ -16031,11 +15960,11 @@ packages:
       ts-node:
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@jest/test-sequencer': 29.7.0
       '@jest/types': 29.6.3
       '@types/node': 18.11.10
-      babel-jest: 29.7.0(@babel/core@7.24.0)
+      babel-jest: 29.7.0(@babel/core@7.23.9)
       chalk: 4.1.2
       ci-info: 3.9.0
       deepmerge: 4.3.1
@@ -16072,11 +16001,11 @@ packages:
       ts-node:
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@jest/test-sequencer': 29.7.0
       '@jest/types': 29.6.3
       '@types/node': 18.18.8
-      babel-jest: 29.7.0(@babel/core@7.24.0)
+      babel-jest: 29.7.0(@babel/core@7.23.9)
       chalk: 4.1.2
       ci-info: 3.9.0
       deepmerge: 4.3.1
@@ -16229,10 +16158,10 @@ packages:
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
       '@jest/types': 27.5.1
-      '@types/graceful-fs': 4.1.9
+      '@types/graceful-fs': 4.1.5
       '@types/node': 18.18.8
       anymatch: 3.1.3
-      fb-watchman: 2.0.2
+      fb-watchman: 2.0.1
       graceful-fs: 4.2.11
       jest-regex-util: 27.5.1
       jest-serializer: 27.5.1
@@ -16249,10 +16178,10 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.6.3
-      '@types/graceful-fs': 4.1.9
+      '@types/graceful-fs': 4.1.5
       '@types/node': 18.18.8
       anymatch: 3.1.3
-      fb-watchman: 2.0.2
+      fb-watchman: 2.0.1
       graceful-fs: 4.2.11
       jest-regex-util: 29.6.3
       jest-util: 29.7.0
@@ -16340,13 +16269,13 @@ packages:
     dependencies:
       '@babel/code-frame': 7.23.5
       '@jest/types': 27.5.1
-      '@types/stack-utils': 2.0.3
+      '@types/stack-utils': 2.0.1
       chalk: 4.1.2
       graceful-fs: 4.2.11
       micromatch: 4.0.5
       pretty-format: 27.5.1
       slash: 3.0.0
-      stack-utils: 2.0.6
+      stack-utils: 2.0.5
     dev: true
 
   /jest-message-util@28.1.1:
@@ -16355,13 +16284,13 @@ packages:
     dependencies:
       '@babel/code-frame': 7.23.5
       '@jest/types': 28.1.1
-      '@types/stack-utils': 2.0.3
+      '@types/stack-utils': 2.0.1
       chalk: 4.1.2
       graceful-fs: 4.2.11
       micromatch: 4.0.5
       pretty-format: 28.1.1
       slash: 3.0.0
-      stack-utils: 2.0.6
+      stack-utils: 2.0.5
     dev: true
 
   /jest-message-util@29.7.0:
@@ -16370,13 +16299,13 @@ packages:
     dependencies:
       '@babel/code-frame': 7.23.5
       '@jest/types': 29.6.3
-      '@types/stack-utils': 2.0.3
+      '@types/stack-utils': 2.0.1
       chalk: 4.1.2
       graceful-fs: 4.2.11
       micromatch: 4.0.5
       pretty-format: 29.7.0
       slash: 3.0.0
-      stack-utils: 2.0.6
+      stack-utils: 2.0.5
     dev: true
 
   /jest-mock-extended@3.0.1(jest@29.4.1)(typescript@4.9.3):
@@ -16407,8 +16336,8 @@ packages:
       jest-util: 29.7.0
     dev: true
 
-  /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1):
-    resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}
+  /jest-pnp-resolver@1.2.2(jest-resolve@27.5.1):
+    resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==}
     engines: {node: '>=6'}
     peerDependencies:
       jest-resolve: '*'
@@ -16419,8 +16348,8 @@ packages:
       jest-resolve: 27.5.1
     dev: true
 
-  /jest-pnp-resolver@1.2.3(jest-resolve@29.7.0):
-    resolution: {integrity: sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==}
+  /jest-pnp-resolver@1.2.2(jest-resolve@29.7.0):
+    resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==}
     engines: {node: '>=6'}
     peerDependencies:
       jest-resolve: '*'
@@ -16470,7 +16399,7 @@ packages:
       chalk: 4.1.2
       graceful-fs: 4.2.11
       jest-haste-map: 27.5.1
-      jest-pnp-resolver: 1.2.3(jest-resolve@27.5.1)
+      jest-pnp-resolver: 1.2.2(jest-resolve@27.5.1)
       jest-util: 27.5.1
       jest-validate: 27.5.1
       resolve: 1.22.8
@@ -16485,11 +16414,11 @@ packages:
       chalk: 4.1.2
       graceful-fs: 4.2.11
       jest-haste-map: 29.7.0
-      jest-pnp-resolver: 1.2.3(jest-resolve@29.7.0)
+      jest-pnp-resolver: 1.2.2(jest-resolve@29.7.0)
       jest-util: 29.7.0
       jest-validate: 29.7.0
       resolve: 1.22.8
-      resolve.exports: 2.0.2
+      resolve.exports: 2.0.0
       slash: 3.0.0
     dev: true
 
@@ -16566,8 +16495,8 @@ packages:
       '@jest/transform': 27.5.1
       '@jest/types': 27.5.1
       chalk: 4.1.2
-      cjs-module-lexer: 1.2.3
-      collect-v8-coverage: 1.0.2
+      cjs-module-lexer: 1.2.2
+      collect-v8-coverage: 1.0.1
       execa: 5.1.1
       glob: 7.2.3
       graceful-fs: 4.2.11
@@ -16597,8 +16526,8 @@ packages:
       '@jest/types': 29.6.3
       '@types/node': 18.18.8
       chalk: 4.1.2
-      cjs-module-lexer: 1.2.3
-      collect-v8-coverage: 1.0.2
+      cjs-module-lexer: 1.2.2
+      collect-v8-coverage: 1.0.1
       glob: 7.2.3
       graceful-fs: 4.2.11
       jest-haste-map: 29.7.0
@@ -16626,16 +16555,16 @@ packages:
     resolution: {integrity: sha512-yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/generator': 7.23.6
-      '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.24.0)
-      '@babel/traverse': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/plugin-syntax-typescript': 7.18.6(@babel/core@7.23.9)
+      '@babel/traverse': 7.23.9
+      '@babel/types': 7.23.9
       '@jest/transform': 27.5.1
       '@jest/types': 27.5.1
-      '@types/babel__traverse': 7.20.5
+      '@types/babel__traverse': 7.17.1
       '@types/prettier': 2.6.3
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.0)
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.23.9)
       chalk: 4.1.2
       expect: 27.5.1
       graceful-fs: 4.2.11
@@ -16647,7 +16576,7 @@ packages:
       jest-util: 27.5.1
       natural-compare: 1.4.0
       pretty-format: 27.5.1
-      semver: 7.6.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -16656,15 +16585,15 @@ packages:
     resolution: {integrity: sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@babel/generator': 7.23.6
-      '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.24.0)
-      '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.24.0)
-      '@babel/types': 7.24.0
+      '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.23.9)
+      '@babel/plugin-syntax-typescript': 7.18.6(@babel/core@7.23.9)
+      '@babel/types': 7.23.9
       '@jest/expect-utils': 29.7.0
       '@jest/transform': 29.7.0
       '@jest/types': 29.6.3
-      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.24.0)
+      babel-preset-current-node-syntax: 1.0.1(@babel/core@7.23.9)
       chalk: 4.1.2
       expect: 29.7.0
       graceful-fs: 4.2.11
@@ -16675,7 +16604,7 @@ packages:
       jest-util: 29.7.0
       natural-compare: 1.4.0
       pretty-format: 29.7.0
-      semver: 7.6.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -16876,6 +16805,7 @@ packages:
 
   /jose@4.14.4:
     resolution: {integrity: sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g==}
+    deprecated: this version is no longer supported
     dev: true
 
   /joycon@3.1.1:
@@ -16894,7 +16824,7 @@ packages:
     dependencies:
       config-chain: 1.1.13
       editorconfig: 0.15.3
-      glob: 8.1.0
+      glob: 8.0.3
       nopt: 6.0.0
     dev: false
 
@@ -17045,7 +16975,7 @@ packages:
       acorn: 8.11.3
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
-      semver: 7.6.0
+      semver: 7.5.4
     dev: false
 
   /jsonc-parser@2.3.1:
@@ -17095,7 +17025,7 @@ packages:
       jws: 3.2.2
       lodash: 4.17.21
       ms: 2.1.3
-      semver: 7.6.0
+      semver: 7.5.4
 
   /jstransformer@1.0.0:
     resolution: {integrity: sha512-C9YK3Rf8q6VAPDCCU9fnqo3mAfOH6vUGnMcP4AQAYIEpWtfGLpwOTmZ+igtdK5y+VvI2n3CyYSzy4Qh34eq24A==}
@@ -17295,8 +17225,8 @@ packages:
       strip-bom: 3.0.0
     dev: true
 
-  /load-tsconfig@0.2.5:
-    resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==}
+  /load-tsconfig@0.2.3:
+    resolution: {integrity: sha512-iyT2MXws+dc2Wi6o3grCFtGXpeMvHmJqS27sMPGtV2eUu4PeFnG+33I8BlFK1t1NWMjOpcx9bridn5yxLDX2gQ==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dev: true
 
@@ -17313,7 +17243,7 @@ packages:
     resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
     engines: {node: '>=14'}
     dependencies:
-      mlly: 1.6.1
+      mlly: 1.5.0
       pkg-types: 1.0.3
     dev: true
 
@@ -17497,8 +17427,8 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.15
     dev: true
 
-  /magic-string@0.30.8:
-    resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==}
+  /magic-string@0.30.5:
+    resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==}
     engines: {node: '>=12'}
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15
@@ -17531,13 +17461,6 @@ packages:
     dependencies:
       semver: 6.3.1
 
-  /make-dir@4.0.0:
-    resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==}
-    engines: {node: '>=10'}
-    dependencies:
-      semver: 7.6.0
-    dev: true
-
   /make-error@1.3.6:
     resolution: {integrity: sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==}
 
@@ -17785,7 +17708,7 @@ packages:
   /mjml-accordion@4.14.1:
     resolution: {integrity: sha512-dpNXyjnhYwhM75JSjD4wFUa9JgHm86M2pa0CoTzdv1zOQz67ilc4BoK5mc2S0gOjJpjBShM5eOJuCyVIuAPC6w==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17795,7 +17718,7 @@ packages:
   /mjml-body@4.14.1:
     resolution: {integrity: sha512-YpXcK3o2o1U+fhI8f60xahrhXuHmav6BZez9vIN3ZEJOxPFSr+qgr1cT2iyFz50L5+ZsLIVj2ZY+ALQjdsg8ig==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17805,7 +17728,7 @@ packages:
   /mjml-button@4.14.1:
     resolution: {integrity: sha512-V1Tl1vQ3lXYvvqHJHvGcc8URr7V1l/ZOsv7iLV4QRrh7kjKBXaRS7uUJtz6/PzEbNsGQCiNtXrODqcijLWlgaw==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17815,7 +17738,7 @@ packages:
   /mjml-carousel@4.14.1:
     resolution: {integrity: sha512-Ku3MUWPk/TwHxVgKEUtzspy/ePaWtN/3z6/qvNik0KIn0ZUIZ4zvR2JtaVL5nd30LHSmUaNj30XMPkCjYiKkFA==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17826,8 +17749,8 @@ packages:
     resolution: {integrity: sha512-Gy6MnSygFXs0U1qOXTHqBg2vZX2VL/fAacgQzD4MHq4OuybWaTNSzXRwxBXYCxT3IJB874n2Q0Mxp+Xka+tnZg==}
     hasBin: true
     dependencies:
-      '@babel/runtime': 7.24.0
-      chokidar: 3.6.0
+      '@babel/runtime': 7.23.9
+      chokidar: 3.5.3
       glob: 7.2.3
       html-minifier: 4.0.0
       js-beautify: 1.14.7
@@ -17844,7 +17767,7 @@ packages:
   /mjml-column@4.14.1:
     resolution: {integrity: sha512-iixVCIX1YJtpQuwG2WbDr7FqofQrlTtGQ4+YAZXGiLThs0En3xNIJFQX9xJ8sgLEGGltyooHiNICBRlzSp9fDg==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17854,7 +17777,7 @@ packages:
   /mjml-core@4.14.1:
     resolution: {integrity: sha512-di88rSfX+8r4r+cEqlQCO7CRM4mYZrfe2wSCu2je38i+ujjkLpF72cgLnjBlSG5aOUCZgYvlsZ85stqIz9LQfA==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       cheerio: 1.0.0-rc.12
       detect-node: 2.0.4
       html-minifier: 4.0.0
@@ -17871,7 +17794,7 @@ packages:
   /mjml-divider@4.14.1:
     resolution: {integrity: sha512-agqWY0aW2xaMiUOhYKDvcAAfOLalpbbtjKZAl1vWmNkURaoK4L7MgDilKHSJDFUlHGm2ZOArTrq8i6K0iyThBQ==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17881,7 +17804,7 @@ packages:
   /mjml-group@4.14.1:
     resolution: {integrity: sha512-dJt5batgEJ7wxlxzqOfHOI94ABX+8DZBvAlHuddYO4CsLFHYv6XRIArLAMMnAKU76r6p3X8JxYeOjKZXdv49kg==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17891,7 +17814,7 @@ packages:
   /mjml-head-attributes@4.14.1:
     resolution: {integrity: sha512-XdUNOp2csK28kBDSistInOyzWNwmu5HDNr4y1Z7vSQ1PfkmiuS6jWG7jHUjdoMhs27e6Leuyyc6a8gWSpqSWrg==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17901,7 +17824,7 @@ packages:
   /mjml-head-breakpoint@4.14.1:
     resolution: {integrity: sha512-Qw9l/W/I5Z9p7I4ShgnEpAL9if4472ejcznbBnp+4Gq+sZoPa7iYoEPsa9UCGutlaCh3N3tIi2qKhl9qD8DFxA==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17911,7 +17834,7 @@ packages:
   /mjml-head-font@4.14.1:
     resolution: {integrity: sha512-oBYm1gaOdEMjE5BoZouRRD4lCNZ1jcpz92NR/F7xDyMaKCGN6T/+r4S5dq1gOLm9zWqClRHaECdFJNEmrDpZqA==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17921,7 +17844,7 @@ packages:
   /mjml-head-html-attributes@4.14.1:
     resolution: {integrity: sha512-vlJsJc1Sm4Ml2XvLmp01zsdmWmzm6+jNCO7X3eYi9ngEh8LjMCLIQOncnOgjqm9uGpQu2EgUhwvYFZP2luJOVg==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17931,7 +17854,7 @@ packages:
   /mjml-head-preview@4.14.1:
     resolution: {integrity: sha512-89gQtt3fhl2dkYpHLF5HDQXz/RLpzecU6wmAIT7Dz6etjLGE1dgq2Ay6Bu/OeHjDcT1gbM131zvBwuXw8OydNw==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17941,7 +17864,7 @@ packages:
   /mjml-head-style@4.14.1:
     resolution: {integrity: sha512-XryOuf32EDuUCBT2k99C1+H87IOM919oY6IqxKFJCDkmsbywKIum7ibhweJdcxiYGONKTC6xjuibGD3fQTTYNQ==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17951,7 +17874,7 @@ packages:
   /mjml-head-title@4.14.1:
     resolution: {integrity: sha512-aIfpmlQdf1eJZSSrFodmlC4g5GudBti2eMyG42M7/3NeLM6anEWoe+UkF/6OG4Zy0tCQ40BDJ5iBZlMsjQICzw==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17961,7 +17884,7 @@ packages:
   /mjml-head@4.14.1:
     resolution: {integrity: sha512-KoCbtSeTAhx05Ugn9TB2UYt5sQinSCb7RGRer5iPQ3CrXj8hT5B5Svn6qvf/GACPkWl4auExHQh+XgLB+r3OEA==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17971,7 +17894,7 @@ packages:
   /mjml-hero@4.14.1:
     resolution: {integrity: sha512-TQJ3yfjrKYGkdEWjHLHhL99u/meKFYgnfJvlo9xeBvRjSM696jIjdqaPHaunfw4CP6d2OpCIMuacgOsvqQMWOA==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17981,7 +17904,7 @@ packages:
   /mjml-image@4.14.1:
     resolution: {integrity: sha512-jfKLPHXuFq83okwlNM1Um/AEWeVDgs2JXIOsWp2TtvXosnRvGGMzA5stKLYdy1x6UfKF4c1ovpMS162aYGp+xQ==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -17992,7 +17915,7 @@ packages:
     resolution: {integrity: sha512-d+9HKQOhZi3ZFAaFSDdjzJX9eDQGjMf3BArLWNm2okC4ZgfJSpOc77kgCyFV8ugvwc8fFegPnSV60Jl4xtvK2A==}
     hasBin: true
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       js-beautify: 1.14.7
       lodash: 4.17.21
       mjml-core: 4.14.1
@@ -18005,7 +17928,7 @@ packages:
   /mjml-navbar@4.14.1:
     resolution: {integrity: sha512-rNy1Kw8CR3WQ+M55PFBAUDz2VEOjz+sk06OFnsnmNjoMVCjo1EV7OFLDAkmxAwqkC8h4zQWEOFY0MBqqoAg7+A==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -18015,7 +17938,7 @@ packages:
   /mjml-parser-xml@4.14.1:
     resolution: {integrity: sha512-9WQVeukbXfq9DUcZ8wOsHC6BTdhaVwTAJDYMIQglXLwKwN7I4pTCguDDHy5d0kbbzK5OCVxCdZe+bfVI6XANOQ==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       detect-node: 2.0.4
       htmlparser2: 8.0.1
       lodash: 4.17.21
@@ -18024,7 +17947,7 @@ packages:
   /mjml-preset-core@4.14.1:
     resolution: {integrity: sha512-uUCqK9Z9d39rwB/+JDV2KWSZGB46W7rPQpc9Xnw1DRP7wD7qAfJwK6AZFCwfTgWdSxw0PwquVNcrUS9yBa9uhw==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       mjml-accordion: 4.14.1
       mjml-body: 4.14.1
       mjml-button: 4.14.1
@@ -18057,7 +17980,7 @@ packages:
   /mjml-raw@4.14.1:
     resolution: {integrity: sha512-9+4wzoXnCtfV6QPmjfJkZ50hxFB4Z8QZnl2Ac0D1Cn3dUF46UkmO5NLMu7UDIlm5DdFyycZrMOwvZS4wv9ksPw==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -18067,7 +17990,7 @@ packages:
   /mjml-section@4.14.1:
     resolution: {integrity: sha512-Ik5pTUhpT3DOfB3hEmAWp8rZ0ilWtIivnL8XdUJRfgYE9D+MCRn+reIO+DAoJHxiQoI6gyeKkIP4B9OrQ7cHQw==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -18077,7 +18000,7 @@ packages:
   /mjml-social@4.14.1:
     resolution: {integrity: sha512-G44aOZXgZHukirjkeQWTTV36UywtE2YvSwWGNfo/8d+k5JdJJhCIrlwaahyKEAyH63G1B0Zt8b2lEWx0jigYUw==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -18087,7 +18010,7 @@ packages:
   /mjml-spacer@4.14.1:
     resolution: {integrity: sha512-5SfQCXTd3JBgRH1pUy6NVZ0lXBiRqFJPVHBdtC3OFvUS3q1w16eaAXlIUWMKTfy8CKhQrCiE6m65kc662ZpYxA==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -18097,7 +18020,7 @@ packages:
   /mjml-table@4.14.1:
     resolution: {integrity: sha512-aVBdX3WpyKVGh/PZNn2KgRem+PQhWlvnD00DKxDejRBsBSKYSwZ0t3EfFvZOoJ9DzfHsN0dHuwd6Z18Ps44NFQ==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -18107,7 +18030,7 @@ packages:
   /mjml-text@4.14.1:
     resolution: {integrity: sha512-yZuvf5z6qUxEo5CqOhCUltJlR6oySKVcQNHwoV5sneMaKdmBiaU4VDnlYFera9gMD9o3KBHIX6kUg7EHnCwBRQ==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
     transitivePeerDependencies:
@@ -18117,13 +18040,13 @@ packages:
   /mjml-validator@4.13.0:
     resolution: {integrity: sha512-uURYfyQYtHJ6Qz/1A7/+E9ezfcoISoLZhYK3olsxKRViwaA2Mm8gy/J3yggZXnsUXWUns7Qymycm5LglLEIiQg==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
     dev: false
 
   /mjml-wrapper@4.14.1:
     resolution: {integrity: sha512-aA5Xlq6d0hZ5LY+RvSaBqmVcLkvPvdhyAv3vQf3G41Gfhel4oIPmkLnVpHselWhV14A0KwIOIAKVxHtSAxyOTQ==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       lodash: 4.17.21
       mjml-core: 4.14.1
       mjml-section: 4.14.1
@@ -18135,7 +18058,7 @@ packages:
     resolution: {integrity: sha512-f/wnWWIVbeb/ge3ff7c/KYYizI13QbGIp03odwwkCThsJsacw4gpZZAU7V4gXY3HxSXP2/q3jxOfaHVbkfNpOQ==}
     hasBin: true
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       mjml-cli: 4.14.1
       mjml-core: 4.14.1
       mjml-migrate: 4.14.1
@@ -18156,13 +18079,13 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  /mlly@1.6.1:
-    resolution: {integrity: sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==}
+  /mlly@1.5.0:
+    resolution: {integrity: sha512-NPVQvAY1xr1QoVeG0cy8yUYC7FQcOx6evl/RjT1wL5FvzPnzOysoqB/jmx/DhssT2dYa8nxECLAaFI/+gVLhDQ==}
     dependencies:
       acorn: 8.11.3
       pathe: 1.1.2
       pkg-types: 1.0.3
-      ufo: 1.4.0
+      ufo: 1.3.2
 
   /mocha@9.2.2:
     resolution: {integrity: sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==}
@@ -18351,7 +18274,7 @@ packages:
     dependencies:
       hosted-git-info: 4.1.0
       is-core-module: 2.13.1
-      semver: 7.6.0
+      semver: 7.5.4
       validate-npm-package-license: 3.0.4
     dev: true
 
@@ -18453,7 +18376,7 @@ packages:
     resolution: {integrity: sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.5
       define-properties: 1.2.1
     dev: true
 
@@ -18470,7 +18393,7 @@ packages:
     resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.5
       define-properties: 1.2.1
       has-symbols: 1.0.3
       object-keys: 1.1.1
@@ -19004,8 +18927,8 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /pirates@4.0.6:
-    resolution: {integrity: sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==}
+  /pirates@4.0.5:
+    resolution: {integrity: sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==}
     engines: {node: '>= 6'}
 
   /pkg-dir@4.2.0:
@@ -19019,7 +18942,7 @@ packages:
     resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==}
     dependencies:
       jsonc-parser: 3.2.0
-      mlly: 1.6.1
+      mlly: 1.5.0
       pathe: 1.1.2
 
   /pkginfo@0.4.1:
@@ -19042,10 +18965,6 @@ packages:
       - supports-color
     dev: true
 
-  /possible-typed-array-names@1.0.0:
-    resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
-    engines: {node: '>= 0.4'}
-
   /postcss-import@15.1.0(postcss@8.4.32):
     resolution: {integrity: sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==}
     engines: {node: '>=14.0.0'}
@@ -19149,7 +19068,7 @@ packages:
     resolution: {integrity: sha512-jOrdVvzUXBC7C+9gkIkpDJ3HIxOHTIqjpQ4C1EMt1ZGeMvSEpbFCKq23DEfgsj46vMnDgyQf+1ZLp2Wm+bKSsA==}
     engines: {node: '>=10'}
     dependencies:
-      punycode: 2.3.1
+      punycode: 2.3.0
     dev: false
 
   /prelude-ls@1.1.2:
@@ -19519,8 +19438,8 @@ packages:
   /punycode@1.4.1:
     resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==}
 
-  /punycode@2.3.1:
-    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+  /punycode@2.3.0:
+    resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
     engines: {node: '>=6'}
 
   /pure-rand@6.0.4:
@@ -19550,13 +19469,13 @@ packages:
     resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
     engines: {node: '>=0.6'}
     dependencies:
-      side-channel: 1.0.6
+      side-channel: 1.0.4
 
   /qs@6.11.2:
     resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==}
     engines: {node: '>=0.6'}
     dependencies:
-      side-channel: 1.0.6
+      side-channel: 1.0.4
 
   /querystringify@2.2.0:
     resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
@@ -19790,16 +19709,15 @@ packages:
   /regenerator-transform@0.15.2:
     resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
 
-  /regexp.prototype.flags@1.5.2:
-    resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
+  /regexp.prototype.flags@1.5.1:
+    resolution: {integrity: sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.5
       define-properties: 1.2.1
-      es-errors: 1.3.0
-      set-function-name: 2.0.2
+      set-function-name: 2.0.1
     dev: true
 
   /regexpp@3.2.0:
@@ -19832,7 +19750,7 @@ packages:
   /relay-runtime@12.0.0:
     resolution: {integrity: sha512-QU6JKr1tMsry22DXNy9Whsq5rmvwr3LSZiiWV/9+DFpuTWvp+WFhobWMc8TC4OjKFfNhEZy7mOiqUAn5atQtug==}
     dependencies:
-      '@babel/runtime': 7.24.0
+      '@babel/runtime': 7.23.9
       fbjs: 3.0.4
       invariant: 2.2.4
     transitivePeerDependencies:
@@ -19917,8 +19835,8 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /resolve.exports@2.0.2:
-    resolution: {integrity: sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==}
+  /resolve.exports@2.0.0:
+    resolution: {integrity: sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==}
     engines: {node: '>=10'}
     dev: true
 
@@ -19979,7 +19897,7 @@ packages:
       rollup: ^3.25
       typescript: ^4.5 || ^5.0
     dependencies:
-      magic-string: 0.30.8
+      magic-string: 0.30.5
       rollup: 3.29.4
       typescript: 5.2.2
     optionalDependencies:
@@ -20020,7 +19938,7 @@ packages:
       jest-worker: 26.6.2
       rollup: 2.79.1
       serialize-javascript: 4.0.0
-      terser: 5.28.1
+      terser: 5.27.0
     dev: true
 
   /rollup-plugin-ts@3.4.5(rollup@3.29.4)(typescript@5.2.2):
@@ -20055,11 +19973,11 @@ packages:
       '@rollup/pluginutils': 5.1.0(rollup@3.29.4)
       '@wessberg/stringutil': 1.0.19
       ansi-colors: 4.1.3
-      browserslist: 4.23.0
+      browserslist: 4.22.3
       browserslist-generator: 2.1.0
       compatfactory: 3.0.0(typescript@5.2.2)
       crosspath: 2.0.0
-      magic-string: 0.30.8
+      magic-string: 0.30.5
       rollup: 3.29.4
       ts-clone-node: 3.0.0(typescript@5.2.2)
       tslib: 2.6.2
@@ -20086,26 +20004,23 @@ packages:
     optionalDependencies:
       fsevents: 2.3.3
 
-  /rollup@4.12.0:
-    resolution: {integrity: sha512-wz66wn4t1OHIJw3+XU7mJJQV/2NAfw5OAk6G6Hoo3zcvz/XOfQ52Vgi+AN4Uxoxi0KBBwk2g8zPrTDA4btSB/Q==}
+  /rollup@4.6.1:
+    resolution: {integrity: sha512-jZHaZotEHQaHLgKr8JnQiDT1rmatjgKlMekyksz+yk9jt/8z9quNjnKNRoaM0wd9DC2QKXjmWWuDYtM3jfF8pQ==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
-    dependencies:
-      '@types/estree': 1.0.5
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.12.0
-      '@rollup/rollup-android-arm64': 4.12.0
-      '@rollup/rollup-darwin-arm64': 4.12.0
-      '@rollup/rollup-darwin-x64': 4.12.0
-      '@rollup/rollup-linux-arm-gnueabihf': 4.12.0
-      '@rollup/rollup-linux-arm64-gnu': 4.12.0
-      '@rollup/rollup-linux-arm64-musl': 4.12.0
-      '@rollup/rollup-linux-riscv64-gnu': 4.12.0
-      '@rollup/rollup-linux-x64-gnu': 4.12.0
-      '@rollup/rollup-linux-x64-musl': 4.12.0
-      '@rollup/rollup-win32-arm64-msvc': 4.12.0
-      '@rollup/rollup-win32-ia32-msvc': 4.12.0
-      '@rollup/rollup-win32-x64-msvc': 4.12.0
+      '@rollup/rollup-android-arm-eabi': 4.6.1
+      '@rollup/rollup-android-arm64': 4.6.1
+      '@rollup/rollup-darwin-arm64': 4.6.1
+      '@rollup/rollup-darwin-x64': 4.6.1
+      '@rollup/rollup-linux-arm-gnueabihf': 4.6.1
+      '@rollup/rollup-linux-arm64-gnu': 4.6.1
+      '@rollup/rollup-linux-arm64-musl': 4.6.1
+      '@rollup/rollup-linux-x64-gnu': 4.6.1
+      '@rollup/rollup-linux-x64-musl': 4.6.1
+      '@rollup/rollup-win32-arm64-msvc': 4.6.1
+      '@rollup/rollup-win32-ia32-msvc': 4.6.1
+      '@rollup/rollup-win32-x64-msvc': 4.6.1
       fsevents: 2.3.3
     dev: true
 
@@ -20163,8 +20078,8 @@ packages:
     resolution: {integrity: sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==}
     engines: {node: '>=0.4'}
     dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
       has-symbols: 1.0.3
       isarray: 2.0.5
     dev: true
@@ -20175,12 +20090,12 @@ packages:
   /safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
-  /safe-regex-test@1.0.3:
-    resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
+  /safe-regex-test@1.0.2:
+    resolution: {integrity: sha512-83S9w6eFq12BBIJYvjMux6/dkirb8+4zJRA9cxNBVb7Wq5fJBW+Xze48WqR8pxua7bDuAaaAxtVVd4Idjp1dBQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
       is-regex: 1.1.4
     dev: true
 
@@ -20192,7 +20107,7 @@ packages:
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       immutable: 4.3.2
       source-map-js: 1.0.2
 
@@ -20201,7 +20116,7 @@ packages:
     engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       immutable: 4.3.2
       source-map-js: 1.0.2
 
@@ -20269,14 +20184,6 @@ packages:
     hasBin: true
     dependencies:
       lru-cache: 6.0.0
-    dev: false
-
-  /semver@7.6.0:
-    resolution: {integrity: sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==}
-    engines: {node: '>=10'}
-    hasBin: true
-    dependencies:
-      lru-cache: 6.0.0
 
   /send@0.18.0:
     resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
@@ -20351,25 +20258,22 @@ packages:
     resolution: {integrity: sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==}
     dev: false
 
-  /set-function-length@1.2.1:
-    resolution: {integrity: sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==}
+  /set-function-length@1.1.1:
+    resolution: {integrity: sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      define-data-property: 1.1.4
-      es-errors: 1.3.0
-      function-bind: 1.1.2
-      get-intrinsic: 1.2.4
+      define-data-property: 1.1.1
+      get-intrinsic: 1.2.2
       gopd: 1.0.1
-      has-property-descriptors: 1.0.2
+      has-property-descriptors: 1.0.1
 
-  /set-function-name@2.0.2:
-    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
+  /set-function-name@2.0.1:
+    resolution: {integrity: sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      define-data-property: 1.1.4
-      es-errors: 1.3.0
+      define-data-property: 1.1.1
       functions-have-names: 1.2.3
-      has-property-descriptors: 1.0.2
+      has-property-descriptors: 1.0.1
     dev: true
 
   /setimmediate@1.0.5:
@@ -20423,13 +20327,11 @@ packages:
       rechoir: 0.6.2
     dev: true
 
-  /side-channel@1.0.6:
-    resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
-    engines: {node: '>= 0.4'}
+  /side-channel@1.0.4:
+    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
     dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
       object-inspect: 1.13.1
 
   /siginfo@2.0.0:
@@ -20708,8 +20610,8 @@ packages:
   /sprintf-js@1.0.3:
     resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
 
-  /stack-utils@2.0.6:
-    resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==}
+  /stack-utils@2.0.5:
+    resolution: {integrity: sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==}
     engines: {node: '>=10'}
     dependencies:
       escape-string-regexp: 2.0.0
@@ -20742,7 +20644,7 @@ packages:
     resolution: {integrity: sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      internal-slot: 1.0.7
+      internal-slot: 1.0.6
     dev: true
 
   /stream-browserify@3.0.0:
@@ -20798,49 +20700,49 @@ packages:
   /string.prototype.matchall@4.0.10:
     resolution: {integrity: sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==}
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.5
       define-properties: 1.2.1
-      es-abstract: 1.22.5
-      get-intrinsic: 1.2.4
+      es-abstract: 1.22.3
+      get-intrinsic: 1.2.2
       has-symbols: 1.0.3
-      internal-slot: 1.0.7
-      regexp.prototype.flags: 1.5.2
-      set-function-name: 2.0.2
-      side-channel: 1.0.6
+      internal-slot: 1.0.6
+      regexp.prototype.flags: 1.5.1
+      set-function-name: 2.0.1
+      side-channel: 1.0.4
     dev: true
 
   /string.prototype.padend@3.1.3:
     resolution: {integrity: sha512-jNIIeokznm8SD/TZISQsZKYu7RJyheFNt84DUPrh482GC8RVp2MKqm2O5oBRdGxbDQoXrhhWtPIWQOiy20svUg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.5
       define-properties: 1.2.1
-      es-abstract: 1.22.5
+      es-abstract: 1.22.3
     dev: true
 
   /string.prototype.trim@1.2.8:
     resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.5
       define-properties: 1.2.1
-      es-abstract: 1.22.5
+      es-abstract: 1.22.3
     dev: true
 
   /string.prototype.trimend@1.0.7:
     resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==}
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.5
       define-properties: 1.2.1
-      es-abstract: 1.22.5
+      es-abstract: 1.22.3
     dev: true
 
   /string.prototype.trimstart@1.0.7:
     resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==}
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.5
       define-properties: 1.2.1
-      es-abstract: 1.22.5
+      es-abstract: 1.22.3
     dev: true
 
   /string_decoder@0.10.31:
@@ -20956,17 +20858,17 @@ packages:
       - utf-8-validate
     dev: false
 
-  /sucrase@3.35.0:
-    resolution: {integrity: sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==}
-    engines: {node: '>=16 || 14 >=14.17'}
+  /sucrase@3.34.0:
+    resolution: {integrity: sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==}
+    engines: {node: '>=8'}
     hasBin: true
     dependencies:
-      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/gen-mapping': 0.3.3
       commander: 4.1.1
-      glob: 10.3.10
+      glob: 7.1.6
       lines-and-columns: 1.2.4
       mz: 2.7.0
-      pirates: 4.0.6
+      pirates: 4.0.5
       ts-interface-checker: 0.1.13
 
   /superagent-proxy@3.0.0(superagent@8.0.9):
@@ -20995,7 +20897,7 @@ packages:
       methods: 1.1.2
       mime: 2.6.0
       qs: 6.11.2
-      semver: 7.6.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
 
@@ -21099,7 +21001,7 @@ packages:
     dependencies:
       '@alloc/quick-lru': 5.2.0
       arg: 5.0.2
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       didyoumean: 1.2.2
       dlv: 1.1.3
       fast-glob: 3.3.2
@@ -21118,7 +21020,7 @@ packages:
       postcss-nested: 6.0.1(postcss@8.4.32)
       postcss-selector-parser: 6.0.13
       resolve: 1.22.8
-      sucrase: 3.35.0
+      sucrase: 3.34.0
     transitivePeerDependencies:
       - ts-node
 
@@ -21129,7 +21031,7 @@ packages:
     dependencies:
       '@alloc/quick-lru': 5.2.0
       arg: 5.0.2
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       didyoumean: 1.2.2
       dlv: 1.1.3
       fast-glob: 3.3.2
@@ -21148,7 +21050,7 @@ packages:
       postcss-nested: 6.0.1(postcss@8.4.32)
       postcss-selector-parser: 6.0.13
       resolve: 1.22.8
-      sucrase: 3.35.0
+      sucrase: 3.34.0
     transitivePeerDependencies:
       - ts-node
     dev: true
@@ -21232,15 +21134,15 @@ packages:
       uglify-js:
         optional: true
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.25
+      '@jridgewell/trace-mapping': 0.3.22
       jest-worker: 27.5.1
       schema-utils: 3.3.0
       serialize-javascript: 6.0.2
-      terser: 5.28.1
+      terser: 5.27.0
       webpack: 5.89.0
     dev: true
 
-  /terser-webpack-plugin@5.3.10(webpack@5.90.3):
+  /terser-webpack-plugin@5.3.10(webpack@5.90.0):
     resolution: {integrity: sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -21256,16 +21158,16 @@ packages:
       uglify-js:
         optional: true
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.25
+      '@jridgewell/trace-mapping': 0.3.22
       jest-worker: 27.5.1
       schema-utils: 3.3.0
       serialize-javascript: 6.0.2
-      terser: 5.28.1
-      webpack: 5.90.3
+      terser: 5.27.0
+      webpack: 5.90.0
     dev: true
 
-  /terser@5.28.1:
-    resolution: {integrity: sha512-wM+bZp54v/E9eRRGXb5ZFDvinrJIOaTapx3WUokyVGZu5ucVCK55zEgGd5Dl2fSr3jUo5sDiERErUWLY6QPFyA==}
+  /terser@5.27.0:
+    resolution: {integrity: sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A==}
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
@@ -21411,7 +21313,7 @@ packages:
     engines: {node: '>=6'}
     dependencies:
       psl: 1.9.0
-      punycode: 2.3.1
+      punycode: 2.3.0
       universalify: 0.2.0
       url-parse: 1.5.10
     dev: true
@@ -21422,14 +21324,14 @@ packages:
   /tr46@1.0.1:
     resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
     dependencies:
-      punycode: 2.3.1
+      punycode: 2.3.0
     dev: true
 
   /tr46@2.1.0:
     resolution: {integrity: sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==}
     engines: {node: '>=8'}
     dependencies:
-      punycode: 2.3.1
+      punycode: 2.3.0
     dev: true
 
   /tree-kill@1.2.2:
@@ -21471,7 +21373,7 @@ packages:
   /ts-interface-checker@0.1.13:
     resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==}
 
-  /ts-jest@27.1.5(@babel/core@7.24.0)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5):
+  /ts-jest@27.1.5(@babel/core@7.23.9)(@types/jest@27.5.2)(jest@27.5.1)(typescript@4.9.5):
     resolution: {integrity: sha512-Xv6jBQPoBEvBq/5i2TeSG9tt/nqkbpcurrEG1b+2yfBrcJelOZF9Ml6dmyMh7bcW9JyFbRYpR5rxROSlBLTZHA==}
     engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
     hasBin: true
@@ -21492,7 +21394,7 @@ packages:
       esbuild:
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       '@types/jest': 27.5.2
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
@@ -21501,12 +21403,12 @@ packages:
       json5: 2.2.3
       lodash.memoize: 4.1.2
       make-error: 1.3.6
-      semver: 7.6.0
+      semver: 7.5.4
       typescript: 4.9.5
       yargs-parser: 20.2.9
     dev: true
 
-  /ts-jest@29.0.5(@babel/core@7.24.0)(jest@29.4.1)(typescript@4.9.3):
+  /ts-jest@29.0.5(@babel/core@7.23.9)(jest@29.4.1)(typescript@4.9.3):
     resolution: {integrity: sha512-PL3UciSgIpQ7f6XjVOmbi96vmDHUqAyqDr8YxzopDqX3kfgYtX1cuNeBjP+L9sFXi6nzsGGA6R3fP3DDDJyrxA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -21527,7 +21429,7 @@ packages:
       esbuild:
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
       jest: 29.4.1(@types/node@18.11.10)(ts-node@10.9.1)
@@ -21540,7 +21442,7 @@ packages:
       yargs-parser: 21.1.1
     dev: true
 
-  /ts-jest@29.1.2(@babel/core@7.24.0)(esbuild@0.19.12)(jest@29.7.0)(typescript@5.3.3):
+  /ts-jest@29.1.2(@babel/core@7.23.9)(esbuild@0.19.5)(jest@29.7.0)(typescript@5.3.3):
     resolution: {integrity: sha512-br6GJoH/WUX4pu7FbZXuWGKGNDuU7b8Uj77g/Sp7puZV6EXzuByl6JrECvm0MzVzSTkSHWTihsXt+5XYER5b+g==}
     engines: {node: ^16.10.0 || ^18.0.0 || >=20.0.0}
     hasBin: true
@@ -21561,21 +21463,21 @@ packages:
       esbuild:
         optional: true
     dependencies:
-      '@babel/core': 7.24.0
+      '@babel/core': 7.23.9
       bs-logger: 0.2.6
-      esbuild: 0.19.12
+      esbuild: 0.19.5
       fast-json-stable-stringify: 2.1.0
       jest: 29.7.0(@types/node@17.0.27)
       jest-util: 29.7.0
       json5: 2.2.3
       lodash.memoize: 4.1.2
       make-error: 1.3.6
-      semver: 7.6.0
+      semver: 7.5.4
       typescript: 5.3.3
       yargs-parser: 21.1.1
     dev: true
 
-  /ts-loader@9.4.2(typescript@4.9.3)(webpack@5.90.3):
+  /ts-loader@9.4.2(typescript@4.9.3)(webpack@5.90.0):
     resolution: {integrity: sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -21583,11 +21485,11 @@ packages:
       webpack: ^5.0.0
     dependencies:
       chalk: 4.1.2
-      enhanced-resolve: 5.15.1
+      enhanced-resolve: 5.15.0
       micromatch: 4.0.5
-      semver: 7.6.0
+      semver: 7.5.4
       typescript: 4.9.3
-      webpack: 5.90.3
+      webpack: 5.90.0
     dev: true
 
   /ts-log@2.2.4:
@@ -21609,7 +21511,7 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       dynamic-dedupe: 0.3.0
       minimist: 1.2.6
       mkdirp: 1.0.4
@@ -21727,7 +21629,7 @@ packages:
     engines: {node: '>=10.13.0'}
     dependencies:
       chalk: 4.1.2
-      enhanced-resolve: 5.15.1
+      enhanced-resolve: 5.15.0
       tsconfig-paths: 4.2.0
     dev: true
 
@@ -21793,19 +21695,19 @@ packages:
         optional: true
     dependencies:
       '@swc/core': 1.4.2
-      bundle-require: 4.0.2(esbuild@0.19.12)
+      bundle-require: 4.0.2(esbuild@0.19.5)
       cac: 6.7.14
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       debug: 4.3.4(supports-color@9.2.2)
-      esbuild: 0.19.12
+      esbuild: 0.19.5
       execa: 5.1.1
       globby: 11.1.0
       joycon: 3.1.1
       postcss-load-config: 4.0.2(postcss@8.4.32)(ts-node@10.9.1)
       resolve-from: 5.0.0
-      rollup: 4.12.0
+      rollup: 4.6.1
       source-map: 0.8.0-beta.0
-      sucrase: 3.35.0
+      sucrase: 3.34.0
       tree-kill: 1.2.2
       typescript: 5.3.3
     transitivePeerDependencies:
@@ -21887,48 +21789,42 @@ packages:
       media-typer: 0.3.0
       mime-types: 2.1.35
 
-  /typed-array-buffer@1.0.2:
-    resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
+  /typed-array-buffer@1.0.0:
+    resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-typed-array: 1.1.13
+      call-bind: 1.0.5
+      get-intrinsic: 1.2.2
+      is-typed-array: 1.1.12
     dev: true
 
-  /typed-array-byte-length@1.0.1:
-    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
+  /typed-array-byte-length@1.0.0:
+    resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==}
     engines: {node: '>= 0.4'}
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.5
       for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
+      has-proto: 1.0.1
+      is-typed-array: 1.1.12
     dev: true
 
-  /typed-array-byte-offset@1.0.2:
-    resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
+  /typed-array-byte-offset@1.0.0:
+    resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==}
     engines: {node: '>= 0.4'}
     dependencies:
-      available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.5
       for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
+      has-proto: 1.0.1
+      is-typed-array: 1.1.12
     dev: true
 
-  /typed-array-length@1.0.5:
-    resolution: {integrity: sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==}
-    engines: {node: '>= 0.4'}
+  /typed-array-length@1.0.4:
+    resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.5
       for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
-      possible-typed-array-names: 1.0.0
+      is-typed-array: 1.1.12
     dev: true
 
   /typedarray-to-buffer@3.1.5:
@@ -21979,8 +21875,8 @@ packages:
     resolution: {integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==}
     dev: false
 
-  /ufo@1.4.0:
-    resolution: {integrity: sha512-Hhy+BhRBleFjpJ2vchUNN40qgkh0366FWJGqVLYBHev0vpHTrXSA0ryT+74UiW6KWsldNurQMKGqCm1M2zBciQ==}
+  /ufo@1.3.2:
+    resolution: {integrity: sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==}
 
   /uglify-js@3.17.4:
     resolution: {integrity: sha512-T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==}
@@ -22008,7 +21904,7 @@ packages:
   /unbox-primitive@1.0.2:
     resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
     dependencies:
-      call-bind: 1.0.7
+      call-bind: 1.0.5
       has-bigints: 1.0.2
       has-symbols: 1.0.3
       which-boxed-primitive: 1.0.2
@@ -22114,7 +22010,7 @@ packages:
     dependencies:
       fast-glob: 3.3.2
       unplugin: 1.5.1
-      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.28.1)
+      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.27.0)
     dev: true
 
   /unplugin-fonts@1.1.1(vite@4.5.0):
@@ -22128,7 +22024,7 @@ packages:
     dependencies:
       fast-glob: 3.3.2
       unplugin: 1.5.1
-      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
     dev: true
 
   /unplugin-icons@0.14.9(@vue/compiler-sfc@3.2.45)(vite@3.2.4):
@@ -22240,7 +22136,7 @@ packages:
     dependencies:
       '@antfu/utils': 0.5.2
       '@rollup/pluginutils': 4.2.1
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       debug: 4.3.4(supports-color@9.2.2)
       fast-glob: 3.3.2
       local-pkg: 0.4.3
@@ -22269,7 +22165,7 @@ packages:
     dependencies:
       '@antfu/utils': 0.5.2
       '@rollup/pluginutils': 4.2.1
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       debug: 4.3.4(supports-color@9.2.2)
       fast-glob: 3.3.2
       local-pkg: 0.4.3
@@ -22301,11 +22197,11 @@ packages:
     dependencies:
       '@antfu/utils': 0.7.6
       '@rollup/pluginutils': 5.1.0(rollup@2.79.1)
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       debug: 4.3.4(supports-color@9.2.2)
       fast-glob: 3.3.2
       local-pkg: 0.4.3
-      magic-string: 0.30.8
+      magic-string: 0.30.5
       minimatch: 9.0.3
       resolve: 1.22.8
       unplugin: 1.5.1
@@ -22330,11 +22226,11 @@ packages:
     dependencies:
       '@antfu/utils': 0.7.6
       '@rollup/pluginutils': 5.1.0(rollup@3.29.4)
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       debug: 4.3.4(supports-color@9.2.2)
       fast-glob: 3.3.2
       local-pkg: 0.4.3
-      magic-string: 0.30.8
+      magic-string: 0.30.5
       minimatch: 9.0.3
       resolve: 1.22.8
       unplugin: 1.5.1
@@ -22362,9 +22258,9 @@ packages:
         optional: true
     dependencies:
       acorn: 8.11.3
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       rollup: 2.79.1
-      vite: 4.5.0(@types/node@18.18.8)(terser@5.28.1)
+      vite: 4.5.0(@types/node@18.18.8)(terser@5.27.0)
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.4.4
     dev: true
@@ -22387,8 +22283,8 @@ packages:
         optional: true
     dependencies:
       acorn: 8.11.3
-      chokidar: 3.6.0
-      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.28.1)
+      chokidar: 3.5.3
+      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.27.0)
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.4.4
     dev: false
@@ -22411,9 +22307,9 @@ packages:
         optional: true
     dependencies:
       acorn: 8.11.3
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       rollup: 2.79.1
-      vite: 4.5.0(@types/node@18.18.8)(terser@5.28.1)
+      vite: 4.5.0(@types/node@18.18.8)(terser@5.27.0)
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.4.4
     dev: true
@@ -22436,8 +22332,8 @@ packages:
         optional: true
     dependencies:
       acorn: 8.11.3
-      chokidar: 3.6.0
-      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.28.1)
+      chokidar: 3.5.3
+      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.27.0)
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.4.4
     dev: false
@@ -22446,7 +22342,7 @@ packages:
     resolution: {integrity: sha512-7lJXQY4CxOK4jZyVskZuuNBqBSOlxezKqBpfQEpH+Odk2Ban3moKAlvzs9rZuZoZp6/1FEhvY9TZXav2FRhaBg==}
     dependencies:
       acorn: 8.11.3
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.5.0
     dev: true
@@ -22455,7 +22351,7 @@ packages:
     resolution: {integrity: sha512-0QkvG13z6RD+1L1FoibQqnvTwVBXvS4XSPwAyinVgoOCl2jAgwzdUKmEj05o4Lt8xwQI85Hb6mSyYkcAGwZPew==}
     dependencies:
       acorn: 8.11.3
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.6.1
 
@@ -22474,13 +22370,13 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /update-browserslist-db@1.0.13(browserslist@4.23.0):
+  /update-browserslist-db@1.0.13(browserslist@4.22.3):
     resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==}
     hasBin: true
     peerDependencies:
       browserslist: '>= 4.21.0'
     dependencies:
-      browserslist: 4.23.0
+      browserslist: 4.22.3
       escalade: 3.1.1
       picocolors: 1.0.0
 
@@ -22501,7 +22397,7 @@ packages:
   /uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
-      punycode: 2.3.1
+      punycode: 2.3.0
 
   /urijs@1.19.11:
     resolution: {integrity: sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==}
@@ -22552,8 +22448,8 @@ packages:
       inherits: 2.0.4
       is-arguments: 1.1.1
       is-generator-function: 1.0.10
-      is-typed-array: 1.1.13
-      which-typed-array: 1.1.14
+      is-typed-array: 1.1.12
+      which-typed-array: 1.1.13
     dev: false
 
   /utils-merge@1.0.1:
@@ -22586,18 +22482,18 @@ packages:
     resolution: {integrity: sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==}
     engines: {node: '>=10.12.0'}
     dependencies:
-      '@types/istanbul-lib-coverage': 2.0.6
+      '@types/istanbul-lib-coverage': 2.0.4
       convert-source-map: 1.9.0
       source-map: 0.7.4
     dev: true
 
-  /v8-to-istanbul@9.2.0:
-    resolution: {integrity: sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==}
+  /v8-to-istanbul@9.0.1:
+    resolution: {integrity: sha512-74Y4LqY74kLE6IFyIjPtkSTWzUZmj8tdHT9Ii/26dvQ6K9Dl2NbEfj0XgU2sHCtKgt5VupqhlO/5aWuqS+IY1w==}
     engines: {node: '>=10.12.0'}
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.25
-      '@types/istanbul-lib-coverage': 2.0.6
-      convert-source-map: 2.0.0
+      '@jridgewell/trace-mapping': 0.3.22
+      '@types/istanbul-lib-coverage': 2.0.4
+      convert-source-map: 1.9.0
     dev: true
 
   /valid-data-url@3.0.1:
@@ -22634,17 +22530,17 @@ packages:
       zod: 3.22.4
     dev: false
 
-  /vite-node@0.34.6(@types/node@18.18.8)(sass@1.69.5)(terser@5.28.1):
+  /vite-node@0.34.6(@types/node@18.18.8)(sass@1.69.5)(terser@5.27.0):
     resolution: {integrity: sha512-nlBMJ9x6n7/Amaz6F3zJ97EBwR2FkzhBRxF5e+jE6LA3yi6Wtc2lyTij1OnDMIr34v5g/tVQtsVAzhT0jc5ygA==}
     engines: {node: '>=v14.18.0'}
     hasBin: true
     dependencies:
       cac: 6.7.14
       debug: 4.3.4(supports-color@9.2.2)
-      mlly: 1.6.1
+      mlly: 1.5.0
       pathe: 1.1.2
       picocolors: 1.0.0
-      vite: 5.0.5(@types/node@18.18.8)(sass@1.69.5)(terser@5.28.1)
+      vite: 5.0.5(@types/node@18.18.8)(sass@1.69.5)(terser@5.27.0)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -22690,7 +22586,7 @@ packages:
       '@babel/code-frame': 7.23.5
       ansi-escapes: 4.3.2
       chalk: 4.1.2
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       commander: 8.3.0
       eslint: 8.55.0
       fast-glob: 3.3.2
@@ -22698,11 +22594,11 @@ packages:
       lodash.debounce: 4.0.8
       lodash.pick: 4.4.0
       npm-run-path: 4.0.1
-      semver: 7.6.0
+      semver: 7.5.4
       strip-ansi: 6.0.1
       tiny-invariant: 1.3.1
       typescript: 5.3.2
-      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
       vscode-languageclient: 7.0.0
       vscode-languageserver: 7.0.0
       vscode-languageserver-textdocument: 1.0.8
@@ -22717,10 +22613,10 @@ packages:
       vite: '>=2'
     dependencies:
       '@rollup/pluginutils': 4.2.1
-      '@types/eslint': 8.56.5
+      '@types/eslint': 8.56.2
       eslint: 8.55.0
       rollup: 2.79.1
-      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.28.1)
+      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.27.0)
 
   /vite-plugin-eslint@1.8.1(eslint@8.55.0)(vite@4.5.0):
     resolution: {integrity: sha512-PqdMf3Y2fLO9FsNPmMX+//2BF5SF8nEWspZdgl4kSt7UvHDRHVVfHvxsD7ULYzZrJDGRxR81Nq7TOFgwMnUang==}
@@ -22729,10 +22625,10 @@ packages:
       vite: '>=2'
     dependencies:
       '@rollup/pluginutils': 4.2.1
-      '@types/eslint': 8.56.5
+      '@types/eslint': 8.56.2
       eslint: 8.55.0
       rollup: 2.79.1
-      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
     dev: false
 
   /vite-plugin-fonts@0.7.0(vite@4.5.0):
@@ -22742,7 +22638,7 @@ packages:
       vite: ^2.0.0 || ^3.0.0 || ^4.0.0
     dependencies:
       fast-glob: 3.3.2
-      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
     dev: true
 
   /vite-plugin-html-config@1.0.11(vite@4.5.0):
@@ -22751,7 +22647,7 @@ packages:
     peerDependencies:
       vite: '>=2.0.0'
     dependencies:
-      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
     dev: true
 
   /vite-plugin-inspect@0.7.38(rollup@2.79.1)(vite@4.5.0):
@@ -22772,7 +22668,7 @@ packages:
       open: 9.1.0
       picocolors: 1.0.0
       sirv: 2.0.3
-      vite: 4.5.0(@types/node@18.18.8)(terser@5.28.1)
+      vite: 4.5.0(@types/node@18.18.8)(terser@5.27.0)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -22796,7 +22692,7 @@ packages:
       open: 9.1.0
       picocolors: 1.0.0
       sirv: 2.0.3
-      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -22820,7 +22716,7 @@ packages:
       open: 9.1.0
       picocolors: 1.0.0
       sirv: 2.0.3
-      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -22848,7 +22744,7 @@ packages:
       json5: 2.2.3
       local-pkg: 0.4.3
       picocolors: 1.0.0
-      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.28.1)
+      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.27.0)
       yaml: 2.3.4
     transitivePeerDependencies:
       - supports-color
@@ -22871,7 +22767,7 @@ packages:
       json5: 2.2.3
       local-pkg: 0.4.3
       picocolors: 1.0.0
-      vite: 4.5.0(@types/node@18.18.8)(terser@5.28.1)
+      vite: 4.5.0(@types/node@18.18.8)(terser@5.27.0)
       yaml: 2.3.4
     transitivePeerDependencies:
       - supports-color
@@ -22895,7 +22791,7 @@ packages:
       json5: 2.2.3
       local-pkg: 0.4.3
       picocolors: 1.0.0
-      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
       yaml: 2.3.4
     transitivePeerDependencies:
       - supports-color
@@ -22912,7 +22808,7 @@ packages:
       fast-glob: 3.3.2
       pretty-bytes: 6.1.1
       rollup: 2.79.1
-      vite: 4.5.0(@types/node@18.18.8)(terser@5.28.1)
+      vite: 4.5.0(@types/node@18.18.8)(terser@5.27.0)
       workbox-build: 6.6.0
       workbox-window: 6.6.0
     transitivePeerDependencies:
@@ -22930,7 +22826,7 @@ packages:
       debug: 4.3.4(supports-color@9.2.2)
       fast-glob: 3.3.2
       pretty-bytes: 6.1.1
-      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
       workbox-build: 7.0.0
       workbox-window: 7.0.0
     transitivePeerDependencies:
@@ -22943,11 +22839,11 @@ packages:
     peerDependencies:
       vite: ^3.0.0
     dependencies:
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       fast-glob: 3.3.2
       fs-extra: 10.1.0
       picocolors: 1.0.0
-      vite: 4.5.0(@types/node@18.18.8)(terser@5.28.1)
+      vite: 4.5.0(@types/node@18.18.8)(terser@5.27.0)
     dev: true
 
   /vite-plugin-static-copy@0.17.1(vite@4.5.0):
@@ -22956,11 +22852,11 @@ packages:
     peerDependencies:
       vite: ^3.0.0 || ^4.0.0 || ^5.0.0
     dependencies:
-      chokidar: 3.6.0
+      chokidar: 3.5.3
       fast-glob: 3.3.2
       fs-extra: 11.1.1
       picocolors: 1.0.0
-      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
     dev: true
 
   /vite-plugin-vue-layouts@0.7.0(vite@3.2.4)(vue-router@4.1.0)(vue@3.3.9):
@@ -22973,7 +22869,7 @@ packages:
       '@vue/compiler-sfc': 3.3.10
       debug: 4.3.4(supports-color@9.2.2)
       fast-glob: 3.3.2
-      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.28.1)
+      vite: 3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.27.0)
       vue: 3.3.9(typescript@4.9.3)
       vue-router: 4.1.0(vue@3.3.9)
     transitivePeerDependencies:
@@ -22990,7 +22886,7 @@ packages:
       '@vue/compiler-sfc': 3.3.10
       debug: 4.3.4(supports-color@9.2.2)
       fast-glob: 3.3.2
-      vite: 4.5.0(@types/node@18.18.8)(terser@5.28.1)
+      vite: 4.5.0(@types/node@18.18.8)(terser@5.27.0)
       vue: 3.3.9(typescript@4.9.5)
       vue-router: 4.2.5(vue@3.3.9)
     transitivePeerDependencies:
@@ -23007,14 +22903,14 @@ packages:
       '@vue/compiler-sfc': 3.3.10
       debug: 4.3.4(supports-color@9.2.2)
       fast-glob: 3.3.2
-      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1)
+      vite: 4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0)
       vue: 3.3.9(typescript@5.3.2)
       vue-router: 4.2.5(vue@3.3.9)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /vite@3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.28.1):
+  /vite@3.2.4(@types/node@18.18.8)(sass@1.58.0)(terser@5.27.0):
     resolution: {integrity: sha512-Z2X6SRAffOUYTa+sLy3NQ7nlHFU100xwanq1WDwqaiFiCe+25zdxP1TfCS5ojPV2oDDcXudHIoPnI1Z/66B7Yw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -23045,11 +22941,11 @@ packages:
       resolve: 1.22.8
       rollup: 2.79.1
       sass: 1.58.0
-      terser: 5.28.1
+      terser: 5.27.0
     optionalDependencies:
       fsevents: 2.3.3
 
-  /vite@4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.28.1):
+  /vite@4.5.0(@types/node@17.0.27)(sass@1.69.5)(terser@5.27.0):
     resolution: {integrity: sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -23082,11 +22978,11 @@ packages:
       postcss: 8.4.32
       rollup: 3.29.4
       sass: 1.69.5
-      terser: 5.28.1
+      terser: 5.27.0
     optionalDependencies:
       fsevents: 2.3.3
 
-  /vite@4.5.0(@types/node@18.18.8)(terser@5.28.1):
+  /vite@4.5.0(@types/node@18.18.8)(terser@5.27.0):
     resolution: {integrity: sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -23118,11 +23014,11 @@ packages:
       esbuild: 0.18.20
       postcss: 8.4.32
       rollup: 3.29.4
-      terser: 5.28.1
+      terser: 5.27.0
     optionalDependencies:
       fsevents: 2.3.3
 
-  /vite@5.0.5(@types/node@17.0.45)(terser@5.28.1):
+  /vite@5.0.5(@types/node@17.0.45)(terser@5.27.0):
     resolution: {integrity: sha512-OekeWqR9Ls56f3zd4CaxzbbS11gqYkEiBtnWFFgYR2WV8oPJRRKq0mpskYy/XaoCL3L7VINDhqqOMNDiYdGvGg==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
@@ -23151,15 +23047,15 @@ packages:
         optional: true
     dependencies:
       '@types/node': 17.0.45
-      esbuild: 0.19.12
+      esbuild: 0.19.5
       postcss: 8.4.32
-      rollup: 4.12.0
-      terser: 5.28.1
+      rollup: 4.6.1
+      terser: 5.27.0
     optionalDependencies:
       fsevents: 2.3.3
     dev: true
 
-  /vite@5.0.5(@types/node@18.18.8)(sass@1.69.5)(terser@5.28.1):
+  /vite@5.0.5(@types/node@18.18.8)(sass@1.69.5)(terser@5.27.0):
     resolution: {integrity: sha512-OekeWqR9Ls56f3zd4CaxzbbS11gqYkEiBtnWFFgYR2WV8oPJRRKq0mpskYy/XaoCL3L7VINDhqqOMNDiYdGvGg==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
@@ -23188,16 +23084,16 @@ packages:
         optional: true
     dependencies:
       '@types/node': 18.18.8
-      esbuild: 0.19.12
+      esbuild: 0.19.5
       postcss: 8.4.32
-      rollup: 4.12.0
+      rollup: 4.6.1
       sass: 1.69.5
-      terser: 5.28.1
+      terser: 5.27.0
     optionalDependencies:
       fsevents: 2.3.3
     dev: true
 
-  /vitest@0.34.6(sass@1.69.5)(terser@5.28.1):
+  /vitest@0.34.6(sass@1.69.5)(terser@5.27.0):
     resolution: {integrity: sha512-+5CALsOvbNKnS+ZHMXtuUC7nL8/7F1F2DnHGjSsszX8zCjWSSviphCb/NuS9Nzf4Q03KyyDRBAXhF/8lffME4Q==}
     engines: {node: '>=v14.18.0'}
     hasBin: true
@@ -23242,15 +23138,15 @@ packages:
       chai: 4.3.10
       debug: 4.3.4(supports-color@9.2.2)
       local-pkg: 0.4.3
-      magic-string: 0.30.8
+      magic-string: 0.30.5
       pathe: 1.1.2
       picocolors: 1.0.0
       std-env: 3.4.0
       strip-literal: 1.3.0
       tinybench: 2.5.0
       tinypool: 0.7.0
-      vite: 5.0.5(@types/node@18.18.8)(sass@1.69.5)(terser@5.28.1)
-      vite-node: 0.34.6(@types/node@18.18.8)(sass@1.69.5)(terser@5.28.1)
+      vite: 5.0.5(@types/node@18.18.8)(sass@1.69.5)(terser@5.27.0)
+      vite-node: 0.34.6(@types/node@18.18.8)(sass@1.69.5)(terser@5.27.0)
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
@@ -23320,7 +23216,7 @@ packages:
     engines: {vscode: ^1.52.0}
     dependencies:
       minimatch: 3.1.2
-      semver: 7.6.0
+      semver: 7.5.4
       vscode-languageserver-protocol: 3.16.0
     dev: true
 
@@ -23385,7 +23281,7 @@ packages:
     deprecated: 'WARNING: This project has been renamed to @volar/typescript-language-service. Install using @volar/typescript-language-service instead.'
     dependencies:
       '@volar/shared': 0.27.24
-      semver: 7.6.0
+      semver: 7.5.4
       upath: 2.0.1
       vscode-languageserver: 8.0.2
       vscode-languageserver-textdocument: 1.0.8
@@ -23450,7 +23346,7 @@ packages:
       espree: 9.6.1
       esquery: 1.5.0
       lodash: 4.17.21
-      semver: 7.6.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -23468,7 +23364,7 @@ packages:
       espree: 9.6.1
       esquery: 1.5.0
       lodash: 4.17.21
-      semver: 7.6.0
+      semver: 7.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -23482,7 +23378,7 @@ packages:
       '@intlify/core-base': 9.2.2
       '@intlify/shared': 9.2.2
       '@intlify/vue-devtools': 9.2.2
-      '@vue/devtools-api': 6.6.1
+      '@vue/devtools-api': 6.5.1
       vue: 3.3.9(typescript@4.9.3)
     dev: false
 
@@ -23494,7 +23390,7 @@ packages:
     dependencies:
       '@intlify/core-base': 9.8.0
       '@intlify/shared': 9.8.0
-      '@vue/devtools-api': 6.6.1
+      '@vue/devtools-api': 6.5.1
       vue: 3.3.9(typescript@5.3.2)
 
   /vue-pdf-embed@1.2.1(vue@3.3.9):
@@ -23510,7 +23406,7 @@ packages:
     peerDependencies:
       vue: 3.3.9
     dependencies:
-      '@vue/devtools-api': 6.6.1
+      '@vue/devtools-api': 6.5.1
       vue: 3.3.9(typescript@4.9.3)
 
   /vue-router@4.2.5(vue@3.3.9):
@@ -23518,7 +23414,7 @@ packages:
     peerDependencies:
       vue: 3.3.9
     dependencies:
-      '@vue/devtools-api': 6.6.1
+      '@vue/devtools-api': 6.5.1
       vue: 3.3.9(typescript@5.3.2)
 
   /vue-template-compiler@2.7.14:
@@ -23564,7 +23460,7 @@ packages:
     dependencies:
       '@volar/typescript': 1.11.1
       '@vue/language-core': 1.8.24(typescript@5.3.2)
-      semver: 7.6.0
+      semver: 7.5.4
       typescript: 5.3.2
     dev: true
 
@@ -23576,7 +23472,7 @@ packages:
     dependencies:
       '@vue/language-core': 1.8.8(typescript@4.9.5)
       '@vue/typescript': 1.8.8(typescript@4.9.5)
-      semver: 7.6.0
+      semver: 7.5.4
       typescript: 4.9.5
     dev: true
 
@@ -23761,9 +23657,9 @@ packages:
       '@webassemblyjs/wasm-parser': 1.11.6
       acorn: 8.11.3
       acorn-import-assertions: 1.9.0(acorn@8.11.3)
-      browserslist: 4.23.0
+      browserslist: 4.22.3
       chrome-trace-event: 1.0.3
-      enhanced-resolve: 5.15.1
+      enhanced-resolve: 5.15.0
       es-module-lexer: 1.4.1
       eslint-scope: 5.1.1
       events: 3.3.0
@@ -23784,8 +23680,8 @@ packages:
       - uglify-js
     dev: true
 
-  /webpack@5.90.3:
-    resolution: {integrity: sha512-h6uDYlWCctQRuXBs1oYpVe6sFcWedl0dpcVaTf/YF67J9bKvwJajFulMVSYKHrksMB3I/pIagRzDxwxkebuzKA==}
+  /webpack@5.90.0:
+    resolution: {integrity: sha512-bdmyXRCXeeNIePv6R6tGPyy20aUobw4Zy8r0LUS2EWO+U+Ke/gYDgsCh7bl5rB6jPpr4r0SZa6dPxBxLooDT3w==}
     engines: {node: '>=10.13.0'}
     hasBin: true
     peerDependencies:
@@ -23801,9 +23697,9 @@ packages:
       '@webassemblyjs/wasm-parser': 1.11.6
       acorn: 8.11.3
       acorn-import-assertions: 1.9.0(acorn@8.11.3)
-      browserslist: 4.23.0
+      browserslist: 4.22.3
       chrome-trace-event: 1.0.3
-      enhanced-resolve: 5.15.1
+      enhanced-resolve: 5.15.0
       es-module-lexer: 1.4.1
       eslint-scope: 5.1.1
       events: 3.3.0
@@ -23815,7 +23711,7 @@ packages:
       neo-async: 2.6.2
       schema-utils: 3.3.0
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.10(webpack@5.90.3)
+      terser-webpack-plugin: 5.3.10(webpack@5.90.0)
       watchpack: 2.4.0
       webpack-sources: 3.2.3
     transitivePeerDependencies:
@@ -23896,15 +23792,15 @@ packages:
     resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==}
     dev: true
 
-  /which-typed-array@1.1.14:
-    resolution: {integrity: sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==}
+  /which-typed-array@1.1.13:
+    resolution: {integrity: sha512-P5Nra0qjSncduVPEAr7xhoF5guty49ArDTwzJ/yNuPIbZppyRxFQsRCWrocxIY+CnMVG+qfbU2FmDKyvSGClow==}
     engines: {node: '>= 0.4'}
     dependencies:
-      available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
+      available-typed-arrays: 1.0.5
+      call-bind: 1.0.5
       for-each: 0.3.3
       gopd: 1.0.1
-      has-tostringtag: 1.0.2
+      has-tostringtag: 1.0.0
 
   /which@1.3.1:
     resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
@@ -23945,8 +23841,8 @@ packages:
     engines: {node: '>= 10.0.0'}
     requiresBuild: true
     dependencies:
-      '@babel/parser': 7.24.0
-      '@babel/types': 7.24.0
+      '@babel/parser': 7.23.9
+      '@babel/types': 7.23.9
       assert-never: 1.2.1
       babel-walk: 3.0.0-canary-5
 
@@ -23993,10 +23889,10 @@ packages:
     engines: {node: '>=10.0.0'}
     dependencies:
       '@apideck/better-ajv-errors': 0.3.6(ajv@8.12.0)
-      '@babel/core': 7.24.0
-      '@babel/preset-env': 7.24.0(@babel/core@7.24.0)
-      '@babel/runtime': 7.24.0
-      '@rollup/plugin-babel': 5.3.1(@babel/core@7.24.0)(rollup@2.79.1)
+      '@babel/core': 7.23.9
+      '@babel/preset-env': 7.23.9(@babel/core@7.23.9)
+      '@babel/runtime': 7.23.9
+      '@rollup/plugin-babel': 5.3.1(@babel/core@7.23.9)(rollup@2.79.1)
       '@rollup/plugin-node-resolve': 11.2.1(rollup@2.79.1)
       '@rollup/plugin-replace': 2.4.2(rollup@2.79.1)
       '@surma/rollup-plugin-off-main-thread': 2.2.3
@@ -24039,10 +23935,10 @@ packages:
     engines: {node: '>=16.0.0'}
     dependencies:
       '@apideck/better-ajv-errors': 0.3.6(ajv@8.12.0)
-      '@babel/core': 7.24.0
-      '@babel/preset-env': 7.24.0(@babel/core@7.24.0)
-      '@babel/runtime': 7.24.0
-      '@rollup/plugin-babel': 5.3.1(@babel/core@7.24.0)(rollup@2.79.1)
+      '@babel/core': 7.23.9
+      '@babel/preset-env': 7.23.9(@babel/core@7.23.9)
+      '@babel/runtime': 7.23.9
+      '@rollup/plugin-babel': 5.3.1(@babel/core@7.23.9)(rollup@2.79.1)
       '@rollup/plugin-node-resolve': 11.2.1(rollup@2.79.1)
       '@rollup/plugin-replace': 2.4.2(rollup@2.79.1)
       '@surma/rollup-plugin-off-main-thread': 2.2.3

From 88bb01cb67013506bd58af86bd368bd8d447e5cd Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 7 Mar 2024 19:37:56 +0530
Subject: [PATCH 46/60] refactor: removed Users Table

---
 .../src/components/users/Table.vue            | 286 ------------------
 1 file changed, 286 deletions(-)
 delete mode 100644 packages/hoppscotch-sh-admin/src/components/users/Table.vue

diff --git a/packages/hoppscotch-sh-admin/src/components/users/Table.vue b/packages/hoppscotch-sh-admin/src/components/users/Table.vue
deleted file mode 100644
index 401e473b61..0000000000
--- a/packages/hoppscotch-sh-admin/src/components/users/Table.vue
+++ /dev/null
@@ -1,286 +0,0 @@
-<template>
-  <div class="flex flex-1 flex-col">
-    <div v-if="pagination" class="mb-3 flex items-center justify-end">
-      <HoppButtonSecondary
-        outline
-        filled
-        :icon="IconLeft"
-        :disabled="page === 1"
-        @click="changePage(PageDirection.Previous)"
-      />
-
-      <span class="flex h-full w-10 items-center justify-center">{{
-        page
-      }}</span>
-
-      <HoppButtonSecondary
-        outline
-        filled
-        :icon="IconRight"
-        :disabled="page === pagination.totalPages"
-        @click="changePage(PageDirection.Next)"
-      />
-    </div>
-
-    <div class="overflow-auto rounded-md border border-dividerDark shadow-md">
-      <!-- An Extension Slot to extend the table functionality such as search   -->
-      <slot name="extension"></slot>
-
-      <table class="w-full table-fixed">
-        <thead>
-          <tr
-            class="border-b border-dividerDark bg-primaryLight text-left text-sm text-secondary"
-          >
-            <th v-if="selectedRows" class="w-24">
-              <input
-                ref="selectAllCheckbox"
-                type="checkbox"
-                :checked="areAllRowsSelected"
-                :disabled="loading"
-                class="flex h-full w-full items-center justify-center"
-                @click.stop="toggleAllRows"
-              />
-            </th>
-            <slot name="head">
-              <th
-                v-for="th in headings"
-                :key="th.key"
-                scope="col"
-                class="px-6 py-3"
-              >
-                {{ th.label ?? th.key }}
-              </th>
-            </slot>
-          </tr>
-        </thead>
-
-        <tbody class="divide-y divide-divider">
-          <tr v-if="loading">
-            <slot name="loading-state">
-              <td :colspan="columnSpan">
-                <div class="mx-auto my-3 h-5 w-5 text-center">
-                  <HoppSmartSpinner />
-                </div>
-              </td>
-            </slot>
-          </tr>
-
-          <tr v-else-if="!list.length">
-            <slot name="empty-state">
-              <td :colspan="columnSpan" class="py-3 text-center">
-                <p>No data available</p>
-              </td>
-            </slot>
-          </tr>
-
-          <template v-else>
-            <tr
-              v-for="(rowData, rowIndex) in workingList"
-              :key="rowIndex"
-              class="rounded-xl text-secondaryDark hover:cursor-pointer hover:bg-divider"
-              :class="{ 'divide-x divide-divider': showYBorder }"
-              @click="onRowClicked(rowData)"
-            >
-              <td v-if="selectedRows">
-                <input
-                  type="checkbox"
-                  :checked="isRowSelected(rowData)"
-                  class="flex h-full w-full items-center justify-center"
-                  @click.stop="toggleRow(rowData)"
-                />
-              </td>
-              <slot name="body" :row="rowData">
-                <td
-                  v-for="cellHeading in headings"
-                  :key="cellHeading.key"
-                  class="px-4 py-2"
-                  @click="!cellHeading.preventClick && onRowClicked(rowData)"
-                >
-                  <!-- Dynamic column slot -->
-                  <slot :name="cellHeading.key" :item="rowData">
-                    <!-- Generic implementation of the column -->
-                    <div class="flex flex-col truncate">
-                      <span class="truncate">
-                        {{ rowData[cellHeading.key] ?? '-' }}
-                      </span>
-                    </div>
-                  </slot>
-                </td>
-              </slot>
-            </tr>
-          </template>
-        </tbody>
-      </table>
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { useVModel } from '@vueuse/core';
-import { isEqual } from 'lodash-es';
-import { computed, ref, watch } from 'vue';
-
-import IconLeft from '~icons/lucide/arrow-left';
-import IconRight from '~icons/lucide/arrow-right';
-
-export type CellHeading = {
-  key: string;
-  label?: string;
-  preventClick?: boolean;
-};
-
-export type Item = Record<string, unknown>;
-
-const props = withDefaults(
-  defineProps<{
-    /** Whether to show the vertical border between columns */
-    showYBorder?: boolean;
-    /**  The list of items to be displayed in the table */
-    list: Item[];
-    /** The headings of the table */
-    headings?: CellHeading[];
-
-    selectedRows?: Item[];
-    /** Whether to enable sorting */
-    sort?: {
-      /** The key to sort the list by */
-      key: string;
-      direction: Direction;
-    };
-
-    /** Whether to enable pagination */
-    pagination?: {
-      totalPages: number;
-    };
-
-    /** Whether to show a loading spinner */
-    loading?: boolean;
-  }>(),
-  {
-    showYBorder: false,
-    sort: undefined,
-    selectedRows: undefined,
-    loading: false,
-  }
-);
-
-const emit = defineEmits<{
-  (event: 'onRowClicked', item: Item): void;
-  (event: 'update:list', list: Item[]): void;
-  (event: 'update:selectedRows', selectedRows: Item[]): void;
-  (event: 'pageNumber', page: number): void;
-}>();
-
-// Pagination functionality
-const page = ref(1);
-
-enum PageDirection {
-  Previous,
-  Next,
-}
-
-const changePage = (direction: PageDirection) => {
-  const isPrevious = direction === PageDirection.Previous;
-
-  const isValidPreviousAction = isPrevious && page.value > 1;
-  const isValidNextAction =
-    !isPrevious && page.value < props.pagination!.totalPages;
-
-  if (isValidNextAction || isValidPreviousAction) {
-    page.value += isPrevious ? -1 : 1;
-
-    emit('pageNumber', page.value);
-  }
-};
-
-// The working version of the list that is used to perform operations upon
-const workingList = useVModel(props, 'list', emit);
-
-// Checkbox functionality
-const selectedRows = useVModel(props, 'selectedRows', emit);
-
-watch(workingList.value, (updatedList) => {
-  if (props.selectedRows) {
-    updatedList = updatedList.map((item) => ({
-      ...item,
-      selected: false,
-    }));
-  }
-});
-
-const onRowClicked = (item: Item) => emit('onRowClicked', item);
-
-const isRowSelected = (item: Item) => {
-  const { selected, ...data } = item;
-  return selectedRows.value?.some((row) => isEqual(row, data));
-};
-
-const toggleRow = (item: Item) => {
-  item.selected = !item.selected;
-  const { selected, ...data } = item;
-
-  const index =
-    selectedRows.value?.findIndex((row) => isEqual(row, data)) ?? -1;
-
-  if (item.selected && !isRowSelected(data)) {
-    selectedRows.value!.push(data);
-  } else if (index !== -1) {
-    selectedRows.value?.splice(index, 1);
-  }
-};
-
-const selectAllCheckbox = ref<HTMLInputElement | null>(null);
-
-const toggleAllRows = () => {
-  const isChecked = selectAllCheckbox.value?.checked;
-  workingList.value.forEach((item) => {
-    item.selected = isChecked;
-    const { selected, ...data } = item;
-    if (isChecked) {
-      if (!isRowSelected(item)) {
-        selectedRows.value!.push(data);
-      }
-      return;
-    }
-    const index =
-      selectedRows.value?.findIndex((row) => isEqual(row, data)) ?? -1;
-    selectedRows.value!.splice(index, 1);
-  });
-};
-
-const areAllRowsSelected = computed(() => {
-  if (workingList.value.length === 0 || selectedRows.value?.length === 0)
-    return false;
-  return workingList.value.every((item) => {
-    const { selected, ...data } = item;
-    return selectedRows.value?.some((row) => isEqual(row, data));
-  });
-});
-
-// Sort List by key and direction which can set to ascending or descending
-export type Direction = 'ascending' | 'descending';
-
-const sortList = (key: string, direction: Direction) => {
-  workingList.value.sort((a, b) => {
-    const valueA = a[key] as string;
-    const valueB = b[key] as string;
-    return direction === 'ascending'
-      ? valueA.localeCompare(valueB)
-      : valueB.localeCompare(valueA);
-  });
-};
-
-watch(
-  () => props.sort?.direction,
-  () => {
-    if (props.sort) {
-      sortList(props.sort.key, props.sort.direction);
-    }
-  },
-  { immediate: true }
-);
-
-const columnSpan = computed(
-  () => (props.headings?.length ?? 0) + (props.selectedRows ? 1 : 0)
-);
-</script>

From acd9739647d7162f48224912cb7951c724705f05 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 7 Mar 2024 19:38:50 +0530
Subject: [PATCH 47/60] refactor: improvements to paged query

---
 .../src/composables/usePagedQuery.ts          | 39 +++++++++++--------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/composables/usePagedQuery.ts b/packages/hoppscotch-sh-admin/src/composables/usePagedQuery.ts
index 67665529fa..2304df407d 100644
--- a/packages/hoppscotch-sh-admin/src/composables/usePagedQuery.ts
+++ b/packages/hoppscotch-sh-admin/src/composables/usePagedQuery.ts
@@ -1,4 +1,4 @@
-import { Ref, onMounted, ref } from 'vue';
+import { onMounted, ref, Ref } from 'vue';
 import { DocumentNode } from 'graphql';
 import { TypedDocumentNode, useClientHandle } from '@urql/vue';
 
@@ -9,9 +9,9 @@ export function usePagedQuery<
 >(
   query: string | TypedDocumentNode<Result, Vars> | DocumentNode,
   getList: (result: Result) => ListItem[],
-  getCursor: (value: ListItem) => string,
   itemsPerPage: number,
-  variables: Vars
+  variables: Vars,
+  getCursor?: (value: ListItem) => string
 ) {
   const { client } = useClientHandle();
   const fetching = ref(true);
@@ -20,21 +20,23 @@ export function usePagedQuery<
   const currentPage = ref(0);
   const hasNextPage = ref(true);
 
-  const fetchNextPage = async () => {
+  const fetchNextPage = async (additionalVariables?: Vars) => {
     fetching.value = true;
 
-    const cursor =
-      list.value.length > 0 ? getCursor(list.value.at(-1)!) : undefined;
-    const variablesForPagination = {
-      ...variables,
-      take: itemsPerPage,
-      cursor,
-    };
-
-    const result = await client
-      .query(query, variablesForPagination)
-      .toPromise();
+    // Cursor based pagination
+    if (getCursor) {
+      const cursor =
+        list.value.length > 0
+          ? getCursor(list.value.at(-1) as ListItem)
+          : undefined;
+      variables = { ...variables, cursor };
+    }
+    // Offset based pagination
+    else if (additionalVariables) {
+      variables = { ...variables, ...additionalVariables };
+    }
 
+    const result = await client.query(query, { ...variables }).toPromise();
     if (result.error) {
       error.value = true;
       fetching.value = false;
@@ -63,11 +65,14 @@ export function usePagedQuery<
     }
   };
 
-  const refetch = async () => {
+  const refetch = async (variables?: Vars) => {
     currentPage.value = 0;
     hasNextPage.value = true;
     list.value = [];
-    await fetchNextPage();
+
+    if (hasNextPage.value) {
+      variables ? await fetchNextPage(variables) : await fetchNextPage();
+    }
   };
 
   return {

From 9f0d1a2a7065b506c5ebb1cb501df836be80f237 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 7 Mar 2024 19:41:22 +0530
Subject: [PATCH 48/60] refactor: replaced users table with HoppSmartTable

---
 .../src/components/users/SharedRequests.vue                   | 4 ++--
 packages/hoppscotch-sh-admin/src/pages/teams/index.vue        | 4 ++--
 packages/hoppscotch-sh-admin/src/pages/users/index.vue        | 4 ++--
 packages/hoppscotch-sh-admin/src/pages/users/invited.vue      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue b/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
index 4d3bb0407f..6b2700230d 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
@@ -10,7 +10,7 @@
       {{ t('users.no_shared_requests') }}
     </div>
 
-    <UsersTable v-else :headings="headings" :list="sharedRequests">
+    <HoppSmartTable v-else :headings="headings" :list="sharedRequests">
       <template #head>
         <th class="px-6 py-2">{{ t('shared_requests.id') }}</th>
         <th class="px-6 py-2 w-30">{{ t('shared_requests.url') }}</th>
@@ -64,7 +64,7 @@
           />
         </td>
       </template>
-    </UsersTable>
+    </HoppSmartTable>
 
     <!-- Pagination -->
     <div
diff --git a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
index 8ca5349552..8a0edc36bf 100644
--- a/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/teams/index.vue
@@ -18,7 +18,7 @@
 
         <div v-else-if="error">{{ t('teams.load_list_error') }}</div>
 
-        <UsersTable
+        <HoppSmartTable
           v-else-if="teamsList.length"
           :headings="headings"
           :list="teamsList"
@@ -82,7 +82,7 @@
               </div>
             </td>
           </template>
-        </UsersTable>
+        </HoppSmartTable>
 
         <div v-else class="px-2">
           {{ t('teams.no_teams') }}
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index e41561406d..6f7296f8f1 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -23,7 +23,7 @@
       <div class="overflow-x-auto">
         <div v-if="error">{{ t('users.load_list_error') }}</div>
 
-        <UsersTable
+        <HoppSmartTable
           v-else-if="usersList"
           :headings="headings"
           :list="usersList"
@@ -141,7 +141,7 @@
               </div>
             </td>
           </template>
-        </UsersTable>
+        </HoppSmartTable>
 
         <!-- Actions for Selected Rows -->
         <div
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
index 4a3d1835d7..526dd2db22 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
@@ -24,7 +24,7 @@
           {{ t('users.no_invite') }}
         </div>
 
-        <UsersTable
+        <HoppSmartTable
           v-else
           :headings="headings"
           :list="pendingInvites"
@@ -61,7 +61,7 @@
               />
             </div>
           </template>
-        </UsersTable>
+        </HoppSmartTable>
 
         <div
           v-if="selectedRows.length"

From cfd57e5fe4b772462c7ec44b17b8a6af1137a26e Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Fri, 8 Mar 2024 09:18:34 +0530
Subject: [PATCH 49/60] chore: component fixes

---
 .../hoppscotch-common/src/components.d.ts     | 416 +++++++++---------
 1 file changed, 208 insertions(+), 208 deletions(-)

diff --git a/packages/hoppscotch-common/src/components.d.ts b/packages/hoppscotch-common/src/components.d.ts
index df8e8a8fa7..20783de26a 100644
--- a/packages/hoppscotch-common/src/components.d.ts
+++ b/packages/hoppscotch-common/src/components.d.ts
@@ -1,214 +1,214 @@
-/* eslint-disable */
-/* prettier-ignore */
-// @ts-nocheck
-// Generated by unplugin-vue-components
+// generated by unplugin-vue-components
+// We suggest you to commit this file into source control
 // Read more: https://github.com/vuejs/core/pull/3399
+import "@vue/runtime-core"
+
 export {}
 
-declare module 'vue' {
+declare module "@vue/runtime-core" {
   export interface GlobalComponents {
-    AppActionHandler: typeof import('./components/app/ActionHandler.vue')['default']
-    AppBanner: typeof import('./components/app/Banner.vue')['default']
-    AppContextMenu: typeof import('./components/app/ContextMenu.vue')['default']
-    AppDeveloperOptions: typeof import('./components/app/DeveloperOptions.vue')['default']
-    AppFooter: typeof import('./components/app/Footer.vue')['default']
-    AppGitHubStarButton: typeof import('./components/app/GitHubStarButton.vue')['default']
-    AppHeader: typeof import('./components/app/Header.vue')['default']
-    AppInspection: typeof import('./components/app/Inspection.vue')['default']
-    AppInterceptor: typeof import('./components/app/Interceptor.vue')['default']
-    AppLogo: typeof import('./components/app/Logo.vue')['default']
-    AppOptions: typeof import('./components/app/Options.vue')['default']
-    AppPaneLayout: typeof import('./components/app/PaneLayout.vue')['default']
-    AppShare: typeof import('./components/app/Share.vue')['default']
-    AppShortcuts: typeof import('./components/app/Shortcuts.vue')['default']
-    AppShortcutsEntry: typeof import('./components/app/ShortcutsEntry.vue')['default']
-    AppShortcutsPrompt: typeof import('./components/app/ShortcutsPrompt.vue')['default']
-    AppSidenav: typeof import('./components/app/Sidenav.vue')['default']
-    AppSpotlight: typeof import('./components/app/spotlight/index.vue')['default']
-    AppSpotlightEntry: typeof import('./components/app/spotlight/Entry.vue')['default']
-    AppSpotlightEntryGQLHistory: typeof import('./components/app/spotlight/entry/GQLHistory.vue')['default']
-    AppSpotlightEntryGQLRequest: typeof import('./components/app/spotlight/entry/GQLRequest.vue')['default']
-    AppSpotlightEntryIconSelected: typeof import('./components/app/spotlight/entry/IconSelected.vue')['default']
-    AppSpotlightEntryRESTHistory: typeof import('./components/app/spotlight/entry/RESTHistory.vue')['default']
-    AppSpotlightEntryRESTRequest: typeof import('./components/app/spotlight/entry/RESTRequest.vue')['default']
-    AppSupport: typeof import('./components/app/Support.vue')['default']
-    Collections: typeof import('./components/collections/index.vue')['default']
-    CollectionsAdd: typeof import('./components/collections/Add.vue')['default']
-    CollectionsAddFolder: typeof import('./components/collections/AddFolder.vue')['default']
-    CollectionsAddRequest: typeof import('./components/collections/AddRequest.vue')['default']
-    CollectionsCollection: typeof import('./components/collections/Collection.vue')['default']
-    CollectionsEdit: typeof import('./components/collections/Edit.vue')['default']
-    CollectionsEditFolder: typeof import('./components/collections/EditFolder.vue')['default']
-    CollectionsEditRequest: typeof import('./components/collections/EditRequest.vue')['default']
-    CollectionsGraphql: typeof import('./components/collections/graphql/index.vue')['default']
-    CollectionsGraphqlAdd: typeof import('./components/collections/graphql/Add.vue')['default']
-    CollectionsGraphqlAddFolder: typeof import('./components/collections/graphql/AddFolder.vue')['default']
-    CollectionsGraphqlAddRequest: typeof import('./components/collections/graphql/AddRequest.vue')['default']
-    CollectionsGraphqlCollection: typeof import('./components/collections/graphql/Collection.vue')['default']
-    CollectionsGraphqlEdit: typeof import('./components/collections/graphql/Edit.vue')['default']
-    CollectionsGraphqlEditFolder: typeof import('./components/collections/graphql/EditFolder.vue')['default']
-    CollectionsGraphqlEditRequest: typeof import('./components/collections/graphql/EditRequest.vue')['default']
-    CollectionsGraphqlFolder: typeof import('./components/collections/graphql/Folder.vue')['default']
-    CollectionsGraphqlImportExport: typeof import('./components/collections/graphql/ImportExport.vue')['default']
-    CollectionsGraphqlRequest: typeof import('./components/collections/graphql/Request.vue')['default']
-    CollectionsImportExport: typeof import('./components/collections/ImportExport.vue')['default']
-    CollectionsMyCollections: typeof import('./components/collections/MyCollections.vue')['default']
-    CollectionsProperties: typeof import('./components/collections/Properties.vue')['default']
-    CollectionsRequest: typeof import('./components/collections/Request.vue')['default']
-    CollectionsSaveRequest: typeof import('./components/collections/SaveRequest.vue')['default']
-    CollectionsTeamCollections: typeof import('./components/collections/TeamCollections.vue')['default']
-    CookiesAllModal: typeof import('./components/cookies/AllModal.vue')['default']
-    CookiesEditCookie: typeof import('./components/cookies/EditCookie.vue')['default']
-    Embeds: typeof import('./components/embeds/index.vue')['default']
-    Environments: typeof import('./components/environments/index.vue')['default']
-    EnvironmentsAdd: typeof import('./components/environments/Add.vue')['default']
-    EnvironmentsImportExport: typeof import('./components/environments/ImportExport.vue')['default']
-    EnvironmentsMy: typeof import('./components/environments/my/index.vue')['default']
-    EnvironmentsMyDetails: typeof import('./components/environments/my/Details.vue')['default']
-    EnvironmentsMyEnvironment: typeof import('./components/environments/my/Environment.vue')['default']
-    EnvironmentsSelector: typeof import('./components/environments/Selector.vue')['default']
-    EnvironmentsTeams: typeof import('./components/environments/teams/index.vue')['default']
-    EnvironmentsTeamsDetails: typeof import('./components/environments/teams/Details.vue')['default']
-    EnvironmentsTeamsEnvironment: typeof import('./components/environments/teams/Environment.vue')['default']
-    FirebaseLogin: typeof import('./components/firebase/Login.vue')['default']
-    FirebaseLogout: typeof import('./components/firebase/Logout.vue')['default']
-    GraphqlAuthorization: typeof import('./components/graphql/Authorization.vue')['default']
-    GraphqlField: typeof import('./components/graphql/Field.vue')['default']
-    GraphqlHeaders: typeof import('./components/graphql/Headers.vue')['default']
-    GraphqlQuery: typeof import('./components/graphql/Query.vue')['default']
-    GraphqlRequest: typeof import('./components/graphql/Request.vue')['default']
-    GraphqlRequestOptions: typeof import('./components/graphql/RequestOptions.vue')['default']
-    GraphqlRequestTab: typeof import('./components/graphql/RequestTab.vue')['default']
-    GraphqlResponse: typeof import('./components/graphql/Response.vue')['default']
-    GraphqlSidebar: typeof import('./components/graphql/Sidebar.vue')['default']
-    GraphqlSubscriptionLog: typeof import('./components/graphql/SubscriptionLog.vue')['default']
-    GraphqlTabHead: typeof import('./components/graphql/TabHead.vue')['default']
-    GraphqlType: typeof import('./components/graphql/Type.vue')['default']
-    GraphqlTypeLink: typeof import('./components/graphql/TypeLink.vue')['default']
-    GraphqlVariable: typeof import('./components/graphql/Variable.vue')['default']
-    History: typeof import('./components/history/index.vue')['default']
-    HistoryGraphqlCard: typeof import('./components/history/graphql/Card.vue')['default']
-    HistoryRestCard: typeof import('./components/history/rest/Card.vue')['default']
-    HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary']
-    HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary']
-    HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor']
-    HoppSmartCheckbox: typeof import('@hoppscotch/ui')['HoppSmartCheckbox']
-    HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal']
-    HoppSmartExpand: typeof import('@hoppscotch/ui')['HoppSmartExpand']
-    HoppSmartFileChip: typeof import('@hoppscotch/ui')['HoppSmartFileChip']
-    HoppSmartInput: typeof import('@hoppscotch/ui')['HoppSmartInput']
-    HoppSmartIntersection: typeof import('@hoppscotch/ui')['HoppSmartIntersection']
-    HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem']
-    HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink']
-    HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal']
-    HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture']
-    HoppSmartPlaceholder: typeof import('@hoppscotch/ui')['HoppSmartPlaceholder']
-    HoppSmartProgressRing: typeof import('@hoppscotch/ui')['HoppSmartProgressRing']
-    HoppSmartRadio: typeof import('@hoppscotch/ui')['HoppSmartRadio']
-    HoppSmartRadioGroup: typeof import('@hoppscotch/ui')['HoppSmartRadioGroup']
-    HoppSmartSelectWrapper: typeof import('@hoppscotch/ui')['HoppSmartSelectWrapper']
-    HoppSmartSlideOver: typeof import('@hoppscotch/ui')['HoppSmartSlideOver']
-    HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner']
-    HoppSmartTab: typeof import('@hoppscotch/ui')['HoppSmartTab']
-    HoppSmartTabs: typeof import('@hoppscotch/ui')['HoppSmartTabs']
-    HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle']
-    HoppSmartTree: typeof import('@hoppscotch/ui')['HoppSmartTree']
-    HoppSmartWindow: typeof import('@hoppscotch/ui')['HoppSmartWindow']
-    HoppSmartWindows: typeof import('@hoppscotch/ui')['HoppSmartWindows']
-    HttpAuthorization: typeof import('./components/http/Authorization.vue')['default']
-    HttpAuthorizationApiKey: typeof import('./components/http/authorization/ApiKey.vue')['default']
-    HttpAuthorizationBasic: typeof import('./components/http/authorization/Basic.vue')['default']
-    HttpBody: typeof import('./components/http/Body.vue')['default']
-    HttpBodyParameters: typeof import('./components/http/BodyParameters.vue')['default']
-    HttpCodegenModal: typeof import('./components/http/CodegenModal.vue')['default']
-    HttpHeaders: typeof import('./components/http/Headers.vue')['default']
-    HttpImportCurl: typeof import('./components/http/ImportCurl.vue')['default']
-    HttpOAuth2Authorization: typeof import('./components/http/OAuth2Authorization.vue')['default']
-    HttpParameters: typeof import('./components/http/Parameters.vue')['default']
-    HttpPreRequestScript: typeof import('./components/http/PreRequestScript.vue')['default']
-    HttpRawBody: typeof import('./components/http/RawBody.vue')['default']
-    HttpReqChangeConfirmModal: typeof import('./components/http/ReqChangeConfirmModal.vue')['default']
-    HttpRequest: typeof import('./components/http/Request.vue')['default']
-    HttpRequestOptions: typeof import('./components/http/RequestOptions.vue')['default']
-    HttpRequestTab: typeof import('./components/http/RequestTab.vue')['default']
-    HttpResponse: typeof import('./components/http/Response.vue')['default']
-    HttpResponseMeta: typeof import('./components/http/ResponseMeta.vue')['default']
-    HttpSidebar: typeof import('./components/http/Sidebar.vue')['default']
-    HttpTabHead: typeof import('./components/http/TabHead.vue')['default']
-    HttpTestResult: typeof import('./components/http/TestResult.vue')['default']
-    HttpTestResultEntry: typeof import('./components/http/TestResultEntry.vue')['default']
-    HttpTestResultEnv: typeof import('./components/http/TestResultEnv.vue')['default']
-    HttpTestResultReport: typeof import('./components/http/TestResultReport.vue')['default']
-    HttpTests: typeof import('./components/http/Tests.vue')['default']
-    HttpURLEncodedParams: typeof import('./components/http/URLEncodedParams.vue')['default']
-    IconLucideActivity: typeof import('~icons/lucide/activity')['default']
-    IconLucideAlertTriangle: typeof import('~icons/lucide/alert-triangle')['default']
-    IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default']
-    IconLucideArrowUpRight: typeof import('~icons/lucide/arrow-up-right')['default']
-    IconLucideBrush: typeof import('~icons/lucide/brush')['default']
-    IconLucideCheckCircle: typeof import('~icons/lucide/check-circle')['default']
-    IconLucideChevronRight: typeof import('~icons/lucide/chevron-right')['default']
-    IconLucideGlobe: typeof import('~icons/lucide/globe')['default']
-    IconLucideHelpCircle: typeof import('~icons/lucide/help-circle')['default']
-    IconLucideInbox: typeof import('~icons/lucide/inbox')['default']
-    IconLucideInfo: typeof import('~icons/lucide/info')['default']
-    IconLucideLayers: typeof import('~icons/lucide/layers')['default']
-    IconLucideListEnd: typeof import('~icons/lucide/list-end')['default']
-    IconLucideMinus: typeof import('~icons/lucide/minus')['default']
-    IconLucideRss: typeof import('~icons/lucide/rss')['default']
-    IconLucideSearch: typeof import('~icons/lucide/search')['default']
-    IconLucideUsers: typeof import('~icons/lucide/users')['default']
-    IconLucideX: typeof import('~icons/lucide/x')['default']
-    ImportExportBase: typeof import('./components/importExport/Base.vue')['default']
-    ImportExportImportExportList: typeof import('./components/importExport/ImportExportList.vue')['default']
-    ImportExportImportExportSourcesList: typeof import('./components/importExport/ImportExportSourcesList.vue')['default']
-    ImportExportImportExportStepsFileImport: typeof import('./components/importExport/ImportExportSteps/FileImport.vue')['default']
-    ImportExportImportExportStepsMyCollectionImport: typeof import('./components/importExport/ImportExportSteps/MyCollectionImport.vue')['default']
-    ImportExportImportExportStepsUrlImport: typeof import('./components/importExport/ImportExportSteps/UrlImport.vue')['default']
-    InterceptorsErrorPlaceholder: typeof import('./components/interceptors/ErrorPlaceholder.vue')['default']
-    InterceptorsExtensionSubtitle: typeof import('./components/interceptors/ExtensionSubtitle.vue')['default']
-    LensesHeadersRenderer: typeof import('./components/lenses/HeadersRenderer.vue')['default']
-    LensesHeadersRendererEntry: typeof import('./components/lenses/HeadersRendererEntry.vue')['default']
-    LensesRenderersAudioLensRenderer: typeof import('./components/lenses/renderers/AudioLensRenderer.vue')['default']
-    LensesRenderersHTMLLensRenderer: typeof import('./components/lenses/renderers/HTMLLensRenderer.vue')['default']
-    LensesRenderersImageLensRenderer: typeof import('./components/lenses/renderers/ImageLensRenderer.vue')['default']
-    LensesRenderersJSONLensRenderer: typeof import('./components/lenses/renderers/JSONLensRenderer.vue')['default']
-    LensesRenderersPDFLensRenderer: typeof import('./components/lenses/renderers/PDFLensRenderer.vue')['default']
-    LensesRenderersRawLensRenderer: typeof import('./components/lenses/renderers/RawLensRenderer.vue')['default']
-    LensesRenderersVideoLensRenderer: typeof import('./components/lenses/renderers/VideoLensRenderer.vue')['default']
-    LensesRenderersXMLLensRenderer: typeof import('./components/lenses/renderers/XMLLensRenderer.vue')['default']
-    LensesResponseBodyRenderer: typeof import('./components/lenses/ResponseBodyRenderer.vue')['default']
-    ProfileUserDelete: typeof import('./components/profile/UserDelete.vue')['default']
-    RealtimeCommunication: typeof import('./components/realtime/Communication.vue')['default']
-    RealtimeConnectionConfig: typeof import('./components/realtime/ConnectionConfig.vue')['default']
-    RealtimeLog: typeof import('./components/realtime/Log.vue')['default']
-    RealtimeLogEntry: typeof import('./components/realtime/LogEntry.vue')['default']
-    RealtimeSubscription: typeof import('./components/realtime/Subscription.vue')['default']
-    SettingsExtension: typeof import('./components/settings/Extension.vue')['default']
-    SettingsProxy: typeof import('./components/settings/Proxy.vue')['default']
-    Share: typeof import('./components/share/index.vue')['default']
-    ShareCreateModal: typeof import('./components/share/CreateModal.vue')['default']
-    ShareCustomizeModal: typeof import('./components/share/CustomizeModal.vue')['default']
-    ShareModal: typeof import('./components/share/Modal.vue')['default']
-    ShareRequest: typeof import('./components/share/Request.vue')['default']
-    ShareTemplatesButton: typeof import('./components/share/templates/Button.vue')['default']
-    ShareTemplatesEmbeds: typeof import('./components/share/templates/Embeds.vue')['default']
-    ShareTemplatesLink: typeof import('./components/share/templates/Link.vue')['default']
-    SmartAccentModePicker: typeof import('./components/smart/AccentModePicker.vue')['default']
-    SmartChangeLanguage: typeof import('./components/smart/ChangeLanguage.vue')['default']
-    SmartColorModePicker: typeof import('./components/smart/ColorModePicker.vue')['default']
-    SmartEnvInput: typeof import('./components/smart/EnvInput.vue')['default']
-    TabPrimary: typeof import('./components/tab/Primary.vue')['default']
-    TabSecondary: typeof import('./components/tab/Secondary.vue')['default']
-    Teams: typeof import('./components/teams/index.vue')['default']
-    TeamsAdd: typeof import('./components/teams/Add.vue')['default']
-    TeamsEdit: typeof import('./components/teams/Edit.vue')['default']
-    TeamsInvite: typeof import('./components/teams/Invite.vue')['default']
-    TeamsMemberStack: typeof import('./components/teams/MemberStack.vue')['default']
-    TeamsModal: typeof import('./components/teams/Modal.vue')['default']
-    TeamsTeam: typeof import('./components/teams/Team.vue')['default']
-    Tippy: typeof import('vue-tippy')['Tippy']
-    WorkspaceCurrent: typeof import('./components/workspace/Current.vue')['default']
-    WorkspaceSelector: typeof import('./components/workspace/Selector.vue')['default']
+    AppActionHandler: (typeof import("./components/app/ActionHandler.vue"))["default"]
+    AppBanner: (typeof import("./components/app/Banner.vue"))["default"]
+    AppContextMenu: (typeof import("./components/app/ContextMenu.vue"))["default"]
+    AppDeveloperOptions: (typeof import("./components/app/DeveloperOptions.vue"))["default"]
+    AppFooter: (typeof import("./components/app/Footer.vue"))["default"]
+    AppGitHubStarButton: (typeof import("./components/app/GitHubStarButton.vue"))["default"]
+    AppHeader: (typeof import("./components/app/Header.vue"))["default"]
+    AppInspection: (typeof import("./components/app/Inspection.vue"))["default"]
+    AppInterceptor: (typeof import("./components/app/Interceptor.vue"))["default"]
+    AppLogo: (typeof import("./components/app/Logo.vue"))["default"]
+    AppOptions: (typeof import("./components/app/Options.vue"))["default"]
+    AppPaneLayout: (typeof import("./components/app/PaneLayout.vue"))["default"]
+    AppShare: (typeof import("./components/app/Share.vue"))["default"]
+    AppShortcuts: (typeof import("./components/app/Shortcuts.vue"))["default"]
+    AppShortcutsEntry: (typeof import("./components/app/ShortcutsEntry.vue"))["default"]
+    AppShortcutsPrompt: (typeof import("./components/app/ShortcutsPrompt.vue"))["default"]
+    AppSidenav: (typeof import("./components/app/Sidenav.vue"))["default"]
+    AppSpotlight: (typeof import("./components/app/spotlight/index.vue"))["default"]
+    AppSpotlightEntry: (typeof import("./components/app/spotlight/Entry.vue"))["default"]
+    AppSpotlightEntryGQLHistory: (typeof import("./components/app/spotlight/entry/GQLHistory.vue"))["default"]
+    AppSpotlightEntryGQLRequest: (typeof import("./components/app/spotlight/entry/GQLRequest.vue"))["default"]
+    AppSpotlightEntryIconSelected: (typeof import("./components/app/spotlight/entry/IconSelected.vue"))["default"]
+    AppSpotlightEntryRESTHistory: (typeof import("./components/app/spotlight/entry/RESTHistory.vue"))["default"]
+    AppSpotlightEntryRESTRequest: (typeof import("./components/app/spotlight/entry/RESTRequest.vue"))["default"]
+    AppSupport: (typeof import("./components/app/Support.vue"))["default"]
+    Collections: (typeof import("./components/collections/index.vue"))["default"]
+    CollectionsAdd: (typeof import("./components/collections/Add.vue"))["default"]
+    CollectionsAddFolder: (typeof import("./components/collections/AddFolder.vue"))["default"]
+    CollectionsAddRequest: (typeof import("./components/collections/AddRequest.vue"))["default"]
+    CollectionsCollection: (typeof import("./components/collections/Collection.vue"))["default"]
+    CollectionsEdit: (typeof import("./components/collections/Edit.vue"))["default"]
+    CollectionsEditFolder: (typeof import("./components/collections/EditFolder.vue"))["default"]
+    CollectionsEditRequest: (typeof import("./components/collections/EditRequest.vue"))["default"]
+    CollectionsGraphql: (typeof import("./components/collections/graphql/index.vue"))["default"]
+    CollectionsGraphqlAdd: (typeof import("./components/collections/graphql/Add.vue"))["default"]
+    CollectionsGraphqlAddFolder: (typeof import("./components/collections/graphql/AddFolder.vue"))["default"]
+    CollectionsGraphqlAddRequest: (typeof import("./components/collections/graphql/AddRequest.vue"))["default"]
+    CollectionsGraphqlCollection: (typeof import("./components/collections/graphql/Collection.vue"))["default"]
+    CollectionsGraphqlEdit: (typeof import("./components/collections/graphql/Edit.vue"))["default"]
+    CollectionsGraphqlEditFolder: (typeof import("./components/collections/graphql/EditFolder.vue"))["default"]
+    CollectionsGraphqlEditRequest: (typeof import("./components/collections/graphql/EditRequest.vue"))["default"]
+    CollectionsGraphqlFolder: (typeof import("./components/collections/graphql/Folder.vue"))["default"]
+    CollectionsGraphqlImportExport: (typeof import("./components/collections/graphql/ImportExport.vue"))["default"]
+    CollectionsGraphqlRequest: (typeof import("./components/collections/graphql/Request.vue"))["default"]
+    CollectionsImportExport: (typeof import("./components/collections/ImportExport.vue"))["default"]
+    CollectionsMyCollections: (typeof import("./components/collections/MyCollections.vue"))["default"]
+    CollectionsProperties: (typeof import("./components/collections/Properties.vue"))["default"]
+    CollectionsRequest: (typeof import("./components/collections/Request.vue"))["default"]
+    CollectionsSaveRequest: (typeof import("./components/collections/SaveRequest.vue"))["default"]
+    CollectionsTeamCollections: (typeof import("./components/collections/TeamCollections.vue"))["default"]
+    CookiesAllModal: (typeof import("./components/cookies/AllModal.vue"))["default"]
+    CookiesEditCookie: (typeof import("./components/cookies/EditCookie.vue"))["default"]
+    Embeds: (typeof import("./components/embeds/index.vue"))["default"]
+    Environments: (typeof import("./components/environments/index.vue"))["default"]
+    EnvironmentsAdd: (typeof import("./components/environments/Add.vue"))["default"]
+    EnvironmentsImportExport: (typeof import("./components/environments/ImportExport.vue"))["default"]
+    EnvironmentsMy: (typeof import("./components/environments/my/index.vue"))["default"]
+    EnvironmentsMyDetails: (typeof import("./components/environments/my/Details.vue"))["default"]
+    EnvironmentsMyEnvironment: (typeof import("./components/environments/my/Environment.vue"))["default"]
+    EnvironmentsSelector: (typeof import("./components/environments/Selector.vue"))["default"]
+    EnvironmentsTeams: (typeof import("./components/environments/teams/index.vue"))["default"]
+    EnvironmentsTeamsDetails: (typeof import("./components/environments/teams/Details.vue"))["default"]
+    EnvironmentsTeamsEnvironment: (typeof import("./components/environments/teams/Environment.vue"))["default"]
+    FirebaseLogin: (typeof import("./components/firebase/Login.vue"))["default"]
+    FirebaseLogout: (typeof import("./components/firebase/Logout.vue"))["default"]
+    GraphqlAuthorization: (typeof import("./components/graphql/Authorization.vue"))["default"]
+    GraphqlField: (typeof import("./components/graphql/Field.vue"))["default"]
+    GraphqlHeaders: (typeof import("./components/graphql/Headers.vue"))["default"]
+    GraphqlQuery: (typeof import("./components/graphql/Query.vue"))["default"]
+    GraphqlRequest: (typeof import("./components/graphql/Request.vue"))["default"]
+    GraphqlRequestOptions: (typeof import("./components/graphql/RequestOptions.vue"))["default"]
+    GraphqlRequestTab: (typeof import("./components/graphql/RequestTab.vue"))["default"]
+    GraphqlResponse: (typeof import("./components/graphql/Response.vue"))["default"]
+    GraphqlSidebar: (typeof import("./components/graphql/Sidebar.vue"))["default"]
+    GraphqlSubscriptionLog: (typeof import("./components/graphql/SubscriptionLog.vue"))["default"]
+    GraphqlTabHead: (typeof import("./components/graphql/TabHead.vue"))["default"]
+    GraphqlType: (typeof import("./components/graphql/Type.vue"))["default"]
+    GraphqlTypeLink: (typeof import("./components/graphql/TypeLink.vue"))["default"]
+    GraphqlVariable: (typeof import("./components/graphql/Variable.vue"))["default"]
+    History: (typeof import("./components/history/index.vue"))["default"]
+    HistoryGraphqlCard: (typeof import("./components/history/graphql/Card.vue"))["default"]
+    HistoryRestCard: (typeof import("./components/history/rest/Card.vue"))["default"]
+    HoppButtonPrimary: (typeof import("@hoppscotch/ui"))["HoppButtonPrimary"]
+    HoppButtonSecondary: (typeof import("@hoppscotch/ui"))["HoppButtonSecondary"]
+    HoppSmartAnchor: (typeof import("@hoppscotch/ui"))["HoppSmartAnchor"]
+    HoppSmartCheckbox: (typeof import("@hoppscotch/ui"))["HoppSmartCheckbox"]
+    HoppSmartConfirmModal: (typeof import("@hoppscotch/ui"))["HoppSmartConfirmModal"]
+    HoppSmartExpand: (typeof import("@hoppscotch/ui"))["HoppSmartExpand"]
+    HoppSmartFileChip: (typeof import("@hoppscotch/ui"))["HoppSmartFileChip"]
+    HoppSmartInput: (typeof import("@hoppscotch/ui"))["HoppSmartInput"]
+    HoppSmartIntersection: (typeof import("@hoppscotch/ui"))["HoppSmartIntersection"]
+    HoppSmartItem: (typeof import("@hoppscotch/ui"))["HoppSmartItem"]
+    HoppSmartLink: (typeof import("@hoppscotch/ui"))["HoppSmartLink"]
+    HoppSmartModal: (typeof import("@hoppscotch/ui"))["HoppSmartModal"]
+    HoppSmartPicture: (typeof import("@hoppscotch/ui"))["HoppSmartPicture"]
+    HoppSmartPlaceholder: (typeof import("@hoppscotch/ui"))["HoppSmartPlaceholder"]
+    HoppSmartProgressRing: (typeof import("@hoppscotch/ui"))["HoppSmartProgressRing"]
+    HoppSmartRadio: (typeof import("@hoppscotch/ui"))["HoppSmartRadio"]
+    HoppSmartRadioGroup: (typeof import("@hoppscotch/ui"))["HoppSmartRadioGroup"]
+    HoppSmartSelectWrapper: (typeof import("@hoppscotch/ui"))["HoppSmartSelectWrapper"]
+    HoppSmartSlideOver: (typeof import("@hoppscotch/ui"))["HoppSmartSlideOver"]
+    HoppSmartSpinner: (typeof import("@hoppscotch/ui"))["HoppSmartSpinner"]
+    HoppSmartTab: (typeof import("@hoppscotch/ui"))["HoppSmartTab"]
+    HoppSmartTabs: (typeof import("@hoppscotch/ui"))["HoppSmartTabs"]
+    HoppSmartToggle: (typeof import("@hoppscotch/ui"))["HoppSmartToggle"]
+    HoppSmartTree: (typeof import("@hoppscotch/ui"))["HoppSmartTree"]
+    HoppSmartWindow: (typeof import("@hoppscotch/ui"))["HoppSmartWindow"]
+    HoppSmartWindows: (typeof import("@hoppscotch/ui"))["HoppSmartWindows"]
+    HttpAuthorization: (typeof import("./components/http/Authorization.vue"))["default"]
+    HttpAuthorizationApiKey: (typeof import("./components/http/authorization/ApiKey.vue"))["default"]
+    HttpAuthorizationBasic: (typeof import("./components/http/authorization/Basic.vue"))["default"]
+    HttpBody: (typeof import("./components/http/Body.vue"))["default"]
+    HttpBodyParameters: (typeof import("./components/http/BodyParameters.vue"))["default"]
+    HttpCodegenModal: (typeof import("./components/http/CodegenModal.vue"))["default"]
+    HttpHeaders: (typeof import("./components/http/Headers.vue"))["default"]
+    HttpImportCurl: (typeof import("./components/http/ImportCurl.vue"))["default"]
+    HttpOAuth2Authorization: (typeof import("./components/http/OAuth2Authorization.vue"))["default"]
+    HttpParameters: (typeof import("./components/http/Parameters.vue"))["default"]
+    HttpPreRequestScript: (typeof import("./components/http/PreRequestScript.vue"))["default"]
+    HttpRawBody: (typeof import("./components/http/RawBody.vue"))["default"]
+    HttpReqChangeConfirmModal: (typeof import("./components/http/ReqChangeConfirmModal.vue"))["default"]
+    HttpRequest: (typeof import("./components/http/Request.vue"))["default"]
+    HttpRequestOptions: (typeof import("./components/http/RequestOptions.vue"))["default"]
+    HttpRequestTab: (typeof import("./components/http/RequestTab.vue"))["default"]
+    HttpResponse: (typeof import("./components/http/Response.vue"))["default"]
+    HttpResponseMeta: (typeof import("./components/http/ResponseMeta.vue"))["default"]
+    HttpSidebar: (typeof import("./components/http/Sidebar.vue"))["default"]
+    HttpTabHead: (typeof import("./components/http/TabHead.vue"))["default"]
+    HttpTestResult: (typeof import("./components/http/TestResult.vue"))["default"]
+    HttpTestResultEntry: (typeof import("./components/http/TestResultEntry.vue"))["default"]
+    HttpTestResultEnv: (typeof import("./components/http/TestResultEnv.vue"))["default"]
+    HttpTestResultReport: (typeof import("./components/http/TestResultReport.vue"))["default"]
+    HttpTests: (typeof import("./components/http/Tests.vue"))["default"]
+    HttpURLEncodedParams: (typeof import("./components/http/URLEncodedParams.vue"))["default"]
+    IconLucideActivity: (typeof import("~icons/lucide/activity"))["default"]
+    IconLucideAlertTriangle: (typeof import("~icons/lucide/alert-triangle"))["default"]
+    IconLucideArrowLeft: (typeof import("~icons/lucide/arrow-left"))["default"]
+    IconLucideArrowUpRight: (typeof import("~icons/lucide/arrow-up-right"))["default"]
+    IconLucideBrush: (typeof import("~icons/lucide/brush"))["default"]
+    IconLucideCheckCircle: (typeof import("~icons/lucide/check-circle"))["default"]
+    IconLucideChevronRight: (typeof import("~icons/lucide/chevron-right"))["default"]
+    IconLucideGlobe: (typeof import("~icons/lucide/globe"))["default"]
+    IconLucideHelpCircle: (typeof import("~icons/lucide/help-circle"))["default"]
+    IconLucideInbox: (typeof import("~icons/lucide/inbox"))["default"]
+    IconLucideInfo: (typeof import("~icons/lucide/info"))["default"]
+    IconLucideLayers: (typeof import("~icons/lucide/layers"))["default"]
+    IconLucideListEnd: (typeof import("~icons/lucide/list-end"))["default"]
+    IconLucideMinus: (typeof import("~icons/lucide/minus"))["default"]
+    IconLucideRss: (typeof import("~icons/lucide/rss"))["default"]
+    IconLucideSearch: (typeof import("~icons/lucide/search"))["default"]
+    IconLucideUsers: (typeof import("~icons/lucide/users"))["default"]
+    IconLucideX: (typeof import("~icons/lucide/x"))["default"]
+    ImportExportBase: (typeof import("./components/importExport/Base.vue"))["default"]
+    ImportExportImportExportList: (typeof import("./components/importExport/ImportExportList.vue"))["default"]
+    ImportExportImportExportSourcesList: (typeof import("./components/importExport/ImportExportSourcesList.vue"))["default"]
+    ImportExportImportExportStepsFileImport: (typeof import("./components/importExport/ImportExportSteps/FileImport.vue"))["default"]
+    ImportExportImportExportStepsMyCollectionImport: (typeof import("./components/importExport/ImportExportSteps/MyCollectionImport.vue"))["default"]
+    ImportExportImportExportStepsUrlImport: (typeof import("./components/importExport/ImportExportSteps/UrlImport.vue"))["default"]
+    InterceptorsErrorPlaceholder: (typeof import("./components/interceptors/ErrorPlaceholder.vue"))["default"]
+    InterceptorsExtensionSubtitle: (typeof import("./components/interceptors/ExtensionSubtitle.vue"))["default"]
+    LensesHeadersRenderer: (typeof import("./components/lenses/HeadersRenderer.vue"))["default"]
+    LensesHeadersRendererEntry: (typeof import("./components/lenses/HeadersRendererEntry.vue"))["default"]
+    LensesRenderersAudioLensRenderer: (typeof import("./components/lenses/renderers/AudioLensRenderer.vue"))["default"]
+    LensesRenderersHTMLLensRenderer: (typeof import("./components/lenses/renderers/HTMLLensRenderer.vue"))["default"]
+    LensesRenderersImageLensRenderer: (typeof import("./components/lenses/renderers/ImageLensRenderer.vue"))["default"]
+    LensesRenderersJSONLensRenderer: (typeof import("./components/lenses/renderers/JSONLensRenderer.vue"))["default"]
+    LensesRenderersPDFLensRenderer: (typeof import("./components/lenses/renderers/PDFLensRenderer.vue"))["default"]
+    LensesRenderersRawLensRenderer: (typeof import("./components/lenses/renderers/RawLensRenderer.vue"))["default"]
+    LensesRenderersVideoLensRenderer: (typeof import("./components/lenses/renderers/VideoLensRenderer.vue"))["default"]
+    LensesRenderersXMLLensRenderer: (typeof import("./components/lenses/renderers/XMLLensRenderer.vue"))["default"]
+    LensesResponseBodyRenderer: (typeof import("./components/lenses/ResponseBodyRenderer.vue"))["default"]
+    ProfileUserDelete: (typeof import("./components/profile/UserDelete.vue"))["default"]
+    RealtimeCommunication: (typeof import("./components/realtime/Communication.vue"))["default"]
+    RealtimeConnectionConfig: (typeof import("./components/realtime/ConnectionConfig.vue"))["default"]
+    RealtimeLog: (typeof import("./components/realtime/Log.vue"))["default"]
+    RealtimeLogEntry: (typeof import("./components/realtime/LogEntry.vue"))["default"]
+    RealtimeSubscription: (typeof import("./components/realtime/Subscription.vue"))["default"]
+    SettingsExtension: (typeof import("./components/settings/Extension.vue"))["default"]
+    SettingsProxy: (typeof import("./components/settings/Proxy.vue"))["default"]
+    Share: (typeof import("./components/share/index.vue"))["default"]
+    ShareCreateModal: (typeof import("./components/share/CreateModal.vue"))["default"]
+    ShareCustomizeModal: (typeof import("./components/share/CustomizeModal.vue"))["default"]
+    ShareModal: (typeof import("./components/share/Modal.vue"))["default"]
+    ShareRequest: (typeof import("./components/share/Request.vue"))["default"]
+    ShareTemplatesButton: (typeof import("./components/share/templates/Button.vue"))["default"]
+    ShareTemplatesEmbeds: (typeof import("./components/share/templates/Embeds.vue"))["default"]
+    ShareTemplatesLink: (typeof import("./components/share/templates/Link.vue"))["default"]
+    SmartAccentModePicker: (typeof import("./components/smart/AccentModePicker.vue"))["default"]
+    SmartChangeLanguage: (typeof import("./components/smart/ChangeLanguage.vue"))["default"]
+    SmartColorModePicker: (typeof import("./components/smart/ColorModePicker.vue"))["default"]
+    SmartEnvInput: (typeof import("./components/smart/EnvInput.vue"))["default"]
+    TabPrimary: (typeof import("./components/tab/Primary.vue"))["default"]
+    TabSecondary: (typeof import("./components/tab/Secondary.vue"))["default"]
+    Teams: (typeof import("./components/teams/index.vue"))["default"]
+    TeamsAdd: (typeof import("./components/teams/Add.vue"))["default"]
+    TeamsEdit: (typeof import("./components/teams/Edit.vue"))["default"]
+    TeamsInvite: (typeof import("./components/teams/Invite.vue"))["default"]
+    TeamsMemberStack: (typeof import("./components/teams/MemberStack.vue"))["default"]
+    TeamsModal: (typeof import("./components/teams/Modal.vue"))["default"]
+    TeamsTeam: (typeof import("./components/teams/Team.vue"))["default"]
+    Tippy: (typeof import("vue-tippy"))["Tippy"]
+    WorkspaceCurrent: (typeof import("./components/workspace/Current.vue"))["default"]
+    WorkspaceSelector: (typeof import("./components/workspace/Selector.vue"))["default"]
   }
 }

From fa51759b83790f09ee906aac84d5ebafe9d46210 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Fri, 8 Mar 2024 10:05:31 +0530
Subject: [PATCH 50/60] chore: updated hopp ui version

---
 packages/hoppscotch-sh-admin/package.json     |  2 +-
 .../src/pages/users/index.vue                 |  2 +-
 pnpm-lock.yaml                                | 33 +++++++++++++++++--
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/package.json b/packages/hoppscotch-sh-admin/package.json
index 16a28aa362..94839ff15b 100644
--- a/packages/hoppscotch-sh-admin/package.json
+++ b/packages/hoppscotch-sh-admin/package.json
@@ -17,7 +17,7 @@
     "@fontsource-variable/material-symbols-rounded": "5.0.5",
     "@fontsource-variable/roboto-mono": "5.0.6",
     "@graphql-typed-document-node/core": "3.1.1",
-    "@hoppscotch/ui": "0.1.0",
+    "@hoppscotch/ui": "0.1.2",
     "@hoppscotch/vue-toasted": "0.1.0",
     "@intlify/unplugin-vue-i18n": "1.2.0",
     "@types/cors": "2.8.13",
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 6f7296f8f1..4c19cbfd30 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -262,7 +262,7 @@ const headings = [
 ];
 
 // Get Paginated Results of all the users in the infra
-const usersPerPage = 2;
+const usersPerPage = 20;
 const {
   fetching,
   error,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 28ad9194d3..f19aa123a0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1258,8 +1258,8 @@ importers:
         specifier: 3.1.1
         version: 3.1.1(graphql@16.6.0)
       '@hoppscotch/ui':
-        specifier: 0.1.0
-        version: 0.1.0(eslint@8.55.0)(terser@5.27.0)(vite@3.2.4)(vue@3.3.9)
+        specifier: 0.1.2
+        version: 0.1.2(eslint@8.55.0)(terser@5.27.0)(vite@3.2.4)(vue@3.3.9)
       '@hoppscotch/vue-toasted':
         specifier: 0.1.0
         version: 0.1.0(vue@3.3.9)
@@ -6015,13 +6015,14 @@ packages:
       lodash-es: 4.17.21
       path: 0.12.7
       vite-plugin-eslint: 1.8.1(eslint@8.55.0)(vite@3.2.4)
-      vue: 3.3.9(typescript@4.9.3)
+      vue: 3.3.9(typescript@4.9.5)
       vuedraggable-es: 4.1.1(vue@3.3.9)
     transitivePeerDependencies:
       - '@vue/composition-api'
       - eslint
       - terser
       - vite
+    dev: true
 
   /@hoppscotch/ui@0.1.0(eslint@8.55.0)(terser@5.27.0)(vite@4.5.0)(vue@3.3.9):
     resolution: {integrity: sha512-+4iHdfO7gRn7l3vpnPcQZbgdA+uE/K1KQX0/eUFcCWvja/C3eSM0db31MRX2cz1KYGwiezzhhVe21mIT4a0CZQ==}
@@ -6049,6 +6050,32 @@ packages:
       - vite
     dev: false
 
+  /@hoppscotch/ui@0.1.2(eslint@8.55.0)(terser@5.27.0)(vite@3.2.4)(vue@3.3.9):
+    resolution: {integrity: sha512-bBn7Km1iIFMBsXgnrDLqTBzz29XOPRZcRbQd18DZMYxoR7WQo9amBfa850vk5debYQx2+Mb0ExOnrGVO1QlBRg==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      vue: 3.3.9
+    dependencies:
+      '@boringer-avatars/vue3': 0.2.1(vue@3.3.9)
+      '@fontsource-variable/inter': 5.0.15
+      '@fontsource-variable/material-symbols-rounded': 5.0.16
+      '@fontsource-variable/roboto-mono': 5.0.16
+      '@hoppscotch/vue-toasted': 0.1.0(vue@3.3.9)
+      '@vitejs/plugin-legacy': 2.3.0(terser@5.27.0)(vite@3.2.4)
+      '@vueuse/core': 8.7.5(vue@3.3.9)
+      fp-ts: 2.16.2
+      lodash-es: 4.17.21
+      path: 0.12.7
+      vite-plugin-eslint: 1.8.1(eslint@8.55.0)(vite@3.2.4)
+      vue: 3.3.9(typescript@4.9.3)
+      vuedraggable-es: 4.1.1(vue@3.3.9)
+    transitivePeerDependencies:
+      - '@vue/composition-api'
+      - eslint
+      - terser
+      - vite
+    dev: false
+
   /@hoppscotch/vue-toasted@0.1.0(vue@3.3.9):
     resolution: {integrity: sha512-DIgmeTHxWwX5UeaHLEqDYNLJFGRosx/5N1fCHkaO8zt+sZv8GrHlkrIpjfKF2drmA3kKw5cY42Cw7WuCoabR3g==}
     peerDependencies:

From 1e2469f7f9596ccf45b24631901ffba85f9b31be Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Sat, 9 Mar 2024 11:03:39 +0530
Subject: [PATCH 51/60] fix: pagination and search not computing properly

---
 .../src/pages/users/index.vue                 | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 4c19cbfd30..63507ee882 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -26,7 +26,7 @@
         <HoppSmartTable
           v-else-if="usersList"
           :headings="headings"
-          :list="usersList"
+          :list="finalUsersList"
           :loading="showSpinner"
           :selected-rows="selectedRows"
           :pagination="{ totalPages }"
@@ -290,9 +290,30 @@ const searchQuery = ref('');
 
 const handleSearch = async (input: string) => {
   searchQuery.value = input;
-  await refetch({ searchString: input, take: usersPerPage, skip: 0 });
+  if (input.length === 0) {
+    await refetch({
+      searchString: '',
+      take: usersPerPage,
+      skip: (pageNumber.value - 1) * usersPerPage,
+    });
+  } else {
+    // If search query is present, fetch all the users filtered by the search query
+    await refetch({ searchString: input, take: usersCount.value!, skip: 0 });
+  }
 };
 
+// Final Users List after Search and Pagination operations
+const finalUsersList = computed(() =>
+  // If search query is present, filter the list based on the search query and return the paginated results
+  // Else just return the paginated results directly
+  searchQuery.value.length > 0
+    ? usersList.value.slice(
+        (pageNumber.value - 1) * usersPerPage,
+        pageNumber.value * usersPerPage
+      )
+    : usersList.value
+);
+
 watch(searchQuery, () => {
   debounce(() => {
     handleSearch(searchQuery.value);
@@ -312,23 +333,29 @@ watch(fetching, (fetching) => {
 });
 
 // Pagination
+const pageNumber = ref(1);
 const { data } = useQuery({ query: MetricsDocument });
 const usersCount = computed(() => data?.value?.infra.usersCount);
 
 const totalPages = computed(() => {
   if (!usersCount.value) return 0;
   if (searchQuery.value.length > 0) {
-    return usersList.value.length;
+    return Math.ceil(usersList.value.length / usersPerPage);
   }
   return Math.ceil(usersCount.value / usersPerPage);
 });
 
 const handlePageChange = async (page: number) => {
+  pageNumber.value = page;
   if (page < 1 || page > totalPages.value) {
     return;
+  } else if (searchQuery.value.length > 0) {
+    // Simulate fetching state
+    fetching.value = true;
+    debounce(() => (fetching.value = false), 500);
   } else {
     await refetch({
-      searchString: searchQuery.value,
+      searchString: '',
       take: usersPerPage,
       skip: (page - 1) * usersPerPage,
     });

From 80793fa93ca311a857ec159e1b4298e8547dc795 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Sat, 9 Mar 2024 20:52:08 +0530
Subject: [PATCH 52/60] refactor: implemented onsite pagination instead of
 using smart table pagination

---
 .../hoppscotch-sh-admin/src/components.d.ts   | 101 +++++++++---------
 .../src/pages/users/index.vue                 |  81 ++++++++++----
 2 files changed, 114 insertions(+), 68 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/components.d.ts b/packages/hoppscotch-sh-admin/src/components.d.ts
index 76edcdbada..f6d1e02c41 100644
--- a/packages/hoppscotch-sh-admin/src/components.d.ts
+++ b/packages/hoppscotch-sh-admin/src/components.d.ts
@@ -1,59 +1,60 @@
 // generated by unplugin-vue-components
 // We suggest you to commit this file into source control
 // Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core';
+import '@vue/runtime-core'
 
-export {};
+export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AppHeader: typeof import('./components/app/Header.vue')['default'];
-    AppLogin: typeof import('./components/app/Login.vue')['default'];
-    AppLogout: typeof import('./components/app/Logout.vue')['default'];
-    AppModal: typeof import('./components/app/Modal.vue')['default'];
-    AppSidebar: typeof import('./components/app/Sidebar.vue')['default'];
-    AppToast: typeof import('./components/app/Toast.vue')['default'];
-    DashboardMetricsCard: typeof import('./components/dashboard/MetricsCard.vue')['default'];
-    HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary'];
-    HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary'];
-    HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor'];
-    HoppSmartAutoComplete: typeof import('@hoppscotch/ui')['HoppSmartAutoComplete'];
-    HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal'];
-    HoppSmartInput: typeof import('@hoppscotch/ui')['HoppSmartInput'];
-    HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem'];
-    HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink'];
-    HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal'];
-    HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture'];
-    HoppSmartPlaceholder: typeof import('@hoppscotch/ui')['HoppSmartPlaceholder'];
-    HoppSmartSelectWrapper: typeof import('@hoppscotch/ui')['HoppSmartSelectWrapper'];
-    HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner'];
-    HoppSmartTab: typeof import('@hoppscotch/ui')['HoppSmartTab'];
-    HoppSmartTable: typeof import('@hoppscotch/ui')['HoppSmartTable'];
-    HoppSmartTabs: typeof import('@hoppscotch/ui')['HoppSmartTabs'];
-    HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle'];
-    IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default'];
-    IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default'];
-    IconLucideHelpCircle: typeof import('~icons/lucide/help-circle')['default'];
-    IconLucideInbox: typeof import('~icons/lucide/inbox')['default'];
-    IconLucideSearch: typeof import('~icons/lucide/search')['default'];
-    IconLucideUser: typeof import('~icons/lucide/user')['default'];
-    SettingsAuthProvider: typeof import('./components/settings/AuthProvider.vue')['default'];
-    SettingsConfigurations: typeof import('./components/settings/Configurations.vue')['default'];
-    SettingsDataSharing: typeof import('./components/settings/DataSharing.vue')['default'];
-    SettingsReset: typeof import('./components/settings/Reset.vue')['default'];
-    SettingsServerRestart: typeof import('./components/settings/ServerRestart.vue')['default'];
-    SettingsSmtpConfiguration: typeof import('./components/settings/SmtpConfiguration.vue')['default'];
-    SetupDataSharingAndNewsletter: typeof import('./components/setup/DataSharingAndNewsletter.vue')['default'];
-    TeamsAdd: typeof import('./components/teams/Add.vue')['default'];
-    TeamsDetails: typeof import('./components/teams/Details.vue')['default'];
-    TeamsInvite: typeof import('./components/teams/Invite.vue')['default'];
-    TeamsMembers: typeof import('./components/teams/Members.vue')['default'];
-    TeamsPendingInvites: typeof import('./components/teams/PendingInvites.vue')['default'];
-    Tippy: typeof import('vue-tippy')['Tippy'];
-    UiAutoResetIcon: typeof import('./components/ui/AutoResetIcon.vue')['default'];
-    UsersDetails: typeof import('./components/users/Details.vue')['default'];
-    UsersInviteModal: typeof import('./components/users/InviteModal.vue')['default'];
-    UsersSharedRequests: typeof import('./components/users/SharedRequests.vue')['default'];
-    UsersTable: typeof import('./components/users/Table.vue')['default'];
+    AppHeader: typeof import('./components/app/Header.vue')['default']
+    AppLogin: typeof import('./components/app/Login.vue')['default']
+    AppLogout: typeof import('./components/app/Logout.vue')['default']
+    AppModal: typeof import('./components/app/Modal.vue')['default']
+    AppSidebar: typeof import('./components/app/Sidebar.vue')['default']
+    AppToast: typeof import('./components/app/Toast.vue')['default']
+    DashboardMetricsCard: typeof import('./components/dashboard/MetricsCard.vue')['default']
+    HoppButtonPrimary: typeof import('@hoppscotch/ui')['HoppButtonPrimary']
+    HoppButtonSecondary: typeof import('@hoppscotch/ui')['HoppButtonSecondary']
+    HoppSmartAnchor: typeof import('@hoppscotch/ui')['HoppSmartAnchor']
+    HoppSmartAutoComplete: typeof import('@hoppscotch/ui')['HoppSmartAutoComplete']
+    HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal']
+    HoppSmartInput: typeof import('@hoppscotch/ui')['HoppSmartInput']
+    HoppSmartItem: typeof import('@hoppscotch/ui')['HoppSmartItem']
+    HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink']
+    HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal']
+    HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture']
+    HoppSmartPlaceholder: typeof import('@hoppscotch/ui')['HoppSmartPlaceholder']
+    HoppSmartSelectWrapper: typeof import('@hoppscotch/ui')['HoppSmartSelectWrapper']
+    HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner']
+    HoppSmartTab: typeof import('@hoppscotch/ui')['HoppSmartTab']
+    HoppSmartTable: typeof import('@hoppscotch/ui')['HoppSmartTable']
+    HoppSmartTabs: typeof import('@hoppscotch/ui')['HoppSmartTabs']
+    HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle']
+    IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default']
+    IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
+    IconLucideHelpCircle: typeof import('~icons/lucide/help-circle')['default']
+    IconLucideInbox: typeof import('~icons/lucide/inbox')['default']
+    IconLucideSearch: typeof import('~icons/lucide/search')['default']
+    IconLucideUser: typeof import('~icons/lucide/user')['default']
+    SettingsAuthProvider: typeof import('./components/settings/AuthProvider.vue')['default']
+    SettingsConfigurations: typeof import('./components/settings/Configurations.vue')['default']
+    SettingsDataSharing: typeof import('./components/settings/DataSharing.vue')['default']
+    SettingsReset: typeof import('./components/settings/Reset.vue')['default']
+    SettingsServerRestart: typeof import('./components/settings/ServerRestart.vue')['default']
+    SettingsSmtpConfiguration: typeof import('./components/settings/SmtpConfiguration.vue')['default']
+    SetupDataSharingAndNewsletter: typeof import('./components/setup/DataSharingAndNewsletter.vue')['default']
+    TeamsAdd: typeof import('./components/teams/Add.vue')['default']
+    TeamsDetails: typeof import('./components/teams/Details.vue')['default']
+    TeamsInvite: typeof import('./components/teams/Invite.vue')['default']
+    TeamsMembers: typeof import('./components/teams/Members.vue')['default']
+    TeamsPendingInvites: typeof import('./components/teams/PendingInvites.vue')['default']
+    Tippy: typeof import('vue-tippy')['Tippy']
+    UiAutoResetIcon: typeof import('./components/ui/AutoResetIcon.vue')['default']
+    UsersDetails: typeof import('./components/users/Details.vue')['default']
+    UsersInviteModal: typeof import('./components/users/InviteModal.vue')['default']
+    UsersSharedRequests: typeof import('./components/users/SharedRequests.vue')['default']
+    UsersTable: typeof import('./components/users/Table.vue')['default']
   }
+
 }
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 63507ee882..2d75c06f3f 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -23,14 +23,33 @@
       <div class="overflow-x-auto">
         <div v-if="error">{{ t('users.load_list_error') }}</div>
 
+        <div v-else-if="usersList" class="mb-3 flex items-center justify-end">
+          <HoppButtonSecondary
+            outline
+            filled
+            :icon="IconLeft"
+            :disabled="page === 1"
+            @click="changePage(PageDirection.Previous)"
+          />
+
+          <div class="flex h-full w-10 items-center justify-center">
+            <span>{{ page }}</span>
+          </div>
+
+          <HoppButtonSecondary
+            outline
+            filled
+            :icon="IconRight"
+            :disabled="page === totalPages"
+            @click="changePage(PageDirection.Next)"
+          />
+        </div>
+
         <HoppSmartTable
-          v-else-if="usersList"
           :headings="headings"
           :list="finalUsersList"
           :loading="showSpinner"
           :selected-rows="selectedRows"
-          :pagination="{ totalPages }"
-          @pageNumber="handlePageChange"
           @onRowClicked="goToUserDetails"
         >
           <template #extension>
@@ -244,6 +263,8 @@ import IconTrash from '~icons/lucide/trash';
 import IconUserCheck from '~icons/lucide/user-check';
 import IconUserMinus from '~icons/lucide/user-minus';
 import IconAddUser from '~icons/lucide/user-plus';
+import IconLeft from '~icons/lucide/chevron-left';
+import IconRight from '~icons/lucide/chevron-right';
 
 // Get Proper Date Formats
 const t = useI18n();
@@ -262,7 +283,7 @@ const headings = [
 ];
 
 // Get Paginated Results of all the users in the infra
-const usersPerPage = 20;
+const usersPerPage = 2;
 const {
   fetching,
   error,
@@ -294,7 +315,7 @@ const handleSearch = async (input: string) => {
     await refetch({
       searchString: '',
       take: usersPerPage,
-      skip: (pageNumber.value - 1) * usersPerPage,
+      skip: (page.value - 1) * usersPerPage,
     });
   } else {
     // If search query is present, fetch all the users filtered by the search query
@@ -308,16 +329,23 @@ const finalUsersList = computed(() =>
   // Else just return the paginated results directly
   searchQuery.value.length > 0
     ? usersList.value.slice(
-        (pageNumber.value - 1) * usersPerPage,
-        pageNumber.value * usersPerPage
+        (page.value - 1) * usersPerPage,
+        page.value * usersPerPage
       )
     : usersList.value
 );
 
 watch(searchQuery, () => {
-  debounce(() => {
+  console.log('search');
+
+  if (searchQuery.value.length === 0) {
     handleSearch(searchQuery.value);
-  }, 500);
+  } else {
+    page.value = 1;
+    debounce(() => {
+      handleSearch(searchQuery.value);
+    }, 500);
+  }
 });
 
 // Spinner
@@ -333,7 +361,7 @@ watch(fetching, (fetching) => {
 });
 
 // Pagination
-const pageNumber = ref(1);
+const page = ref(1);
 const { data } = useQuery({ query: MetricsDocument });
 const usersCount = computed(() => data?.value?.infra.usersCount);
 
@@ -345,21 +373,38 @@ const totalPages = computed(() => {
   return Math.ceil(usersCount.value / usersPerPage);
 });
 
-const handlePageChange = async (page: number) => {
-  pageNumber.value = page;
-  if (page < 1 || page > totalPages.value) {
+watch(page, async () => {
+  console.log('page');
+
+  if (page.value < 1 || page.value > totalPages.value) {
     return;
-  } else if (searchQuery.value.length > 0) {
-    // Simulate fetching state
-    fetching.value = true;
-    debounce(() => (fetching.value = false), 500);
+  } else if (searchQuery.value.length > 0 && page.value !== 1) {
+    // // Simulate fetching state
+    showSpinner.value = true;
+    debounce(() => (showSpinner.value = false), 500);
   } else {
     await refetch({
       searchString: '',
       take: usersPerPage,
-      skip: (page - 1) * usersPerPage,
+      skip: (page.value - 1) * usersPerPage,
     });
   }
+});
+
+enum PageDirection {
+  Previous,
+  Next,
+}
+
+const changePage = (direction: PageDirection) => {
+  const isPrevious = direction === PageDirection.Previous;
+
+  const isValidPreviousAction = isPrevious && page.value > 1;
+  const isValidNextAction = !isPrevious && page.value < totalPages.value;
+
+  if (isValidNextAction || isValidPreviousAction) {
+    page.value += isPrevious ? -1 : 1;
+  }
 };
 
 // Go to Individual User Details Page

From 36460f316b9a22c446d2321133d3079d35dbbeb1 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Sat, 9 Mar 2024 21:12:12 +0530
Subject: [PATCH 53/60] fix: refetching even even search query is present

---
 .../src/pages/users/index.vue                 | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 2d75c06f3f..016c6883ff 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -321,33 +321,36 @@ const handleSearch = async (input: string) => {
     // If search query is present, fetch all the users filtered by the search query
     await refetch({ searchString: input, take: usersCount.value!, skip: 0 });
   }
+  page.value = 1;
 };
 
-// Final Users List after Search and Pagination operations
-const finalUsersList = computed(() =>
-  // If search query is present, filter the list based on the search query and return the paginated results
-  // Else just return the paginated results directly
-  searchQuery.value.length > 0
-    ? usersList.value.slice(
-        (page.value - 1) * usersPerPage,
-        page.value * usersPerPage
-      )
-    : usersList.value
-);
-
 watch(searchQuery, () => {
-  console.log('search');
+  console.log('search', searchQuery.value);
 
   if (searchQuery.value.length === 0) {
     handleSearch(searchQuery.value);
   } else {
-    page.value = 1;
     debounce(() => {
       handleSearch(searchQuery.value);
     }, 500);
   }
 });
 
+// Final Users List after Search and Pagination operations
+const finalUsersList = computed(() => {
+  // If search query is present, filter the list based on the search query and return the paginated results
+  // Else just return the paginated results directly
+
+  console.log('userslist', usersList.value);
+
+  return searchQuery.value.length > 0
+    ? usersList.value.slice(
+        (page.value - 1) * usersPerPage,
+        page.value * usersPerPage
+      )
+    : usersList.value;
+});
+
 // Spinner
 const showSpinner = ref(false);
 
@@ -378,11 +381,15 @@ watch(page, async () => {
 
   if (page.value < 1 || page.value > totalPages.value) {
     return;
-  } else if (searchQuery.value.length > 0 && page.value !== 1) {
+  } else if (searchQuery.value.length > 0) {
+    console.log('inside');
+
     // // Simulate fetching state
     showSpinner.value = true;
     debounce(() => (showSpinner.value = false), 500);
   } else {
+    console.log('refetch');
+
     await refetch({
       searchString: '',
       take: usersPerPage,

From 4e889454834dc664acb1403982cd2f39ca75dc31 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Sat, 9 Mar 2024 22:35:25 +0530
Subject: [PATCH 54/60] fix: computation is now based on input query

---
 .../src/pages/users/index.vue                    | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 016c6883ff..c05e31d155 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -308,9 +308,11 @@ const debounce = (func: () => void, delay: number) => {
 
 // Search
 const searchQuery = ref('');
+const inputQuery = ref('');
 
 const handleSearch = async (input: string) => {
-  searchQuery.value = input;
+  inputQuery.value = input;
+
   if (input.length === 0) {
     await refetch({
       searchString: '',
@@ -321,12 +323,11 @@ const handleSearch = async (input: string) => {
     // If search query is present, fetch all the users filtered by the search query
     await refetch({ searchString: input, take: usersCount.value!, skip: 0 });
   }
+
   page.value = 1;
 };
 
 watch(searchQuery, () => {
-  console.log('search', searchQuery.value);
-
   if (searchQuery.value.length === 0) {
     handleSearch(searchQuery.value);
   } else {
@@ -340,10 +341,7 @@ watch(searchQuery, () => {
 const finalUsersList = computed(() => {
   // If search query is present, filter the list based on the search query and return the paginated results
   // Else just return the paginated results directly
-
-  console.log('userslist', usersList.value);
-
-  return searchQuery.value.length > 0
+  return inputQuery.value.length > 0
     ? usersList.value.slice(
         (page.value - 1) * usersPerPage,
         page.value * usersPerPage
@@ -377,13 +375,9 @@ const totalPages = computed(() => {
 });
 
 watch(page, async () => {
-  console.log('page');
-
   if (page.value < 1 || page.value > totalPages.value) {
     return;
   } else if (searchQuery.value.length > 0) {
-    console.log('inside');
-
     // // Simulate fetching state
     showSpinner.value = true;
     debounce(() => (showSpinner.value = false), 500);

From 80902d464930cbc8efe47a13ae1a7e337845d929 Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Sat, 9 Mar 2024 22:45:15 +0530
Subject: [PATCH 55/60] chore: code improvements in users page

---
 .../src/pages/users/index.vue                 | 68 ++++++++++---------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index c05e31d155..b71a1c373e 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -56,7 +56,7 @@
             <div class="flex w-full items-center bg-primary">
               <icon-lucide-search class="mx-3 text-xs" />
               <HoppSmartInput
-                v-model="searchQuery"
+                v-model="query"
                 styles="w-full bg-primary py-1"
                 input-styles="h-full border-none"
                 placeholder="Search by name or email"
@@ -283,7 +283,7 @@ const headings = [
 ];
 
 // Get Paginated Results of all the users in the infra
-const usersPerPage = 2;
+const usersPerPage = 20;
 const {
   fetching,
   error,
@@ -307,11 +307,13 @@ const debounce = (func: () => void, delay: number) => {
 };
 
 // Search
+
+const query = ref('');
+// Query which is sent to the backend after debouncing
 const searchQuery = ref('');
-const inputQuery = ref('');
 
 const handleSearch = async (input: string) => {
-  inputQuery.value = input;
+  searchQuery.value = input;
 
   if (input.length === 0) {
     await refetch({
@@ -324,30 +326,31 @@ const handleSearch = async (input: string) => {
     await refetch({ searchString: input, take: usersCount.value!, skip: 0 });
   }
 
+  // Reset the page to 1 when the search query changes
   page.value = 1;
 };
 
-watch(searchQuery, () => {
-  if (searchQuery.value.length === 0) {
-    handleSearch(searchQuery.value);
+watch(query, () => {
+  if (query.value.length === 0) {
+    handleSearch(query.value);
   } else {
     debounce(() => {
-      handleSearch(searchQuery.value);
+      handleSearch(query.value);
     }, 500);
   }
 });
 
 // Final Users List after Search and Pagination operations
-const finalUsersList = computed(() => {
+const finalUsersList = computed(() =>
   // If search query is present, filter the list based on the search query and return the paginated results
   // Else just return the paginated results directly
-  return inputQuery.value.length > 0
+  searchQuery.value.length > 0
     ? usersList.value.slice(
         (page.value - 1) * usersPerPage,
         page.value * usersPerPage
       )
-    : usersList.value;
-});
+    : usersList.value
+);
 
 // Spinner
 const showSpinner = ref(false);
@@ -362,13 +365,29 @@ watch(fetching, (fetching) => {
 });
 
 // Pagination
+enum PageDirection {
+  Previous,
+  Next,
+}
+
 const page = ref(1);
 const { data } = useQuery({ query: MetricsDocument });
 const usersCount = computed(() => data?.value?.infra.usersCount);
 
+const changePage = (direction: PageDirection) => {
+  const isPrevious = direction === PageDirection.Previous;
+
+  const isValidPreviousAction = isPrevious && page.value > 1;
+  const isValidNextAction = !isPrevious && page.value < totalPages.value;
+
+  if (isValidNextAction || isValidPreviousAction) {
+    page.value += isPrevious ? -1 : 1;
+  }
+};
+
 const totalPages = computed(() => {
   if (!usersCount.value) return 0;
-  if (searchQuery.value.length > 0) {
+  if (query.value.length > 0) {
     return Math.ceil(usersList.value.length / usersPerPage);
   }
   return Math.ceil(usersCount.value / usersPerPage);
@@ -377,13 +396,12 @@ const totalPages = computed(() => {
 watch(page, async () => {
   if (page.value < 1 || page.value > totalPages.value) {
     return;
-  } else if (searchQuery.value.length > 0) {
-    // // Simulate fetching state
+  }
+  // Show spinner when moving to a different page when search query is present
+  else if (query.value.length > 0) {
     showSpinner.value = true;
     debounce(() => (showSpinner.value = false), 500);
   } else {
-    console.log('refetch');
-
     await refetch({
       searchString: '',
       take: usersPerPage,
@@ -392,22 +410,6 @@ watch(page, async () => {
   }
 });
 
-enum PageDirection {
-  Previous,
-  Next,
-}
-
-const changePage = (direction: PageDirection) => {
-  const isPrevious = direction === PageDirection.Previous;
-
-  const isValidPreviousAction = isPrevious && page.value > 1;
-  const isValidNextAction = !isPrevious && page.value < totalPages.value;
-
-  if (isValidNextAction || isValidPreviousAction) {
-    page.value += isPrevious ? -1 : 1;
-  }
-};
-
 // Go to Individual User Details Page
 const router = useRouter();
 const goToUserDetails = (user: UserInfoQuery['infra']['userInfo']) =>

From 5c7458e144cce39c6f63aab9d6f36a2aab567c45 Mon Sep 17 00:00:00 2001
From: jamesgeorge007 <jamesgeorge998001@gmail.com>
Date: Mon, 11 Mar 2024 11:01:32 +0530
Subject: [PATCH 56/60] chore: add suggestions from review

- Show the error state within the table.
- Ensure the next pagination action remains disabled if the current page count exceeds the total page count accounting for the case with empty results.
- Move the debounce `setTimeout` ID outside the function body to achieve the expected behavior.
- Clear `setTimeout` IDs on page unmount.
---
 .../src/pages/users/index.vue                 | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index b71a1c373e..424d98b052 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -21,9 +21,7 @@
         </div>
       </div>
       <div class="overflow-x-auto">
-        <div v-if="error">{{ t('users.load_list_error') }}</div>
-
-        <div v-else-if="usersList" class="mb-3 flex items-center justify-end">
+        <div class="mb-3 flex items-center justify-end">
           <HoppButtonSecondary
             outline
             filled
@@ -40,7 +38,7 @@
             outline
             filled
             :icon="IconRight"
-            :disabled="page === totalPages"
+            :disabled="page >= totalPages"
             @click="changePage(PageDirection.Next)"
           />
         </div>
@@ -75,7 +73,7 @@
           <template #empty-state>
             <td colspan="6">
               <span class="flex justify-center p-3">
-                {{ t('users.no_users') }}
+                {{ error ? t('users.load_list_error') : t('users.no_users') }}
               </span>
             </td>
           </template>
@@ -238,7 +236,7 @@
 <script setup lang="ts">
 import { useMutation, useQuery } from '@urql/vue';
 import { format } from 'date-fns';
-import { computed, ref, watch } from 'vue';
+import { computed, ref, watch, onUnmounted } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from '~/composables/i18n';
 import { useToast } from '~/composables/toast';
@@ -299,9 +297,23 @@ const {
 // Selected Rows
 const selectedRows = ref<UsersListQuery['infra']['allUsers']>([]);
 
+// Ensure this variable is declared outside the debounce function
+let debounceTimeout: ReturnType<typeof setTimeout> | null = null;
+
+let toastTimeout: ReturnType<typeof setTimeout> | null = null;
+
+onUnmounted(() => {
+  if (debounceTimeout) {
+    clearTimeout(debounceTimeout);
+  }
+
+  if (toastTimeout) {
+    clearTimeout(toastTimeout);
+  }
+});
+
 // Debounce Function
 const debounce = (func: () => void, delay: number) => {
-  let debounceTimeout: ReturnType<typeof setTimeout> | null = null;
   if (debounceTimeout) clearTimeout(debounceTimeout);
   debounceTimeout = setTimeout(func, delay);
 };
@@ -583,7 +595,7 @@ const deleteUsers = async (id: string | null) => {
           count: deletedUsers.length - deletedIDs.length,
         })
       );
-      setTimeout(() => {
+      toastTimeout = setTimeout(() => {
         toast.error(t('state.remove_admin_for_deletion'));
       }, 2000);
     } else {

From 5123ce62611aaed60c8af81aa10e41414b329815 Mon Sep 17 00:00:00 2001
From: jamesgeorge007 <jamesgeorge998001@gmail.com>
Date: Tue, 12 Mar 2024 19:36:09 +0530
Subject: [PATCH 57/60] fix: multiple users selection computation

---
 packages/hoppscotch-sh-admin/src/pages/users/index.vue | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 424d98b052..88c554f02c 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -453,9 +453,7 @@ const confirmUsersToAdmin = ref(false);
 const usersToAdminUID = ref<string | null>(null);
 const usersToAdmin = useMutation(MakeUsersAdminDocument);
 
-const AreMultipleUsersSelected = computed(
-  () => usersToAdminUID.value === null && selectedRows.value.length > 0
-);
+const AreMultipleUsersSelected = computed(() => selectedRows.value.length > 1);
 
 const confirmUserToAdmin = (id: string | null) => {
   confirmUsersToAdmin.value = true;
@@ -508,7 +506,7 @@ const resetConfirmAdminToUser = () => {
 };
 
 const AreMultipleUsersSelectedToAdmin = computed(
-  () => adminsToUserUID.value === null && selectedRows.value.length > 0
+  () => selectedRows.value.length > 1
 );
 
 const makeAdminsToUsers = async (id: string | null) => {
@@ -556,7 +554,7 @@ const resetConfirmUserDeletion = () => {
 };
 
 const AreMultipleUsersSelectedForDeletion = computed(
-  () => deleteUserUID.value === null && selectedRows.value.length > 0
+  () => selectedRows.value.length > 1
 );
 
 const deleteUsers = async (id: string | null) => {

From 099efd5f3a260b2a7605b7d2cafc8e3a7e249563 Mon Sep 17 00:00:00 2001
From: jamesgeorge007 <jamesgeorge998001@gmail.com>
Date: Tue, 12 Mar 2024 19:47:47 +0530
Subject: [PATCH 58/60] refactor: prevent mutating function args

---
 .../hoppscotch-sh-admin/src/composables/usePagedQuery.ts    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/composables/usePagedQuery.ts b/packages/hoppscotch-sh-admin/src/composables/usePagedQuery.ts
index 2304df407d..d65a07a763 100644
--- a/packages/hoppscotch-sh-admin/src/composables/usePagedQuery.ts
+++ b/packages/hoppscotch-sh-admin/src/composables/usePagedQuery.ts
@@ -10,7 +10,7 @@ export function usePagedQuery<
   query: string | TypedDocumentNode<Result, Vars> | DocumentNode,
   getList: (result: Result) => ListItem[],
   itemsPerPage: number,
-  variables: Vars,
+  baseVariables: Vars,
   getCursor?: (value: ListItem) => string
 ) {
   const { client } = useClientHandle();
@@ -21,6 +21,8 @@ export function usePagedQuery<
   const hasNextPage = ref(true);
 
   const fetchNextPage = async (additionalVariables?: Vars) => {
+    let variables = { ...baseVariables };
+
     fetching.value = true;
 
     // Cursor based pagination
@@ -36,7 +38,7 @@ export function usePagedQuery<
       variables = { ...variables, ...additionalVariables };
     }
 
-    const result = await client.query(query, { ...variables }).toPromise();
+    const result = await client.query(query, variables).toPromise();
     if (result.error) {
       error.value = true;
       fetching.value = false;

From a83ec4c14e0ce38e3a58b8af2fcb70eea6b73ef6 Mon Sep 17 00:00:00 2001
From: jamesgeorge007 <jamesgeorge998001@gmail.com>
Date: Tue, 12 Mar 2024 19:49:46 +0530
Subject: [PATCH 59/60] refactor: rename slot prop as per context

---
 .../src/components/users/SharedRequests.vue      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue b/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
index 6b2700230d..892dfb6c5d 100644
--- a/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
+++ b/packages/hoppscotch-sh-admin/src/components/users/SharedRequests.vue
@@ -20,21 +20,21 @@
           {{ t('shared_requests.action') }}
         </th>
       </template>
-      <template #body="{ row: request }">
+      <template #body="{ row: sharedRequest }">
         <td class="flex py-4 px-7 max-w-50">
           <span class="truncate">
-            {{ request.id }}
+            {{ sharedRequest.id }}
           </span>
         </td>
 
         <td class="py-4 px-7 w-96">
-          {{ sharedRequestURL(request.request) }}
+          {{ sharedRequestURL(sharedRequest.request) }}
         </td>
 
         <td class="py-2 px-7">
-          {{ getCreatedDate(request.createdOn) }}
+          {{ getCreatedDate(sharedRequest.createdOn) }}
           <div class="text-gray-400 text-tiny">
-            {{ getCreatedTime(request.createdOn) }}
+            {{ getCreatedTime(sharedRequest.createdOn) }}
           </div>
         </td>
 
@@ -42,7 +42,7 @@
           <HoppButtonSecondary
             v-tippy="{ theme: 'tooltip' }"
             :title="t('shared_requests.open_request')"
-            :to="`${shortcodeBaseURL}/r/${request.id}`"
+            :to="`${shortcodeBaseURL}/r/${sharedRequest.id}`"
             :blank="true"
             :icon="IconExternalLink"
             class="px-3 text-emerald-500 hover:text-accent"
@@ -51,7 +51,7 @@
           <UiAutoResetIcon
             :title="t('shared_requests.copy')"
             :icon="{ default: IconCopy, temporary: IconCheck }"
-            @click="copySharedRequest(request.id)"
+            @click="copySharedRequest(sharedRequest.id)"
           />
 
           <HoppButtonSecondary
@@ -60,7 +60,7 @@
             :icon="IconTrash"
             color="red"
             class="px-3"
-            @click="deleteSharedRequest(request.id)"
+            @click="deleteSharedRequest(sharedRequest.id)"
           />
         </td>
       </template>

From 6b43960e243bf96511ae9bca040d3c34a8c4010b Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Wed, 13 Mar 2024 10:52:45 +0530
Subject: [PATCH 60/60] refactor: new clear selection button to clear all
 selections

---
 packages/hoppscotch-sh-admin/locales/en.json  |  1 +
 .../hoppscotch-sh-admin/src/components.d.ts   |  3 ---
 .../src/pages/users/index.vue                 | 23 +++++++++++++------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/packages/hoppscotch-sh-admin/locales/en.json b/packages/hoppscotch-sh-admin/locales/en.json
index eca7207886..b53af9d271 100644
--- a/packages/hoppscotch-sh-admin/locales/en.json
+++ b/packages/hoppscotch-sh-admin/locales/en.json
@@ -106,6 +106,7 @@
     "admin_failure": "Failed to make user an admin!!",
     "admin_success": "User is now an admin!!",
     "and": "and",
+    "clear_selection": "Clear Selection",
     "configure_auth": "Check out the documentation to configure auth providers.",
     "confirm_admin_to_user": "Do you want to remove admin status from this user?",
     "confirm_admins_to_users": "Do you want to remove admin status from selected users?",
diff --git a/packages/hoppscotch-sh-admin/src/components.d.ts b/packages/hoppscotch-sh-admin/src/components.d.ts
index f6d1e02c41..c437ffcc31 100644
--- a/packages/hoppscotch-sh-admin/src/components.d.ts
+++ b/packages/hoppscotch-sh-admin/src/components.d.ts
@@ -24,8 +24,6 @@ declare module '@vue/runtime-core' {
     HoppSmartLink: typeof import('@hoppscotch/ui')['HoppSmartLink']
     HoppSmartModal: typeof import('@hoppscotch/ui')['HoppSmartModal']
     HoppSmartPicture: typeof import('@hoppscotch/ui')['HoppSmartPicture']
-    HoppSmartPlaceholder: typeof import('@hoppscotch/ui')['HoppSmartPlaceholder']
-    HoppSmartSelectWrapper: typeof import('@hoppscotch/ui')['HoppSmartSelectWrapper']
     HoppSmartSpinner: typeof import('@hoppscotch/ui')['HoppSmartSpinner']
     HoppSmartTab: typeof import('@hoppscotch/ui')['HoppSmartTab']
     HoppSmartTable: typeof import('@hoppscotch/ui')['HoppSmartTable']
@@ -33,7 +31,6 @@ declare module '@vue/runtime-core' {
     HoppSmartToggle: typeof import('@hoppscotch/ui')['HoppSmartToggle']
     IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default']
     IconLucideChevronDown: typeof import('~icons/lucide/chevron-down')['default']
-    IconLucideHelpCircle: typeof import('~icons/lucide/help-circle')['default']
     IconLucideInbox: typeof import('~icons/lucide/inbox')['default']
     IconLucideSearch: typeof import('~icons/lucide/search')['default']
     IconLucideUser: typeof import('~icons/lucide/user')['default']
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 88c554f02c..803583a496 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -44,10 +44,10 @@
         </div>
 
         <HoppSmartTable
+          v-model:list="finalUsersList"
+          v-model:selected-rows="selectedRows"
           :headings="headings"
-          :list="finalUsersList"
           :loading="showSpinner"
-          :selected-rows="selectedRows"
           @onRowClicked="goToUserDetails"
         >
           <template #extension>
@@ -57,7 +57,7 @@
                 v-model="query"
                 styles="w-full bg-primary py-1"
                 input-styles="h-full border-none"
-                placeholder="Search by name or email"
+                :placeholder="t('users.searchbar_placeholder')"
               />
             </div>
           </template>
@@ -169,6 +169,7 @@
             class="flex justify-center items-end bg-primaryLight border border-divider rounded-md mb-5"
           >
             <HoppButtonSecondary
+              :icon="IconCheck"
               :label="t('state.selected', { count: selectedRows.length })"
               class="py-4 border-divider rounded-r-none bg-emerald-800 text-secondaryDark"
             />
@@ -187,9 +188,15 @@
             <HoppButtonSecondary
               :icon="IconTrash"
               :label="t('users.delete_users')"
-              class="py-4 border-divider rounded-l-none hover:bg-red-500"
+              class="py-4 border-divider rounded-none hover:bg-red-500"
               @click="confirmUsersDeletion = true"
             />
+            <HoppButtonSecondary
+              :icon="IconX"
+              :label="t('state.clear_selection')"
+              class="py-4 border-divider rounded-l-none text-secondaryDark bg-red-600 hover:bg-red-500"
+              @click="selectedRows.splice(0, selectedRows.length)"
+            />
           </div>
         </div>
       </div>
@@ -236,7 +243,7 @@
 <script setup lang="ts">
 import { useMutation, useQuery } from '@urql/vue';
 import { format } from 'date-fns';
-import { computed, ref, watch, onUnmounted } from 'vue';
+import { computed, onUnmounted, ref, watch } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from '~/composables/i18n';
 import { useToast } from '~/composables/toast';
@@ -256,13 +263,15 @@ import {
   DELETE_USER_FAILED_ONLY_ONE_ADMIN,
   USER_ALREADY_INVITED,
 } from '~/helpers/errors';
+import IconCheck from '~icons/lucide/check';
+import IconLeft from '~icons/lucide/chevron-left';
+import IconRight from '~icons/lucide/chevron-right';
 import IconMoreHorizontal from '~icons/lucide/more-horizontal';
 import IconTrash from '~icons/lucide/trash';
 import IconUserCheck from '~icons/lucide/user-check';
 import IconUserMinus from '~icons/lucide/user-minus';
 import IconAddUser from '~icons/lucide/user-plus';
-import IconLeft from '~icons/lucide/chevron-left';
-import IconRight from '~icons/lucide/chevron-right';
+import IconX from '~icons/lucide/x';
 
 // Get Proper Date Formats
 const t = useI18n();