@griddo/ax 11.2.6-rc.0 → 11.2.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "11.2.6-rc.0",
+  "version": "11.2.6",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -225,5 +225,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4141f9ba443b688911c9bdfc718134355648b467"
+  "gitHead": "26934c501923afc606ad39bd2bbcd4c77b565d59"
 }

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

@@ -39,7 +39,7 @@ const ContentFilters = (props: IProps): JSX.Element => {
   const type = typeFilters[0].value;
   const filters = getFilters(dynamicValues);
 
-  const handleClick = (value: string, fromPage = false, firstTemplate: string | null = null) => {
+  const handleClickData = (value: string, fromPage = false, firstTemplate: string | null = null) => {
     const hasTemplate = fromPage && firstTemplate;
 
     resetFilter();
@@ -54,15 +54,9 @@ const ContentFilters = (props: IProps): JSX.Element => {
 
   const handleClickBase = (value: string) => {
     resetFilter();
-
-    let filter = value;
-    if (value === "unique") {
-      filter = "unique-pages";
-      setFilter("type", [{ value, label: value }]);
-    }
-
-    setContentFilter(filter);
-    setSelectedStructuredData(filter, "site");
+    setFilter("type", [{ value, label: value }]);
+    setContentFilter(value);
+    setSelectedStructuredData(value, "site");
   };
 
   return (
@@ -72,6 +66,9 @@ const ContentFilters = (props: IProps): JSX.Element => {
           const isSelected = type === "all" ? filter.value === current : filter.value === type;
           const selectedClass = isSelected ? "selected" : "";
 
+          const handleClick = (value: string, fromPage = false, firstTemplate: string | null = null) =>
+            filter.value === "unique" ? handleClickBase(value) : handleClickData(value, fromPage, firstTemplate);
+
           return (
             <React.Fragment key={filter.value}>
               {!filter.items ? (

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

@@ -15,7 +15,15 @@ const getDynamicFilters = (values: IStructuredData[]): IDynamicFilter[] =>
 const getFilters = (dynamicValues: IStructuredData[]): IContentFilter[] => {
   const filters: IContentFilter[] = [
     { label: "All Content", value: "unique-pages" },
-    { label: "Base Pages", value: "unique" },
+    {
+      label: "Base Pages",
+      value: "unique",
+      items: [
+        { label: "Base Templates", value: "basic", editable: true },
+        { label: "List Pages", value: "list", editable: true },
+        { label: "Static Pages", value: "static", editable: true },
+      ],
+    },
   ];
 
   const pageTypes = dynamicValues.filter((value) => value.fromPage);

package/src/modules/Content/index.tsx

@@ -167,8 +167,9 @@ const Content = (props: IProps): JSX.Element => {
 
   const currentFilter = getCurrentFilter(structuredData, filter);
   const checkFromPage = currentFilter ? currentFilter.fromPage : undefined;
-  const isStructuredData = filter !== "unique-pages" && !checkFromPage;
-  const isGlobalPages = filter !== "unique-pages" && checkFromPage;
+  const baseFilters = ["unique-pages", "basic", "list", "static"];
+  const isStructuredData = !baseFilters.includes(filter) && !checkFromPage;
+  const isGlobalPages = !baseFilters.includes(filter) && checkFromPage;
   const isDataEditable = !isStructuredData || (currentStructuredData && currentStructuredData.editable);
   const isDataPrivate = currentStructuredData?.private || false;
   const isDataExportable = currentStructuredData?.exportable || false;
@@ -273,7 +274,7 @@ const Content = (props: IProps): JSX.Element => {
   }, [filter, currentSiteInfo, isStructuredData, page, currentSearch]);
 
   const getPages = async (params: any, filterQuery?: any) => {
-    const isStructuredDataPage = filter !== "unique-pages";
+    const isStructuredDataPage = !baseFilters.includes(filter);
     const pageFilter = isStructuredDataPage ? filter : undefined;
     await getSitePages(params, pageFilter, filterQuery);
   };
@@ -331,7 +332,7 @@ const Content = (props: IProps): JSX.Element => {
 
   useEffect(() => {
     if (!isLoading) {
-      const isContentType = filter !== "unique-pages";
+      const isContentType = !baseFilters.includes(filter);
       const emptyState: IEmptyStateProps = {};
       const { liveStatus, translated, type } = filterValues;
       const isSearching =
@@ -824,7 +825,7 @@ const Content = (props: IProps): JSX.Element => {
     message: "1 Page copied to another Site",
   };
 
-  const addNewAction = filter === "unique-pages" || isGlobalPages ? toggleNewModal : addNewData;
+  const addNewAction = baseFilters.includes(filter) || isGlobalPages ? toggleNewModal : addNewData;
 
   const rightButtonProps = isAllowedToCreatePages
     ? {

package/src/types/index.tsx

@@ -1090,8 +1090,8 @@ export interface IContentFilter {
 export interface IDynamicFilter {
   label: string;
   value: string;
-  fromPage: boolean;
-  firstTemplate: string | null;
+  fromPage?: boolean;
+  firstTemplate?: string | null;
   editable?: boolean;
   isPrivate?: boolean;
 }