From 30079b842d73e41130a56282ecc3881cb7efa6eb Mon Sep 17 00:00:00 2001 From: Joel Jacob Stephen <70131076+JoelJacobStephen@users.noreply.github.com> Date: Fri, 11 Oct 2024 20:47:10 +0530 Subject: [PATCH] fix(sh-admin): resolve i18n strings correctly on error toast with remove member action (#4429) --- .../hoppscotch-sh-admin/src/components.d.ts | 112 +++++++++--------- .../src/components/teams/Members.vue | 2 +- 2 files changed, 55 insertions(+), 59 deletions(-) diff --git a/packages/hoppscotch-sh-admin/src/components.d.ts b/packages/hoppscotch-sh-admin/src/components.d.ts index a3f8ceec3..e6a77bc00 100644 --- a/packages/hoppscotch-sh-admin/src/components.d.ts +++ b/packages/hoppscotch-sh-admin/src/components.d.ts @@ -1,67 +1,63 @@ // 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']; - HoppSmartCheckbox: typeof import('@hoppscotch/ui')['HoppSmartCheckbox']; - HoppSmartConfirmModal: typeof import('@hoppscotch/ui')['HoppSmartConfirmModal']; - 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']; - 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']; - IconLucideCheck: typeof import('~icons/lucide/check')['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']; - Tokens: typeof import('./components/tokens/index.vue')['default']; - TokensGenerateModal: typeof import('./components/tokens/GenerateModal.vue')['default']; - TokensList: typeof import('./components/tokens/List.vue')['default']; - TokensOverview: typeof import('./components/tokens/Overview.vue')['default']; - TokensToken: typeof import('./components/tokens/Token.vue')['default']; - 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']; - UsersSuccessInviteModal: typeof import('./components/users/SuccessInviteModal.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'] + IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default'] + IconLucideCheck: typeof import('~icons/lucide/check')['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'] + 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'] + Tokens: typeof import('./components/tokens/index.vue')['default'] + TokensGenerateModal: typeof import('./components/tokens/GenerateModal.vue')['default'] + TokensList: typeof import('./components/tokens/List.vue')['default'] + TokensOverview: typeof import('./components/tokens/Overview.vue')['default'] + 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'] + UsersSuccessInviteModal: typeof import('./components/users/SuccessInviteModal.vue')['default'] } + } diff --git a/packages/hoppscotch-sh-admin/src/components/teams/Members.vue b/packages/hoppscotch-sh-admin/src/components/teams/Members.vue index d2d7e9af9..7a48d60cd 100644 --- a/packages/hoppscotch-sh-admin/src/components/teams/Members.vue +++ b/packages/hoppscotch-sh-admin/src/components/teams/Members.vue @@ -359,7 +359,7 @@ const removeExistingTeamMember = async (userID: string, index: number) => { ); compiledErrorMessage - ? toast.error(compiledErrorMessage) + ? toast.error(t(compiledErrorMessage)) : toast.error(t('state.remove_member_failure')); } else { team.value.teamMembers = team.value.teamMembers?.filter(