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.

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

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75e7904
Extract all schedule controls from machine
BrunoQuaresma Nov 8, 2023
8d1ee30
Remove workspace schedule banner xservice
BrunoQuaresma Nov 8, 2023
dd6dd84
Merge branch 'main' of https://github.com/coder/coder into bq/remove-…
BrunoQuaresma Nov 8, 2023
293ce96
Move mutations to queries
BrunoQuaresma Nov 8, 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
Next Next commit
Extract all schedule controls from machine
  • Loading branch information
@BrunoQuaresma
BrunoQuaresma committed Nov 8, 2023
commit 75e7904669909936753b3721834c8cfe27478461
25 changes: 5 additions & 20 deletions site/src/pages/WorkspacePage/WorkspaceReadyPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { useActor } from "@xstate/react";
import { useDashboard } from "components/Dashboard/DashboardProvider";
import dayjs from "dayjs";
import { useFeatureVisibility } from "hooks/useFeatureVisibility";
Expand Down Expand Up @@ -34,6 +33,7 @@ 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";

interface WorkspaceReadyPageProps {
workspaceState: StateFrom<typeof workspaceMachine>;
Expand All @@ -56,9 +56,6 @@ export const WorkspaceReadyPage = ({
isLoadingMoreBuilds,
hasMoreBuilds,
}: WorkspaceReadyPageProps): JSX.Element => {
const [_, bannerSend] = useActor(
workspaceState.children["scheduleBannerMachine"],
);
const { buildInfo } = useDashboard();
const featureVisibility = useFeatureVisibility();
const {
Expand Down Expand Up @@ -121,10 +118,8 @@ export const WorkspaceReadyPage = ({
} = useMutation({
mutationFn: restartWorkspace,
});
// keep banner machine in sync with workspace
useEffect(() => {
bannerSend({ type: "REFRESH_WORKSPACE", workspace });
}, [bannerSend, workspace]);
const decreaseDeadline = useDecreaseDeadline(workspace);
const increaseDeadline = useIncreaseDeadline(workspace);

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

<Workspace
scheduleProps={{
onDeadlineMinus: (hours: number) => {
bannerSend({
type: "DECREASE_DEADLINE",
hours,
});
},
onDeadlinePlus: (hours: number) => {
bannerSend({
type: "INCREASE_DEADLINE",
hours,
});
},
onDeadlineMinus: decreaseDeadline,
onDeadlinePlus: increaseDeadline,
maxDeadlineDecrease: getMaxDeadlineChange(deadline, getMinDeadline()),
maxDeadlineIncrease: getMaxDeadlineChange(
getMaxDeadline(workspace),
Expand Down
50 changes: 50 additions & 0 deletions site/src/pages/WorkspacePage/scheduleControls.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import { putWorkspaceExtension } from "api/api";
import { Workspace } from "api/typesGenerated";
import dayjs from "dayjs";
import { getDeadline, getMaxDeadline, getMinDeadline } from "utils/schedule";
import minMax from "dayjs/plugin/minMax";
import { useMutation } from "react-query";
import { displayError, displaySuccess } from "components/GlobalSnackbar/utils";
import { getErrorMessage } from "api/errors";

dayjs.extend(minMax);

const callbacks = {
onSuccess: () => {
displaySuccess("Updated workspace shutdown time.");
},
onError: (error: unknown) => {
displayError(
getErrorMessage(error, "Failed to update workspace shutdown time."),
);
},
};

export const useIncreaseDeadline = (workspace: Workspace) => {
const mutation = useMutation({
mutationFn: (hours: number) => increaseDeadline(workspace, hours),
...callbacks,
});
return mutation.mutate;
};

export const useDecreaseDeadline = (workspace: Workspace) => {
const mutation = useMutation({
mutationFn: (hours: number) => decreaseDeadline(workspace, hours),
...callbacks,
});
return mutation.mutate;
};

const increaseDeadline = (workspace: Workspace, hours: number) => {
const proposedDeadline = getDeadline(workspace).add(hours, "hours");
const newDeadline = dayjs.min(proposedDeadline, getMaxDeadline(workspace));

return putWorkspaceExtension(workspace.id, newDeadline);
};

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