Fix selectors in the Nextcloud Calendar recipe (#472)

Script and CSS was updated to add selectors for the latest Nextcloud
(27).
Previous selectors were left as is for backwards compatibility.

3 files changed, 42 insertions, 35 deletions

diff --git a/recipes/nextcloud-calendar/package.json b/recipes/nextcloud-calendar/package.json
index 6505652..3a21661 100644
--- a/recipes/nextcloud-calendar/package.json
+++ b/recipes/nextcloud-calendar/package.json
@@ -1,7 +1,7 @@
 {
   "id": "nextcloud-calendar",
   "name": "Nextcloud Calendar",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "license": "MIT",
   "repository": "https://github.com/csolisr/ferdium-recipes/tree/master/recipes/nextcloud-calendar/",
   "config": {
diff --git a/recipes/nextcloud-calendar/service.css b/recipes/nextcloud-calendar/service.css
index 6e04c63..000a634 100644
--- a/recipes/nextcloud-calendar/service.css
+++ b/recipes/nextcloud-calendar/service.css
@@ -1,41 +1,47 @@
-/* Hide all app links and contacts menu link in the top menu except for
-Calendar */
-#appmenu li:not([data-id="calendar"]),
-#contactsmenu {
+/*
+With `/* Legacy [asterisk]/` are marked those selectors that were working for
+some Nextcloud version before 27 (24 or 25).
+*/
+
+/*Hide all interactive elements that are not related to the Calendar. */
+/* App links and contacts menu link in the top menu except for Calendar */
+#appmenu li:not([data-id="calendar"]),  /* Legacy */
+.app-menu-main > .app-menu-entry:not([data-app-id="calendar"]), /* Nextcloud 27 */
+#unified-search,
+#contactsmenu,
+/* All settings options, except the option to log out */
+#settings #expanddiv li:not([data-id='logout']),  /* Legacy */
+#header-menu-user-menu li:not([id='logout']),  /* Nextcloud 27 */
+/* Notifications that are not related to Calendar */
+.notifications .notification-wrapper .notification:not([object_type="dav"]),  /* Legacy */
+.notification-container .notification-wrapper .notification:not([data-app="dav"]),  /* Nextcloud 27 */
+/* "Dismiss all notifications" as this action will dismiss also hidden
+notifications as this behaviour might not be desirable. */
+.notification-wrapper .dismiss-all, /* Legacy */
+.notification-container .dismiss-all  /* Nextcloud 27 */ {
   display: none;
 }
 
 /* Change the cursor to default for top menu Nextcloud home and Calendar
 links and disable them */
 #nextcloud,
-#appmenu li[data-id="calendar"] a {
-    cursor:default;
+#appmenu li[data-id="calendar"] a,  /* Legacy */
+.app-menu-main li[data-app-id="calendar"] a  /* Nextcloud 27 */ {
+    cursor: default;
     pointer-events: none;
 }
 
-/* Hide all settings options, except the option to log out */
-#settings #expanddiv li:not([data-id='logout']) {
-  display: none;
-}
-
 /* Fix the margin of the dropdown */
-#settings #expanddiv,
-#settings #expanddiv > ul {
-  min-height: 0;
+#settings #expanddiv,  /* Legacy */
+#settings #expanddiv > ul,  /* Legacy */
+#header-menu-notifications,  /* Nextcloud 27 */
+#header-menu-notifications > .header-menu__content,  /* Nextcloud 27 */
+#header-menu-user-menu,  /* Nextcloud 27 */
+#header-menu-user-menu > .header-menu__content  /* Nextcloud 27 */ {
+  min-height: auto;
 }
 
 /* Hide "More" link in the top menu */
 #more-apps {
   display: none !important;
 }
-
-/* Hide notifications that are not related to calendar */
-.notifications .notification-wrapper .notification:not([object_type="dav"]) {
-    display: none;
-}
-
-/* Hide "Dismiss all notifications" as this action will dismiss also hidden
-notifications */
-.notification-wrapper .dismiss-all {
-  display: none;
-}
diff --git a/recipes/nextcloud-calendar/webview.js b/recipes/nextcloud-calendar/webview.js
index 2755cab..3ff240f 100644
--- a/recipes/nextcloud-calendar/webview.js
+++ b/recipes/nextcloud-calendar/webview.js
@@ -5,18 +5,19 @@ function _interopRequireDefault(obj) {
 const _path = _interopRequireDefault(require('path'));
 
 module.exports = Ferdium => {
+  // With `// Legacy ` are marked those selectors that were working for some
+  // Nextcloud version before 27 (24 or 25).
+  const notificationElement = '.notification-wrapper .notification';
   const getMessages = () => {
-    const directSelector = document.querySelectorAll(
-      '.notifications .notification-wrapper .notification[object_type="dav"]',
+    Ferdium.setBadge(
+      Ferdium.safeParseInt(
+        document.querySelectorAll(
+          `.notifications ${notificationElement}[object_type="dav"], ` + // Legacy
+            `.notification-container ${notificationElement}[data-app="dav"]`, // Nextcloud 27
+        )?.length,
+      ),
     );
-    const direct = directSelector
-      ? Ferdium.safeParseInt(directSelector.length)
-      : 0;
-
-    Ferdium.setBadge(direct);
   };
-
   Ferdium.loop(getMessages);
-
   Ferdium.injectCSS(_path.default.join(__dirname, 'service.css'));
 };