@griddo/ax 10.1.22 → 10.1.24

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "10.1.22",
+  "version": "10.1.24",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -230,5 +230,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f4c83713875a78532a56ccae4e29731252f4ea6a"
+  "gitHead": "9f7d623c271600fa67301cfa3609055775af1445"
 }

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

@@ -28,7 +28,7 @@ export const TemplateManager = (props: IProps): JSX.Element => {
     moduleCopy,
     availableDataPacks,
     setHistoryPush,
-    lang
+    lang,
   } = props;
 
   const isConfig = selectedTab === "config";
@@ -46,12 +46,17 @@ export const TemplateManager = (props: IProps): JSX.Element => {
       updateValue(fieldKey, value, templateContent.editorID, slugTo);
     const error = errors.find((err: any) => err.editorID === templateContent.editorID && err.key === key);
 
-    const addedModules = modulesDataPacks
-      .filter(
-        (mod: any) =>
-          mod.sectionList && mod.sectionList[template.component] && mod.sectionList[template.component].includes(key)
-      )
-      .map((mod: any) => mod.id);
+    const addedModules = modulesDataPacks.reduce((acc: string[], current: any) => {
+      if (
+        current.sectionList &&
+        current.sectionList[template.component] &&
+        current.sectionList[template.component].includes(key) &&
+        !acc.includes(current.id)
+      ) {
+        return [...acc, current.id];
+      }
+      return acc;
+    }, []);
 
     const mappedWhiteList = whiteList ? [...whiteList, ...addedModules].sort() : [...addedModules.sort()];
     const categories = getModuleCategories(mappedWhiteList);

package/src/modules/Content/index.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useCallback, useState, useRef } from "react";
 import { connect } from "react-redux";
-import { useLocation } from "react-router-dom";
+import { useHistory, useLocation } from "react-router-dom";
 import { schemas } from "components";
 
 import { useModal, useBulkSelection, useToast, useCategoryColors } from "@ax/hooks";
