Skip to content

OU-814: [release-coo-0.4] fix prevent variable provider cache when dashboard change #449

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 27, 2025
Merged

OU-814: [release-coo-0.4] fix prevent variable provider cache when dashboard change #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion web/src/components/dashboards/perses/PersesWrapper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ function InnerWrapper({ children, project, dashboardName }) {
>
<VariableProviderWithQueryParams
builtinVariableDefinitions={builtinVariables}
initialVariableDefinitions={persesDashboard?.spec?.variables}
initialVariableDefinitions={clearedDashboardResource?.spec?.variables}
key={clearedDashboardResource?.metadata.name}
>
<PersesPrometheusDatasourceWrapper
queries={[]}
Expand Down
22 changes: 16 additions & 6 deletions web/src/components/dashboards/shared/dashboard-skeleton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ import {
Title,
} from '@patternfly/react-core';
import { TimeRangeControls } from '@perses-dev/plugin-system';
import { DashboardStickyToolbar, useDashboardActions } from '@perses-dev/dashboards';
import {
DashboardStickyToolbar,
useDashboardActions,
useVariableDefinitions,
} from '@perses-dev/dashboards';

const HeaderTop: React.FC = React.memo(() => {
const { t } = useTranslation(process.env.I18N_NAMESPACE);
Expand Down Expand Up @@ -55,12 +59,16 @@ const DashboardSkeleton: React.FC<MonitoringDashboardsPageProps> = React.memo(

const { perspective } = usePerspective();
const { setDashboard } = useDashboardActions();
const variables = useVariableDefinitions();

const onChangeBoard = (selectedDashboard: string) => {
changeBoard(selectedDashboard);

if (isPerses) {
const selectedBoard = boardItems.find((item) => item.name === selectedDashboard);
const selectedBoard = boardItems.find(
(item) => item.name.toLowerCase() === selectedDashboard.toLowerCase(),
);

if (selectedBoard) {
setDashboard(selectedBoard.persesDashboard);
}
Expand All @@ -87,10 +95,12 @@ const DashboardSkeleton: React.FC<MonitoringDashboardsPageProps> = React.memo(
</StackItem>
)}
{isPerses ? (
<StackItem>
<b> {t('Dashboard Variables')} </b>
<DashboardStickyToolbar initialVariableIsSticky={false} />
</StackItem>
variables.length > 0 ? (
<StackItem>
<b> {t('Dashboard Variables')} </b>
<DashboardStickyToolbar initialVariableIsSticky={false} key={dashboardName} />
</StackItem>
) : null
) : (
<StackItem>
<LegacyDashboardsAllVariableDropdowns key={dashboardName} />
Expand Down