From 0962718b0ce164af52ae377bfb741d31272c05f7 Mon Sep 17 00:00:00 2001 From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com> Date: Sun, 9 Jul 2023 11:37:50 +0530 Subject: [PATCH] chore: updated types --- packages/hoppscotch-sh-admin/src/components.d.ts | 3 --- .../hoppscotch-sh-admin/src/pages/users/index.vue | 12 +++++++----- .../hoppscotch-ui/src/components/smart/Table.vue | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/packages/hoppscotch-sh-admin/src/components.d.ts b/packages/hoppscotch-sh-admin/src/components.d.ts index 91edf8d50..3a217ec91 100644 --- a/packages/hoppscotch-sh-admin/src/components.d.ts +++ b/packages/hoppscotch-sh-admin/src/components.d.ts @@ -35,11 +35,8 @@ declare module '@vue/runtime-core' { TeamsInvite: typeof import('./components/teams/Invite.vue')['default'] TeamsMembers: typeof import('./components/teams/Members.vue')['default'] TeamsPendingInvites: typeof import('./components/teams/PendingInvites.vue')['default'] - TeamsTable: typeof import('./components/teams/Table.vue')['default'] Tippy: typeof import('vue-tippy')['Tippy'] UsersInviteModal: typeof import('./components/users/InviteModal.vue')['default'] - UsersTable: typeof import('./components/users/Table.vue')['default'] - UsersTables: typeof import('./components/users/Tables.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 b10dd6603..1bf16b5d8 100644 --- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue +++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue @@ -178,15 +178,17 @@ const { const newUsersList = computed(() => { return usersList.value.map((user) => { return { - uid: user.uid || '', - name: user.displayName || '', - email: user.email || '', - createdOn: getCreatedDate(user.createdOn) || '', + uid: user.uid, + name: user.displayName ?? '', + email: user.email ?? '', + createdOn: getCreatedDate(user.createdOn), }; }); }); -const isUserAdmin = (selectedUser: UsersListQuery['admin']['allUsers']) => { +const isUserAdmin = ( + selectedUser: UsersListQuery['admin']['allUsers'][number] +) => { return usersList.value.filter((user) => { return user.uid === selectedUser.uid; })[0].isAdmin; diff --git a/packages/hoppscotch-ui/src/components/smart/Table.vue b/packages/hoppscotch-ui/src/components/smart/Table.vue index f56a53f6f..3f1e18db0 100644 --- a/packages/hoppscotch-ui/src/components/smart/Table.vue +++ b/packages/hoppscotch-ui/src/components/smart/Table.vue @@ -91,8 +91,8 @@ import { computed } from "vue" const props = defineProps<{ - xBorder: Boolean - list: [] + xBorder: boolean + list: Record[] headings: string[] cellStyles: string badgeName: string