From 099f7c0082e0fb7494765c5993a949da85ac828e Mon Sep 17 00:00:00 2001 From: PeterYurkovich Date: Tue, 12 May 2026 10:04:24 -0400 Subject: [PATCH] fix: prevent namespace desync through namespace variable loading race condition --- .../components/dashboards/legacy/legacy-variable-dropdowns.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/src/components/dashboards/legacy/legacy-variable-dropdowns.tsx b/web/src/components/dashboards/legacy/legacy-variable-dropdowns.tsx index b9fa73d24..662c7dbe9 100644 --- a/web/src/components/dashboards/legacy/legacy-variable-dropdowns.tsx +++ b/web/src/components/dashboards/legacy/legacy-variable-dropdowns.tsx @@ -257,7 +257,8 @@ const LegacyDashboardsVariableDropdown: FC = ({ id, name ]); useEffect(() => { - if (variable?.value !== queryParam) { + // Wait to set variable and query values until all options have been loaded + if (variable?.value !== queryParam && options?.length > 0) { // Default to using the query param to allow for sharable links if (queryParam) { dispatch(dashboardsPatchVariable(name, { value: queryParam }));