Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(sh-admin): improvements to pending invites page in dashboard #3926

Merged
merged 2 commits into from Mar 22, 2024
Merged

refactor(sh-admin): improvements to pending invites page in dashboard #3926

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f2a2183
refactor: removed admin id and updated header names in invites page
JoelJacobStephen Mar 21, 2024
a1d252f
refactor: updated invited components with the new string changes
JoelJacobStephen Mar 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/hoppscotch-sh-admin/locales/en.json
View file
Open in desktop
Expand Up @@ -253,7 +253,6 @@
},
"users": {
"admin": "Admin",
"admin_email": "Admin Email",
"admin_id": "Admin ID",
"cancel": "Cancel",
"created_on": "Created On",
Expand All @@ -270,6 +269,7 @@
"invalid_user": "Invalid User",
"invite_load_list_error": "Unable to Load Invited Users List",
"invite_user": "Invite User",
"invited_by": "Invited By",
"invited_on": "Invited On",
"invited_users": "Invited Users",
"invitee_email": "Invitee Email",
Expand Down
1 change: 0 additions & 1 deletion packages/hoppscotch-sh-admin/src/components.d.ts
View file
Open in desktop
Expand Up @@ -51,7 +51,6 @@ declare module '@vue/runtime-core' {
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']
}

}
2 changes: 1 addition & 1 deletion packages/hoppscotch-sh-admin/src/pages/users/index.vue
View file
Open in desktop
Expand Up @@ -20,7 +20,7 @@
/>
</div>
</div>
<div class="overflow-x-auto">
<div class="overflow-x-auto mb-5">
<div class="mb-3 flex items-center justify-end">
<HoppButtonSecondary
outline
Expand Down
7 changes: 3 additions & 4 deletions packages/hoppscotch-sh-admin/src/pages/users/invited.vue
View file
Open in desktop
Expand Up @@ -45,7 +45,7 @@
<template #action="{ item }">
<div v-if="item" class="my-1 mr-2">
<HoppButtonSecondary
v-if="xlAndLarger"
v-if="lgAndLarger"
:icon="IconTrash"
:label="t('users.revoke_invitation')"
class="text-secondaryDark bg-red-500 hover:bg-red-600"
Expand Down Expand Up @@ -119,7 +119,7 @@ const toast = useToast();
const router = useRouter();

const breakpoints = useBreakpoints(breakpointsTailwind);
const xlAndLarger = breakpoints.greater('xl');
const lgAndLarger = breakpoints.greater('lg');

// Get Proper Date Formats
const getCreatedDate = (date: string) => format(new Date(date), 'dd-MM-yyyy');
Expand All @@ -130,9 +130,8 @@ const { fetching, error, data } = useQuery({ query: InvitedUsersDocument });

// Table Headings
const headings = [
{ key: 'adminUid', label: t('users.admin_id') },
{ key: 'adminEmail', label: t('users.admin_email') },
{ key: 'inviteeEmail', label: t('users.invitee_email') },
{ key: 'adminEmail', label: t('users.invited_by') },
{ key: 'invitedOn', label: t('users.invited_on') },
{ key: 'action', label: 'Action' },
];
Expand Down