Skip to content

Commit a3c4908

Browse files
committed
Move components and fix build errors
1 parent f7e9ba9 commit a3c4908

12 files changed

+34
-19
lines changed

site/src/pages/WorkspacePage/WorkspaceActions/DownloadLogsDialog.stories.tsx renamed to site/src/modules/workspaces/WorkspaceMoreActions/DownloadLogsDialog.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { withDesktopViewport } from "testHelpers/storybook";
66
import { DownloadLogsDialog } from "./DownloadLogsDialog";
77

88
const meta: Meta<typeof DownloadLogsDialog> = {
9-
title: "pages/WorkspacePage/DownloadLogsDialog",
9+
title: "modules/workspaces/DownloadLogsDialog",
1010
component: DownloadLogsDialog,
1111
args: {
1212
open: true,

site/src/pages/WorkspacePage/WorkspaceActions/DownloadLogsDialog.tsx renamed to site/src/modules/workspaces/WorkspaceMoreActions/DownloadLogsDialog.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,9 @@ const DownloadingItem: FC<DownloadingItemProps> = ({ file, giveUpTimeMs }) => {
221221
function humanBlobSize(size: number) {
222222
const BLOB_SIZE_UNITS = ["B", "KB", "MB", "GB", "TB"] as const;
223223
let i = 0;
224-
while (size > 1024 && i < BLOB_SIZE_UNITS.length) {
225-
size /= 1024;
224+
let sizeIterator = size;
225+
while (sizeIterator > 1024 && i < BLOB_SIZE_UNITS.length) {
226+
sizeIterator /= 1024;
226227
i++;
227228
}
228229

site/src/modules/workspaces/WorkspaceMoreActions/WorkspaceMoreActions.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ import {
1717
CopyIcon,
1818
DownloadIcon,
1919
} from "lucide-react";
20-
import { UpdateBuildParametersDialog } from "pages/WorkspacePage/UpdateBuildParametersDialog";
21-
import { DownloadLogsDialog } from "pages/WorkspacePage/WorkspaceActions/DownloadLogsDialog";
20+
import { UpdateBuildParametersDialog } from "./UpdateBuildParametersDialog";
21+
import { DownloadLogsDialog } from "./DownloadLogsDialog";
2222
import { useState, type FC } from "react";
2323
import { useMutation, useQueryClient } from "react-query";
2424
import { Link as RouterLink } from "react-router-dom";
2525
import { ChangeWorkspaceVersionDialog } from "./ChangeWorkspaceVersionDialog";
2626
import { WorkspaceDeleteDialog } from "./WorkspaceDeleteDialog";
2727
import type { WorkspacePermissions } from "../permissions";
28-
import { useWorkspaceDuplication } from "pages/CreateWorkspacePage/useWorkspaceDuplication";
28+
import { useWorkspaceDuplication } from "./useWorkspaceDuplication";
2929

3030
type WorkspaceMoreActionsProps = {
3131
workspace: Workspace;

site/src/pages/CreateWorkspacePage/useWorkspaceDuplication.test.tsx renamed to site/src/modules/workspaces/WorkspaceMoreActions/useWorkspaceDuplication.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
type GetLocationSnapshot,
66
renderHookWithAuth,
77
} from "testHelpers/hooks";
8-
import CreateWorkspacePage from "./CreateWorkspacePage";
8+
import CreateWorkspacePage from "../../../pages/CreateWorkspacePage/CreateWorkspacePage";
99
import { useWorkspaceDuplication } from "./useWorkspaceDuplication";
1010

1111
function render(workspace?: Workspace) {

site/src/pages/CreateWorkspacePage/useWorkspaceDuplication.ts renamed to site/src/modules/workspaces/WorkspaceMoreActions/useWorkspaceDuplication.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { linkToTemplate, useLinks } from "modules/navigation";
44
import { useCallback } from "react";
55
import { useQuery } from "react-query";
66
import { useNavigate } from "react-router-dom";
7-
import type { CreateWorkspaceMode } from "./CreateWorkspacePage";
7+
import type { CreateWorkspaceMode } from "../../../pages/CreateWorkspacePage/CreateWorkspacePage";
88

99
function getDuplicationUrlParams(
1010
workspaceParams: readonly WorkspaceBuildParameter[],

site/src/modules/workspaces/WorkspaceUpdateDialogs.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import type {
88
} from "api/typesGenerated";
99
import { ConfirmDialog } from "components/Dialogs/ConfirmDialog/ConfirmDialog";
1010
import { MemoizedInlineMarkdown } from "components/Markdown/Markdown";
11-
import { UpdateBuildParametersDialog } from "pages/WorkspacePage/UpdateBuildParametersDialog";
11+
import { UpdateBuildParametersDialog } from "modules/workspaces/WorkspaceMoreActions/UpdateBuildParametersDialog";
1212
import { type FC, useState } from "react";
1313
import { useMutation, useQueryClient } from "react-query";
1414

site/src/pages/WorkspacePage/Workspace.stories.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ const createTimestamp = (
2121
const permissions: WorkspacePermissions = {
2222
readWorkspace: true,
2323
updateWorkspace: true,
24-
updateTemplate: true,
25-
viewDeploymentConfig: true,
24+
updateWorkspaceVersion: true,
25+
deploymentConfig: true,
26+
deleteFailedWorkspace: true,
2627
};
2728

2829
const meta: Meta<typeof Workspace> = {

site/src/pages/WorkspacePage/WorkspaceActions/WorkspaceActions.stories.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,13 @@ export const Failed: Story = {
157157
export const FailedWithDebug: Story = {
158158
args: {
159159
workspace: Mocks.MockFailedWorkspace,
160-
canDebug: true,
160+
permissions: {
161+
deploymentConfig: true,
162+
deleteFailedWorkspace: true,
163+
readWorkspace: true,
164+
updateWorkspace: true,
165+
updateWorkspaceVersion: true,
166+
},
161167
},
162168
};
163169

site/src/pages/WorkspacePage/WorkspaceNotifications/WorkspaceNotifications.stories.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ import {
1010
} from "testHelpers/entities";
1111
import { withDashboardProvider } from "testHelpers/storybook";
1212
import { WorkspaceNotifications } from "./WorkspaceNotifications";
13+
import type { WorkspacePermissions } from "modules/workspaces/permissions";
1314

14-
const defaultPermissions = {
15+
const defaultPermissions: WorkspacePermissions = {
1516
readWorkspace: true,
16-
updateTemplate: true,
17+
updateWorkspaceVersion: true,
1718
updateWorkspace: true,
18-
viewDeploymentConfig: true,
19+
deploymentConfig: true,
20+
deleteFailedWorkspace: true,
1921
};
2022

2123
const meta: Meta<typeof WorkspaceNotifications> = {

site/src/pages/WorkspacePage/WorkspaceTopbar.stories.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,13 @@ const meta: Meta<typeof WorkspaceTopbar> = {
3333
workspace: baseWorkspace,
3434
template: MockTemplate,
3535
latestVersion: MockTemplateVersion,
36-
canUpdateWorkspace: true,
36+
permissions: {
37+
readWorkspace: true,
38+
updateWorkspaceVersion: true,
39+
updateWorkspace: true,
40+
deploymentConfig: true,
41+
deleteFailedWorkspace: true,
42+
},
3743
},
3844
parameters: {
3945
layout: "fullscreen",

site/src/pages/WorkspaceSettingsPage/WorkspaceParametersPage/WorkspaceParametersPage.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,13 @@ const WorkspaceParametersPage: FC = () => {
5050
const template = templateQuery.data;
5151

5252
// Permissions
53-
const checks =
54-
workspace && template ? workspaceChecks(workspace, template) : {};
53+
const checks = workspace && template ? workspaceChecks(workspace) : {};
5554
const permissionsQuery = useQuery({
5655
...checkAuthorization({ checks }),
5756
enabled: workspace !== undefined && template !== undefined,
5857
});
5958
const permissions = permissionsQuery.data as WorkspacePermissions | undefined;
60-
const canChangeVersions = Boolean(permissions?.updateTemplate);
59+
const canChangeVersions = Boolean(permissions?.updateWorkspaceVersion);
6160

6261
return (
6362
<>

0 commit comments

Comments
 (0)