@griddo/ax 1.66.4 → 1.66.7

package/src/modules/Content/index.tsx

@@ -15,7 +15,6 @@ import {
   IGetSitePagesParams,
   IColumn,
   ISite,
-  IUser,
 } from "@ax/types";
 import { MainWrapper, Modal, TableList, ErrorToast, Toast, EmptyState, Notification } from "@ax/components";
 import { getFilteredStructuredData, isGlobalStructuredData, isStructuredDataFromPage } from "@ax/helpers";
@@ -84,14 +83,9 @@ const Content = (props: IProps): JSX.Element => {
     resetPageEditor,
     removePageFromSite,
     importPageFromGlobal,
+    restorePage,
     getDataPack,
-    getSitesByLang,
     dataPacks,
-    restorePage,
-    getAvailableDataPacks,
-    sitesByLang,
-    user,
-    setCurrentDataID,
   } = props;
 
   const itemsPerPage = 50;
@@ -112,12 +106,10 @@ const Content = (props: IProps): JSX.Element => {
   const isDataEditable = !isStructuredData || (currentStructuredData && currentStructuredData.editable);
 
   const pagesIds = currentSitePages && currentSitePages.map((page: any) => page.id);
-  const currentSitePagesTemplatesIds = currentSitePages && currentSitePages.map((page: any) => page.templateId);
   const dataIds = currentDataContent && currentDataContent.map((data: any) => data.id);
   const contentIds = isStructuredData ? dataIds : pagesIds;
-  const currentSitesByLang = sitesByLang?.filter(
-    (site) => user?.sites?.includes("all") || user.sites.includes(site.id)
-  );
+  const currentSitePagesTemplatesIds = currentSitePages && currentSitePages.map((page: any) => page.templateId);
+
   const categoryColumns =
     currentStructuredData && currentStructuredData.schema
       ? currentStructuredData.schema.fields.filter((field: any) => field.showList)
@@ -155,7 +147,6 @@ const Content = (props: IProps): JSX.Element => {
   const [deleteAllVersions, setDeleteAllVersions] = useState(false);
   const [arePagesTranslated, setArePagesTranslated] = useState(false);
   const [templateInstanceError, setTemplateInstanceError] = useState({ error: false, templateName: "" });
-  const [pagesTemplatesIds, setPagesTemplatesIds] = useState<any[]>([]);
 
   const {
     resetBulkSelection,
@@ -179,12 +170,6 @@ const Content = (props: IProps): JSX.Element => {
     setIsVisible: setIsVisibleDeletedToast,
   } = useToast();
 
-  const {
-    isVisible: isVisibleCopiedToast,
-    toggleToast: toggleCopiedToast,
-    setIsVisible: setIsVisibleCopiedToast,
-  } = useToast();
-
   const { categoryColors, addCategoryColors } = useCategoryColors();
 
   const getParams = useCallback(() => {
@@ -246,16 +231,11 @@ const Content = (props: IProps): JSX.Element => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [filter]);
 
-  const fetchSitesByLang = async () => await getSitesByLang(lang.id);
-
   useEffect(() => {
     if (!locationState || locationState.isFromEditor !== true) {
       setFilter("unique-pages");
     }
     resetPageEditor();
-    fetchSitesByLang();
-    setCurrentDataID(null);
-    getAvailableDataPacks(null);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
@@ -282,12 +262,6 @@ const Content = (props: IProps): JSX.Element => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isLoading, currentSitePages]);
 
-  useEffect(() => {
-    if (pagesTemplatesIds?.length === 0) {
-      setPagesTemplatesIds(currentSitePagesTemplatesIds);
-    }
-  }, [currentSitePagesTemplatesIds]);
-
   const bulkFilter = (bulkSelection: number[]) => filterByStatus(bulkSelection, currentSitePages);
 
   const handleAddToBulk = (item: ICheck) => addToBulkSelection(item, bulkFilter);
@@ -556,15 +530,13 @@ const Content = (props: IProps): JSX.Element => {
         duplicatePage,
         removePageFromSite,
         languageActions: pageLanguageActions,
+        deleteBulk: deleteCurrentPageBulk,
         getDataPack: getDataPack,
         setTemplateInstanceError,
-        deleteBulk: deleteCurrentPageBulk,
-        toggleCopiedToast,
       };
 
       return (
         <PageItem
-          sites={currentSitesByLang}
           item={item}
           key={pageItem.id}
           functions={pageItemFunctions}
@@ -678,11 +650,6 @@ const Content = (props: IProps): JSX.Element => {
     message: "Page deleted.",
   };
 
-  const copiedToastProps = {
-    setIsVisible: setIsVisibleCopiedToast,
-    message: "1 Page copied to another Site",
-  };
-
   const addNewAction = filter === "unique-pages" || isGlobalPages ? toggleNewModal : addNewData;
 
   return (
@@ -694,74 +661,70 @@ const Content = (props: IProps): JSX.Element => {
       rightButton={{ label: "New", action: addNewAction }}
       searchAction={setSearchQuery}
     >
-      <>
-        <S.ContentListWrapper>
-          <ContentFilters current={filter} dynamicValues={structuredData} resetFilter={resetFilter} />
-          <S.TableWrapper>
-            <ErrorToast />
-            {templateInstanceError.error && (
-              <Notification
-                type="error"
-                text={`There can be only one ${templateInstanceError.templateName} page and you already have it.`}
-              />
+      <S.ContentListWrapper>
+        <ContentFilters current={filter} dynamicValues={structuredData} resetFilter={resetFilter} />
+        <S.TableWrapper>
+          <ErrorToast />
+          {templateInstanceError.error && (
+            <Notification
+              type="error"
+              text={`There can be only one ${templateInstanceError.templateName} page and you already have it.`}
+            />
+          )}
+          <TableList
+            tableHeader={Header}
+            pagination={pagination}
+            onScroll={onScroll}
+            hasFixedHeader={true}
+            tableRef={tableRef}
+          >
+            {!isEmpty ? (
+              content
+            ) : (
+              <S.EmptyWrapper>
+                <EmptyState {...emptyStateProps} />
+              </S.EmptyWrapper>
             )}
-            <TableList
-              tableHeader={Header}
-              pagination={pagination}
-              onScroll={onScroll}
-              hasFixedHeader={true}
-              tableRef={tableRef}
-            >
-              {!isEmpty ? (
-                content
-              ) : (
-                <S.EmptyWrapper>
-                  <EmptyState {...emptyStateProps} />
-                </S.EmptyWrapper>
-              )}
-            </TableList>
-          </S.TableWrapper>
-        </S.ContentListWrapper>
-        <Modal isOpen={isNewOpen} hide={toggleNewModal} size="M" title="New content">
-          <OptionTable
-            selectPage={addTemplate}
-            selectData={addNewStructuredData}
-            filters={options.filters}
-            values={options.values}
-            selectedValue={selectedOption}
-            theme={currentSiteInfo.theme}
-            mainAction={createContentAction}
-            secondaryAction={{ title: "Cancel", onClick: toggleNewModal }}
-          />
-        </Modal>
-        <Modal
-          isOpen={isImporterOpen}
-          hide={toggleImporterModal}
-          size="M"
-          title="New content"
-          mainAction={{ title: "Add Pages", onClick: importPage }}
-          secondaryAction={{ title: "Cancel", onClick: toggleImporterModal }}
-        >
-          <PageImporter structuredData={selectedOptionType} {...{ setPagesToImport }} />
-        </Modal>
-        <DeleteModal
-          isOpen={isDeleteOpen}
-          toggleModal={toggleDeleteModal}
-          mainModalAction={mainDeleteModalAction}
-          secondaryModalAction={secondaryDeleteModalAction}
-          {...{ isTranslated: arePagesTranslated, deleteAllVersions, setDeleteAllVersions }}
+          </TableList>
+        </S.TableWrapper>
+      </S.ContentListWrapper>
+      <Modal isOpen={isNewOpen} hide={toggleNewModal} size="M" title="New content">
+        <OptionTable
+          selectPage={addTemplate}
+          selectData={addNewStructuredData}
+          filters={options.filters}
+          values={options.values}
+          selectedValue={selectedOption}
+          theme={currentSiteInfo.theme}
+          mainAction={createContentAction}
+          secondaryAction={{ title: "Cancel", onClick: toggleNewModal }}
         />
-        {isVisible && <Toast {...toastProps} />}
-        {isVisibleRemovedToast && <Toast {...removedToastProps} />}
-        {isVisibleDeletedToast && <Toast {...deletedToastProps} />}
-        {isVisibleCopiedToast && <Toast {...copiedToastProps} />}
-      </>
+      </Modal>
+      <Modal
+        isOpen={isImporterOpen}
+        hide={toggleImporterModal}
+        size="M"
+        title="New content"
+        mainAction={{ title: "Add Pages", onClick: importPage }}
+        secondaryAction={{ title: "Cancel", onClick: toggleImporterModal }}
+      >
+        <PageImporter structuredData={selectedOptionType} {...{ setPagesToImport }} />
+      </Modal>
+      <DeleteModal
+        isOpen={isDeleteOpen}
+        toggleModal={toggleDeleteModal}
+        mainModalAction={mainDeleteModalAction}
+        secondaryModalAction={secondaryDeleteModalAction}
+        {...{ isTranslated: arePagesTranslated, deleteAllVersions, setDeleteAllVersions }}
+      />
+      {isVisible && <Toast {...toastProps} />}
+      {isVisibleRemovedToast && <Toast {...removedToastProps} />}
+      {isVisibleDeletedToast && <Toast {...deletedToastProps} />}
     </MainWrapper>
   );
 };
 
 const mapStateToProps = (state: IRootState) => ({
-  sitesByLang: state.sites.sitesByLang,
   currentSiteInfo: state.sites.currentSiteInfo,
   currentSitePages: state.sites.currentSitePages,
   filter: state.sites.currentFilter,
@@ -778,7 +741,6 @@ const mapStateToProps = (state: IRootState) => ({
   activatedTemplates: state.dataPacks.templates,
   isLoading: state.app.isLoading,
   dataPacks: state.dataPacks.activated,
-  user: state.users.currentUser,
 });
 
 interface IDispatchProps {
@@ -798,7 +760,7 @@ interface IDispatchProps {
   getStructuredDataContents(params: any, siteID: number): Promise<void>;
   resetForm(): void;
   deleteBulk(ids: any): Promise<boolean>;
-  duplicatePage(pageID: number, data?: any, siteID?: number): Promise<boolean>;
+  duplicatePage(pageID: number, data: any): Promise<void>;
   deleteDataContent(dataID: number[]): Promise<boolean>;
   restoreDataContent(catID: number | number[]): void;
   setFilter(value: string): void;
@@ -806,18 +768,14 @@ interface IDispatchProps {
   resetPageEditor(): Promise<void>;
   removePageFromSite(pageID: number | number[], refresh?: boolean): Promise<boolean>;
   importPageFromGlobal(pageID: number | number[]): Promise<boolean>;
-  getDataPack: (id: string) => Promise<void>;
   restorePage(id: number | number[]): Promise<boolean>;
-  getAvailableDataPacks: (queryParams: string | null) => void;
-  getSitesByLang(language: number): Promise<void>;
-  setCurrentDataID(id: number | null): void;
+  getDataPack: (id: string) => Promise<void>;
 }
 
 const mapDispatchToProps = {
   setHistoryPush: appActions.setHistoryPush,
   setLanguage: appActions.setLanguage,
   getSitePages: sitesActions.getSitePages,
-  getSitesByLang: sitesActions.getSitesByLang,
   setCurrentPageID: pageEditorActions.setCurrentPageID,
   setCurrentPageStatus: pageEditorActions.setCurrentPageStatus,
   setCurrentPageName: pageEditorActions.setCurrentPageName,
@@ -838,10 +796,8 @@ const mapDispatchToProps = {
   resetPageEditor: pageEditorActions.resetPageEditor,
   removePageFromSite: sitesActions.removePageFromSite,
   importPageFromGlobal: sitesActions.importPageFromGlobal,
-  getDataPack: dataPacksActions.getSiteDataPack,
   restorePage: pageEditorActions.restorePage,
-  getAvailableDataPacks: dataPacksActions.getAvailableSiteDataPacks,
-  setCurrentDataID: structuredDataActions.setCurrentDataID,
+  getDataPack: dataPacksActions.getSiteDataPack,
 };
 
 interface IPagesProps {
@@ -863,9 +819,6 @@ interface IPagesProps {
   activatedTemplates: any[];
   isLoading: boolean;
   dataPacks: IDataPack[];
-  sites: ISite[];
-  sitesByLang: ISite[];
-  user: IUser;
 }
 
 type IProps = IPagesProps & IDispatchProps;

package/src/modules/Content/style.tsx

@@ -35,11 +35,4 @@ const ModalContent = styled.div`
   }
 `;
 
-const SelectWrapper = styled.div`
-  & .react-select__control,
-  .react-select__menu {
-    min-width: 100%;
-  }
-`;
-
-export { ContentListWrapper, TableWrapper, PaginationWrapper, EmptyWrapper, ModalContent, SelectWrapper };
+export { ContentListWrapper, TableWrapper, PaginationWrapper, EmptyWrapper, ModalContent };

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

@@ -29,7 +29,6 @@ const Editor = (props: IProps) => {
     copyModule,
     pasteModule,
     theme,
-    browserRef,
     setNotification,
   } = props;
 
@@ -48,7 +47,7 @@ const Editor = (props: IProps) => {
 
   return (
     <ResizePanel
-      leftPanel={<PageBrowser isReadOnly={isReadOnly} theme={theme} browserRef={browserRef} />}
+      leftPanel={<PageBrowser isReadOnly={isReadOnly} theme={theme} />}
       rightPanel={
         <ConfigPanel
           schema={schema}
@@ -100,7 +99,6 @@ interface IPageBrowserDispatchProps {
   isEditable: boolean;
   isReadOnly: boolean;
   theme: string;
-  browserRef: any;
 }
 
 type IProps = IEditorStateProps & IPageBrowserDispatchProps;

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

@@ -18,7 +18,6 @@ const PageBrowser = (props: IProps) => {
     theme,
     isReadOnly,
     isPreview,
-    browserRef,
   } = props;
 
   const slugWithSlash = slug ? (slug.startsWith("/") ? slug : `/${slug}`) : "";
@@ -39,7 +38,6 @@ const PageBrowser = (props: IProps) => {
       disabled={isReadOnly}
       siteID={canonicalSite}
       isPreview={isPreview}
-      browserRef={browserRef}
     />
   );
 };
@@ -62,7 +60,6 @@ interface IPageBrowserDispatchProps {
   theme: string;
   isReadOnly: boolean;
   isPreview?: boolean;
-  browserRef?: any;
 }
 
 type IProps = IEditorStateProps & IPageBrowserDispatchProps;

package/src/modules/GlobalEditor/index.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useRef } from "react";
+import React, { useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { RouteComponentProps } from "react-router-dom";
 
@@ -50,7 +50,6 @@ const GlobalEditor = (props: IProps) => {
   const [selectedTab, setSelectedTab] = useState("edit");
   const [notification, setNotification] = useState<INotification | null>(null);
   const { isDirty, setIsDirty, resetDirty } = useIsDirty(editorContent.editorContent, isNewTranslation);
-  const browserRef = useRef<HTMLDivElement>(null);
 
   const isPublished = props.pageStatus === pageStatus.PUBLISHED || props.pageStatus === pageStatus.UPLOAD_PENDING;
   const isDraft = props.pageStatus === pageStatus.MODIFIED;
@@ -115,7 +114,7 @@ const GlobalEditor = (props: IProps) => {
   const publishPage = async () => {
     const { updatePageStatus, savePage, pageID, validatePage } = props;
 
-    const validated = await validatePage(true, browserRef);
+    const validated = await validatePage(true);
 
     if (validated) {
       const publishPage = {
@@ -135,7 +134,7 @@ const GlobalEditor = (props: IProps) => {
   const publishChanges = async () => {
     const { savePage, validatePage } = props;
 
-    const validated = await validatePage(true, browserRef);
+    const validated = await validatePage(true);
 
     if (validated) {
       const publishPage = {
@@ -164,13 +163,13 @@ const GlobalEditor = (props: IProps) => {
 
   const reviewPage = () => {
     const { validatePage } = props;
-    validatePage(false, browserRef);
+    validatePage();
   };
 
   const handlePublishDraft = async () => {
     const { savePage, validatePage } = props;
 
-    const validated = await validatePage(true, browserRef);
+    const validated = await validatePage(true);
 
     if (validated) {
       const isSaved = await savePage(false, null, true);
@@ -463,7 +462,6 @@ const GlobalEditor = (props: IProps) => {
               isEditable={isEditable}
               isReadOnly={isReadOnly}
               theme={theme}
-              browserRef={browserRef}
               setNotification={setNotification}
             />
           </S.Content>
@@ -569,7 +567,7 @@ interface IPageEditorDispatchProps {
   getPage(pageID?: number, global?: boolean): Promise<void>;
   savePage(createDraft: boolean, publishPage?: any, publishDraft?: boolean): Promise<boolean>;
   deletePage(params?: ISavePageParams): Promise<boolean>;
-  validatePage(publish?: boolean, browserRef?: any): Promise<boolean>;
+  validatePage(publish?: boolean): Promise<boolean>;
   updatePageStatus(id: number[], status: string): Promise<boolean>;
   setHistoryPush(path: string, isEditor: boolean): void;
   setLanguage?(lang: { locale: string; id: number | null }): void;

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

@@ -35,11 +35,10 @@ const Editor = (props: IProps) => {
     isReadOnly,
     userEditing,
     site,
+    lastElementAddedId,
     copyModule,
     pasteModule,
     setNotification,
-    lastElementAddedId,
-    browserRef,
   } = props;
 
   const actions = {
@@ -59,9 +58,7 @@ const Editor = (props: IProps) => {
 
   return (
     <ResizePanel
-      leftPanel={
-        <PageBrowser isTemplateActivated={isTemplateActivated} isReadOnly={isReadOnly} browserRef={browserRef} />
-      }
+      leftPanel={<PageBrowser isTemplateActivated={isTemplateActivated} isReadOnly={isReadOnly} />}
       rightPanel={
         <ConfigPanel
           schema={schema}
@@ -122,7 +119,6 @@ interface IPageBrowserDispatchProps {
   isEditable: boolean;
   pageTitle: string;
   isReadOnly: boolean;
-  browserRef: any;
 }
 
 type IProps = IEditorStateProps & IPageBrowserDispatchProps;

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

@@ -21,7 +21,6 @@ const PageBrowser = (props: IProps) => {
     isTemplateActivated,
     isReadOnly,
     isPreview,
-    browserRef,
   } = props;
 
   const slugWithSlash = slug ? (slug.startsWith("/") ? slug : `/${slug}`) : "";
@@ -45,7 +44,6 @@ const PageBrowser = (props: IProps) => {
       disabled={disabled}
       siteID={siteID}
       isPreview={isPreview}
-      browserRef={browserRef}
     />
   );
 };
@@ -69,7 +67,6 @@ interface IPageBrowserDispatchProps {
   isTemplateActivated: boolean;
   isReadOnly: boolean;
   isPreview?: boolean;
-  browserRef?: any;
 }
 
 type IProps = IEditorStateProps & IPageBrowserDispatchProps;

package/src/modules/PageEditor/index.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useRef } from "react";
+import React, { useEffect, useState } from "react";
 import { connect } from "react-redux";
 import { RouteComponentProps } from "react-router-dom";
 
@@ -10,11 +10,11 @@ import { navigationActions } from "@ax/containers/Navigation";
 import { pageStatus } from "@ax/containers/PageEditor/interfaces";
 import { RouteLeavingGuard } from "@ax/guards";
 import { useIsDirty, useModal } from "@ax/hooks";
-import { isModuleDisabled, getDeactivatedModules } from "@ax/helpers";
+import { isModuleDisabled } from "@ax/helpers";
 import { dataPacksActions } from "@ax/containers/Settings/DataPacks";
+import { DeleteModal } from "./atoms";
 import Editor from "./Editor";
 import Preview from "./Preview";
-import { DeleteModal } from "./atoms";
 
 import * as S from "./style";
 
@@ -46,15 +46,14 @@ const PageEditor = (props: IProps) => {
     isNewTranslation,
   } = props;
 
+  const [deleteAllVersions, setDeleteAllVersions] = useState(false);
   const [isReadOnly, setIsReadOnly] = useState(false);
   const [selectedTab, setSelectedTab] = useState("edit");
-  const [deleteAllVersions, setDeleteAllVersions] = useState(false);
   const [notification, setNotification] = useState<INotification | null>(null);
   const { isDirty, setIsDirty, resetDirty } = useIsDirty(editorContent.editorContent, isNewTranslation);
   const { isOpen, toggleModal } = useModal();
   const { isOpen: isUnpublishOpen, toggleModal: toggleUnpublishModal } = useModal();
   const { isOpen: isDeleteOpen, toggleModal: toggleDeleteModal } = useModal();
-  const browserRef = useRef<HTMLDivElement>(null);
 
   const isGlobal = editorContent.editorContent && editorContent.editorContent.origin === "GLOBAL";
   const isEditable = editorContent.editorContent && editorContent.editorContent.editable;
@@ -62,8 +61,8 @@ const PageEditor = (props: IProps) => {
   const isDraft = props.pageStatus === pageStatus.MODIFIED;
   const hasDraft = editorContent.editorContent && editorContent.editorContent.haveDraftPage;
   const isLivePageChanged = editorContent.editorContent && editorContent.editorContent.liveChanged;
-  const structuredData = editorContent.editorContent ? editorContent.editorContent.structuredData : "";
   const isTranslated = pageLanguages.length > 1;
+  const structuredData = editorContent.editorContent ? editorContent.editorContent.structuredData : "";
 
   useEffect(() => {
     const { pageID, getPage, setTab, sendPagePing } = props;
@@ -119,7 +118,7 @@ const PageEditor = (props: IProps) => {
   const publishPage = async () => {
     const { updatePageStatus, savePage, pageID, validatePage } = props;
 
-    const validated = await validatePage(true, browserRef);
+    const validated = await validatePage(true);
 
     if (validated) {
       const publishPage = {
@@ -139,7 +138,7 @@ const PageEditor = (props: IProps) => {
   const publishChanges = async () => {
     const { savePage, validatePage } = props;
 
-    const validated = await validatePage(true, browserRef);
+    const validated = await validatePage(true);
 
     if (validated) {
       const publishPage = {
@@ -168,13 +167,13 @@ const PageEditor = (props: IProps) => {
 
   const reviewPage = () => {
     const { validatePage } = props;
-    validatePage(false, browserRef);
+    validatePage();
   };
 
   const handlePublishDraft = async () => {
     const { savePage, validatePage } = props;
 
-    const validated = await validatePage(true, browserRef);
+    const validated = await validatePage(true);
 
     if (validated) {
       const isSaved = await savePage(false, null, true);
@@ -296,12 +295,10 @@ const PageEditor = (props: IProps) => {
 
   const goToPages = (path: string) => setRoute(path);
 
-  const goToError = (editorID: number | null, tab: string, template: boolean) => {
+  const goToError = (editorID: number, tab: string, template: boolean) => {
     const realEditorID = template ? 0 : editorID;
-    if (realEditorID !== null) {
-      setSelectedContent(realEditorID);
-      setTab(tab);
-    }
+    setSelectedContent(realEditorID);
+    setTab(tab);
   };
 
   const modalText = (
@@ -312,18 +309,9 @@ const PageEditor = (props: IProps) => {
 
   let isTemplateActivated = true;
   let hasDeactivatedModules = false;
-  let deactivatedModules: string[] = [];
   if (editorContent.editorContent && editorContent.editorContent.template) {
     const editorTemplate = editorContent.editorContent.template;
-    const mainContentModules = editorTemplate?.mainContent?.modules;
-
-    if (mainContentModules) {
-      deactivatedModules = getDeactivatedModules(activatedModules, mainContentModules);
-      hasDeactivatedModules = deactivatedModules.length > 0;
-    } else {
-      hasDeactivatedModules = isModuleDisabled(selectedComponent, schema.schemaType, activatedModules);
-    }
-
+    hasDeactivatedModules = isModuleDisabled(selectedComponent, schema.schemaType, activatedModules);
     isTemplateActivated = activatedTemplates.find((temp: any) => temp.id === editorTemplate.templateType)
       ? true
       : false;
@@ -407,8 +395,7 @@ const PageEditor = (props: IProps) => {
       if (!isTemplateActivated) {
         getSiteDataPackbyTemplate(editorTemplate.templateType);
       } else if (hasDeactivatedModules) {
-        const currentModule = deactivatedModules.length === 1 ? deactivatedModules[0] : selectedComponent;
-        getSiteDataPackbyModule(currentModule);
+        getSiteDataPackbyModule(selectedComponent);
       }
       setHistoryPush("/sites/settings/content-types", false);
     }
@@ -519,7 +506,6 @@ const PageEditor = (props: IProps) => {
               isEditable={isEditable}
               pageTitle={pageName}
               isReadOnly={isReadOnly}
-              browserRef={browserRef}
               setNotification={setNotification}
             />
           </S.Content>
@@ -636,7 +622,7 @@ interface IPageEditorDispatchProps {
   getPage(pageID?: number): Promise<void>;
   savePage(createDraft: boolean, publishPage?: any, publishDraft?: boolean): Promise<boolean>;
   deletePage(params?: ISavePageParams): Promise<boolean>;
-  validatePage(publish?: boolean, browserRef?: any): Promise<boolean>;
+  validatePage(publish?: boolean): Promise<boolean>;
   updatePageStatus(id: number[], status: string): Promise<boolean>;
   setHistoryPush(path: string, isEditor: boolean): void;
   setLanguage?(lang: { locale: string; id: number | null }): void;