@griddo/ax 1.64.6 → 1.64.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "1.64.6",
+  "version": "1.64.9",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -220,5 +220,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6e6a7945bb41cab79796c90786ba62069f09a977"
+  "gitHead": "89612d5233cf272c1535b62aacb4ec5cd5f2fdbd"
 }

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

@@ -15,7 +15,15 @@ import { getFilters } from "./utils";
 import * as S from "./style";
 
 const ContentFilters = (props: IProps): JSX.Element => {
-  const { setContentFilter, current, dynamicValues, addTemplate, setSelectedStructuredData, resetFilter } = props;
+  const {
+    setContentFilter,
+    current,
+    dynamicValues,
+    addTemplate,
+    setSelectedStructuredData,
+    resetFilter,
+    setStructuredDataFilter,
+  } = props;
   const clonedStructure = deepClone(filterStructure);
   const filters = getFilters(clonedStructure, dynamicValues);
 
@@ -35,6 +43,7 @@ const ContentFilters = (props: IProps): JSX.Element => {
                   resetFilter();
                   setContentFilter(value);
                   setSelectedStructuredData(value, "site");
+                  current && setStructuredDataFilter(value);
                   if (hasTemplate) {
                     addTemplate(firstTemplate);
                   } else {
@@ -67,12 +76,14 @@ interface IProps {
   dynamicValues: any;
   setSelectedStructuredData(id: string, scope: string): void;
   resetFilter(): void;
+  setStructuredDataFilter: (filter: string) => void;
 }
 
 const mapDispatchToProps = {
   setContentFilter: sitesActions.setFilter,
   addTemplate: pageEditorActions.addTemplate,
   setSelectedStructuredData: structuredDataActions.setSelectedStructuredData,
+  setStructuredDataFilter: structuredDataActions.setFilter,
 };
 
 export default connect(null, mapDispatchToProps)(ContentFilters);

package/src/modules/Content/index.tsx

@@ -631,13 +631,15 @@ const Content = (props: IProps): JSX.Element => {
     message: "Page deleted.",
   };
 
+  const addNewAction = filter === "unique-pages" || isGlobalPages ? toggleNewModal : addNewData;
+
   return (
     <MainWrapper
       title={title}
       language={lang}
       languageActions={languageActions}
       availableLanguages={siteLanguages}
-      rightButton={{ label: "New", action: toggleNewModal }}
+      rightButton={{ label: "New", action: addNewAction }}
       searchAction={setSearchQuery}
     >
       <S.ContentListWrapper>

package/src/modules/Content/utils.tsx

@@ -24,13 +24,12 @@ const mapStructuredOptions = (options: any[]) => {
 
   return pureOptions.map((option: any) => {
     const { id, title } = option;
-    const type = title.toLowerCase();
 
     return {
       name: id,
       value: id,
       title,
-      type,
+      type: id,
       isData: true,
     };
   });

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

@@ -46,7 +46,9 @@ const Form = (props: IProps) => {
   const { fields } = schema;
 
   const activatedDataPacksIds = getActivatedDataPacksIds(activatedDataPacks);
-  const isDisabled = currentStructuredData.local && !activatedDataPacksIds.includes(currentStructuredData.id);
+  const isDisabled =
+    currentStructuredData.local &&
+    !activatedDataPacksIds.some((pack: string) => currentStructuredData.dataPacks.includes(pack));
   const isDataTranslatable = currentStructuredData && currentStructuredData.translate;
 
   let title = "";

package/src/modules/StructuredData/StructuredDataList/StructuredDataItem/index.tsx

@@ -40,9 +40,9 @@ const StructuredDataItem = (props: IStructuredDataItemProps): JSX.Element => {
 
   const currentStructuredDataColumns: any = columns[currentStructuredData.id] || columns["all"];
 
-  const activeColumns = Object.keys(currentStructuredDataColumns).filter(
-    (col: string) => currentStructuredDataColumns[col].show
-  );
+  const activeColumns = currentStructuredDataColumns
+    ? Object.keys(currentStructuredDataColumns).filter((col: string) => currentStructuredDataColumns[col].show)
+    : [];
 
   const publishedTooltip: Record<string, string> = {
     active: "Live",