odoo-addon-dms 16.0.1.8.0.3__py3-none-any.whl → 17.0.1.0.0.2__py3-none-any.whl

odoo/addons/dms/static/src/js/views/dms_file_upload.esm.js

@@ -1,165 +1,172 @@
 /** @odoo-module */
 
+// /** ********************************************************************************
+//     Copyright 2024 Subteno - Timothée Vannier (https://www.subteno.com).
+//     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+//  **********************************************************************************/
+
 import {useBus, useService} from "@web/core/utils/hooks";
-import {_t} from "web.core";
+import {_t} from "@web/core/l10n/translation";
 
 const {useRef, useEffect, useState} = owl;
 
-export const FileDropZone = {
-    setup() {
-        this._super();
-        this.dragState = useState({
-            showDragZone: false,
-        });
-        this.root = useRef("root");
-        this.rpc = useService("rpc");
-
-        useEffect(
-            (el) => {
-                if (!el) {
-                    return;
-                }
-                const highlight = this.highlight.bind(this);
-                const unhighlight = this.unhighlight.bind(this);
-                const drop = this.onDrop.bind(this);
-                el.addEventListener("dragover", highlight);
-                el.addEventListener("dragleave", unhighlight);
-                el.addEventListener("drop", drop);
-                return () => {
-                    el.removeEventListener("dragover", highlight);
-                    el.removeEventListener("dragleave", unhighlight);
-                    el.removeEventListener("drop", drop);
-                };
-            },
-
-            () => [document.querySelector(".o_content")]
-        );
-    },
-
-    highlight(ev) {
-        ev.stopPropagation();
-        ev.preventDefault();
-        this.dragState.showDragZone = true;
-    },
-
-    unhighlight(ev) {
-        ev.stopPropagation();
-        ev.preventDefault();
-        this.dragState.showDragZone = false;
-    },
-
-    async onDrop(ev) {
-        ev.preventDefault();
-        await this.env.bus.trigger("change_file_input", {
-            files: ev.dataTransfer.files,
-        });
-    },
-};
-
-export const FileUpload = {
-    setup() {
-        this._super();
-        this.actionService = useService("action");
-        this.notification = useService("notification");
-        this.orm = useService("orm");
-        this.http = useService("http");
-        this.fileInput = useRef("fileInput");
-        this.root = useRef("root");
-
-        this.rpc = useService("rpc");
-
-        useBus(this.env.bus, "change_file_input", async (ev) => {
-            this.fileInput.el.files = ev.detail.files;
-            await this.onChangeFileInput();
-        });
-    },
-
-    uploadDocument() {
-        this.fileInput.el.click();
-    },
-
-    async onChangeFileInput() {
-        const params = {
-            csrf_token: odoo.csrf_token,
-            ufile: [...this.fileInput.el.files],
-            model: "dms.file",
-            id: 0,
-        };
-
-        const fileData = await this.http.post(
-            "/web/binary/upload_attachment",
-            params,
-            "text"
-        );
-        const attachments = JSON.parse(fileData);
-        if (attachments.error) {
-            throw new Error(attachments.error);
-        }
-
-        this.onUpload(attachments);
-    },
-
-    async onUpload(attachments) {
-        const self = this;
-        const attachmentIds = attachments.map((a) => a.id);
-        const ctx = this.props.context;
-        const controllerID = this.actionService.currentController.jsId;
-
-        if (!attachmentIds.length) {
-            this.notification.add(_t("An error occurred during the upload"));
-            return;
-        }
-
-        // Search the correct directory_id value according to the domain
-        ctx.default_directory_id = false;
-        if (this.props.domain) {
-            for (const domain_item of this.props.domain) {
-                if (domain_item.length === 3) {
-                    if (domain_item[0] === "directory_id" && domain_item[1] === "=") {
-                        ctx.default_directory_id = domain_item[2];
+export function createFileDropZoneExtension() {
+    return {
+        setup() {
+            super.setup(...arguments);
+            this.dragState = useState({
+                showDragZone: false,
+            });
+            this.root = useRef("root");
+
+            useEffect(
+                (el) => {
+                    if (!el) {
+                        return;
                     }
-                }
+                    const highlight = this.highlight.bind(this);
+                    const unhighlight = this.unhighlight.bind(this);
+                    const drop = this.onDrop.bind(this);
+                    el.addEventListener("dragover", highlight);
+                    el.addEventListener("dragleave", unhighlight);
+                    el.addEventListener("drop", drop);
+                    return () => {
+                        el.removeEventListener("dragover", highlight);
+                        el.removeEventListener("dragleave", unhighlight);
+                        el.removeEventListener("drop", drop);
+                    };
+                },
+
+                () => [document.querySelector(".o_content")]
+            );
+        },
+
+        highlight(ev) {
+            ev.stopPropagation();
+            ev.preventDefault();
+            this.dragState.showDragZone = true;
+        },
+
+        unhighlight(ev) {
+            ev.stopPropagation();
+            ev.preventDefault();
+            this.dragState.showDragZone = false;
+        },
+
+        async onDrop(ev) {
+            ev.preventDefault();
+            this.dragState.showDragZone = false;
+            await this.env.bus.trigger("change_file_input", {
+                files: ev.dataTransfer.files,
+            });
+        },
+    };
+}
+
+export function createFileUploadExtension() {
+    return {
+        setup() {
+            super.setup();
+            this.notification = useService("notification");
+            this.orm = useService("orm");
+            this.http = useService("http");
+            this.fileInput = useRef("fileInput");
+
+            useBus(this.env.bus, "change_file_input", async (ev) => {
+                this.fileInput.el.files = ev.detail.files;
+                await this.onChangeFileInput();
+            });
+        },
+
+        uploadDocument() {
+            this.fileInput.el.click();
+        },
+
+        async onChangeFileInput() {
+            const params = {
+                csrf_token: odoo.csrf_token,
+                ufile: [...this.fileInput.el.files],
+                model: "dms.file",
+                id: 0,
+            };
+
+            const fileData = await this.http.post(
+                "/web/binary/upload_attachment",
+                params,
+                "text"
+            );
+            const attachments = JSON.parse(fileData);
+            if (attachments.error) {
+                throw new Error(attachments.error);
             }
-        }
 
-        if (ctx.default_directory_id === false) {
-            self.actionService.restore(controllerID);
-            return self.notification.add(
-                this.env._t("You must select a directory first"),
-                {
-                    type: "danger",
-                }
-            );
-        }
+            await this.onUpload(attachments);
+        },
 
-        const attachment_datas = await this.orm.call(
-            "dms.file",
-            "get_dms_files_from_attachments",
-            ["", attachmentIds]
-        );
+        async onUpload(attachments) {
+            const self = this;
+            const attachmentIds = attachments.map((a) => a.id);
+            const ctx = this.props.context;
+            const controllerID = this.actionService.currentController.jsId;
 
-        const attachments_args = [];
+            if (!attachmentIds.length) {
+                this.notification.add(_t("An error occurred during the upload"));
+                return;
+            }
 
-        attachment_datas.forEach((attachment_data) => {
-            attachments_args.push({
-                name: attachment_data.name,
-                content: attachment_data.datas,
-                mimetype: attachment_data.mimetype,
-            });
-        });
+            // Search the correct directory_id value according to the domain
+            let directory_id = false;
+            if (this.props.domain) {
+                for (const domain_item of this.props.domain) {
+                    if (domain_item.length === 3) {
+                        if (
+                            domain_item[0] === "directory_id" &&
+                            ["=", "child_of"].includes(domain_item[1])
+                        ) {
+                            directory_id = domain_item[2];
+                        }
+                    }
+                }
+            }
 
-        this.orm
-            .call("dms.file", "create", [attachments_args], {
-                context: ctx,
-            })
-            .then(() => {
+            if (directory_id === false) {
                 self.actionService.restore(controllerID);
-            })
-            .catch((error) => {
-                self.notification.add(error.data.message, {
+                return self.notification.add(_t("You must select a directory first"), {
                     type: "danger",
                 });
-                self.actionService.restore(controllerID);
+            }
+
+            const attachment_datas = await this.orm.call(
+                "dms.file",
+                "get_dms_files_from_attachments",
+                [],
+                {attachment_ids: attachmentIds}
+            );
+
+            const attachments_args = [];
+
+            attachment_datas.forEach((attachment_data) => {
+                attachments_args.push({
+                    name: attachment_data.name,
+                    content: attachment_data.datas,
+                    mimetype: attachment_data.mimetype,
+                    directory_id,
+                });
             });
-    },
-};
+
+            this.orm
+                .call("dms.file", "create", [attachments_args], {
+                    context: ctx,
+                })
+                .then(() => {
+                    self.actionService.restore(controllerID);
+                })
+                .catch((error) => {
+                    self.notification.add(error.data.message, {
+                        type: "danger",
+                    });
+                    self.actionService.restore(controllerID);
+                });
+        },
+    };
+}

odoo/addons/dms/static/src/js/views/file_kanban_controller.xml

@@ -4,7 +4,6 @@
         t-name="dms.FileKanbanView.Buttons"
         t-inherit="web.KanbanView.Buttons"
         t-inherit-mode="primary"
-        owl="1"
     >
         <div role="toolbar" position="inside">
             <input

odoo/addons/dms/static/src/js/views/file_kanban_record.esm.js

@@ -1,6 +1,11 @@
 /** @odoo-module **/
 
+// /** ********************************************************************************
+//     Copyright 2024 Subteno - Timothée Vannier (https://www.subteno.com).
+//     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+//  **********************************************************************************/
 import {KanbanRecord} from "@web/views/kanban/kanban_record";
+import {useFileViewer} from "@web/core/file_viewer/file_viewer_hook";
 import {useService} from "@web/core/utils/hooks";
 
 const videoReadableTypes = ["x-matroska", "mp4", "webm"];
@@ -9,8 +14,8 @@ const audioReadableTypes = ["mp3", "ogg", "wav", "aac", "mpa", "flac", "m4a"];
 export class FileKanbanRecord extends KanbanRecord {
     setup() {
         super.setup();
-        this.messaging = useService("messaging");
-        this.dialog = useService("dialog");
+        this.store = useService("mail.store");
+        this.fileViewer = useFileViewer();
     }
 
     isVideo(mimetype) {
@@ -30,33 +35,27 @@ export class FileKanbanRecord extends KanbanRecord {
         const self = this;
 
         if (ev.target.closest(".o_kanban_dms_file_preview")) {
-            this.messaging.get().then((messaging) => {
-                const file_type = self.props.record.data.name.split(".")[1];
-                let mimetype = "";
-
-                if (self.isVideo(file_type)) {
-                    mimetype = `video/${file_type}`;
-                } else if (self.isAudio(file_type)) {
-                    mimetype = "audio/mpeg";
-                } else {
-                    mimetype = self.props.record.data.mimetype;
-                }
-
-                const attachmentList = messaging.models.AttachmentList.insert({
-                    selectedAttachment: messaging.models.Attachment.insert({
-                        id: self.props.record.data.id,
-                        filename: self.props.record.data.name,
-                        name: self.props.record.data.name,
-                        mimetype: mimetype,
-                        model_name: self.props.record.resModel,
-                    }),
-                });
-                this.dialog = messaging.models.Dialog.insert({
-                    attachmentListOwnerAsAttachmentView: attachmentList,
-                });
+            const file_type = self.props.record.data.name.split(".")[1];
+            let mimetype = "";
+
+            if (self.isVideo(file_type)) {
+                mimetype = `video/${file_type}`;
+            } else if (self.isAudio(file_type)) {
+                mimetype = "audio/mpeg";
+            } else {
+                mimetype = self.props.record.data.mimetype;
+            }
+
+            const attachment = this.store.Attachment.insert({
+                id: self.props.record.data.id,
+                filename: self.props.record.data.name,
+                name: self.props.record.data.name,
+                mimetype: mimetype,
+                model_name: self.props.record.resModel,
             });
+            this.fileViewer.open(attachment);
             return;
         }
-        return super.onGlobalClick(...arguments);
+        return super.onGlobalClick(ev);
     }
 }

odoo/addons/dms/static/src/js/views/file_kanban_renderer.esm.js

@@ -4,9 +4,8 @@
 //     Copyright 2020 Creu Blanca
 //     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 //  **********************************************************************************/
-import {KanbanRenderer} from "@web/views/kanban/kanban_renderer";
-
 import {FileKanbanRecord} from "./file_kanban_record.esm";
+import {KanbanRenderer} from "@web/views/kanban/kanban_renderer";
 
 export class FileKanbanRenderer extends KanbanRenderer {
     setup() {

odoo/addons/dms/static/src/js/views/file_kanban_renderer.xml

@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!--
+    Copyright 2024 Subteno - Timothée Vannier (https://www.subteno.com).
+    License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
+-->
 <templates xml:space="preserve">
     <t
         t-name="dms.KanbanRenderer"
         t-inherit="web.KanbanRenderer"
         t-inherit-mode="primary"
-        owl="1"
     >
         <xpath expr="//div[hasclass('o_kanban_renderer')]" position="before">
             <div t-if="dragState.showDragZone" class="o_dropzone">
@@ -17,19 +20,8 @@
         t-name="dms.KanbanButtons"
         t-inherit="web.KanbanView.Buttons"
         t-inherit-mode="primary"
-        owl="1"
     >
-        <xpath expr="//t[@t-if='canCreate']" position="after">
-            <button
-                type="button"
-                class="d-none d-md-inline btn btn-primary mx-1"
-                t-on-click.prevent="uploadDocument"
-            >
-                Upload
-            </button>
-        </xpath>
-
-        <xpath expr="//t[@t-if='canCreate']" position="before">
+        <xpath expr="//div" position="inside">
             <button
                 type="button"
                 class="d-inline d-md-none btn btn-primary mx-1"
@@ -37,9 +29,6 @@
             >
                 Scan
             </button>
-        </xpath>
-
-        <xpath expr="//div" position="inside">
             <input
                 type="file"
                 name="ufile"
@@ -49,6 +38,13 @@
                 accept="*"
                 t-on-change="onChangeFileInput"
             />
+            <button
+                type="button"
+                class="d-none d-md-inline btn btn-primary mx-1"
+                t-on-click.prevent="uploadDocument"
+            >
+                Upload
+            </button>
         </xpath>
     </t>
 </templates>

odoo/addons/dms/static/src/js/views/file_kanban_view.esm.js

@@ -3,25 +3,27 @@
 // /** ********************************************************************************
 //     Copyright 2020 Creu Blanca
 //     Copyright 2017-2019 MuK IT GmbH
+//     Copyright 2024 Subteno - Timothée Vannier (https://www.subteno.com).
 //     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 //  **********************************************************************************/
 
-import {registry} from "@web/core/registry";
-import {patch} from "@web/core/utils/patch";
-import {kanbanView} from "@web/views/kanban/kanban_view";
+import {
+    createFileDropZoneExtension,
+    createFileUploadExtension,
+} from "./dms_file_upload.esm";
 import {FileKanbanRenderer} from "./file_kanban_renderer.esm";
-import {FileKanbanController} from "./file_kanban_controller.esm";
-
-import {FileDropZone, FileUpload} from "./dms_file_upload.esm";
+import {KanbanController} from "@web/views/kanban/kanban_controller";
+import {kanbanView} from "@web/views/kanban/kanban_view";
+import {patch} from "@web/core/utils/patch";
+import {registry} from "@web/core/registry";
 
-patch(FileKanbanRenderer.prototype, "file_kanban_renderer_dzone", FileDropZone);
-patch(FileKanbanController.prototype, "filee_kanban_controller_upload", FileUpload);
+patch(FileKanbanRenderer.prototype, createFileDropZoneExtension());
+patch(KanbanController.prototype, createFileUploadExtension());
 FileKanbanRenderer.template = "dms.KanbanRenderer";
 
 export const FileKanbanView = {
     ...kanbanView,
     buttonTemplate: "dms.KanbanButtons",
-    Controller: FileKanbanController,
     Renderer: FileKanbanRenderer,
 };
 

odoo/addons/dms/static/src/js/views/file_list_controller.esm.js

@@ -10,6 +10,6 @@ import {ListController} from "@web/views/list/list_controller";
 
 export class FileListController extends ListController {
     setup() {
-        super.setup();
+        super.setup(...arguments);
     }
 }

odoo/addons/dms/static/src/js/views/file_list_renderer.xml

@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <templates xml:space="preserve">
-    <t
-        t-name="dms.ListRenderer"
-        t-inherit="web.ListRenderer"
-        t-inherit-mode="primary"
-        owl="1"
-    >
+    <t t-name="dms.ListRenderer" t-inherit="web.ListRenderer" t-inherit-mode="primary">
         <xpath expr="//div[hasclass('o_list_renderer')]" position="before">
             <div t-if="dragState.showDragZone" class="o_dropzone">
                 <i class="fa fa-cloud-upload fa-10x" />
@@ -17,7 +12,6 @@
         t-name="dms.ListButtons"
         t-inherit="web.ListView.Buttons"
         t-inherit-mode="primary"
-        owl="1"
     >
         <xpath expr="//div[hasclass('o_list_buttons')]" position="inside">
             <button

odoo/addons/dms/static/src/js/views/file_list_view.esm.js

@@ -3,25 +3,27 @@
 // /** ********************************************************************************
 //     Copyright 2020 Creu Blanca
 //     Copyright 2017-2019 MuK IT GmbH
+//     Copyright 2024 Subteno - Timothée Vannier (https://www.subteno.com).
 //     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl).
 //  **********************************************************************************/
 
-import {registry} from "@web/core/registry";
-import {patch} from "@web/core/utils/patch";
-import {listView} from "@web/views/list/list_view";
+import {
+    createFileDropZoneExtension,
+    createFileUploadExtension,
+} from "./dms_file_upload.esm";
 import {FileListRenderer} from "./file_list_renderer.esm";
-import {FileListController} from "./file_list_controller.esm";
-
-import {FileDropZone, FileUpload} from "./dms_file_upload.esm";
+import {ListController} from "@web/views/list/list_controller";
+import {listView} from "@web/views/list/list_view";
+import {patch} from "@web/core/utils/patch";
+import {registry} from "@web/core/registry";
 
-patch(FileListRenderer.prototype, "file_list_renderer_dzone", FileDropZone);
-patch(FileListController.prototype, "file_list_controller_upload", FileUpload);
+patch(FileListRenderer.prototype, createFileDropZoneExtension());
+patch(ListController.prototype, createFileUploadExtension());
 FileListRenderer.template = "dms.ListRenderer";
 
 export const FileListView = {
     ...listView,
     buttonTemplate: "dms.ListButtons",
-    Controller: FileListController,
     Renderer: FileListRenderer,
 };
 

odoo/addons/dms/static/src/js/views/search_panel.esm.js

@@ -1,19 +1,16 @@
 /** @odoo-module **/
 /* Copyright 2021-2024 Tecnativa - Víctor Martínez
+ * Copyright 2024 Subteno - Timothée Vannier (https://www.subteno.com).
  * License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). */
 
 import {SearchModel} from "@web/search/search_model";
-import {patch} from "@web/core/utils/patch";
-
-patch(SearchModel.prototype, "dms.SearchPanel", {
-    setup() {
-        this._super(...arguments);
-    },
+import {registry} from "@web/core/registry";
 
+class DMSSearchPanel extends SearchModel {
     _getCategoryDomain(excludedCategoryId) {
-        const domain = this._super.apply(this, arguments);
+        const domain = super._getCategoryDomain(...arguments);
         for (const category of this.categories) {
-            if (category.id === excludedCategoryId) {
+            if (category.id === Number(excludedCategoryId)) {
                 continue;
             }
 
@@ -25,5 +22,7 @@ patch(SearchModel.prototype, "dms.SearchPanel", {
             }
         }
         return domain;
-    },
-});
+    }
+}
+
+registry.category("views").add("dms_search_panel", DMSSearchPanel);