Skip to content

chore(site): refactor stories and test from page components #9603

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 31 commits into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
52fae61
Refactor AuditPage
BrunoQuaresma Sep 7, 2023
cc2a549
Refactor CliAuthPageView stories
BrunoQuaresma Sep 7, 2023
4f7bb53
Refactor CreateTemplateForm stories
BrunoQuaresma Sep 7, 2023
cd5b40f
Refactor CreateUserPage test
BrunoQuaresma Sep 7, 2023
c5b4eb5
Refactor CreateWorkspacePage tests
BrunoQuaresma Sep 7, 2023
6121f0d
Fix stories name
BrunoQuaresma Sep 7, 2023
a5440cb
Refactor AppereancePageView stories
BrunoQuaresma Sep 7, 2023
4b3d9f8
Refactor GitAuthSettingsPageView stories
BrunoQuaresma Sep 7, 2023
8f654b6
Refactor NetworkSettingsPageView stories
BrunoQuaresma Sep 7, 2023
1618d36
Refactor SecuritySettingsPageView stories
BrunoQuaresma Sep 7, 2023
64ee732
Refactor UserAuthSettingsPageView stories
BrunoQuaresma Sep 7, 2023
1e40624
Refactor GroupsPage stories
BrunoQuaresma Sep 7, 2023
974bb3f
Refactor LoginPage tests
BrunoQuaresma Sep 7, 2023
30a783a
Refactor SetupPage stories
BrunoQuaresma Sep 7, 2023
5e5e35c
Refactor StarterTemplatePageView stories
BrunoQuaresma Sep 7, 2023
429b823
Refactor StarterTemplatesPage tests
BrunoQuaresma Sep 8, 2023
5dd69e9
Refactor TemplatePage tests
BrunoQuaresma Sep 8, 2023
d5532f0
RefactorTemplateSettingsPage tests
BrunoQuaresma Sep 8, 2023
d6444c9
Refactor TemplatesPage tests
BrunoQuaresma Sep 8, 2023
08adf24
Flat TemplateVersionEditorPage
BrunoQuaresma Sep 8, 2023
d40214a
Refactor TemplateVersionPage stories
BrunoQuaresma Sep 8, 2023
5a8b649
Refactor UserSettingsPage stories
BrunoQuaresma Sep 8, 2023
2d1e6bf
Refactor UsersPage stories
BrunoQuaresma Sep 8, 2023
30ad92b
Simplify IndexPage
BrunoQuaresma Sep 8, 2023
5c64496
Refactor WorkspaceSettingsPage stories
BrunoQuaresma Sep 8, 2023
5d8bcde
Refactor WorkspacePage stories
BrunoQuaresma Sep 8, 2023
7f0e89e
Refactor Conditionals stories
BrunoQuaresma Sep 8, 2023
b5d365b
Fix typo
BrunoQuaresma Sep 8, 2023
2f55e6b
Fix imports
BrunoQuaresma Sep 8, 2023
b3114d6
Fix ChooseOne story
BrunoQuaresma Sep 8, 2023
397370c
Fix UserAuthSettingsPageView stories
BrunoQuaresma Sep 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
Refactor AuditPage
  • Loading branch information
BrunoQuaresma committed Sep 8, 2023
commit 52fae611a4c6d1ea29fefde123c1c290fb6746b9
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import type { Meta, StoryObj } from "@storybook/react";
import { AuditLogDescription } from "./AuditLogDescription";
import {
MockAuditLog,
MockAuditLogSuccessfulLogin,
MockAuditLogUnsuccessfulLoginKnownUser,
MockAuditLogWithWorkspaceBuild,
MockWorkspaceCreateAuditLogForDifferentOwner,
} from "testHelpers/entities";

const meta: Meta<typeof AuditLogDescription> = {
title: "components/AuditLogDescription",
component: AuditLogDescription,
};

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

export const WorkspaceCreate: Story = {
args: {
auditLog: MockAuditLog,
},
};

export const WorkspaceBuildStop: Story = {
args: {
auditLog: MockAuditLogWithWorkspaceBuild,
},
};

export const WorkspaceBuildDuplicatedWord: Story = {
args: {
auditLog: {
...MockAuditLogWithWorkspaceBuild,
additional_fields: {
workspace_name: "workspace",
},
},
},
};

export const CreateWorkspaceWithDiffOwner: Story = {
args: {
auditLog: MockWorkspaceCreateAuditLogForDifferentOwner,
},
};

export const SuccessLogin: Story = {
args: {
auditLog: MockAuditLogSuccessfulLogin,
},
};

export const UnsuccessfulLoginForUnkownUser: Story = {
args: {
auditLog: MockAuditLogUnsuccessfulLoginKnownUser,
},
};

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions site/src/pages/AuditPage/AuditLogRow/AuditLogDiff/index.ts

This file was deleted.

132 changes: 72 additions & 60 deletions site/src/pages/AuditPage/AuditLogRow/AuditLogRow.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,97 +4,109 @@ import TableCell from "@mui/material/TableCell";
import TableContainer from "@mui/material/TableContainer";
import TableHead from "@mui/material/TableHead";
import TableRow from "@mui/material/TableRow";
import { ComponentMeta, Story } from "@storybook/react";
import {
MockAuditLog,
MockAuditLog2,
MockAuditLogWithWorkspaceBuild,
MockAuditLogWithDeletedResource,
MockAuditLogGitSSH,
} from "testHelpers/entities";
import { AuditLogRow, AuditLogRowProps } from "./AuditLogRow";
import { AuditLogRow } from "./AuditLogRow";
import type { Meta, StoryObj } from "@storybook/react";

