From f2a21832aa02515ed76b5eb78d21a3ce4c7c255d Mon Sep 17 00:00:00 2001
From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com>
Date: Thu, 21 Mar 2024 17:41:37 +0530
Subject: [PATCH 1/2] refactor: removed admin id and updated header names in
invites page
---
packages/hoppscotch-sh-admin/locales/en.json | 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/locales/en.json b/packages/hoppscotch-sh-admin/locales/en.json
index b53af9d271..ad32101229 100644
--- a/packages/hoppscotch-sh-admin/locales/en.json
+++ b/packages/hoppscotch-sh-admin/locales/en.json
@@ -253,7 +253,6 @@
},
"users": {
"admin": "Admin",
- "admin_email": "Admin Email",
"admin_id": "Admin ID",
"cancel": "Cancel",
"created_on": "Created On",
@@ -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",
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/index.vue b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
index 803583a496..b8b7e66c32 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/index.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/index.vue
@@ -20,7 +20,7 @@
/>
-
+
Date: Thu, 21 Mar 2024 17:42:41 +0530
Subject: [PATCH 2/2] refactor: updated invited components with the new string
changes
---
packages/hoppscotch-sh-admin/src/components.d.ts | 1 -
packages/hoppscotch-sh-admin/src/pages/users/invited.vue | 7 +++----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/packages/hoppscotch-sh-admin/src/components.d.ts b/packages/hoppscotch-sh-admin/src/components.d.ts
index c437ffcc31..eaaf88bfec 100644
--- a/packages/hoppscotch-sh-admin/src/components.d.ts
+++ b/packages/hoppscotch-sh-admin/src/components.d.ts
@@ -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']
}
}
diff --git a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
index 526dd2db22..8d879a33c3 100644
--- a/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
+++ b/packages/hoppscotch-sh-admin/src/pages/users/invited.vue
@@ -45,7 +45,7 @@
format(new Date(date), 'dd-MM-yyyy');
@@ -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' },
];