From 18c2386e9e5f881742bcf7297d0145c31e2844c7 Mon Sep 17 00:00:00 2001 From: Bruno Quaresma Date: Wed, 6 Nov 2024 14:24:32 -0300 Subject: [PATCH] chore(site): fix reset password storybook flake (#15380) Fix https://github.com/coder/internal/issues/69 --- site/src/pages/UsersPage/UsersPage.stories.tsx | 3 +++ site/src/pages/UsersPage/UsersPage.tsx | 10 ++++++++-- site/src/pages/UsersPage/UsersPageView.stories.tsx | 1 - 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/site/src/pages/UsersPage/UsersPage.stories.tsx b/site/src/pages/UsersPage/UsersPage.stories.tsx index fda6234668..9a426be530 100644 --- a/site/src/pages/UsersPage/UsersPage.stories.tsx +++ b/site/src/pages/UsersPage/UsersPage.stories.tsx @@ -72,6 +72,9 @@ const meta: Meta = { component: UsersPage, parameters, decorators: [withGlobalSnackbar, withAuthProvider, withDashboardProvider], + args: { + defaultNewPassword: "edWbqYiaVpEiEWwI", + }, }; export default meta; diff --git a/site/src/pages/UsersPage/UsersPage.tsx b/site/src/pages/UsersPage/UsersPage.tsx index a4db3aed3c..e4337f9242 100644 --- a/site/src/pages/UsersPage/UsersPage.tsx +++ b/site/src/pages/UsersPage/UsersPage.tsx @@ -35,7 +35,13 @@ import { ResetPasswordDialog } from "./ResetPasswordDialog"; import { useStatusFilterMenu } from "./UsersFilter"; import { UsersPageView } from "./UsersPageView"; -const UsersPage: FC = () => { +type UserPageProps = { + // Used by Storybook to prevent generating a new password each time the story + // loads, avoiding Chromatic snapshot differences. + defaultNewPassword?: string; +}; + +const UsersPage: FC = ({ defaultNewPassword }) => { const queryClient = useQueryClient(); const navigate = useNavigate(); const location = useLocation(); @@ -134,7 +140,7 @@ const UsersPage: FC = () => { onResetUserPassword={(user) => { setConfirmResetPassword({ user, - newPassword: generateRandomString(12), + newPassword: defaultNewPassword ?? generateRandomString(12), }); }} onUpdateUserRoles={async (userId, roles) => { diff --git a/site/src/pages/UsersPage/UsersPageView.stories.tsx b/site/src/pages/UsersPage/UsersPageView.stories.tsx index ba7bf7599d..81e557221e 100644 --- a/site/src/pages/UsersPage/UsersPageView.stories.tsx +++ b/site/src/pages/UsersPage/UsersPageView.stories.tsx @@ -34,7 +34,6 @@ const meta: Meta = { isNonInitialPage: false, users: [MockUser, MockUser2], roles: MockAssignableSiteRoles, - canEditUsers: true, filterProps: defaultFilterProps, authMethods: MockAuthMethodsPasswordOnly,