@griddo/ax 1.62.5 → 1.62.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "1.62.5",
+  "version": "1.62.8",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -244,5 +244,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d4be19767faaf8863532465cf19844f17ef38bcc"
+  "gitHead": "f2c87c6b1fcba0fd6042c269efb4673299800d0d"
 }

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

@@ -230,7 +230,8 @@ function createNavigation(): (dispatch: Dispatch, getState: any) => Promise<bool
       const cleanValues = removeEditorIds(navigationValues);
 
       const successAction = async (response: any) => {
-        generateContent(response, dispatch, getState);
+        const updatedContent = { ...editorContent, ...response };
+        generateContent(updatedContent, dispatch, getState);
         dispatch(setIsNewTranslation(false));
       };
 

package/src/helpers/schemas.tsx

@@ -8,17 +8,23 @@ const allSChemas = { ...schemas.all, ...pageSchemas };
 const getSchema = (name: string) => allSChemas[name];
 const getDefaultSchema = (name: string) => allSChemas[name].default;
 
-const getSchemaThumbnails = (name: string, theme?: string) =>
-  theme && allSChemas[name].thumbnails[theme] ? allSChemas[name].thumbnails[theme] : allSChemas[name].thumbnails;
+const getSchemaThumbnails = (name: string, theme?: string) => {
+  if (!allSChemas[name].thumbnails) return null;
+
+  return theme && allSChemas[name].thumbnails[theme] ? allSChemas[name].thumbnails[theme] : allSChemas[name].thumbnails;
+};
 
 const getTemplate = (name: string) => schemas.templates[name];
 
 const getDefaultTemplate = (name: string) => schemas.templates[name].default;
 
-const getTemplateThumbnails = (name: string, theme?: string) =>
-  theme && schemas.templates[name].thumbnails[theme]
+const getTemplateThumbnails = (name: string, theme?: string) => {
+  if (!schemas.templates[name].thumbnails) return null;
+
+  return theme && schemas.templates[name].thumbnails[theme]
     ? schemas.templates[name].thumbnails[theme]
     : schemas.templates[name] && schemas.templates[name].thumbnails;
+};
 
 const getDataPackSchema = (name: string) => schemas.dataPacks[name];
 

package/src/hooks/forms.tsx

@@ -89,7 +89,6 @@ const useIsDirty = (
   const [isResetting, setIsResetting] = useState(false);
 
   const prevContent = usePrevious(updatedValues, isSaved);
-  const isTranslatedVersion: boolean = prevContent?.language !== updatedValues?.language;
 
   const hasChanged = () => {
     if (prevContent && updatedValues) {
@@ -98,7 +97,7 @@ const useIsDirty = (
 
       const { cleanUpdatedValues, cleanOriginalValues } = cleanPageValues(updatedValuesCloned, originalValuesCloned);
 
-      const hasChanged = !isTranslatedVersion && !isEqual(cleanUpdatedValues, cleanOriginalValues);
+      const hasChanged = !isEqual(cleanUpdatedValues, cleanOriginalValues);
 
       return hasChanged;
     }

package/src/modules/GlobalEditor/index.tsx

@@ -72,6 +72,11 @@ const GlobalEditor = (props: IProps) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  useEffect(() => {
+    resetDirty();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [lang]);
+
   useEffect(() => {
     const { pageID, sendPagePing, currentUserID } = props;
     if (userEditing && userEditing.id !== currentUserID) {

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

@@ -31,15 +31,12 @@ const DefaultsEditor = (props: IProps) => {
     setHeader,
     setFooter,
     setHistoryPush,
-    header,
-    footer,
   } = props;
 
   const { isOpen, toggleModal } = useModal();
   const { isDirty, setIsDirty, resetDirty } = useIsDirty(editorContent, isNewTranslation);
-
   const currentDefaultNav = currentDefaultsContent.find((item: any) => item.setAsDefault);
-  const isNew = !header && !footer;
+  const isNew = !editorContent?.id || null;
   const isSetAsDefault = editorContent && editorContent.setAsDefault;
 
   useEffect(() => {
@@ -50,6 +47,11 @@ const DefaultsEditor = (props: IProps) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  useEffect(() => {
+    resetDirty();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [lang]);
+
   const save = () => {
     isNew || isNewTranslation
       ? createNavigation().then((isSaved: boolean) => {
@@ -76,8 +78,8 @@ const DefaultsEditor = (props: IProps) => {
   };
 
   const rightButtonProps = {
-    label: !isDirty ? "Saved" : isSaving ? "Saving" : "Save",
-    disabled: isSaving || !isDirty,
+    label: !isDirty && !isNewTranslation && !isNew ? "Saved" : isSaving ? "Saving" : "Save",
+    disabled: (!isDirty && !isNewTranslation && !isNew) || isSaving,
     action: () => saveButtonAction(),
   };
 
@@ -88,7 +90,7 @@ const DefaultsEditor = (props: IProps) => {
   };
 
   const createNewTranslation = (isNewTranslation: boolean) => {
-    setIsDirty(false);
+    setIsDirty(true);
     createTranslation(isNewTranslation);
   };
 

package/src/modules/PageEditor/index.tsx

@@ -89,6 +89,7 @@ const PageEditor = (props: IProps) => {
 
   useEffect(() => {
     getDefaults();
+    resetDirty();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [lang]);