@gisce/react-ooui 2.0.0-alpha.26 → 2.0.0-alpha.28

package/dist/ui/GoToResourceModal.d.ts

@@ -1,6 +1,6 @@
 type Props = {
     visible: boolean;
-    onIdSubmitted: (id: number) => void;
+    onIdSubmitted: (ids: number[]) => void;
     onCancel: () => void;
     isSearching: boolean;
 };

package/dist/ui/GoToResourceModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GoToResourceModal.d.ts","sourceRoot":"","sources":["../../src/ui/GoToResourceModal.tsx"],"names":[],"mappings":"AAKA,KAAK,KAAK,GAAG;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAAW,KAAK,4CAkE7C,CAAC"}
+{"version":3,"file":"GoToResourceModal.d.ts","sourceRoot":"","sources":["../../src/ui/GoToResourceModal.tsx"],"names":[],"mappings":"AAKA,KAAK,KAAK,GAAG;IACX,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,IAAI,CAAC;IACvC,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAAW,KAAK,4CA+D7C,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"ActionView.d.ts","sourceRoot":"","sources":["../../src/views/ActionView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAIf,OAAO,EAIL,eAAe,EAGf,QAAQ,EACT,MAAM,eAAe,CAAC;AAoBvB,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,eAAe,CAAC;IAC7B,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;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;;AA2cF,wBAAsC"}
+{"version":3,"file":"ActionView.d.ts","sourceRoot":"","sources":["../../src/views/ActionView.tsx"],"names":[],"mappings":"AAAA,OAAO,KAON,MAAM,OAAO,CAAC;AAIf,OAAO,EAIL,eAAe,EAGf,QAAQ,EACT,MAAM,eAAe,CAAC;AAoBvB,KAAK,KAAK,GAAG;IACX,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,GAAG,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;IAChC,WAAW,EAAE,eAAe,CAAC;IAC7B,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;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;;AAkdF,wBAAsC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "2.0.0-alpha.26",
+  "version": "2.0.0-alpha.28",
   "engines": {
     "node": "20.5.0"
   },

package/src/context/ActionViewContext.tsx

@@ -48,7 +48,7 @@ export type ActionViewContextType = {
   setSearchTreeNameSearch?: (searchString?: string) => void;
   previousView?: View;
   setPreviousView?: (view: View) => void;
-  goToResourceId?: (id: number) => Promise<void>;
+  goToResourceId?: (ids: number[]) => Promise<void>;
   searchValues?: any;
   setSearchValues?: (value: any) => void;
   limit?: number;

package/src/locales/ca_ES.tsx

@@ -71,6 +71,7 @@ export default {
   lastUpdatedDate: "Data última modificació",
   goToResourceId: "Vés al recurs amb ID",
   searchId: "ID de cerca:",
+  searchIdHelp: "Es pot utiltizar un ID o una llista d'IDs separats per comes",
   idNotFound: "No es troba aquesta id de recurs per l'objecte",
   selectedRegisters: "registres seleccionats",
   translate: "Traduïr",

package/src/locales/en_US.tsx

@@ -69,6 +69,7 @@ export default {
   lastUpdatedDate: "Date of last modification",
   goToResourceId: "Go to resource ID",
   searchId: "Search ID:",
+  searchIdHelp: "You can use an ID or a list of IDs separated by commas.",
   idNotFound: "Resource ID does not exist for this object!",
   selectedRegisters: "selected registers",
   translate: "Translate",

package/src/locales/es_ES.tsx

@@ -72,6 +72,8 @@ export default {
   lastUpdatedDate: "Fecha última modificación",
   goToResourceId: "Ir al recurso con ID",
   searchId: "ID de búsqueda:",
+  searchIdHelp:
+    "Se puede utilizar un ID o una lista de IDs separados por comas",
   idNotFound: "No se encuentra ésta ID de recursos para el objeto",
   selectedRegisters: "registros seleccionados",
   translate: "Traducir",

package/src/stories/ui/GoToResourceModal.stories.tsx

@@ -12,11 +12,12 @@ export const Default = (): React.ReactElement => {
     <LocaleProvider lang="en_US">
       <GoToResourceModal
         visible={true}
+        isSearching={false}
         onCancel={() => {
           alert("cancel");
         }}
-        onIdSubmitted={(id) => {
-          alert(id);
+        onIdSubmitted={(ids) => {
+          alert(ids);
         }}
       />
     </LocaleProvider>

package/src/ui/GoToResourceModal.tsx

@@ -1,11 +1,11 @@
 import React, { useContext, useRef } from "react";
-import { Button, Col, Form, InputNumber, Modal, Row, Space } from "antd";
+import { Button, Col, Form, Input, Modal, Row, Space } from "antd";
 import { CheckOutlined, CloseOutlined } from "@ant-design/icons";
 import { LocaleContext, LocaleContextType } from "@/context/LocaleContext";
 
 type Props = {
   visible: boolean;
-  onIdSubmitted: (id: number) => void;
+  onIdSubmitted: (ids: number[]) => void;
   onCancel: () => void;
   isSearching: boolean;
 };
@@ -18,7 +18,8 @@ export const GoToResourceModal = (props: Props) => {
   const inputRef = useRef<null | HTMLElement>();
 
   function handleSubmit(values: any) {
-    onIdSubmitted(values.id);
+    const ids = values.id.split(",").map((id: string) => parseInt(id.trim()));
+    onIdSubmitted(ids);
   }
 
   return (
@@ -39,15 +40,11 @@ export const GoToResourceModal = (props: Props) => {
           rules={[
             {
               required: true,
-              type: "number",
             },
           ]}
+          help={t("searchIdHelp")}
         >
-          <InputNumber
-            style={{ width: "100%" }}
-            autoFocus
-            ref={inputRef as any}
-          />
+          <Input style={{ width: "100%" }} autoFocus ref={inputRef as any} />
         </Form.Item>
         <Row align="middle" justify="end">
           <Col>

package/src/views/ActionView.tsx

@@ -319,52 +319,59 @@ function ActionView(props: Props, ref: any) {
     setGtResourceModalVisible(true);
   }
 
-  async function goToResourceId(id: number) {
+  async function goToResourceId(ids: number[]) {
     setSearchingForResourceId(true);
 
-    const itemIndex = results!.findIndex((item: any) => {
-      return item.id === id;
-    });
-
-    let resource;
-
-    if (itemIndex === -1) {
-      try {
-        resource = (
-          await ConnectionProvider.getHandler().readObjects({
-            model,
-            ids: [id],
-            context,
-          })
-        )?.[0];
-      } catch (err) {}
-
-      if (!resource) {
-        setSearchingForResourceId(false);
-        setGtResourceModalVisible(false);
-        showInfo(t("idNotFound"));
-        return;
+    let mode: ViewType;
+    let domain: any[];
+    if (ids.length === 1) {
+      mode = "form";
+      domain = [];
+      const id = ids[0];
+      const itemIndex = results!.findIndex((item: any) => {
+        return item.id === id;
+      });
+      let resource;
+
+      if (itemIndex === -1) {
+        try {
+          resource = (
+            await ConnectionProvider.getHandler().readObjects({
+              model,
+              ids: [id],
+              context,
+            })
+          )?.[0];
+        } catch (err) {}
+
+        if (!resource) {
+          setSearchingForResourceId(false);
+          setGtResourceModalVisible(false);
+          showInfo(t("idNotFound"));
+          return;
+        }
+      } else {
+        resource = results[itemIndex];
       }
     } else {
-      resource = results[itemIndex];
+      mode = "tree";
+      domain = [["id", "in", ids]];
     }
 
     setSearchingForResourceId(false);
     setGtResourceModalVisible(false);
-
-    const viewForm = views.find((v) => v[1] === "form");
-
+    const viewForm = views.find((v) => v[1] === mode);
     openAction({
-      domain: [],
+      domain,
       context,
       model,
       views,
       title,
       target: "current",
-      initialView: { id: viewForm?.[0]!, type: "form" },
+      initialView: { id: viewForm?.[0]!, type: mode },
       action_id,
       action_type,
-      res_id: id,
+      res_id: ids[0],
     });
   }
 

package/src/widgets/base/Button.tsx

@@ -63,7 +63,7 @@ export const Button = (props: Props) => {
     <Field ooui={ooui}>
       <AntButton
         block
-        disabled={!activated || readOnly}
+        disabled={!activated || readOnly || isRunning}
         onClick={onClick}
         icon={getButtonIcon()}
         type={ooui.primary ? "primary" : "default"}