@@ -180,6 +180,7 @@ const Content = (props: IProps): JSX.Element => {
   const [arePagesTranslated, setArePagesTranslated] = useState(false);
   const [templateInstanceError, setTemplateInstanceError] = useState({ error: false, templateName: "" });
   const [pagesSelected, setPagesSelected] = useState<any[]>([]);
+  const history = useHistory();
 
   const {
     resetBulkSelection,
@@ -273,7 +274,7 @@ const Content = (props: IProps): JSX.Element => {
 
   useEffect(() => {
     checkUserSession();
-    if (!locationState || locationState.isFromEditor !== true) {
+    if (history.action !== "POP" && (!locationState || locationState.isFromEditor !== true)) {
       setFilter("unique-pages");
     }
     resetPageEditor();

package/src/modules/Content/utils.tsx

@@ -1,10 +1,10 @@
 import { schemas } from "components";
 import { filterDuplicatedValues, getActivatedDataPacksIds } from "@ax/helpers";
 import { pageStatus } from "@ax/containers/PageEditor/interfaces";
-import { IPage, IStructuredDataContent } from "@ax/types";
+import { IDataPack, IPage, IStructuredDataContent } from "@ax/types";
 
-const getTemplatesFilters = (activatedDataPacks: any) => {
-  const filters: any[] = [];
+const getTemplatesFilters = (activatedDataPacks: IDataPack[]) => {
+  const filters: { label: string; value: string; mode: string }[] = [];
   const activatedDataPacksIds = getActivatedDataPacksIds(activatedDataPacks);
   const { templates } = schemas;
 
@@ -15,21 +15,23 @@ const getTemplatesFilters = (activatedDataPacks: any) => {
     if (isActivated) {
       !dataPacks
         ? filters.push({ ...type })
-        : dataPacks.map((dataPack: string) => {
+        : dataPacks.forEach((dataPack: string) => {
             const currentDataPack = activatedDataPacks.find(
-              (activatedDataPack: any) => dataPack === activatedDataPack.id
+              (activatedDataPack: IDataPack) => dataPack === activatedDataPack.id
             );
 
-            return filters.push({
-              label: currentDataPack.title,
-              value: currentDataPack.id,
-              mode: type.mode,
-            });
+            if (currentDataPack) {
+              filters.push({
+                label: currentDataPack?.title,
+                value: currentDataPack?.id,
+                mode: type.mode,
+              });
+            }
           });
     }
   });
 
-  const uniqueFilters = filterDuplicatedValues(filters);
+  const uniqueFilters: { label: string; value: string; mode: string }[] = filterDuplicatedValues(filters);
   return uniqueFilters;
 };
 
@@ -45,7 +47,7 @@ const mapStructuredOptions = (options: any[]) => {
       type: id,
       isData: true,
       dataPacks,
-      editable
+      editable,
     };
   });
 };
@@ -74,29 +76,36 @@ const getOptionValues = (options: any) => {
   return [...templatesOptionsValues, ...mapStructuredOptions(options)];
 };
 
-const getOptionFilters = (options: IStructuredDataContent[], activatedDataPacks: any) => {
-  const pureOptions = options.filter((option: any) => !option.fromPage);
+const getOptionFilters = (options: IStructuredDataContent[], activatedDataPacks: IDataPack[]) => {
+  const pureOptions = options.filter((option: IStructuredDataContent) => !option.fromPage);
   const templateFilters = getTemplatesFilters(activatedDataPacks);
   const activatedDataPacksIds = getActivatedDataPacksIds(activatedDataPacks);
 
-
-  const mappedOptions = pureOptions.flatMap((option: any) =>
-    option.dataPacks.filter((dataPack: string) => activatedDataPacksIds.includes(dataPack)).map((dataPack: string) => {
-      const currentDataPack = activatedDataPacks.find((activatedDataPack: any) => dataPack === activatedDataPack.id);
-      return {
-        label: currentDataPack.title,
-        value: currentDataPack.id,
-        isData: true,
-      };
-    })
+  const mappedOptions = pureOptions.flatMap((option: IStructuredDataContent) =>
+    option.dataPacks.reduce((acc: { label: string; value: string; isData: boolean }[], current: string) => {
+      if (activatedDataPacksIds.includes(current)) {
+        const currentDataPack = activatedDataPacks.find(
+          (activatedDataPack: IDataPack) => current === activatedDataPack.id
+        );
+        if (currentDataPack) {
+          const option = {
+            label: currentDataPack.title,
+            value: currentDataPack.id,
+            isData: true,
+          };
+          return [...acc, option];
+        }
+      }
+      return acc;
+    }, [])
   );
+
   const filters = [...templateFilters, ...mappedOptions];
   const uniqueFilters = [...new Map(filters.map((item: any) => [item.value, item])).values()];
   const sortedUniqueFilters = uniqueFilters.sort((a, b) => a.label.localeCompare(b.label));
   const staticFilterIdx = sortedUniqueFilters.findIndex((filter) => filter.value === "static");
   const staticFilter = sortedUniqueFilters.splice(staticFilterIdx, 1);
   sortedUniqueFilters.unshift(...staticFilter);
-
   return sortedUniqueFilters;
 };
 

package/src/modules/GlobalEditor/PageBrowser/index.tsx

@@ -57,7 +57,6 @@ interface IPageBrowserStateProps {
   globalLangs: ILanguage[];
   schema: ISchema | Record<string, unknown>;
   selectedParent: any;
-  activatedModules: string[];
 }
 
 interface IPageBrowserDispatchProps {
@@ -79,7 +78,6 @@ const mapStateToProps = (state: IRootState): IPageBrowserStateProps => ({
   globalLangs: state.app.globalLangs,
   schema: state.pageEditor.schema,
   selectedParent: state.pageEditor.selectedParent,
-  activatedModules: state.dataPacks.modules,
 });
 
 const mapDispatchToProps = {

package/src/modules/PageEditor/PageBrowser/index.tsx

@@ -61,7 +61,6 @@ interface IPageBrowserStateProps {
   cloudinaryName: string | null;
   siteLangs: ILanguage[];
   selectedParent: any;
-  activatedModules: string[];
 }
 
 interface IPageBrowserDispatchProps {
@@ -83,7 +82,6 @@ const mapStateToProps = (state: IRootState): IPageBrowserStateProps => ({
   cloudinaryName: state.app.globalSettings.cloudinaryName,
   siteLangs: state.sites.currentSiteLanguages,
   selectedParent: state.pageEditor.selectedParent,
-  activatedModules: state.dataPacks.modules,
 });
 
 const mapDispatchToProps = {

package/src/modules/StructuredData/Form/index.tsx

@@ -27,7 +27,6 @@ const Form = (props: IProps) => {
     isLoading,
     siteLanguages,
     globalLangs,
-    currentSite,
     lang,
     setLanguage,
     getDataContent,
@@ -112,7 +111,7 @@ const Form = (props: IProps) => {
         ...form,
         structuredData: currentStructuredData ? currentStructuredData.id : null,
         draft: publish === true ? false : status,
-        relatedSite: currentSite ? currentSite.id : null,
+        relatedSite: site ? site.id : null,
       };
 
       let saved = false;
@@ -139,7 +138,7 @@ const Form = (props: IProps) => {
     action: handleSaveAndPublish,
   };
 
-  const inversed = !currentSite;
+  const inversed = !site;
 
   const createNewTranslation = async (value: boolean, lang: { locale: string; id: number }) => {
     const isUsedLang = currentLanguages.find((currentLang: ILanguage) => currentLang.id === lang.id);
@@ -155,7 +154,7 @@ const Form = (props: IProps) => {
     createNewTranslation,
   };
 
-  const languages = currentSite ? siteLanguages : globalLangs;
+  const languages = site ? siteLanguages : globalLangs;
 
   const getCurrentLanguages = () => {
     const availables: any[] = [];
@@ -196,7 +195,7 @@ const Form = (props: IProps) => {
   };
 
   const removeItem = async () => {
-    const path = currentSite ? "/sites/pages" : "/data";
+    const path = site ? "/sites/pages" : "/data";
     deleteStructuredDataContent(form.id).then((deleted: boolean) => {
       if (deleted) {
         setHistoryPush(path, false);
@@ -326,7 +325,6 @@ interface IProps {
   isLoading: boolean;
   siteLanguages: any[];
   globalLangs: any[];
-  currentSite: any;
   lang: { locale: string; id: number | null };
   activatedDataPacks: IDataPack[];
   errors: IErrorItem[];
@@ -355,7 +353,6 @@ const mapStateToProps = (state: IRootState) => ({
   lang: state.app.lang,
   siteLanguages: state.sites.currentSiteLanguages,
   globalLangs: state.app.globalLangs,
-  currentSite: state.sites.currentSiteInfo && state.sites.currentSiteInfo.id,
   activatedDataPacks: state.dataPacks.activated,
   errors: state.structuredData.errors,
   skipReviewOnPublish: state.app.globalSettings.skipReviewOnPublish,

package/src/types/index.tsx

@@ -485,6 +485,8 @@ export interface IStructuredDataContent {
   dataLanguages: IDataLanguage[];
   entity: string;
   structuredData: string;
+  fromPage: boolean;
+  dataPacks: string[];
 }
 
 export interface ICategory {