From a055b9c20efc719d9a3c2e89a0ebbcd52a85d5a0 Mon Sep 17 00:00:00 2001
From: "Xavier Bol (xbo)" <xbo@odoo.com>
Date: Thu, 12 Oct 2023 15:10:03 +0200
Subject: [PATCH] [MOV] hr_org_chart,web_hierarchy: move hierarchy view in its
 own module

This commit moves the generic code of hierarchy view into new module
called `web_hierarchy` to be able to use it outside the hr scope.

task-3376776
---
 addons/hr_org_chart/__manifest__.py           |  8 ++---
 addons/hr_org_chart/models/__init__.py        |  3 --
 .../hr_employee_hierarchy_renderer.js         |  2 +-
 .../hr_employee_hierarchy_renderer.xml        |  2 +-
 .../hr_employee_hierarchy_view.js             |  2 +-
 addons/web_hierarchy/__init__.py              |  3 ++
 addons/web_hierarchy/__manifest__.py          | 29 +++++++++++++++++++
 addons/web_hierarchy/models/__init__.py       |  5 ++++
 .../models/ir_actions.py                      |  0
 .../models/ir_ui_view.py                      |  0
 .../models/models.py                          |  0
 .../static/src}/hierarchy.variables.dark.scss |  0
 .../static/src}/hierarchy.variables.scss      |  0
 .../static/src}/hierarchy_arch_parser.js      |  0
 .../static/src}/hierarchy_card.js             |  2 +-
 .../static/src}/hierarchy_card.scss           |  0
 .../static/src}/hierarchy_card.xml            |  2 +-
 .../static/src}/hierarchy_compiler.js         |  0
 .../static/src}/hierarchy_controller.js       |  2 +-
 .../static/src}/hierarchy_controller.xml      |  4 +--
 .../static/src}/hierarchy_model.js            |  0
 .../static/src}/hierarchy_node_draggable.js   |  0
 .../static/src}/hierarchy_renderer.js         |  4 +--
 .../static/src}/hierarchy_renderer.scss       |  0
 .../static/src}/hierarchy_renderer.xml        |  2 +-
 .../static/src}/hierarchy_view.js             |  2 +-
 .../static/src}/hierarchy_view.scss           |  0
 .../static/tests}/hierarchy_view_tests.js     |  0
 .../static/tests}/mock_server.js              |  0
 29 files changed, 51 insertions(+), 21 deletions(-)
 create mode 100644 addons/web_hierarchy/__init__.py
 create mode 100644 addons/web_hierarchy/__manifest__.py
 create mode 100644 addons/web_hierarchy/models/__init__.py
 rename addons/{hr_org_chart => web_hierarchy}/models/ir_actions.py (100%)
 rename addons/{hr_org_chart => web_hierarchy}/models/ir_ui_view.py (100%)
 rename addons/{hr_org_chart => web_hierarchy}/models/models.py (100%)
 rename addons/{hr_org_chart/static/src/scss => web_hierarchy/static/src}/hierarchy.variables.dark.scss (100%)
 rename addons/{hr_org_chart/static/src/scss => web_hierarchy/static/src}/hierarchy.variables.scss (100%)
 rename addons/{hr_org_chart/static/src/views/hierarchy => web_hierarchy/static/src}/hierarchy_arch_parser.js (100%)
 rename addons/{hr_org_chart/static/src/views/hierarchy => web_hierarchy/static/src}/hierarchy_card.js (97%)
 rename addons/{hr_org_chart/static/src/views/hierarchy => web_hierarchy/static/src}/hierarchy_card.scss (100%)
 rename addons/{hr_org_chart/static/src/views/hierarchy => web_hierarchy/static/src}/hierarchy_card.xml (98%)
 rename addons/{hr_org_chart/static/src/views/hierarchy => web_hierarchy/static/src}/hierarchy_compiler.js (100%)
 rename addons/{hr_org_chart/static/src/views/hierarchy => web_hierarchy/static/src}/hierarchy_controller.js (97%)
 rename addons/{hr_org_chart/static/src/views/hierarchy => web_hierarchy/static/src}/hierarchy_controller.xml (94%)
 rename addons/{hr_org_chart/static/src/views/hierarchy => web_hierarchy/static/src}/hierarchy_model.js (100%)
 rename addons/{hr_org_chart/static/src/hooks => web_hierarchy/static/src}/hierarchy_node_draggable.js (100%)
 rename addons/{hr_org_chart/static/src/views/hierarchy => web_hierarchy/static/src}/hierarchy_renderer.js (97%)
 rename addons/{hr_org_chart/static/src/views/hierarchy => web_hierarchy/static/src}/hierarchy_renderer.scss (100%)
 rename addons/{hr_org_chart/static/src/views/hierarchy => web_hierarchy/static/src}/hierarchy_renderer.xml (96%)
 rename addons/{hr_org_chart/static/src/views/hierarchy => web_hierarchy/static/src}/hierarchy_view.js (95%)
 rename addons/{hr_org_chart/static/src/views/hierarchy => web_hierarchy/static/src}/hierarchy_view.scss (100%)
 rename addons/{hr_org_chart/static/tests/views => web_hierarchy/static/tests}/hierarchy_view_tests.js (100%)
 rename addons/{hr_org_chart/static/tests/views => web_hierarchy/static/tests}/mock_server.js (100%)

