Merge branch 'fix/attachments_tree_domain_issue' into alpha

Author: mguellsegarra

src/actionbar/FormActionBar.tsx

@@ -415,14 +415,7 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
           const res_id = result.currentId as number;
           const res_model = currentModel as string;
           openDefaultActionForModel({
-            model: "ir.attachment",
-            values: {
-              selection_associated_object: `${res_model},${res_id}`,
-            },
-            forced_values: {
-              res_model,
-              res_id,
-            },
+            ...getAttachmentActionPayload(res_model, res_id),
             initialViewType: "form",
           });
         }}
@@ -438,11 +431,7 @@ function FormActionBar({ toolbar }: { toolbar: any }) {
           const res_id = result.currentId as number;
           const res_model = currentModel as string;
           openDefaultActionForModel({
-            model: "ir.attachment",
-            domain: [
-              ["res_model", "=", `${res_model}`],
-              ["res_id", "=", `${res_id}`],
-            ],
+            ...getAttachmentActionPayload(res_model, res_id),
             initialViewType: "tree",
           });
         }}
@@ -483,4 +472,20 @@ async function saveDocument({
   }
 }
 
+function getAttachmentActionPayload(res_model: string, res_id: number) {
+  return {
+    model: "ir.attachment",
+    domain: [
+      ["res_model", "=", `${res_model}`],
+      ["res_id", "=", `${res_id}`],
+    ],
+    values: {
+      selection_associated_object: `${res_model},${res_id}`,
+    },
+    forced_values: {
+      res_model,
+      res_id,
+    },
+  };
+}
 export default FormActionBar;

src/common/Field.tsx

@@ -45,6 +45,7 @@ export default function Field({
       name={id}
       valuePropName={valuePropName}
       rules={rules}
+      help={ooui.tooltipInline ? ooui.tooltip : null}
     >
       {children}
     </Form.Item>
@@ -60,7 +61,7 @@ export default function Field({
         new LabelOoui({
           name: id + "_label",
           string: label,
-          help: tooltip,
+          help: ooui.tooltipInline ? false : tooltip,
           fieldForLabel: id,
         })
       }

src/stories/Char.stories.tsx

@@ -47,3 +47,30 @@ export const Translatable = (): React.ReactElement => {
     </LocaleProvider>
   );
 };
+
+export const Tooltip = (): React.ReactElement => {
+  const ooui = new CharOoui({
+    name: "field",
+    string: "Lorem ipsum",
+    help: "This is a simple help",
+  });
+  return (
+    <LocaleProvider lang="en_US">
+      <Char ooui={ooui} showLabel />
+    </LocaleProvider>
+  );
+};
+
+export const TooltipInline = (): React.ReactElement => {
+  const ooui = new CharOoui({
+    name: "field",
+    string: "Lorem ipsum",
+    help: "This is a simple help",
+    help_inline: "true",
+  });
+  return (
+    <LocaleProvider lang="en_US">
+      <Char ooui={ooui} showLabel />
+    </LocaleProvider>
+  );
+};