public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: hide options when multi properties exist on every var options

Browse Source
This commit is contained in:
grafakus
2025-11-25 12:11:37 +01:00
parent 18c4f5b875
commit e0c28cfa4c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/app/features/dashboard-scene/settings/variables/useVariableSelectionOptionsCategory.tsx
+8 -4
View File
@@ -46,8 +46,10 @@ export function useVariableSelectionOptionsCategory(variable: MultiValueVariable
),
useShowIf: () => {
const state = variable.useState();
const hasJsonValuesFormat = 'valuesFormat' in state && state.valuesFormat === 'json';
return hasJsonValuesFormat ? false : (state.includeAll ?? false);
const hasMultiProps =
('valuesFormat' in state && state.valuesFormat === 'json') ||
state.options.every((o) => Boolean(o.properties));
return hasMultiProps ? false : (state.includeAll ?? false);
},
render: (descriptor) => <CustomAllValueInput id={descriptor.props.id} variable={variable} />,
})
@@ -62,8 +64,10 @@ export function useVariableSelectionOptionsCategory(variable: MultiValueVariable
),
useShowIf: () => {
const state = variable.useState();
const hasJsonValuesFormat = 'valuesFormat' in state && state.valuesFormat === 'json';
return !hasJsonValuesFormat;
const hasMultiProps =
('valuesFormat' in state && state.valuesFormat === 'json') ||
state.options.every((o) => Boolean(o.properties));
return !hasMultiProps;
},
render: (descriptor) => <AllowCustomSwitch id={descriptor.props.id} variable={variable} />,
})