From f4ea2e348c2da455305cd762adf1803b8ec7a510 Mon Sep 17 00:00:00 2001
From: Joana Maia <joana@crowd.dev>
Date: Fri, 17 Feb 2023 17:33:47 +0000
Subject: [PATCH] Fix eagle eye email digest fetch on settings update

---
 .../list/eagle-eye-email-digest-drawer.vue         |  9 ++++++---
 .../components/list/eagle-eye-settings-drawer.vue  |  6 ++++--
 .../eagle-eye/pages/eagle-eye-onboard-page.vue     | 14 ++++++++------
 frontend/src/premium/eagle-eye/store/actions.js    | 13 +++++++++----
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/frontend/src/premium/eagle-eye/components/list/eagle-eye-email-digest-drawer.vue b/frontend/src/premium/eagle-eye/components/list/eagle-eye-email-digest-drawer.vue
index 2f4fe6ca58..8a138f4f7f 100644
--- a/frontend/src/premium/eagle-eye/components/list/eagle-eye-email-digest-drawer.vue
+++ b/frontend/src/premium/eagle-eye/components/list/eagle-eye-email-digest-drawer.vue
@@ -362,9 +362,12 @@ const doSubmit = async () => {
       feed: !form.updateResults ? feed.value : undefined
     }
     doUpdateSettings({
-      ...currentUser.value.eagleEyeSettings,
-      emailDigestActive: form.active,
-      emailDigest: data
+      data: {
+        ...currentUser.value.eagleEyeSettings,
+        emailDigestActive: form.active,
+        emailDigest: data
+      },
+      fetchNewResults: false
     }).then(() => {
       Message.success(
         'Email Digest settings successfully updated'
diff --git a/frontend/src/premium/eagle-eye/components/list/eagle-eye-settings-drawer.vue b/frontend/src/premium/eagle-eye/components/list/eagle-eye-settings-drawer.vue
index fd2683a423..789d6a96ad 100644
--- a/frontend/src/premium/eagle-eye/components/list/eagle-eye-settings-drawer.vue
+++ b/frontend/src/premium/eagle-eye/components/list/eagle-eye-settings-drawer.vue
@@ -263,8 +263,10 @@ const onSubmit = async () => {
       platforms: form.platforms
     }
     doUpdateSettings({
-      ...currentUser.value.eagleEyeSettings,
-      feed: data
+      data: {
+        ...currentUser.value.eagleEyeSettings,
+        feed: data
+      }
     }).then(() => {
       Message.success('Feed settings updated!')
       emit('update:modelValue', false)
diff --git a/frontend/src/premium/eagle-eye/pages/eagle-eye-onboard-page.vue b/frontend/src/premium/eagle-eye/pages/eagle-eye-onboard-page.vue
index 29bc5b3093..62b531e2d5 100644
--- a/frontend/src/premium/eagle-eye/pages/eagle-eye-onboard-page.vue
+++ b/frontend/src/premium/eagle-eye/pages/eagle-eye-onboard-page.vue
@@ -143,12 +143,14 @@ const onSubmit = async () => {
     .map(([key]) => key)
 
   await doUpdateSettings({
-    feed: {
-      keywords: formattedKeywords,
-      exactKeywords: [],
-      excludedKeywords: [],
-      publishedDate: form.datePublished,
-      platforms: formattedPlatforms
+    data: {
+      feed: {
+        keywords: formattedKeywords,
+        exactKeywords: [],
+        excludedKeywords: [],
+        publishedDate: form.datePublished,
+        platforms: formattedPlatforms
+      }
     }
   })
 }
diff --git a/frontend/src/premium/eagle-eye/store/actions.js b/frontend/src/premium/eagle-eye/store/actions.js
index 761500db41..4e9efbdd20 100644
--- a/frontend/src/premium/eagle-eye/store/actions.js
+++ b/frontend/src/premium/eagle-eye/store/actions.js
@@ -356,7 +356,10 @@ export default {
     commit('SET_ACTIVE_ACTION', {})
   },
 
-  async doUpdateSettings({ commit, dispatch }, data) {
+  async doUpdateSettings(
+    { commit, dispatch },
+    { data, fetchNewResults = true }
+  ) {
     commit('UPDATE_EAGLE_EYE_SETTINGS_STARTED')
     return EagleEyeService.updateSettings(data)
       .then(() => {
@@ -365,9 +368,11 @@ export default {
         }).then(() => {
           commit('UPDATE_EAGLE_EYE_SETTINGS_SUCCESS')
 
-          dispatch(`doFetch`, {
-            resetStorage: true
-          })
+          if (fetchNewResults) {
+            dispatch(`doFetch`, {
+              resetStorage: true
+            })
+          }
           return Promise.resolve()
         })
       })