Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 10 additions & 14 deletions ui/src/components/Project/ProjectList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";

Expand Down Expand Up @@ -124,7 +121,9 @@ const ProjectList = ({ open, toggleModal, enableClose }: ProjectListProps) => {
} = useProjectListByGroup(selectedGroupId ?? "", handleError);

const tableData = useMemo<ProjectDBEntry[]>(() => {
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)
Expand Down Expand Up @@ -178,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
);
}
},
Expand Down
80 changes: 78 additions & 2 deletions ui/src/components/Project/ProjectSettings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// All rights reserved.
// SPDX-License-Identifier: Apache-2.0

import { useEffect, useMemo, useState } from "react";
import { useEffect, useMemo, useRef, useState } from "react";
import { useNavigate } from "react-router";
import Spacer from "react-spacer";

Expand All @@ -21,19 +21,25 @@ import {
TooltipContent,
TooltipTrigger
} from "@kumo-ai/kumo-ui-catalog";
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,
useProject,
useProjectId,
useUpdateProject
} from "hooks/project/projects";
import { useAutoResizeTextarea } from "hooks/utils/useAutoResizeTextarea";
import { useValidationState } from "hooks/validation/validation";

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";
Expand All @@ -46,6 +52,16 @@ const formatDate = (dateStr?: string) => {
return formatToShortLocalDateString(dateStr);
};

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();
const [loading, setLoading] = useState(false);
Expand All @@ -56,6 +72,9 @@ const ProjectSettings = () => {
handleError
);
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 ?? "—";
Expand All @@ -64,7 +83,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");

Expand Down Expand Up @@ -123,6 +141,36 @@ const ProjectSettings = () => {
});
};

const canArchive = canArchiveProject(project, userDetails.user_id, isAdmin);

const onArchiveClick = () => {
clearErrors();
dialogRef.current?.toggleDialog(
"Archive project",
`Archive "${project?.display_name}"? New resources and jobs can't be created in an archived project. This can't be undone.`,
{ projectId },
false,
"Archive",
"destructive"
);
};

const archiveInFlightRef = useRef(false);

const onArchiveConfirm = async (target?: { projectId?: string }) => {
const targetProjectId = target?.projectId;
if (!targetProjectId || archiveInFlightRef.current) return;
archiveInFlightRef.current = true;
dialogRef.current?.toggleDialog();
try {
if (await archiveProject(targetProjectId)) {
openProject(navigate, DEFAULT_PROJECT_ID, DEFAULT_GROUP_ID);
}
} finally {
archiveInFlightRef.current = false;
}
};

return (
<>
<div className="flex items-center justify-between">
Expand Down Expand Up @@ -159,6 +207,7 @@ const ProjectSettings = () => {
alert={alert}
ctaMsgs={null}
dialogRef={dialogRef}
onDialogConfirm={onArchiveConfirm}
hideWarnings={() => {}}
clearErrors={clearErrors}
/>
Expand Down Expand Up @@ -272,6 +321,33 @@ const ProjectSettings = () => {
cardClassName={"px-0 pb-0"}
titleSize="md"
/>
{canArchive && (
<>
<Spacer height={32} />
<div
data-testid="archive-project-section"
className="flex items-center justify-between gap-4 max-w-300 border-t border-border-primary pt-6">
<div>
<Label className="font-medium text-base text-title-primary leading-5">
Archive project
</Label>
<p className="text-sm text-title-secondary leading-5 mt-1">
Archived projects are hidden from the project
picker and can't accept new resources or jobs.
</p>
</div>
<Button
id="archive-project"
variant="destructive"
size="sm"
className="rounded-sm px-4 py-2 h-9 text-base leading-5"
disabled={loading}
onClick={onArchiveClick}>
Archive project
</Button>
</div>
</>
)}
</>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<
Expand All @@ -56,6 +64,14 @@ export const mockProjectsByGroupResponse = (): Promise<
createMockResponse([]) as unknown as AxiosResponse<ProjectDBEntry[]>
);
}
if (projectsResponseType === testResponseType.ARCHIVED) {
return Promise.resolve(
createMockResponse([
...mockProjectsData,
mockArchivedProject
]) as unknown as AxiosResponse<ProjectDBEntry[]>
);
}
return Promise.resolve(
createMockResponse(mockProjectsData) as unknown as AxiosResponse<
ProjectDBEntry[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 })
Expand Down Expand Up @@ -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)
Expand Down
34 changes: 33 additions & 1 deletion ui/src/components/Project/__tests__/ProjectList.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
// All rights reserved.
// SPDX-License-Identifier: Apache-2.0

import { removeFromLocalStorage } from "@kumo-ai/kumo-ui-catalog";
import {
removeFromLocalStorage,
storeToLocalStorage
} from "@kumo-ai/kumo-ui-catalog";
import { QueryClient } from "@tanstack/react-query";
import { act, render, screen, waitFor } from "@testing-library/react";
import userEvent from "@testing-library/user-event";
Expand All @@ -24,6 +27,7 @@ import { getStoredSelectedProjectId } from "utils/storage";
import ProjectList, { ProjectListProps } from "../ProjectList";

import {
mockArchivedProject,
mockProjectsData,
setProjectsResponseType
} from "./MockFunctions/ProjectList.mock";
Expand Down Expand Up @@ -166,6 +170,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,
Expand Down Expand Up @@ -193,6 +206,25 @@ describe("ProjectList", () => {
}
);

it("Should hide an archived project even when it is the stored selection", async () => {
storeToLocalStorage(
storageKeys.selectedProject,
mockArchivedProject.id
);
setProjectsResponseType(testResponseType.ARCHIVED);
await renderProjectList();
await selectGroup();

await waitFor(() =>
expect(
screen.getByText(mockProjectsData[0].display_name!)
).toBeInTheDocument()
);
expect(
screen.queryByText(mockArchivedProject.display_name!)
).not.toBeInTheDocument();
});

it("Should filter rows by search input", async () => {
await renderProjectList();
await selectGroup();
Expand Down
Loading
Loading