@gisce/react-ooui 1.0.8 → 1.0.9-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.0.8",
+  "version": "1.0.9-rc.0",
   "files": [
     "dist",
     "src",
@@ -23,6 +23,7 @@
     "access": "public"
   },
   "scripts": {
+    "prerelease": "npm version prerelease --preid rc",
     "start": "vite build --watch --force",
     "build:tailwind": "postcss src/tailwind.css -o src/tailwind.generated.css",
     "build": "vite build",

package/src/.eslintcache

@@ -0,0 +1 @@
+[{"/Users/marc/development/react-ooui/src/stories/Button.stories.js":"1","/Users/marc/development/react-ooui/src/stories/Char.stories.js":"2","/Users/marc/development/react-ooui/src/stories/Selection.stories.js":"3","/Users/marc/development/react-ooui/src/stories/ManyToOne.stories.js":"4","/Users/marc/development/react-ooui/src/stories/Checkbox.stories.js":"5","/Users/marc/development/react-ooui/src/widgets/Checkbox.tsx":"6","/Users/marc/development/react-ooui/src/widgets/ManyToOne.tsx":"7","/Users/marc/development/react-ooui/src/widgets/Selection.tsx":"8","/Users/marc/development/react-ooui/src/widgets/Button.tsx":"9","/Users/marc/development/react-ooui/src/widgets/Char.tsx":"10","/Users/marc/development/react-ooui/src/index.ts":"11","/Users/marc/development/react-ooui/src/helpers/TreeHelper.ts":"12","/Users/marc/development/react-ooui/src/widgets/Tree.tsx":"13","/Users/marc/development/react-ooui/src/stories/Tree.stories.js":"14"},{"size":721,"mtime":1611223665948,"results":"15","hashOfConfig":"16"},{"size":432,"mtime":1611223665949,"results":"17","hashOfConfig":"16"},{"size":539,"mtime":1611223665952,"results":"18","hashOfConfig":"16"},{"size":599,"mtime":1611223665950,"results":"19","hashOfConfig":"16"},{"size":464,"mtime":1611223665949,"results":"20","hashOfConfig":"16"},{"size":671,"mtime":1611223665953,"results":"21","hashOfConfig":"16"},{"size":1308,"mtime":1611223665954,"results":"22","hashOfConfig":"16"},{"size":706,"mtime":1611223665954,"results":"23","hashOfConfig":"16"},{"size":639,"mtime":1611223665953,"results":"24","hashOfConfig":"16"},{"size":741,"mtime":1611223665953,"results":"25","hashOfConfig":"16"},{"size":385,"mtime":1611227468105,"results":"26","hashOfConfig":"16"},{"size":1966,"mtime":1611306565063,"results":"27","hashOfConfig":"16"},{"size":1681,"mtime":1611227447728,"results":"28","hashOfConfig":"16"},{"size":3152,"mtime":1611308351200,"results":"29","hashOfConfig":"16"},{"filePath":"30","messages":"31","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},"i1ix4w",{"filePath":"33","messages":"34","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"35","messages":"36","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"37","messages":"38","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"39","messages":"40","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"41","messages":"42","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"47","messages":"48","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"49"},{"filePath":"50","messages":"51","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"52","messages":"53","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"54","messages":"55","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"56","messages":"57","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},{"filePath":"58","messages":"59","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"usedDeprecatedRules":"32"},"/Users/marc/development/react-ooui/src/stories/Button.stories.js",[],[],"/Users/marc/development/react-ooui/src/stories/Char.stories.js",[],"/Users/marc/development/react-ooui/src/stories/Selection.stories.js",[],"/Users/marc/development/react-ooui/src/stories/ManyToOne.stories.js",[],"/Users/marc/development/react-ooui/src/stories/Checkbox.stories.js",[],"/Users/marc/development/react-ooui/src/widgets/Checkbox.tsx",[],"/Users/marc/development/react-ooui/src/widgets/ManyToOne.tsx",[],"/Users/marc/development/react-ooui/src/widgets/Selection.tsx",[],"/Users/marc/development/react-ooui/src/widgets/Button.tsx",[],[],"/Users/marc/development/react-ooui/src/widgets/Char.tsx",[],"/Users/marc/development/react-ooui/src/index.ts",[],"/Users/marc/development/react-ooui/src/helpers/TreeHelper.ts",[],"/Users/marc/development/react-ooui/src/widgets/Tree.tsx",[],"/Users/marc/development/react-ooui/src/stories/Tree.stories.js",[]]

package/src/types/index.ts

@@ -37,7 +37,7 @@ type FormView = TreeView & {
 };
 
 type SearchResponse = {
-  totalItems: Promise<number>;
+  totalItems: number;
   results: any[];
   attrsEvaluated?: any;
 };

package/src/widgets/views/Graph/GraphIndicator.tsx

@@ -6,7 +6,9 @@ import Measure from "react-measure";
 import iconMapper from "@/helpers/iconMapper";
 import { Alert, Col, Row } from "antd";
 import { Operator } from "@gisce/ooui";
-import { getValueForOperator } from "@gisce/ooui/dist/Graph/processor/graphProcessor";
+
+import { graphProcessor } from "@gisce/ooui";
+const { getValueForOperator } = graphProcessor;
 
 const fontGrowFactor = 0.7;
 const minFontSize = 30;
@@ -109,13 +111,12 @@ export const GraphIndicator = (props: GraphInidicatorProps) => {
       }
 
       if (colorCondition) {
-        const conditionEval = await ConnectionProvider.getHandler().parseCondition(
-          {
+        const conditionEval =
+          await ConnectionProvider.getHandler().parseCondition({
             condition: colorCondition,
             values: { value: retrievedValue, percent },
             context,
-          }
-        );
+          });
         setColor(conditionEval);
       }
 

package/src/widgets/views/SearchTree.tsx

@@ -90,7 +90,7 @@ function SearchTree(props: Props, ref: any) {
 
   const paramsRef = useRef<Array<any>>([]);
 
-  const [totalItems, setTotalItems] = useState<number>();
+  const [totalItems, setTotalItems] = useState<number>(0);
   const [resultsInternal, setResultsInternal] = useState<any>([]);
   const [colorsForResults, setColorsForResults] = useState<any>(undefined);
 
@@ -278,6 +278,8 @@ function SearchTree(props: Props, ref: any) {
       context: parentContext,
       attrs: colors && { colors },
     });
+    setTotalItems(totalItems);
+    setActionViewTotalItems?.(totalItems);
     setColorsForResults(getColorMap(attrsEvaluated));
 
     originalResults.current = [...results];
@@ -291,11 +293,6 @@ function SearchTree(props: Props, ref: any) {
           })
         : [...originalResults.current];
 
