Skip to content

Commit 1c1b652

Browse files
frontend: RestartMultipleButton: Wrap MenuItem in MenuList
1 parent 17c7f01 commit 1c1b652

File tree

5 files changed

+51
-38
lines changed

5 files changed

+51
-38
lines changed

frontend/src/components/common/Resource/RestartMultipleButton.stories.tsx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17+
import MenuList from '@mui/material/MenuList';
1718
import { Meta, StoryFn } from '@storybook/react';
1819
import { getTestDate } from '../../../helpers/testHelpers';
1920
import { TestContext } from '../../../test';
@@ -62,3 +63,10 @@ MenuButtonStyle.args = {
6263
] as RestartableResource[],
6364
buttonStyle: 'menu',
6465
};
66+
MenuButtonStyle.decorators = [
67+
Story => (
68+
<MenuList>
69+
<Story />
70+
</MenuList>
71+
),
72+
];

frontend/src/components/common/Resource/RestartMultipleButton.tsx

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -102,24 +102,26 @@ export default function RestartMultipleButton(props: RestartMultipleButtonProps)
102102
}}
103103
icon="mdi:restart"
104104
/>
105-
<ConfirmDialog
106-
open={openDialog}
107-
title={t('translation|Restart items')}
108-
description={<RestartMultipleButtonDescription items={items} />}
109-
handleClose={() => setOpenDialog(false)}
110-
onConfirm={() => {
111-
handleRestart();
112-
dispatchRestartEvent({
113-
resources: items,
114-
status: EventStatus.CONFIRMED,
115-
});
116-
if (afterConfirm) {
117-
afterConfirm();
118-
}
119-
}}
120-
cancelLabel={t('Cancel')}
121-
confirmLabel={t('Restart')}
122-
/>
105+
{openDialog && (
106+
<ConfirmDialog
107+
open={openDialog}
108+
title={t('translation|Restart items')}
109+
description={<RestartMultipleButtonDescription items={items} />}
110+
handleClose={() => setOpenDialog(false)}
111+
onConfirm={() => {
112+
handleRestart();
113+
dispatchRestartEvent({
114+
resources: items,
115+
status: EventStatus.CONFIRMED,
116+
});
117+
if (afterConfirm) {
118+
afterConfirm();
119+
}
120+
}}
121+
cancelLabel={t('Cancel')}
122+
confirmLabel={t('Restart')}
123+
/>
124+
)}
123125
</>
124126
);
125127
}

frontend/src/components/common/Resource/__snapshots__/RestartMultipleButton.AfterConfirmCallback.stories.storyshot

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@
1111
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
1212
/>
1313
</button>
14-
<div />
1514
</div>
1615
</body>

frontend/src/components/common/Resource/__snapshots__/RestartMultipleButton.Default.stories.storyshot

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,5 @@
1111
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
1212
/>
1313
</button>
14-
<div />
1514
</div>
1615
</body>
Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
11
<body>
22
<div>
3-
<li
4-
class="MuiButtonBase-root MuiMenuItem-root MuiMenuItem-gutters MuiMenuItem-root MuiMenuItem-gutters css-1sgjfx9-MuiButtonBase-root-MuiMenuItem-root"
5-
role="menuitem"
3+
<ul
4+
class="MuiList-root MuiList-padding css-h4y409-MuiList-root"
5+
role="menu"
66
tabindex="-1"
77
>
8-
<div
9-
class="MuiListItemIcon-root css-cveggr-MuiListItemIcon-root"
10-
/>
11-
<div
12-
class="MuiListItemText-root css-tlelie-MuiListItemText-root"
8+
<li
9+
class="MuiButtonBase-root MuiMenuItem-root MuiMenuItem-gutters MuiMenuItem-root MuiMenuItem-gutters css-1sgjfx9-MuiButtonBase-root-MuiMenuItem-root"
10+
role="menuitem"
11+
tabindex="-1"
1312
>
14-
<span
15-
class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary css-nqgwvn-MuiTypography-root"
13+
<div
14+
class="MuiListItemIcon-root css-cveggr-MuiListItemIcon-root"
15+
/>
16+
<div
17+
class="MuiListItemText-root css-tlelie-MuiListItemText-root"
1618
>
17-
Restart items
18-
</span>
19-
</div>
20-
<span
21-
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
22-
/>
23-
</li>
24-
<div />
19+
<span
20+
class="MuiTypography-root MuiTypography-body1 MuiListItemText-primary css-nqgwvn-MuiTypography-root"
21+
>
22+
Restart items
23+
</span>
24+
</div>
25+
<span
26+
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
27+
/>
28+
</li>
29+
</ul>
2530
</div>
2631
</body>

0 commit comments

Comments
 (0)