@griddo/ax 1.68.7 → 1.69.0

package/src/modules/Content/index.tsx

@@ -16,6 +16,7 @@ import {
   IColumn,
   ISite,
   IUser,
+  IErrorItem,
 } from "@ax/types";
 import { MainWrapper, Modal, TableList, ErrorToast, Toast, EmptyState, Notification } from "@ax/components";
 import { getFilteredStructuredData, isGlobalStructuredData, isStructuredDataFromPage } from "@ax/helpers";
@@ -55,6 +56,7 @@ const Content = (props: IProps): JSX.Element => {
     totalItems,
     lang,
     siteLanguages,
+    errors,
     setCurrentPageID,
     setCurrentPageStatus,
     setCurrentPageName,
@@ -73,7 +75,9 @@ const Content = (props: IProps): JSX.Element => {
     createNewTranslation,
     resetForm,
     deleteBulk,
+    getPage,
     duplicatePage,
+    validatePage,
     activatedDataPacks,
     activatedTemplates,
     deleteDataContent,
@@ -92,6 +96,7 @@ const Content = (props: IProps): JSX.Element => {
     getSitesByLang,
     sitesByLang,
     user,
+    skipReviewOnPublish,
   } = props;
 
   const itemsPerPage = 50;
@@ -551,6 +556,8 @@ const Content = (props: IProps): JSX.Element => {
         getDataPack: getDataPack,
         setTemplateInstanceError,
         toggleCopiedToast,
+        validatePage,
+        getPage,
       };
 
       return (
@@ -567,6 +574,7 @@ const Content = (props: IProps): JSX.Element => {
           categoryColors={categoryColors}
           addCategoryColors={addCategoryColors}
           dataPacks={dataPacks}
+          skipReview={skipReviewOnPublish}
         />
       );
     });
@@ -689,6 +697,7 @@ const Content = (props: IProps): JSX.Element => {
       availableLanguages={siteLanguages}
       rightButton={{ label: "New", action: addNewAction }}
       searchAction={setSearchQuery}
+      errors={errors}
     >
       <S.ContentListWrapper>
         <ContentFilters current={filter} dynamicValues={structuredData} resetFilter={resetFilter} />
@@ -700,7 +709,7 @@ const Content = (props: IProps): JSX.Element => {
               text={`There can be only one ${templateInstanceError.templateName} page and you already have it.`}
             />
           )}
-          {!!currentSiteErrorPages.length && <Notification type="error" text={errorPagesText} />}
+          {(!!currentSiteErrorPages.length || errors.length > 0) && <Notification type="error" text={errorPagesText} />}
           <TableList
             tableHeader={Header}
             pagination={pagination}
@@ -763,6 +772,7 @@ const mapStateToProps = (state: IRootState) => ({
   totalItems: state.sites.totalItems,
   lang: state.app.lang,
   pageLanguages: state.pageEditor.currentPageLanguages,
+  errors: state.pageEditor.errors,
   siteLanguages: state.sites.currentSiteLanguages,
   structuredData: state.structuredData.structuredData.site,
   currentDataContent: state.structuredData.currentDataContent,
@@ -775,6 +785,7 @@ const mapStateToProps = (state: IRootState) => ({
   currentSiteErrorPages: state.sites.currentSiteErrorPages,
   sitesByLang: state.sites.sitesByLang,
   user: state.users.currentUser,
+  skipReviewOnPublish: state.app.globalSettings.skipReviewOnPublish,
 });
 
 interface IDispatchProps {
@@ -795,6 +806,8 @@ interface IDispatchProps {
   resetForm(): void;
   deleteBulk(ids: any): Promise<boolean>;
   duplicatePage(pageID: number, data?: any, siteID?: number): Promise<boolean>;
+  getPage(pageID?: number, global?: boolean): Promise<void>;
+  validatePage(publish?: boolean, browserRef?: any, currentPage?: IPage): Promise<boolean>;
   deleteDataContent(dataID: number[]): Promise<boolean>;
   restoreDataContent(catID: number | number[]): void;
   setFilter(value: string): void;
@@ -821,6 +834,8 @@ const mapDispatchToProps = {
   createNewTranslation: pageEditorActions.createNewTranslation,
   deleteBulk: pageEditorActions.deleteBulk,
   duplicatePage: pageEditorActions.duplicatePage,
+  getPage: pageEditorActions.getPage,
+  validatePage: pageEditorActions.validatePage,
   getStructuredDataContents: structuredDataActions.getStructuredDataContents,
   setSelectedStructuredData: structuredDataActions.setSelectedStructuredData,
   updateForm: structuredDataActions.updateForm,
@@ -848,6 +863,7 @@ interface IPagesProps {
   lang: { locale: string; id: number };
   langID?: number;
   pageLanguages: any[];
+  errors: IErrorItem[];
   siteLanguages: any[];
   structuredData: any;
   currentStructuredData: any;
@@ -861,6 +877,7 @@ interface IPagesProps {
   sites: ISite[];
   sitesByLang: ISite[];
   user: IUser;
+  skipReviewOnPublish?: boolean;
 }
 
 type IProps = IPagesProps & IDispatchProps;

package/src/modules/GlobalEditor/Editor/index.tsx

@@ -90,11 +90,11 @@ interface IPageBrowserDispatchProps {
   duplicateModule(editorID: number, key: string): void;
   addComponent: (componentType: any, key: string) => void;
   addModule: (moduleType: string, selectedID: number, key: string) => void;
-  moveElement(moduleID: number, selectedContent: any, isPush: boolean, key: string): void;
+  moveElement(moduleID: number, selectedContent: any, newIndex: number, key: string): void;
   replaceModule(module: any, parent: any, objKey: string): void;
   replaceElementsInCollection(newValue: string, reference: string): void;
   copyModule(editorID: number): boolean;
-  pasteModule(editorID: number): Promise<{ error?: INotification }>;
+  pasteModule(editorID: number, key: string): Promise<{ error?: INotification }>;
   setNotification: (notification: INotification) => void;
   isGlobal: boolean;
   isEditable: boolean;

package/src/modules/GlobalEditor/index.tsx

@@ -125,9 +125,9 @@ const GlobalEditor = (props: IProps) => {
   };
 
   const publishPage = async () => {
-    const { updatePageStatus, savePage, pageID, validatePage } = props;
+    const { updatePageStatus, savePage, pageID, validatePage, skipReviewOnPublish } = props;
 
-    const validated = await validatePage(true);
+    const validated = skipReviewOnPublish ? true : await validatePage(true);
 
     if (validated) {
       const publishPage = {
@@ -145,9 +145,9 @@ const GlobalEditor = (props: IProps) => {
   };
 
   const publishChanges = async () => {
-    const { savePage, validatePage } = props;
+    const { savePage, validatePage, skipReviewOnPublish } = props;
 
-    const validated = await validatePage(true);
+    const validated = skipReviewOnPublish ? true : await validatePage(true);
 
     if (validated) {
       const publishPage = {
@@ -176,13 +176,13 @@ const GlobalEditor = (props: IProps) => {
 
   const reviewPage = () => {
     const { validatePage } = props;
-    validatePage(undefined);
+    validatePage(false);
   };
 
   const handlePublishDraft = async () => {
-    const { savePage, validatePage } = props;
+    const { savePage, validatePage, skipReviewOnPublish } = props;
 
-    const validated = await validatePage(true);
+    const validated = skipReviewOnPublish ? true : await validatePage(true);
 
     if (validated) {
       const isSaved = await savePage(false, null, true);
@@ -541,6 +541,7 @@ const mapStateToProps = (state: IRootState): IPageEditorStateProps => ({
   currentUserID: state.users.currentUser.id,
   isNewTranslation: state.pageEditor.isNewTranslation,
   currentSiteErrorPages: state.sites.currentSiteErrorPages,
+  skipReviewOnPublish: state.app.globalSettings.skipReviewOnPublish,
 });
 
 interface IPageEditorStateProps {
@@ -561,6 +562,7 @@ interface IPageEditorStateProps {
   currentUserID: number | null;
   isNewTranslation: boolean;
   currentSiteErrorPages: number[];
+  skipReviewOnPublish?: boolean;
 }
 
 const mapDispatchToProps = {

package/src/modules/Navigation/Defaults/DefaultsEditor/Editor/index.tsx

@@ -76,7 +76,7 @@ interface IPageBrowserDispatchProps {
   addComponent: (componentType: any, key: string) => void;
   replaceModule(module: any, parent: any, objKey: string): void;
   replaceElementsInCollection(newValue: string, reference: string): void;
-  moveModule(moduleID: number, selectedContent: any, isPush: boolean, key: string): void;
+  moveModule(moduleID: number, selectedContent: any, newIndex: number, key: string): void;
 }
 
 type IProps = IEditorStateProps & IPageBrowserDispatchProps;

package/src/modules/PageEditor/Editor/index.tsx

@@ -108,14 +108,14 @@ interface IPageBrowserDispatchProps {
   duplicateModule(editorID: number, key: string): void;
   addComponent: (componentType: any, key: string) => void;
   addModule: (moduleType: string, selectedID: number, key: string) => void;
-  moveElement(moduleID: number, selectedContent: any, isPush: boolean, key: string): void;
+  moveElement(moduleID: number, selectedContent: any, newIndex: number, key: string): void;
   replaceModule(module: any, parent: any, objKey: string): void;
   replaceElementsInCollection(newValue: string, reference: string): void;
   setHistoryPush(path: string, isEditor: boolean): void;
   getGlobalFromLocalPage(): void;
   saveCurrentSiteInfo(): void;
   copyModule(editorID: number): boolean;
-  pasteModule(editorID: number): Promise<{ error?: INotification }>;
+  pasteModule(editorID: number, key: string): Promise<{ error?: INotification }>;
   setNotification: (notification: INotification) => void;
   isTemplateActivated: boolean;
   isGlobal: boolean;

package/src/modules/PageEditor/index.tsx

@@ -129,9 +129,9 @@ const PageEditor = (props: IProps) => {
   };
 
   const publishPage = async () => {
-    const { updatePageStatus, savePage, pageID, validatePage } = props;
+    const { updatePageStatus, savePage, pageID, validatePage, skipReviewOnPublish } = props;
 
-    const validated = await validatePage(true);
+    const validated = skipReviewOnPublish ? true : await validatePage(true);
 
     if (validated) {
       const publishPage = {
@@ -149,9 +149,9 @@ const PageEditor = (props: IProps) => {
   };
 
   const publishChanges = async () => {
-    const { savePage, validatePage } = props;
+    const { savePage, validatePage, skipReviewOnPublish } = props;
 
-    const validated = await validatePage(true);
+    const validated = skipReviewOnPublish ? true : await validatePage(true);
 
     if (validated) {
       const publishPage = {
@@ -184,9 +184,9 @@ const PageEditor = (props: IProps) => {
   };
 
   const handlePublishDraft = async () => {
-    const { savePage, validatePage } = props;
+    const { savePage, validatePage, skipReviewOnPublish } = props;
 
-    const validated = await validatePage(true);
+    const validated = skipReviewOnPublish ? true : await validatePage(true);
 
     if (validated) {
       const isSaved = await savePage(false, null, true);
@@ -603,6 +603,7 @@ const mapStateToProps = (state: IRootState): IPageEditorStateProps => ({
   currentUserID: state.users.currentUser.id,
   isNewTranslation: state.pageEditor.isNewTranslation,
   currentSiteErrorPages: state.sites.currentSiteErrorPages,
+  skipReviewOnPublish: state.app.globalSettings.skipReviewOnPublish,
 });
 
 interface IPageEditorStateProps {
@@ -624,6 +625,7 @@ interface IPageEditorStateProps {
   currentUserID: number | null;
   isNewTranslation: boolean;
   currentSiteErrorPages: number[];
+  skipReviewOnPublish?: boolean;
 }
 
 const mapDispatchToProps = {

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

@@ -41,6 +41,7 @@ const Form = (props: IProps) => {
     validateForm,
     currentStructuredDataId,
     resetForm,
+    skipReviewOnPublish,
   } = props;
 
   const [isNewStructuredData, setIsNewStructuredData] = useState(!form.id);
@@ -83,8 +84,8 @@ const Form = (props: IProps) => {
       );
     });
 
-  const handleSave = async (publish?: boolean) => {
-    const validated = publish ? await validateForm(true) : true;
+  const handleSave = async (publish: boolean) => {
+    const validated = publish && !skipReviewOnPublish ? await validateForm(true) : true;
 
     if (validated) {
       setIsSavedData(true);
@@ -186,7 +187,7 @@ const Form = (props: IProps) => {
   };
 
   const publishItem = async () => {
-    const validated = await validateForm(true);
+    const validated = skipReviewOnPublish ? true : await validateForm(true);
     if (!validated) return;
 
     if (!isNewStructuredData) {
@@ -316,6 +317,8 @@ interface IProps {
   activatedDataPacks: IDataPack[];
   errors: IErrorItem[];
   validated: boolean;
+  currentStructuredDataId: number | null;
+  skipReviewOnPublish?: boolean;
   createStructuredDataContent: (payload: any) => Promise<boolean>;
   updateStructuredDataContent: (payload: any) => Promise<boolean>;
   setLanguage(lang: { locale: string; id: number | null }): void;
@@ -325,7 +328,6 @@ interface IProps {
   setDataStatus(id: number, status: string): Promise<boolean>;
   deleteStructuredDataContent(id: number): Promise<boolean>;
   validateForm(publish?: boolean): Promise<boolean>;
-  currentStructuredDataId: number | null;
   resetForm(): void;
 }
 
@@ -344,6 +346,7 @@ const mapStateToProps = (state: IRootState) => ({
   activatedDataPacks: state.dataPacks.activated,
   errors: state.structuredData.errors,
   validated: state.structuredData.validated,
+  skipReviewOnPublish: state.app.globalSettings.skipReviewOnPublish,
 });
 
 const mapDispatchToProps = {

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

@@ -5,7 +5,16 @@ import { ICheck, IAvailableSites, ISavePageParams, ILanguage, IPageLanguage, IPa
 import { getHumanLastModifiedDate, getStructuredDataTitle } from "@ax/helpers";
 import { appActions } from "@ax/containers/App";
 import { pageStatus, ISetCurrentPageIDAction } from "@ax/containers/PageEditor/interfaces";
-import { CheckField, FloatingMenu, Icon, Flag, LanguageMenu, Tooltip, ElementsTooltip, CategoryCell } from "@ax/components";
+import {
+  CheckField,
+  FloatingMenu,
+  Icon,
+  Flag,
+  LanguageMenu,
+  Tooltip,
+  ElementsTooltip,
+  CategoryCell,
+} from "@ax/components";
 import { pageEditorActions } from "@ax/containers/PageEditor";
 import { useModal } from "@ax/hooks";
 import { DeleteModal, DuplicateModal, UnpublishModal } from "./atoms";
@@ -27,6 +36,8 @@ const GlobalPageItem = (props: IGlobalPageItemProps): JSX.Element => {
     isAllPages,
     updatePageStatus,
     duplicatePage,
+    getPage,
+    validatePage,
     setHistoryPush,
     deletePage,
     getGlobalPages,
@@ -39,6 +50,7 @@ const GlobalPageItem = (props: IGlobalPageItemProps): JSX.Element => {
     columns,
     categoryColors,
     addCategoryColors,
+    skipReview,
   } = props;
 
   const activeColumns = Object.keys(columns).filter((col: string) => columns[col].show);
@@ -140,8 +152,13 @@ const GlobalPageItem = (props: IGlobalPageItemProps): JSX.Element => {
   };
 
   const publishPage = async () => {
-    await updatePageStatus([globalPage.id], pageStatus.UPLOAD_PENDING, true);
-    getGlobalPages();
+    await getPage(globalPage.id);
+    const isValidated = skipReview ? true : await validatePage(true);
+
+    if (isValidated) {
+      await updatePageStatus([globalPage.id], pageStatus.UPLOAD_PENDING, true);
+      getGlobalPages();
+    }
   };
 
   const unpublishPage = async () => {
@@ -406,6 +423,8 @@ interface IGlobalPageItemProps {
   globalPage: IPage;
   updatePageStatus(ids: number[], status: string, updatedFromList: boolean): Promise<boolean>;
   duplicatePage(pageID: number, data: { title: string; slug: string }, siteID?: number): Promise<boolean>;
+  getPage(pageID?: number, global?: boolean): Promise<void>;
+  validatePage(publish?: boolean, browserRef?: any, currentPage?: IPage): Promise<boolean>;
   setHistoryPush(path: string, isEditor: boolean): void;
   deletePage(params?: ISavePageParams, currentLanguage?: string): Promise<boolean>;
   getGlobalPages(): void;
@@ -418,12 +437,15 @@ interface IGlobalPageItemProps {
   columns: Record<string, IColumn>;
   categoryColors: any;
   addCategoryColors(cats: string[]): void;
+  skipReview?: boolean;
 }
 
 const mapDispatchToProps = {
   setLanguage: appActions.setLanguage,
   updatePageStatus: pageEditorActions.updatePageStatus,
   duplicatePage: pageEditorActions.duplicatePage,
+  getPage: pageEditorActions.getPage,
+  validatePage: pageEditorActions.validatePage,
   setHistoryPush: appActions.setHistoryPush,
   deletePage: pageEditorActions.deletePage,
   createNewTranslation: pageEditorActions.createNewTranslation,

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

@@ -85,6 +85,7 @@ const StructuredDataList = (props: IProps): JSX.Element => {
     setCurrentDataID,
     resetCurrentSiteErrorPages,
     currentSiteErrorPages,
+    skipReviewOnPublish,
   } = props;
 
   const itemsPerPage = 50;
@@ -535,6 +536,7 @@ const StructuredDataList = (props: IProps): JSX.Element => {
           columns={currentDataColumnsState}
           categoryColors={categoryColors}
           addCategoryColors={addCategoryColors}
+          skipReview={skipReviewOnPublish}
         />
       );
     });
@@ -634,6 +636,7 @@ const mapStateToProps = (state: IRootState) => ({
   template: state.pageEditor.template,
   currentSitePages: state.sites.currentSitePages,
   currentSiteErrorPages: state.sites.currentSiteErrorPages,
+  skipReviewOnPublish: state.app.globalSettings.skipReviewOnPublish,
 });
 
 const mapDispatchToProps = {
@@ -698,6 +701,7 @@ interface ICategoriesProps {
   template: string;
   currentSitePages: IPage[];
   currentSiteErrorPages: number[];
+  skipReviewOnPublish?: boolean;
 }
 
 type IProps = ICategoriesProps & IDispatchProps;

package/src/__mocks__/reducers/analyticsState.tsx

@@ -1,14 +0,0 @@
-const initialState = {
-  scriptCode: "",
-  siteScriptCodeExists: false,
-  dimensions: [{ name: "", values: "" }],
-  groups: [{ templates: "", name: "", dimensions: "" }],
-};
-
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export default (state = initialState, action: { type: unknown }) => {
-  switch (action.type) {
-    default:
-      return state;
-  }
-};

package/src/__mocks__/reducers/app.tsx

@@ -1,10 +0,0 @@
-import { AppActionsCreators } from "@ax/containers/App/interfaces";
-import { initialState } from "@ax/containers/App/reducer";
-
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export default (state = initialState, action: { type: AppActionsCreators }) => {
-  switch (action.type) {
-    default:
-      return state;
-  }
-};

package/src/__mocks__/reducers/pageEditor.tsx

@@ -1,30 +0,0 @@
-import { PageEditorActionsCreators } from "../../containers/PageEditor/interfaces";
-
-const initialState = {
-  editorContent: {},
-  template: "BasicTemplate",
-  breadcrumb: [],
-  schema: {},
-  selectedContent: {},
-  tab: "content",
-  selectedEditorID: 0,
-  currentPageID: null,
-  currentPageStatus: null,
-  currentPageName: "",
-  currentPageLanguages: [],
-  isNewTranslation: false,
-  templateConfig: {},
-  selectedParent: null,
-  errors: [],
-  validated: false,
-  sitePageID: null,
-  userEditing: null,
-};
-
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export default (state = initialState, action: { type: PageEditorActionsCreators }) => {
-  switch (action.type) {
-    default:
-      return state;
-  }
-};

package/src/__mocks__/reducers/sites.tsx

@@ -1,10 +0,0 @@
-import { initialState } from "@ax/containers/Sites/reducer";
-import { SitesActionsCreators } from "@ax/containers/Sites/interfaces";
-
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export default (state = initialState, action: { type: SitesActionsCreators }) => {
-  switch (action.type) {
-    default:
-      return state;
-  }
-};