@griddo/ax 11.7.13 → 11.8.0-rc.0

package/src/modules/Forms/FormEditor/index.tsx

@@ -49,11 +49,20 @@ const FormEditor = (props: IProps) => {
     setSelectedContent,
   } = props;
 
-  const { id, title, state, dataLanguages, formInUse } = formContent || { dataLanguages: [], formInUse: null };
+  const {
+    id,
+    title,
+    state,
+    dataLanguages,
+    formInUse,
+    deleted = false,
+  } = formContent || { dataLanguages: [], formInUse: null };
   const formStatus = state === "active" ? "active" : "offline";
   const isTranslated = dataLanguages.length > 1;
   const isSiteView = !!currentSiteInfo;
   const errorNotificationText = "There are some errors on the form so you can not publish yet. Please review them.";
+  const deletedNotificationText =
+    "This form has been deleted and can’t be edited. It will be permanently removed from the trash after 30 days.";
   const isPublishedForm = state === "active";
 
   const formLanguages: ILanguage[] = [];
@@ -64,6 +73,8 @@ const FormEditor = (props: IProps) => {
     }
   });
 
+  const availableLanguages = deleted ? formLanguages : isSiteView ? siteLangs : globalLangs;
+
   const [notification, setNotification] = useState<INotification | null>(null);
   const [deleteAllVersions, setDeleteAllVersions] = useState(false);
   const [errors, setErrors] = useState<IErrorItem[]>([]);
