@griddo/ax 1.75.235 → 1.75.236

package/package.json

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

package/src/__tests__/components/TableFilters/CategoryFilter/CategoryFilter.test.tsx

@@ -21,6 +21,7 @@ describe("Category filter component rendering", () => {
     const filterItemsMock = jest.fn() as CalledWithMock<void, [pointer: string, filter: string]>;
     defaultProps.filterItems = filterItemsMock;
     defaultProps.value = "all";
+    defaultProps.siteID = null;
     defaultProps.structuredData = {
       from: "profile",
       indexable: true,
@@ -61,6 +62,7 @@ describe("Category filter component rendering", () => {
     const filterItemsMock = jest.fn() as CalledWithMock<void, [pointer: string, filter: string]>;
     defaultProps.filterItems = filterItemsMock;
     defaultProps.value = "all";
+    defaultProps.siteID = null;
     defaultProps.structuredData = {
       from: "profile",
       indexable: true,
@@ -104,6 +106,7 @@ describe("CategoryFilter events", () => {
     const filterItemsMock = jest.fn() as CalledWithMock<void, [pointer: string, filter: string]>;
     defaultProps.filterItems = filterItemsMock;
     defaultProps.value = "all";
+    defaultProps.siteID = null;
     defaultProps.structuredData = {
       from: "profile",
       indexable: true,
@@ -150,6 +153,7 @@ describe("CategoryFilter events", () => {
     const filterItemsMock = jest.fn() as CalledWithMock<void, [pointer: string, filter: string]>;
     defaultProps.filterItems = filterItemsMock;
     defaultProps.value = "all";
+    defaultProps.siteID = null;
     defaultProps.structuredData = {
       from: "profile",
       indexable: true,
@@ -198,6 +202,7 @@ describe("CategoryFilter events", () => {
     const filterItemsMock = jest.fn() as CalledWithMock<void, [pointer: string, filter: string]>;
     defaultProps.filterItems = filterItemsMock;
     defaultProps.value = "all";
+    defaultProps.siteID = null;
     defaultProps.structuredData = {
       from: "profile",
       indexable: true,

package/src/components/CategoryCell/index.tsx

@@ -18,7 +18,7 @@ const CategoryCell = (props: ICategoryCellProps): JSX.Element => {
 };
 
 export interface ICategoryCellProps {
-  categories: any;
+  categories: string[];
   categoryColors: any;
   addCategoryColors(cats: string[]): void;
 }

package/src/components/TableFilters/CategoryFilter/index.tsx

@@ -8,7 +8,7 @@ import { IFilterValue } from "@ax/types";
 import * as S from "./style";
 
 const CategoryFilter = (props: ICategoryFilterProps): JSX.Element => {
-  const { filterItems, value, structuredData } = props;
+  const { filterItems, value, structuredData, siteID } = props;
 
   const filters: IFilterValue[] = [
     {
@@ -27,7 +27,8 @@ const CategoryFilter = (props: ICategoryFilterProps): JSX.Element => {
 
   const getSelectCategories = async () => {
     try {
-      const items = await checkgroups.getCheckGroupItems("global", structuredData.source);
+      const site = siteID ? siteID : "global";
+      const items = await checkgroups.getCheckGroupItems(site, structuredData.source);
       if (items && isReqOk(items.status)) {
         return items.data;
       }
@@ -87,6 +88,7 @@ export interface ICategoryFilterProps {
   filterItems(pointer: string, filter: string): void;
   value: string;
   structuredData: any;
+  siteID: number | null;
 }
 
 export default CategoryFilter;

package/src/modules/Content/BulkHeader/TableHeader/index.tsx

@@ -30,6 +30,7 @@ const TableHeader = (props: IProps): JSX.Element => {
     setColumns,
     isGlobalPages,
     filterValues,
+    siteID,
   } = props;
 
   const activeColumns = Object.keys(columns).filter((col: string) => columns[col].show);
@@ -40,7 +41,12 @@ const TableHeader = (props: IProps): JSX.Element => {
       (col: any) =>
         activeColumns.includes(col.key) && (
           <S.HeaderWrapper key={col.key}>
-            <CategoryFilter filterItems={filterItems} structuredData={col} value={filterValues.categories} />
+            <CategoryFilter
+              filterItems={filterItems}
+              structuredData={col}
+              value={filterValues.categories}
+              siteID={siteID}
+            />
           </S.HeaderWrapper>
         )
     );
@@ -138,6 +144,7 @@ interface IProps {
   setColumns: (columns: Record<string, IColumn>) => void;
   isGlobalPages: boolean;
   filterValues: any;
+  siteID: number;
 }
 
 export default TableHeader;

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

@@ -24,6 +24,7 @@ const BulkHeader = (props: IProps): JSX.Element => {
     columns,
     setColumns,
     isGlobalPages,
+    siteID,
   } = props;
 
   const deleteAction = {
@@ -70,6 +71,7 @@ const BulkHeader = (props: IProps): JSX.Element => {
       columns={columns}
       setColumns={setColumns}
       isGlobalPages={isGlobalPages}
+      siteID={siteID}
     />
   );
 };
@@ -94,6 +96,7 @@ interface IProps {
   columns: Record<string, IColumn>;
   setColumns: (columns: Record<string, IColumn>) => void;
   isGlobalPages: boolean;
+  siteID: number;
 }
 
 export default BulkHeader;

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

@@ -456,8 +456,13 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
     isGlobal &&
     categoryColumns.map((col: any) => {
       const fromVal = col.from.includes(".") ? col.from.split(".")[1] : col.from;
-      const type = structuredDataContent && (structuredDataContent[fromVal] || structuredDataContent[col.from]);
-      const categories = Array.isArray(type) && type.map((cat: any) => cat.label || cat.title);
+      const type: any = structuredDataContent && (structuredDataContent[fromVal] || structuredDataContent[col.from]);
+      const categories: string[] = !type
+        ? []
+        : Array.isArray(type)
+        ? type.map((cat: any) => cat.label || cat.title)
+        : [type.label || type.title];
+
       return (
         activeColumns.includes(col.key) && (
           <CategoryCell

package/src/modules/Content/index.tsx

@@ -104,6 +104,10 @@ const Content = (props: IProps): JSX.Element => {
     checkUserSession,
   } = props;
 
+  if (!currentSiteInfo) {
+    throw new Error(`ERROR: User reached Content with null site info`);
+  }
+
   const itemsPerPage = 50;
   const firstPage = 1;
 
@@ -472,6 +476,7 @@ const Content = (props: IProps): JSX.Element => {
       columns={columnsState}
       setColumns={setColumnsState}
       isGlobalPages={isGlobalPages}
+      siteID={currentSiteInfo.id}
     />
   );
 

package/src/modules/StructuredData/StructuredDataList/BulkHeader/TableHeader/index.tsx

@@ -42,7 +42,7 @@ const TableHeader = (props: IProps): JSX.Element => {
       (col: any) =>
         activeColumns.includes(col.key) && (
           <S.HeaderWrapper key={col.key}>
-            <CategoryFilter filterItems={filterItems} value={filterCategories} structuredData={col} />
+            <CategoryFilter filterItems={filterItems} value={filterCategories} structuredData={col} siteID={null} />
           </S.HeaderWrapper>
         )
     );
@@ -103,21 +103,21 @@ const TableHeader = (props: IProps): JSX.Element => {
           <S.NameWrapper>
             <NameFilter sortItems={sortItems} sortedState={sortedListStatus} />
           </S.NameWrapper>
-            {activeColumns.includes("live") && (
-              <S.HeaderWrapper>
-                <LiveFilter filterItems={filterItems} value={filterValues.liveStatus} hasBasicStatus={true} />
-              </S.HeaderWrapper>
-            )}
-            {CategoryColumns}
-            {activeColumns.includes("status") && (
-              <S.HeaderWrapper>
-                <StatusFilter sortItems={sortItems} sortedState={sortedListStatus} isStructuredData={true} />
-              </S.HeaderWrapper>
-            )}
-            {activeColumns.includes("translation") && (
-              <S.HeaderWrapper>
-                <TranslationsFilter filterItems={filterItems} value={filterValues.translated} />
-              </S.HeaderWrapper>
+          {activeColumns.includes("live") && (
+            <S.HeaderWrapper>
+              <LiveFilter filterItems={filterItems} value={filterValues.liveStatus} hasBasicStatus={true} />
+            </S.HeaderWrapper>
+          )}
+          {CategoryColumns}
+          {activeColumns.includes("status") && (
+            <S.HeaderWrapper>
+              <StatusFilter sortItems={sortItems} sortedState={sortedListStatus} isStructuredData={true} />
+            </S.HeaderWrapper>
+          )}
+          {activeColumns.includes("translation") && (
+            <S.HeaderWrapper>
+              <TranslationsFilter filterItems={filterItems} value={filterValues.translated} />
+            </S.HeaderWrapper>
           )}
         </>
       )}

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

@@ -335,8 +335,13 @@ const GlobalPageItem = (props: IGlobalPageItemProps): JSX.Element => {
   const mainUnpublishAction = { title: "Ok", onClick: toggleUnpublishModal };
 
   const CategoryColumns = categoryColumns.map((col: any) => {
-    const type = structuredDataContent && structuredDataContent[col.from];
-    const categories = Array.isArray(type) && type.map((cat: any) => cat.label || cat.title);
+    const type: any = structuredDataContent && structuredDataContent[col.from];
+    const categories: string[] = !type
+      ? []
+      : Array.isArray(type)
+      ? type.map((cat: any) => cat.label || cat.title)
+      : [type.label || type.title];
+
     return (
       activeColumns.includes(col.key) && (
         <CategoryCell

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

@@ -178,8 +178,13 @@ const StructuredDataItem = (props: IStructuredDataItemProps): JSX.Element => {
   const menuOptions = isDisabled || !isEditable ? menuOptionsNoDuplicate : [duplicateOption, ...menuOptionsNoDuplicate];
 
   const CategoryColumns = categoryColumns.map((col: any) => {
-    const type = structuredData && structuredData.content && structuredData.content[col.from];
-    const categories = Array.isArray(type) && type.map((cat: any) => cat.label || cat.title);
+    const type: any = structuredData && structuredData.content && structuredData.content[col.from];
+    const categories: string[] = !type
+      ? []
+      : Array.isArray(type)
+      ? type.map((cat: any) => cat.label || cat.title)
+      : [type.label || type.title];
+
     return (
       activeColumns.includes(col.key) && (
         <CategoryCell