From 4e41bc3d1b72576f8a53f95a9e9a6063f4e28506 Mon Sep 17 00:00:00 2001
From: Leonardo Pavan Rocha <lpr@odoo.com>
Date: Thu, 2 Nov 2023 14:29:43 +0100
Subject: [PATCH] [FIX] calendar: move calendar integration from cog menu to
 module settings

Currently the calendar integration can be accessed from the cog menu when in
the calendar module in the calendar view. However, it is a bit hidden. This
commit removes the button for calendar integration in the cog menu and also we
move the calendar integration settings from the general settings to a new
calendar specific settings page.

task-3570053

Part-of: odoo/odoo#139736
---
 .../views/res_config_settings_views.xml       | 12 -----
 addons/calendar/__manifest__.py               |  1 +
 .../calendar_sync_cog_menu.js                 | 44 -------------------
 .../calendar_sync_cog_menu.xml                |  8 ----
 addons/calendar/views/calendar_views.xml      | 19 +++++++-
 .../views/res_config_settings_views.xml       | 28 ++++++++++++
 .../views/res_config_settings_views.xml       |  2 +-
 .../views/res_config_settings_views.xml       |  2 +-
 8 files changed, 49 insertions(+), 67 deletions(-)
 delete mode 100644 addons/calendar/static/src/components/calendar_sync_cog_menu/calendar_sync_cog_menu.js
 delete mode 100644 addons/calendar/static/src/components/calendar_sync_cog_menu/calendar_sync_cog_menu.xml
 create mode 100644 addons/calendar/views/res_config_settings_views.xml

diff --git a/addons/base_setup/views/res_config_settings_views.xml b/addons/base_setup/views/res_config_settings_views.xml
index 76adcdea10e..8254d1b65e7 100644
--- a/addons/base_setup/views/res_config_settings_views.xml
+++ b/addons/base_setup/views/res_config_settings_views.xml
@@ -140,18 +140,6 @@
                             <setting string="Mail Plugin" documentation="/applications/productivity/mail_plugins.html" help="Integrate with mail client plugins" id="mail_pluggin_setting">
                                 <field name="module_mail_plugin" />
                             </setting>
-                            <setting string="Outlook Calendar" documentation="/applications/productivity/calendar/outlook.html" help="Synchronize your calendar with Outlook" id="sync_outlook_calendar_setting">
-                                <field name="module_microsoft_calendar" />
-                                <div class="content-group" invisible="not module_microsoft_calendar" id="msg_module_microsoft_calendar">
-                                    <div class="text-warning mt16"><strong>Save</strong> this page and come back here to set up the feature.</div>
-                                </div>
-                            </setting>
-                            <setting string="Google Calendar" documentation="/applications/productivity/calendar/google.html" help="Synchronize your calendar with Google Calendar" id="sync_google_calendar_setting">
-                                <field name="module_google_calendar"/>
-                                <div class="content-group" invisible="not module_google_calendar" id="msg_module_google_calendar">
-                                    <div class="text-warning mt16"><strong>Save</strong> this page and come back here to set up the feature.</div>
-                                </div>
-                            </setting>
                             <div id="product_get_pic_setting"/>
                             <setting string="OAuth Authentication" help="Use external accounts to log in (Google, Facebook, etc.)" id="module_auth_oauth">
                                 <field name="module_auth_oauth" />
diff --git a/addons/calendar/__manifest__.py b/addons/calendar/__manifest__.py
index b4919c79173..d1eb6d1126c 100644
--- a/addons/calendar/__manifest__.py
+++ b/addons/calendar/__manifest__.py
@@ -34,6 +34,7 @@ If you need to manage your meetings, you should install the CRM module.
         'views/mail_activity_views.xml',
         'views/calendar_templates.xml',
         'views/calendar_views.xml',
+        'views/res_config_settings_views.xml',
         'views/res_partner_views.xml',
         'wizard/calendar_provider_config.xml',
         'wizard/calendar_popover_delete_wizard.xml',
diff --git a/addons/calendar/static/src/components/calendar_sync_cog_menu/calendar_sync_cog_menu.js b/addons/calendar/static/src/components/calendar_sync_cog_menu/calendar_sync_cog_menu.js
deleted file mode 100644
index fc7b45ea215..00000000000
--- a/addons/calendar/static/src/components/calendar_sync_cog_menu/calendar_sync_cog_menu.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/** @odoo-module */
-
-import { _t } from "@web/core/l10n/translation";
-import { registry } from "@web/core/registry";
-import { Component } from "@odoo/owl";
-import { useService } from "@web/core/utils/hooks";
-import { DropdownItem } from "@web/core/dropdown/dropdown_item";
-
-const cogMenuRegistry = registry.category("cogMenu");
-
-export class CalendarSyncCogMenu extends Component {
-    static props = {};
-    static template = "calendar.CalendarSyncCogMenu";
-    static components = { DropdownItem };
-
-    setup() {
-        this.actionService = useService("action");
-    }
-
-    startCalendarSync() {
-        this.actionService.doAction({
-            name: _t('Connect your Calendar'),
-            type: 'ir.actions.act_window',
-            res_model: 'calendar.provider.config',
-            views: [[false, "form"]],
-            view_mode: "form",
-            target: 'new',
-            context: {
-                'dialog_size': 'medium',
-            }
-        });
-    }
-};
-
-cogMenuRegistry.add(
-    'calendar-sync-cog-menu',
-    {
-        Component: CalendarSyncCogMenu,
-        groupNumber: 10,
-        isDisplayed: ({ config }) => {
-            return config.viewSubType === "attendee_calendar";
-        },
-    },
-);
diff --git a/addons/calendar/static/src/components/calendar_sync_cog_menu/calendar_sync_cog_menu.xml b/addons/calendar/static/src/components/calendar_sync_cog_menu/calendar_sync_cog_menu.xml
deleted file mode 100644
index 93781d2d613..00000000000
--- a/addons/calendar/static/src/components/calendar_sync_cog_menu/calendar_sync_cog_menu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<templates>
-    <t t-name="calendar.CalendarSyncCogMenu">
-        <DropdownItem class="'o_calendar_sync_menu'" onSelected.bind="startCalendarSync">
-            <i class="fa fa-fw fa-calendar me-1"/>Add integrations
-        </DropdownItem>
-    </t>
-</templates>
diff --git a/addons/calendar/views/calendar_views.xml b/addons/calendar/views/calendar_views.xml
index 8539b2f4d6a..c94d2c23b05 100644
--- a/addons/calendar/views/calendar_views.xml
+++ b/addons/calendar/views/calendar_views.xml
@@ -468,6 +468,14 @@
         <field name="context">{'dialog_size': 'medium'}</field>
     </record>
 
