Skip to content

feat(site): add stop and start batch actions #10565

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 9 commits into from
Nov 8, 2023
Merged

feat(site): add stop and start batch actions #10565

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7038c8b
Refactor MoreMnu to be more flexible
BrunoQuaresma Nov 7, 2023
07c1d29
Update menus to use the new way
BrunoQuaresma Nov 7, 2023
8994d1b
Add base
BrunoQuaresma Nov 7, 2023
dd32703
Fix wrong deps
BrunoQuaresma Nov 7, 2023
894629d
Add bulk actions
BrunoQuaresma Nov 7, 2023
85696d3
Extract batch logic into a hook
BrunoQuaresma Nov 7, 2023
59ed10f
Fix missed step to close delete all modal
BrunoQuaresma Nov 7, 2023
eebbdd4
Fix tests
BrunoQuaresma Nov 7, 2023
78aa58f
Fix fmt
BrunoQuaresma Nov 7, 2023
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
Prev Previous commit
Next Next commit
Update menus to use the new way
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Nov 7, 2023
commit 07c1d2994e0ab07f6007ef64d0221734d9f82254
5 changes: 4 additions & 1 deletion site/src/pages/GroupsPage/GroupPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import {
MoreMenuContent,
MoreMenuItem,
MoreMenuTrigger,
ThreeDotsButton,
} from "components/MoreMenu/MoreMenu";

export const GroupPage: FC = () => {
Expand Down Expand Up @@ -287,7 +288,9 @@ const GroupMemberRow = (props: {
<TableCell width="1%">
{canUpdate && (
<MoreMenu>
<MoreMenuTrigger />
<MoreMenuTrigger>
<ThreeDotsButton />
</MoreMenuTrigger>
<MoreMenuContent>
<MoreMenuItem
danger
Expand Down
5 changes: 4 additions & 1 deletion site/src/pages/TemplatePage/TemplatePageHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
MoreMenuContent,
MoreMenuItem,
MoreMenuTrigger,
ThreeDotsButton,
} from "components/MoreMenu/MoreMenu";
import Divider from "@mui/material/Divider";

Expand Down Expand Up @@ -59,7 +60,9 @@ const TemplateMenu: FC<TemplateMenuProps> = ({
return (
<>
<MoreMenu>
<MoreMenuTrigger />
<MoreMenuTrigger>
<ThreeDotsButton />
</MoreMenuTrigger>
<MoreMenuContent>
<MoreMenuItem
onClick={() => {
Expand Down
9 changes: 7 additions & 2 deletions site/src/pages/TemplateSettingsPage/TemplatePermissionsPage/TemplatePermissionsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import {
MoreMenuContent,
MoreMenuItem,
MoreMenuTrigger,
ThreeDotsButton,
} from "components/MoreMenu/MoreMenu";

type AddTemplateUserOrGroupProps = {
Expand Down Expand Up @@ -287,7 +288,9 @@ export const TemplatePermissionsPageView: FC<
<TableCell>
{canUpdatePermissions && (
<MoreMenu>
<MoreMenuTrigger />
<MoreMenuTrigger>
<ThreeDotsButton />
</MoreMenuTrigger>
<MoreMenuContent>
<MoreMenuItem
danger
Expand Down Expand Up @@ -334,7 +337,9 @@ export const TemplatePermissionsPageView: FC<
<TableCell>
{canUpdatePermissions && (
<MoreMenu>
<MoreMenuTrigger />
<MoreMenuTrigger>
<ThreeDotsButton />
</MoreMenuTrigger>
<MoreMenuContent>
<MoreMenuItem
danger
Expand Down
5 changes: 4 additions & 1 deletion site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
MoreMenuTrigger,
MoreMenuContent,
MoreMenuItem,
ThreeDotsButton,
} from "components/MoreMenu/MoreMenu";
import Divider from "@mui/material/Divider";

Expand Down Expand Up @@ -183,7 +184,9 @@ export const UsersTableBody: FC<
{canEditUsers && (
<TableCell>
<MoreMenu>
<MoreMenuTrigger />
<MoreMenuTrigger>
<ThreeDotsButton />
</MoreMenuTrigger>
<MoreMenuContent>
{user.status === "active" || user.status === "dormant" ? (
<MoreMenuItem
Expand Down
17 changes: 10 additions & 7 deletions site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import {
MoreMenuContent,
MoreMenuItem,
MoreMenuTrigger,
ThreeDotsButton,
} from "components/MoreMenu/MoreMenu";

export interface WorkspaceActionsProps {
Expand Down Expand Up @@ -132,13 +133,15 @@ export const WorkspaceActions: FC<WorkspaceActionsProps> = ({

{canCancel && <CancelButton handleAction={handleCancel} />}
<MoreMenu>
<MoreMenuTrigger
title="More options"
size="small"
data-testid="workspace-options-button"
aria-controls="workspace-options"
disabled={!canAcceptJobs}
/>
<MoreMenuTrigger>
<ThreeDotsButton
title="More options"
size="small"
data-testid="workspace-options-button"
aria-controls="workspace-options"
disabled={!canAcceptJobs}
/>
</MoreMenuTrigger>

<MoreMenuContent id="workspace-options">
<MoreMenuItem onClick={handleSettings}>
Expand Down