Merge branch 'issue548_notifs_buttons' into 'master'

notification toggle read: correct js syntax

See merge request Chill-Projet/chill-bundles!404

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to
 ## Unreleased
 
 <!-- write down unreleased development here -->
+* [main] notification toggle read: correct js syntax for compilation in production (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/548)
 * [parcours] Display of interlocuteurs changed to flex-table in parcours edit page to prevent cut-off of information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/535)
 * [activity] espace entre les boutons pour supprimer les documents
 
@@ -138,6 +139,7 @@ and this project adheres to
 * [address]: Correction residential address 'depuis le' (https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/459)
 * [Documents]: List view adapted to display more information (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/414)
 * [Thirdparty_contact]: address blurred if confidential in view page (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/450)
+* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
 
 
 ### test release 2021-02-01
@@ -160,18 +162,9 @@ and this project adheres to
 * [fast_actions] improve fast-actions buttons override mechanism, fix https://gitlab.com/champs-libres/departement-de-la-vendee/accent-suivi-developpement/-/issues/413
 * [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
 * [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
-
-
-## Test releases
-=======
 * [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
->>>>>>> issue422_and_others_on_AddPersons
 
-=======
-* [homepage widget] add vue homepage_widget with asynchone loading, give a global view resume of the user concerned actions, notifications, etc.
-* [thirdparty] Add a contact to a thirdparty from within onTheFly (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/345)
 
->>>>>>> b0d50d315c8e00959a967badac9cf5057ab2b4bc
 ### test release 2021-01-31
 
 * [person] accompanying course: optimisation: do not fetch some resources for the banner (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/409)

src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read.js

@@ -8,30 +8,31 @@ window.addEventListener('DOMContentLoaded', function (e) {
     document.querySelectorAll('.notification_toggle_read_status')
         .forEach(function (el, i) {
             createApp({
-                template: '<notification-read-toggle ' +
+                template: `<notification-read-toggle
-                    ':notificationId="notificationId" ' +
+                    :notificationId="notificationId"
-                    ':buttonClass="buttonClass" ' +
+                    :buttonClass="buttonClass"
-                    ':buttonNoText="buttonNoText" ' +
+                    :buttonNoText="buttonNoText"
-                    ':showUrl="showUrl" ' +
+                    :showUrl="showUrl"
-                    ':isRead="isRead"' +
+                    :isRead="isRead"
-                    '@markRead="onMarkRead" @markUnread="onMarkUnread"' +
+                    @markRead="onMarkRead"
-                    '></notification-read-toggle>',
+                    @markUnread="onMarkUnread">
+                </notification-read-toggle>`,
                 components: {
                     NotificationReadToggle,
                 },
                 data() {
                     return {
-                        notificationId: +el.dataset.notificationId,
+                        notificationId: el.dataset.notificationId,
                         buttonClass: el.dataset.buttonClass,
                         buttonNoText: 'false' === el.dataset.buttonText,
                         showUrl: el.dataset.showButtonUrl,
-                        isRead: 1 === +el.dataset.notificationCurrentIsRead,
+                        isRead: 1 === el.dataset.notificationCurrentIsRead,
                         container: el.dataset.container
                     }
                 },
                 computed: {
                     getContainer() {
-                        return document.querySelectorAll('div.' + this.container);
+                        return document.querySelectorAll(`div.${this.container}`);
                     }
                 },
                 methods: {

src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue

@@ -81,7 +81,7 @@ export default {
         /// [Option] showUrl is href for show page second button.
         //  When passed, the component return a button-group with 2 buttons.
         isButtonGroup() {
-            return !!this.showUrl
+            return this.showUrl;
         }
     },
     methods: {