Skip to content

feat: add extra workspace actions in the workspaces table #17775

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 15 commits into from
May 13, 2025
Merged

feat: add extra workspace actions in the workspaces table #17775

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
496473f
Refactor base menu component
BrunoQuaresma May 12, 2025
22759e3
Refactor change workspace version
BrunoQuaresma May 12, 2025
2f3cce0
Refactor delete workspace
BrunoQuaresma May 12, 2025
f7e9ba9
Refactor duplicate and clean up code
BrunoQuaresma May 12, 2025
a3c4908
Move components and fix build errors
BrunoQuaresma May 12, 2025
d5ae7e1
Minor visual fixes
BrunoQuaresma May 12, 2025
0c65d4f
Fix debug check
BrunoQuaresma May 12, 2025
3b5f20b
Add more actions to workspaces row
BrunoQuaresma May 12, 2025
207094a
Minor fixes
BrunoQuaresma May 12, 2025
c79952b
Run FMT
BrunoQuaresma May 12, 2025
be967dd
Fix lint and tests
BrunoQuaresma May 12, 2025
139548c
Fix stories
BrunoQuaresma May 13, 2025
84b65a8
Apply PR reviews
BrunoQuaresma May 13, 2025
96a6ffd
Merge branch 'main' of https://github.com/coder/coder into bq/more-ac…
BrunoQuaresma May 13, 2025
62413e0
Fix stories
BrunoQuaresma May 13, 2025
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
Fix debug check
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed May 12, 2025
commit 0c65d4f1c5df4f8272f61d1163d75caa4e9af6a7
1 change: 1 addition & 0 deletions site/src/api/queries/deployment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export const deploymentConfig = () => {
return {
queryKey: deploymentConfigQueryKey,
queryFn: API.getDeploymentConfig,
staleTime: Number.POSITIVE_INFINITY,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just making sure: are we guaranteed that the config won't ever change after the initial request from the server? I know we already disable a lot of the RQ background refetch functionality, so I'm wondering if there's any harm in letting the data be marked as stale, since I'd think the data would still be refetched relatively infrequently

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeap! To change these deployment configs even coderd would need to be restarted 😄

};
};

Expand Down
13 changes: 10 additions & 3 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 @@ -22,6 +22,8 @@ import { DebugButton } from "./DebugButton";
import { RetryButton } from "./RetryButton";
import { WorkspaceMoreActions } from "modules/workspaces/WorkspaceMoreActions/WorkspaceMoreActions";
import type { WorkspacePermissions } from "modules/workspaces/permissions";
import { useQuery } from "react-query";
import { deploymentConfig } from "api/queries/deployment";

export interface WorkspaceActionsProps {
workspace: Workspace;
Expand Down Expand Up @@ -55,11 +57,16 @@ export const WorkspaceActions: FC<WorkspaceActionsProps> = ({
handleDormantActivate,
}) => {
const { user } = useAuthenticated();
const isOwner =
user.roles.find((role) => role.name === "owner") !== undefined;
const { data: deployment } = useQuery({
...deploymentConfig(),
enabled: permissions.deploymentConfig,
});
const { actions, canCancel, canAcceptJobs } = abilitiesByWorkspaceStatus(
workspace,
{ canDebug: permissions.deploymentConfig, isOwner },
{
canDebug: !!deployment?.config.enable_terraform_debug_mode,
isOwner: !!user.roles.find((role) => role.name === "owner"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be changed to user.roles.some((role) => role.name === "owner"), which is a little more clear, and will have less memory usage

},
);

const mustUpdate = mustUpdateWorkspace(
Expand Down
12 changes: 8 additions & 4 deletions site/src/pages/WorkspacePage/WorkspacePage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import {
} from "testHelpers/renderHelpers";
import { server } from "testHelpers/server";
import WorkspacePage from "./WorkspacePage";
import type { WorkspacePermissions } from "modules/workspaces/permissions";

const { API, MissingBuildParameters } = apiModule;

Expand Down Expand Up @@ -126,11 +127,14 @@ describe("WorkspacePage", () => {
// set permissions
server.use(
http.post("/api/v2/authcheck", async () => {
return HttpResponse.json({
updateTemplates: true,
const permissions: WorkspacePermissions = {
deleteFailedWorkspace: true,
deploymentConfig: true,
readWorkspace: true,
updateWorkspace: true,
updateTemplate: true,
});
updateWorkspaceVersion: true,
};
return HttpResponse.json(permissions);
}),
);

Expand Down