From ceb56b2702ec5cf318265156c3d661d39298632a Mon Sep 17 00:00:00 2001 From: aliu65803 Date: Fri, 13 Nov 2026 15:58:19 -0600 Subject: [PATCH 1/4] Archive projects from project settings Add an Archive project action with confirmation to Project Settings, using the existing archive endpoint, and hide archived projects from the project picker. The Default and already-archived projects cannot be archived. Co-Authored-By: Claude Opus 5.5 --- ui/src/components/Project/ProjectList.tsx | 6 +- ui/src/components/Project/ProjectSettings.tsx | 74 +++++++++++- .../MockFunctions/ProjectList.mock.ts | 16 +++ .../MockFunctions/ProjectSettings.mock.ts | 25 +++++ .../Project/__tests__/ProjectList.test.tsx | 10 ++ .../__tests__/ProjectSettings.test.tsx | 106 ++++++++++++++++++ ui/src/hooks/project/projects.ts | 39 +++++++ ui/src/tests/mockAxios.ts | 4 + 8 files changed, 277 insertions(+), 3 deletions(-) diff --git a/ui/src/components/Project/ProjectList.tsx b/ui/src/components/Project/ProjectList.tsx index 502e14b29..3ccfe125b 100644 --- a/ui/src/components/Project/ProjectList.tsx +++ b/ui/src/components/Project/ProjectList.tsx @@ -35,7 +35,7 @@ import { TooltipTrigger, useLocalStorage } from "@kumo-ai/kumo-ui-catalog"; -import { ProjectDBEntry } from "gen/v0/types"; +import { ProjectDBEntry, ProjectStatus } from "gen/v0/types"; import { useUserDetails } from "stores/userStore"; import WithErrorBoundary from "components/@hoc/WithErrorBoundary"; @@ -124,7 +124,9 @@ const ProjectList = ({ open, toggleModal, enableClose }: ProjectListProps) => { } = useProjectListByGroup(selectedGroupId ?? "", handleError); const tableData = useMemo(() => { - const entries = projects ?? []; + const entries = (projects ?? []).filter( + (p) => p.status !== ProjectStatus.ARCHIVED + ); const tabFiltered = activeTab === "my-projects" ? entries.filter((p) => p?.created_by === userDetails?.user_id) diff --git a/ui/src/components/Project/ProjectSettings.tsx b/ui/src/components/Project/ProjectSettings.tsx index af72e36e5..8f08fd6be 100644 --- a/ui/src/components/Project/ProjectSettings.tsx +++ b/ui/src/components/Project/ProjectSettings.tsx @@ -15,18 +15,21 @@ import { PropertiesOverviewCard, RadioGroup, RadioGroupItem, + storeToLocalStorage, TextArea, Title, Tooltip, TooltipContent, TooltipTrigger } from "@kumo-ai/kumo-ui-catalog"; +import { ProjectStatus } from "gen/v0/types"; import WithErrorBoundary from "components/@hoc/WithErrorBoundary"; import Validation from "components/Validation/Validation"; import { useKumoGroups } from "hooks/groups/groups"; import { + useArchiveProject, useProject, useProjectId, useUpdateProject @@ -34,6 +37,11 @@ import { import { useAutoResizeTextarea } from "hooks/utils/useAutoResizeTextarea"; import { useValidationState } from "hooks/validation/validation"; +import { + defaultModelsPageURL, + getProjectPath, + storageKeys +} from "utils/Constants"; import { formatToShortLocalDateString } from "utils/timeConverter"; import ProjectNameInput from "./NameInput/ProjectNameInput"; @@ -46,6 +54,8 @@ const formatDate = (dateStr?: string) => { return formatToShortLocalDateString(dateStr); }; +const DEFAULT_PROJECT_ID = "default"; + const ProjectSettings = () => { const projectId = useProjectId(); const [loading, setLoading] = useState(false); @@ -56,6 +66,7 @@ const ProjectSettings = () => { handleError ); const { updateProject } = useUpdateProject(handleError, setLoading); + const { archiveProject } = useArchiveProject(handleError, setLoading); const { groups } = useKumoGroups(); const groupName = groups.find((g) => g.id === project?.group_id)?.display_name ?? "—"; @@ -64,7 +75,6 @@ const ProjectSettings = () => { const [projectNameError, setProjectNameError] = useState(""); const [userHasEditedName, setUserHasEditedName] = useState(false); const [description, setDescription] = useState(""); - // const [isArchiveDialogOpen, setIsArchiveDialogOpen] = useState(false); const navigate = useNavigate(); const [radioValue, setRadioValue] = useState("Share"); @@ -123,6 +133,40 @@ const ProjectSettings = () => { }); }; + const canArchive = + !!project && + project.id !== DEFAULT_PROJECT_ID && + project.status !== ProjectStatus.ARCHIVED; + + const onArchiveClick = () => { + clearErrors(); + dialogRef.current?.toggleDialog( + "Archive project", + `Archive "${project?.display_name}"? Archived projects can no longer be changed and their jobs cannot run. This cannot be undone from the UI.`, + {}, + false, + "Archive", + "destructive" + ); + }; + + const onArchiveConfirm = async () => { + dialogRef.current?.toggleDialog(); + if (!projectId) return; + const archived = await archiveProject(projectId); + if (archived) { + storeToLocalStorage( + storageKeys.selectedProject, + DEFAULT_PROJECT_ID + ); + navigate( + getProjectPath(DEFAULT_PROJECT_ID).ModelJobsList + + "?" + + defaultModelsPageURL.split("?")[1] + ); + } + }; + return ( <>
@@ -159,6 +203,7 @@ const ProjectSettings = () => { alert={alert} ctaMsgs={null} dialogRef={dialogRef} + onDialogConfirm={onArchiveConfirm} hideWarnings={() => {}} clearErrors={clearErrors} /> @@ -272,6 +317,33 @@ const ProjectSettings = () => { cardClassName={"px-0 pb-0"} titleSize="md" /> + {canArchive && ( + <> + +
+
+ +

+ Archived projects are read-only and hidden from + the project list. +

+
+ +
+ + )} ); }; diff --git a/ui/src/components/Project/__tests__/MockFunctions/ProjectList.mock.ts b/ui/src/components/Project/__tests__/MockFunctions/ProjectList.mock.ts index c897b1f96..af22713a2 100644 --- a/ui/src/components/Project/__tests__/MockFunctions/ProjectList.mock.ts +++ b/ui/src/components/Project/__tests__/MockFunctions/ProjectList.mock.ts @@ -41,6 +41,14 @@ export const mockProjectsData: ProjectDBEntry[] = [ } ]; +export const mockArchivedProject: ProjectDBEntry = { + ...mockProjectsData[0], + id: "project_0a1b2c3d4e5f60718293a4b5c6d7e8f9", + slug: "legacy", + display_name: "Legacy Archived", + status: "archived" +}; + let projectsResponseType = ""; export const mockProjectsByGroupResponse = (): Promise< @@ -56,6 +64,14 @@ export const mockProjectsByGroupResponse = (): Promise< createMockResponse([]) as unknown as AxiosResponse ); } + if (projectsResponseType === testResponseType.ARCHIVED) { + return Promise.resolve( + createMockResponse([ + ...mockProjectsData, + mockArchivedProject + ]) as unknown as AxiosResponse + ); + } return Promise.resolve( createMockResponse(mockProjectsData) as unknown as AxiosResponse< ProjectDBEntry[] diff --git a/ui/src/components/Project/__tests__/MockFunctions/ProjectSettings.mock.ts b/ui/src/components/Project/__tests__/MockFunctions/ProjectSettings.mock.ts index 70223cb3a..462592606 100644 --- a/ui/src/components/Project/__tests__/MockFunctions/ProjectSettings.mock.ts +++ b/ui/src/components/Project/__tests__/MockFunctions/ProjectSettings.mock.ts @@ -31,6 +31,14 @@ export const mockGetProjectResponse = ( return mockErrorResponse(); case testResponseType.INVALID: return mockInvalidResponse(); + case testResponseType.ARCHIVED: + return Promise.resolve( + createMockResponse({ + ...mockProjectData, + id: projectId, + status: "archived" + }) + ); default: return Promise.resolve( createMockResponse({ ...mockProjectData, id: projectId }) @@ -59,6 +67,23 @@ export const setUpdateProjectResponseType = (type: string = "") => { updateProjectResponseType = type; }; +let archiveProjectResponseType = ""; + +export const mockArchiveProjectResponse = () => { + switch (archiveProjectResponseType) { + case testResponseType.ERROR: + return mockErrorResponse(); + default: + return Promise.resolve( + createMockResponse({ ...mockProjectData, status: "archived" }) + ); + } +}; + +export const setArchiveProjectResponseType = (type: string = "") => { + archiveProjectResponseType = type; +}; + const mockErrorResponse = () => { return Promise.reject( createMockResponse(new Error("Internal Server Error"), 500) diff --git a/ui/src/components/Project/__tests__/ProjectList.test.tsx b/ui/src/components/Project/__tests__/ProjectList.test.tsx index 0d5ab8b35..cd648f65c 100644 --- a/ui/src/components/Project/__tests__/ProjectList.test.tsx +++ b/ui/src/components/Project/__tests__/ProjectList.test.tsx @@ -24,6 +24,7 @@ import { getStoredSelectedProjectId } from "utils/storage"; import ProjectList, { ProjectListProps } from "../ProjectList"; import { + mockArchivedProject, mockProjectsData, setProjectsResponseType } from "./MockFunctions/ProjectList.mock"; @@ -166,6 +167,15 @@ describe("ProjectList", () => { ], shouldBeHidden: [] as string[] }, + { + description: "selected group includes an archived project", + projectsResponseType: testResponseType.ARCHIVED, + shouldBeVisible: [ + mockProjectsData[0].display_name!, + mockProjectsData[1].display_name! + ], + shouldBeHidden: [mockArchivedProject.display_name!] + }, { description: "selected group has no projects", projectsResponseType: testResponseType.EMPTY, diff --git a/ui/src/components/Project/__tests__/ProjectSettings.test.tsx b/ui/src/components/Project/__tests__/ProjectSettings.test.tsx index a48a20f2d..28d263b2b 100644 --- a/ui/src/components/Project/__tests__/ProjectSettings.test.tsx +++ b/ui/src/components/Project/__tests__/ProjectSettings.test.tsx @@ -22,12 +22,15 @@ import { testResponseType } from "tests/testResponseType"; import { createQueryClient, createWrapper } from "tests/testUtil"; import { storageKeys } from "utils/Constants/enums"; +import { defaultModelsPageURL, getProjectPath } from "utils/Constants/routes"; +import { getStoredSelectedProjectId } from "utils/storage"; import { formatToShortLocalDateString } from "utils/timeConverter"; import ProjectSettings from "../ProjectSettings"; import { mockProjectData, + setArchiveProjectResponseType, setProjectResponseType, setUpdateProjectResponseType } from "./MockFunctions/ProjectSettings.mock"; @@ -71,6 +74,7 @@ describe("ProjectSettings", () => { mockNavigateCall(); setProjectResponseType(); setUpdateProjectResponseType(); + setArchiveProjectResponseType(); storeToLocalStorage(storageKeys.selectedProject, mockProjectData.id); }); @@ -337,4 +341,106 @@ describe("ProjectSettings", () => { screen.getByRole("button", { name: "Copy to clipboard" }) ).toBeInTheDocument(); }); + + describe("Archive project", () => { + const archiveButton = () => + screen.queryByRole("button", { name: "Archive project" }); + + const archiveUrl = `v0/projects/${mockProjectData.id}/archive`; + const archiveRequested = () => + vi + .mocked(mockAxiosInstance.post) + .mock.calls.some(([url]) => url === archiveUrl); + + const confirmArchive = async () => { + await userEvent.click(archiveButton()!); + const dialog = await screen.findByTestId("dialog-content"); + expect(dialog).toHaveTextContent(mockProjectData.display_name!); + await userEvent.click( + screen.getByRole("button", { name: "Archive" }) + ); + }; + + it("Should archive after confirmation and return to the Default project", async () => { + await renderProjectSettings(); + await waitForProjectLoad(); + + await confirmArchive(); + + await waitFor(() => expect(archiveRequested()).toBe(true)); + await waitFor(() => { + expect(mockUseNavigate).toHaveBeenCalledWith( + getProjectPath("default").ModelJobsList + + "?" + + defaultModelsPageURL.split("?")[1] + ); + }); + expect(getStoredSelectedProjectId()).toBe("default"); + }); + + it("Should not archive when the confirmation is cancelled", async () => { + await renderProjectSettings(); + await waitForProjectLoad(); + + await userEvent.click(archiveButton()!); + await screen.findByTestId("dialog-content"); + const cancelButtons = screen.getAllByRole("button", { + name: "Cancel" + }); + await userEvent.click(cancelButtons[cancelButtons.length - 1]); + + await waitFor(() => + expect( + screen.queryByTestId("dialog-content") + ).not.toBeInTheDocument() + ); + expect(archiveRequested()).toBe(false); + expect(mockUseNavigate).not.toHaveBeenCalled(); + }); + + it("Should show an error and stay on the page when archiving fails", async () => { + setArchiveProjectResponseType(testResponseType.ERROR); + await renderProjectSettings(); + await waitForProjectLoad(); + + await confirmArchive(); + + await waitFor(() => + expect( + screen.getAllByText("Project archive failed!").length + ).toBeGreaterThan(0) + ); + expect(mockUseNavigate).not.toHaveBeenCalled(); + expect(getStoredSelectedProjectId()).toBe(mockProjectData.id); + }); + + it.each([ + { + description: "the Default project", + selectedProject: "default", + responseType: "" + }, + { + description: "an already archived project", + selectedProject: mockProjectData.id, + responseType: testResponseType.ARCHIVED + } + ])( + "Should not offer archiving for $description", + async ({ selectedProject, responseType }) => { + storeToLocalStorage( + storageKeys.selectedProject, + selectedProject + ); + setProjectResponseType(responseType); + await renderProjectSettings(); + await waitForProjectLoad(); + + expect(archiveButton()).not.toBeInTheDocument(); + expect( + screen.queryByTestId("archive-project-section") + ).not.toBeInTheDocument(); + } + ); + }); }); diff --git a/ui/src/hooks/project/projects.ts b/ui/src/hooks/project/projects.ts index d2d93b445..553f6e000 100644 --- a/ui/src/hooks/project/projects.ts +++ b/ui/src/hooks/project/projects.ts @@ -11,6 +11,7 @@ import { useGetGroupsProjectsByGroupId } from "gen/v0/api/groups/groups"; import { + useCreateProjectsArchiveByProjectId, useGetProjects, useGetProjectsByProjectId, useUpdateProjectsByProjectId @@ -211,6 +212,44 @@ export const useCreateProject = ( return { createProject: createNewProject }; }; +export const useArchiveProject = ( + handleError: HandleErrorFunc, + setLoading: (value: boolean) => void +) => { + const { mutateAsync: archiveProjectById } = + useCreateProjectsArchiveByProjectId(); + const queryClient = useQueryClient(); + + const archiveProject = useCallback( + async (projectId: string): Promise => { + setLoading(true); + try { + await archiveProjectById({ projectId }); + invalidateProjectInfo(queryClient, projectId); + queryClient.invalidateQueries({ + queryKey: [ReactQueryKeys.ProjectList] + }); + return true; + } catch (e) { + const statusCode = ( + e as { response: { status: errorStatusCode } } + )?.response?.status; + const err = prepareCustomError( + parseErrorMessage(e as CustomError), + statusCode + ); + handleError(err, "Project archive failed!"); + return false; + } finally { + setLoading(false); + } + }, + [archiveProjectById, handleError, queryClient, setLoading] + ); + + return { archiveProject }; +}; + export const useProjectId = () => { const { projectId } = useParams<{ projectId?: string }>(); const storedProjectID = getStoredSelectedProjectId(); diff --git a/ui/src/tests/mockAxios.ts b/ui/src/tests/mockAxios.ts index f55b80b36..80bafaf52 100644 --- a/ui/src/tests/mockAxios.ts +++ b/ui/src/tests/mockAxios.ts @@ -63,6 +63,7 @@ import { mockTrialTagsResponse } from "components/PredictiveQueries/Training/__t import { mockCreateProjectResponse } from "components/Project/__tests__/MockFunctions/CreateProject.mock"; import { mockProjectsByGroupResponse } from "components/Project/__tests__/MockFunctions/ProjectList.mock"; import { + mockArchiveProjectResponse, mockGetProjectResponse, mockUpdateProjectResponse } from "components/Project/__tests__/MockFunctions/ProjectSettings.mock"; @@ -246,6 +247,9 @@ export const mockAxiosInstance = { if (url === "v1/tables/infer_metadata") { return mockInferMetadataResponse(payload); } + if (url.startsWith("v0/projects/") && url.endsWith("/archive")) { + return mockArchiveProjectResponse(); + } if ( url.startsWith("v0/projects/") && url.endsWith("/connectors/uploads/start") From c2e49eaa765a1b89e4d75f5fb33bd11c45872f9b Mon Sep 17 00:00:00 2001 From: aliu65803 Date: Fri, 13 Nov 2026 19:45:53 -0600 Subject: [PATCH 2/4] Restrict project archiving to owners and admins and return to the Default group Show the archive action only to the project owner or an administrator, matching the backend rule. After archiving, select the Default project and its group through a shared openProject helper also used by the project picker. Correct the confirmation copy and move the Default project and group IDs into shared constants. Tighten the archive tests. Co-Authored-By: Claude Opus 5.5 --- ui/src/components/Project/ProjectList.tsx | 18 ++-- ui/src/components/Project/ProjectSettings.tsx | 43 ++++---- .../__tests__/ProjectSettings.test.tsx | 97 ++++++++++++++----- ui/src/utils/Constants/config.ts | 4 + ui/src/utils/navigator.ts | 24 ++++- 5 files changed, 124 insertions(+), 62 deletions(-) diff --git a/ui/src/components/Project/ProjectList.tsx b/ui/src/components/Project/ProjectList.tsx index 3ccfe125b..ec6dcb1b6 100644 --- a/ui/src/components/Project/ProjectList.tsx +++ b/ui/src/components/Project/ProjectList.tsx @@ -46,11 +46,8 @@ import { useUserGroups } from "hooks/groups/groups"; import { useProjectId, useProjectListByGroup } from "hooks/project/projects"; import { useValidationState } from "hooks/validation/validation"; -import { - defaultModelsPageURL, - getProjectPath, - storageKeys -} from "utils/Constants"; +import { storageKeys } from "utils/Constants"; +import { openProject } from "utils/navigator"; import { getSelectedGroup } from "utils/storage"; import { formatToShortLocalDateString } from "utils/timeConverter"; @@ -180,13 +177,10 @@ const ProjectList = ({ open, toggleModal, enableClose }: ProjectListProps) => { if (rowData && !selectionInFlightRef.current) { selectionInFlightRef.current = true; toggleModal(); - const projectID = (rowData as { id: string }).id; - storeToLocalStorage(storageKeys.selectedProject, projectID); - storeToLocalStorage(storageKeys.selectedGroup, selectedGroupId); - navigate( - getProjectPath(projectID).ModelJobsList + - "?" + - defaultModelsPageURL.split("?")[1] + openProject( + navigate, + (rowData as { id: string }).id, + selectedGroupId ); } }, diff --git a/ui/src/components/Project/ProjectSettings.tsx b/ui/src/components/Project/ProjectSettings.tsx index 8f08fd6be..e974e809f 100644 --- a/ui/src/components/Project/ProjectSettings.tsx +++ b/ui/src/components/Project/ProjectSettings.tsx @@ -15,18 +15,19 @@ import { PropertiesOverviewCard, RadioGroup, RadioGroupItem, - storeToLocalStorage, TextArea, Title, Tooltip, TooltipContent, TooltipTrigger } from "@kumo-ai/kumo-ui-catalog"; -import { ProjectStatus } from "gen/v0/types"; +import { ProjectDBEntry, ProjectStatus } from "gen/v0/types"; +import { useUserDetails } from "stores/userStore"; import WithErrorBoundary from "components/@hoc/WithErrorBoundary"; import Validation from "components/Validation/Validation"; +import { useAdminInfo } from "hooks/auth/admin"; import { useKumoGroups } from "hooks/groups/groups"; import { useArchiveProject, @@ -37,11 +38,8 @@ import { import { useAutoResizeTextarea } from "hooks/utils/useAutoResizeTextarea"; import { useValidationState } from "hooks/validation/validation"; -import { - defaultModelsPageURL, - getProjectPath, - storageKeys -} from "utils/Constants"; +import { DEFAULT_GROUP_ID, DEFAULT_PROJECT_ID } from "utils/Constants"; +import { openProject } from "utils/navigator"; import { formatToShortLocalDateString } from "utils/timeConverter"; import ProjectNameInput from "./NameInput/ProjectNameInput"; @@ -54,7 +52,15 @@ const formatDate = (dateStr?: string) => { return formatToShortLocalDateString(dateStr); }; -const DEFAULT_PROJECT_ID = "default"; +const canArchiveProject = ( + project: ProjectDBEntry | null, + userId: string | undefined, + isAdmin: boolean +): boolean => + !!project && + project.id !== DEFAULT_PROJECT_ID && + project.status !== ProjectStatus.ARCHIVED && + (isAdmin || project.created_by === userId); const ProjectSettings = () => { const projectId = useProjectId(); @@ -67,6 +73,8 @@ const ProjectSettings = () => { ); const { updateProject } = useUpdateProject(handleError, setLoading); const { archiveProject } = useArchiveProject(handleError, setLoading); + const userDetails = useUserDetails(); + const { isAdmin } = useAdminInfo(); const { groups } = useKumoGroups(); const groupName = groups.find((g) => g.id === project?.group_id)?.display_name ?? "—"; @@ -133,16 +141,13 @@ const ProjectSettings = () => { }); }; - const canArchive = - !!project && - project.id !== DEFAULT_PROJECT_ID && - project.status !== ProjectStatus.ARCHIVED; + const canArchive = canArchiveProject(project, userDetails.user_id, isAdmin); const onArchiveClick = () => { clearErrors(); dialogRef.current?.toggleDialog( "Archive project", - `Archive "${project?.display_name}"? Archived projects can no longer be changed and their jobs cannot run. This cannot be undone from the UI.`, + `Archive "${project?.display_name}"? New resources and jobs can't be created in an archived project. This can't be undone.`, {}, false, "Archive", @@ -155,15 +160,7 @@ const ProjectSettings = () => { if (!projectId) return; const archived = await archiveProject(projectId); if (archived) { - storeToLocalStorage( - storageKeys.selectedProject, - DEFAULT_PROJECT_ID - ); - navigate( - getProjectPath(DEFAULT_PROJECT_ID).ModelJobsList + - "?" + - defaultModelsPageURL.split("?")[1] - ); + openProject(navigate, DEFAULT_PROJECT_ID, DEFAULT_GROUP_ID); } }; @@ -329,7 +326,7 @@ const ProjectSettings = () => {

Archived projects are read-only and hidden from - the project list. + the project picker.