implement James's suggestions

Author: kantord

src/routes/__tests__/route-workspace.test.tsx

@@ -48,35 +48,10 @@ test("renders title", () => {
   const { getByRole } = renderComponent();
 
   expect(
-    getByRole("heading", { name: 'Workspace settings for "foo"', level: 4 }),
+    getByRole("heading", { name: "Workspace settings for foo", level: 4 }),
   ).toBeVisible();
 });
 
-test("has a badge when editing the active workspace", () => {
-  (useParams as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
-    name: "baz",
-  });
-
-  const { getByRole } = renderComponent();
-
-  const heading = getByRole("heading", {
-    name: /.*workspace settings.*/i,
-    level: 4,
-  });
-
-  expect(within(heading).getByText(/active/i)).toBeVisible();
-});
-
-test("has no 'active workspace' badge when it's not the active workspace", () => {
-  (useParams as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
-    name: "another",
-  });
-
-  const { queryByText } = renderComponent();
-
-  expect(queryByText(/active/i)).toBeNull();
-});
-
 test("renders workspace name input", () => {
   const { getByRole } = renderComponent();
 
@@ -105,6 +80,25 @@ test("has breadcrumbs", () => {
   expect(within(breadcrumbs).getByText(/workspace settings/i)).toBeVisible();
 });
 
+test("rename workspace", async () => {
+  (useParams as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
+    name: "foo",
+  });
+  const { getByRole, getByTestId } = renderComponent();
+
+  const workspaceName = getByRole("textbox", {
+    name: /workspace name/i,
+  });
+  await userEvent.type(workspaceName, "_renamed");
+
+  const saveBtn = within(getByTestId("workspace-name")).getByRole("button", {
+    name: /save/i,
+  });
+  await userEvent.click(saveBtn);
+  await waitFor(() => expect(mockNavigate).toHaveBeenCalledTimes(1));
+  expect(mockNavigate).toHaveBeenCalledWith("/workspace/foo_renamed");
+});
+
 test("revert changes button", async () => {
   (useParams as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
     name: "foo",
@@ -152,22 +146,3 @@ test("revert changes button", async () => {
     }),
   ).toHaveValue("foo");
 });
-
-test("rename workspace", async () => {
-  (useParams as unknown as ReturnType<typeof vi.fn>).mockReturnValue({
-    name: "foo",
-  });
-  const { getByRole, getByTestId } = renderComponent();
-
-  const workspaceName = getByRole("textbox", {
-    name: /workspace name/i,
-  });
-  await userEvent.type(workspaceName, "_renamed");
-
-  const saveBtn = within(getByTestId("workspace-name")).getByRole("button", {
-    name: /save/i,
-  });
-  await userEvent.click(saveBtn);
-  await waitFor(() => expect(mockNavigate).toHaveBeenCalledTimes(1));
-  expect(mockNavigate).toHaveBeenCalledWith("/workspace/foo_renamed");
-});

src/routes/route-workspace.tsx

@@ -3,13 +3,12 @@ import { ArchiveWorkspace } from "@/features/workspace/components/archive-worksp
 
 import { WorkspaceHeading } from "@/features/workspace/components/workspace-heading";
 import { WorkspaceName } from "@/features/workspace/components/workspace-name";
-import { Alert, Badge, Breadcrumb, Breadcrumbs } from "@stacklok/ui-kit";
+import { Alert, Breadcrumb, Breadcrumbs } from "@stacklok/ui-kit";
 import { useParams } from "react-router-dom";
 import { useArchivedWorkspaces } from "@/features/workspace/hooks/use-archived-workspaces";
 import { useRestoreWorkspaceButton } from "@/features/workspace/hooks/use-restore-workspace-button";
 import { WorkspaceCustomInstructions } from "@/features/workspace/components/workspace-custom-instructions";
 import { WorkspacePreferredModel } from "@/features/workspace/components/workspace-preferred-model";
-import { useActiveWorkspaceName } from "@/features/workspace/hooks/use-active-workspace-name";
 
 function WorkspaceArchivedBanner({ name }: { name: string }) {
   const restoreButtonProps = useRestoreWorkspaceButton({ workspaceName: name });
@@ -37,8 +36,6 @@ export function RouteWorkspace() {
       data?.workspaces.find((w) => w.name === name) !== undefined,
   });
 
-  const { data: activeWorkspaceName } = useActiveWorkspaceName();
-
   return (
     <>
       <Breadcrumbs>
@@ -50,12 +47,7 @@ export function RouteWorkspace() {
       <WorkspaceHeading
         title={
           <div className="flex gap-2 items-center">
-            Workspace settings for "{name}"
-            {activeWorkspaceName === name && (
-              <Badge size="sm" variant="inverted">
-                Active
-              </Badge>
-            )}
+            Workspace settings for {name}
           </div>
         }
       />