@griddo/ax 10.6.14 → 10.6.16

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "10.6.14",
+  "version": "10.6.16",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -233,5 +233,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bf6a44085efc5362970097d5e1c02a2d47dade9d"
+  "gitHead": "70b2e0f5430ab937321332b83cd48b81303a138a"
 }

package/src/modules/App/Routing/NavMenu/index.tsx

@@ -46,7 +46,8 @@ const NavMenu = (props: IProps) => {
   const goToPublishedSite = () => {
     const language = siteLanguages.find((l) => l.id === lang.id);
     if (language && language.home) {
-      window.open(`${language.home}/`, "_blank");
+      const urlHome = `${language.home}${language.home.endsWith("/") ? "" : "/"}`;
+      window.open(urlHome, "_blank");
     }
   };
 

package/src/modules/Settings/ContentTypes/DataPacks/Config/Form/index.tsx

@@ -1,7 +1,15 @@
 import React, { useState } from "react";
 import { connect } from "react-redux";
 
-import { IDataPackConfigImport, IDataPackConfigImportCategory, IRootState, ISite, ITemplate } from "@ax/types";
+import {
+  IDataPack,
+  IDataPackConfigImport,
+  IDataPackConfigImportCategory,
+  IRootState,
+  ISite,
+  IStructuredData,
+  ITemplate,
+} from "@ax/types";
 import { dataPacksActions } from "@ax/containers/Settings";
 import { FieldsBehavior, Modal, Tag } from "@ax/components";
 import { useModal } from "@ax/hooks";
@@ -11,12 +19,17 @@ import * as S from "./style";
 
 const Form = (props: IProps): JSX.Element => {
   const { currentSite, selected, updateFormValue, configFormData, allStructuredData } = props;
-  const { templates, categories, structuredData } = selected;
 
   if (!currentSite) {
     throw new Error(`ERROR: User reached Data Pack form with null site info`);
   }
 
+  if (!selected) {
+    throw new Error(`ERROR: User reached Data Pack form without one selected`);
+  }
+
+  const { templates, categories, structuredData } = selected;
+
   const getSubscribedData = (importValue: IDataPackConfigImport[]) => {
     const value: Record<string, ICategoryValue[]> = {};
     if (!importValue) return value;
@@ -82,21 +95,21 @@ const Form = (props: IProps): JSX.Element => {
   const secondaryAction = { title: "Cancel", onClick: toggleModal };
 
   const getCategoryText = (id: string): string => {
-    const data = [...categories, ...allStructuredData.global, ...allStructuredData.site].find(
-      (elem: any) => elem.id === id
-    );
+    const data = [...categories, ...allStructuredData.global, ...allStructuredData.site].find((elem) => elem.id === id);
     return data ? data.title : id;
   };
 
   const getIsGlobal = (id: string): boolean => {
-    const data = allStructuredData && allStructuredData.site.find((elem: any) => elem.id === id);
+    const data = allStructuredData && allStructuredData.site.find((elem) => elem.id === id);
     return data && data.local ? false : true;
   };
 
+  const globalPageData = structuredData.find((data) => data.fromPage && !data.local);
+
   const elements =
-    structuredData[0] &&
-    structuredData[0].relatedCategories &&
-    structuredData[0].relatedCategories.map((cat: string) => {
+    globalPageData &&
+    globalPageData.relatedCategories &&
+    globalPageData.relatedCategories.map((cat) => {
       return { source: cat, key: cat, placeholder: getCategoryText(cat), isGlobal: getIsGlobal(cat) };
     });
 
@@ -132,12 +145,10 @@ const Form = (props: IProps): JSX.Element => {
     </S.CategoriesWrapper>
   );
 
-  const isGlobalDataPage = structuredData[0] && structuredData[0].fromPage && !structuredData[0].local;
-
   return (
     <>
       <S.Config>
-        {isGlobalDataPage && (
+        {!!globalPageData && (
           <S.SectionContent>
             <S.SubscribeWrapper>
               <S.Heading>Subscribe to data</S.Heading>
@@ -215,11 +226,11 @@ interface ICategoryValue {
 }
 
 interface IProps {
-  selected: any;
+  selected: IDataPack | null;
   currentSite: ISite | null;
   updateFormValue: (config?: any) => void;
   configFormData: any;
-  allStructuredData: any;
+  allStructuredData: { global: IStructuredData[]; site: IStructuredData[] };
 }
 
 const mapDispatchToProps = {

package/src/types/index.tsx

@@ -454,6 +454,7 @@ export interface IStructuredData {
   dataPacks: string[];
   private?: boolean;
   exportable?: boolean;
+  relatedCategories: string[];
 }
 
 export interface IDataLanguage {
@@ -628,6 +629,7 @@ export interface IDataPack {
   categories: any[];
   activated: boolean;
   config: string;
+  structuredData: IStructuredData[];
 }
 
 export interface ISocialState {