@griddo/ax 12.3.0 → 12.5.0

package/src/__tests__/components/RestrictionsModal/CurrentAccessList/CurrentAccessList.test.tsx

@@ -1,3 +1,4 @@
+import type { Mock } from "vitest";
 import { parseTheme } from "@ax/helpers";
 
 import { cleanup, fireEvent, render, screen } from "@testing-library/react";
@@ -8,9 +9,9 @@ import CurrentAccessList from "@ax/components/RestrictionsModal/CurrentAccessLis
 import globalTheme from "@ax/themes/theme.json";
 import type { IUser } from "@ax/types";
 
-jest.mock("react-redux", () => ({
-	...jest.requireActual("react-redux"),
-	useSelector: jest.fn((selector) => {
+vi.mock("react-redux", async () => ({
+	...(await vi.importActual("react-redux")),
+	useSelector: vi.fn((selector) => {
 		const mockState = {
 			users: {
 				roles: [
@@ -28,7 +29,7 @@ afterEach(cleanup);
 const defaultProps: {
 	restrictionType: "users" | "roles";
 	currentAccessGrants: { users: number[]; roles: number[] };
-	onEdit: jest.Mock;
+	onEdit: Mock;
 	users: IUser[];
 } = {
 	restrictionType: "users",
@@ -36,7 +37,7 @@ const defaultProps: {
 		users: [1, 2],
 		roles: [],
 	},
-	onEdit: jest.fn(),
+	onEdit: vi.fn(),
 	users: [
 		{
 			id: 1,
@@ -144,7 +145,7 @@ describe("CurrentAccessList component rendering", () => {
 
 describe("CurrentAccessList component events", () => {
 	it("should call onEdit when Manage User Access button is clicked", () => {
-		const onEditMock = jest.fn();
+		const onEditMock = vi.fn();
 
 		renderComponent({
 			...defaultProps,

package/src/__tests__/components/RestrictionsModal/OptionsStep/OptionsStep.test.tsx

@@ -1,3 +1,4 @@
+import type { Mock } from "vitest";
 import React from "react";
 
 import { ThemeProvider } from "styled-components";
@@ -12,14 +13,14 @@ afterEach(cleanup);
 
 const defaultProps: {
 	restrictionType: "users" | "roles";
-	onRestrictionTypeChange: jest.Mock;
-	onCancel: jest.Mock;
-	onNext: jest.Mock;
+	onRestrictionTypeChange: Mock;
+	onCancel: Mock;
+	onNext: Mock;
 } = {
 	restrictionType: "users",
-	onRestrictionTypeChange: jest.fn(),
-	onCancel: jest.fn(),
-	onNext: jest.fn(),
+	onRestrictionTypeChange: vi.fn(),
+	onCancel: vi.fn(),
+	onNext: vi.fn(),
 };
 
 const renderComponent = (props = defaultProps) =>
@@ -81,7 +82,7 @@ describe("OptionsStep component rendering", () => {
 
 describe("OptionsStep component events", () => {
 	it("should call onRestrictionTypeChange when users option is clicked", () => {
-		const onRestrictionTypeChangeMock = jest.fn();
+		const onRestrictionTypeChangeMock = vi.fn();
 
 		renderComponent({
 			...defaultProps,
@@ -97,7 +98,7 @@ describe("OptionsStep component events", () => {
 	});
 
 	it("should call onRestrictionTypeChange when roles option is clicked", () => {
-		const onRestrictionTypeChangeMock = jest.fn();
+		const onRestrictionTypeChangeMock = vi.fn();
 
 		renderComponent({
 			...defaultProps,
@@ -113,7 +114,7 @@ describe("OptionsStep component events", () => {
 	});
 
 	it("should call onCancel when Cancel button is clicked", () => {
-		const onCancelMock = jest.fn();
+		const onCancelMock = vi.fn();
 
 		renderComponent({
 			...defaultProps,
@@ -127,7 +128,7 @@ describe("OptionsStep component events", () => {
 	});
 
 	it("should call onNext when Next button is clicked", () => {
-		const onNextMock = jest.fn();
+		const onNextMock = vi.fn();
 
 		renderComponent({
 			...defaultProps,
@@ -141,7 +142,7 @@ describe("OptionsStep component events", () => {
 	});
 
 	it("should toggle between users and roles selections", () => {
-		const onRestrictionTypeChangeMock = jest.fn();
+		const onRestrictionTypeChangeMock = vi.fn();
 
 		renderComponent({
 			...defaultProps,

package/src/__tests__/components/RestrictionsModal/RestrictionsModal.test.tsx

@@ -1,3 +1,4 @@
+import type { Mock } from "vitest";
 import { cleanup, fireEvent, render, screen } from "@testing-library/react";
 import { ThemeProvider } from "styled-components";
 import "@testing-library/jest-dom";
@@ -7,13 +8,13 @@ import { parseTheme } from "@ax/helpers";
 import globalTheme from "@ax/themes/theme.json";
 import type { PageAccessGrantsSummary } from "@ax/types";
 
-jest.mock("@ax/components/RestrictionsModal/utils", () => ({
-	fetchUsers: jest.fn().mockResolvedValue([]),
+vi.mock("@ax/components/RestrictionsModal/utils", async () => ({
+	fetchUsers: vi.fn().mockResolvedValue([]),
 }));
 
-jest.mock("react-redux", () => ({
-	...jest.requireActual("react-redux"),
-	useSelector: jest.fn((selector) => {
+vi.mock("react-redux", async () => ({
+	...(await vi.importActual("react-redux")),
+	useSelector: vi.fn((selector) => {
 		const mockState = {
 			sites: {
 				currentSiteInfo: { id: 1 },
@@ -34,15 +35,15 @@ afterEach(cleanup);
 
 const defaultProps: {
 	isOpen: boolean;
-	toggleModal: jest.Mock;
+	toggleModal: Mock;
 	currentAccessGrants: PageAccessGrantsSummary | undefined;
-	onUpdateAccessGrants: jest.Mock;
+	onUpdateAccessGrants: Mock;
 	isSaving: boolean;
 } = {
 	isOpen: false,
-	toggleModal: jest.fn(),
+	toggleModal: vi.fn(),
 	currentAccessGrants: undefined,
-	onUpdateAccessGrants: jest.fn().mockResolvedValue(undefined),
+	onUpdateAccessGrants: vi.fn().mockResolvedValue(undefined),
 	isSaving: false,
 };
 
@@ -102,7 +103,7 @@ describe("RestrictionsModal component navigation", () => {
 	});
 
 	it("should close modal when Cancel button is clicked", () => {
-		const toggleModalMock = jest.fn();
+		const toggleModalMock = vi.fn();
 
 		renderComponent({
 			...defaultProps,

package/src/__tests__/components/RestrictionsModal/RolesList/RolesList.test.tsx

@@ -5,11 +5,11 @@ import "@testing-library/jest-dom";
 
 import globalTheme from "@ax/themes/theme.json";
 import RolesList from "@ax/components/RestrictionsModal/RolesList";
-import { render, cleanup, screen, fireEvent } from "../../../../../config/jest/test-utils";
+import { render, cleanup, screen, fireEvent } from "../../../../../config/tests/test-utils";
 
 afterEach(() => {
 	cleanup();
-	jest.resetAllMocks();
+	vi.resetAllMocks();
 });
 
 const mockStore = configureStore();
@@ -25,11 +25,11 @@ const initialState = {
 };
 
 const defaultProps = {
-	onCancel: jest.fn(),
-	onApply: jest.fn(),
+	onCancel: vi.fn(),
+	onApply: vi.fn(),
 	selectedRoleIds: [],
 	isSaving: false,
-	onResetAccess: jest.fn(),
+	onResetAccess: vi.fn(),
 };
 
 const renderComponent = (props = defaultProps, storeState = initialState) => {
@@ -178,7 +178,7 @@ describe("RolesList component role selection", () => {
 
 describe("RolesList component actions", () => {
 	it("should call onApply with selected role IDs when Apply button is clicked", () => {
-		const onApplyMock = jest.fn();
+		const onApplyMock = vi.fn();
 
 		renderComponent({ ...defaultProps, onApply: onApplyMock });
 
@@ -192,7 +192,7 @@ describe("RolesList component actions", () => {
 	});
 
 	it("should call onCancel when Cancel button is clicked", () => {
-		const onCancelMock = jest.fn();
+		const onCancelMock = vi.fn();
 
 		renderComponent({
 			...defaultProps,
@@ -207,7 +207,7 @@ describe("RolesList component actions", () => {
 	});
 
 	it("should call onResetAccess when Reset Page Access button is clicked", () => {
-		const onResetAccessMock = jest.fn();
+		const onResetAccessMock = vi.fn();
 
 		renderComponent({
 			...defaultProps,

package/src/__tests__/components/RestrictionsModal/UsersList/UsersList.test.tsx

@@ -1,3 +1,4 @@
+import type { Mock } from "vitest";
 import { act } from "@testing-library/react";
 import { ThemeProvider } from "styled-components";
 import configureStore from "redux-mock-store";
@@ -7,10 +8,10 @@ import "@testing-library/jest-dom";
 import globalTheme from "@ax/themes/theme.json";
 import UsersList from "@ax/components/RestrictionsModal/UsersList";
 import type { IUser } from "@ax/types";
-import { render, cleanup, screen, fireEvent } from "../../../../../config/jest/test-utils";
+import { render, cleanup, screen, fireEvent } from "../../../../../config/tests/test-utils";
 
-jest.mock("@ax/components/RestrictionsModal/utils", () => ({
-	fetchUsers: jest.fn().mockResolvedValue([
+vi.mock("@ax/components/RestrictionsModal/utils", () => ({
+	fetchUsers: vi.fn().mockResolvedValue([
 		{ id: 1, username: "john", name: "John Doe", email: "john@example.com", failed: 0, roles: [], isSuperAdmin: false, pagePermissions: [] },
 		{ id: 2, username: "jane", name: "Jane Smith", email: "jane@example.com", failed: 0, roles: [], isSuperAdmin: false, pagePermissions: [] },
 		{ id: 3, username: "bob", name: "Bob Wilson", email: "bob@example.com", failed: 0, roles: [], isSuperAdmin: false, pagePermissions: [] },
@@ -19,7 +20,7 @@ jest.mock("@ax/components/RestrictionsModal/utils", () => ({
 
 afterEach(() => {
 	cleanup();
-	jest.resetAllMocks();
+	vi.resetAllMocks();
 });
 
 const mockStore = configureStore();
@@ -34,18 +35,18 @@ const initialState = {
 };
 
 const defaultProps: {
-	onCancel: jest.Mock;
-	onApply: jest.Mock;
+	onCancel: Mock;
+	onApply: Mock;
 	selectedUserIds: number[];
 	isSaving: boolean;
-	onResetAccess: jest.Mock;
+	onResetAccess: Mock;
 	users: IUser[];
 } = {
-	onCancel: jest.fn(),
-	onApply: jest.fn(),
+	onCancel: vi.fn(),
+	onApply: vi.fn(),
 	selectedUserIds: [],
 	isSaving: false,
-	onResetAccess: jest.fn(),
+	onResetAccess: vi.fn(),
 	users: [
 		{ id: 1, username: "john", name: "John Doe", email: "john@example.com", failed: 0, roles: [], isSuperAdmin: false, pagePermissions: [] },
 		{ id: 2, username: "jane", name: "Jane Smith", email: "jane@example.com", failed: 0, roles: [], isSuperAdmin: false, pagePermissions: [] },
@@ -189,7 +190,7 @@ describe("UsersList component user selection", () => {
 	});
 
 	it("should call onApply with selected user IDs when Apply button is clicked", async () => {
-		const onApplyMock = jest.fn();
+		const onApplyMock = vi.fn();
 
 		renderComponent({ ...defaultProps, onApply: onApplyMock });
 
@@ -205,7 +206,7 @@ describe("UsersList component user selection", () => {
 	});
 
 	it("should include current user when applying selection", async () => {
-		const onApplyMock = jest.fn();
+		const onApplyMock = vi.fn();
 
 		renderComponent({
 			...defaultProps,
@@ -224,7 +225,7 @@ describe("UsersList component user selection", () => {
 
 describe("UsersList component actions", () => {
 	it("should call onCancel when Cancel button is clicked", async () => {
-		const onCancelMock = jest.fn();
+		const onCancelMock = vi.fn();
 
 		await act(async () => {
 			renderComponent({
@@ -244,7 +245,7 @@ describe("UsersList component actions", () => {
 	});
 
 	it("should call onResetAccess when Reset Page Access button is clicked", () => {
-		const onResetAccessMock = jest.fn();
+		const onResetAccessMock = vi.fn();
 
 		renderComponent({
 			...defaultProps,
@@ -270,7 +271,7 @@ describe("UsersList component actions", () => {
 	});
 
 	it("should ensure current user is always included in apply", async () => {
-		const onApplyMock = jest.fn();
+		const onApplyMock = vi.fn();
 
 		renderComponent({
 			...defaultProps,

package/src/__tests__/components/SearchField/SearchField.test.tsx

@@ -13,7 +13,7 @@ afterEach(cleanup);
 
 describe("Search field component rendering", () => {
 	it("should render the component opened", () => {
-		const onChangeMock = jest.fn();
+		const onChangeMock = vi.fn();
 		const defaultProps: ISearchFieldProps = {
 			onChange: onChangeMock,
 		};
@@ -34,7 +34,7 @@ describe("Search field component rendering", () => {
 	});
 
 	it("should render the component opened with placeholder", () => {
-		const onChangeMock = jest.fn();
+		const onChangeMock = vi.fn();
 		const defaultProps: ISearchFieldProps = {
 			onChange: onChangeMock,
 			placeholder: "Search",
@@ -58,7 +58,7 @@ describe("Search field component rendering", () => {
 	});
 
 	it("should render the component closed", () => {
-		const onChangeMock = jest.fn();
+		const onChangeMock = vi.fn();
 		const defaultProps: ISearchFieldProps = {
 			onChange: onChangeMock,
 			closeOnInactive: true,
@@ -80,7 +80,7 @@ describe("Search field component rendering", () => {
 	});
 
 	it("should render the component disabled", () => {
-		const onChangeMock = jest.fn();
+		const onChangeMock = vi.fn();
 		const defaultProps: ISearchFieldProps = {
 			onChange: onChangeMock,
 			closeOnInactive: false,
@@ -100,7 +100,7 @@ describe("Search field component rendering", () => {
 
 describe("Search field filters", () => {
 	it("should render the component with search filters", () => {
-		const onChangeMock = jest.fn();
+		const onChangeMock = vi.fn();
 
 		const searchFilters = [
 			{ value: "filterby", label: "Filter by" },
@@ -131,8 +131,8 @@ describe("Search field filters", () => {
 	});
 
 	it("should call onFilterChange when selecting option", async () => {
-		const onChangeMock = jest.fn();
-		const onFilterChangeMock = jest.fn();
+		const onChangeMock = vi.fn();
+		const onFilterChangeMock = vi.fn();
 
 		const searchFilters = [
 			{ value: "filterby", label: "Filter by" },
@@ -167,7 +167,7 @@ describe("Search field filters", () => {
 
 describe("search field events", () => {
 	it("should open on icon search click and show field and close icon", () => {
-		const onChangeMock = jest.fn();
+		const onChangeMock = vi.fn();
 		const defaultProps: ISearchFieldProps = {
 			onChange: onChangeMock,
 			closeOnInactive: true,
@@ -204,7 +204,7 @@ describe("search field events", () => {
 	});
 
 	it("should close and clear on close icon click and hide field and search icon if closeOnActive", () => {
-		const onChangeMock = jest.fn();
+		const onChangeMock = vi.fn();
 		const defaultProps: ISearchFieldProps = {
 			onChange: onChangeMock,
 			closeOnInactive: true,
@@ -246,7 +246,7 @@ describe("search field events", () => {
 	});
 
 	it("should clear and not close on close icon click if not closeOnActive and input is not empty", () => {
-		const onChangeMock = jest.fn();
+		const onChangeMock = vi.fn();
 		const defaultProps: ISearchFieldProps = {
 			onChange: onChangeMock,
 			closeOnInactive: false,
@@ -280,7 +280,7 @@ describe("search field events", () => {
 	});
 
 	it("show press enter on input type", () => {
-		const onChangeMock = jest.fn();
+		const onChangeMock = vi.fn();
 		const defaultProps: ISearchFieldProps = {
 			onChange: onChangeMock,
 			closeOnInactive: true,
@@ -311,7 +311,7 @@ describe("search field events", () => {
 	});
 
 	it("should call onchange on input type", () => {
-		const onChangeMock = jest.fn();
+		const onChangeMock = vi.fn();
 		const defaultProps: ISearchFieldProps = {
 			onChange: onChangeMock,
 			closeOnInactive: true,
@@ -342,7 +342,7 @@ describe("search field events", () => {
 	});
 
 	it("should call onchange on key enter", () => {
-		const onChangeMock = jest.fn();
+		const onChangeMock = vi.fn();
 		const defaultProps: ISearchFieldProps = {
 			onChange: onChangeMock,
 			closeOnInactive: true,