@gisce/react-ooui 1.0.15 → 1.0.17

package/dist/views/ActionView.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ActionView.d.ts","sourceRoot":"","sources":["ActionView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAIf,OAAO,EAAsB,QAAQ,EAAE,MAAM,eAAe,CAAC;AAsB7D,aAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,IAAI,CAAC;IAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC;IACxB,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,oBAAY,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;;AAsZF,wBAAsC"}
+{"version":3,"file":"ActionView.d.ts","sourceRoot":"","sources":["ActionView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAIf,OAAO,EAAsB,QAAQ,EAAE,MAAM,eAAe,CAAC;AAsB7D,aAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,IAAI,CAAC;IAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC;IACxB,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,oBAAY,IAAI,GAAG;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,QAAQ,CAAC;CAChB,CAAC;;AAuZF,wBAAsC"}

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

@@ -1 +1 @@
-{"version":3,"file":"Form.d.ts","sourceRoot":"","sources":["Form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAiCf,OAAO,EAAE,QAAQ,EAAgB,MAAM,SAAS,CAAC;AAiBjD,oBAAY,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,UAAU,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC;IAC9B,eAAe,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACxE,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACrC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IACvC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB,CAAC;;AA+9BF,wBAAgC"}
+{"version":3,"file":"Form.d.ts","sourceRoot":"","sources":["Form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAiCf,OAAO,EAAE,QAAQ,EAAgB,MAAM,SAAS,CAAC;AAiBjD,oBAAY,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,UAAU,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC;IAC9B,eAAe,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,UAAU,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IACxE,aAAa,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC;IACrC,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;IACtB,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,CAAC;IACvC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,aAAa,CAAC,EAAE,GAAG,CAAC;IACpB,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB,CAAC;;AAi+BF,wBAAgC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "files": [
     "dist",
     "src",

package/src/actionbar/FormActionBar.tsx

@@ -66,6 +66,7 @@ function FormActionBar() {
     formRef,
     setFormHasChanges,
     searchTreeRef,
+    goToResourceId,
   } = useContext(ActionViewContext) as ActionViewContextType;
   const { t, lang } = useContext(LocaleContext) as LocaleContextType;
 
@@ -182,9 +183,7 @@ function FormActionBar() {
       });
 
       if (newId) {
-        await searchTreeRef?.current?.refreshResults();
-        setCurrentId?.(newId);
-        setCurrentItemIndex?.(currentItemIndex! + 1);
+        await goToResourceId?.(newId);
       }
     } catch (e) {
       showErrorDialog(JSON.stringify(e));

package/src/context/ActionViewContext.tsx

@@ -45,11 +45,11 @@ export type ActionViewContextType = {
   setTotalItems: (totalItems: number) => void;
   searchTreeNameSearch?: string;
   setSearchTreeNameSearch?: (searchString?: string) => void;
+  goToResourceId?: (id: number) => Promise<void>;
 };
 
-export const ActionViewContext = React.createContext<ActionViewContextType | null>(
-  null
-);
+export const ActionViewContext =
+  React.createContext<ActionViewContextType | null>(null);
 
 type ActionViewProviderProps = ActionViewContextType & {
   children: React.ReactNode;
@@ -92,6 +92,7 @@ const ActionViewProvider = (props: ActionViewProviderProps): any => {
     selectedRowItems,
     searchTreeNameSearch,
     setSearchTreeNameSearch,
+    goToResourceId,
   } = props;
 
   useEffect(() => {
@@ -151,6 +152,7 @@ const ActionViewProvider = (props: ActionViewProviderProps): any => {
         setTotalItems,
         searchTreeNameSearch,
         setSearchTreeNameSearch,
+        goToResourceId,
       }}
     >
       {children}

package/src/views/ActionView.tsx

@@ -451,6 +451,7 @@ function ActionView(props: Props, ref: any) {
       setSelectedRowItems={setSelectedRowItems}
       setSearchTreeNameSearch={setSearchTreeNameSearch}
       searchTreeNameSearch={searchTreeNameSearch}
+      goToResourceId={goToResourceId}
     >
       {viewContent()}
     </ActionViewProvider>

package/src/widgets/views/Form.tsx

@@ -738,20 +738,19 @@ function Form(props: FormProps, ref: any) {
 
   const processFieldOnChange = async (fieldName: string) => {
     const onChangeFieldAction = formOoui?.onChangeFields[fieldName];
-    const currentValues = processValues(antForm.getFieldsValue(true), fields);
 
     if (!onChangeFieldAction) {
       parseForm({
         fields,
         arch: arch!,
-        values: currentValues,
+        values: getCurrentValues(fields),
       });
       return;
     }
 
     const payload = getOnChangePayload({
       values: {
-        ...currentValues,
+        ...getCurrentValues(fields),
         context: {
           ...parentContext,
           ...formOoui?.context,
@@ -769,7 +768,10 @@ function Form(props: FormProps, ref: any) {
     });
 
     if (response.value) {
-      const processedValues = { ...currentValues, ...response.value };
+      const processedValues = {
+        ...getCurrentValues(fields),
+        ...response.value,
+      };
       parseForm({ fields, arch: arch!, values: processedValues });
       assignNewValuesToForm({
         values: processedValues,
@@ -791,7 +793,7 @@ function Form(props: FormProps, ref: any) {
       });
     }
 
-    if (response.domain) {
+    if (response.domain && Object.keys(response.domain).length > 0) {
       const proccessedFields = mergeFieldsDomain({
         fieldsDomain: response.domain,
         fields,
@@ -800,7 +802,7 @@ function Form(props: FormProps, ref: any) {
       parseForm({
         fields: proccessedFields,
         arch: arch!,
-        values: currentValues,
+        values: getCurrentValues(proccessedFields),
       });
       setFields(proccessedFields);
     }