@griddo/ax 10.1.77 → 10.1.79

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "10.1.77",
+  "version": "10.1.79",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -127,7 +127,7 @@
     "react-dom": "*",
     "react-draft-wysiwyg": "^1.14.5",
     "react-frame-component": "^5.2.1",
-    "react-froala-wysiwyg": "3.1.0",
+    "react-froala-wysiwyg": "^3.2.7",
     "react-redux": "^7.2.8",
     "react-refresh": "^0.10.0",
     "react-router-dom": "5.1.2",
@@ -189,9 +189,6 @@
     "ts-jest": "^27.1.4",
     "ts-node": "^10.9.1"
   },
-  "resolutions": {
-    "react-error-overlay": "6.0.9"
-  },
   "babel": {
     "presets": [
       "react-app",
@@ -233,5 +230,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "414efc2fbc4fb9a3e5a3b7dde8ed81be8fc9f08a"
+  "gitHead": "7983caa7394962e73188ec16d3335997293056ca"
 }

package/public/index.html

@@ -6,7 +6,7 @@
   <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
   <meta name="theme-color" content="#2C50EE" />
-  <meta name="description" content="Thesaurus AX" />
+  <meta name="description" content="Griddo AX" />
   <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
   <link rel="stylesheet" href="fonts/fonts.css" />
   <title></title>
@@ -18,4 +18,4 @@
   <div id="root"></div>
 </body>
 
-</html>
+</html>

package/src/components/Fields/Wysiwyg/config.tsx

@@ -1,3 +1,27 @@
+import { getRichTextConfig, parseClassNames } from "./helpers";
+
+const richTextConfig = getRichTextConfig();
+const paragraphStyles = richTextConfig?.paragraphStyles ? parseClassNames(richTextConfig.paragraphStyles) : undefined;
+
+const miscButtons = [
+  "underline",
+  "textColor",
+  "formatOLSimple",
+  "specialCharacters",
+  "insertHR",
+  "alignLeft",
+  "alignRight",
+  "alignJustify",
+  "outdent",
+  "indent",
+  "undo",
+  "redo",
+  "selectAll",
+  "html",
+  "insertTable",
+  paragraphStyles ? "paragraphStyle" : undefined,
+];
+
 const buttonsFull = {
   moreText: {
     buttons: ["bold", "italic", "paragraphFormat", "formatUL", "quote", "alignCenter"],
@@ -8,22 +32,7 @@ const buttonsFull = {
     buttonsVisible: 5,
   },
   moreMisc: {
-    buttons: [
-      "underline",
-      "textColor",
-      "formatOLSimple",
-      "specialCharacters",
-      "insertHR",
-      "alignLeft",
-      "alignRight",
-      "alignJustify",
-      "outdent",
-      "indent",
-      "undo",
-      "redo",
-      "selectAll",
-      "html",
-    ],
+    buttons: miscButtons,
     align: "right",
     buttonsVisible: 0,
   },
@@ -79,6 +88,7 @@ const wysiwygConfig = {
   imageMaxSize: 20 * 1024 * 1024,
   imageManagerLoadURL: `${process.env.REACT_APP_API_ENDPOINT}/images/wysiwyg`,
   requestWithCORS: false,
+  paragraphStyles,
 };
 
 export { buttonsFull, buttons, wysiwygConfig };

package/src/components/Fields/Wysiwyg/helpers.tsx

@@ -0,0 +1,17 @@
+import { schemas } from "components";
+
+const getRichTextConfig = (): IRichTextConfig | null => {
+  return schemas?.richTextConfig ? schemas.richTextConfig : null;
+};
+
+const parseClassNames = (paragraphStyles: { label: string; className: string }[]) =>
+  paragraphStyles.reduce(
+    (acc, current: { label: string; className: string }) => ({ ...acc, [current.className]: current.label }),
+    {}
+  );
+
+interface IRichTextConfig {
+  paragraphStyles?: { label: string; className: string }[];
+}
+
+export { getRichTextConfig, parseClassNames };

package/src/components/Fields/Wysiwyg/style.tsx

@@ -56,7 +56,7 @@ export const EditorWrapper = styled.div<{ error: boolean | undefined; disabled?:
         margin: 0 10px;
       }
     }
-    .second-toolbar {
+    .fr-second-toolbar {
       border-color: ${(p) =>
         p.error === true ? p.theme.color.error : p.disabled ? p.theme.color.interactiveDisabled : p.theme.color.uiLine};
       border-radius: 0 0 4px 4px;
@@ -82,7 +82,7 @@ export const EditorWrapper = styled.div<{ error: boolean | undefined; disabled?:
     }
     ${Wrapper}:focus-within & {
       .fr-toolbar,
-      .second-toolbar {
+      .fr-second-toolbar {
         border-color: ${(p) =>
           p.error === true
             ? p.theme.color.error

package/src/components/Fields/Wysiwyg/vendors.tsx

@@ -1,5 +1,6 @@
 import "froala-editor/css/froala_style.min.css";
 import "froala-editor/css/froala_editor.pkgd.min.css";
+import "froala-editor/css/plugins/table.min.css";
 import "froala-editor/js/plugins/align.min.js";
 import "froala-editor/js/plugins/colors.min.js";
 import "froala-editor/js/plugins/fullscreen.min.js";
@@ -15,3 +16,5 @@ import "froala-editor/js/plugins/special_characters.min.js";
 import "froala-editor/js/plugins/word_paste.min.js";
 import "froala-editor/js/plugins/paragraph_format.min.js";
 import "froala-editor/js/plugins/char_counter.min.js";
+import "froala-editor/js/plugins/paragraph_style.min.js";
+import "froala-editor/js/plugins/table.min.js";

package/src/containers/Navigation/Defaults/actions.tsx

@@ -419,21 +419,6 @@ function setDefaultNavigation(navID: number, type: string): (dispatch: Dispatch,
   };
 }
 
-function getSiteDefaults(): (dispatch: Dispatch, getState: any) => Promise<void> {
-  return async (dispatch, getState) => {
-    const { currentSiteInfo } = getStateValues(getState);
-    const siteID = currentSiteInfo.id;
-
-    const headerResponse = await navigation.getHeaders(siteID);
-    const footerResponse = await navigation.getFooters(siteID);
-    const header = headerResponse && headerResponse.data;
-    const footer = footerResponse && footerResponse.data;
-
-    dispatch(setHeader(header.id));
-    dispatch(setFooter(footer.id));
-  };
-}
-
 function generateNewDefault(dispatch: Dispatch, getState: any) {
   const {
     selectedDefault,
@@ -879,7 +864,6 @@ export {
   setHeader,
   setFooter,
   createNewTranslation,
-  getSiteDefaults,
   getValues,
   addModule,
   addComponent,

package/src/containers/PageEditor/actions.tsx

@@ -104,7 +104,7 @@ import {
 } from "./interfaces";
 
 const { setIsLoading, setIsSaving, handleError } = appActions;
-const { getSiteDefaults, getDefaults } = navigationActions;
+const { getDefaults } = navigationActions;
 
 // AUDIT: THIS FILE IS WAY TOO LONG - LOOK FOR A REFACTOR SOLUTION
 // FIXME: CHECK EDITOR CONTENT STRUCTURE (editorContent.editorContent)
@@ -234,25 +234,18 @@ function setTranslatedParent(): (dispatch: Dispatch, getState: any) => void {
   };
 }
 
-function createNewTranslation(isNewTranslation: boolean): (dispatch: Dispatch, getState: any) => void {
-  return async (dispatch, getState) => {
+function createNewTranslation(isNewTranslation: boolean): (dispatch: Dispatch) => void {
+  return async (dispatch) => {
     try {
-      const {
-        sites: { currentSiteInfo },
-      } = getState();
-
       dispatch(setIsNewTranslation(isNewTranslation));
       dispatch(setCurrentPageStatus("offline"));
-      if (currentSiteInfo) {
-        await getSiteDefaults()(dispatch, getState);
-      }
     } catch (e) {
       console.log(e); // TODO: capturar error bien
     }
   };
 }
 
-const setRootEditorID = (dispatch: Dispatch, getState: any) => {
+const setRootEditorID = (dispatch: Dispatch) => {
   const rootEditorID = 0;
 
   dispatch(setSelectedEditorID(rootEditorID));
@@ -294,7 +287,7 @@ function generateNewPage(dispatch: Dispatch, getState: any, baseSchema: string)
   dispatch(setUserEditing(null));
 
   // SET PAGE AS ROOT WHEN NEW PAGE
-  setRootEditorID(dispatch, getState);
+  setRootEditorID(dispatch);
   generatePageContent(page, dispatch, getState);
 }
 
@@ -334,7 +327,6 @@ function getPage(pageID?: number, global?: boolean): (dispatch: Dispatch, getSta
 
         if (currentSiteInfo) {
           await getPageLanguages(pageID, currentSiteInfo.id, page.entity)(dispatch);
-          await getSiteDefaults()(dispatch, getState);
         } else {
           await getPageLanguages(pageID, null, page.entity)(dispatch);
         }
@@ -357,7 +349,7 @@ function getPage(pageID?: number, global?: boolean): (dispatch: Dispatch, getSta
 
         if (isReqOk(response.status)) {
           addTemplate(page.templateId)(dispatch);
-          setRootEditorID(dispatch, getState);
+          setRootEditorID(dispatch);
           generatePageContent(page, dispatch, getState);
           dispatch(setCurrentPageName(page.title));
           dispatch(setCurrentPageID(page.id));

package/src/modules/Categories/CategoriesList/CategoryItem/index.tsx

@@ -1,11 +1,12 @@
-import React from "react";
+import React, { useState } from "react";
 import { connect } from "react-redux";
 
 import { structuredDataActions } from "@ax/containers/StructuredData";
 import { useModal } from "@ax/hooks";
-import { IStructuredDataContent, ICategory, ICheck } from "@ax/types";
+import { IStructuredDataContent, ICategory, ICheck, IDataLanguage } from "@ax/types";
 import { CheckField, FloatingMenu, Flag, LanguageMenu } from "@ax/components";
 import CategoryPanel from "../CategoryPanel";
+import { DeleteModal } from "../atoms";
 
 import * as S from "./style";
 
@@ -28,9 +29,12 @@ const CategoryItem = (props: ICategoryItemProps): JSX.Element => {
   } = props;
 
   const { isOpen, toggleModal } = useModal();
+  const { isOpen: isDeleteOpen, toggleModal: toggleDeleteModal } = useModal();
+  const [deleteAllVersions, setDeleteAllVersions] = useState(false);
 
   const { locale } = lang;
   const { dataLanguages, content } = category;
+  const isTranslated = dataLanguages.length > 1;
 
   const handleClick = () => {
     resetCategoryValues();
@@ -40,19 +44,23 @@ const CategoryItem = (props: ICategoryItemProps): JSX.Element => {
 
   const handleOnChange = (value: ICheck) => onChange(value);
 
-  const removeItem = async () =>
-    deleteStructuredDataContent(category.id).then((deleted: boolean) => {
-      if (deleted) {
-        setDeletedItem(category.id);
-        toggleToast();
-      }
-    });
+  const removeItem = async () => {
+    const allPageVersions = dataLanguages.map((lang: IDataLanguage) => lang.id);
+    const catIds = deleteAllVersions ? allPageVersions : category.id;
+    const deleted = await deleteStructuredDataContent(catIds);
+
+    if (deleted) {
+      setDeletedItem(catIds);
+      isDeleteOpen && toggleDeleteModal();
+      toggleToast();
+    }
+  };
 
   const menuOptions = [
     {
       label: "delete",
       icon: "delete",
-      action: removeItem,
+      action: isTranslated ? toggleDeleteModal : removeItem,
     },
   ];
 
@@ -122,6 +130,13 @@ const CategoryItem = (props: ICategoryItemProps): JSX.Element => {
     "Not translatable"
   );
 
+  const mainDeleteModalAction = {
+    title: "Delete category",
+    onClick: removeItem,
+  };
+
+  const secondaryDeleteModalAction = { title: "Cancel", onClick: toggleDeleteModal };
+
   return (
     <>
       <S.CategoryRow role="rowgroup" selected={isSelected}>
@@ -140,6 +155,15 @@ const CategoryItem = (props: ICategoryItemProps): JSX.Element => {
         </S.ActionsCell>
       </S.CategoryRow>
       <CategoryPanel isOpen={isOpen} toggleModal={toggleModal} item={category} getContents={getContents} />
+      {isDeleteOpen && (
+        <DeleteModal
+          isOpen={isDeleteOpen}
+          toggleModal={toggleDeleteModal}
+          mainModalAction={mainDeleteModalAction}
+          secondaryModalAction={secondaryDeleteModalAction}
+          {...{ deleteAllVersions, setDeleteAllVersions, title: category.title }}
+        />
+      )}
     </>
   );
 };
@@ -152,13 +176,13 @@ interface IProps {
   isSelected: boolean;
   onChange: (e: any) => void;
   toggleToast(): void;
-  setDeletedItem(item: number): void;
+  setDeletedItem(item: number | number[]): void;
   getContents(dataId: string): void;
 }
 
 interface IDispatchProps {
   setCategoryValues(value: ICategory): void;
-  deleteStructuredDataContent(id: number): Promise<boolean>;
+  deleteStructuredDataContent(id: number | number[]): Promise<boolean>;
   resetCategoryValues(): void;
   setEntity(entity: string): void;
   getTranslatedCategory(id: number, lang: { locale: string; id: number }): any;

package/src/modules/Categories/CategoriesList/atoms.tsx

@@ -0,0 +1,59 @@
+import React from "react";
+
+import { IModal } from "@ax/types";
+import { Modal, FieldsBehavior } from "@ax/components";
+
+import * as S from "./style";
+
+const DeleteModal = (props: IDeleteModal): JSX.Element => {
+  const { isOpen, toggleModal, mainModalAction, secondaryModalAction, deleteAllVersions, setDeleteAllVersions, title } =
+    props;
+
+  const options = [
+    {
+      title: "Delete only this version",
+      name: "deletePage",
+      value: false,
+    },
+    {
+      title: "Delete all languages versions",
+      name: "deleteAll",
+      value: true,
+    },
+  ];
+
+  const categoryTitle = title ? <strong>{title}</strong> : "this";
+
+  return (
+    <Modal
+      isOpen={isOpen}
+      hide={toggleModal}
+      title="Delete Category?"
+      secondaryAction={secondaryModalAction}
+      mainAction={mainModalAction}
+      size="S"
+    >
+      <S.ModalContent>
+        <p>
+          You are going to delete {categoryTitle} category that have some translations associated. Choose if you want to
+          delete all languages versions or only this one.
+        </p>
+        <FieldsBehavior
+          name="removeAllVersions"
+          fieldType="RadioGroup"
+          value={deleteAllVersions}
+          options={options}
+          onChange={setDeleteAllVersions}
+        />
+      </S.ModalContent>
+    </Modal>
+  );
+};
+
+interface IDeleteModal extends IModal {
+  deleteAllVersions: boolean;
+  setDeleteAllVersions: React.Dispatch<React.SetStateAction<boolean>>;
+  title?: string;
+}
+
+export { DeleteModal };

package/src/modules/Categories/CategoriesList/index.tsx

@@ -7,6 +7,8 @@ import { IRootState, IStructuredData, IStructuredDataContent, IGetStructuredData
 import { useBulkSelection, useModal, useToast } from "@ax/hooks";
 import { MainWrapper, TableList, ErrorToast, Toast, EmptyState } from "@ax/components";
 
+import { DeleteModal } from "./atoms";
+import { getAllLangCategoriesIds } from "./utils";
 import CategoryItem from "./CategoryItem";
 import CategoryPanel from "./CategoryPanel";
 import CategoryNav from "./CategoryNav";
@@ -39,7 +41,9 @@ const CategoriesList = (props: IProps): JSX.Element => {
   const [page, setPage] = useState(1);
   const [isScrolling, setIsScrolling] = useState(false);
   const [deletedItem, setDeletedItem] = useState<number | number[] | null>(null);
+  const [deleteAllVersions, setDeleteAllVersions] = useState(false);
   const { isVisible, toggleToast, setIsVisible } = useToast();
+  const { isOpen: isDeleteOpen, toggleModal: toggleDeleteModal } = useModal();
   const tableRef = useRef<HTMLDivElement>(null);
 
   const scope = currentSiteID ? "site" : "global";
@@ -104,13 +108,22 @@ const CategoriesList = (props: IProps): JSX.Element => {
     action: openModal,
   };
 
-  const bulkDelete = () =>
-    deleteDataContent(selectedItems.all).then((deleted: boolean) => {
-      if (deleted) {
-        setDeletedItem(selectedItems.all);
-        toggleToast();
-      }
-    });
+  const bulkDelete = async () => {
+    const idsToBeDeleted = getAllLangCategoriesIds(currentDataContent, selectedItems, deleteAllVersions);
+    const deleted = await deleteDataContent(idsToBeDeleted);
+    if (deleted) {
+      unselectAllItems();
+      setDeletedItem(idsToBeDeleted);
+      isDeleteOpen && toggleDeleteModal();
+      toggleToast();
+    }
+  };
+
+  const handleToggleDeleteModal = () => {
+    const selectedCategories = currentDataContent.filter((category) => selectedItems.all.includes(category.id));
+    const hasTranslations = selectedCategories.some((category) => category.dataLanguages.length > 1);
+    hasTranslations ? toggleDeleteModal() : bulkDelete();
+  };
 
   const unselectAllItems = () => resetBulkSelection();
 
@@ -136,7 +149,7 @@ const CategoriesList = (props: IProps): JSX.Element => {
   const TableHeader = (
     <BulkHeader
       showBulk={areItemsSelected(catIds)}
-      bulkDelete={bulkDelete}
+      bulkDelete={handleToggleDeleteModal}
       selectAllItems={handleSelectAll}
       totalItems={totalItems}
       selectItems={selectItems}
@@ -171,6 +184,13 @@ const CategoriesList = (props: IProps): JSX.Element => {
     action: hasCategories ? openModal : () => setHistoryPush("/sites/settings/content-types"),
   };
 
+  const mainDeleteModalAction = {
+    title: "Delete categories",
+    onClick: bulkDelete,
+  };
+
+  const secondaryDeleteModalAction = { title: "Cancel", onClick: toggleDeleteModal };
+
   return (
     <MainWrapper
       title="Categories"
@@ -224,6 +244,13 @@ const CategoriesList = (props: IProps): JSX.Element => {
         </S.TableWrapper>
       </S.CategoryListWrapper>
       <CategoryPanel isOpen={isOpen} toggleModal={toggleModal} getContents={getContents} />
+      {isDeleteOpen && <DeleteModal
+        isOpen={isDeleteOpen}
+        toggleModal={toggleDeleteModal}
+        mainModalAction={mainDeleteModalAction}
+        secondaryModalAction={secondaryDeleteModalAction}
+        {...{ deleteAllVersions, setDeleteAllVersions }}
+      />}
       {isVisible && <Toast {...toastProps} />}
     </MainWrapper>
   );

package/src/modules/Categories/CategoriesList/style.tsx

@@ -19,4 +19,12 @@ const EmptyWrapper = styled.div`
   align-items: center;
 `;
 
-export { CategoryListWrapper, TableWrapper, EmptyWrapper };
+const ModalContent = styled.div`
+  padding: ${(p) => p.theme.spacing.m};
+
+  p {
+    margin-bottom: ${(p) => p.theme.spacing.m};
+  }
+`;
+
+export { CategoryListWrapper, TableWrapper, EmptyWrapper, ModalContent };

package/src/modules/Categories/CategoriesList/utils.tsx

@@ -0,0 +1,20 @@
+import { IDataLanguage, IStructuredDataContent } from "@ax/types";
+
+const getAllLangCategoriesIds = (
+  currentCategories: IStructuredDataContent[],
+  selectedItems: Record<string, number[]>,
+  getAllVersions: boolean
+): number[] => {
+  let langsCategoryIds: number[] = [];
+  if (getAllVersions) {
+    const selectedCategories = currentCategories.filter((category) => selectedItems.all.includes(category.id));
+    langsCategoryIds = selectedCategories.reduce((ids: number[], category: IStructuredDataContent) => {
+      const langsCategoryIds = category.dataLanguages.map((lang: IDataLanguage) => lang.id);
+      return [...ids, ...langsCategoryIds];
+    }, []);
+  }
+
+  return langsCategoryIds.length ? langsCategoryIds : selectedItems.all;
+};
+
+export { getAllLangCategoriesIds }

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

@@ -176,7 +176,7 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
 
   const handleDeleteItem = async () => {
     const allPageVersions = pageLanguages.map((lang: IPageLanguage) => lang.pageId);
-    deleteAllVersions ? await deleteBulk(allPageVersions) : await deletePage();
+    deleteAllVersions ? deleteBulk(allPageVersions) : deletePage();
     toggleDeleteModal();
   };
 

package/src/modules/Content/index.tsx

@@ -26,6 +26,7 @@ import { appActions } from "@ax/containers/App";
 import { sitesActions } from "@ax/containers/Sites";
 import { pageEditorActions } from "@ax/containers/PageEditor";
 import { structuredDataActions } from "@ax/containers/StructuredData";
+import { navigationActions } from "@ax/containers/Navigation/Defaults";
 import { INITIAL_TEMPLATE } from "@ax/containers/PageEditor/constants";
 import { dataPacksActions } from "@ax/containers/Settings";
 import {
@@ -104,6 +105,7 @@ const Content = (props: IProps): JSX.Element => {
     contentFilters,
     deleteAndRemoveFromSiteBulk,
     checkUserSession,
+    getDefaults,
   } = props;
 
   if (!currentSiteInfo) {
@@ -282,6 +284,7 @@ const Content = (props: IProps): JSX.Element => {
     resetCurrentSiteErrorPages();
     fetchSitesByLang();
     getIntegrations(currentSiteInfo.id);
+    getDefaults();
     resetForm();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -888,6 +891,7 @@ interface IDispatchProps {
   setContentFilters(contentFilters: Record<string, string> | null): void;
   deleteAndRemoveFromSiteBulk(pageIds: number[], globalPageIds: number[]): Promise<boolean>;
   checkUserSession(): Promise<void>;
+  getDefaults(): Promise<void>;
 }
 
 const mapDispatchToProps = {
@@ -924,6 +928,7 @@ const mapDispatchToProps = {
   setContentFilters: sitesActions.setContentFilters,
   deleteAndRemoveFromSiteBulk: sitesActions.deleteAndRemoveFromSiteBulk,
   checkUserSession: appActions.checkUserSession,
+  getDefaults: navigationActions.getDefaults,
 };
 
 interface IPagesProps {

package/src/modules/PageEditor/index.tsx

@@ -80,6 +80,7 @@ const PageEditor = (props: IProps) => {
     const handleGetPage = async () => await getPage(pageID);
 
     setTab(defaultTab);
+    resetDirty();
     handleGetPage();
 
     if (!pageID) {
@@ -106,12 +107,6 @@ const PageEditor = (props: IProps) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [userEditing]);
 
-  useEffect(() => {
-    getDefaults();
-    resetDirty();
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [lang]);
-
   useEffect(() => {
     if (!errorPagesChecked && !isLoading && editorContent) {
       const pageId = editorContent.id;
@@ -122,6 +117,12 @@ const PageEditor = (props: IProps) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editorContent]);
 
+  const handleGetTranlation = async (pageID: number) => {
+    resetDirty();
+    await getDefaults();
+    await getPage(pageID);
+  }
+
   const setRoute = (path: string) => props.setHistoryPush(path, true);
 
   const removePage = async () => {
@@ -269,7 +270,7 @@ const PageEditor = (props: IProps) => {
   const languageActions = {
     setLanguage,
     createNewTranslation: handleNewTranlation,
-    getContent: getPage,
+    getContent: handleGetTranlation,
   };
 
   const unpublishOption =
@@ -648,7 +649,6 @@ const mapDispatchToProps = {
   setLanguage: appActions.setLanguage,
   createNewTranslation: pageEditorActions.createNewTranslation,
   setTab: pageEditorActions.setTab,
-  getSiteDefaults: navigationActions.getSiteDefaults,
   getSiteDataPackbyTemplate: dataPacksActions.getSiteDataPackbyTemplate,
   getSiteDataPackbyModule: dataPacksActions.getSiteDataPackbyModule,
   getDefaults: navigationActions.getDefaults,
@@ -668,10 +668,9 @@ interface IPageEditorDispatchProps {
   setLanguage?(lang: { locale: string; id: number | null }): void;
   createNewTranslation?(isNewTranslation: boolean): void;
   setTab(tab: string): void;
-  getSiteDefaults(): void;
   getSiteDataPackbyTemplate(templateType: string): void;
   getSiteDataPackbyModule(module: string): void;
-  getDefaults(): void;
+  getDefaults(): Promise<void>;
   setSelectedContent(editorID: number): Promise<void>;
   sendPagePing(pageID: number): Promise<boolean>;
   discardDraft(): Promise<void>;