coder · BrunoQuaresma · Jan 12, 2024 · Jan 9, 2024 · Jan 9, 2024 · Jan 9, 2024
diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
@@ -370,7 +370,6 @@ export const AppRouter: FC = () => {
 
               {/* In order for the 404 page to work properly the routes that start with
               top level parameter must be fully qualified. */}
-              <Route path="/:username/:workspace" element={<WorkspacePage />} />
               <Route
                 path="/:username/:workspace/builds/:buildNumber"
                 element={<WorkspaceBuildPage />}
@@ -413,6 +412,7 @@ export const AppRouter: FC = () => {
             </Route>
 
             {/* Pages that don't have the dashboard layout */}
+            <Route path="/:username/:workspace" element={<WorkspacePage />} />
             <Route
               path="/templates/:template/versions/:version/edit"
               element={<TemplateVersionEditorPage />}

diff --git a/site/src/api/queries/workspaceQuota.ts b/site/src/api/queries/workspaceQuota.ts
@@ -12,7 +12,7 @@ export const workspaceQuota = (username: string) => {
   };
 };
 
-const getWorkspaceResolveAutostartQueryKey = (workspaceId: string) => [
+export const getWorkspaceResolveAutostartQueryKey = (workspaceId: string) => [
   workspaceId,
   "workspaceResolveAutostart",
 ];

diff --git a/site/src/components/WorkspaceDeletion/DormantWorkspaceBanner.tsx b/site/src/components/WorkspaceDeletion/DormantWorkspaceBanner.tsx
diff --git a/site/src/components/WorkspaceDeletion/index.ts b/site/src/components/WorkspaceDeletion/index.ts
diff --git a/...WorkspaceDeletion/DormantDeletionText.tsx → ...kspaceStatusBadge/DormantDeletionText.tsx b/...WorkspaceDeletion/DormantDeletionText.tsx → ...kspaceStatusBadge/DormantDeletionText.tsx
diff --git a/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx b/site/src/components/WorkspaceStatusBadge/WorkspaceStatusBadge.tsx
@@ -9,7 +9,7 @@ import { type FC, type ReactNode } from "react";
 import type { Workspace } from "api/typesGenerated";
 import { Pill } from "components/Pill/Pill";
 import { ChooseOne, Cond } from "components/Conditionals/ChooseOne";
-import { DormantDeletionText } from "components/WorkspaceDeletion";
+import { DormantDeletionText } from "./DormantDeletionText";
 import { getDisplayWorkspaceStatus } from "utils/workspace";
 import { useClassName } from "hooks/useClassName";
 import { formatDistanceToNow } from "date-fns";

diff --git a/site/src/pages/WorkspacePage/Workspace.stories.tsx b/site/src/pages/WorkspacePage/Workspace.stories.tsx
@@ -9,15 +9,25 @@ import EventSource from "eventsourcemock";
 import { ProxyContext, getPreferredProxy } from "contexts/ProxyContext";
 import { DashboardProviderContext } from "components/Dashboard/DashboardProvider";
 import { WorkspaceBuildLogsSection } from "pages/WorkspacePage/WorkspaceBuildLogsSection";
+import { getWorkspaceResolveAutostartQueryKey } from "api/queries/workspaceQuota";
+import { WorkspacePermissions } from "./permissions";
 
 const MockedAppearance = {
   config: Mocks.MockAppearanceConfig,
   isPreview: false,
   setPreview: () => {},
 };
 
+const permissions: WorkspacePermissions = {
+  readWorkspace: true,
+  updateWorkspace: true,
+  updateTemplate: true,
+  viewDeploymentValues: true,
+};
+
 const meta: Meta<typeof Workspace> = {
   title: "pages/WorkspacePage/Workspace",
+  args: { permissions },
   component: Workspace,
   decorators: [
     (Story) => (
@@ -68,8 +78,6 @@ export const Running: Story = {
     workspace: Mocks.MockWorkspace,
     handleStart: action("start"),
     handleStop: action("stop"),
-    canUpdateWorkspace: true,
-    workspaceErrors: {},
     buildInfo: Mocks.MockBuildInfo,
     template: Mocks.MockTemplate,
   },
@@ -78,7 +86,10 @@ export const Running: Story = {
 export const WithoutUpdateAccess: Story = {
   args: {
     ...Running.args,
-    canUpdateWorkspace: false,
+    permissions: {
+      ...permissions,
+      updateWorkspace: false,
+    },
   },
 };
 
@@ -110,18 +121,6 @@ export const Stopping: Story = {
   },
 };
 
-export const Failed: Story = {
-  args: {
-    ...Running.args,
-    workspace: Mocks.MockFailedWorkspace,
-    workspaceErrors: {
-      buildError: Mocks.mockApiError({
-        message: "A workspace build is already active.",
-      }),
-    },
-  },
-};
-
 export const FailedWithLogs: Story = {
   args: {
     ...Running.args,
@@ -196,31 +195,19 @@ export const Outdated: Story = {
 export const CantAutostart: Story = {
   args: {
     ...Running.args,
-    canAutostart: false,
     workspace: Mocks.MockOutdatedRunningWorkspaceRequireActiveVersion,
   },
-};
-
-export const GetBuildsError: Story = {
-  args: {
-    ...Running.args,
-    workspaceErrors: {
-      getBuildsError: Mocks.mockApiError({
-        message: "There is a problem fetching builds.",
-      }),
-    },
-  },
-};
-
-export const CancellationError: Story = {
-  args: {
-    ...Failed.args,
-    workspaceErrors: {
-      cancellationError: Mocks.mockApiError({
-        message: "Job could not be canceled.",
-      }),
-    },
-    buildLogs: <WorkspaceBuildLogsSection logs={makeFailedBuildLogs()} />,
+  parameters: {
+    queries: [
+      {
+        key: getWorkspaceResolveAutostartQueryKey(
+          Mocks.MockOutdatedRunningWorkspaceRequireActiveVersion.id,
+        ),
+        data: {
+          parameter_mismatch: false,
+        },
+      },
+    ],
   },
 };