@griddo/ax 1.67.0 → 1.67.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "1.67.0",
+  "version": "1.67.3",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -221,5 +221,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d44876fdcc7e83f8715701a96c1a9b222666925a"
+  "gitHead": "f74caa35c567a1b658a8a2cc27fa2dd37ca6bf44"
 }

package/src/containers/PageEditor/actions.tsx

@@ -28,6 +28,7 @@ import {
   getParentKey,
   checkH1content,
   parseValidationErrors,
+  findPackagesActivationErrors,
 } from "@ax/forms";
 import { appActions } from "@ax/containers/App";
 import { navigationActions } from "@ax/containers/Navigation";
@@ -92,7 +93,7 @@ import {
   ISetCopyModule,
 } from "./interfaces";
 
-const { setIsLoading, setIsSaving } = appActions;
+const { setIsLoading, setIsSaving, handleError } = appActions;
 const { getSiteDefaults, getDefaults } = navigationActions;
 
 // AUDIT: THIS FILE IS WAY TOO LONG - LOOK FOR A REFACTOR SOLUTION
@@ -200,7 +201,7 @@ function setTranslatedParent(): (dispatch: Dispatch, getState: any) => void {
           const translatedParentId = translatedParent && translatedParent[0] ? translatedParent[0].pageId : null;
           updateEditorContent(selectedEditorID, "parent", translatedParentId)(dispatch, getState);
         },
-        handleError: (response: any) => appActions.handleError(response)(dispatch),
+        handleError: (response: any) => handleError(response)(dispatch),
       };
 
       const callback = async () => pages.getPageLanguages(parent, site, entity);
@@ -576,7 +577,6 @@ function getPageLanguages(pageID: number, siteID: number | null, entity?: string
   };
 }
 
