@gisce/react-ooui 1.4.0-rc.0 → 1.4.0

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

@@ -1 +1 @@
-{"version":3,"file":"Tree.d.ts","sourceRoot":"","sources":["Tree.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAKvE,OAAO,EAAE,QAAQ,EAAU,MAAM,SAAS,CAAC;AAwB3C,aAAK,KAAK,GAAG;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAChE,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IACrC,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,gBAAgB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IACtC,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,wBAAwB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACzD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AA+GF,iBAAS,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC,YAAY,CAoN9C;AAED,eAAe,IAAI,CAAC"}
+{"version":3,"file":"Tree.d.ts","sourceRoot":"","sources":["Tree.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAKvE,OAAO,EAAE,QAAQ,EAAU,MAAM,SAAS,CAAC;AAwB3C,aAAK,KAAK,GAAG;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,mBAAmB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAChE,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IACrC,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,gBAAgB,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC7C,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IACtC,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,wBAAwB,CAAC,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IACzD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AA8GF,iBAAS,IAAI,CAAC,KAAK,EAAE,KAAK,GAAG,KAAK,CAAC,YAAY,CAqN9C;AAED,eAAe,IAAI,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.4.0-rc.0",
+  "version": "1.4.0",
   "files": [
     "dist",
     "src",

package/src/actionbar/TreeActionBar.tsx

@@ -1,5 +1,5 @@
 import React, { useContext, useState } from "react";
-import { Space, Spin } from "antd";
+import { Space } from "antd";
 import ChangeViewButton from "./ChangeViewButton";
 import {
   ActionViewContext,
@@ -151,13 +151,6 @@ function TreeActionBar(props: Props) {
 
   return (
     <Space wrap={true}>
-      {treeIsLoading && (
-        <>
-          <Spin />
-          {separator()}
-          {separator()}
-        </>
-      )}
       {treeExpandable ? null : (
         <>
           <SearchBar

package/src/hooks/useSearch.ts

@@ -107,7 +107,13 @@ export const useSearch = (opts: UseSearchOpts) => {
       });
 
       const { colors, status } = getTree(treeView!);
-      console.log(colors, status);
+      const attrs: any = {};
+      if (colors) {
+        attrs.colors = colors;
+      }
+      if (status) {
+        attrs.status = status;
+      }
 
       const resultsWithData =
         await ConnectionProvider.getHandler().readEvalUiObjects({
@@ -118,10 +124,7 @@ export const useSearch = (opts: UseSearchOpts) => {
             ? { ...treeView!.fields, [treeView!.field_parent]: {} }
             : treeView!.fields,
           context,
-          attrs: {
-            colors,
-            status,
-          },
+          attrs,
         });
       const resultsData = resultsWithData[0];
 
@@ -173,7 +176,14 @@ export const useSearch = (opts: UseSearchOpts) => {
       const { params, newOffset } = opts || {};
 
       const mergedParams = mergeParams(params || searchParams, domain);
-      const { colors, status } = getTree(treeView!);
+      const { colors, status } = getTree(treeView!);      const attrs: any = {};
+      if (colors) {
+        attrs.colors = colors;
+      }
+      if (status) {
+        attrs.status = status;
+      }
+
 
       const { totalItems, results, attrsEvaluated } =
         await ConnectionProvider.getHandler().searchForTree({
@@ -185,7 +195,7 @@ export const useSearch = (opts: UseSearchOpts) => {
             ? { ...treeView!.fields, [treeView!.field_parent]: {} }
             : treeView!.fields,
           context,
-          attrs: { colors, status },
+          attrs,
         });
       setColorsForResults(getColorMap(attrsEvaluated));
       setStatusForResults(getStatusMap(attrsEvaluated));
@@ -283,7 +293,6 @@ export const useSearch = (opts: UseSearchOpts) => {
 
   const changeSort = useCallback(
     (newSorter: any) => {
-      if (JSON.stringify(newSorter) === JSON.stringify(sorter)) return;
       setSorter?.(newSorter);
       const sortedResults =
         newSorter !== undefined

package/src/widgets/views/SearchTree.tsx

@@ -182,9 +182,9 @@ function SearchTree(props: Props, ref: any) {
       setInitialFetchDone(true);
     } catch (error) {
       setInitialError(error);
-      setTreeIsLoading?.(false);
     } finally {
       setIsLoading(false);
+      setTreeIsLoading?.(false);
     }
   };
 

package/src/widgets/views/Tree.tsx

@@ -118,7 +118,7 @@ const imageComponent = (value: string): React.ReactElement => {
 };
 
 const TagComponent = (
-  value: any,
+value: any,
   key: string,
   ooui: any,
   context: any
@@ -127,12 +127,14 @@ const TagComponent = (
 };
 
 const SelectionComponent = (
-  value: any,
+value: any,
   key: string,
   ooui: any,
   context: any
 ): React.ReactElement => {
-  return <>{ooui.selectionValues.get(value)}</>;
+  return (
+    <>{ooui.selectionValues.get(value)}</>
+  );
 };
 
 const referenceComponent = (
@@ -152,12 +154,9 @@ const referenceComponent = (
   );
 };
 
-const AvatarFn = (
-  value: any,
-  key: string,
-  ooui: any,
-  context: any
-): React.ReactElement => <Avatar ooui={ooui} value={value} />;
+const AvatarFn = (value: any, key:string, ooui: any, context: any): React.ReactElement => (
+  <Avatar ooui={ooui} value={value} />
+)
 
 function Tree(props: Props): React.ReactElement {
   const {
@@ -309,7 +308,9 @@ function Tree(props: Props): React.ReactElement {
       summary.push(`${sumField.label}: ${Math.round(total * 100) / 100}`);
     });
 
-    return <div className="p-1 pb-0 pl-2 mt-2 ">{summary.join(", ")}</div>;
+    return (
+      <div className="p-1 pb-0 pl-2 mt-2 ">{summary.join(", ")}</div>
+    );
   }
 
   let dataTable;
@@ -332,12 +333,11 @@ function Tree(props: Props): React.ReactElement {
   ) : (
     <div>
       {pagination()}
-      {loading && <Spin className="pb-4" />}
       <GisceTable
         height={adjustedHeight!}
         columns={dataTable.columns}
         dataSource={items}
-        loading={false}
+        loading={loading}
         loadingComponent={<Spin />}
         onRowStyle={(record: any) => {
           if (colorsForResults![record.id]) {