From 995bf2d88342bf6a7ebb672225c8979c56dd97f3 Mon Sep 17 00:00:00 2001 From: Antoine Guenet Date: Fri, 28 Apr 2023 07:18:31 +0000 Subject: [PATCH] [REF] web, mail: rename attachment_viewer to file_viewer Since the attachement viewer was moved to core, this renames it to file viewer to decouple it from the Attachment model/concept from the mail module. Part-of: odoo/odoo#119625 --- .../static/src/attachments/attachment_list.js | 4 +- .../src/attachments/attachment_list.xml | 4 +- .../src/attachments/attachment_view.scss | 2 +- .../static/src/core_ui/primary_variables.scss | 2 +- addons/mail/static/src/scss/composer.scss | 2 +- .../static/src/views/form/form_compiler.js | 12 +-- .../static/src/views/form/form_renderer.js | 2 +- .../tests/thread/attachment_list_tests.js | 16 ++-- .../static/tests/web/attachment_box_tests.js | 16 ++-- .../mrp_documents_kanban_record.js | 6 +- .../static/tests/mrp_document_kanban_tests.js | 10 +-- addons/web/__manifest__.py | 6 +- .../attachment_viewer/attachment_viewer.xml | 77 ------------------- .../attachment_viewer_hook.js | 34 -------- .../file_viewer.dark.scss} | 4 +- .../file_viewer.js} | 38 ++++++--- .../file_viewer.scss} | 18 ++--- .../src/core/file_viewer/file_viewer.xml | 77 +++++++++++++++++++ .../src/core/file_viewer/file_viewer_hook.js | 34 ++++++++ 19 files changed, 189 insertions(+), 175 deletions(-) delete mode 100644 addons/web/static/src/core/attachment_viewer/attachment_viewer.xml delete mode 100644 addons/web/static/src/core/attachment_viewer/attachment_viewer_hook.js rename addons/web/static/src/core/{attachment_viewer/attachment_viewer.dark.scss => file_viewer/file_viewer.dark.scss} (57%) rename addons/web/static/src/core/{attachment_viewer/attachment_viewer.js => file_viewer/file_viewer.js} (83%) rename addons/web/static/src/core/{attachment_viewer/attachment_viewer.scss => file_viewer/file_viewer.scss} (59%) create mode 100644 addons/web/static/src/core/file_viewer/file_viewer.xml create mode 100644 addons/web/static/src/core/file_viewer/file_viewer_hook.js diff --git a/addons/mail/static/src/attachments/attachment_list.js b/addons/mail/static/src/attachments/attachment_list.js index 2365359eb4f..827d315ac7e 100644 --- a/addons/mail/static/src/attachments/attachment_list.js +++ b/addons/mail/static/src/attachments/attachment_list.js @@ -5,7 +5,7 @@ import { Component } from "@odoo/owl"; import { ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_dialog"; import { useService } from "@web/core/utils/hooks"; import { sprintf } from "@web/core/utils/strings"; -import { useAttachmentViewer } from "@web/core/attachment_viewer/attachment_viewer_hook"; +import { useFileViewer } from "@web/core/file_viewer/file_viewer_hook"; import { _t } from "@web/core/l10n/translation"; import { url } from "@web/core/utils/urls"; @@ -25,7 +25,7 @@ export class AttachmentList extends Component { // Arbitrary high value, this is effectively a max-width. this.imagesWidth = 1920; this.dialog = useService("dialog"); - this.attachmentViewer = useAttachmentViewer(); + this.fileViewer = useFileViewer(); } /** diff --git a/addons/mail/static/src/attachments/attachment_list.xml b/addons/mail/static/src/attachments/attachment_list.xml index 13ec8c3b765..c71a8c35f22 100644 --- a/addons/mail/static/src/attachments/attachment_list.xml +++ b/addons/mail/static/src/attachments/attachment_list.xml @@ -19,7 +19,7 @@ aria-label="View image" role="menuitem" t-att-data-mimetype="attachment.mimetype" - t-on-click="() => this.attachmentViewer.open(attachment, props.attachments)" + t-on-click="() => this.fileViewer.open(attachment, props.attachments)" >