-    totalItems.then((value) => {
-      setTotalItems(value);
-      setActionViewTotalItems?.(value);
-    });
-
     setResults(resultsSorted);
 
     if (resultsActionView && resultsSorted.length > 0) {

package/src/widgets/views/Tree.tsx

@@ -1,7 +1,7 @@
 import React, { useContext, useEffect, useRef, useState } from "react";
 import { Pagination, Checkbox, Space, Row, Col, Spin } from "antd";
 import { getTree, getTableColumns, getTableItems } from "@/helpers/treeHelper";
-import { Tree as TreeOoui } from "@gisce/ooui";
+import { One2many, Tree as TreeOoui } from "@gisce/ooui";
 
 import { TreeView, Column } from "@/types";
 import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
@@ -18,7 +18,7 @@ import {
 import { One2manyValue } from "../base/one2many/One2manyInput";
 
 type Props = {
-  total?: number;
+  total: number;
   limit: number;
   page?: number;
   loading: boolean;
@@ -147,7 +147,7 @@ function Tree(props: Props): React.ReactElement {
 
   const from = (page - 1) * limit + 1;
   const to = from - 1 + items.length;
-  const summary = !total
+  const summary = loading
     ? null
     : total === 0
     ? t("no_results")
@@ -161,9 +161,7 @@ function Tree(props: Props): React.ReactElement {
       return null;
     }
 
-    return loading ? null : !total ? (
-      <Spin />
-    ) : (
+    return loading ? null : (
       <Row align="bottom" className="pb-4">
         <Col span={12}>
           <Pagination