Skip to content

feat: add frontend support for enabling automatic workspace updates #10375

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 11 commits into from
Oct 31, 2023
Merged

feat: add frontend support for enabling automatic workspace updates #10375

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a66709a
feat: add frontend support for enabling automatic workspace updates
sreya Oct 20, 2023
262050a
cleanup
Kira-Pilot Oct 20, 2023
86b0cb7
add update policy to workspace stats
sreya Oct 21, 2023
ce25bba
revert restrictive behavior
sreya Oct 21, 2023
3602dd9
move workspace setting behind experimental
sreya Oct 21, 2023
2f0ef94
remove unused import
sreya Oct 21, 2023
c68a8b6
Merge branch 'main' into jon/wsautoupdatefe
sreya Oct 30, 2023
e751552
pr comments
sreya Oct 30, 2023
2a67fe3
pr comments
sreya Oct 31, 2023
2018b0b
remove unused prop
sreya Oct 31, 2023
673b214
storybook: add auto updates story
aslilac Oct 31, 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
pr comments
  • Loading branch information
@sreya
sreya committed Oct 31, 2023
commit 2a67fe3430f3317f44bfb4de0b40c05eb337e5b2
4 changes: 2 additions & 2 deletions site/src/pages/WorkspacePage/WorkspaceActions/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Workspace, WorkspaceStatus } from "api/typesGenerated";
import { ReactNode } from "react";
import { workspaceUpdatePolicy } from "utils/workspace";

// the button types we have
export enum ButtonTypesEnum {
Expand Down Expand Up @@ -44,8 +45,7 @@ export const actionsByWorkspaceStatus = (
}
if (
workspace.outdated &&
workspace.template_require_active_version &&
!canChangeVersions
workspaceUpdatePolicy(workspace, canChangeVersions)
) {
if (status === "running") {
return {
Expand Down
5 changes: 2 additions & 3 deletions site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import {
} from "api/typesGenerated";
import { Alert } from "components/Alert/Alert";
import MenuItem from "@mui/material/MenuItem";
import { useTemplatePoliciesEnabled } from "components/Dashboard/DashboardProvider";
import upperFirst from "lodash/upperFirst";

export type WorkspaceSettingsFormValues = {
Expand All @@ -32,9 +31,10 @@ export const WorkspaceSettingsForm: FC<{
isSubmitting: boolean;
workspace: Workspace;
error: unknown;
templatePoliciesEnabled: boolean,
onCancel: () => void;
onSubmit: (values: WorkspaceSettingsFormValues) => void;
}> = ({ onCancel, onSubmit, workspace, error, isSubmitting }) => {
}> = ({ onCancel, onSubmit, workspace, error, isSubmitting, templatePoliciesEnabled }) => {
const form = useFormik<WorkspaceSettingsFormValues>({
onSubmit,
initialValues: {
Expand All @@ -51,7 +51,6 @@ export const WorkspaceSettingsForm: FC<{
error,
);

const templatePoliciesEnabled = useTemplatePoliciesEnabled();

return (
<HorizontalForm onSubmit={form.handleSubmit} data-testid="form">
Expand Down
3 changes: 3 additions & 0 deletions site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { useMutation } from "react-query";
import { displaySuccess } from "components/GlobalSnackbar/utils";
import { patchWorkspace, updateWorkspaceAutomaticUpdates } from "api/api";
import { WorkspaceSettingsFormValues } from "./WorkspaceSettingsForm";
import { useTemplatePoliciesEnabled } from "components/Dashboard/DashboardProvider";

const WorkspaceSettingsPage = () => {
const params = useParams() as {
Expand All @@ -17,6 +18,7 @@ const WorkspaceSettingsPage = () => {
const username = params.username.replace("@", "");
const workspace = useWorkspaceSettings();
const navigate = useNavigate();
const templatePoliciesEnabled = useTemplatePoliciesEnabled();

const mutation = useMutation({
mutationFn: async (formValues: WorkspaceSettingsFormValues) => {
Expand Down Expand Up @@ -46,6 +48,7 @@ const WorkspaceSettingsPage = () => {
workspace={workspace}
onCancel={() => navigate(`/@${username}/${workspaceName}`)}
onSubmit={mutation.mutate}
templatePoliciesEnabled={templatePoliciesEnabled}
/>
</>
);
Expand Down
3 changes: 3 additions & 0 deletions site/src/pages/WorkspaceSettingsPage/WorkspaceSettingsPageView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export type WorkspaceSettingsPageViewProps = {
workspace: Workspace;
onCancel: () => void;
onSubmit: ComponentProps<typeof WorkspaceSettingsForm>["onSubmit"];
templatePoliciesEnabled: boolean;
};

export const WorkspaceSettingsPageView: FC<WorkspaceSettingsPageViewProps> = ({
Expand All @@ -17,6 +18,7 @@ export const WorkspaceSettingsPageView: FC<WorkspaceSettingsPageViewProps> = ({
isSubmitting,
error,
workspace,
templatePoliciesEnabled,
}) => {
return (
<>
Expand All @@ -34,6 +36,7 @@ export const WorkspaceSettingsPageView: FC<WorkspaceSettingsPageViewProps> = ({
workspace={workspace}
onCancel={onCancel}
onSubmit={onSubmit}
templatePoliciesEnabled={templatePoliciesEnabled}
/>
</>
);
Expand Down