@griddo/ax 1.57.13 → 1.57.17

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "1.57.13",
+  "version": "1.57.17",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -241,5 +241,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6e011bce3d0578bfa5be5639fecf513689b3e22a"
+  "gitHead": "514381d0a46d139e682ccf1393e65f807eeeb21a"
 }

package/src/api/structuredData.tsx

@@ -147,7 +147,7 @@ const restoreDataContentBulk = (dataContentId: number[]) => {
   return sendRequest(SERVICES.RESTORE_DATA_CONTENT_BULK, { ids: dataContentId });
 };
 
-const getDistributorContent = async (siteID: number, data: any) => {
+const getDistributorContent = async (siteID: number | string, data: any) => {
   const { host, endpoint } = SERVICES.GET_DISTRIBUTOR_CONTENT;
   const [prefix, suffix] = endpoint;
 

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/Fields/ReferenceField/ItemList/index.tsx

@@ -20,7 +20,8 @@ const ItemList = (props: IProps) => {
     };
 
     const getItems = async () => {
-      const response = await structuredData.getDistributorContent(currentSite, params);
+      const siteID = currentSite ? currentSite : "global";
+      const response = await structuredData.getDistributorContent(siteID, params);
       if (isReqOk(response.status)) {
         setState({ ...context, state: { ...state, selectedItems: response.data } });
       } else {

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;