@griddo/ax 11.2.11 → 11.2.12-rc.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "11.2.11",
+  "version": "11.2.12-rc.0",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -110,6 +110,7 @@
     "jsdom-global": "^3.0.2",
     "lodash.isequal": "4.5.0",
     "markdown-draft-js": "^2.2.1",
+    "masonic": "^4.0.1",
     "mini-css-extract-plugin": "0.11.3",
     "optimize-css-assets-webpack-plugin": "^6.0.1",
     "pkg-dir": "^5.0.0",
@@ -225,5 +226,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c557c8d5e4369a6c163952d94033a5a7a4faaeb5"
+  "gitHead": "8bea2c0c6f1b0dbcfdd2fe1dabb48a0c13b7ee83"
 }

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

@@ -13,7 +13,7 @@ afterEach(cleanup);
 const defaultProps = mock<ISideModalProps>();
 
 describe("SideModal component rendering", () => {
-  it("should render the component", () => {
+  it("should render the component visible if isOpen is true", () => {
     const handleClickMock = jest.fn();
     const toggleModalMock = jest.fn() as CalledWithMock<void, []> & (() => void);
     defaultProps.categories = [
@@ -23,7 +23,7 @@ describe("SideModal component rendering", () => {
     defaultProps.isOpen = true;
     defaultProps.theme = "default-theme";
     defaultProps.whiteList = ["EventsDistributor", "ArticlesDistributor"];
-    defaultProps.handleClick = handleClickMock;
+    defaultProps.onClick = handleClickMock;
     defaultProps.toggleModal = toggleModalMock;
     defaultProps.optionsType = "modules";
 
@@ -35,9 +35,11 @@ describe("SideModal component rendering", () => {
 
     const sideModal = screen.getByTestId("side-modal");
     expect(sideModal).toBeTruthy();
+    const styles = getComputedStyle(sideModal);
+    expect(styles.left).toEqual("0px");
   });
 
-  it("should not render the component if isOpen is false", () => {
+  it("should render the component hidden if isOpen is false", () => {
     const handleClickMock = jest.fn();
     const toggleModalMock = jest.fn() as CalledWithMock<void, []> & (() => void);
     defaultProps.categories = [
@@ -47,7 +49,7 @@ describe("SideModal component rendering", () => {
     defaultProps.isOpen = false;
     defaultProps.theme = "default-theme";
     defaultProps.whiteList = ["EventsDistributor", "ArticlesDistributor"];
-    defaultProps.handleClick = handleClickMock;
+    defaultProps.onClick = handleClickMock;
     defaultProps.toggleModal = toggleModalMock;
     defaultProps.optionsType = "modules";
 
@@ -57,8 +59,10 @@ describe("SideModal component rendering", () => {
       </ThemeProvider>
     );
 
-    const sideModal = screen.queryByTestId("side-modal");
-    expect(sideModal).not.toBeTruthy();
+    const sideModal = screen.getByTestId("side-modal");
+    expect(sideModal).toBeTruthy();
+    const styles = getComputedStyle(sideModal);
+    expect(styles.left).toEqual("-999px");
   });
 
   it("should render optiontype as title", () => {
@@ -120,7 +124,7 @@ describe("SideModal component rendering", () => {
     defaultProps.isOpen = true;
     defaultProps.theme = "default-theme";
     defaultProps.whiteList = ["BasicContent", "CardCollection"];
-    defaultProps.handleClick = handleClickMock;
+    defaultProps.onClick = handleClickMock;
     defaultProps.toggleModal = toggleModalMock;
     defaultProps.optionsType = "modules";
 
@@ -155,7 +159,7 @@ describe("SideModal component rendering", () => {
     defaultProps.isOpen = true;
     defaultProps.theme = "default-theme";
     defaultProps.whiteList = ["LinkableImage", "Video"];
-    defaultProps.handleClick = handleClickMock;
+    defaultProps.onClick = handleClickMock;
     defaultProps.toggleModal = toggleModalMock;
     defaultProps.optionsType = "components";
 
@@ -182,7 +186,7 @@ describe("SideModal component events", () => {
     defaultProps.isOpen = true;
     defaultProps.theme = "default-theme";
     defaultProps.whiteList = ["Accordion", "AddressCollection"];
-    defaultProps.handleClick = handleClickMock;
+    defaultProps.onClick = handleClickMock;
     defaultProps.toggleModal = toggleModalMock;
     defaultProps.optionsType = "modules";
 
@@ -212,7 +216,7 @@ describe("SideModal component events", () => {
     defaultProps.isOpen = true;
     defaultProps.theme = "default-theme";
     defaultProps.whiteList = ["BasicContent", "CardCollection"];
-    defaultProps.handleClick = handleClickMock;
+    defaultProps.onClick = handleClickMock;
     defaultProps.toggleModal = toggleModalMock;
     defaultProps.optionsType = "modules";
 
@@ -251,7 +255,7 @@ describe("SideModal component events", () => {
     defaultProps.isOpen = true;
     defaultProps.theme = "default-theme";
     defaultProps.whiteList = ["BasicContent", "CardCollection"];
-    defaultProps.handleClick = handleClickMock;
+    defaultProps.onClick = handleClickMock;
     defaultProps.toggleModal = toggleModalMock;
     defaultProps.optionsType = "modules";
 

package/src/api/images.tsx

@@ -22,9 +22,14 @@ const SERVICES: { [key: string]: IServiceConfig } = {
     endpoint: "/image/",
     method: "DELETE",
   },
+  CREATE_THUMBNAIL: {
+    ...template,
+    endpoint: ["/thumbnail/contentId/", "/contentType/"],
+    method: "POST",
+  },
 };
 
-const createImage = async (data: any, setProgress?: (progress: number) => void) => {
+const createImage = async (data: FormData, setProgress?: (progress: number) => void) => {
   return sendUploadRequest(SERVICES.CREATE_IMAGE, data, setProgress);
 };
 
@@ -49,4 +54,14 @@ const deleteImage = async (imageID: number) => {
   return sendRequest(SERVICES.DELETE_IMAGE);
 };
 
-export default { createImage, getImageInfo, updateImage, deleteImage };
+const createThumbnail = async (contentID: number, contentType: "form" | "navigation", data: FormData) => {
+  const {
+    host,
+    endpoint: [prefix, suffix],
+  } = SERVICES.CREATE_THUMBNAIL;
+  SERVICES.CREATE_THUMBNAIL.dynamicUrl = `${host}${prefix}${contentID}${suffix}${contentType}`;
+
+  return sendRequest(SERVICES.CREATE_THUMBNAIL, data);
+};
+
+export default { createImage, getImageInfo, updateImage, deleteImage, createThumbnail };

package/src/api/pages.tsx

@@ -1,9 +1,16 @@
+import { AxiosResponse } from "axios";
 import { template } from "./config";
 import { IServiceConfig, sendRequest } from "./utils";
+import { IGetPagesParams } from "@ax/types";
 
 const PUBLIC_BASE_PATH = process.env.REACT_APP_PUBLIC_API_ENDPOINT;
 
 const SERVICES: { [key: string]: IServiceConfig } = {
+  GET_PAGES: {
+    ...template,
+    endpoint: "/pages",
+    method: "GET",
+  },
   GET_PAGE_INFO: {
     ...template,
     endpoint: "/page/",
@@ -92,6 +99,45 @@ const SERVICES: { [key: string]: IServiceConfig } = {
   },
 };
 
+const getPages = async (params: IGetPagesParams, filterQuery = ""): Promise<AxiosResponse> => {
+  const { host, endpoint } = SERVICES.GET_PAGES;
+
+  const {
+    deleted,
+    page,
+    itemsPerPage,
+    query,
+    filterStructuredData,
+    lang,
+    format,
+    filterPages,
+    ignoreLang,
+    filterSites,
+    type,
+  } = params;
+
+  SERVICES.GET_PAGES.dynamicUrl = `${host}${endpoint}?deleted=${deleted}${filterQuery}`;
+
+  if (page && itemsPerPage)
+    SERVICES.GET_PAGES.dynamicUrl = SERVICES.GET_PAGES.dynamicUrl + `&page=${page}&itemsPerPage=${itemsPerPage}`;
+  if (query && query.trim() !== "") SERVICES.GET_PAGES.dynamicUrl = SERVICES.GET_PAGES.dynamicUrl + `&query=${query}`;
+  if (filterStructuredData)
+    SERVICES.GET_PAGES.dynamicUrl = SERVICES.GET_PAGES.dynamicUrl + `&filterStructuredData=${filterStructuredData}`;
+  if (format) SERVICES.GET_PAGES.dynamicUrl = SERVICES.GET_PAGES.dynamicUrl + `&format=${format}`;
+  if (type) SERVICES.GET_PAGES.dynamicUrl = SERVICES.GET_PAGES.dynamicUrl + `&type=${type}`;
+  if (filterPages)
+    SERVICES.GET_PAGES.dynamicUrl = SERVICES.GET_PAGES.dynamicUrl + `&filterPages=${filterPages.join(",")}`;
+  if (filterSites)
+    SERVICES.GET_PAGES.dynamicUrl = SERVICES.GET_PAGES.dynamicUrl + `&filterSites=${filterSites.join(",")}`;
+  if (ignoreLang) SERVICES.GET_PAGES.dynamicUrl = SERVICES.GET_PAGES.dynamicUrl + `&ignoreLang=${ignoreLang}`;
+
+  const dataHeader = {
+    ...(lang && { lang }),
+  };
+
+  return sendRequest(SERVICES.GET_PAGES, null, dataHeader);
+};
+
 const getPageInfo = async (pageID: number) => {
   const { host, endpoint } = SERVICES.GET_PAGE_INFO;
   SERVICES.GET_PAGE_INFO.dynamicUrl = `${host}${endpoint}${pageID}`;
@@ -232,6 +278,7 @@ const getPageTranslation = async (data: any, langID: number) => {
 };
 
 export default {
+  getPages,
   getPageInfo,
   updatePage,
   createPage,
@@ -248,5 +295,5 @@ export default {
   getPublicPage,
   pageCheck,
   getPageSummary,
-  getPageTranslation
+  getPageTranslation,
 };

package/src/api/selects.tsx

@@ -37,18 +37,20 @@ const getSelectSiteItems = async (siteId: number, entity: string, params: any, p
   return sendRequest(SERVICES.GET_SITE_ITEMS);
 };
 
-const getSelectItems = async (entity: string, entityId?: number | string) => {
+const getSelectItems = async (entity: string, entityId?: number | string, lang?: number) => {
   const { host, endpoint } = SERVICES.GET_ITEMS;
+  const filter = lang ? `?filterByLanguage=${lang}` : "";
   SERVICES.GET_ITEMS.dynamicUrl = entityId
-    ? `${host}${endpoint}/${entity}/${entityId}`
-    : `${host}${endpoint}/${entity}/`;
+    ? `${host}${endpoint}/${entity}/${entityId}${filter}`
+    : `${host}${endpoint}/${entity}${filter}`;
 
   return sendRequest(SERVICES.GET_ITEMS);
 };
 
-const getSelectSites = async () => {
+const getSelectSites = async (lang?: number) => {
   const { host, endpoint } = SERVICES.GET_SITES;
-  SERVICES.GET_ITEMS.dynamicUrl = `${host}${endpoint}`;
+  const filter = lang ? `?filterByLanguage=${lang}` : "";
+  SERVICES.GET_ITEMS.dynamicUrl = `${host}${endpoint}${filter}`;
 
   return sendRequest(SERVICES.GET_SITES);
 };

package/src/components/Browser/index.tsx

@@ -147,7 +147,14 @@ const Browser = (props: IBrowserProps): JSX.Element => {
       )}
       {showIframe ? (
         <S.FrameWrapper hasBorder={isPageEditor} data-testid="navbar-iframe-wrapper">
-          <iframe title="Preview" width={getWidth(resolution)} height="100%" src={urlPreview} loading="lazy" />
+          <iframe
+            title="Preview"
+            width={getWidth(resolution)}
+            height="100%"
+            src={urlPreview}
+            loading="lazy"
+            className="frame-content"
+          />
         </S.FrameWrapper>
       ) : (
         <S.Wrapper

package/src/components/Button/style.tsx

@@ -25,13 +25,17 @@ const Button = styled.button<{ iconFill: boolean }>`
     transition: opacity 0.1s;
   }
   :focus {
-    outline: 1px solid ${(p) => p.theme.color.interactive02};
+    outline: none;
+  }
+  :focus-visible {
+    outline: ${(p) => `1px solid ${p.theme.color.interactive02}`};
   }
   :hover:before {
     background-color: ${(p) => p.theme.color.overlayHoverDark};
     opacity: 1;
   }
-  :focus:before {
+  :focus:before,
+  :focus-visible:before {
     background-color: ${(p) => p.theme.color.overlayFocusDark};
     opacity: 1;
   }
@@ -44,6 +48,7 @@ const Button = styled.button<{ iconFill: boolean }>`
     background-color: ${(p) => p.theme.color.interactiveDisabled};
     :hover:before,
     :focus:before,
+    :focus-visible:before,
     :active:before {
       background-color: transparent;
     }

package/src/components/ConfigPanel/Form/ConnectedField/NavConnectedField/index.tsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { memo } from "react";
 import { connect } from "react-redux";
 
 import { FieldContainer } from "@ax/components";
@@ -7,7 +7,7 @@ import { getInnerFields } from "@ax/forms";
 import { IRootState } from "@ax/types";
 import { areEqual, filterThemeModules } from "@ax/helpers";
 
-const NavConnectedField = (props: any) => {
+const NavConnectedField = (props: any): JSX.Element => {
   const {
     whiteList,
     objKey,
@@ -109,4 +109,7 @@ const mapDispatchToProps = {
   updateEditorContent: navigationActions.updateEditorContent,
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(React.memo(NavConnectedField, areEqual));
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(memo(NavConnectedField, areEqual) as typeof NavConnectedField);

package/src/components/ConfigPanel/Form/ConnectedField/PageConnectedField/TemplateManager/index.tsx

@@ -31,6 +31,7 @@ export const TemplateManager = (props: IProps): JSX.Element => {
     lang,
     themeElements,
     scrollEditorID,
+    isForm,
   } = props;
 
   const isConfig = selectedTab === "config";
@@ -46,7 +47,7 @@ export const TemplateManager = (props: IProps): JSX.Element => {
     const mappedField = !isArr ? { ...field, key: fieldObjKey } : field;
     const handleUpdate = (fieldKey: string, value: any) =>
       updateValue(fieldKey, value, templateContent.editorID, slugTo);
-    const error = errors.find((err: any) => err.editorID === templateContent.editorID && err.key === key);
+    const error = errors.find((err) => err.editorID === templateContent.editorID && err.key === key);
     const isComputedField = Object.prototype.hasOwnProperty.call(field, "computed");
 
     const addedModules: string[] = modulesDataPacks.reduce((acc: string[], current: any) => {
@@ -81,10 +82,13 @@ export const TemplateManager = (props: IProps): JSX.Element => {
 
   return (
     <>
-      {isConfig && templateFields && <S.Title>Template Options</S.Title>}
+      {isConfig && templateFields && !isForm && <S.Title>Template Options</S.Title>}
       {templateFields &&
         templateFields
-          .filter((templateField: ISchemaField) => !templateField.hidden)
+          .filter((templateField: ISchemaField) => {
+            const isHidden = templateField.hidden || (isForm && !templateField.overwrite);
+            return !isHidden;
+          })
           .map((templateField: ISchemaField, index: number) => {
             const {
               whiteList,
@@ -156,6 +160,7 @@ interface IProps {
   lang: number;
   themeElements: IThemeElements | null;
   scrollEditorID: number | null;
+  isForm: boolean;
 }
 
 const mapStateToProps = (state: IRootState) => ({

package/src/components/ConfigPanel/Form/ConnectedField/PageConnectedField/index.tsx

@@ -8,6 +8,7 @@ import {
   areEqual,
   filterThemeModules,
   isTemplateExcludedFromTheme,
+  getFormTemplate,
 } from "@ax/helpers";
 import { IRootState } from "@ax/types";
 import { pageEditorActions } from "@ax/containers/PageEditor";
@@ -15,7 +16,7 @@ import { pageEditorActions } from "@ax/containers/PageEditor";
 import TemplateManager from "./TemplateManager";
 import Field from "./Field";
 
-const PageConnectedField = (props: any) => {
+const PageConnectedField = (props: any): JSX.Element => {
   const {
     whiteList,
     objKey,
@@ -51,15 +52,18 @@ const PageConnectedField = (props: any) => {
   } = props;
 
   const isTemplate = field.type === "template";
+  const isFormTemplate = field.type === "formTemplate";
+
   const overrideableFields = ["header", "footer"];
   const isOverride = selectedContent.type && overrideableFields.includes(selectedContent.type);
   const isPageHome = componentType === "page" && selectedContent.isHome;
   const allowModifySlug = !selectedContent.id && !selectedContent.isHome;
   const isNewPage = componentType === "page" && !selectedContent.id;
   const error = errors.find((err: any) => err.editorID === selectedEditorID && err.key === objKey);
+  const isFormPage = selectedContent.component === "FormPage";
 
   let isTemplateActivated = true;
-  if (selectedContent.template && !isGlobal) {
+  if (selectedContent.template && !isGlobal && !isFormTemplate) {
     isTemplateActivated =
       activatedTemplates.find((temp: any) => temp.id === selectedContent.template.templateType) &&
       !isTemplateExcludedFromTheme(themeElements, selectedContent.template.templateType)
@@ -143,7 +147,7 @@ const PageConnectedField = (props: any) => {
   };
 
   if (isOverride) {
-    if (!field.modifiable) return null;
+    if (!field.modifiable) return <></>;
 
     updateValue = (key: string, value: any) => {
       updateEditorContent(selectedEditorID, key, value);
@@ -153,8 +157,10 @@ const PageConnectedField = (props: any) => {
     };
   }
 
-  if (isTemplate) {
-    const template = getTemplate(selectedContent[field.key].templateType);
+  if (isTemplate || isFormTemplate) {
+    const template = isFormTemplate
+      ? getFormTemplate(selectedContent[field.key].templateType)
+      : getTemplate(selectedContent[field.key].templateType);
 
     return (
       <TemplateManager
@@ -176,10 +182,15 @@ const PageConnectedField = (props: any) => {
         setHistoryPush={setHistoryPush}
         lang={lang.id}
         activatedModules={filteredActivatedModules}
+        isForm={isFormTemplate}
       />
     );
   }
 
+  if (isFormPage) {
+    return <></>;
+  }
+
   return (
     <Field
       whiteList={filteredWhiteList}
@@ -236,4 +247,7 @@ const mapDispatchToProps = {
   deleteError: pageEditorActions.deleteError,
 };
 
-export default connect(mapStateToProps, mapDispatchToProps)(memo(PageConnectedField, areEqual));
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(memo(PageConnectedField, areEqual) as typeof PageConnectedField);

package/src/components/ConfigPanel/NavigationForm/Field/index.tsx

@@ -126,7 +126,7 @@ const Field = (props: IProps) => {
         <SideModal
           optionsType={optionsType}
           whiteList={orderedOptions}
-          handleClick={handleReplace}
+          onClick={handleReplace}
           toggleModal={toggleModal}
           isOpen={isOpen}
           theme={theme}

package/src/components/ErrorCenter/index.tsx

@@ -6,6 +6,7 @@ import * as S from "./style";
 
 const ErrorCenter = (props: IErrorCenterProps): JSX.Element => {
   const { errors, actions } = props;
+  const { goToError, goToPackage } = actions || {};
 
   const goToElement = (key: string) => {
     const element = document.getElementById(`gdd_${key}`);
@@ -25,10 +26,10 @@ const ErrorCenter = (props: IErrorCenterProps): JSX.Element => {
 
   const getErrorItem = (item: IErrorItem): JSX.Element => {
     const handleClick = () => {
-      if (item.hasDeactivatedPackage) {
-        actions?.goToPackage();
+      if (item.hasDeactivatedPackage && goToPackage) {
+        goToPackage();
       } else {
-        item.editorID !== null && actions?.goToError(item.editorID, item.tab, item.template);
+        item.editorID !== null && goToError && goToError(item.editorID, item.tab, item.template, item.parentEditorID);
         goToElement(item.key);
       }
     };
@@ -67,8 +68,8 @@ const ErrorCenter = (props: IErrorCenterProps): JSX.Element => {
 export interface IErrorCenterProps {
   errors: IErrorItem[];
   actions?: {
-    goToError(editorID: number | null, tab: string, template: boolean): void;
-    goToPackage(): void;
+    goToError(editorID: number | null, tab: string, template: boolean, parentEditorID?: number): void;
+    goToPackage?(): void;
   };
 }
 

package/src/components/Fields/AsyncSelect/index.tsx

@@ -26,6 +26,7 @@ const AsyncSelect = (props: IAsyncSelectProps): JSX.Element => {
     source,
     type,
     maxWidth,
+    filterLang,
   } = props;
 
   const initialState: IState = {
@@ -50,7 +51,7 @@ const AsyncSelect = (props: IAsyncSelectProps): JSX.Element => {
                 ? await selects.getSelectSiteItems(site.id, entity, options, selectedContent.id)
                 : await selects.getSelectSiteItems(site.id, entity, options);
           } else {
-            result = await selects.getSelectItems(entity, entityId);
+            result = await selects.getSelectItems(entity, entityId, filterLang);
           }
 
           if (result && isReqOk(result.status)) {
@@ -184,6 +185,7 @@ export interface IAsyncSelectProps {
   source?: string;
   type?: string;
   maxWidth?: number;
+  filterLang?: number;
 }
 
 export default AsyncSelect;

package/src/components/Fields/ComponentArray/MixableComponentArray/AddItemButton/index.tsx

@@ -18,7 +18,7 @@ const AddItemButton = (props: IProps) => {
         categories={categories}
         toggleModal={toggleModal}
         isOpen={isOpen}
-        handleClick={handleClick}
+        onClick={handleClick}
         theme={theme}
         showSearch
       />

package/src/components/Fields/ComponentArray/MixableComponentArray/index.tsx

@@ -49,7 +49,7 @@ const MixableComponentArray = (props: IMixableComponentArrayProps): JSX.Element
 
   // fix for old not array values
   const fixedValue = Array.isArray(value) ? value : containerToComponentArray(value);
-  const componentIDs: number[] = fixedValue.map((element: any) => element.editorID);
+  const componentIDs: number[] = fixedValue.map((element) => element.editorID);
 
   const type = getTypefromKey(objKey);
   const { contentType = type } = field;
@@ -63,8 +63,11 @@ const MixableComponentArray = (props: IMixableComponentArrayProps): JSX.Element
   );
 
   const selectedID = parseInt(localStorage.getItem("selectedID") || "0");
+  const isComponentModule = contentType === "components";
+  const isModuleArr = contentType === "modules" || contentType === "fields";
+  const isFormArr = contentType === "fields";
 
-  const { isOpen, toggleModal } = useModal();
+  const { isOpen, toggleModal } = useModal(isFormArr, false);
   const [isBulkOpen, setIsBulkOpen] = useState(false);
   const [draggingId, setDraggingId] = useState<number | null>(null);
   const { isVisible, toggleToast, setIsVisible, state: toastState } = useToast();
@@ -83,9 +86,6 @@ const MixableComponentArray = (props: IMixableComponentArrayProps): JSX.Element
     return fixedValue.length > 1 ? `#${index + 1} ${name}` : name;
   };
 
-  const isComponentModule = contentType === "components";
-  const isModuleArr = contentType === "modules" || contentType === "fields";
-
   const handleAddModule = (moduleType: string) =>
     addModuleAction && addModuleAction(moduleType, objKey, editorID, isComponentModule);
 
@@ -121,18 +121,16 @@ const MixableComponentArray = (props: IMixableComponentArrayProps): JSX.Element
 
   const ComponentList = React.memo(function ComponentList({ components }: any) {
     return components.map((element: IModule, i: number) => {
-      const { editorID } = element;
-      const { moduleTitle, isModuleDeactivated, componentTitle, displayName, isModule } = getComponentProps(
-        element,
-        activatedModules,
-        isModuleArr
-      );
+      const { editorID, fixed } = element;
+      const componentProps = getComponentProps(element, activatedModules, isModuleArr);
+      const { moduleTitle, isModuleDeactivated, componentTitle, displayName, isModule } = componentProps;
       const text = getText(componentTitle || displayName, i);
       const isItemSelected = isSelected(editorID);
       const isDraggingSelected = selectedItems.all.includes(draggingId);
       const isGhosting = isItemSelected && !!draggingId && draggingId !== editorID && isDraggingSelected;
       const isMultiDragging = selectedItems.all.length > 1 && draggingId === editorID;
       const isActive = scrollEditorID === editorID;
+      const canDelete = !isFormArr || !fixed;
 
       return (
         <Draggable draggableId={`${editorID}`} index={i} key={editorID}>
@@ -150,8 +148,9 @@ const MixableComponentArray = (props: IMixableComponentArrayProps): JSX.Element
               categories={categories}
               actions={actions}
               selectedContent={selectedContent}
-              disabled={disabled}
+              disabled={disabled || isModuleDeactivated}
               canDuplicate={showAddItemButton && !isModuleDeactivated}
+              canDelete={canDelete}
               parentKey={objKey}
               theme={theme}
               arrayLength={components.length}
@@ -214,7 +213,10 @@ const MixableComponentArray = (props: IMixableComponentArrayProps): JSX.Element
   };
 
   const handleDelete = () => {
-    deleteModuleAction && deleteModuleAction(selectedItems.all, objKey);
+    const modulesToDelete = fixedValue
+      .filter((element) => selectedItems.all.includes(element.editorID) && (!isFormArr || !element.fixed))
+      .map((element) => element.editorID);
+    deleteModuleAction && deleteModuleAction(modulesToDelete, objKey);
     resetBulkSelection();
   };
 
@@ -303,7 +305,7 @@ const MixableComponentArray = (props: IMixableComponentArrayProps): JSX.Element
           categories={categories}
           toggleModal={toggleModal}
           isOpen={isOpen}
-          handleClick={handleModuleReplace}
+          onClick={handleModuleReplace}
           theme={theme}
           showSearch
         />
@@ -320,7 +322,7 @@ export interface IMixableComponentArrayProps {
   value?: IModule[];
   selectedContent: any;
   editorID: number;
-  goTo: (editorID: string) => void;
+  goTo: (editorID: number) => void;
   actions?: {
     addComponentAction: (componentType: any, key?: string) => void;
     addModuleAction: (moduleType: string, key: string, selectedID: number, isComponentModule?: boolean) => void;

package/src/components/Fields/ComponentArray/SameComponentArray/index.tsx

@@ -90,11 +90,9 @@ const SameComponentArray = (props: ISameComponentArrayProps): JSX.Element => {
   const ComponentList = React.memo(function ComponentList({ components }: any) {
     return components.map((element: any, i: number) => {
       const { editorID } = element;
-      const { moduleTitle, isModuleDeactivated, componentTitle, displayName, isModule } = getComponentProps(
-        element,
-        activatedModules,
-        isModuleArr
-      );
+      const componentProps = getComponentProps(element, activatedModules, isModuleArr);
+      if (!componentProps) return <></>;
+      const { moduleTitle, isModuleDeactivated, componentTitle, displayName, isModule } = componentProps;
       const text = getText(componentTitle || displayName, i);
       const isItemSelected = isSelected(editorID);
       const isDraggingSelected = selectedItems.all.includes(draggingId);
@@ -219,7 +217,7 @@ export interface ISameComponentArrayProps {
   elementUniqueSelection: boolean;
   selectedContent: any;
   editorID: number;
-  goTo: (editorID: string) => void;
+  goTo: (editorID: number) => void;
   actions: {
     addComponentAction: (componentType: any, key?: string) => void;
     addModuleAction: (moduleType: string, key: string, selectedID: number, isComponentModule?: boolean) => void;