Skip to content

Eagle eye email digest drawer on update #546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gaspergrom merged 1 commit into from
Feb 20, 2023
Merged

Eagle eye email digest drawer on update #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions frontend/src/premium/eagle-eye/components/list/eagle-eye-email-digest-drawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/premium/eagle-eye/components/list/eagle-eye-settings-drawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 8 additions & 6 deletions frontend/src/premium/eagle-eye/pages/eagle-eye-onboard-page.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
})
}
Expand Down
13 changes: 9 additions & 4 deletions frontend/src/premium/eagle-eye/store/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(() => {
Expand All @@ -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()
})
})
Expand Down