@griddo/ax 10.6.19 → 10.6.20

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "10.6.19",
+  "version": "10.6.20",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -233,5 +233,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "92b2da3974ba50064e2c9b33f9b5dc752da7a33e"
+  "gitHead": "12ae17b68dfb1b977eeb213b383aa65da91ab928"
 }

package/src/components/ScheduleModal/index.tsx

@@ -23,7 +23,15 @@ const ScheduleModal = (props: IScheduleModal): JSX.Element => {
     }
   };
 
-  const handleTimeChange = (time: string) => setScheduleDate({ ...scheduleDate, time });
+  const handleTimeChange = (time: string) => {
+    setScheduleDate({ ...scheduleDate, time });
+    const timeArray = time.split(":");
+    if (timeArray[0] === "00") {
+      setError(true);
+    } else {
+      setError(false);
+    }
+  };
 
   const modalAction: any = { ...mainModalAction, disabled: error };
 

package/src/containers/PageEditor/actions.tsx

@@ -350,11 +350,12 @@ function getPage(pageID?: number, global?: boolean): (dispatch: Dispatch, getSta
 
         if (global) page["component"] = component;
 
-        const pageLiveStatus = page.draftFromPage
-          ? pageStatus.MODIFIED
-          : isNewTranslation
-          ? pageStatus.OFFLINE
-          : page.liveStatus.status;
+        const pageLiveStatus =
+          page.draftFromPage && !page.publicationScheduled
+            ? pageStatus.MODIFIED
+            : isNewTranslation
+            ? pageStatus.OFFLINE
+            : page.liveStatus.status;
 
         if (isReqOk(response.status)) {
           addTemplate(page.templateId)(dispatch);
@@ -1460,14 +1461,17 @@ function setIsTranslated(isTranslated: boolean): (dispatch: Dispatch) => Promise
   };
 }
 
-function schedulePublication(date: string | null): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+function schedulePublication(
+  date: string | null,
+  isDraft: boolean
+): (dispatch: Dispatch, getState: any) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
         pageEditor: { editorContent },
       } = getState();
 
-      const status = date ? pageStatus.SCHEDULED : pageStatus.OFFLINE;
+      const status = date ? pageStatus.SCHEDULED : isDraft ? pageStatus.MODIFIED : pageStatus.OFFLINE;
       const updatedEditorContent = { ...editorContent, publicationScheduled: date };
 
       dispatch(setEditorContent(updatedEditorContent));

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

@@ -108,7 +108,7 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
   const API_URL = process.env.REACT_APP_API_ENDPOINT;
   const isPublished = liveStatus.status === pageStatus.PUBLISHED || liveStatus.status === pageStatus.UPLOAD_PENDING;
   const isAllowedToDelete = (isPublished && isAllowedToDeletePublishedPage) || (!isPublished && isAllowedToDeletePage);