-
 function duplicatePage(pageID: number, data: any, siteID?: number): (dispatch: Dispatch) => Promise<boolean> {
   return async (dispatch) => {
     try {
@@ -1073,11 +1073,16 @@ function validatePage(publish?: boolean, browserRef?: any): (dispatch: Dispatch,
   return async (dispatch, getState) => {
     try {
       const { editorContent } = getStateValues(getState);
+      const content = deepClone(editorContent);
+
+      const {
+        dataPacks: { modules, templates },
+        pageEditor,
+      } = getState();
+
       const page = getPageData(getState, false);
       const { values } = parseData(page, false);
 
-      const content = deepClone(editorContent);
-
       let errors: IErrorItem[] = [];
 
       const responseActions = {
@@ -1095,6 +1100,8 @@ function validatePage(publish?: boolean, browserRef?: any): (dispatch: Dispatch,
       const fieldErrors = findFieldsErrors(content);
 
       errors = [...errors, ...fieldErrors];
+      const packagesActivationErrors = findPackagesActivationErrors(pageEditor, modules, templates);
+      errors = packagesActivationErrors ? [...errors, packagesActivationErrors] : errors;
 
       let warnings: IErrorItem[] = [];
       if (browserRef && browserRef.current) {

package/src/forms/errors.tsx

@@ -40,6 +40,7 @@ const ERRORS: Record<string, string> = {
   ERR039: "Sorry, this color doesn't exist. Please add new one.",
   ERR040: "Sorry, the file is not in a valid format.",
   ERR041: "Sorry, the password doesn’t match.",
+  ERR042: "This content is part of disabled content type package. To publish it, you must first activate it.",
 };
 
 export { ERRORS };

package/src/forms/index.tsx

@@ -25,7 +25,9 @@ import {
 import { getInnerFields, getStructuredDataInnerFields } from "./fields";
 import {
   getValidity,
+  findPackagesActivationErrors,
   findFieldsErrors,
+  isTemplateActivated,
   findMandatoryStructuredDataErrors,
   checkH1content,
   parseValidationErrors,
@@ -55,7 +57,9 @@ export {
   getLastComponentEditorID,
   getParentKey,
   getValidity,
+  findPackagesActivationErrors,
   findFieldsErrors,
+  isTemplateActivated,
   findMandatoryStructuredDataErrors,
   checkH1content,
   parseValidationErrors,

package/src/forms/validators.tsx

@@ -1,14 +1,16 @@
 import {
   dateToString,
+  getDeactivatedModules,
   getDefaultSchema,
   getSchema,
   getTemplate,
   hasProps,
   isComponentEmpty,
   isEmptyContainer,
+  isModuleDisabled,
 } from "@ax/helpers";
 import { findByEditorID } from "@ax/forms";
-import { IErrorItem } from "@ax/types";
+import { IErrorItem, ITemplate } from "@ax/types";
 import { ERRORS } from "./errors";
 
 const VALIDATORS = {
@@ -290,6 +292,58 @@ const getValidationErrors = (
   return errors;
 };
 
+const isTemplateActivated = (templates: ITemplate[], currentTemplateType: string): boolean =>
+  templates.find((temp: ITemplate) => temp.id === currentTemplateType) ? true : false;
+
+const findPackagesActivationErrors = (
+  pageEditor: any,
+  modules: string[],
+  templates: ITemplate[]
+): IErrorItem | null => {
+  const {
+    schema,
+    selectedContent: { component },
+  } = pageEditor;
+
+  const isGlobal = component === "GlobalPage";
+  let deactivatedModules: string[] = [];
+  let isCurrentTemplateActivated = true;
+  let hasDeactivatedModules = false;
+
+  const {
+    editorContent: { template },
+  } = pageEditor?.editorContent;
+
+  if (template && !isGlobal) {
+    const mainContentModules = template?.mainContent?.modules;
+
+    if (mainContentModules) {
+      deactivatedModules = getDeactivatedModules(modules, mainContentModules);
+      hasDeactivatedModules = deactivatedModules.length > 0;
+    } else {
+      hasDeactivatedModules = isModuleDisabled(component, schema.schemaType, modules);
+    }
+
+    isCurrentTemplateActivated = isTemplateActivated(templates, template.templateType);
+  }
+
+  if (!isCurrentTemplateActivated || hasDeactivatedModules) {
+    return {
+      type: "error",
+      message: getErrorMessage("ERR042", null),
+      validator: {},
+      editorID: null,
+      component: "",
+      name: "",
+      key: "",
+      tab: "",
+      template: false,
+    };
+  }
+
+  return null;
+};
+
 const findFieldsErrors = (content: any): IErrorItem[] => {
   const queue: any[] = [content];
   let errors: IErrorItem[] = [];
@@ -386,4 +440,12 @@ interface IError {
   errorCode: string;
 }
 
-export { getValidity, findFieldsErrors, findMandatoryStructuredDataErrors, checkH1content, parseValidationErrors };
+export {
+  getValidity,
+  isTemplateActivated,
+  findPackagesActivationErrors,
+  findFieldsErrors,
+  findMandatoryStructuredDataErrors,
+  checkH1content,
+  parseValidationErrors,
+};

package/src/helpers/dataPacks.tsx

@@ -8,4 +8,11 @@ const getActivatedDataPacksIds = (activatedDataPacks: any) => {
 const isModuleDisabled = (selectedComponent: string, type: string, activatedModules: string[]): boolean =>
   type === "module" && !activatedModules.includes(selectedComponent);
 
-export { getActivatedDataPacksIds, isModuleDisabled };
+const getDeactivatedModules = (modules: any, currentModules: any) => {
+  const deactivatedModules = currentModules
+    .map((module: any) => (isModuleDisabled(module.component, "module", modules) ? module.component : null))
+    .filter((module: string | null) => !!module);
+  return deactivatedModules;
+};
+
+export { getActivatedDataPacksIds, isModuleDisabled, getDeactivatedModules };

package/src/helpers/index.tsx

@@ -92,7 +92,7 @@ import { imageResizeCropAndCompress, compressImage } from "./imageResize";
 
 import { isEmptyArray, moveArrayElement } from "./arrays";
 
-import { getActivatedDataPacksIds, isModuleDisabled } from "./dataPacks";
+import { getActivatedDataPacksIds, isModuleDisabled, getDeactivatedModules } from "./dataPacks";
 
 import { isDevelopment } from "./environment";
 
@@ -155,6 +155,7 @@ export {
   handleRequest,
   getActivatedDataPacksIds,
   isModuleDisabled,
+  getDeactivatedModules,
   getInitials,
   getSchemaType,
   getModuleCategories,

package/src/modules/PageEditor/index.tsx

@@ -10,7 +10,7 @@ import { navigationActions } from "@ax/containers/Navigation";
 import { pageStatus } from "@ax/containers/PageEditor/interfaces";
 import { RouteLeavingGuard } from "@ax/guards";
 import { useIsDirty, useModal } from "@ax/hooks";
-import { isModuleDisabled } from "@ax/helpers";
+import { isModuleDisabled, getDeactivatedModules } from "@ax/helpers";
 import { dataPacksActions } from "@ax/containers/Settings/DataPacks";
 import { DeleteModal } from "./atoms";
 import Editor from "./Editor";
@@ -180,7 +180,7 @@ const PageEditor = (props: IProps) => {
 
   const reviewPage = () => {
     const { validatePage } = props;
-    validatePage(undefined, browserRef);
+    validatePage(false, browserRef);
   };
 
   const handlePublishDraft = async () => {
@@ -324,9 +324,18 @@ const PageEditor = (props: IProps) => {
 
   let isTemplateActivated = true;
   let hasDeactivatedModules = false;
+  let deactivatedModules: string[] = [];
   if (editorContent.editorContent && editorContent.editorContent.template) {
     const editorTemplate = editorContent.editorContent.template;
-    hasDeactivatedModules = isModuleDisabled(selectedComponent, schema.schemaType, activatedModules);
+    const mainContentModules = editorTemplate?.mainContent?.modules;
+
+    if (mainContentModules) {
+      deactivatedModules = getDeactivatedModules(activatedModules, mainContentModules);
+      hasDeactivatedModules = deactivatedModules.length > 0;
+    } else {
+      hasDeactivatedModules = isModuleDisabled(selectedComponent, schema.schemaType, activatedModules);
+    }
+
     isTemplateActivated = activatedTemplates.find((temp: any) => temp.id === editorTemplate.templateType)
       ? true
       : false;
@@ -410,7 +419,8 @@ const PageEditor = (props: IProps) => {
       if (!isTemplateActivated) {
         getSiteDataPackbyTemplate(editorTemplate.templateType);
       } else if (hasDeactivatedModules) {
-        getSiteDataPackbyModule(selectedComponent);
+        const currentModule = deactivatedModules.length === 1 ? deactivatedModules[0] : selectedComponent;
+        getSiteDataPackbyModule(currentModule);
       }
       setHistoryPush("/sites/settings/content-types", false);
     }