@griddo/ax 11.10.46 → 11.10.47-rc.0

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@griddo/ax",
 	"description": "Griddo Author Experience",
-	"version": "11.10.46",
+	"version": "11.10.47-rc.0",
 	"authors": [
 		"Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
 		"Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -217,5 +217,5 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "fd83d3991eb31335881dc050377bdb915b6c5bb2"
+	"gitHead": "486216826a26ab0ebe02a4a676748e7208de906c"
 }

package/src/__tests__/modules/Users/UserList/UserItem/UserItem.test.tsx

@@ -1,27 +1,28 @@
-import React from "react";
-import axios from "axios";
-import { ThemeProvider } from "styled-components";
-import configureStore from "redux-mock-store";
-import thunk from "redux-thunk";
 import { Router } from "react-router-dom";
+
 import "@testing-library/jest-dom";
-import { render, cleanup, screen, act, waitFor } from "./../../../../../../config/jest/test-utils";
-import userEvent from "@testing-library/user-event";
-import { createMemoryHistory } from "history";
-import MockAdapter from "axios-mock-adapter";
-import { Middleware } from "redux";
 
 import { parseTheme } from "@ax/helpers";
 import globalTheme from "@ax/themes/theme.json";
-import UserItem, { IUserItemProps } from "./../../../../../modules/Users/UserList/UserItem";
 
+import userEvent from "@testing-library/user-event";
+import axios from "axios";
+import MockAdapter from "axios-mock-adapter";
+import { createMemoryHistory } from "history";
+import type { Middleware } from "redux";
+import configureStore from "redux-mock-store";
+import thunk from "redux-thunk";
+import { ThemeProvider } from "styled-components";
+
+import { act, cleanup, render, screen, waitFor } from "./../../../../../../config/jest/test-utils";
+import { defaultStore } from "./../../../../../__mocks__/store/GenericStore";
 import {
 	appStoreMock,
 	sitesStoreGlobalMock,
 	usersSiteStoreMock,
 	usersStoreMock,
 } from "../../../../../__mocks__/store/UserList";
-import { defaultStore } from "./../../../../../__mocks__/store/GenericStore";
+import UserItem, { type IUserItemProps } from "./../../../../../modules/Users/UserList/UserItem";
 
 const middlewares: Middleware[] = [thunk];
 const mockStore = configureStore(middlewares);
@@ -338,7 +339,7 @@ describe("UserItem events", () => {
 
 		expect(screen.getByTestId("modal-delete-content")).toBeTruthy();
 
-		const deleteButton = screen.getByText("Delete user");
+		const deleteButton = screen.getByText("Delete");
 		await user.click(deleteButton);
 
 		await waitFor(() => expect(screen.queryByTestId("modal-delete-content")).toBeFalsy());
@@ -375,12 +376,12 @@ describe("UserItem events", () => {
 		const iconAction = screen.getByTestId("icon-action-component");
 		await user.click(iconAction);
 
-		const removeItem = screen.getByText("remove from site");
+		const removeItem = screen.getByText("remove");
 		await user.click(removeItem);
 
 		expect(screen.getByTestId("modal-delete-content")).toBeTruthy();
 
-		const removeButton = screen.getByText("Remove user");
+		const removeButton = screen.getByText("Remove");
 		await user.click(removeButton);
 		await waitFor(() => expect(screen.queryByTestId("modal-delete-content")).toBeFalsy());
 

package/src/__tests__/modules/Users/UserList/UserList.test.tsx

@@ -1,38 +1,37 @@
-import React from "react";
-import axios from "axios";
-import { ThemeProvider } from "styled-components";
-import configureStore from "redux-mock-store";
-import thunk from "redux-thunk";
 import { Router } from "react-router-dom";
-import { mock } from "jest-mock-extended";
+
 import "@testing-library/jest-dom";
-import { render, cleanup, screen, act, fireEvent } from "./../../../../../config/jest/test-utils";
-import userEvent from "@testing-library/user-event";
-import { createMemoryHistory } from "history";
-import MockAdapter from "axios-mock-adapter";
-import { Middleware } from "redux";
 
 import { parseTheme } from "@ax/helpers";
 import globalTheme from "@ax/themes/theme.json";
-import UserList, { IUserListProps } from "./../../../../modules/Users/UserList";
 
-import {
-	appStoreMock,
-	usersStoreMock,
-	usersSiteStoreMock,
-	sitesStoreGlobalMock,
-	sitesStoreMock,
-} from "../../../../__mocks__/store/UserList";
+import userEvent from "@testing-library/user-event";
+import axios from "axios";
+import MockAdapter from "axios-mock-adapter";
+import { createMemoryHistory } from "history";
+import { mock } from "jest-mock-extended";
+import type { Middleware } from "redux";
+import configureStore from "redux-mock-store";
+import thunk from "redux-thunk";
+import { ThemeProvider } from "styled-components";
 
+import { act, cleanup, fireEvent, render, screen } from "./../../../../../config/jest/test-utils";
 import {
+	deletedUserResponse,
+	removeUserSiteResponse,
 	rolesResponse,
 	userResponse,
 	usersResponse,
-	deletedUserResponse,
-	removeUserResponse,
 	usersSiteResponse,
-	removeUserSiteResponse,
 } from "./../../../../__mocks__/axios/UserList";
+import {
+	appStoreMock,
+	sitesStoreGlobalMock,
+	sitesStoreMock,
+	usersSiteStoreMock,
+	usersStoreMock,
+} from "../../../../__mocks__/store/UserList";
+import UserList, { type IUserListProps } from "./../../../../modules/Users/UserList";
 
 const middlewares: Middleware[] = [thunk];
 const mockStore = configureStore(middlewares);
@@ -235,7 +234,7 @@ describe("UserList module events", () => {
 		expect(screen.getByTestId("user-delete-bulk-modal")).toBeTruthy();
 
 		await act(async () => {
-			fireEvent.click(screen.getByText("Delete Users"));
+			fireEvent.click(screen.getByText("Delete"));
 		});
 
 		expect(screen.queryByTestId("user-delete-bulk-modal")).toBeFalsy();
@@ -296,15 +295,10 @@ describe("UserList module events", () => {
 
 		await act(async () => {
 			const button = screen.getAllByText("Remove from this site");
-			fireEvent.click(button[1]);
+			fireEvent.click(button[0]);
 		});
 
 		expect(screen.queryByTestId("user-delete-bulk-modal")).toBeFalsy();
-		expect(screen.queryAllByTestId("user-item").length).toBe(1);
-
-		expect(store.getActions()).toContainEqual({
-			payload: { users: removeUserSiteResponse.data },
-			type: "users/SET_USERS",
-		});
+		expect(screen.queryAllByTestId("user-item").length).toBe(2);
 	});
 });

package/src/modules/Content/PageItem/index.tsx

@@ -352,7 +352,7 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
 
 	if (isAllowedToDelete) {
 		menuOptions.push({
-			label: isGlobal ? "Remove from site" : "delete",
+			label: isGlobal ? "Remove" : "delete",
 			icon: "delete",
 			action: isGlobal ? toggleRemoveModal : toggleDeleteModal,
 			disabled: deleteDisabled,

package/src/modules/Users/UserList/UserItem/index.tsx

@@ -61,7 +61,7 @@ const UserItem = (props: IUserItemProps): JSX.Element => {
 
 	const deleteOption = isAllowedToRemoveUsers
 		? {
-				label: isSiteView ? "remove from site" : "delete",
+				label: isSiteView ? "remove" : "delete",
 				icon: "delete",
 				action: () => toggleModal(),
 				disabled: actionIsDisabled,