diff --git a/addons/hr_org_chart/__manifest__.py b/addons/hr_org_chart/__manifest__.py
index cffc30faf74..94a4cf9ac56 100644
--- a/addons/hr_org_chart/__manifest__.py
+++ b/addons/hr_org_chart/__manifest__.py
@@ -13,8 +13,8 @@ Org Chart Widget for HR
 This module extend the employee form with a organizational chart.
 (N+1, N+2, direct subordinates)
         """,
-    'depends': ['hr'],
-    'auto_install': True,
+    'depends': ['hr', 'web_hierarchy'],
+    'auto_install': ['hr'],
     'data': [
         'views/hr_department_views.xml',
         'views/hr_views.xml',
@@ -26,13 +26,9 @@ This module extend the employee form with a organizational chart.
             'hr_org_chart/static/src/scss/variables.scss',
         ],
         'web.assets_backend': [
-            'hr_org_chart/static/src/scss/hierarchy.variables.scss',
             'hr_org_chart/static/src/fields/*',
             'hr_org_chart/static/src/views/**/*',
         ],
-        'web.assets_web_dark': [
-            ('before', 'hr_org_chart/static/src/scss/hierarchy.variables.scss', 'hr_org_chart/static/src/scss/**/*.variables.dark.scss'),
-        ],
         'web.qunit_suite_tests': [
             'hr_org_chart/static/tests/**/*',
         ],
diff --git a/addons/hr_org_chart/models/__init__.py b/addons/hr_org_chart/models/__init__.py
index b51ad54cfff..27f11d1b306 100644
--- a/addons/hr_org_chart/models/__init__.py
+++ b/addons/hr_org_chart/models/__init__.py
@@ -3,6 +3,3 @@
 
 from . import hr_org_chart_mixin
 from . import hr_employee
-from . import ir_actions
-from . import ir_ui_view
-from . import models
diff --git a/addons/hr_org_chart/static/src/views/hr_employee_hierarchy/hr_employee_hierarchy_renderer.js b/addons/hr_org_chart/static/src/views/hr_employee_hierarchy/hr_employee_hierarchy_renderer.js
index 972a1f74455..d1fceb83b74 100644
--- a/addons/hr_org_chart/static/src/views/hr_employee_hierarchy/hr_employee_hierarchy_renderer.js
+++ b/addons/hr_org_chart/static/src/views/hr_employee_hierarchy/hr_employee_hierarchy_renderer.js
@@ -2,7 +2,7 @@
 
 import { Avatar } from "@mail/views/web/fields/avatar/avatar";
 
-import { HierarchyRenderer } from "../hierarchy/hierarchy_renderer";
+import { HierarchyRenderer } from "@web_hierarchy/hierarchy_renderer";
 
 export class HrEmployeeHierarchyRenderer extends HierarchyRenderer {
    static template = "hr_org_chart.HrEmployeeHierarchyRenderer";
diff --git a/addons/hr_org_chart/static/src/views/hr_employee_hierarchy/hr_employee_hierarchy_renderer.xml b/addons/hr_org_chart/static/src/views/hr_employee_hierarchy/hr_employee_hierarchy_renderer.xml
index 760af418f3f..56b91f32b4d 100644
--- a/addons/hr_org_chart/static/src/views/hr_employee_hierarchy/hr_employee_hierarchy_renderer.xml
+++ b/addons/hr_org_chart/static/src/views/hr_employee_hierarchy/hr_employee_hierarchy_renderer.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <templates>
 
-    <t t-name="hr_org_chart.HrEmployeeHierarchyRenderer" t-inherit="hr_org_chart.HierarchyRenderer">
+    <t t-name="hr_org_chart.HrEmployeeHierarchyRenderer" t-inherit="web_hierarchy.HierarchyRenderer">
         <xpath expr="//div[hasclass('o_hierarchy_parent_node_container')]/span" position="replace">
             <Avatar
                 resModel="row.parentNode.model.resModel"
diff --git a/addons/hr_org_chart/static/src/views/hr_employee_hierarchy/hr_employee_hierarchy_view.js b/addons/hr_org_chart/static/src/views/hr_employee_hierarchy/hr_employee_hierarchy_view.js
index 05fb680dcb8..72056d189a4 100644
--- a/addons/hr_org_chart/static/src/views/hr_employee_hierarchy/hr_employee_hierarchy_view.js
+++ b/addons/hr_org_chart/static/src/views/hr_employee_hierarchy/hr_employee_hierarchy_view.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import { registry } from "@web/core/registry";
-import { hierarchyView } from "../hierarchy/hierarchy_view";
+import { hierarchyView } from "@web_hierarchy/hierarchy_view";
 import { HrEmployeeHierarchyRenderer } from "./hr_employee_hierarchy_renderer";
 
 export const hrEmployeeHierarchyView = {
diff --git a/addons/web_hierarchy/__init__.py b/addons/web_hierarchy/__init__.py
new file mode 100644
index 00000000000..d6210b1285d
--- /dev/null
+++ b/addons/web_hierarchy/__init__.py
@@ -0,0 +1,3 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import models
diff --git a/addons/web_hierarchy/__manifest__.py b/addons/web_hierarchy/__manifest__.py
new file mode 100644
index 00000000000..038439567f4
--- /dev/null
+++ b/addons/web_hierarchy/__manifest__.py
@@ -0,0 +1,29 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+{
+    'name': 'Web Hierarchy',
+    'category': 'Hidden',
+    'version': '1.0',
+    'description':
+        """
+Odoo Web Hierarchy view
+=======================
+
+This module adds a new view called to be able to define a view to display
+an organization such as an Organization Chart for employees for instance.
+        """,
+    'depends': ['web'],
+    'assets': {
+        'web.assets_backend': [
+            'web_hierarchy/static/src/hierarchy.variables.scss',
+            'web_hierarchy/static/src/**/*',
+        ],
+        'web.assets_web_dark': [
+            ('before', 'web_hierarchy/static/src/hierarchy.variables.scss', 'web_hierarchy/static/src/**/*.variables.dark.scss'),
+        ],
+        'web.qunit_suite_tests': [
+            'web_hierarchy/static/tests/**/*',
+        ],
+    },
+    'license': 'LGPL-3',
+}
diff --git a/addons/web_hierarchy/models/__init__.py b/addons/web_hierarchy/models/__init__.py
new file mode 100644
index 00000000000..89107c88c34
--- /dev/null
+++ b/addons/web_hierarchy/models/__init__.py
@@ -0,0 +1,5 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import ir_actions
+from . import ir_ui_view
+from . import models
diff --git a/addons/hr_org_chart/models/ir_actions.py b/addons/web_hierarchy/models/ir_actions.py
similarity index 100%
rename from addons/hr_org_chart/models/ir_actions.py
rename to addons/web_hierarchy/models/ir_actions.py
diff --git a/addons/hr_org_chart/models/ir_ui_view.py b/addons/web_hierarchy/models/ir_ui_view.py
similarity index 100%
rename from addons/hr_org_chart/models/ir_ui_view.py
rename to addons/web_hierarchy/models/ir_ui_view.py
diff --git a/addons/hr_org_chart/models/models.py b/addons/web_hierarchy/models/models.py
similarity index 100%
rename from addons/hr_org_chart/models/models.py
rename to addons/web_hierarchy/models/models.py
diff --git a/addons/hr_org_chart/static/src/scss/hierarchy.variables.dark.scss b/addons/web_hierarchy/static/src/hierarchy.variables.dark.scss
similarity index 100%
rename from addons/hr_org_chart/static/src/scss/hierarchy.variables.dark.scss
rename to addons/web_hierarchy/static/src/hierarchy.variables.dark.scss
diff --git a/addons/hr_org_chart/static/src/scss/hierarchy.variables.scss b/addons/web_hierarchy/static/src/hierarchy.variables.scss
similarity index 100%
rename from addons/hr_org_chart/static/src/scss/hierarchy.variables.scss
rename to addons/web_hierarchy/static/src/hierarchy.variables.scss
diff --git a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_arch_parser.js b/addons/web_hierarchy/static/src/hierarchy_arch_parser.js
similarity index 100%
rename from addons/hr_org_chart/static/src/views/hierarchy/hierarchy_arch_parser.js
rename to addons/web_hierarchy/static/src/hierarchy_arch_parser.js
diff --git a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_card.js b/addons/web_hierarchy/static/src/hierarchy_card.js
similarity index 97%
rename from addons/hr_org_chart/static/src/views/hierarchy/hierarchy_card.js
rename to addons/web_hierarchy/static/src/hierarchy_card.js
index 0c38b13f24d..0ae4002de65 100644
--- a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_card.js
+++ b/addons/web_hierarchy/static/src/hierarchy_card.js
@@ -26,7 +26,7 @@ export class HierarchyCard extends Component {
     static defaultProps = {
         classNames: "",
     };
-    static template = "hr_org_chart.HierarchyCard";
+    static template = "web_hierarchy.HierarchyCard";
     static Compiler = HierarchyCompiler;
 
     setup() {
diff --git a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_card.scss b/addons/web_hierarchy/static/src/hierarchy_card.scss
similarity index 100%
rename from addons/hr_org_chart/static/src/views/hierarchy/hierarchy_card.scss
rename to addons/web_hierarchy/static/src/hierarchy_card.scss
diff --git a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_card.xml b/addons/web_hierarchy/static/src/hierarchy_card.xml
similarity index 98%
rename from addons/hr_org_chart/static/src/views/hierarchy/hierarchy_card.xml
rename to addons/web_hierarchy/static/src/hierarchy_card.xml
index 258e479558f..8c118304dc6 100644
--- a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_card.xml
+++ b/addons/web_hierarchy/static/src/hierarchy_card.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <templates>
 
-    <t t-name="hr_org_chart.HierarchyCard">
+    <t t-name="web_hierarchy.HierarchyCard">
         <div class="o_hierarchy_node_container mb-4 d-flex flex-column" t-att-class="classNames" t-att-data-node-id="props.node.id">
             <div class="o_hierarchy_node_button_container w-100 d-flex justify-content-end">
                 <button t-if="props.node.parentResId !== false and !props.node.parentNode"
diff --git a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_compiler.js b/addons/web_hierarchy/static/src/hierarchy_compiler.js
similarity index 100%
rename from addons/hr_org_chart/static/src/views/hierarchy/hierarchy_compiler.js
rename to addons/web_hierarchy/static/src/hierarchy_compiler.js
diff --git a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_controller.js b/addons/web_hierarchy/static/src/hierarchy_controller.js
similarity index 97%
rename from addons/hr_org_chart/static/src/views/hierarchy/hierarchy_controller.js
rename to addons/web_hierarchy/static/src/hierarchy_controller.js
index 4e83a538fbe..e4f440d30e2 100644
--- a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_controller.js
+++ b/addons/web_hierarchy/static/src/hierarchy_controller.js
@@ -25,7 +25,7 @@ export class HierarchyController extends Component {
         buttonTemplate: String,
         archInfo: Object,
     };
-    static template = "hr_org_chart.HierarchyView";
+    static template = "web_hierarchy.HierarchyView";
 
     setup() {
         this.rootRef = useRef("root");
diff --git a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_controller.xml b/addons/web_hierarchy/static/src/hierarchy_controller.xml
similarity index 94%
rename from addons/hr_org_chart/static/src/views/hierarchy/hierarchy_controller.xml
rename to addons/web_hierarchy/static/src/hierarchy_controller.xml
index f014ffb3f51..f1df51f5b0e 100644
--- a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_controller.xml
+++ b/addons/web_hierarchy/static/src/hierarchy_controller.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <templates>
-    <t t-name="hr_org_chart.HierarchyButtons" owl="1">
+    <t t-name="web_hierarchy.HierarchyButtons" owl="1">
         <div class="d-flex o_grid_buttons">
             <div class="me-2" t-if="props.archInfo.activeActions.create and (!props.archInfo.createInline or displayNoContent)">
                 <button class="btn btn-primary o_hierarchy_button_add"
@@ -11,7 +11,7 @@
             </div>
         </div>
     </t>
-    <t t-name="hr_org_chart.HierarchyView" owl="1">
+    <t t-name="web_hierarchy.HierarchyView" owl="1">
         <div t-attf-class="o_hierarchy_view {{ isMobile ? 'o_action_delegate_scroll' : '' }} {{ props.className }}" t-ref="root">
             <Layout className="(model.useSampleModel ? 'o_view_sample_data' : '') + ' d-flex'" display="props.display">
                 <t t-set-slot="control-panel-additional-actions">
diff --git a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_model.js b/addons/web_hierarchy/static/src/hierarchy_model.js
similarity index 100%
rename from addons/hr_org_chart/static/src/views/hierarchy/hierarchy_model.js
rename to addons/web_hierarchy/static/src/hierarchy_model.js
diff --git a/addons/hr_org_chart/static/src/hooks/hierarchy_node_draggable.js b/addons/web_hierarchy/static/src/hierarchy_node_draggable.js
similarity index 100%
rename from addons/hr_org_chart/static/src/hooks/hierarchy_node_draggable.js
rename to addons/web_hierarchy/static/src/hierarchy_node_draggable.js
diff --git a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_renderer.js b/addons/web_hierarchy/static/src/hierarchy_renderer.js
similarity index 97%
rename from addons/hr_org_chart/static/src/views/hierarchy/hierarchy_renderer.js
rename to addons/web_hierarchy/static/src/hierarchy_renderer.js
index 4cc974b823d..b105ec3bbb7 100644
--- a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_renderer.js
+++ b/addons/web_hierarchy/static/src/hierarchy_renderer.js
@@ -7,7 +7,7 @@ import { useService } from "@web/core/utils/hooks";
 import { scrollTo } from "@web/core/utils/scrolling";
 
 import { HierarchyCard } from "./hierarchy_card";
-import { useHierarchyNodeDraggable } from "../../hooks/hierarchy_node_draggable";
+import { useHierarchyNodeDraggable } from "./hierarchy_node_draggable";
 
 export class HierarchyRenderer extends Component {
     static components = {
@@ -19,7 +19,7 @@ export class HierarchyRenderer extends Component {
         archInfo: Object,
         templates: Object,
     };
-    static template = "hr_org_chart.HierarchyRenderer";
+    static template = "web_hierarchy.HierarchyRenderer";
 
     setup() {
         this.rendererRef = useRef("renderer");
diff --git a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_renderer.scss b/addons/web_hierarchy/static/src/hierarchy_renderer.scss
similarity index 100%
rename from addons/hr_org_chart/static/src/views/hierarchy/hierarchy_renderer.scss
rename to addons/web_hierarchy/static/src/hierarchy_renderer.scss
diff --git a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_renderer.xml b/addons/web_hierarchy/static/src/hierarchy_renderer.xml
similarity index 96%
rename from addons/hr_org_chart/static/src/views/hierarchy/hierarchy_renderer.xml
rename to addons/web_hierarchy/static/src/hierarchy_renderer.xml
index f46286f3e0a..2c22a32d868 100644
--- a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_renderer.xml
+++ b/addons/web_hierarchy/static/src/hierarchy_renderer.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <templates>
 
-    <t t-name="hr_org_chart.HierarchyRenderer" owl="1">
+    <t t-name="web_hierarchy.HierarchyRenderer" owl="1">
         <div class="o_hierarchy_renderer w-100 d-flex justify-content-center" t-ref="renderer">
             <div class="o_hierarchy_container d-flex flex-column w-100 w-lg-75 h-100 pt-5 px-2">
                 <t t-foreach="rows" t-as="row" t-key="row_index">
diff --git a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_view.js b/addons/web_hierarchy/static/src/hierarchy_view.js
similarity index 95%
rename from addons/hr_org_chart/static/src/views/hierarchy/hierarchy_view.js
rename to addons/web_hierarchy/static/src/hierarchy_view.js
index abf7e4dca95..a868252b3ff 100644
--- a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_view.js
+++ b/addons/web_hierarchy/static/src/hierarchy_view.js
@@ -17,7 +17,7 @@ export const hierarchyView = {
     Controller: HierarchyController,
     Model: HierarchyModel,
     Renderer: HierarchyRenderer,
-    buttonTemplate: "hr_org_chart.HierarchyButtons",
+    buttonTemplate: "web_hierarchy.HierarchyButtons",
     searchMenuTypes: [],
 
     props: (genericProps, view) => {
diff --git a/addons/hr_org_chart/static/src/views/hierarchy/hierarchy_view.scss b/addons/web_hierarchy/static/src/hierarchy_view.scss
similarity index 100%
rename from addons/hr_org_chart/static/src/views/hierarchy/hierarchy_view.scss
rename to addons/web_hierarchy/static/src/hierarchy_view.scss
diff --git a/addons/hr_org_chart/static/tests/views/hierarchy_view_tests.js b/addons/web_hierarchy/static/tests/hierarchy_view_tests.js
similarity index 100%
rename from addons/hr_org_chart/static/tests/views/hierarchy_view_tests.js
rename to addons/web_hierarchy/static/tests/hierarchy_view_tests.js
diff --git a/addons/hr_org_chart/static/tests/views/mock_server.js b/addons/web_hierarchy/static/tests/mock_server.js
similarity index 100%
rename from addons/hr_org_chart/static/tests/views/mock_server.js
rename to addons/web_hierarchy/static/tests/mock_server.js