@griddo/ax 1.57.11 → 1.57.15

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "1.57.11",
+  "version": "1.57.15",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -157,6 +157,9 @@
     "prettier": "^2.3.0",
     "react-test-render": "1.1.2"
   },
+  "resolutions": {
+    "react-error-overlay": "6.0.9"
+  },
   "babel": {
     "presets": [
       "react-app",
@@ -238,5 +241,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c7a31b4c2c40de3d6531425b89e3de1c119f9291"
+  "gitHead": "69e8e17f1eab8b9b3a84c0ce164d20e47d7ed733"
 }

package/src/components/Fields/DateField/index.tsx

@@ -31,7 +31,7 @@ const DateField = (props: IDateFieldProps): JSX.Element => {
   } = props;
 
   const currentDate = new Date();
-  const defaultValue = mandatory ? dateToString(currentDate) : null;
+  const defaultValue = mandatory ? dateToString(currentDate, "yyyy/MM/dd") : null;
   const stringDate = value && typeof value === "number" ? dateToString(new Date(value * 1000)) : value;
 
   const dateValue = stringDate && (isValidDate(stringDate) || isValidDateRange(stringDate)) ? stringDate : defaultValue;
@@ -74,7 +74,7 @@ const DateField = (props: IDateFieldProps): JSX.Element => {
       end: equalRangeDates ? start : end,
     };
 
-    const selectedDate = getStringifyDateRange(start, end);
+    const selectedDate = getStringifyDateRange(start, end, "yyyy/MM/dd");
 
     setDates(rangeDates);
     onChange(selectedDate);

package/src/components/Gallery/GalleryPanel/GalleryDragAndDrop/index.tsx

@@ -8,7 +8,8 @@ import { Icon, DragAndDrop } from "@ax/components";
 import * as S from "./style";
 
 const GalleryDragAndDrop = (props: IProps) => {
-  const { isImageSelected,
+  const {
+    isImageSelected,
     validFormats,
     site,
     allowUpload,
@@ -65,7 +66,7 @@ const GalleryDragAndDrop = (props: IProps) => {
   const handleUploadFile = async (files: Array<any>) => {
     if (files[0]) {
       if (!checkType(files[0].type)) {
-        uploadError("Invalid format");
+        uploadError(true, "Invalid format");
       } else {
         try {
           const newImage = await uploadImage(files[0], site);
@@ -81,6 +82,7 @@ const GalleryDragAndDrop = (props: IProps) => {
 
   const handleTryAgain = () => {
     setInDropZone(false);
+    uploadError(false);
   };
 
   const handleFileClick = () => {
@@ -130,25 +132,14 @@ const GalleryDragAndDrop = (props: IProps) => {
       </S.DragIcon>
       <S.DragTitle>Select an image to see details</S.DragTitle>
     </S.StatusWrapper>
-
   );
 
   return (
     <S.Wrapper hidden={isImageSelected}>
-      <S.DragAndDropWrapper
-        inDropZone={inDropZone}
-        uploading={isUploading}
-        success={isSuccess}
-        error={isError}
-      >
+      <S.DragAndDropWrapper inDropZone={inDropZone} uploading={isUploading} success={isSuccess} error={isError}>
         {allowUpload ? renderDragAndDrop() : renderPlaceholder()}
       </S.DragAndDropWrapper>
-      <S.UploadingWrapper
-        inDropZone={inDropZone}
-        uploading={isUploading}
-        success={isSuccess}
-        error={isError}
-      >
+      <S.UploadingWrapper inDropZone={inDropZone} uploading={isUploading} success={isSuccess} error={isError}>
         <S.StatusWrapper>
           <S.UploadingStatus>
             <S.DragIcon>
@@ -184,9 +175,9 @@ interface IGalleryDragAndDropProps {
   site: number | string;
   allowUpload: boolean;
   refreshImages: () => Promise<void>;
-  isUploading: boolean,
-  isSuccess: boolean,
-  isError: boolean,
+  isUploading: boolean;
+  isSuccess: boolean;
+  isError: boolean;
   errorMsg: string;
 }
 
@@ -200,7 +191,7 @@ const mapStateToProps = (state: IRootState) => ({
 interface IDispatchProps {
   getSiteImages(params: IGetSiteImages): Promise<void>;
   selectImage(item: IImage): void;
-  uploadError: (error: string) => Promise<void>;
+  uploadError: (error: boolean, msg?: string) => Promise<void>;
   uploadImage: (imageFile: File, site: number | string) => Promise<IImage>;
 }
 
@@ -213,4 +204,4 @@ const mapDispatchToProps = {
 
 type IProps = IGalleryDragAndDropProps & IDispatchProps;
 
-export default connect(mapStateToProps, mapDispatchToProps)(memo(GalleryDragAndDrop));
+export default connect(mapStateToProps, mapDispatchToProps)(memo(GalleryDragAndDrop));

package/src/components/Gallery/index.tsx

@@ -17,7 +17,7 @@ const itemsPerPage = 50;
 const firstPage = 1;
 
 const Gallery = (props: IProps): JSX.Element => {
-  const { data, isLoading, getSiteImages, selectImage, getImageSelected, toggleModal, site } = props;
+  const { data, isLoading, getSiteImages, selectImage, getImageSelected, toggleModal, site, uploadError } = props;
 
   const tabs = [];
   if (site) tabs.unshift(...["Local", "Global"]);
@@ -48,6 +48,7 @@ const Gallery = (props: IProps): JSX.Element => {
   pageRef.current = getParams().page;
 
   useEffect(() => {
+    uploadError(false);
     const params = getParams();
     getSiteImages({ ...params, page: firstPage });
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -220,11 +221,13 @@ const mapStateToProps = (state: IRootState) => ({
 interface IDispatchProps {
   getSiteImages(params: IGetSiteImages): Promise<void>;
   selectImage(item: IImage): void;
+  uploadError: (error: boolean, msg?: string) => Promise<void>;
 }
 
 const mapDispatchToProps = {
   getSiteImages: galleryActions.getSiteImages,
   selectImage: galleryActions.selectImage,
+  uploadError: galleryActions.uploadError,
 };
 
 type IProps = IGalleryProps & IDispatchProps;

package/src/components/Modal/style.tsx

@@ -73,6 +73,7 @@ export const ModalHeader = styled.div`
 export const ModalContent = styled.div`
   position: relative;
   flex-grow: 1;
+  overflow: auto;
 `;
 
 export const Title = styled.div`

package/src/containers/Gallery/actions.tsx

@@ -47,8 +47,8 @@ function setUploadSuccess(isSuccess: boolean): ISetUploadSuccess {
   return { type: SET_UPLOAD_SUCCESS, payload: { isUploading: false, isSuccess } };
 }
 
-function setUploadError(errorMsg = ""): ISetUploadError {
-  return { type: SET_UPLOAD_ERROR, payload: { inDropZone: false, isUploading: false, isError: true, errorMsg } };
+function setUploadError(isError: boolean, errorMsg = ""): ISetUploadError {
+  return { type: SET_UPLOAD_ERROR, payload: { inDropZone: false, isUploading: false, isError, errorMsg } };
 }
 
 function getSiteImages(props: IGetSiteImages): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
@@ -110,7 +110,7 @@ function uploadImage(imageFile: File, site: number | string): (dispatch: Dispatc
         // dispatch(setInDropZone(false));
         return { ...result.data, file: image };
       } else {
-        dispatch(setUploadError("Error uploading image"));
+        dispatch(setUploadError(true, "Error uploading image"));
       }
     } catch (e) {
       console.log(e);
@@ -118,9 +118,9 @@ function uploadImage(imageFile: File, site: number | string): (dispatch: Dispatc
   };
 }
 
-function uploadError(error: string): (dispatch: Dispatch) => Promise<void> {
+function uploadError(error: boolean, msg?: string): (dispatch: Dispatch) => Promise<void> {
   return async (dispatch) => {
-    dispatch(setUploadError(error));
+    dispatch(setUploadError(error, msg));
   };
 }
 

package/src/helpers/dates.tsx

@@ -2,13 +2,20 @@ import { format, formatDistanceToNowStrict, addMinutes, isValid, parse } from "d
 
 const formatString = "dd/MM/yyyy";
 
-const dateToString = (date: Date): string => format(new Date(date), formatString);
-const stringToDate = (value: string): Date => parse(value, formatString, new Date());
+const dateToString = (date: Date, formatDate = formatString): string => format(new Date(date), formatDate);
+
+const stringToDate = (value: string): Date => {
+  const regEx = /^[0-9]{4}[\/][0-9]{2}[\/][0-9]{2}$/g;
+  const isInversed = regEx.test(value);
+  const formatDate = isInversed ? "yyyy/MM/dd" : "dd/MM/yyyy";
+  return parse(value, formatDate, new Date());
+};
 
 const isValidDate = (value: string): boolean => {
   // eslint-disable-next-line
-  const regEx = /^[0-9]{2}[\/][0-9]{2}[\/][0-9]{4}$/g;
-  if (regEx.test(value)) {
+  const regEx = /^[0-9]{4}[\/][0-9]{2}[\/][0-9]{2}$/g;
+  const regEx2 = /^[0-9]{2}[\/][0-9]{2}[\/][0-9]{4}$/g;
+  if (regEx.test(value) || regEx2.test(value)) {
     const date = stringToDate(value);
     return isValid(date);
   }
@@ -39,12 +46,12 @@ const getDateRange = (value: string): { start: Date; end: Date | null } => {
 
 const areEqualDates = (date1: Date, date2: Date): boolean => dateToString(date1) === dateToString(date2);
 
-const getStringifyDateRange = (start: Date, end: Date): string => {
+const getStringifyDateRange = (start: Date, end: Date, formatDate?: string): string => {
   const equalRangeDates = areEqualDates(start, end);
 
   const stringifyDates = {
-    start: start ? dateToString(start) : "",
-    end: end ? dateToString(end) : "",
+    start: start ? dateToString(start, formatDate) : "",
+    end: end ? dateToString(end, formatDate) : "",
   };
 
   return end && !equalRangeDates ? `${stringifyDates.start} - ${stringifyDates.end}` : stringifyDates.start;

package/src/modules/Sites/SitesList/SiteModal/style.tsx

@@ -4,8 +4,9 @@ export const Form = styled.div`
   display: flex;
   height: 100%;
   width: 100%;
-  padding: ${(p) => p.theme.spacing.m};
+  padding: ${(p) => `${p.theme.spacing.m} ${p.theme.spacing.m} 0 ${p.theme.spacing.m}`};
   flex-direction: column;
+  overflow: auto;
 `;
 
 export const FieldsWrapper = styled.div`