Merge branch 'main' of https://github.com/hotwax/bopis into partial_o…

…rder_rejection/#285

src/components/NotificationPreferenceModal.vue

@@ -53,10 +53,7 @@ import { translate } from "@/i18n";
 import { showToast } from "@/utils";
 import emitter from "@/event-bus"
 import { generateTopicName } from "@/utils/firebase";
-import {
-  subscribeTopic,
-  unsubscribeTopic
-} from '@/adapter';
+import { subscribeTopic, unsubscribeTopic } from '@/adapter'
 
 export default defineComponent({
   name: "NotificationPreferenceModal",
@@ -78,7 +75,7 @@ export default defineComponent({
   data() {
     return {
       notificationPrefState: {} as any,
-      notificationPrefToUpate: {
+      notificationPrefToUpdate: {
         subscribe: [],
         unsubscribe: []
       } as any,
@@ -115,16 +112,16 @@ export default defineComponent({
       // running when the ion-toggle hydrates and hence, updated the 
       // initialNotificationPrefState here
       const value = !event.target.checked
-      // updates the notificationPrefToUpate to check which pref
+      // updates the notificationPrefToUpdate to check which pref
       // values were updated from their initial values
       if (value !== this.initialNotificationPrefState[enumId]) {
         value
-          ? this.notificationPrefToUpate.subscribe.push(enumId)
-          : this.notificationPrefToUpate.unsubscribe.push(enumId)
+          ? this.notificationPrefToUpdate.subscribe.push(enumId)
+          : this.notificationPrefToUpdate.unsubscribe.push(enumId)
       } else {
         !value
-          ? this.notificationPrefToUpate.subscribe.splice(this.notificationPrefToUpate.subscribe.indexOf(enumId), 1)
-          : this.notificationPrefToUpate.unsubscribe.splice(this.notificationPrefToUpate.subscribe.indexOf(enumId), 1)
+          ? this.notificationPrefToUpdate.subscribe.splice(this.notificationPrefToUpdate.subscribe.indexOf(enumId), 1)
+          : this.notificationPrefToUpdate.unsubscribe.splice(this.notificationPrefToUpdate.subscribe.indexOf(enumId), 1)
       }
 
       // updating this.notificationPrefState as it is used to
@@ -133,7 +130,6 @@ export default defineComponent({
       this.notificationPrefState[enumId] = value
     },
     async updateNotificationPref() {
-      // TODO disbale button if initial and final are same
       // added loader as the API call is in pending state for too long, blocking the flow
       emitter.emit("presentLoader");
       try {
@@ -148,13 +144,13 @@ export default defineComponent({
       const ofbizInstanceName = this.userProfile.ofbizInstanceName
       const facilityId = (this.currentFacility as any).facilityId
       const subscribeRequests = [] as any
-      this.notificationPrefToUpate.subscribe.map(async (enumId: string) => {
+      this.notificationPrefToUpdate.subscribe.map(async (enumId: string) => {
         const topicName = generateTopicName(ofbizInstanceName, facilityId, enumId)
         await subscribeRequests.push(subscribeTopic(topicName, process.env.VUE_APP_NOTIF_APP_ID))
       })
 
       const unsubscribeRequests = [] as any
-      this.notificationPrefToUpate.unsubscribe.map(async (enumId: string) => {
+      this.notificationPrefToUpdate.unsubscribe.map(async (enumId: string) => {
         const topicName = generateTopicName(ofbizInstanceName, facilityId, enumId)
         await unsubscribeRequests.push(unsubscribeTopic(topicName, process.env.VUE_APP_NOTIF_APP_ID))
       })

src/locales/en.json

@@ -113,6 +113,7 @@
   "Search time zones": "Search time zones",
   "Select facility": "Select facility",
   "Select time zone": "Select time zone",
+  "Select the notifications you want to receive.": "Select the notifications you want to receive.",
   "Select your preferred language.": "Select your preferred language.",
   "Settings": "Settings",
   "Select a picker": "Select a picker",

src/locales/es.json

@@ -112,6 +112,7 @@
   "Search time zones": "Buscar zonas horarias",
   "Select facility": "Seleccionar instalación",
   "Select time zone": "Seleccionar zona horaria",
+  "Select the notifications you want to receive.": "Select the notifications you want to receive.",
   "Select your preferred language.": "Selecciona tu idioma preferido.",
   "Settings": "Configuraciones",
   "Select a picker": "Seleccionar un recolector",

src/locales/ja.json

@@ -112,6 +112,7 @@
   "Search time zones": "タイムゾーンの検索",
   "Select facility": "拠点の検索",
   "Select time zone": "タイムゾーンを選択",
+  "Select the notifications you want to receive.": "Select the notifications you want to receive.",
   "Select your preferred language.": "お好みの言語の選択",
   "Settings": "設定",
   "Select a picker": "受取人の選択",

src/store/modules/user/UserState.ts

@@ -11,4 +11,5 @@ export default interface UserState {
     notifications: any;
     notificationPrefs: any;
     firebaseDeviceId: string;
+    hasUnreadNotifications: boolean
 }

src/store/modules/user/actions.ts

@@ -233,6 +233,7 @@ const actions: ActionTree<UserState, RootState> = {
   addNotification({ state, commit }, payload) {
     const notifications = JSON.parse(JSON.stringify(state.notifications))
     notifications.push({ ...payload.notification, time: DateTime.now().toMillis() })
+    commit(types.USER_UNREAD_NOTIFICATIONS_STATUS_UPDATED, true)
     if (payload.isForeground) {
       showToast(translate("New notification received."));
     }
@@ -280,6 +281,11 @@ const actions: ActionTree<UserState, RootState> = {
     commit(types.USER_NOTIFICATIONS_UPDATED, [])
     commit(types.USER_NOTIFICATIONS_PREFERENCES_UPDATED, [])
     commit(types.USER_FIREBASE_DEVICEID_UPDATED, '')
+    commit(types.USER_UNREAD_NOTIFICATIONS_STATUS_UPDATED, true)
+  },
+
+  setUnreadNotificationsStatus({ commit }, payload) {
+    commit(types.USER_UNREAD_NOTIFICATIONS_STATUS_UPDATED, payload)
   }
 }
 export default actions;

src/store/modules/user/getters.ts

@@ -59,6 +59,9 @@ const getters: GetterTree <UserState, RootState> = {
     },
     getFirebaseDeviceId(state) {
         return state.firebaseDeviceId
+    },
+    getUnreadNotificationsStatus(state) {
+        return state.hasUnreadNotifications
     }
 }
 export default getters;

src/store/modules/user/index.ts

@@ -23,7 +23,8 @@ const userModule: Module<UserState, RootState> = {
       permissions: [],
       notifications: [],
       notificationPrefs: [],
-      firebaseDeviceId: ''
+      firebaseDeviceId: '',
+      hasUnreadNotifications: true
     },
     getters,
     actions,

src/store/modules/user/mutation-types.ts

@@ -11,4 +11,5 @@ export const USER_PERMISSIONS_UPDATED = SN_USER + '/PERMISSIONS_UPDATED'
 export const USER_PARTIAL_ORDER_REJECTION_CONFIG_UPDATED = SN_USER + '/PARTIAL_ORDER_REJECTION_CONFIG_UPDATED'
 export const USER_NOTIFICATIONS_UPDATED = SN_USER + '/NOTIFICATIONS_UPDATED'
 export const USER_NOTIFICATIONS_PREFERENCES_UPDATED = SN_USER + '/NOTIFICATIONS_PREFERENCES_UPDATED'
-export const USER_FIREBASE_DEVICEID_UPDATED = SN_USER + '/FIREBASE_DEVICEID_UPDATED'
+export const USER_FIREBASE_DEVICEID_UPDATED = SN_USER + '/FIREBASE_DEVICEID_UPDATED'
+export const USER_UNREAD_NOTIFICATIONS_STATUS_UPDATED = SN_USER + '/UNREAD_NOTIFICATIONS_STATUS_UPDATED'

src/store/modules/user/mutations.ts

@@ -44,6 +44,9 @@ const mutations: MutationTree <UserState> = {
     },
     [types.USER_FIREBASE_DEVICEID_UPDATED] (state, payload) {
         state.firebaseDeviceId = payload
+    },
+    [types.USER_UNREAD_NOTIFICATIONS_STATUS_UPDATED] (state, payload) {
+        state.hasUnreadNotifications = payload
     }
 
 }

src/views/Orders.vue

@@ -5,7 +5,7 @@
         <ion-title>{{ currentFacility?.facilityName }}</ion-title>
         <ion-buttons slot="end">
           <ion-button @click="viewNotifications()">
-            <ion-icon slot="icon-only" :icon="notificationsOutline" :color="notifications.length ? 'primary' : ''" />
+            <ion-icon slot="icon-only" :icon="notificationsOutline" :color="(unreadNotificationsStatus && notifications.length) ? 'primary' : ''" />
           </ion-button>
           <ion-button @click="viewShipToStoreOrders()">
             <ion-icon slot="icon-only" :icon="trailSignOutline" />
@@ -251,6 +251,7 @@ export default defineComponent({
       isCompletedOrdersScrollable: 'order/isCompletedOrdersScrollable',
       showPackingSlip: 'user/showPackingSlip',
       notifications: 'user/getNotifications',
+      unreadNotificationsStatus: 'user/getUnreadNotificationsStatus'
     })
   },
   data() {
@@ -447,6 +448,7 @@ export default defineComponent({
       this.$router.push({ path: '/ship-to-store-orders' })
     },
     viewNotifications() {
+      this.store.dispatch('user/setUnreadNotificationsStatus', false)
       this.$router.push({ path: '/notifications' })
     }
   },

src/views/Settings.vue

@@ -209,25 +209,72 @@
             <ion-toggle :checked="configurePicker" @ionChange="setConfigurePickerPreference($event)" slot="end" />
           </ion-item>
         </ion-card>
+
+        <ion-card v-if="notificationPrefs.length">
+          <ion-card-header>
+            <ion-card-title>
+              {{ $t("Notification Preference") }}
+            </ion-card-title>
+          </ion-card-header>
+          <ion-card-content>
+            {{ $t('Select the notifications you want to receive.') }}
+          </ion-card-content>
+          <ion-list>
+            <ion-item :key="pref.enumId" v-for="pref in notificationPrefs" lines="none">
+              <ion-label class="ion-text-wrap">{{ pref.description }}</ion-label>
+              <ion-toggle @click="confirmNotificationPrefUpdate(pref.enumId, $event)" :checked="pref.isEnabled" slot="end" />
+            </ion-item>
+          </ion-list>
+        </ion-card>
       </section>
     </ion-content>
   </ion-page>
 </template>
 
 <script lang="ts">
-import { IonAvatar, IonButton, IonCard, IonCardContent, IonCardHeader, IonCardSubtitle, IonCardTitle, IonContent, IonHeader, IonIcon, IonItem, IonLabel, IonPage, IonSelect, IonSelectOption, IonTitle, IonToggle , IonToolbar, modalController } from '@ionic/vue';
+import {
+  alertController,
+  IonAvatar,
+  IonButton,
+  IonCard,
+  IonCardContent,
+  IonCardHeader,
+  IonCardSubtitle,
+  IonCardTitle,
+  IonContent,
+  IonHeader,
+  IonIcon,
+  IonItem,
+  IonLabel,
+  IonPage,
+  IonSelect,
+  IonSelectOption,
+  IonTitle,
+  IonToggle,
+  IonToolbar,
+  modalController
+} from '@ionic/vue';
 import { defineComponent } from 'vue';
-import { ellipsisVertical, personCircleOutline, sendOutline , storefrontOutline, codeWorkingOutline, openOutline } from 'ionicons/icons'
+import {
+  codeWorkingOutline,
+  ellipsisVertical,
+  openOutline,
+  personCircleOutline,
+  sendOutline,
+  storefrontOutline
+} from 'ionicons/icons'
 import { mapGetters, useStore } from 'vuex';
 import { useRouter } from 'vue-router';
 import TimeZoneModal from './TimezoneModal.vue';
 import Image from '@/components/Image.vue';
 import { DateTime } from 'luxon';
 import { UserService } from '@/services/UserService'
 import { showToast } from '@/utils';
-import { hasError, removeClientRegistrationToken } from '@/adapter'
+import { hasError, removeClientRegistrationToken, subscribeTopic, unsubscribeTopic } from '@/adapter'
 import { translate } from "@/i18n";
 import { Actions, hasPermission } from '@/authorization'
+import { generateTopicName } from "@/utils/firebase";
+import emitter from "@/event-bus"
 
 export default defineComponent({
   name: 'Settings',
@@ -282,17 +329,21 @@ export default defineComponent({
       partialOrderRejectionConfig: 'user/getPartialOrderRejectionConfig',
       locale: 'user/getLocale',
       firebaseDeviceId: 'user/getFirebaseDeviceId',
+      notificationPrefs: 'user/getNotificationPrefs'
     })
   },
   mounted() {
     this.appVersion = this.appInfo.branch ? (this.appInfo.branch + "-" + this.appInfo.revision) : this.appInfo.tag;
   },
-  ionViewWillEnter() {
+  async ionViewWillEnter() {
     // Only fetch configuration when environment mapping exists
     if (Object.keys(this.rerouteFulfillmentConfigMapping).length > 0) {
       this.getAvailableShipmentMethods();
       this.getRerouteFulfillmentConfiguration();
     }
+    // as notification prefs can also be updated from the notification pref modal,
+    // latest state is fetched each time we open the settings page
+    await this.store.dispatch('user/fetchNotificationPreferences')
   },
   methods: {
     setFacility (event: any) {
@@ -433,6 +484,53 @@ export default defineComponent({
         "settingValue": value
       }
       await this.store.dispatch('user/updatePartialOrderRejectionConfig', params)
+    },
+    async updateNotificationPref(enumId: string, event: any) {
+      try {
+        const ofbizInstanceName = this.userProfile.ofbizInstanceName
+        const facilityId = (this.currentFacility as any).facilityId
+        const topicName = generateTopicName(ofbizInstanceName, facilityId, enumId)
+        // event.target.checked returns the initial value (the value that was there before clicking
+        // and updating the toggle). But it returns the updated value on further references (if passed
+        // as a parameter in other function, here in our case, passed from confirmNotificationPrefUpdate)
+        // Hence, event.target.checked here holds the updated value (value after the toggle action)
+        event.target.checked
+          ? await subscribeTopic(topicName, process.env.VUE_APP_NOTIF_APP_ID)
+          : await unsubscribeTopic(topicName, process.env.VUE_APP_NOTIF_APP_ID)
+        showToast(translate('Notification preferences updated.'))
+      } catch (error) {
+        // reverting the value of toggle as event.target.checked is 
+        // updated on click event, and revert is needed on API fail
+        event.target.checked = !event.target.checked;
+        showToast(translate('Notification preferences not updated. Please try again.'))
+      } finally {
+        emitter.emit("dismissLoader")
+      }
+    },
+    async confirmNotificationPrefUpdate(enumId: string, event: any) {
+      const message = this.$t("Are you sure you want to update the notification preferences?");
+      const alert = await alertController.create({
+        header: this.$t("Update notification preferences"),
+        message,
+        buttons: [
+          {
+            text: this.$t("Cancel"),
+            handler: () => {
+              // reverting the value of toggle as event.target.checked is 
+              // updated on click event and revert is needed on "Cancel"
+              event.target.checked = !event.target.checked
+            }
+          },
+          {
+            text: this.$t("Confirm"),
+            handler: async () => {
+              // passing event reference for updation in case the API fails
+              await this.updateNotificationPref(enumId, event)
+            }
+          }
+        ],
+      });
+      return alert.present();
     }
   },
   setup () {