Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,10 @@
type="primary"
class="btn btn--md btn--primary"
:loading="loadingUpdateSettings"
:disabled="$v.$invalid || !hasFormChanged"
:disabled="
$v.$invalid ||
(!hasFormChanged && !hasElementChanged)
"
@click="doSubmit()"
>Update
</el-button>
Expand Down Expand Up @@ -243,6 +246,7 @@ import { email, required } from '@vuelidate/validators'
import useVuelidate from '@vuelidate/core'
import AppFormItem from '@/shared/form/form-item.vue'
import formChangeDetector from '@/shared/form/form-change'
import elementChangeDetector from '@/shared/form/element-change'

const props = defineProps({
modelValue: {
Expand Down Expand Up @@ -274,6 +278,10 @@ const form = reactive({
const { hasFormChanged, formSnapshot } =
formChangeDetector(form)

const feed = ref(null)
const { elementSnapshot, hasElementChanged } =
elementChangeDetector(feed)

const $v = useVuelidate(rules, form)

const drawerModel = computed({
Expand All @@ -285,8 +293,6 @@ const drawerModel = computed({
}
})

const feed = ref(null)

const results = computed(() => {
if (!form.updateResults) {
if (currentUser.value && feed.value) {
Expand Down Expand Up @@ -338,9 +344,12 @@ const fillForm = (user) => {
form.updateResults = !eagleEyeSettings.emailDigest
? true
: eagleEyeSettings.emailDigest?.matchFeedSettings
feed.value = user.eagleEyeSettings.emailDigest.feed

formSnapshot()
feed.value =
eagleEyeSettings?.emailDigest?.feed ||
eagleEyeSettings?.feed ||
null
elementSnapshot()
}
const doSubmit = async () => {
$v.value.$touch()
Expand Down
22 changes: 22 additions & 0 deletions frontend/src/shared/form/element-change.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { ref, computed } from 'vue'

export default function elementChangeDetector(element) {
const temporaryElement = ref('')

function elementSnapshot() {
temporaryElement.value = JSON.stringify(element.value)
}

const hasElementChanged = computed(() => {
return (
temporaryElement.value !==
JSON.stringify(element.value)
)
})

return {
temporaryElement,
elementSnapshot,
hasElementChanged
}
}