Skip to content

fix(site): retry and debug passing build parameters options #12384

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 9 commits into from
Mar 4, 2024
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
Next Next commit
Extract debug button
  • Loading branch information
BrunoQuaresma committed Mar 1, 2024
commit c3a8dd93f5fc5236ca0b19b84f8b62dc476c9105
37 changes: 0 additions & 37 deletions site/src/pages/WorkspacePage/WorkspaceActions/Buttons.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import ReplayIcon from "@mui/icons-material/Replay";
import BlockIcon from "@mui/icons-material/Block";
import OutlinedBlockIcon from "@mui/icons-material/BlockOutlined";
import PowerSettingsNewIcon from "@mui/icons-material/PowerSettingsNew";
import DebugIcon from "@mui/icons-material/BugReportOutlined";
import Star from "@mui/icons-material/Star";
import StarBorder from "@mui/icons-material/StarBorder";
import { type FC } from "react";
Expand Down Expand Up @@ -174,42 +173,6 @@ export const DisabledButton: FC<DisabledButtonProps> = ({ label }) => {
);
};

type DebugButtonProps = Omit<ActionButtonProps, "loading"> & {
workspace: Workspace;
enableBuildParameters: boolean;
};

export const DebugButton: FC<DebugButtonProps> = ({
handleAction,
workspace,
enableBuildParameters,
}) => {
const mainAction = (
<TopbarButton startIcon={<DebugIcon />} onClick={() => handleAction()}>
Debug
</TopbarButton>
);

if (!enableBuildParameters) {
return mainAction;
}

return (
<ButtonGroup
variant="outlined"
css={{
// Workaround to make the border transitions smoothly on button groups
"& > button:hover + button": {
borderLeft: "1px solid #FFF",
},
}}
>
{mainAction}
<BuildParametersPopover workspace={workspace} onSubmit={handleAction} />
</ButtonGroup>
);
};

interface FavoriteButtonProps {
onToggle: (workspaceID: string) => void;
workspaceID: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
import { Meta, StoryObj } from "@storybook/react";
import { DebugButton } from "./DebugButton";
import { MockWorkspace } from "testHelpers/entities";
import { userEvent, waitFor, within } from "@storybook/test";

const meta: Meta<typeof DebugButton> = {
title: "pages/WorkspacePage/DebugButton",
component: DebugButton,
};

export default meta;
type Story = StoryObj<typeof DebugButton>;

export const Default: Story = {};

export const WithBuildParameters: Story = {
args: {
enableBuildParameters: true,
workspace: MockWorkspace,
},
parameters: {
queries: [
{
key: ["workspace", MockWorkspace.id, "parameters"],
data: { templateVersionRichParameters: [], buildParameters: [] },
},
],
},
};

export const WithOpenBuildParameters: Story = {
args: {
enableBuildParameters: true,
workspace: MockWorkspace,
},
parameters: {
queries: [
{
key: ["workspace", MockWorkspace.id, "parameters"],
data: { templateVersionRichParameters: [], buildParameters: [] },
},
],
},
play: async ({ canvasElement, step }) => {
const screen = within(canvasElement);

await step("open popover", async () => {
await userEvent.click(screen.getByTestId("build-parameters-button"));
await waitFor(() =>
expect(screen.getByText("Build Options")).toBeInTheDocument(),
);
});
},
};
43 changes: 43 additions & 0 deletions site/src/pages/WorkspacePage/WorkspaceActions/DebugButton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import ButtonGroup from "@mui/material/ButtonGroup";
import DebugIcon from "@mui/icons-material/BugReportOutlined";
import { type FC } from "react";
import type { Workspace } from "api/typesGenerated";
import { BuildParametersPopover } from "./BuildParametersPopover";
import { TopbarButton } from "components/FullPageLayout/Topbar";
import { ActionButtonProps } from "./Buttons";

type DebugButtonProps = Omit<ActionButtonProps, "loading"> & {
workspace: Workspace;
enableBuildParameters: boolean;
};

export const DebugButton: FC<DebugButtonProps> = ({
handleAction,
workspace,
enableBuildParameters,
}) => {
const mainAction = (
<TopbarButton startIcon={<DebugIcon />} onClick={() => handleAction()}>
Debug
</TopbarButton>
);

if (!enableBuildParameters) {
return mainAction;
}

return (
<ButtonGroup
variant="outlined"
css={{
// Workaround to make the border transitions smoothly on button groups
"& > button:hover + button": {
borderLeft: "1px solid #FFF",
},
}}
>
{mainAction}
<BuildParametersPopover workspace={workspace} onSubmit={handleAction} />
</ButtonGroup>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
UpdateButton,
ActivateButton,
FavoriteButton,
DebugButton,
} from "./Buttons";

import Divider from "@mui/material/Divider";
Expand All @@ -29,6 +28,7 @@ import {
import { TopbarIconButton } from "components/FullPageLayout/Topbar";
import MoreVertOutlined from "@mui/icons-material/MoreVertOutlined";
import { RetryButton } from "./RetryButton";
import { DebugButton } from "./DebugButton";

export interface WorkspaceActionsProps {
workspace: Workspace;
Expand Down