export default {
const meta: Meta<typeof AuditLogRow> = {
title: "components/AuditLogRow",
component: AuditLogRow,
} as ComponentMeta<typeof AuditLogRow>;
decorators: [
(Story) => (
<TableContainer>
<Table>
<TableHead>
<TableRow>
<TableCell style={{ paddingLeft: 32 }}>Logs</TableCell>
</TableRow>
</TableHead>
<TableBody>
<Story />
</TableBody>
</Table>
</TableContainer>
),
],
};

const Template: Story<AuditLogRowProps> = (args) => (
<TableContainer>
<Table>
<TableHead>
<TableRow>
<TableCell style={{ paddingLeft: 32 }}>Logs</TableCell>
</TableRow>
</TableHead>
<TableBody>
<AuditLogRow {...args} />
</TableBody>
</Table>
</TableContainer>
);
export default meta;
type Story = StoryObj<typeof AuditLogRow>;

export const NoDiff = Template.bind({});
NoDiff.args = {
auditLog: {
...MockAuditLog,
diff: {},
export const NoDiff: Story = {
args: {
auditLog: {
...MockAuditLog,
diff: {},
},
},
};

export const WithDiff = Template.bind({});
WithDiff.args = {
auditLog: MockAuditLog2,
defaultIsDiffOpen: true,
export const WithDiff: Story = {
args: {
auditLog: MockAuditLog2,
defaultIsDiffOpen: true,
},
};

export const WithLongDiffRow = Template.bind({});
WithLongDiffRow.args = {
auditLog: {
...MockAuditLog2,
diff: {
...MockAuditLog2.diff,
icon: {
old: "https://www.google.com/url?sa=i&url=https%3A%2F%2Fwww.docker.com%2Fcompany%2Fnewsroom%2Fmedia-resources%2F&psig=AOvVaw3hLg_lm0tzXPBt74XZD2GC&ust=1666892413988000&source=images&cd=vfe&ved=0CAwQjRxqFwoTCPDsiKa4_voCFQAAAAAdAAAAABAD",
new: "https://www.google.com/url?sa=i&url=https%3A%2F%2Fwww.kindpng.com%2Fimgv%2FhRowRxi_docker-icon-png-transparent-png%2F&psig=AOvVaw3hLg_lm0tzXPBt74XZD2GC&ust=1666892413988000&source=images&cd=vfe&ved=0CAwQjRxqFwoTCPDsiKa4_voCFQAAAAAdAAAAABAI",
secret: false,
export const WithLongDiffRow: Story = {
args: {
auditLog: {
...MockAuditLog2,
diff: {
...MockAuditLog2.diff,
icon: {
old: "https://www.google.com/url?sa=i&url=https%3A%2F%2Fwww.docker.com%2Fcompany%2Fnewsroom%2Fmedia-resources%2F&psig=AOvVaw3hLg_lm0tzXPBt74XZD2GC&ust=1666892413988000&source=images&cd=vfe&ved=0CAwQjRxqFwoTCPDsiKa4_voCFQAAAAAdAAAAABAD",
new: "https://www.google.com/url?sa=i&url=https%3A%2F%2Fwww.kindpng.com%2Fimgv%2FhRowRxi_docker-icon-png-transparent-png%2F&psig=AOvVaw3hLg_lm0tzXPBt74XZD2GC&ust=1666892413988000&source=images&cd=vfe&ved=0CAwQjRxqFwoTCPDsiKa4_voCFQAAAAAdAAAAABAI",
secret: false,
},
},
},
defaultIsDiffOpen: true,
},
defaultIsDiffOpen: true,
};

export const WithStoppedWorkspaceBuild = Template.bind({});
WithStoppedWorkspaceBuild.args = {
auditLog: {
...MockAuditLogWithWorkspaceBuild,
action: "stop",
export const WithStoppedWorkspaceBuild: Story = {
args: {
auditLog: {
...MockAuditLogWithWorkspaceBuild,
action: "stop",
},
},
};

export const WithStartedWorkspaceBuild = Template.bind({});
WithStartedWorkspaceBuild.args = {
auditLog: {
...MockAuditLogWithWorkspaceBuild,
action: "start",
export const WithStartedWorkspaceBuild: Story = {
args: {
auditLog: {
...MockAuditLogWithWorkspaceBuild,
action: "start",
},
},
};

export const WithDeletedWorkspaceBuild = Template.bind({});
WithDeletedWorkspaceBuild.args = {
auditLog: {
...MockAuditLogWithWorkspaceBuild,
action: "delete",
is_deleted: true,
export const WithDeletedWorkspaceBuild: Story = {
args: {
auditLog: {
...MockAuditLogWithWorkspaceBuild,
action: "delete",
is_deleted: true,
},
},
};

export const DeletedResource = Template.bind({});
DeletedResource.args = {
auditLog: MockAuditLogWithDeletedResource,
export const DeletedResource: Story = {
args: {
auditLog: MockAuditLogWithDeletedResource,
},
};

export const SecretDiffValue = Template.bind({});
SecretDiffValue.args = {
auditLog: MockAuditLogGitSSH,
export const SecretDiffValue: Story = {
args: {
auditLog: MockAuditLogGitSSH,
},
};
9 changes: 0 additions & 9 deletions site/src/pages/AuditPage/AuditPage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,6 @@ describe("AuditPage", () => {
);
});

it("shows the audit logs", async () => {
// When
await renderPage();

// Then
await screen.findByTestId(`audit-log-row-${MockAuditLog.id}`);
screen.getByTestId(`audit-log-row-${MockAuditLog2.id}`);
});

it("renders page 5", async () => {
// Given
const page = 5;
Expand Down