@gisce/react-ooui 0.7.1 → 0.8.1

package/src/widgets/views/Form.tsx

@@ -6,7 +6,7 @@ import React, {
   useRef,
   useContext,
 } from "react";
-import { Form as FormOoui } from "@gisce/ooui";
+import { Form as FormOoui, parseContext } from "@gisce/ooui";
 import {
   Form as AntForm,
   Button,
@@ -115,6 +115,7 @@ function Form(props: FormProps, ref: any) {
   const [fields, setFields] = useState<any>();
   const formModalContext = useContext(FormModalContext) as FormModalContextType;
   const [containerWidth, setContainerWidth] = useState<any>();
+  const [defaultGetCalled, setDefaultGetCalled] = useState<boolean>(false);
 
   const createdId = useRef<number>();
   const originalFormValues = useRef<any>({});
@@ -182,6 +183,15 @@ function Form(props: FormProps, ref: any) {
     fetchData();
   }, [id, model, valuesProps, formViewProps, visible]);
 
+  useEffect(() => {
+    if (defaultGetCalled) {
+      checkFieldsChanges({
+        elementHasLostFocus: true,
+      });
+      setDefaultGetCalled(false);
+    }
+  }, [defaultGetCalled]);
+
   const onSubmitSucceed = (id?: number, values?: any, formValues?: any) => {
     setFormHasChanges?.(false);
     setFormIsSaving?.(false);
@@ -337,6 +347,7 @@ function Form(props: FormProps, ref: any) {
     let values;
     let _fields;
     let _arch;
+    let hasDefaultGetCalled;
 
     setFormIsLoading?.(true);
     setError(undefined);
@@ -352,10 +363,13 @@ function Form(props: FormProps, ref: any) {
     if (valuesProps) {
       values = valuesProps;
     } else {
-      values = await fetchValuesFromApi({
+      ({
+        values,
+        defaultGetCalled: hasDefaultGetCalled,
+      } = await fetchValuesFromApi({
         fields: _fields,
         arch: _arch!,
-      });
+      }));
     }
 
     if (actionDomain) {
@@ -365,9 +379,18 @@ function Form(props: FormProps, ref: any) {
     originalFormValues.current = processValues(values, _fields);
 
     parseForm({ fields: _fields, arch: _arch!, values });
-    assignNewValuesToForm({ values, fields: _fields, reset: true });
+    assignNewValuesToForm({
+      values,
+      fields: _fields,
+      reset: true,
+      isDefaultGet: hasDefaultGetCalled,
+    });
     setFormIsLoading?.(false);
     setFormHasChanges?.(false);
+
+    if (hasDefaultGetCalled) {
+      setDefaultGetCalled(true);
+    }
   };
 
   function setOriginalValue(field: string, value: any) {
@@ -420,10 +443,12 @@ function Form(props: FormProps, ref: any) {
     values: newValues,
     fields,
     reset,
+    isDefaultGet = false,
   }: {
     values: any;
     fields: any;
     reset: boolean;
+    isDefaultGet?: boolean;
   }) => {
     const currentValues = reset ? {} : antForm.getFieldsValue(true);
     const mergedValues = { ...currentValues, ...newValues };
@@ -440,7 +465,10 @@ function Form(props: FormProps, ref: any) {
       };
     });
 
-    lastAssignedValues.current = valuesProcessed;
+    if (!isDefaultGet) {
+      lastAssignedValues.current = valuesProcessed;
+    }
+
     antForm.setFields(fieldsToUpdate);
   };
 
@@ -452,6 +480,8 @@ function Form(props: FormProps, ref: any) {
     arch: string;
   }) => {
     let values = {};
+    let defaultGetCalled = false;
+
     if (getCurrentId()!) {
       values = (
         await ConnectionProvider.getHandler().readObjects({
@@ -476,8 +506,9 @@ function Form(props: FormProps, ref: any) {
     } else {
       setAttachments?.([]);
       values = await getDefaultValues(fields);
+      defaultGetCalled = true;
     }
-    return values;
+    return { values, defaultGetCalled };
   };
 
   const submitApi = async (options?: { callOnSubmitSucceed?: boolean }) => {
@@ -771,7 +802,20 @@ function Form(props: FormProps, ref: any) {
     ) {
       onSubmitSucceed?.(getCurrentId(), getValues(), getFormValues());
     } else if (response.type) {
-      await runAction({ actionData: response, context });
+      let responseContext = {};
+
+      if (response.context) {
+        responseContext = parseContext({
+          context: response.context,
+          fields,
+          values: getValues(),
+        });
+      }
+
+      await runAction({
+        actionData: response,
+        context: { ...context, ...responseContext },
+      });
     } else {
       await fetchValues();
     }
@@ -822,9 +866,9 @@ function Form(props: FormProps, ref: any) {
         fields,
         values: getValues(),
         context: {
-          ...context,
           ...parentContext,
           ...formOoui?.context,
+          ...context,
         },
         onRefreshParentValues: () => {
           fetchValues();

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

@@ -94,6 +94,7 @@ function getGraphProps(props: GetGraphPropsType) {
     graphProps.isGroup = isGroup;
 
     if (isStack) {
+      graphProps.isStack = true;
       graphProps.groupField = "stacked";
     }
   }

package/src/widgets/views/SearchTree.tsx

@@ -439,9 +439,11 @@ function SearchTree(props: Props, ref: any) {
     });
   };
 
-  function changeSelectedRowKeys(selectedRowItems: any[]) {
+  function changeSelectedRowKeys(selectedRowKeys: any[]) {
+    const selectedRowItems = getResults().filter((entry: any) =>
+      selectedRowKeys.includes(entry.id)
+    );
     setSelectedRowItems?.(selectedRowItems);
-    const selectedRowKeys = selectedRowItems.map((entry: any) => entry.id);
     onChangeSelectedRowKeys?.(selectedRowKeys);
   }
 

package/src/widgets/views/Tree.tsx

@@ -30,7 +30,17 @@ type Props = {
 };
 
 const booleanComponentFn = (value: boolean): React.ReactElement => {
-  return <Checkbox defaultChecked={value} disabled />;
+  return (
+    <div
+      style={{
+        display: "flex",
+        justifyContent: "center",
+        alignContent: "center",
+      }}
+    >
+      <Checkbox defaultChecked={value} disabled />
+    </div>
+  );
 };
 
 const many2OneComponentFn = (m2oField: any): React.ReactElement => {
@@ -61,6 +71,10 @@ const floatTimeComponent = (value: number): React.ReactElement => {
   return <>{parseFloatToString(value)}</>;
 };
 
+const numberComponent = (value: number): React.ReactElement => {
+  return <div style={{ textAlign: "right" }}>{value}</div>;
+};
+
 const imageComponent = (value: string): React.ReactElement => {
   return (
     <img
@@ -109,6 +123,8 @@ function Tree(props: Props): React.ReactElement {
       progressbar: progressBarComponentFn,
       float_time: floatTimeComponent,
       image: imageComponent,
+      integer: numberComponent,
+      float: numberComponent,
     });
 
     setColumns(columns);