From a43b8c6805a9fe1f6eb8b0ce622bc01b53b230fc Mon Sep 17 00:00:00 2001
From: Renaud Thiry <reth@odoo.com>
Date: Tue, 15 Nov 2022 15:39:03 +0000
Subject: [PATCH 1/3] [FIX] calendar: hide 'sync' options from users

Issue
When the google and outlook sync plugins are not installed the admin user should see an option to install them from the calendar but other users should not see anything.

Fix
This replaces the 'groups' attribute in the calendar controller template with a t-if and a dynamic check as OWL doesn't process 'groups'.

task - 3056311

X-original-commit: 4d5b7d4b5347c958f37b8f40e9edfae7cd78c2ca
Part-of: odoo/odoo#106517
---
 .../views/attendee_calendar/attendee_calendar_controller.js   | 3 ++-
 .../views/attendee_calendar/attendee_calendar_controller.xml  | 4 ++--
 addons/google_calendar/static/tests/google_calendar_tests.js  | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.js b/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.js
index ea97dee6e90..cd3652d08e8 100644
--- a/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.js
+++ b/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.js
@@ -4,11 +4,12 @@ import { CalendarController } from "@web/views/calendar/calendar_controller";
 import { useService } from "@web/core/utils/hooks";
 
 export class AttendeeCalendarController extends CalendarController {
-    setup() {
+    async setup() {
         super.setup();
         this.actionService = useService("action");
         this.user = useService("user");
         this.orm = useService("orm");
+        this.isSystemUser = await this.user.hasGroup('base.group_system');
     }
 
     onClickAddButton() {
diff --git a/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml b/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml
index ce655e77a92..968e65fd26d 100644
--- a/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml
+++ b/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml
@@ -2,10 +2,10 @@
 <templates>
     <t t-name="calendar.AttendeeCalendarController" t-inherit="web.CalendarController" t-inherit-mode="primary" owl="1">
         <DatePicker position="after">
-            <div class="o_calendar_sync text-center" groups="base.group_system">
+            <div id="calendar_sync_title" class="o_calendar_sync text-center" t-if="isSystemUser">
                 <span class="text-primary fs-6">Synchronize with:</span>
             </div>
-            <div id="calendar_sync" class="container inline btn-group justify-content-evenly align-items-center" groups="base.group_system">
+            <div id="calendar_sync" class="container inline btn-group justify-content-evenly align-items-center" t-if="isSystemUser">
                 <div id="google_calendar_sync" class="o_calendar_sync">
                     <button type="button" id="google_sync_activate" class="btn btn-muted" t-on-click="() => this.configureCalendarProviderSync('google')">
                         <b><i class='fa fa-plug'/> Google</b>
diff --git a/addons/google_calendar/static/tests/google_calendar_tests.js b/addons/google_calendar/static/tests/google_calendar_tests.js
index 0ef7d4e89f2..5a9199ca7b9 100644
--- a/addons/google_calendar/static/tests/google_calendar_tests.js
+++ b/addons/google_calendar/static/tests/google_calendar_tests.js
@@ -126,6 +126,8 @@ QUnit.module('Google Calendar', {
                     assert.step(route);
                 } else if (route === '/web/dataset/call_kw/res.partner/get_attendee_detail') {
                     return Promise.resolve([]);
+                } else if (route === '/web/dataset/call_kw/res.users/has_group') {
+                    return Promise.resolve(true);
                 }
             },
         });

From 13db30cba55b13a3ffb653ffb63aa0dc69d7a208 Mon Sep 17 00:00:00 2001
From: Renaud Thiry <reth@odoo.com>
Date: Tue, 15 Nov 2022 15:44:09 +0000
Subject: [PATCH 2/3] [FIX] calendar: show calendar sync when installed

## Issue

Regular users were not able to see the sync button
used to sync with external calendar services even after
these services were configured

## Fix

Conditionally display the whole sync section until one of the
services is configured.

Override the display conditions when one of the relevant modules are
installed.

task - 3056311

X-original-commit: 29f820cfd421859a2b480725ba2a81a515509b88
Part-of: odoo/odoo#106517
---
 .../attendee_calendar_controller.xml          | 26 ++++++++++---------
 .../google_calendar_controller.xml            |  3 +++
 .../microsoft_calendar_controller.xml         |  3 +++
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml b/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml
index 968e65fd26d..2184962d6f8 100644
--- a/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml
+++ b/addons/calendar/static/src/views/attendee_calendar/attendee_calendar_controller.xml
@@ -2,19 +2,21 @@
 <templates>
     <t t-name="calendar.AttendeeCalendarController" t-inherit="web.CalendarController" t-inherit-mode="primary" owl="1">
         <DatePicker position="after">
-            <div id="calendar_sync_title" class="o_calendar_sync text-center" t-if="isSystemUser">
-                <span class="text-primary fs-6">Synchronize with:</span>
-            </div>
-            <div id="calendar_sync" class="container inline btn-group justify-content-evenly align-items-center" t-if="isSystemUser">
-                <div id="google_calendar_sync" class="o_calendar_sync">
-                    <button type="button" id="google_sync_activate" class="btn btn-muted" t-on-click="() => this.configureCalendarProviderSync('google')">
-                        <b><i class='fa fa-plug'/> Google</b>
-                    </button>
+            <div id="calendar_sync_wrapper" t-if="isSystemUser">
+                <div id="calendar_sync_title" class="o_calendar_sync text-center">
+                    <span class="text-primary fs-6">Synchronize with:</span>
                 </div>
-                <div id="microsoft_calendar_sync" class="o_calendar_sync">
-                    <button type="button" id="microsoft_sync_activate" class="btn btn-muted" t-on-click="() => this.configureCalendarProviderSync('microsoft')">
-                        <b><i class='fa fa-plug'/> Outlook</b>
-                    </button>
+                <div id="calendar_sync" class="container inline btn-group justify-content-evenly align-items-center">
+                    <div id="google_calendar_sync" class="o_calendar_sync" t-if="isSystemUser">
+                        <button type="button" id="google_sync_activate" class="btn btn-muted" t-on-click="() => this.configureCalendarProviderSync('google')">
+                            <b><i class='fa fa-plug'/> Google</b>
+                        </button>
+                    </div>
+                    <div id="microsoft_calendar_sync" class="o_calendar_sync" t-if="isSystemUser">
+                        <button type="button" id="microsoft_sync_activate" class="btn btn-muted" t-on-click="() => this.configureCalendarProviderSync('microsoft')">
+                            <b><i class='fa fa-plug'/> Outlook</b>
+                        </button>
+                    </div>
                 </div>
             </div>
         </DatePicker>
diff --git a/addons/google_calendar/static/src/views/google_calendar/google_calendar_controller.xml b/addons/google_calendar/static/src/views/google_calendar/google_calendar_controller.xml
index f97a9334d1d..d3bb0b13e28 100644
--- a/addons/google_calendar/static/src/views/google_calendar/google_calendar_controller.xml
+++ b/addons/google_calendar/static/src/views/google_calendar/google_calendar_controller.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates>
     <t t-name="google_calendar.GoogleCalendarController" t-inherit="calendar.AttendeeCalendarController" t-inherit-mode="extension" owl="1">
+        <xpath expr="//div[@id='calendar_sync_wrapper']" position="attributes">
+            <attribute name="t-if">true</attribute>
+        </xpath>
         <xpath expr="//div[@id='google_calendar_sync']" position="replace">
             <div id="google_calendar_sync" class="o_calendar_sync">
                 <button t-if="!model.googleIsSync" type="button" id="google_sync_pending" class="o_google_sync_button o_google_sync_pending btn btn-secondary btn" t-on-click="onGoogleSyncCalendar">
diff --git a/addons/microsoft_calendar/static/src/views/microsoft_calendar/microsoft_calendar_controller.xml b/addons/microsoft_calendar/static/src/views/microsoft_calendar/microsoft_calendar_controller.xml
index 537164b4781..87917413dde 100644
--- a/addons/microsoft_calendar/static/src/views/microsoft_calendar/microsoft_calendar_controller.xml
+++ b/addons/microsoft_calendar/static/src/views/microsoft_calendar/microsoft_calendar_controller.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <templates>
     <t t-name="microsoft_calendar.MicrosoftCalendarController" t-inherit="calendar.AttendeeCalendarController" t-inherit-mode="extension" owl="1">
+        <xpath expr="//div[@id='calendar_sync_wrapper']" position="attributes">
+            <attribute name="t-if">true</attribute>
+        </xpath>
         <xpath expr="//div[@id='microsoft_calendar_sync']" position="replace">
             <div id="microsoft_calendar_sync" class="o_calendar_sync">
                 <button t-if="!model.microsoftIsSync" type="button" id="microsoft_sync_pending" class="o_microsoft_sync_button o_microsoft_sync_pending btn btn-secondary btn" t-on-click="onMicrosoftSyncCalendar">

From 53cad6f9f7ba7c258e22eeff5112c2b4ccbc4aaf Mon Sep 17 00:00:00 2001
From: Renaud Thiry <reth@odoo.com>
Date: Tue, 15 Nov 2022 15:46:17 +0000
Subject: [PATCH 3/3] [FIX] calendar: show dialog when sync unconfigured

## Issue

Currently if an administrator installs one of the sync modules but does
not set any credentials. If the user tries to sync their calendar
they are met with an error.

## Fix

Make sure they get a clear dialog explaining why they cannot sync.

task - 3056311

X-original-commit: 6ec6a3764c5e5460aa8a1cdfa228740606fdfe13
Part-of: odoo/odoo#106517
---
 .../google_calendar_controller.js             | 20 ++++++++++---------
 .../microsoft_calendar_controller.js          | 20 ++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/addons/google_calendar/static/src/views/google_calendar/google_calendar_controller.js b/addons/google_calendar/static/src/views/google_calendar/google_calendar_controller.js
index 601a1c2aed3..407a6b25315 100644
--- a/addons/google_calendar/static/src/views/google_calendar/google_calendar_controller.js
+++ b/addons/google_calendar/static/src/views/google_calendar/google_calendar_controller.js
@@ -19,15 +19,17 @@ patch(AttendeeCalendarController.prototype, "google_calendar_google_calendar_con
             [[this.user.userId]],
         );
         const syncResult = await this.model.syncGoogleCalendar();
-        if (syncResult.status === "need_auth") {
-            this.configureCalendarProviderSync("google");
-        } else if (syncResult.status === "need_config_from_admin") {
-            if (Number.isInteger(syncResult.action)) {
-                this.dialog.add(ConfirmationDialog, {
-                    title: this.env._t("Configuration"),
-                    body: this.env._t("The Google Synchronization needs to be configured before you can use it, do you want to do it now?"),
-                    confirm: this.actionService.doAction.bind(this.actionService, syncResult.action),
-                });
+        if (["need_auth", "need_config_from_admin"].includes(syncResult.status)) {
+            if (this.isSystemUser) {
+                if (syncResult.status === "need_auth") {
+                    this.configureCalendarProviderSync("google");
+                } else if (syncResult.status === "need_config_from_admin") {
+                    this.dialog.add(ConfirmationDialog, {
+                        title: this.env._t("Configuration"),
+                        body: this.env._t("The Google Synchronization needs to be configured before you can use it, do you want to do it now?"),
+                        confirm: this.actionService.doAction.bind(this.actionService, syncResult.action),
+                    });
+                }
             } else {
                 this.dialog.add(AlertDialog, {
                     title: this.env._t("Configuration"),
diff --git a/addons/microsoft_calendar/static/src/views/microsoft_calendar/microsoft_calendar_controller.js b/addons/microsoft_calendar/static/src/views/microsoft_calendar/microsoft_calendar_controller.js
index 59dd7494946..39bd5e77e1a 100644
--- a/addons/microsoft_calendar/static/src/views/microsoft_calendar/microsoft_calendar_controller.js
+++ b/addons/microsoft_calendar/static/src/views/microsoft_calendar/microsoft_calendar_controller.js
@@ -19,15 +19,17 @@ patch(AttendeeCalendarController.prototype, "microsoft_calendar_microsoft_calend
             [[this.user.userId]],
         );
         const syncResult = await this.model.syncMicrosoftCalendar();
-        if (syncResult.status === "need_auth") {
-            this.configureCalendarProviderSync("microsoft");
-        } else if (syncResult.status === "need_config_from_admin") {
-            if (Number.isInteger(syncResult.action)) {
-                this.dialog.add(ConfirmationDialog, {
-                    title: this.env._t("Configuration"),
-                    body: this.env._t("The Outlook Synchronization needs to be configured before you can use it, do you want to do it now?"),
-                    confirm: this.actionService.doAction.bind(this.actionService, syncResult.action),
-                });
+        if (["need_auth", "need_config_from_admin"].includes(syncResult.status)) {
+            if (this.isSystemUser) {
+                if (syncResult.status === "need_auth") {
+                    this.configureCalendarProviderSync("microsoft");
+                } else if (syncResult.status === "need_config_from_admin") {
+                    this.dialog.add(ConfirmationDialog, {
+                        title: this.env._t("Configuration"),
+                        body: this.env._t("The Outlook Synchronization needs to be configured before you can use it, do you want to do it now?"),
+                        confirm: this.actionService.doAction.bind(this.actionService, syncResult.action),
+                    });
+                }
             } else {
                 this.dialog.add(AlertDialog, {
                     title: this.env._t("Configuration"),