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

Chore: RolePickerMenu and RolePickerSubmenu - Replace HorizontalGroup with Stack (#86145)

Browse Source
This commit is contained in:
Laura Fernández 2024-04-15 16:12:47 +02:00 committed by GitHub
parent 499ad35a50
commit afbd28e160
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.betterer.results
View File

@ -1233,12 +1233,6 @@ exports[`better eslint`] = {
[0, 0, 0, "Styles should be written using objects.", "5"], [0, 0, 0, "Styles should be written using objects.", "5"],
[0, 0, 0, "Styles should be written using objects.", "6"] [0, 0, 0, "Styles should be written using objects.", "6"]
], ],
"public/app/core/components/RolePicker/RolePickerMenu.tsx:5381": [
[0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
],
"public/app/core/components/RolePicker/RolePickerSubMenu.tsx:5381": [
[0, 0, 0, "\'HorizontalGroup\' import from \'@grafana/ui\' is restricted from being used by a pattern. Use Stack component instead.", "0"]
],
"public/app/core/components/RolePicker/ValueContainer.tsx:5381": [ "public/app/core/components/RolePicker/ValueContainer.tsx:5381": [
[0, 0, 0, "Styles should be written using objects.", "0"] [0, 0, 0, "Styles should be written using objects.", "0"]
], ],

6
public/app/core/components/RolePicker/RolePickerMenu.tsx
View File

@ -1,7 +1,7 @@
import { css, cx } from '@emotion/css'; import { css, cx } from '@emotion/css';
import React, { useEffect, useRef, useState } from 'react'; import React, { useEffect, useRef, useState } from 'react';
import { Button, CustomScrollbar, HorizontalGroup, TextLink, useStyles2, useTheme2 } from '@grafana/ui'; import { Button, CustomScrollbar, Stack, TextLink, useStyles2, useTheme2 } from '@grafana/ui';
import { getSelectStyles } from '@grafana/ui/src/components/Select/getSelectStyles'; import { getSelectStyles } from '@grafana/ui/src/components/Select/getSelectStyles';
import { OrgRole, Role } from 'app/types'; import { OrgRole, Role } from 'app/types';
@ -256,14 +256,14 @@ export const RolePickerMenu = ({
))} ))}
</CustomScrollbar> </CustomScrollbar>
<div className={customStyles.menuButtonRow}> <div className={customStyles.menuButtonRow}>
<HorizontalGroup justify="flex-end"> <Stack justifyContent="flex-end">
<Button size="sm" fill="text" onClick={onClearInternal} disabled={updateDisabled}> <Button size="sm" fill="text" onClick={onClearInternal} disabled={updateDisabled}>
Clear all Clear all
</Button> </Button>
<Button size="sm" onClick={onUpdateInternal} disabled={updateDisabled}> <Button size="sm" onClick={onUpdateInternal} disabled={updateDisabled}>
{apply ? `Apply` : `Update`} {apply ? `Apply` : `Update`}
</Button> </Button>
</HorizontalGroup> </Stack>
</div> </div>
</div> </div>
<div ref={subMenuNode} /> <div ref={subMenuNode} />

6
public/app/core/components/RolePicker/RolePickerSubMenu.tsx
View File

@ -1,7 +1,7 @@
import { cx } from '@emotion/css'; import { cx } from '@emotion/css';
import React from 'react'; import React from 'react';
import { Button, CustomScrollbar, HorizontalGroup, useStyles2, useTheme2 } from '@grafana/ui'; import { Button, CustomScrollbar, Stack, useStyles2, useTheme2 } from '@grafana/ui';
import { getSelectStyles } from '@grafana/ui/src/components/Select/getSelectStyles'; import { getSelectStyles } from '@grafana/ui/src/components/Select/getSelectStyles';
import { Role } from 'app/types'; import { Role } from 'app/types';
@ -65,11 +65,11 @@ export const RolePickerSubMenu = ({
</div> </div>
</CustomScrollbar> </CustomScrollbar>
<div className={customStyles.subMenuButtonRow}> <div className={customStyles.subMenuButtonRow}>
<HorizontalGroup justify="flex-end"> <Stack justifyContent="flex-end">
<Button size="sm" fill="text" onClick={onClearInternal}> <Button size="sm" fill="text" onClick={onClearInternal}>
Clear Clear
</Button> </Button>
</HorizontalGroup> </Stack>
</div> </div>
</div> </div>
); );