@griddo/ax 1.66.13 → 1.67.2

package/src/modules/Redirects/index.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useRef, useState } from "react";
 import { connect } from "react-redux";
 
-import { INavItem, IRedirect, IRootState } from "@ax/types";
+import { IEmptyStateProps, INavItem, IRedirect, IRootState } from "@ax/types";
 import { appActions } from "@ax/containers/App";
 import { redirectsActions } from "@ax/containers/Redirects";
 import { MainWrapper, ErrorToast, Nav, TableList, EmptyState, Toast } from "@ax/components";
@@ -30,6 +30,7 @@ const Redirects = (props: IProps): JSX.Element => {
     importRedirects,
     imports,
     totalImports,
+    isLoading,
   } = props;
 
   const itemsPerPage = 50;
@@ -50,6 +51,10 @@ const Redirects = (props: IProps): JSX.Element => {
   const { isOpen: isOpenCheckImport, toggleModal: toggleCheckImportModal } = useModal();
   const [importData, setImportData] = useState<{ from: string; to: string }[]>([]);
   const [isUploading, setIsUploading] = useState(false);
+  const [searchQuery, setSearchQuery] = useState<string>("");
+  const [searchFilter, setSearchFilter] = useState<string>("");
+  const [isEmpty, setIsEmpty] = useState(false);
+  const [emptyStateProps, setEmptyStateProps] = useState<IEmptyStateProps>({});
 
   const initState = {
     from: "",
@@ -62,17 +67,18 @@ const Redirects = (props: IProps): JSX.Element => {
   const [formValues, setFormValues] = useState<IRedirect>(initState);
 
   const redIds = redirects && redirects.map((red: any) => red.id);
-  const isEmpty = redirects && redirects.length === 0;
 
   const getParams = useCallback(() => {
     const params = {
       page,
       itemsPerPage,
       pagination: true,
+      query: searchQuery.trim(),
+      filterBy: searchFilter === "filterby" || searchQuery.trim() === "" ? "" : searchFilter,
     };
 
     return params;
-  }, [page]);
+  }, [page, searchQuery, searchFilter]);
 
   useEffect(() => {
     const params = getParams();
@@ -81,7 +87,26 @@ const Redirects = (props: IProps): JSX.Element => {
       tableRef.current.scrollTo(0, 0);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [page, currentFilterQuery]);
+  }, [page, currentFilterQuery, searchQuery, searchFilter]);
+
+  useEffect(() => {
+    if (!isLoading) {
+      const emptyState: IEmptyStateProps = {};
+      const isSearching = searchQuery.length > 0;
+      if (isSearching) {
+        emptyState.icon = "search";
+        emptyState.title = "Oh! No Results Found";
+        emptyState.message = "We couldn’t find what you are looking for. Please, try another search.";
+      } else {
+        emptyState.message = "To have a redirects on your site, create as many redirects as you want.";
+        emptyState.button = "Create New redirect";
+        emptyState.action = handleModal;
+      }
+      setIsEmpty(!redirects.length);
+      setEmptyStateProps(emptyState);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [isLoading]);
 
   const {
     resetBulkSelection,
@@ -176,12 +201,6 @@ const Redirects = (props: IProps): JSX.Element => {
     toggleOverwriteModal();
   };
 
-  const emptyStateProps = {
-    message: "To have a redirects on your site, create as many redirects as you want.",
-    button: "Create New redirect",
-    action: handleModal,
-  };
-
   const pagination = {
     setPage,
     itemsPerPage,
@@ -236,6 +255,12 @@ const Redirects = (props: IProps): JSX.Element => {
 
   const secondaryImportModalAction = { title: "Cancel", onClick: toggleCheckImportModal };
 
+  const searchFilters = [
+    { value: "filterby", label: "Filter by" },
+    { value: "from", label: "Old URL" },
+    { value: "to", label: "New URL" },
+  ];
+
   return (
     <>
       <MainWrapper
@@ -243,6 +268,9 @@ const Redirects = (props: IProps): JSX.Element => {
         title="SEO Settings"
         rightButton={rightButtonProps}
         rightLineButton={rightLineButtonProps}
+        searchAction={setSearchQuery}
+        filterSearchAction={setSearchFilter}
+        searchFilters={searchFilters}
       >
         <S.Wrapper>
           <Nav current={currentNavItem} items={navItems} onClick={handleMenuClick} />
@@ -341,6 +369,7 @@ const mapStateToProps = (state: IRootState) => ({
   currentSiteID: state.sites.currentSiteInfo && state.sites.currentSiteInfo.id,
   totalImports: state.redirects.totalImports,
   imports: state.redirects.imports,
+  isLoading: state.app.isLoading,
 });
 
 const mapDispatchToProps = {
@@ -357,6 +386,7 @@ interface IRedirectsProps {
   totalItems: number;
   currentSiteID: number | null;
   totalImports: number;
+  isLoading: boolean;
   imports: null | {
     error: IRedirect[];
     existing: IRedirect[];

package/src/modules/Settings/Globals/index.tsx

@@ -87,7 +87,7 @@ const Globals = (props: IProps): JSX.Element => {
                 text="The design of the navigation modules has changed. Please, check the previously created."
                 btnText="Go to check"
                 onClick={goToNavigationModules}
-                onClose={closeNavigationNotification}
+                resetError={closeNavigationNotification}
               />
             )}
             <S.FormWrapper>

package/src/modules/Sites/index.tsx

@@ -28,7 +28,7 @@ const Sites = (props: IProps): JSX.Element => {
   const fetchInitialData = async () => {
     setCurrentSiteInfo(null);
     await getStructuredData(token);
-    await getSites(token);
+    await getSites();
     await getAllDataPacks();
     await getUser("me");
 
@@ -68,7 +68,7 @@ interface IStateProps {
 
 interface IDispatchProps {
   setCurrentSiteInfo(currentSiteInfo: any): void;
-  getSites(token: string): Promise<void>;
+  getSites(): Promise<void>;
   getStructuredData(token: string, siteId?: number): Promise<void>;
   setLanguage(lang: { locale: string; id: number | null }): void;
   getAllDataPacks: () => Promise<void>;

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

@@ -405,7 +405,7 @@ interface IGlobalPageItemProps {
   isAllPages?: boolean;
   globalPage: IPage;
   updatePageStatus(ids: number[], status: string, updatedFromList: boolean): Promise<boolean>;
-  duplicatePage(pageID: number, data: { title: string; slug: string }): Promise<void>;
+  duplicatePage(pageID: number, data: { title: string; slug: string }, siteID?: number): Promise<boolean>;
   setHistoryPush(path: string, isEditor: boolean): void;
   deletePage(params?: ISavePageParams, currentLanguage?: string): Promise<boolean>;
   getGlobalPages(): void;

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

@@ -82,6 +82,9 @@ const StructuredDataList = (props: IProps): JSX.Element => {
     restorePage,
     resetPageEditor,
     getAnalytics,
+    setCurrentDataID,
+    resetCurrentSiteErrorPages,
+    currentSiteErrorPages,
   } = props;
 
   const itemsPerPage = 50;
@@ -212,6 +215,7 @@ const StructuredDataList = (props: IProps): JSX.Element => {
     resetFilter();
     setIsFirstRender(false);
     resetPageEditor();
+    resetCurrentSiteErrorPages();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
@@ -283,7 +287,7 @@ const StructuredDataList = (props: IProps): JSX.Element => {
       setEmptyStateProps(emptyState);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isLoading]);
+  }, [isLoading, currentSitePages, currentDataContent]);
 
   useEffect(() => {
     getAnalytics();
@@ -305,6 +309,7 @@ const StructuredDataList = (props: IProps): JSX.Element => {
   };
 
   const createNewData = () => {
+    setCurrentDataID(null);
     resetForm();
     handleClick();
   };
@@ -537,6 +542,11 @@ const StructuredDataList = (props: IProps): JSX.Element => {
 
   const content = isStructuredDataFromPage ? mapGlobalPages() : mapCurrentDataContent();
 
+  const errorPagesText =
+    currentSiteErrorPages.length > 1
+      ? "These pages contains some errors, so you can not publish them yet. Please, review the errors on the pages."
+      : "This page contains some errors, so you can not publish it yet. Please, review the errors on the page.";
+
   return (
     <MainWrapper
       title="Global Data"
@@ -560,6 +570,7 @@ const StructuredDataList = (props: IProps): JSX.Element => {
             </S.NotificationWrapper>
           )}
           <ErrorToast />
+          {!!currentSiteErrorPages.length && <Notification type="error" text={errorPagesText} />}
           <TableList
             tableHeader={TableHeader}
             pagination={pagination}
@@ -621,6 +632,7 @@ const mapStateToProps = (state: IRootState) => ({
   isLoading: state.app.isLoading,
   template: state.pageEditor.template,
   currentSitePages: state.sites.currentSitePages,
+  currentSiteErrorPages: state.sites.currentSiteErrorPages,
 });
 
 const mapDispatchToProps = {
@@ -643,6 +655,8 @@ const mapDispatchToProps = {
   restorePage: pageEditorActions.restorePage,
   resetPageEditor: pageEditorActions.resetPageEditor,
   getAnalytics: analyticsActions.getAnalytics,
+  setCurrentDataID: structuredDataActions.setCurrentDataID,
+  resetCurrentSiteErrorPages: sitesActions.resetCurrentSiteErrorPages,
 };
 
 interface IDispatchProps {
@@ -665,6 +679,8 @@ interface IDispatchProps {
   restorePage(id: number | number[]): Promise<boolean>;
   resetPageEditor(): Promise<void>;
   getAnalytics(): void;
+  setCurrentDataID(id: number | null): void;
+  resetCurrentSiteErrorPages: () => Promise<void>;
 }
 
 interface ICategoriesProps {
@@ -680,8 +696,9 @@ interface ICategoriesProps {
   isLoading: boolean;
   template: string;
   currentSitePages: IPage[];
+  currentSiteErrorPages: number[];
 }
 
 type IProps = ICategoriesProps & IDispatchProps;
 
-export default connect(mapStateToProps, mapDispatchToProps)(StructuredDataList);
+export default connect(mapStateToProps, mapDispatchToProps)(StructuredDataList);

package/src/modules/Users/Profile/index.tsx

@@ -11,14 +11,14 @@ import { useURLSearchParam } from "@ax/hooks";
 import UserForm from "../UserForm";
 
 const Profile = (props: IProps) => {
-  const { user, getUser, updateUser, isSaving, isLoading, getSites, token } = props;
+  const { user, getUser, updateUser, isSaving, isLoading, getSites } = props;
 
   const isUserInit = useURLSearchParam("init");
 
   const [form, setForm] = useState<IUser>({ ...user });
 
   useEffect(() => {
-    isUserInit ? getSites(token) : getUser("me");
+    isUserInit ? getSites() : getUser("me");
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
@@ -58,7 +58,7 @@ const mapStateToProps = (state: IRootState) => ({
 interface IDispatchProps {
   setHistoryPush(path: string): any;
   getUser(id: string): any;
-  getSites(token: string): Promise<void>;
+  getSites(): Promise<void>;
   updateUser(id: number, data: any, isProfile: boolean, isList: boolean): any;
 }
 

package/src/routes/multisite.tsx

@@ -9,6 +9,7 @@ import UserEdit from "../modules/Users/UserEdit";
 import Editor from "./../modules/GlobalEditor";
 import GlobalSettings from "./../modules/GlobalSettings";
 import AnalyticsSettings from "../modules/Analytics";
+import FramePreview from "../modules/FramePreview";
 
 export default [
   { path: "/sites", component: Sites, name: "Sites", showInNav: true, icon: "Project" },
@@ -46,10 +47,10 @@ export default [
             path: `/settings/analytics`,
             component: AnalyticsSettings,
             name: "Analytics tools",
-          }
-        ]
-      }
-    ]
+          },
+        ],
+      },
+    ],
   },
   {
     path: `/settings/redirects`,
@@ -57,4 +58,11 @@ export default [
     name: "Settings",
     showInNav: false,
   },
+  {
+    path: `/editor/page-preview`,
+    component: FramePreview,
+    name: "Preview",
+    showInNav: false,
+    hideNav: true,
+  },
 ];

package/src/routes/site.tsx

@@ -17,7 +17,7 @@ import Profile from "./../modules/Users/Profile";
 const BASE_PATH = "/sites";
 
 export default [
-  { path: `${BASE_PATH}/pages`, component: Content, name: "Content", showInNav: true, icon: "Data" },
+  { path: `${BASE_PATH}/pages`, component: Content, name: "Content", showInNav: true, icon: "page" },
   { path: `${BASE_PATH}/pages/editor`, component: Editor, name: "Page Editor", showInNav: false, hideNav: true },
   {
     path: `${BASE_PATH}/pages/editor/new`,

package/src/types/index.tsx

@@ -268,13 +268,14 @@ export interface ISavePageParams {
 export interface IGetSitePagesParams {
   siteID: number;
   deleted: boolean;
-  page: number;
-  itemsPerPage: number;
+  page?: number;
+  itemsPerPage?: number;
   langID?: number;
   query?: string;
   lang?: number;
   filterStructuredData?: string;
   format?: string;
+  filterPages?: number[];
 }
 
 export interface IGetGlobalPagesParams {
@@ -573,8 +574,8 @@ export interface IErrorItem {
   type: string;
   message: string;
   validator: Record<string, unknown>;
-  editorID: number;
-  component: string;
+  editorID: number | null;
+  component: string | null;
   name: string;
   key: string;
   tab: string;
@@ -740,6 +741,13 @@ export interface INotification {
   onClick?: () => void;
 }
 
+export interface ILinkField {
+  text: string;
+  linkType: string;
+  url: IUrlField;
+  modal: any;
+}
+
 export type Field =
   | "AsyncCheckGroup"
   | "AsyncSelect"
@@ -753,6 +761,7 @@ export type Field =
   | "HeadingField"
   | "HiddenField"
   | "ImageField"
+  | "LinkField"
   | "NumberField"
   | "RadioField"
   | "RadioGroup"

package/tsconfig.paths.json

@@ -13,7 +13,8 @@
       "@ax/modules": ["src/modules"],
       "@ax/routes": ["src/routes"],
       "@ax/types": ["src/types"],
-      "@ax/schemas": ["src/schemas"]
+      "@ax/schemas": ["src/schemas"],
+      "@ax/themes/*": ["src/themes/*"]
     }
   }
 }