Skip to content

Commit 450e777

Browse files
Copilotimnasnainaec
andcommitted
Extract compareProjectInfo to shared utilities
Co-authored-by: imnasnainaec <6411521+imnasnainaec@users.noreply.github.com>
1 parent f628740 commit 450e777

File tree

4 files changed

+14
-19
lines changed

4 files changed

+14
-19
lines changed

src/components/SiteSettings/UserManagement/ConfirmDeletion.tsx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ import { toast } from "react-toastify";
55

66
import { User, UserProjectInfo } from "api/models";
77
import { getUserProjects } from "backend";
8-
9-
function compareProjectInfo(a: UserProjectInfo, b: UserProjectInfo): number {
10-
return a.projectIsActive && !b.projectIsActive
11-
? -1
12-
: !a.projectIsActive && b.projectIsActive
13-
? 1
14-
: a.projectName.localeCompare(b.projectName);
15-
}
8+
import { compareProjectInfo } from "components/SiteSettings/UserManagement/utilities";
169

1710
interface ConfirmDeletionProps {
1811
user?: User;

src/components/SiteSettings/UserManagement/UserProjectsDialog.tsx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ import { toast } from "react-toastify";
55

66
import { User, UserProjectInfo } from "api/models";
77
import { getUserProjects } from "backend";
8-
9-
function compareProjectInfo(a: UserProjectInfo, b: UserProjectInfo): number {
10-
return a.projectIsActive && !b.projectIsActive
11-
? -1
12-
: !a.projectIsActive && b.projectIsActive
13-
? 1
14-
: a.projectName.localeCompare(b.projectName);
15-
}
8+
import { compareProjectInfo } from "components/SiteSettings/UserManagement/utilities";
169

1710
interface UserProjectsDialogProps {
1811
user?: User;

src/components/SiteSettings/UserManagement/tests/UserProjectsDialog.test.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@ import { act, render, screen } from "@testing-library/react";
33

44
import { User } from "api/models";
55
import UserProjectsDialog from "components/SiteSettings/UserManagement/UserProjectsDialog";
6-
import { newUser } from "types/user";
76

87
const mockGetUserProjects = jest.fn();
98

109
jest.mock("backend", () => ({
1110
getUserProjects: (...args: any[]) => mockGetUserProjects(...args),
1211
}));
1312

14-
const testUser: User = { ...newUser(), id: "test-id", username: "testuser" };
15-
1613
const renderUserProjectsDialog = async (
1714
user?: User
1815
): Promise<void> => {
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { UserProjectInfo } from "api/models";
2+
3+
export function compareProjectInfo(
4+
a: UserProjectInfo,
5+
b: UserProjectInfo
6+
): number {
7+
return a.projectIsActive && !b.projectIsActive
8+
? -1
9+
: !a.projectIsActive && b.projectIsActive
10+
? 1
11+
: a.projectName.localeCompare(b.projectName);
12+
}

0 commit comments

Comments
 (0)