Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix race condition in FormattingWidget initialization (#69777) (#69778)

Will Bryant2f2ab17ebb3a
diff --git a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsx b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsx
index 841b75f21ae..90a7d0f6948 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/FormattingWidget.tsx
@@ -40,7 +40,6 @@ export function FormattingWidget() {
const {
value: initialValue,
updateSetting,
- isLoading,
settingDetails,
} = useAdminSetting("custom-formatting");
const [localValue, setLocalValue] = useState<FormattingSettings | undefined>({
@@ -48,6 +47,13 @@ export function FormattingWidget() {
...initialValue,
});
+ useEffect(() => {
+ setLocalValue({
+ ...DEFAULT_FORMATTING_SETTINGS,
+ ...initialValue,
+ });
+ }, [initialValue]);
+
const {
date_style: dateStyle,
date_abbreviate: dateAbreviate,
@@ -71,10 +77,6 @@ export function FormattingWidget() {
return [currencyOptions, currencyStyleOptions];
}, [currency, currencyStyle]);
- if (isLoading) {
- return null;
- }
-
const dateStyleOptions = getDateStyleOptionsForUnit("default", dateAbreviate);
const handleChange = (newValue: FormattingSettings) => {