@@ -227,7 +238,7 @@ const FormEditor = (props: IProps) => {
   const downArrowMenu = {
     button: isAllowedToPublishForm ? publishButton : undefined,
     options: menuOptions,
-    displayed: true,
+    displayed: !deleted,
   };
 
   const modalText = (
@@ -274,7 +285,7 @@ const FormEditor = (props: IProps) => {
         pageStatus={formStatus}
         language={lang}
         languageAction={handleLanguage}
-        availableLanguages={isSiteView ? siteLangs : globalLangs}
+        availableLanguages={availableLanguages}
         currentLanguages={formLanguages}
         currentPageID={0}
         fullWidth={true}
@@ -295,6 +306,11 @@ const FormEditor = (props: IProps) => {
             />
           </S.NotificationWrapper>
         )}
+        {deleted && (
+          <S.NotificationWrapper>
+            <Notification type="error" text={deletedNotificationText} />
+          </S.NotificationWrapper>
+        )}
         <ErrorToast size="l" fixed />
         <S.Content>
           <Editor
@@ -304,6 +320,7 @@ const FormEditor = (props: IProps) => {
             browserRef={browserRef}
             setNotification={setNotification}
             setErrors={setErrors}
+            isDisabled={deleted}
           />
         </S.Content>
       </MainWrapper>

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

@@ -32,6 +32,7 @@ const Editor = (props: IProps) => {
     browserRef,
     setNotification,
     isEditLive,
+    isDisabled,
   } = props;
 
   const actions = {
@@ -68,6 +69,7 @@ const Editor = (props: IProps) => {
           userEditing={userEditing}
           theme={theme}
           isEditLive={isEditLive}
+          isDisabled={isDisabled}
         />
       }
     />
@@ -104,6 +106,7 @@ interface IPageBrowserDispatchProps {
   theme: string;
   browserRef: any;
   isEditLive: boolean;
+  isDisabled: boolean;
 }
 
 type IProps = IEditorStateProps & IPageBrowserDispatchProps;

package/src/modules/GlobalEditor/index.tsx

@@ -22,6 +22,7 @@ import {
   ErrorPage,
   CancelScheduleModal,
   ScheduleModal,
+  RestoreModal,
 } from "@ax/components";
 import { pageEditorActions } from "@ax/containers/PageEditor";
 import { structuredDataActions } from "@ax/containers/StructuredData";
@@ -64,6 +65,8 @@ const GlobalEditor = (props: IProps) => {
     currentSiteErrorPages,
     getUserCurrentPermissions,
     schedulePublication,
+    restorePage,
+    schemaVersion,
   } = props;
 
   const isAllowedToPublishPages = usePermission("global.globalData.publishUnpublishAllGlobalData");
@@ -83,6 +86,7 @@ const GlobalEditor = (props: IProps) => {
   const [scheduleDate, setScheduleDate] = useState({ date: dateToString(new Date(), "yyy/MM/dd"), time: "12:00 am" });
   const { isOpen: isScheduleOpen, toggleModal: toggleScheduleModal } = useModal();
   const { isOpen: isCancelScheduleOpen, toggleModal: toggleCancelScheduleModal } = useModal();
+  const { isOpen: isRestoreOpen, toggleModal: toggleRestoreModal } = useModal();
   const browserRef = useRef<HTMLDivElement>(null);
 
   const isPublished = props.pageStatus === pageStatus.PUBLISHED || props.pageStatus === pageStatus.UPLOAD_PENDING;
@@ -92,11 +96,21 @@ const GlobalEditor = (props: IProps) => {
   const structuredData = editorContent ? editorContent.structuredData : "";
   const isEditLive = isPublished && hasDraft;
   const isScheduled = props.pageStatus === pageStatus.SCHEDULED;
+  const isDeleted = editorContent.deleted;
 
   const errorNotificationText =
     "There are some errors on the page so you can not publish yet. Please review them in the error panel.";
   const validatedNotificationText = "Everything seems ok, you can publish the page.";
 
+  const deletedNotificationText =
+    "This page has been deleted and can’t be edited. It will be permanently removed from the trash after 30 days.";
+  const globalNotificationText = "You’ re working on the Global Page. Make sure you want to make changes to this page.";
+
+  const modifiedNotificationText =
+    "You made some changes to the Live version that aren't implemented on this Draft. Check it out before you continue working.";
+
+  const backLinkRoute = "/data";
+
   const theme = getDefaultTheme();
 
   useEffect(() => {
@@ -359,7 +373,7 @@ const GlobalEditor = (props: IProps) => {
   }
 
   const downArrowMenu = {
-    displayed: !isReadOnly,
+    displayed: !isReadOnly && !isDeleted,
     button: isAllowedToPublishPages ? getPublishButton(props.pageStatus) : undefined,
     options: menuOptions,
   };
@@ -460,13 +474,6 @@ const GlobalEditor = (props: IProps) => {
     }
   };
 
-  const globalNotificationText = "You’ re working on the Global Page. Make sure you want to make changes to this page.";
-
-  const modifiedNotificationText =
-    "You made some changes to the Live version that aren't implemented on this Draft. Check it out before you continue working.";
-
-  const backLinkRoute = "/data";
-
   const handleGoBack = () => {
     props.setHistoryPush(backLinkRoute, false);
   };
@@ -536,6 +543,14 @@ const GlobalEditor = (props: IProps) => {
     }
   };
 
+  const handleRestorePage = async () => {
+    const isRestored = await restorePage(pageID);
+    if (isRestored) {
+      isRestoreOpen && toggleRestoreModal();
+      await getPage(pageID);
+    }
+  };
+
   return isLoading ? (
     <Loading />
   ) : (
@@ -551,7 +566,7 @@ const GlobalEditor = (props: IProps) => {
         pageStatus={props.pageStatus}
         language={lang}
         languageAction={handleLanguage}
-        availableLanguages={isAllowedToCreatePages ? globalLangs : filteredLanguages}
+        availableLanguages={isAllowedToCreatePages && !isDeleted ? globalLangs : filteredLanguages}
         currentLanguages={contentLanguages}
         currentPageID={pageID}
         fullWidth={true}
@@ -571,6 +586,16 @@ const GlobalEditor = (props: IProps) => {
                 <Notification type="warning" text={modifiedNotificationText} />
               </S.NotificationWrapper>
             )}
+            {isDeleted && (
+              <S.NotificationWrapper>
+                <Notification
+                  type="error"
+                  text={deletedNotificationText}
+                  btnText="Restore page"
+                  onClick={toggleRestoreModal}
+                />
+              </S.NotificationWrapper>
+            )}
             {sitePageID && (
               <S.NotificationWrapper>
                 <Notification type="info" text={globalNotificationText} btnText="Go Back" onClick={goBackToSite} />
@@ -597,6 +622,7 @@ const GlobalEditor = (props: IProps) => {
                 browserRef={browserRef}
                 setNotification={setNotification}
                 isEditLive={isEditLive}
+                isDisabled={isDeleted}
               />
             </S.Content>
           </>
@@ -651,6 +677,15 @@ const GlobalEditor = (props: IProps) => {
           mainModalAction={mainCancelScheduleModalAction}
           secondaryModalAction={secondaryCancelScheduleModalAction}
         />
+        <RestoreModal
+          isOpen={isRestoreOpen}
+          toggleModal={toggleRestoreModal}
+          {...{
+            isChild: false,
+            hasIssues: schemaVersion !== editorContent.schemaVersionTimestamp,
+            restorePage: handleRestorePage,
+          }}
+        />
       </MainWrapper>
     </>
   );
@@ -674,6 +709,7 @@ const mapStateToProps = (state: IRootState): IPageEditorStateProps => ({
   isNewTranslation: state.pageEditor.isNewTranslation,
   currentSiteErrorPages: state.sites.currentSiteErrorPages,
   skipReviewOnPublish: state.app.globalSettings.skipReviewOnPublish,
+  schemaVersion: state.structuredData.schemaVersion,
 });
 
 interface IPageEditorStateProps {
@@ -694,6 +730,7 @@ interface IPageEditorStateProps {
   isNewTranslation: boolean;
   currentSiteErrorPages: number[];
   skipReviewOnPublish?: boolean;
+  schemaVersion: string;
 }
 
 const mapDispatchToProps = {
@@ -714,6 +751,7 @@ const mapDispatchToProps = {
   discardDraft: pageEditorActions.discardDraft,
   getUserCurrentPermissions: usersActions.getUserCurrentPermissions,
   schedulePublication: pageEditorActions.schedulePublication,
+  restorePage: pageEditorActions.restorePage,
 };
 
 interface IPageEditorDispatchProps {
@@ -734,6 +772,7 @@ interface IPageEditorDispatchProps {
   discardDraft(): Promise<void>;
   getUserCurrentPermissions(): Promise<void>;
   schedulePublication(date: string | null, isDraft: boolean): Promise<boolean>;
+  restorePage(id: number | number[]): Promise<boolean>;
 }
 
 type IProps = IPageEditorStateProps & IPageEditorDispatchProps & RouteComponentProps;

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

@@ -6,7 +6,7 @@ import { Browser } from "@ax/components";
 import { ILanguage, IRootState, ISite, ISocialState } from "@ax/types";
 
 const DefaultsBrowser = (props: IProps) => {
-  const { socials, cloudinaryName, content, currentSiteInfo, siteLangs, browserRef, actions } = props;
+  const { socials, cloudinaryName, content, currentSiteInfo, siteLangs, browserRef, actions, isDisabled } = props;
 
   if (!currentSiteInfo) {
     throw new Error(`ERROR: User reached Page Editor with null site info`);
@@ -28,6 +28,7 @@ const DefaultsBrowser = (props: IProps) => {
       siteLangs={siteLangs}
       siteID={siteID}
       actions={actions}
+      disabled={isDisabled}
     />
   );
 };
@@ -35,6 +36,7 @@ const DefaultsBrowser = (props: IProps) => {
 interface IDefaultsBrowserProps {
   actions: any;
   browserRef?: React.RefObject<HTMLDivElement>;
+  isDisabled: boolean;
 }
 
 interface IDefaultsBrowserStateProps {

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

@@ -28,6 +28,7 @@ const Editor = (props: IProps) => {
     isLoading,
     site,
     browserRef,
+    isDisabled,
   } = props;
 
   if (!site) {
@@ -50,7 +51,7 @@ const Editor = (props: IProps) => {
 
   return (
     <ResizePanel
-      leftPanel={<DefaultsBrowser browserRef={browserRef} actions={actions} />}
+      leftPanel={<DefaultsBrowser browserRef={browserRef} actions={actions} isDisabled={isDisabled} />}
       rightPanel={
         <ConfigPanel
           schema={schema}
@@ -65,6 +66,7 @@ const Editor = (props: IProps) => {
           isLoading={isLoading}
           isEditable={true}
           theme={site.theme}
+          isDisabled={isDisabled}
         />
       }
     />
@@ -96,6 +98,7 @@ interface IPageBrowserDispatchProps {
   pasteModule(editorID: number, key: string, modulesToPaste: IModule[]): Promise<{ error?: INotification }>;
   setNotification: (notification: INotification) => void;
   browserRef?: React.RefObject<HTMLDivElement>;
+  isDisabled: boolean;
 }
 
 type IProps = IEditorStateProps & IPageBrowserDispatchProps;

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

@@ -8,7 +8,7 @@ import { RouteLeavingGuard } from "@ax/guards";
 
 import { appActions } from "@ax/containers/App";
 import { navigationActions, menuActions } from "@ax/containers/Navigation";
-import { ErrorPage, ErrorToast, Loading, MainWrapper, Modal, Notification } from "@ax/components";
+import { ErrorPage, ErrorToast, Loading, MainWrapper, Modal, Notification, RestoreModal } from "@ax/components";
 import Editor from "./Editor";
 
 import * as S from "./style";
@@ -34,13 +34,18 @@ const DefaultsEditor = (props: IProps) => {
     setHistoryPush,
     getMenus,
     currentSiteInfo,
+    restoreNavigation,
   } = props;
 
   const [notification, setNotification] = useState<INotification | null>(null);
   const { isOpen, toggleModal } = useModal();
+  const { isOpen: isRestoreOpen, toggleModal: toggleRestoreModal } = useModal();
   const { isDirty, setIsDirty, resetDirty } = useIsDirty(editorContent, isNewTranslation);
   const currentDefaultNav = currentDefaultsContent.find((item: any) => item.setAsDefault);
   const isNew = !editorContent?.id;
+  const isDeleted = !!editorContent?.deleted;
+
+  const deletedNotificationText = `This ${editorContent?.type} has been deleted and can’t be edited. It will be permanently removed from the trash after 30 days.`;
 
   const currentLanguages: ILanguage[] = [];
   navLanguages?.forEach((navLang) => {
@@ -57,7 +62,8 @@ const DefaultsEditor = (props: IProps) => {
   const isAllowedToCreateFooters = usePermission("navigation.createSiteFooters") && selectedDefault === "Footers";
 
   useEffect(() => {
-    getValues();
+    const handleGetValues = async () => await getValues();
+    handleGetValues();
     if (isNew) {
       setIsDirty(false);
     }
@@ -133,11 +139,20 @@ const DefaultsEditor = (props: IProps) => {
     }
   };
 
+  const handleRestorePage = async () => {
+    const isRestored = await restoreNavigation(editorContent.id, editorContent.type);
+    if (isRestored) {
+      isRestoreOpen && toggleRestoreModal();
+      await getValues();
+    }
+  };
+
   const leavingGuardText = (
     <>
       Some content <strong>is not saved</strong> on this page.
     </>
   );
+
   const setDefaultModalText = editorContent && (
     <p>{`There is already a ${editorContent.type} defined as default. If you change it to this one, it will be shown on all the pages on this site. Are you sure your want to make this change?`}</p>
   );
@@ -146,16 +161,19 @@ const DefaultsEditor = (props: IProps) => {
   const secondaryModalAction = { title: "Cancel", onClick: toggleModal };
   const goBack = (path: string) => setHistoryPush(path, true);
 
-  const availableLanguages = isAllowedToCreateHeaders || isAllowedToCreateFooters ? siteLanguages : currentLanguages;
+  const availableLanguages =
+    (isAllowedToCreateHeaders || isAllowedToCreateFooters) && !isDeleted ? siteLanguages : currentLanguages;
+
+  const backLinkRoute = "/sites/navigations/modules";
 
   return isLoading ? (
     <Loading />
   ) : (
     <>
-      <RouteLeavingGuard when={isDirty} action={goBack} text={leavingGuardText} />
+      <RouteLeavingGuard when={isDirty || isSaving} action={goBack} text={leavingGuardText} />
       <MainWrapper
         title={editorContent.title}
-        backLink={true}
+        backLink={backLinkRoute}
         rightButton={rightButtonProps}
         fixedAppBar={true}
         language={lang}
@@ -175,6 +193,16 @@ const DefaultsEditor = (props: IProps) => {
             />
           </S.NotificationWrapper>
         )}
+        {isDeleted && (
+          <S.NotificationWrapper>
+            <Notification
+              type="error"
+              text={deletedNotificationText}
+              btnText={`Restore ${editorContent?.type}`}
+              onClick={toggleRestoreModal}
+            />
+          </S.NotificationWrapper>
+        )}
         <ErrorToast size="l" />
         <Modal
           isOpen={isOpen}
@@ -187,8 +215,17 @@ const DefaultsEditor = (props: IProps) => {
           {isOpen ? <S.ModalContent>{setDefaultModalText}</S.ModalContent> : null}
         </Modal>
         <S.Content>
-          <Editor browserRef={browserRef} setNotification={setNotification} />
+          <Editor browserRef={browserRef} setNotification={setNotification} isDisabled={isDeleted} />
         </S.Content>
+        <RestoreModal
+          isOpen={isRestoreOpen}
+          toggleModal={toggleRestoreModal}
+          {...{
+            isChild: false,
+            hasIssues: false,
+            restorePage: handleRestorePage,
+          }}
+        />
       </MainWrapper>
     </>
   );
@@ -235,6 +272,7 @@ const mapDispatchToProps = {
   setHeader: navigationActions.setHeader,
   setFooter: navigationActions.setFooter,
   getMenus: menuActions.getMenus,
+  restoreNavigation: navigationActions.restoreNavigation,
 };
 
 interface IDispatchProps {
@@ -247,6 +285,7 @@ interface IDispatchProps {
   setHeader(id: number | null): void;
   setFooter(id: number | null): void;
   getMenus(): Promise<void>;
+  restoreNavigation(navID: number | number[], type: string): Promise<boolean>;
 }
 
 type IProps = IStateProps & IDispatchProps;

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

@@ -43,6 +43,7 @@ const Editor = (props: IProps) => {
     restorePageNavigation,
     content,
     isEditLive,
+    isDisabled,
   } = props;
 
   if (!site) {
@@ -73,7 +74,7 @@ const Editor = (props: IProps) => {
       leftPanel={
         <PageBrowser
           isTemplateActivated={isTemplateActivated}
-          isReadOnly={isReadOnly || isEditLive}
+          isReadOnly={isReadOnly || isEditLive || isDisabled}
           browserRef={browserRef}
         />
       }
@@ -100,6 +101,7 @@ const Editor = (props: IProps) => {
           header={header}
           footer={footer}
           isEditLive={isEditLive}
+          isDisabled={isDisabled}
         />
       }
     />
@@ -144,6 +146,7 @@ interface IPageBrowserDispatchProps {
   isReadOnly: boolean;
   browserRef: any;
   isEditLive: boolean;
+  isDisabled: boolean;
 }
 
 type IProps = IEditorStateProps & IPageBrowserDispatchProps;

package/src/modules/PageEditor/index.tsx

@@ -21,6 +21,7 @@ import {
   ErrorPage,
   CancelScheduleModal,
   ScheduleModal,
+  RestoreModal,
 } from "@ax/components";
 import { pageEditorActions } from "@ax/containers/PageEditor";
 import { appActions } from "@ax/containers/App";
@@ -65,6 +66,8 @@ const PageEditor = (props: IProps) => {
     currentSiteErrorPages,
     schedulePublication,
     setCurrentPageID,
+    restorePage,
+    schemaVersion,
   } = props;
 
   const isAllowedToPublishPages = usePermission("content.publishUnpublishPages");
@@ -86,6 +89,7 @@ const PageEditor = (props: IProps) => {
   const { isOpen: isDeleteOpen, toggleModal: toggleDeleteModal } = useModal();
   const { isOpen: isScheduleOpen, toggleModal: toggleScheduleModal } = useModal();
   const { isOpen: isCancelScheduleOpen, toggleModal: toggleCancelScheduleModal } = useModal();
+  const { isOpen: isRestoreOpen, toggleModal: toggleRestoreModal } = useModal();
   const [errorPagesChecked, setErrorPagesChecked] = useState(false);
   const browserRef = useRef<HTMLDivElement>(null);
 
@@ -102,10 +106,18 @@ const PageEditor = (props: IProps) => {
   const canBeUnpublished = editorContent && editorContent.canBeUnpublished;
   const deleteHelpText = !canBeUnpublished ? "This is the canonical site of the page. You cannot unpublish it." : null;
   const isScheduled = !!editorContent && !!editorContent.publicationScheduled;
+  const isDeleted = editorContent.deleted;
 
   const errorNotificationText =
     "There are some errors on the page so you can not publish yet. Please review them in the error panel.";
   const validatedNotificationText = "Everything seems ok, you can publish the page.";
+  const modifiedNotificationText =
+    "You made some changes to the Live version that aren't implemented on this Draft. Check it out before you continue working.";
+
+  const deletedNotificationText =
+    "This page has been deleted and can’t be edited. It will be permanently removed from the trash after 30 days.";
+
+  const backLinkRoute = "/sites/pages";
 
   useEffect(() => {
     const { pageID, getPage, setTab, sendPagePing } = props;
@@ -369,7 +381,7 @@ const PageEditor = (props: IProps) => {
   }
 
   const downArrowMenu = {
-    displayed: !isReadOnly,
+    displayed: !isReadOnly && !isDeleted,
     button: isAllowedToPublishPages ? getPublishButton(props.pageStatus) : undefined,
     options: !isGlobal ? menuOptions : [],
   };
@@ -415,7 +427,7 @@ const PageEditor = (props: IProps) => {
   }
 
   let availableLanguages = siteLanguages;
-  if (!isTemplateActivated || hasDeactivatedModules || !isAllowedToCreatePages) {
+  if (!isTemplateActivated || hasDeactivatedModules || !isAllowedToCreatePages || isDeleted) {
     const pageLanguagesIDs = pageLanguages.map((language) => language.languageId);
     availableLanguages = siteLanguages.filter((language) => {
       return pageLanguagesIDs.includes(language.id);
@@ -505,11 +517,6 @@ const PageEditor = (props: IProps) => {
     }
   };
 
-  const modifiedNotificationText =
-    "You made some changes to the Live version that aren't implemented on this Draft. Check it out before you continue working.";
-
-  const backLinkRoute = "/sites/pages";
-
   const handleGoBack = () => {
     props.setHistoryPush(backLinkRoute, false);
   };
@@ -584,6 +591,14 @@ const PageEditor = (props: IProps) => {
     }
   };
 
+  const handleRestorePage = async () => {
+    const isRestored = await restorePage(pageID);
+    if (isRestored) {
+      isRestoreOpen && toggleRestoreModal();
+      await getPage(pageID);
+    }
+  };
+
   return isLoading ? (
     <Loading />
   ) : (
@@ -623,6 +638,16 @@ const PageEditor = (props: IProps) => {
                 />
               </S.NotificationWrapper>
             )}
+            {isDeleted && (
+              <S.NotificationWrapper>
+                <Notification
+                  type="error"
+                  text={deletedNotificationText}
+                  btnText="Restore page"
+                  onClick={toggleRestoreModal}
+                />
+              </S.NotificationWrapper>
+            )}
             {isLivePageChanged && (
               <S.NotificationWrapper>
                 <Notification type="warning" text={modifiedNotificationText} />
@@ -650,6 +675,7 @@ const PageEditor = (props: IProps) => {
                 browserRef={browserRef}
                 setNotification={setNotification}
                 isEditLive={isEditLive}
+                isDisabled={isDeleted}
               />
             </S.Content>
           </>
@@ -711,6 +737,15 @@ const PageEditor = (props: IProps) => {
           mainModalAction={mainCancelScheduleModalAction}
           secondaryModalAction={secondaryCancelScheduleModalAction}
         />
+        <RestoreModal
+          isOpen={isRestoreOpen}
+          toggleModal={toggleRestoreModal}
+          {...{
+            isChild: false,
+            hasIssues: schemaVersion !== editorContent.schemaVersionTimestamp,
+            restorePage: handleRestorePage,
+          }}
+        />
       </MainWrapper>
     </>
   );
@@ -736,6 +771,7 @@ const mapStateToProps = (state: IRootState): IPageEditorStateProps => ({
   isNewTranslation: state.pageEditor.isNewTranslation,
   currentSiteErrorPages: state.sites.currentSiteErrorPages,
   skipReviewOnPublish: state.app.globalSettings.skipReviewOnPublish,
+  schemaVersion: state.structuredData.schemaVersion,
 });
 
 interface IPageEditorStateProps {
@@ -758,6 +794,7 @@ interface IPageEditorStateProps {
   currentSiteErrorPages: number[];
   skipReviewOnPublish?: boolean;
   schema: any;
+  schemaVersion: string;
 }
 
 const mapDispatchToProps = {
@@ -779,6 +816,7 @@ const mapDispatchToProps = {
   deleteBulk: pageEditorActions.deleteBulk,
   schedulePublication: pageEditorActions.schedulePublication,
   setCurrentPageID: pageEditorActions.setCurrentPageID,
+  restorePage: pageEditorActions.restorePage,
 };
 
 interface IPageEditorDispatchProps {
@@ -800,6 +838,7 @@ interface IPageEditorDispatchProps {
   deleteBulk(ids: number[]): Promise<boolean>;
   schedulePublication(date: string | null, isDraft: boolean): Promise<boolean>;
   setCurrentPageID: (currentPageID: number | null) => void;
+  restorePage(id: number | number[]): Promise<boolean>;
 }
 
 type IProps = IPageEditorStateProps & IPageEditorDispatchProps & RouteComponentProps;

package/src/modules/Redirects/BulkHeader/TableHeader/style.tsx

@@ -28,10 +28,4 @@ const ActionsHeader = styled(Header)`
   justify-content: flex-end;
 `;
 
-export {
-  TableHeader,
-  CheckHeader,
-  SiteHeader,
-  UrlHeader,
-  ActionsHeader,
-};
+export { TableHeader, CheckHeader, SiteHeader, UrlHeader, ActionsHeader };