From e485b6a14254ecf14248efaba033008ce670e6b3 Mon Sep 17 00:00:00 2001
From: Shelley Nason <sanason@gmail.com>
Date: Tue, 19 Dec 2023 17:07:00 -0600
Subject: [PATCH] fix: remove "Occasional Updates" toggle from profile page

---
 .../src/components/EmailSettingsBanner.vue    | 75 -------------------
 .../src/components/Modals/ProfileSettings.vue |  3 +-
 packages/client/src/store/modules/users.js    |  5 +-
 packages/client/src/views/MyProfile.vue       |  8 +-
 4 files changed, 4 insertions(+), 87 deletions(-)
 delete mode 100644 packages/client/src/components/EmailSettingsBanner.vue

diff --git a/packages/client/src/components/EmailSettingsBanner.vue b/packages/client/src/components/EmailSettingsBanner.vue
deleted file mode 100644
index eb4867e9f..000000000
--- a/packages/client/src/components/EmailSettingsBanner.vue
+++ /dev/null
@@ -1,75 +0,0 @@
-<template>
-    <div>
-      <b-alert style="display: flex;  text-align: center; max-width: 1100px;" variant="success" show v-model="showBanner" dismissible>
-          <b-icon icon="envelope-fill" font-scale="1.5" style="width: 50px; color: #0FA958;"></b-icon>
-          <div style="padding-right: 10px; color: #212529;">
-          <b>The Grant ID Tool now has email notifications!</b>
-          Fine tune which email you will receive in <u v-on:click="showProfileSettings()">Settings</u> or turn on all notifications here:
-        </div >
-        <b-form-checkbox v-model="checked" name="email-opt-in-switch" switch @change="onUserSubscriptionChangeSubmit"/>
-      </b-alert>
-      <b-alert
-        id="email-settings-banner"
-        ref="modal"
-        title="Email Settings Banner"
-        @show="resetModal"
-        @hidden="resetModal"
-        ok-only
-      >
-      </b-alert>
-    </div>
-  </template>
-
-<script>
-import { mapActions, mapGetters } from 'vuex';
-
-export default {
-  props: {
-    showBanner: Boolean,
-    showProfileSettings: Function,
-  },
-  data() {
-    return {
-      checked: false,
-    };
-  },
-  computed: {
-    ...mapGetters({
-      loggedInUser: 'users/loggedInUser',
-    }),
-  },
-  methods: {
-    ...mapActions({
-      updateEmailSubscriptionPreferences: 'users/updateEmailSubscriptionPreferences',
-    }),
-    resetModal() {
-      this.$emit('update:showModal', false);
-    },
-    onUserSubscriptionChangeSubmit(isOptIn) {
-      const updatedPreferences = {
-        GRANT_ASSIGNMENT: 'UNSUBSCRIBED',
-        GRANT_DIGEST: 'UNSUBSCRIBED',
-      };
-      if (isOptIn) {
-        Object.keys(updatedPreferences).forEach((notificationType) => { updatedPreferences[notificationType] = 'SUBSCRIBED'; });
-      }
-      this.updateEmailSubscriptionPreferences({
-        userId: this.loggedInUser.id,
-        preferences: updatedPreferences,
-      });
-    },
-    setToggleIfAllIsSubscribedTo() {
-      // Set default toggle to true only if all email preferences are already subscribed to.
-      const userEmailPreferences = this.loggedInUser.emailPreferences;
-      delete userEmailPreferences.GRANT_INTEREST; // ignore grant interest since it's not a setting in User Preferences UI yet.
-      const isAllSubscribedTo = Object.values(this.loggedInUser.emailPreferences).every((optInValue) => optInValue === 'SUBSCRIBED');
-      if (isAllSubscribedTo) {
-        this.checked = true;
-      }
-    },
-  },
-  mounted() {
-    this.setToggleIfAllIsSubscribedTo();
-  },
-};
-</script>
diff --git a/packages/client/src/components/Modals/ProfileSettings.vue b/packages/client/src/components/Modals/ProfileSettings.vue
index 1de0a98fd..ec6c92055 100644
--- a/packages/client/src/components/Modals/ProfileSettings.vue
+++ b/packages/client/src/components/Modals/ProfileSettings.vue
@@ -91,7 +91,7 @@ export default {
   methods: {
     ...mapActions({
       changeSelectedAgency: 'users/changeSelectedAgency',
-      updateEmailSubscriptionPreferences: 'users/updateEmailSubscriptionPreferences',
+      updateEmailSubscriptionPreferences: 'users/updateEmailSubscriptionPreferencesForLoggedInUser',
     }),
     resetModal() {
       this.$emit('update:showModal', false);
@@ -103,7 +103,6 @@ export default {
       };
       data.forEach((notificationType) => { updatedPreferences[notificationType] = 'SUBSCRIBED'; });
       this.updateEmailSubscriptionPreferences({
-        userId: this.loggedInUser.id,
         preferences: updatedPreferences,
       });
     },
diff --git a/packages/client/src/store/modules/users.js b/packages/client/src/store/modules/users.js
index 4fd5d0bb2..d26efb77e 100644
--- a/packages/client/src/store/modules/users.js
+++ b/packages/client/src/store/modules/users.js
@@ -79,15 +79,14 @@ export default {
       }
       await dispatch('fetchUsers');
     },
-    async updateEmailSubscriptionPreferences({ dispatch, commit }, { userId, preferences }) {
+    async updateEmailSubscriptionPreferencesForLoggedInUser({ commit, getters }, { preferences }) {
       const data = await fetchApi.put(
-        `/api/organizations/:organizationId/users/${userId}/email_subscription`,
+        `/api/organizations/:organizationId/users/${getters.loggedInUser.id}/email_subscription`,
         {
           preferences,
         },
       );
       commit('SET_LOGGED_IN_USER', data.user);
-      dispatch('fetchUsers');
     },
   },
   mutations: {
diff --git a/packages/client/src/views/MyProfile.vue b/packages/client/src/views/MyProfile.vue
index c3082d156..b5f5eab10 100644
--- a/packages/client/src/views/MyProfile.vue
+++ b/packages/client/src/views/MyProfile.vue
@@ -61,11 +61,6 @@ export default {
           key: 'GRANT_ASSIGNMENT',
           description: 'Send me notifications if a grant has been assigned to my USDR Grants team.',
         },
-        {
-          name: 'Occasional Updates',
-          key: 'GRANT_FINDER_UPDATES',
-          description: 'Send me occasional emails about feature releases, surveys, and other updates.',
-        },
       ],
       breadcrumb_items: [
         {
@@ -98,7 +93,7 @@ export default {
   },
   methods: {
     ...mapActions({
-      updateEmailSubscriptionPreferences: 'users/updateEmailSubscriptionPreferences',
+      updateEmailSubscriptionPreferences: 'users/updateEmailSubscriptionPreferencesForLoggedInUser',
     }),
     onUpdateEmailPreference(pref) {
       const updatedPreferences = {
@@ -106,7 +101,6 @@ export default {
         [pref.key]: pref.checked ? 'SUBSCRIBED' : 'UNSUBSCRIBED',
       };
       this.updateEmailSubscriptionPreferences({
-        userId: this.loggedInUser.id,
         preferences: updatedPreferences,
       });
     },