@gisce/react-ooui 1.2.0-rc.66 → 1.2.0-rc.68

package/dist/widgets/custom/Tag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Tag.d.ts","sourceRoot":"","sources":["Tag.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAKtC,eAAO,MAAM,GAAG,UAAW,WAAW,gBAMrC,CAAC;AAEF,eAAO,MAAM,QAAQ,oCASpB,CAAA"}
+{"version":3,"file":"Tag.d.ts","sourceRoot":"","sources":["Tag.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAItC,eAAO,MAAM,GAAG,UAAW,WAAW,gBAMrC,CAAC;AAEF,eAAO,MAAM,QAAQ,UAAW,GAAG,uBASlC,CAAA"}

package/dist/widgets/views/Graph/GraphDefaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GraphDefaults.d.ts","sourceRoot":"","sources":["GraphDefaults.ts"],"names":[],"mappings":"AAiCA,QAAA,MAAM,mBAAmB;;;;;;mCAvBK,GAAG;;;;;mCAAH,GAAG;;;;;;;;gCATf,GAAG;;;;;;;;;;;;mCA4DQ,GAAG;;;;;;;;;;;gCA5Dd,GAAG;;;;;;;;;;;;;;;;gCAAH,GAAG;;;;;;;mCASS,GAAG;;;;;mCAAH,GAAG;;;;;;;;;;CAwGhC,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"GraphDefaults.d.ts","sourceRoot":"","sources":["GraphDefaults.ts"],"names":[],"mappings":"AA2CA,QAAA,MAAM,mBAAmB;;;;;;mCA/BK,GAAG;;;;;mCAAH,GAAG;;;;;;;;gCATf,GAAG;;;;;;;;;;;;mCAoEQ,GAAG;;;;;;;;;;;gCApEd,GAAG;;;;;;;;;;;;;;;;gCAAH,GAAG;;;;;;;mCASS,GAAG;;;;;mCAAH,GAAG;;;;;;;;;;CAgHhC,CAAC;AA6CF,eAAe,mBAAmB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.2.0-rc.66",
+  "version": "1.2.0-rc.68",
   "files": [
     "dist",
     "src",
@@ -27,17 +27,17 @@
     "prerelease": "npm version prerelease --preid rc",
     "prepatch": "npm version prepatch --preid rc",
     "premajor": "npm version premajor --preid rc",
-    "start": "while :; do vite build --watch --force; done",
+    "start": "while :; do tsc && vite build --watch --force; done",
     "build:tailwind": "postcss src/tailwind.css -o src/tailwind.generated.css",
-    "build": "vite build",
+    "build": "tsc && vite build",
     "test": "jest",
     "storybook": "start-storybook -p 6006",
     "build-storybook": "build-storybook"
   },
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
-    "@gisce/ooui": "^0.19.1",
-    "@gisce/react-formiga-components": "^1.0.9-rc.19",
+    "@gisce/ooui": "^0.19.2-rc.1",
+    "@gisce/react-formiga-components": "^1.0.9-rc.20",
     "@gisce/react-formiga-table": "^0.5.0",
     "@monaco-editor/react": "^4.4.5",
     "@tabler/icons-react": "^2.11.0",

package/src/hooks/useExport.ts

@@ -3,7 +3,7 @@ import {
   ExportOptions,
   PredefinedExport,
   PredefinedExportField,
-} from "@/../../react-formiga-components/dist/components/other/ExportModal/ExportModal.types";
+} from "@gisce/react-formiga-components";
 import { useCallback, useRef } from "react";
 import { ConnectionProvider } from "..";
 import showInfo from "@/ui/InfoDialog";
@@ -161,7 +161,7 @@ export const useExport = ({
 
       // We create the lines
       await Promise.all(
-        pExport.fields.map(async (field) => {
+        pExport.fields.map(async (field: any) => {
           return await ConnectionProvider.getHandler().create({
             model: "ir.exports.line",
             values: {
@@ -367,7 +367,8 @@ const retrieveKeyFieldsForPredefinedExports = async ({
   onGetFieldChilds: (key: string) => Promise<ExportField[]>;
 }) => {
   const allPredefinedExportKeys = predefinedExports.flatMap(
-    (exp: PredefinedExport) => exp.fields.map((field) => field.key)
+    (exp: PredefinedExport) =>
+      exp.fields.map((field: any) => field.key)
   );
 
   const keysWithoutChildsInFields = getKeysWithoutChildsInFields({

package/src/widgets/custom/Tag.tsx

@@ -1,9 +1,9 @@
+import React from "react";
 import Field from "@/common/Field";
 import { WidgetProps } from "@/types";
 import { Tag as AntdTag } from 'antd';
 import { colorFromString } from "@/helpers/formHelper";
 
-
 export const Tag = (props: WidgetProps) => {
   return (
     <Field {...props}>
@@ -12,7 +12,7 @@ export const Tag = (props: WidgetProps) => {
   );
 };
 
-export const TagInput = (props) => {
+export const TagInput = (props: any) => {
   const {ooui, value} = props;
   if (!value) {
     return null

package/src/widgets/views/Graph/GraphDefaults.ts

@@ -1,3 +1,5 @@
+import moment from "moment";
+
 const formatter = (graphType: "pie" | "default" | "barGrouped") => {
   return (object: any) => {
     const formattedValue = object.value.toLocaleString("es-ES", {
@@ -17,6 +19,14 @@ const axisFormatter = (value: any) => {
     return value.toLocaleString("es-ES", {
       useGrouping: true,
     });
+  } else if (isValidDateString(value)) {
+    const dateType = getDateType(value);
+    if (dateType === null) {
+      return value;
+    }
+    return moment(value, (dateFormats.input as any)[dateType]).format(
+      (dateFormats.output as any)[dateType]
+    );
   } else {
     return value;
   }
@@ -114,4 +124,47 @@ const DefaultGraphOptions = {
   },
 };
 
+function isValidDateString(variable: any): boolean {
+  // Check if the variable is defined and is a string
+  if (typeof variable !== "string" || variable === undefined) {
+    return false;
+  }
+
+  // Check if the string is a valid date
+  const date = new Date(variable);
+  return date.toString() !== "Invalid Date";
+}
+
+const dateFormats = {
+  input: {
+    hours: "YYYY-MM-DD HH:mm",
+    days: "YYYY-MM-DD",
+    weeks: "YYYY-[W]WW",
+    months: "YYYY-MM",
+    years: "YYYY",
+  },
+  output: {
+    hours: "DD/MM/YYYY HH:mm",
+    days: "DD/MM/YYYY",
+    weeks: "[W]WW/YYYY",
+    months: "MM/YYYY",
+    years: "YYYY",
+  },
+};
+
+function getDateType(dateString: string): string | null {
+  for (const format in dateFormats.input) {
+    const isValidFormat = moment(
+      dateString,
+      (dateFormats.input as any)[format],
+      true
+    ).isValid();
+    if (isValidFormat) {
+      return format;
+    }
+  }
+
+  return null;
+}
+
 export default DefaultGraphOptions;