@gisce/react-ooui 1.2.0-rc.42 → 1.2.0-rc.44

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

@@ -8,6 +8,12 @@ declare const DefaultGraphOptions: {
             maxWidthRatio: number;
             maxItemWidth: number;
         };
+        tooltip: {
+            formatter: (object: any) => {
+                name: any;
+                value: any;
+            };
+        };
     };
     pie: {
         appendPadding: number;
@@ -25,6 +31,12 @@ declare const DefaultGraphOptions: {
             maxWidthRatio: number;
             maxItemWidth: number;
         };
+        tooltip: {
+            formatter: (object: any) => {
+                name: any;
+                value: any;
+            };
+        };
         interactions: {
             type: string;
         }[];
@@ -35,6 +47,12 @@ declare const DefaultGraphOptions: {
             maxWidthRatio: number;
             maxItemWidth: number;
         };
+        tooltip: {
+            formatter: (object: any) => {
+                name: any;
+                value: any;
+            };
+        };
         label: {
             position: string;
             layout: {

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

@@ -1 +1 @@
-{"version":3,"file":"GraphDefaults.d.ts","sourceRoot":"","sources":["GraphDefaults.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,mBAAmB;;;;;;;;;;;;;;;;;mCAiBI,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqC/B,CAAC;AAEF,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"GraphDefaults.d.ts","sourceRoot":"","sources":["GraphDefaults.ts"],"names":[],"mappings":"AAUA,QAAA,MAAM,mBAAmB;;;;;;;;;;;gCATP,GAAG;;;;;;;;;;;;mCA6BQ,GAAG;;;;;;;;;;;gCA7Bd,GAAG;;;;;;;;;;;;;;;;gCAAH,GAAG;;;;;;;;;;;;CAwEpB,CAAC;AAEF,eAAe,mBAAmB,CAAC"}

package/dist/widgets/views/SearchTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SearchTree.d.ts","sourceRoot":"","sources":["SearchTree.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAKf,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAgBnD,aAAK,gBAAgB,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,aAAK,KAAK,GAAG;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,YAAY,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,uBAAuB,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,KAAK,IAAI,CAAC;CAC1D,CAAC;;AA8SF,wBAAsC"}
+{"version":3,"file":"SearchTree.d.ts","sourceRoot":"","sources":["SearchTree.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAKf,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAgBnD,aAAK,gBAAgB,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC;IACnB,QAAQ,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,aAAK,KAAK,GAAG;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,YAAY,EAAE,CAAC,IAAI,EAAE,gBAAgB,KAAK,IAAI,CAAC;IAC/C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,uBAAuB,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,KAAK,IAAI,CAAC;CAC1D,CAAC;;AA+SF,wBAAsC"}

package/dist/widgets/views/searchFilter/SearchFilter.d.ts

@@ -14,6 +14,7 @@ declare type Props = {
     searchError?: string;
     searchValues?: any;
     showLimitOptions?: boolean;
+    formXml: string;
 };
 declare function SearchFilter(props: Props): JSX.Element;
 export default SearchFilter;

package/dist/widgets/views/searchFilter/SearchFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SearchFilter.d.ts","sourceRoot":"","sources":["SearchFilter.tsx"],"names":[],"mappings":";AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,aAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,iBAAS,YAAY,CAAC,KAAK,EAAE,KAAK,eAmHjC;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"SearchFilter.d.ts","sourceRoot":"","sources":["SearchFilter.tsx"],"names":[],"mappings":";AAYA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAMvC,aAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,YAAY,EAAE,YAAY,CAAC;IAC3B,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,qBAAqB,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IACjD,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,iBAAS,YAAY,CAAC,KAAK,EAAE,KAAK,eAwHjC;AAED,eAAe,YAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.2.0-rc.42",
+  "version": "1.2.0-rc.44",
   "files": [
     "dist",
     "src",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
-    "@gisce/ooui": "^0.17.14-rc.0",
+    "@gisce/ooui": "^0.17.14-rc.1",
     "@gisce/react-formiga-components": "^1.0.9-rc.14",
     "@gisce/react-formiga-table": "^0.5.0",
     "@monaco-editor/react": "^4.4.5",

package/src/helpers/searchHelper.ts

@@ -5,14 +5,14 @@ const convertBooleanParamIfNeeded = (value: any) => {
   return value;
 };
 
-export const getParamsForFields = (values: any, fields: any) => {
+export const getParamsForFields = (values: any, widgetContainer: any) => {
   const filteredValues = removeUndefinedFields(values);
   const groupedDateTime = groupDateTimeValuesIfNeeded(filteredValues);
-  const groupedValues = ungroupDateValuesIfNeeded(groupedDateTime, fields);
+  const groupedValues = ungroupDateValuesIfNeeded(groupedDateTime, widgetContainer);
 
   const params = [
     ...Object.keys(groupedValues).map((key) => {
-      return getParamForField(key, groupedValues[key], fields);
+      return getParamForField(key, groupedValues[key], widgetContainer);
     }),
   ];
 
@@ -27,9 +27,9 @@ export const getParamsForFields = (values: any, fields: any) => {
   return paramsForFields;
 };
 
-const getParamForField = (key: string, value: any, fields: any) => {
+const getParamForField = (key: string, value: any, widgetContainer: any) => {
   const filteredKey = key.split("#")[0];
-  const type = fields[filteredKey].type;
+  const type = widgetContainer.findById(filteredKey)?.type;
 
   if (
     type === "char" ||
@@ -127,9 +127,10 @@ export const groupDateTimeValuesIfNeeded = (values: any) => {
   return newValues;
 };
 
-const ungroupDateValuesIfNeeded = (values: any, fields: any) => {
+const ungroupDateValuesIfNeeded = (values: any, widgetContainer: any) => {
   const dateFields = Object.keys(values).filter((key) => {
-    return fields[key] && fields[key].type === "date";
+    const widget = widgetContainer.findById(key);
+    return widget && widget.type === "date";
   });
 
   let newValues: any = { ...values };

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

@@ -1,3 +1,13 @@
+const formatter = (graphType: "pie" | "default" | "barGrouped") => {
+  return (object: any) => {
+    const formattedValue = object.value.toLocaleString("en-US", {
+      useGrouping: true,
+    });
+    const name = graphType === "pie" ? object.x : object.type;
+    return { name, value: formattedValue };
+  };
+};
+
 const DefaultGraphOptions = {
   default: {
     padding: "auto",
@@ -8,6 +18,9 @@ const DefaultGraphOptions = {
       maxWidthRatio: 0.5,
       maxItemWidth: 1000,
     },
+    tooltip: {
+      formatter: formatter("default"),
+    },
   },
   pie: {
     appendPadding: 10,
@@ -25,6 +38,9 @@ const DefaultGraphOptions = {
       maxWidthRatio: 0.5,
       maxItemWidth: 1000,
     },
+    tooltip: {
+      formatter: formatter("pie"),
+    },
     interactions: [
       {
         type: "element-active",
@@ -37,6 +53,9 @@ const DefaultGraphOptions = {
       maxWidthRatio: 0.5,
       maxItemWidth: 1000,
     },
+    tooltip: {
+      formatter: formatter("barGrouped"),
+    },
     label: {
       position: "middle",
       layout: [

package/src/widgets/views/SearchTree.tsx

@@ -295,6 +295,7 @@ function SearchTree(props: Props, ref: any) {
             formView.search_fields,
             treeView.search_fields,
           ])}
+          formXml={formView.arch}
           onClear={clear}
           limit={limit}
           offset={offset}

package/src/widgets/views/searchFilter/SearchFilter.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { Form, Row, Col, Alert } from "antd";
 import useDeepCompareEffect from "use-deep-compare-effect";
 
@@ -30,6 +30,7 @@ type Props = {
   searchError?: string;
   searchValues?: any;
   showLimitOptions?: boolean;
+  formXml: string;
 };
 
 function SearchFilter(props: Props) {
@@ -47,11 +48,13 @@ function SearchFilter(props: Props) {
     searchError,
     searchValues,
     showLimitOptions = true,
+    formXml,
   } = props;
 
   const [simpleSearchFields, setSimpleSearchFields] = useState<Container>();
   const [advancedSearchFields, setAdvancedSearchFields] = useState<Container>();
   const [advancedFilter, setAdvancedFilter] = useState(false);
+  const sfo = useRef<SearchFilterOoui>();
 
   const [form] = Form.useForm();
 
@@ -84,10 +87,10 @@ function SearchFilter(props: Props) {
 
   useDeepCompareEffect(() => {
     setAdvancedFilter(false);
-    const sfo = new SearchFilterOoui(searchFields, fields);
-    sfo.parse();
-    setSimpleSearchFields(sfo._simpleSearchContainer);
-    setAdvancedSearchFields(sfo._advancedSearchContainer);
+    sfo.current = new SearchFilterOoui(searchFields, fields, formXml);
+    sfo.current.parse();
+    setSimpleSearchFields(sfo.current._simpleSearchContainer);
+    setAdvancedSearchFields(sfo.current._advancedSearchContainer);
   }, [fields, searchFields]);
 
   const rows = getRowsAndCols();
@@ -96,7 +99,10 @@ function SearchFilter(props: Props) {
     const { limit, offset } = values;
     delete values.offset;
     delete values.limit;
-    const newParams = getParamsForFields(values, fields);
+    const newParams = getParamsForFields(
+      values,
+      sfo.current?._advancedSearchContainer
+    );
 
     onSubmit({ params: newParams, offset, limit, searchValues: values });
   };