Skip to content

chore(site): remove workspace schedule banner service #10588

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.

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 4 commits into from
Nov 8, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Move mutations to queries
  • Loading branch information
BrunoQuaresma committed Nov 8, 2023
commit 293ce964a137e1e3992e34f1de96c1ec20dc3d26
27 changes: 26 additions & 1 deletion site/src/api/queries/workspaces.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import * as API from "api/api";
import { QueryClient, type QueryOptions } from "react-query";

import { putWorkspaceExtension } from "api/api";
import dayjs from "dayjs";
import { getDeadline, getMaxDeadline, getMinDeadline } from "utils/schedule";
import {
type WorkspaceBuildParameter,
type Workspace,
Expand Down Expand Up @@ -99,3 +101,26 @@ export function workspaces(config: WorkspacesRequest = {}) {
queryFn: () => API.getWorkspaces({ q, limit }),
} as const satisfies QueryOptions<WorkspacesResponse>;
}

export const decreaseDeadline = (workspace: Workspace) => {
return {
mutationFn: (hours: number) => {
const proposedDeadline = getDeadline(workspace).subtract(hours, "hours");
const newDeadline = dayjs.max(proposedDeadline, getMinDeadline());
return putWorkspaceExtension(workspace.id, newDeadline);
},
};
};

export const increaseDeadline = (workspace: Workspace) => {
return {
mutationFn: (hours: number) => {
const proposedDeadline = getDeadline(workspace).add(hours, "hours");
const newDeadline = dayjs.min(
proposedDeadline,
getMaxDeadline(workspace),
);
return putWorkspaceExtension(workspace.id, newDeadline);
},
};
};
29 changes: 24 additions & 5 deletions site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ import { templateVersion, templateVersions } from "api/queries/templates";
import { Alert } from "components/Alert/Alert";
import { Stack } from "components/Stack/Stack";
import { useWorkspaceBuildLogs } from "hooks/useWorkspaceBuildLogs";
import { useDecreaseDeadline, useIncreaseDeadline } from "./scheduleControls";
import { decreaseDeadline, increaseDeadline } from "api/queries/workspaces";
import { getErrorMessage } from "api/errors";
import { displaySuccess, displayError } from "components/GlobalSnackbar/utils";

interface WorkspaceReadyPageProps {
workspaceState: StateFrom<typeof workspaceMachine>;
Expand Down Expand Up @@ -118,8 +120,25 @@ export const WorkspaceReadyPage = ({
} = useMutation({
mutationFn: restartWorkspace,
});
const decreaseDeadline = useDecreaseDeadline(workspace);
const increaseDeadline = useIncreaseDeadline(workspace);

const onDeadlineChangeSuccess = () => {
displaySuccess("Updated workspace shutdown time.");
};
const onDeadlineChangeFails = (error: unknown) => {
displayError(
getErrorMessage(error, "Failed to update workspace shutdown time."),
);
};
const decreaseMutation = useMutation({
...decreaseDeadline(workspace),
onSuccess: onDeadlineChangeSuccess,
onError: onDeadlineChangeFails,
});
const increaseMutation = useMutation({
...increaseDeadline(workspace),
onSuccess: onDeadlineChangeSuccess,
onError: onDeadlineChangeFails,
});

return (
<>
Expand All @@ -139,8 +158,8 @@ export const WorkspaceReadyPage = ({

<Workspace
scheduleProps={{
onDeadlineMinus: decreaseDeadline,
onDeadlinePlus: increaseDeadline,
onDeadlineMinus: decreaseMutation.mutate,
onDeadlinePlus: increaseMutation.mutate,
maxDeadlineDecrease: getMaxDeadlineChange(deadline, getMinDeadline()),
maxDeadlineIncrease: getMaxDeadlineChange(
getMaxDeadline(workspace),
Expand Down
50 changes: 0 additions & 50 deletions site/src/pages/WorkspacePage/scheduleControls.ts

This file was deleted.