IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

DashboardScene: Fixes checkbox orienation in save forms (#86408)

Browse Source
This commit is contained in:
Torkel Ödegaard 2024-04-18 10:15:06 +02:00 committed by GitHub
parent 4e0e12bb07
commit 1d513f66b8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
public/app/features/dashboard-scene/saving/SaveDashboardForm.tsx
View File

@ -101,7 +101,7 @@ export function SaveDashboardForm({ dashboard, drawer, changeInfo }: Props) {
} }
return ( return (
<Stack gap={0} direction="column"> <Stack gap={2} direction="column">
<SaveDashboardFormCommonOptions drawer={drawer} changeInfo={changeInfo} /> <SaveDashboardFormCommonOptions drawer={drawer} changeInfo={changeInfo} />
<Field label="Message"> <Field label="Message">
<TextArea <TextArea
@ -118,7 +118,7 @@ export function SaveDashboardForm({ dashboard, drawer, changeInfo }: Props) {
rows={5} rows={5}
/> />
</Field> </Field>
<Box paddingTop={2}>{renderFooter(state.error)}</Box> {renderFooter(state.error)}
</Stack> </Stack>
); );
} }
@ -133,37 +133,37 @@ export function SaveDashboardFormCommonOptions({ drawer, changeInfo }: SaveDashb
const { hasTimeChanges, hasVariableValueChanges, hasRefreshChange } = changeInfo; const { hasTimeChanges, hasVariableValueChanges, hasRefreshChange } = changeInfo;
return ( return (
<> <Stack direction={'column'} alignItems={'flex-start'}>
{hasTimeChanges && ( {hasTimeChanges && (
<Field label="Update default time range" description="Will make current time range the new default"> <Checkbox
<Checkbox id="save-timerange"
id="save-timerange" checked={saveTimeRange}
checked={saveTimeRange} onChange={drawer.onToggleSaveTimeRange}
onChange={drawer.onToggleSaveTimeRange} label="Update default time range"
data-testid={selectors.pages.SaveDashboardModal.saveTimerange} description={'Will make current time range the new default'}
/> data-testid={selectors.pages.SaveDashboardModal.saveTimerange}
</Field> />
)} )}
{hasRefreshChange && ( {hasRefreshChange && (
<Field label="Update default refresh value" description="Will make the current refresh the new default"> <Checkbox
<Checkbox id="save-refresh"
id="save-refresh" label="Update default refresh value"
checked={saveRefresh} description="Will make the current refresh the new default"
onChange={drawer.onToggleSaveRefresh} checked={saveRefresh}
data-testid={selectors.pages.SaveDashboardModal.saveRefresh} onChange={drawer.onToggleSaveRefresh}
/> data-testid={selectors.pages.SaveDashboardModal.saveRefresh}
</Field> />
)} )}
{hasVariableValueChanges && ( {hasVariableValueChanges && (
<Field label="Update default variable values" description="Will make the current values the new default"> <Checkbox
<Checkbox id="save-variables"
id="save-variables" label="Update default variable values"
checked={saveVariables} description="Will make the current values the new default"
onChange={drawer.onToggleSaveVariables} checked={saveVariables}
data-testid={selectors.pages.SaveDashboardModal.saveVariables} onChange={drawer.onToggleSaveVariables}
/> data-testid={selectors.pages.SaveDashboardModal.saveVariables}
</Field> />
)} )}
</> </Stack>
); );
} }

6
public/app/features/dashboard-scene/saving/SaveProvisionedDashboardForm.tsx
View File

@ -49,9 +49,9 @@ export function SaveProvisionedDashboardForm({ dashboard, drawer, changeInfo }:
<br /> <br /> <br /> <br />
<strong>File path: </strong> {dashboard.state.meta.provisionedExternalId} <strong>File path: </strong> {dashboard.state.meta.provisionedExternalId}
</div> </div>
<Stack direction="column" gap={0}>
<SaveDashboardFormCommonOptions drawer={drawer} changeInfo={changeInfo} /> <SaveDashboardFormCommonOptions drawer={drawer} changeInfo={changeInfo} />
</Stack>
<div className={styles.json}> <div className={styles.json}>
<AutoSizer disableWidth> <AutoSizer disableWidth>
{({ height }) => ( {({ height }) => (