@griddo/ax 1.67.8 → 1.68.0

package/src/modules/GlobalEditor/index.tsx

@@ -127,7 +127,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 = {
@@ -147,7 +147,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 = {
@@ -176,13 +176,13 @@ const GlobalEditor = (props: IProps) => {
 
   const reviewPage = () => {
     const { validatePage } = props;
-    validatePage(undefined, browserRef);
+    validatePage(undefined);
   };
 
   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);
@@ -307,6 +307,8 @@ const GlobalEditor = (props: IProps) => {
     setTab(tab);
   };
 
+  const goToPackage = () => setHistoryPush("/sites/settings/content-types", false);
+
   const modalText = (
     <>
       Some content <strong>is not saved</strong> on this page.
@@ -425,7 +427,7 @@ const GlobalEditor = (props: IProps) => {
         currentPageID={pageID}
         fullWidth={true}
         errors={errors}
-        errorActions={{ goToError }}
+        errorActions={{ goToError, goToPackage }}
         inversed={true}
         isFromEditor={true}
         pageStatusActions={pageStatusActions}
@@ -583,7 +585,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/GlobalEditor/style.tsx

@@ -11,7 +11,7 @@ const NotificationWrapper = styled.div`
   top: ${(p) => `calc(${p.theme.spacing.s} * 4)`};
   left: 0;
   right: 0;
-  z-index: 2;
+  z-index: 3;
 `;
 
 const ModalContent = styled.div`

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

@@ -10,7 +10,6 @@ const DefaultsBrowser = (props: IProps) => {
     socials,
     cloudinaryName,
     content,
-    selectedEditorID,
     setSelectedContent,
     currentSiteInfo: { theme, id: siteID },
     siteLangs,
@@ -23,7 +22,6 @@ const DefaultsBrowser = (props: IProps) => {
       isPage={false}
       socials={socials}
       content={updatedContent}
-      selectedEditorID={selectedEditorID}
       setSelectedContent={setSelectedContent}
       url={content.slug}
       theme={theme}
@@ -37,7 +35,6 @@ const DefaultsBrowser = (props: IProps) => {
 interface IEditorStateProps {
   // TODO: Define content Type
   content: any;
-  selectedEditorID: number;
   currentSiteInfo: any;
   socials: ISocialState;
   cloudinaryName: string | null;
@@ -52,7 +49,6 @@ type IProps = IEditorStateProps & IPageBrowserDispatchProps;
 
 const mapStateToProps = (state: IRootState): IEditorStateProps => ({
   content: { ...state.navigation.editorContent },
-  selectedEditorID: state.navigation.selectedEditorID as number,
   currentSiteInfo: state.sites.currentSiteInfo,
   socials: state.social,
   cloudinaryName: state.app.globalSettings.cloudinaryName,

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

@@ -37,7 +37,8 @@ const DefaultsEditor = (props: IProps) => {
   const { isOpen, toggleModal } = useModal();
   const { isDirty, setIsDirty, resetDirty } = useIsDirty(editorContent, isNewTranslation);
   const currentDefaultNav = currentDefaultsContent.find((item: any) => item.setAsDefault);
-  const isNew = !editorContent?.id || null;
+  const isNew = !editorContent?.id;
+
   const isSetAsDefault = editorContent && editorContent.setAsDefault;
 
   useEffect(() => {
@@ -85,7 +86,7 @@ const DefaultsEditor = (props: IProps) => {
   const saveButtonAction = () => {
     const isCurrentDefault = currentDefaultNav && currentDefaultNav.id === editorContent.id;
     const isNewDefault = isNew || !isCurrentDefault;
-    isSetAsDefault && isNewDefault ? toggleModal() : save();
+    isSetAsDefault && isNewDefault && !isNewTranslation ? toggleModal() : save();
   };
 
   const rightButtonProps = {

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

@@ -14,7 +14,6 @@ const PageBrowser = (props: IProps) => {
       header,
       footer,
     },
-    selectedEditorID,
     setSelectedContent,
     currentSiteInfo: { theme, id: siteID },
     siteLangs,
@@ -36,7 +35,6 @@ const PageBrowser = (props: IProps) => {
       header={header}
       footer={footer}
       socials={socials}
-      selectedEditorID={selectedEditorID}
       setSelectedContent={setSelectedContent}
       url={url}
       theme={theme}
@@ -45,6 +43,7 @@ const PageBrowser = (props: IProps) => {
       disabled={disabled}
       siteID={siteID}
       isPreview={isPreview}
+      showIframe={true}
       browserRef={browserRef}
     />
   );
@@ -53,7 +52,6 @@ const PageBrowser = (props: IProps) => {
 interface IEditorStateProps {
   // TODO: Define content Type
   content: any;
-  selectedEditorID: number;
   currentSiteInfo: any;
   socials: ISocialState;
   cloudinaryName: string | null;
@@ -74,7 +72,6 @@ type IProps = IEditorStateProps & IPageBrowserDispatchProps;
 
 const mapStateToProps = (state: IRootState): IEditorStateProps => ({
   content: { ...state.pageEditor.editorContent },
-  selectedEditorID: state.pageEditor.selectedEditorID as number,
   currentSiteInfo: state.sites.currentSiteInfo,
   socials: state.social,
   cloudinaryName: state.app.globalSettings.cloudinaryName,

package/src/modules/PageEditor/index.tsx

@@ -131,7 +131,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 = {
@@ -151,7 +151,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 = {
@@ -180,13 +180,13 @@ const PageEditor = (props: IProps) => {
 
   const reviewPage = () => {
     const { validatePage } = props;
-    validatePage(false, browserRef);
+    validatePage(false);
   };
 
   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);
@@ -482,7 +482,7 @@ const PageEditor = (props: IProps) => {
         currentPageID={pageID}
         fullWidth={true}
         errors={errors}
-        errorActions={{ goToError }}
+        errorActions={{ goToError, goToPackage: handleClickNotification }}
         isFromEditor={true}
         tabs={tabsPreview}
       >
@@ -650,7 +650,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;

package/src/modules/PublicPreview/index.tsx

@@ -1,12 +1,9 @@
 import React, { useEffect, useState } from "react";
 import { useParams } from "react-router-dom";
 
-import * as components from "components";
-import { SiteProvider } from "components";
-import { Preview } from "@griddo/core";
 import { pages } from "@ax/api";
 import { getDefaultTheme, isReqOk } from "@ax/helpers";
-import { Loading } from "@ax/components";
+import { BrowserContent, Loading } from "@ax/components";
 
 import * as S from "./style";
 
@@ -41,43 +38,29 @@ const PublicPreview = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  const API_URL = process.env.REACT_APP_API_ENDPOINT;
-  const PUBLIC_API_URL = process.env.REACT_APP_PUBLIC_API_ENDPOINT;
-
   const globalTheme = getDefaultTheme();
   const theme = state && state.site ? state.siteInfo.theme : globalTheme;
   const socials = state && state.site ? state.siteInfo.socials : [];
   const langs = state && state.site ? state.siteInfo.siteLanguages : [];
 
-  if (isLoading) return <Loading />;
+  if (isLoading || !state) return <Loading />;
 
   return (
-    <SiteProvider
-      cloudinaryCloudName={state && state.cloudinaryName}
-      theme={theme}
-      socials={socials}
-      siteLangs={langs}
-      selectEditorID={0}
-      renderer="editor"
-      apiUrl={API_URL}
-      publicApiUrl={PUBLIC_API_URL}
-      siteId={state && state.site}
-    >
-      <S.Wrapper ref={(ref: any) => ((window as any).browserRef = ref)}>
-        {state && (
-          <Preview
-            isPage={true}
-            apiUrl={API_URL}
-            library={components}
-            content={state}
-            header={state && state.headerContent}
-            footer={state && state.footerContent}
-            languageId={state && state.language}
-            pageLanguages={state && state.pageLanguages}
-          />
-        )}
-      </S.Wrapper>
-    </SiteProvider>
+    <S.Wrapper ref={(ref: any) => ((window as any).browserRef = ref)}>
+      <BrowserContent
+        cloudinaryName={state && state.cloudinaryName}
+        theme={theme}
+        socials={socials}
+        siteLangs={langs}
+        siteID={state && state.site}
+        isPage={true}
+        content={state}
+        header={state && state.headerContent}
+        footer={state && state.footerContent}
+        languageID={state && state.language}
+        pageLanguages={state && state.pageLanguages}
+      />
+    </S.Wrapper>
   );
 };
 

package/src/modules/PublicPreview/style.tsx

@@ -5,11 +5,9 @@ const Wrapper = styled.div`
   scroll-behavior: smooth;
   height: 100%;
   position: relative;
-
   .headroom {
     position: relative !important;
   }
-
   body.preview:not(&) {
     min-width: 0 !important;
   }

package/src/modules/Settings/ContentTypes/DataPacks/Config/Form/TemplateConfig/TemplateEditor/Editor/TemplateBrowser/index.tsx

@@ -9,7 +9,6 @@ const TemplateBrowser = (props: IProps) => {
     socials,
     cloudinaryName,
     content: { editorContent, header, footer },
-    selectedEditorID,
     currentSiteInfo: { theme, id: siteID },
     siteLangs,
   } = props;
@@ -21,7 +20,6 @@ const TemplateBrowser = (props: IProps) => {
       isPage={true}
       socials={socials}
       content={updatedContent}
-      selectedEditorID={selectedEditorID}
       url=""
       theme={theme}
       cloudinaryName={cloudinaryName}
@@ -35,7 +33,6 @@ const TemplateBrowser = (props: IProps) => {
 
 interface IProps {
   content: any;
-  selectedEditorID: number;
   currentSiteInfo: any;
   socials: ISocialState;
   cloudinaryName: string | null;
@@ -44,7 +41,6 @@ interface IProps {
 
 const mapStateToProps = (state: IRootState): IProps => ({
   content: { ...state.pageEditor.editorContent },
-  selectedEditorID: state.navigation.selectedEditorID as number,
   currentSiteInfo: state.sites.currentSiteInfo,
   socials: state.social,
   cloudinaryName: state.app.globalSettings.cloudinaryName,

package/src/modules/Sites/index.tsx

@@ -49,7 +49,7 @@ const Sites = (props: IProps): JSX.Element => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [token]);
 
-  return isLoading ? <Loading /> : <SitesList sites={sites} />;
+  return isLoading && sites.length === 0 ? <Loading /> : <SitesList sites={sites} />;
 };
 
 const mapStateToProps = (state: IRootState) => ({

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

@@ -22,7 +22,7 @@ const ConnectedField = (props: IProps) => {
   let innerFields: JSX.Element[] = [];
 
   if (isConditional || isArrayGroup) {
-    innerFields = getStructuredDataInnerFields(field.fields, form.content, updateFormValue, theme);
+    innerFields = getStructuredDataInnerFields(field.fields, form.content, updateFormValue, theme, errors);
   }
 
   const fieldProps = {

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

@@ -118,10 +118,12 @@ const Form = (props: IProps) => {
     return form.draft ? "Save" : "Save & publish";
   };
 
+  const handleSaveAndPublish = () => (isNewStructuredData || form.draft ? handleSave(false) : handleSave(true));
+
   const rightButtonProps = {
     label: isSaving ? "Saving" : getSaveLabel(),
     disabled: isSaving || isDisabled,
-    action: handleSave,
+    action: handleSaveAndPublish,
   };
 
   const inversed = !currentSite;

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

@@ -174,6 +174,7 @@ const StructuredDataList = (props: IProps): JSX.Element => {
       include_draft: true,
       query: searchQuery,
       format: "list",
+      relatedFields: true,
     };
 
     return params;

package/src/schemas/pages/GlobalPage.tsx

@@ -11,6 +11,7 @@ export default {
           title: "Title",
           type: "TextField",
           key: "title",
+          mandatory: true,
         },
         {
           title: "Template",

package/src/types/index.tsx

@@ -580,6 +580,7 @@ export interface IErrorItem {
   key: string;
   tab: string;
   template: boolean;
+  hasDeactivatedPackage?: boolean;
 }
 
 export interface IStructuredDataFilter {