+    <record id="calendar_settings_action" model="ir.actions.act_window">
+        <field name="name">Settings</field>
+        <field name="res_model">res.config.settings</field>
+        <field name="view_mode">form</field>
+        <field name="target">inline</field>
+        <field name="context">{'module' : 'calendar', 'bin_size': False}</field>
+    </record>
+
     <!-- Menus -->
     <menuitem
         id="mail_menu_calendar"
@@ -490,12 +498,21 @@
         name="Configuration"
         sequence="40"
         action="calendar.action_calendar_event"
-        groups="base.group_no_one"/>
+        groups="base.group_system,base.group_no_one"/>
+
+    <menuitem
+        id="menu_calendar_settings"
+        parent="calendar_menu_config"
+        name="Settings"
+        sequence="45"
+        action="calendar_settings_action"
+        groups="base.group_system"/>
 
     <menuitem
         id="calendar_submenu_reminders"
         parent="calendar_menu_config"
         name="Reminders"
+        sequence="50"
         action="action_calendar_alarm"
         groups="base.group_no_one"/>
 
diff --git a/addons/calendar/views/res_config_settings_views.xml b/addons/calendar/views/res_config_settings_views.xml
new file mode 100644
index 00000000000..86caf743290
--- /dev/null
+++ b/addons/calendar/views/res_config_settings_views.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.calendar</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="base.res_config_settings_view_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//form" position="inside">
+                <app data-string="Calendar" string="Calendar" name="calendar" groups="base.group_system">
+                    <block title="Calendar Settings" name="calendar">
+                        <setting string="Outlook Calendar" documentation="/applications/productivity/calendar/outlook.html" help="Synchronize your calendar with Outlook" id="sync_outlook_calendar_setting">
+                            <field name="module_microsoft_calendar" />
+                            <div class="content-group" invisible="not module_microsoft_calendar" id="msg_module_microsoft_calendar">
+                                <div class="text-warning mt16"><strong>Save</strong> this page and come back here to set up the feature.</div>
+                            </div>
+                        </setting>
+                        <setting string="Google Calendar" documentation="/applications/productivity/calendar/google.html" help="Synchronize your calendar with Google Calendar" id="sync_google_calendar_setting">
+                            <field name="module_google_calendar"/>
+                            <div class="content-group" invisible="not module_google_calendar" id="msg_module_google_calendar">
+                                <div class="text-warning mt16"><strong>Save</strong> this page and come back here to set up the feature.</div>
+                            </div>
+                        </setting>
+                    </block>
+                </app>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/addons/google_calendar/views/res_config_settings_views.xml b/addons/google_calendar/views/res_config_settings_views.xml
index 2232ae20bbe..41523d8a5e1 100644
--- a/addons/google_calendar/views/res_config_settings_views.xml
+++ b/addons/google_calendar/views/res_config_settings_views.xml
@@ -3,7 +3,7 @@
         <record id="res_config_settings_view_form" model="ir.ui.view">
             <field name="name">res.config.settings.view.form.inherit.google.calendar</field>
             <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
+            <field name="inherit_id" ref="calendar.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <div id="msg_module_google_calendar" position="replace">
                     <div class="content-group" invisible="not module_google_calendar">
diff --git a/addons/microsoft_calendar/views/res_config_settings_views.xml b/addons/microsoft_calendar/views/res_config_settings_views.xml
index 2b88df4e1a9..e824636f176 100644
--- a/addons/microsoft_calendar/views/res_config_settings_views.xml
+++ b/addons/microsoft_calendar/views/res_config_settings_views.xml
@@ -3,7 +3,7 @@
         <record id="res_config_settings_view_form" model="ir.ui.view">
             <field name="name">res.config.settings.view.form.inherit.microsoft.calendar</field>
             <field name="model">res.config.settings</field>
-            <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
+            <field name="inherit_id" ref="calendar.res_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <div id="msg_module_microsoft_calendar" position="replace">
                     <div class="content-group" invisible="not module_microsoft_calendar">