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

package/dist/widgets/base/Integer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Integer.d.ts","sourceRoot":"","sources":["Integer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAG1C,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAItC,aAAK,YAAY,GAAG,WAAW,GAAG;IAChC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC,CAAC;AAEF,eAAO,MAAM,OAAO,UAAW,YAAY,sBA4C1C,CAAC"}
+{"version":3,"file":"Integer.d.ts","sourceRoot":"","sources":["Integer.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAqB,MAAM,OAAO,CAAC;AAG1C,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAItC,aAAK,YAAY,GAAG,WAAW,GAAG;IAChC,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;CACvC,CAAC;AAEF,eAAO,MAAM,OAAO,UAAW,YAAY,sBA+B1C,CAAC"}

package/dist/widgets/base/one2many/One2manyInput.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"One2manyInput.d.ts","sourceRoot":"","sources":["One2manyInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,aAAa,CAAC;AAWvD,OAAO,EAAE,KAAK,EAAY,MAAM,SAAS,CAAC;AAkB1C,aAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;CAC5B,CAAC;AAQF,aAAK,YAAY,GAAG;IAClB,SAAS,CAAC,EACN,UAAU,GACV,eAAe,GACf,eAAe,GACf,eAAe,GACf,aAAa,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,aAAa,CAAC,EAAE,GAAG,CAAC;CACrB,CAAC;AAEF,UAAU,kBAAkB;IAC1B,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1C,KAAK,EAAE,KAAK,CAAC;CACd;AAWD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAqoB/C,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC"}
+{"version":3,"file":"One2manyInput.d.ts","sourceRoot":"","sources":["One2manyInput.tsx"],"names":[],"mappings":"AAAA,OAAO,KAMN,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,aAAa,CAAC;AAWvD,OAAO,EAAE,KAAK,EAAY,MAAM,SAAS,CAAC;AAkB1C,aAAK,aAAa,GAAG;IACnB,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC;CAC5B,CAAC;AAQF,aAAK,YAAY,GAAG;IAClB,SAAS,CAAC,EACN,UAAU,GACV,eAAe,GACf,eAAe,GACf,eAAe,GACf,aAAa,CAAC;IAClB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,aAAa,CAAC,EAAE,GAAG,CAAC;CACrB,CAAC;AAEF,UAAU,kBAAkB;IAC1B,IAAI,EAAE,YAAY,CAAC;IACnB,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC1C,KAAK,EAAE,KAAK,CAAC;CACd;AAWD,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CA6nB/C,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC"}

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

@@ -9,8 +9,8 @@ export declare type FormProps = {
     showFooter?: boolean;
     getDataFromAction?: boolean;
     mustClearAfterSave?: boolean;
-    submitMode?: "api" | "values" | "2many";
-    onSubmitSucceed?: (id?: number, values?: any, formValues?: any, x2manyPendingLink?: boolean) => void;
+    submitMode?: "api" | "values";
+    onSubmitSucceed?: (id?: number, values?: any, formValues?: any) => void;
     onSubmitError?: (error: any) => void;
     onCancel?: () => void;
     onFieldsChange?: (values: any) => void;

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;AAkCf,OAAO,EAAE,QAAQ,EAAgB,MAAM,SAAS,CAAC;AAmBjD,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,GAAG,OAAO,CAAC;IACxC,eAAe,CAAC,EAAE,CAChB,EAAE,CAAC,EAAE,MAAM,EACX,MAAM,CAAC,EAAE,GAAG,EACZ,UAAU,CAAC,EAAE,GAAG,EAChB,iBAAiB,CAAC,EAAE,OAAO,KACxB,IAAI,CAAC;IACV,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;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;;AAmhCF,wBAAgC"}
+{"version":3,"file":"Form.d.ts","sourceRoot":"","sources":["Form.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAkCf,OAAO,EAAE,QAAQ,EAAgB,MAAM,SAAS,CAAC;AAmBjD,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;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;;AAm+BF,wBAAgC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "1.4.8-rc.0",
+  "version": "1.4.8",
   "files": [
     "dist",
     "src",
@@ -33,9 +33,9 @@
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
     "@gisce/fiber-diagram": "^1.1.0-rc.3",
-    "@gisce/ooui": "^0.22.1-rc.1",
+    "@gisce/ooui": "^0.22.2",
     "@gisce/react-formiga-components": "^1.0.9-rc.21",
-    "@gisce/react-formiga-table": "^0.8.4-rc.0",
+    "@gisce/react-formiga-table": "^0.8.4",
     "@monaco-editor/react": "^4.4.5",
     "@tabler/icons-react": "^2.11.0",
     "antd": "^5.5.2",

package/src/widgets/base/Integer.tsx

@@ -27,20 +27,7 @@ export const Integer = (props: IntegerProps) => {
         className={"w-full "}
         disabled={readOnly}
         formatter={(value) => {
-          // Check if value is not undefined and is a valid number
-          if (
-            value === undefined ||
-            typeof value !== "number" ||
-            isNaN(value)
-          ) {
-            return "";
-          }
-
-          // Truncate the value to remove decimals
-          let truncatedValue = Math.trunc(value);
-
-          // Replace non-numeric and non-hyphen characters
-          return `${truncatedValue}`.replace(/[^0-9\-]+/g, "");
+          return `${value}`.replace(/[^0-9\-]+/g, "");
         }}
         onChange={(newValue: any) => {
           const newNumber = newValue as number;

package/src/widgets/base/one2many/One2manyInput.tsx

@@ -437,19 +437,11 @@ const One2manyInput: React.FC<One2manyInputProps> = (
   const onFormModalSubmitSucceed = (
     id: number | undefined,
     _: any,
-    values: any,
-    x2manyPendingLink: boolean = false
+    values: any
   ) => {
     let updatedItems: One2manyItem[];
 
-    if (x2manyPendingLink) {
-      updatedItems = items.concat({
-        id,
-        operation: "pendingLink",
-        values: { ...values, id },
-        treeValues: { ...values, id },
-      });
-    } else if (id) {
+    if (id) {
       updatedItems = items.map((item: One2manyItem) => {
         if (item.id === id) {
           return {
@@ -691,7 +683,7 @@ const One2manyInput: React.FC<One2manyInputProps> = (
         formView={views.get("form")}
         model={relation}
         id={modalItem?.id}
-        submitMode={"2many"}
+        submitMode={"values"}
         values={modalItem?.values}
         defaultValues={modalItem?.defaultValues}
         visible={showFormModal}

package/src/widgets/views/Form.tsx

@@ -67,13 +67,8 @@ export type FormProps = {
   showFooter?: boolean;
   getDataFromAction?: boolean;
   mustClearAfterSave?: boolean;
-  submitMode?: "api" | "values" | "2many";
-  onSubmitSucceed?: (
-    id?: number,
-    values?: any,
-    formValues?: any,
-    x2manyPendingLink?: boolean
-  ) => void;
+  submitMode?: "api" | "values";
+  onSubmitSucceed?: (id?: number, values?: any, formValues?: any) => void;
   onSubmitError?: (error: any) => void;
   onCancel?: () => void;
   onFieldsChange?: (values: any) => void;
@@ -132,7 +127,6 @@ function Form(props: FormProps, ref: any) {
   const lastAssignedValues = useRef<any>({});
   const warningIsShown = useRef<boolean>(false);
   const formSubmitting = useRef<boolean>(false);
-  const x2manyPendingLink = useRef<boolean>(false);
 
   const widthToEvaluate =
     parentWidth !== undefined ? parentWidth : containerWidth;
@@ -209,15 +203,10 @@ function Form(props: FormProps, ref: any) {
     }
   }, [defaultGetCalled]);
 
-  const onSubmitSucceed = (
-    id?: number,
-    values?: any,
-    formValues?: any,
-    x2manyPendingLink?: boolean
-  ) => {
+  const onSubmitSucceed = (id?: number, values?: any, formValues?: any) => {
     setFormHasChanges?.(false);
     setFormIsSaving?.(false);
-    propsOnSubmitSucceed?.(id, values, formValues, x2manyPendingLink);
+    propsOnSubmitSucceed?.(id, values, formValues);
     setCurrentId?.(id);
   };
 
@@ -305,15 +294,6 @@ function Form(props: FormProps, ref: any) {
     return { ...parentContext, ...formOoui?.context };
   }
 
-  function getActiveIdsContext() {
-    const currentId = getCurrentId()!;
-
-    if (!currentId) {
-      return {};
-    }
-    return { active_id: getCurrentId()!, active_ids: [getCurrentId()!] };
-  }
-
   function getAdditionalValues() {
     return {
       id: getCurrentId()!,
@@ -628,32 +608,6 @@ function Form(props: FormProps, ref: any) {
     formSubmitting.current = true;
 
     setError(undefined);
-
-    if (
-      x2manyPendingLink.current &&
-      !formHasChanges() &&
-      getCurrentId()! &&
-      callOnSubmitSucceed
-    ) {
-      formSubmitting.current = false;
-      setFormHasChanges?.(false);
-      onSubmitSucceed?.(
-        getCurrentId(),
-        getValues(),
-        getFormValues(),
-        x2manyPendingLink.current
-      );
-      x2manyPendingLink.current = false;
-      const currentId = getCurrentId()!;
-
-      if (mustClearAfterSave) {
-        createdId.current = undefined;
-        assignNewValuesToForm({ values: {}, fields, reset: true });
-      }
-
-      return { succeed: true, id: currentId };
-    }
-
     if (!formHasChanges() && getCurrentId()! && callOnSubmitSucceed) {
       formSubmitting.current = false;
       setFormHasChanges?.(false);
@@ -1003,22 +957,15 @@ function Form(props: FormProps, ref: any) {
 
     try {
       if (formHasChanges() || getCurrentId() === undefined) {
-        if (submitMode === "2many") {
-          await submitApi({ callOnSubmitSucceed: false });
-          x2manyPendingLink.current = true;
-        } else {
-          await submitForm({ callOnSubmitSucceed: false });
-        }
+        await submitForm({ callOnSubmitSucceed: false });
       }
 
-      const updatedContext = { ...context, ...getActiveIdsContext() };
-
       if (type === "object") {
-        await runObjectButton({ action, context: updatedContext });
+        await runObjectButton({ action, context });
       } else if (type === "workflow") {
         await runWorkflowButton({ action });
       } else if (type === "action") {
-        await runActionButton({ action, context: updatedContext });
+        await runActionButton({ action, context });
       }
     } catch (err) {
       showErrorDialog(err);