From 1bf4ae779a86f06ac4360e188bc6788301d2e820 Mon Sep 17 00:00:00 2001
From: Alexander Polyankin <alexander.polyankin@metabase.com>
Date: Sat, 29 Jan 2022 01:37:06 +0300
Subject: [PATCH] Fix rerender when locale changes (#20015)
---
.../components/SettingsPage/SettingsPage.tsx | 20 +++++++++++--------
.../metabase/setup/components/Setup/Setup.tsx | 6 +++---
2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx b/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx
index 288627c6335..9e43aba4081 100644
--- a/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx
+++ b/frontend/src/metabase/setup/components/SettingsPage/SettingsPage.tsx
@@ -14,7 +14,11 @@ export interface SettingsPageProps {
onStepShow: (step: number) => void;
}
-const SettingsPage = ({ step, onStepShow }: SettingsPageProps): JSX.Element => {
+const SettingsPage = ({
+ step,
+ onStepShow,
+ ...props
+}: SettingsPageProps): JSX.Element => {
useEffect(() => {
onStepShow(step);
}, [step, onStepShow]);
@@ -25,13 +29,13 @@ const SettingsPage = ({ step, onStepShow }: SettingsPageProps): JSX.Element => {
<LogoIcon height={51} />
</PageHeader>
<PageBody>
- <LanguageStep />
- <UserStep />
- <DatabaseStep />
- <DatabaseHelp />
- <PreferencesStep />
- <CompletedStep />
- <SetupHelp />
+ <LanguageStep {...props} />
+ <UserStep {...props} />
+ <DatabaseStep {...props} />
+ <DatabaseHelp {...props} />
+ <PreferencesStep {...props} />
+ <CompletedStep {...props} />
+ <SetupHelp {...props} />
</PageBody>
</div>
);
diff --git a/frontend/src/metabase/setup/components/Setup/Setup.tsx b/frontend/src/metabase/setup/components/Setup/Setup.tsx
index 8ae142cfda1..e5dcd69d9f0 100644
--- a/frontend/src/metabase/setup/components/Setup/Setup.tsx
+++ b/frontend/src/metabase/setup/components/Setup/Setup.tsx
@@ -6,11 +6,11 @@ export interface SetupProps {
isWelcome: boolean;
}
-const Setup = ({ isWelcome }: SetupProps): JSX.Element => {
+const Setup = ({ isWelcome, ...props }: SetupProps): JSX.Element => {
if (isWelcome) {
- return <WelcomePage />;
+ return <WelcomePage {...props} />;
} else {
- return <SettingsPage />;
+ return <SettingsPage {...props} />;
}
};
--
GitLab