-  const isScheduledPub = !!publicationScheduled && liveStatus.status === pageStatus.SCHEDULED;
+  const isScheduledPub = !!publicationScheduled && (liveStatus.status === pageStatus.SCHEDULED || haveDraftPage);
 
   const publishedTooltip: Record<string, string> = {
     active: "Live",
@@ -461,7 +461,7 @@ const PageItem = (props: IPageItemProps): JSX.Element => {
 
   const mainCopyModalAction = { title: "Copy page", onClick: copyToOtherSite, disabled: !site };
 
-  const getLiveStatus = () => (haveDraftPage ? "modified" : liveStatus.status);
+  const getLiveStatus = () => (isScheduledPub ? "scheduled" : haveDraftPage ? "modified" : liveStatus.status);
 
   const mainUnpublishAction = { title: "Ok", onClick: toggleUnpublishModal };
 

package/src/modules/GlobalEditor/index.tsx

@@ -71,13 +71,13 @@ const GlobalEditor = (props: IProps) => {
   const [notification, setNotification] = useState<INotification | null>(null);
   const { isDirty, setIsDirty, resetDirty } = useIsDirty(editorContent, isNewTranslation);
   const [errorPagesChecked, setErrorPagesChecked] = useState(false);
-  const [scheduleDate, setScheduleDate] = useState({ date: "", time: "" });
+  const [scheduleDate, setScheduleDate] = useState({ date: "", time: "12:00 am" });
   const { isOpen: isScheduleOpen, toggleModal: toggleScheduleModal } = useModal();
   const { isOpen: isCancelScheduleOpen, toggleModal: toggleCancelScheduleModal } = useModal();
   const browserRef = useRef<HTMLDivElement>(null);
 
   const isPublished = props.pageStatus === pageStatus.PUBLISHED || props.pageStatus === pageStatus.UPLOAD_PENDING;
-  const isDraft = props.pageStatus === pageStatus.MODIFIED;
+  const isDraft = props.pageStatus === pageStatus.MODIFIED || !!editorContent.draftFromPage;
   const hasDraft: boolean = editorContent && !!editorContent.haveDraftPage;
   const isLivePageChanged = editorContent && editorContent.liveChanged;
   const structuredData = editorContent ? editorContent.structuredData : "";
@@ -245,7 +245,7 @@ const GlobalEditor = (props: IProps) => {
   const handleSchedulePublication = async () => {
     const date = new Date(`${scheduleDate.date} ${scheduleDate.time}`);
     const dateString = dateToString(date, "dd/MM/yyyy HH:mm:ss");
-    const saved = await schedulePublication(dateString);
+    const saved = await schedulePublication(dateString, isDraft);
     if (saved) {
       resetDirty();
       toggleScheduleModal();
@@ -253,9 +253,9 @@ const GlobalEditor = (props: IProps) => {
   };
 
   const handleCancelSchedulePublication = async () => {
-    const saved = await schedulePublication(null);
+    const saved = await schedulePublication(null, isDraft);
     if (saved) {
-      setScheduleDate({ date: "", time: "" });
+      setScheduleDate({ date: "", time: "12:00 am" });
       resetDirty();
       toggleCancelScheduleModal();
     }
@@ -266,7 +266,7 @@ const GlobalEditor = (props: IProps) => {
       case pageStatus.OFFLINE:
       case pageStatus.OFFLINE_PENDING:
         return {
-          label: "Publish",
+          label: status === pageStatus.OFFLINE_PENDING ? "Cancel Unpublishing" : "Publish",
           action: publishPage,
         };
       case pageStatus.PUBLISHED:
@@ -277,13 +277,14 @@ const GlobalEditor = (props: IProps) => {
               action: handleCreateDraft,
             }
           : {
-              label: "Unpublish",
+              label: status === pageStatus.UPLOAD_PENDING ? "Cancel publication" : "Unpublish",
               action: hasDraft ? toggleUnpublishModal : unpublishPage,
             };
       case pageStatus.MODIFIED:
+      case pageStatus.SCHEDULED:
         return {
-          label: "Publish changes",
-          action: handlePublishDraft,
+          label: isDraft ? "Publish changes" : "Publish",
+          action: isDraft ? handlePublishDraft : publishPage,
         };
       default:
         return null;
@@ -303,7 +304,7 @@ const GlobalEditor = (props: IProps) => {
 
   const menuOptions = [];
 
-  if (isAllowedToPublishPages && !isScheduled) {
+  if (isAllowedToPublishPages && !isScheduled && !isPublished && props.pageStatus !== pageStatus.OFFLINE_PENDING) {
     menuOptions.push({
       label: "Schedule",
       icon: "calendar",
@@ -319,7 +320,14 @@ const GlobalEditor = (props: IProps) => {
     });
   }
 
-  if (isAllowedToEditContentPage) {
+  if (
+    isAllowedToEditContentPage &&
+    (props.pageStatus === pageStatus.PUBLISHED ||
+      props.pageStatus === pageStatus.OFFLINE ||
+      props.pageStatus === pageStatus.OFFLINE_PENDING ||
+      props.pageStatus === pageStatus.SCHEDULED ||
+      (isDraft && isDirty))
+  ) {
     menuOptions.push({
       label: "Review",
       icon: "question",
@@ -327,7 +335,7 @@ const GlobalEditor = (props: IProps) => {
     });
   }
 
-  if (isAllowedToEditContentPage && (isDraft || (isPublished && isDirty))) {
+  if (isAllowedToEditContentPage && !isScheduled && (isDraft || (isPublished && isDirty))) {
     menuOptions.push({
       label: "Discard changes",
       icon: "close",
@@ -345,7 +353,7 @@ const GlobalEditor = (props: IProps) => {
 
   if (!isDraft && isAllowedToDeletePage) {
     menuOptions.push({
-      label: "Delete",
+      label: "Delete page",
       icon: "delete",
       action: removePage,
     });
@@ -691,7 +699,7 @@ interface IPageEditorDispatchProps {
   setStructuredDataFilter(filter: string | null): void;
   discardDraft(): Promise<void>;
   getUserCurrentPermissions(): void;
-  schedulePublication(date: string | null): Promise<boolean>;
+  schedulePublication(date: string | null, isDraft: boolean): Promise<boolean>;
 }
 
 type IProps = IPageEditorStateProps & IPageEditorDispatchProps & RouteComponentProps;

package/src/modules/PageEditor/index.tsx

@@ -70,7 +70,7 @@ const PageEditor = (props: IProps) => {
   const [isReadOnly, setIsReadOnly] = useState(false);
   const [selectedTab, setSelectedTab] = useState(defaultTab);
   const [notification, setNotification] = useState<INotification | null>(null);
-  const [scheduleDate, setScheduleDate] = useState({ date: "", time: "" });
+  const [scheduleDate, setScheduleDate] = useState({ date: "", time: "12:00 am" });
   const { isDirty, setIsDirty, resetDirty } = useIsDirty(editorContent, isNewTranslation);
   const { isOpen, toggleModal } = useModal();
   const { isOpen: isUnpublishOpen, toggleModal: toggleUnpublishModal } = useModal();
@@ -83,7 +83,7 @@ const PageEditor = (props: IProps) => {
   const isGlobal = editorContent && editorContent.origin === "GLOBAL";
   const isEditable = editorContent && editorContent.editable;
   const isPublished = props.pageStatus === pageStatus.PUBLISHED || props.pageStatus === pageStatus.UPLOAD_PENDING;
-  const isDraft = props.pageStatus === pageStatus.MODIFIED;
+  const isDraft = props.pageStatus === pageStatus.MODIFIED || !!editorContent.draftFromPage;
   const hasDraft = editorContent && editorContent.haveDraftPage;
   const isLivePageChanged = editorContent && editorContent.liveChanged;
   const isTranslated = pageLanguages.length > 1;
@@ -258,7 +258,7 @@ const PageEditor = (props: IProps) => {
   const handleSchedulePublication = async () => {
     const date = new Date(`${scheduleDate.date} ${scheduleDate.time}`);
     const dateString = dateToString(date, "dd/MM/yyyy HH:mm:ss");
-    const saved = await schedulePublication(dateString);
+    const saved = await schedulePublication(dateString, isDraft);
     if (saved) {
       resetDirty();
       toggleScheduleModal();
@@ -266,9 +266,9 @@ const PageEditor = (props: IProps) => {
   };
 
   const handleCancelSchedulePublication = async () => {
-    const saved = await schedulePublication(null);
+    const saved = await schedulePublication(null, isDraft);
     if (saved) {
-      setScheduleDate({ date: "", time: "" });
+      setScheduleDate({ date: "", time: "12:00 am" });
       resetDirty();
       toggleCancelScheduleModal();
     }
@@ -279,7 +279,7 @@ const PageEditor = (props: IProps) => {
       case pageStatus.OFFLINE:
       case pageStatus.OFFLINE_PENDING:
         return {
-          label: "Publish",
+          label: status === pageStatus.OFFLINE_PENDING ? "Cancel Unpublishing" : "Publish",
           action: publishPage,
         };
       case pageStatus.PUBLISHED:
@@ -290,15 +290,16 @@ const PageEditor = (props: IProps) => {
               action: handleCreateDraft,
             }
           : {
-              label: "Unpublish",
+              label: status === pageStatus.UPLOAD_PENDING ? "Cancel publication" : "Unpublish",
               action: hasDraft ? toggleUnpublishModal : unpublishPage,
               disabled: !canBeUnpublished,
               helpText: deleteHelpText,
             };
       case pageStatus.MODIFIED:
+      case pageStatus.SCHEDULED:
         return {
-          label: "Publish changes",
-          action: handlePublishDraft,
+          label: isDraft ? "Publish changes" : "Publish",
+          action: isDraft ? handlePublishDraft : publishPage,
         };
       default:
         return null;
@@ -318,7 +319,7 @@ const PageEditor = (props: IProps) => {
 
   const menuOptions = [];
 
-  if (isAllowedToPublishPages && !isScheduled) {
+  if (isAllowedToPublishPages && !isScheduled && !isPublished && props.pageStatus !== pageStatus.OFFLINE_PENDING) {
     menuOptions.push({
       label: "Schedule",
       icon: "calendar",
@@ -334,7 +335,14 @@ const PageEditor = (props: IProps) => {
     });
   }
 
-  if (isAllowedToEditContentPage) {
+  if (
+    isAllowedToEditContentPage &&
+    (props.pageStatus === pageStatus.PUBLISHED ||
+      props.pageStatus === pageStatus.OFFLINE ||
+      props.pageStatus === pageStatus.OFFLINE_PENDING ||
+      props.pageStatus === pageStatus.SCHEDULED ||
+      (isDraft && isDirty))
+  ) {
     menuOptions.push({
       label: "Review",
       icon: "question",
@@ -350,7 +358,7 @@ const PageEditor = (props: IProps) => {
     });
   }
 
-  if (isAllowedToEditContentPage && (isDraft || (isPublished && isDirty))) {
+  if (isAllowedToEditContentPage && !isScheduled && (isDraft || (isPublished && isDirty))) {
     menuOptions.push({
       label: "Discard changes",
       icon: "close",
@@ -360,7 +368,7 @@ const PageEditor = (props: IProps) => {
 
   if (!isDraft && isAllowedToDelete) {
     menuOptions.push({
-      label: "Delete",
+      label: "Delete page",
       icon: "delete",
       action: toggleDeleteModal,
     });
@@ -766,7 +774,7 @@ interface IPageEditorDispatchProps {
   sendPagePing(pageID: number): Promise<boolean>;
   discardDraft(): Promise<void>;
   deleteBulk(ids: number[]): Promise<boolean>;
-  schedulePublication(date: string | null): Promise<boolean>;
+  schedulePublication(date: string | null, isDraft: boolean): Promise<boolean>;
 }
 
 type IProps = IPageEditorStateProps & IPageEditorDispatchProps & RouteComponentProps;

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

@@ -44,7 +44,7 @@ const Form = (props: IProps) => {
 
   const [isNewStructuredData, setIsNewStructuredData] = useState(!currentStructuredDataId);
   const [notification, setNotification] = useState<INotification | null>(null);
-  const [scheduleDate, setScheduleDate] = useState({ date: "", time: "" });
+  const [scheduleDate, setScheduleDate] = useState({ date: "", time: "12:00 am" });
   const { isOpen: isScheduleOpen, toggleModal: toggleScheduleModal } = useModal();
   const { isOpen: isCancelScheduleOpen, toggleModal: toggleCancelScheduleModal } = useModal();
   const { isDirty, resetDirty, setIsDirty } = useIsDirty(form);
@@ -264,7 +264,7 @@ const Form = (props: IProps) => {
 
   const handleCancelSchedulePublication = () => {
     handleSave(false, null);
-    setScheduleDate({ date: "", time: "" });
+    setScheduleDate({ date: "", time: "12:00 am" });
     toggleCancelScheduleModal();
   };
 

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

@@ -71,7 +71,8 @@ const GlobalPageItem = (props: IGlobalPageItemProps): JSX.Element => {
   } = globalPage;
 
   const activeColumns = columns.filter((col) => col.show).map((col) => col.id);
-  const isScheduledPub = !!publicationScheduled && liveStatus.status === pageStatus.SCHEDULED;
+  const isScheduledPub =
+    !!publicationScheduled && (liveStatus.status === pageStatus.SCHEDULED || liveStatus.status === pageStatus.MODIFIED);
 
   const initValue = { title: "", slug: "" };
   const [duplicateModalState, setDuplicateModalState] = useState(initValue);
@@ -352,7 +353,7 @@ const GlobalPageItem = (props: IGlobalPageItemProps): JSX.Element => {
 
   const availableSiteNames = availableSites && availableSites.map((site: IAvailableSites) => site.name);
 
-  const getLiveStatus = () => (haveDraftPage ? "modified" : liveStatus.status);
+  const getLiveStatus = () => (isScheduledPub ? "scheduled" : haveDraftPage ? "modified" : liveStatus.status);
 
   const mainUnpublishAction = { title: "Ok", onClick: toggleUnpublishModal };
 

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

@@ -11,6 +11,8 @@ import {
   IDataLanguage,
   IColumn,
   ISite,
+  IStructuredData,
+  ISchemaField,
 } from "@ax/types";
 import { getActivatedDataPacksIds, getHumanLastModifiedDate, getScheduleFormatDate } from "@ax/helpers";
 import { setIsSavedData } from "@ax/forms";
@@ -135,7 +137,9 @@ const StructuredDataItem = (props: IStructuredDataItemProps): JSX.Element => {
   const currentLanguages = getCurrentLanguages();
   const activatedDataPacksIds = getActivatedDataPacksIds(activatedDataPacks);
   const isDisabled =
-    currentStructuredData && currentStructuredData.local && !activatedDataPacksIds.includes(currentStructuredData.id);
+    currentStructuredData &&
+    currentStructuredData.dataPacks[0] &&
+    !activatedDataPacksIds.includes(currentStructuredData.dataPacks[0]);
 
   const availableLanguages = isDisabled || !isAllowedToCreatePages ? currentLanguages : languages;
 
@@ -276,7 +280,7 @@ interface IStructuredDataItemProps {
   structuredData: IStructuredDataContent;
   languages: ILanguage[];
   lang: { locale: string; id: number | null };
-  currentStructuredData: any;
+  currentStructuredData: IStructuredData | null;
   handleClick: () => void;
   updateForm: (form: any) => void;
   setLanguage(lang: { locale: string; id: number | null }): void;
@@ -285,13 +289,13 @@ interface IStructuredDataItemProps {
   getDataContent(id: number, lang: { locale: string; id: number }): void;
   resetForm(): void;
   isSelected: boolean;
-  onChange: (e: any) => void;
+  onChange: (value: ICheck) => void;
   toggleToast(): void;
   setDeletedItem(item: number): void;
   isEditable?: boolean | null;
   activatedDataPacks?: IDataPack[];
   setDataStatus(id: number, status: string): void;
-  categoryColumns: any[];
+  categoryColumns: ISchemaField[];
   columns: IColumn[];
   categoryColors: any;
   addCategoryColors(cats: string[]): void;