Skip to content

OU-830: [release-coo-0.5] fix: add error boundary to variable dropdown #418

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
May 28, 2025
Merged

OU-830: [release-coo-0.5] fix: add error boundary to variable dropdown #418

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
14 changes: 11 additions & 3 deletions web/src/components/dashboards/perses/variable-dropdowns.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
useVariableDefinitions,
} from '@perses-dev/dashboards';
import { useListVariablePluginValues, VariableOption } from '@perses-dev/plugin-system';
import ErrorBoundary from '../../console/console-shared/error/error-boundary';

/**
* This file is approximately the equal of `perses/ui/dashboards/src/components/Variables/Variable`
Expand Down Expand Up @@ -108,8 +109,8 @@ function ListVariable({ name, id }: VariableDropdownProps) {
children: string;
}
>(viewOptions, (option: VariableOption) => ({
value: option.label,
children: option.label,
value: option?.label,
children: option?.label,
}));

const title = definition?.spec.display?.name ?? name;
Expand Down Expand Up @@ -154,12 +155,19 @@ export const AllVariableDropdowns: React.FC = () => {
export function VariableComponent({ name }: VariableProps) {
const ctx = useVariableDefinitionAndState(name);
const kind = ctx.definition?.kind;

let variableComponent = null;

switch (kind) {
// Openshift doesn't support this, so ignore for now
// case 'TextVariable':
// return <TextVariable name={name} source={source} />;
case 'ListVariable':
return <ListVariable id={name} name={name} />;
variableComponent = <ListVariable id={name} name={name} />;
}

if (variableComponent) {
return <ErrorBoundary>{variableComponent}</ErrorBoundary>;
}

return <div>Unsupported Variable Kind: ${kind}</div>;
Expand Down