test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: reload doc after sending email

Browse Source 
(cherry picked from commit ea0011771b268ee60dce56cd9262e24a921a45d4)
This commit is contained in:
Shariq Ansari 2025-07-29 14:08:11 +05:30 committed by Mergify
parent f1786b7cd9
commit 3ca2883efb
2 changed files with 35 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/Activities/Activities.vue
View File

@ -490,6 +490,7 @@ import { timeAgo, formatDate, startCase } from '@/utils'
import { globalStore } from '@/stores/global' import { globalStore } from '@/stores/global'
import { usersStore } from '@/stores/users' import { usersStore } from '@/stores/users'
import { whatsappEnabled, callEnabled } from '@/composables/settings' import { whatsappEnabled, callEnabled } from '@/composables/settings'
import { useDocument } from '@/data/document'
import { capture } from '@/telemetry' import { capture } from '@/telemetry'
import { Button, Tooltip, createResource } from 'frappe-ui' import { Button, Tooltip, createResource } from 'frappe-ui'
import { useElementVisibility } from '@vueuse/core' import { useElementVisibility } from '@vueuse/core'
@ -527,6 +528,8 @@ const doc = defineModel()
const reload = defineModel('reload') const reload = defineModel('reload')
const tabIndex = defineModel('tabIndex') const tabIndex = defineModel('tabIndex')
const { document: _document } = useDocument(props.doctype, doc.value.data.name)
const reload_email = ref(false) const reload_email = ref(false)
const modalRef = ref(null) const modalRef = ref(null)
const showFilesUploader = ref(false) const showFilesUploader = ref(false)
@ -767,6 +770,7 @@ const whatsappBox = ref(null)
watch([reload, reload_email], ([reload_value, reload_email_value]) => { watch([reload, reload_email], ([reload_value, reload_email_value]) => {
if (reload_value || reload_email_value) { if (reload_value || reload_email_value) {
all_activities.reload() all_activities.reload()
_document.reload()
reload.value = false reload.value = false
reload_email.value = false reload_email.value = false
} }

79
frontend/src/components/SidePanelLayout.vue
View File

@ -1,8 +1,5 @@
<template> <template>
<div <div class="sections flex flex-col overflow-y-auto">
v-if="!document.get?.loading"
class="sections flex flex-col overflow-y-auto"
>
<template v-for="(section, i) in _sections" :key="section.name"> <template v-for="(section, i) in _sections" :key="section.name">
<div v-if="section.visible" class="section flex flex-col"> <div v-if="section.visible" class="section flex flex-col">
<div <div
@ -82,21 +79,21 @@
class="flex h-7 cursor-pointer items-center px-2 py-1 text-ink-gray-5" class="flex h-7 cursor-pointer items-center px-2 py-1 text-ink-gray-5"
> >
<Tooltip :text="__(field.tooltip)"> <Tooltip :text="__(field.tooltip)">
<div>{{ document.doc[field.fieldname] }}</div> <div>{{ doc[field.fieldname] }}</div>
</Tooltip> </Tooltip>
</div> </div>
<div v-else-if="field.fieldtype === 'Dropdown'"> <div v-else-if="field.fieldtype === 'Dropdown'">
<NestedPopover> <NestedPopover>
<template #target="{ open }"> <template #target="{ open }">
<Button <Button
:label="document.doc[field.fieldname]" :label="doc[field.fieldname]"
class="dropdown-button flex w-full items-center justify-between rounded border border-gray-100 bg-surface-gray-2 px-2 py-1.5 text-base text-ink-gray-8 placeholder-ink-gray-4 transition-colors hover:border-outline-gray-modals hover:bg-surface-gray-3 focus:border-outline-gray-4 focus:bg-surface-white focus:shadow-sm focus:outline-none focus:ring-0 focus-visible:ring-2 focus-visible:ring-outline-gray-3" class="dropdown-button flex w-full items-center justify-between rounded border border-gray-100 bg-surface-gray-2 px-2 py-1.5 text-base text-ink-gray-8 placeholder-ink-gray-4 transition-colors hover:border-outline-gray-modals hover:bg-surface-gray-3 focus:border-outline-gray-4 focus:bg-surface-white focus:shadow-sm focus:outline-none focus:ring-0 focus-visible:ring-2 focus-visible:ring-outline-gray-3"
> >
<div <div
v-if="document.doc[field.fieldname]" v-if="doc[field.fieldname]"
class="truncate" class="truncate"
> >
{{ document.doc[field.fieldname] }} {{ doc[field.fieldname] }}
</div> </div>
<div <div
v-else v-else
@ -153,7 +150,7 @@
v-else-if="field.fieldtype == 'Check'" v-else-if="field.fieldtype == 'Check'"
class="form-control" class="form-control"
type="checkbox" type="checkbox"
v-model="document.doc[field.fieldname]" v-model="doc[field.fieldname]"
@change.stop=" @change.stop="
fieldChange($event.target.checked, field) fieldChange($event.target.checked, field)
" "
@ -170,7 +167,7 @@
" "
class="form-control" class="form-control"
type="textarea" type="textarea"
:value="document.doc[field.fieldname]" :value="doc[field.fieldname]"
:placeholder="field.placeholder" :placeholder="field.placeholder"
:debounce="500" :debounce="500"
@change.stop="fieldChange($event.target.value, field)" @change.stop="fieldChange($event.target.value, field)"
@ -179,7 +176,7 @@
v-else-if="field.fieldtype === 'Select'" v-else-if="field.fieldtype === 'Select'"
class="form-control cursor-pointer [&_select]:cursor-pointer truncate" class="form-control cursor-pointer [&_select]:cursor-pointer truncate"
type="select" type="select"
v-model="document.doc[field.fieldname]" v-model="doc[field.fieldname]"
:options="field.options" :options="field.options"
:placeholder="field.placeholder" :placeholder="field.placeholder"
@change.stop="fieldChange($event.target.value, field)" @change.stop="fieldChange($event.target.value, field)"
@ -188,8 +185,8 @@
v-else-if="field.fieldtype === 'User'" v-else-if="field.fieldtype === 'User'"
class="form-control" class="form-control"
:value=" :value="
document.doc[field.fieldname] && doc[field.fieldname] &&
getUser(document.doc[field.fieldname]).full_name getUser(doc[field.fieldname]).full_name
" "
doctype="User" doctype="User"
:filters="field.filters" :filters="field.filters"
@ -197,13 +194,10 @@
:placeholder="'Select' + ' ' + field.label + '...'" :placeholder="'Select' + ' ' + field.label + '...'"
:hideMe="true" :hideMe="true"
> >
<template <template v-if="doc[field.fieldname]" #prefix>
v-if="document.doc[field.fieldname]"
#prefix
>
<UserAvatar <UserAvatar
class="mr-1.5" class="mr-1.5"
:user="document.doc[field.fieldname]" :user="doc[field.fieldname]"
size="sm" size="sm"
/> />
</template> </template>
@ -227,11 +221,11 @@
['Link', 'Dynamic Link'].includes(field.fieldtype) ['Link', 'Dynamic Link'].includes(field.fieldtype)
" "
class="form-control select-text" class="form-control select-text"
:value="document.doc[field.fieldname]" :value="doc[field.fieldname]"
:doctype=" :doctype="
field.fieldtype == 'Link' field.fieldtype == 'Link'
? field.options ? field.options
: document.doc[field.options] : doc[field.options]
" "
:filters="field.filters" :filters="field.filters"
:placeholder="field.placeholder" :placeholder="field.placeholder"
@ -244,7 +238,7 @@
> >
<DateTimePicker <DateTimePicker
icon-left="" icon-left=""
:value="document.doc[field.fieldname]" :value="doc[field.fieldname]"
:formatter=" :formatter="
(date) => getFormat(date, '', true, true) (date) => getFormat(date, '', true, true)
" "
@ -260,7 +254,7 @@
> >
<DatePicker <DatePicker
icon-left="" icon-left=""
:value="document.doc[field.fieldname]" :value="doc[field.fieldname]"
:formatter="(date) => getFormat(date, '', true)" :formatter="(date) => getFormat(date, '', true)"
:placeholder="field.placeholder" :placeholder="field.placeholder"
placement="left-start" placement="left-start"
@ -272,9 +266,7 @@
v-else-if="field.fieldtype === 'Percent'" v-else-if="field.fieldtype === 'Percent'"
class="form-control" class="form-control"
type="text" type="text"
:value=" :value="getFormattedPercent(field.fieldname, doc)"
getFormattedPercent(field.fieldname, document.doc)
"
:placeholder="field.placeholder" :placeholder="field.placeholder"
:debounce="500" :debounce="500"
@change.stop=" @change.stop="
@ -285,7 +277,7 @@
<Password <Password
v-else-if="field.fieldtype === 'Password'" v-else-if="field.fieldtype === 'Password'"
class="form-control" class="form-control"
:value="document.doc[field.fieldname]" :value="doc[field.fieldname]"
:placeholder="field.placeholder" :placeholder="field.placeholder"
:debounce="500" :debounce="500"
@change.stop="fieldChange($event.target.value, field)" @change.stop="fieldChange($event.target.value, field)"
@ -295,7 +287,7 @@
v-else-if="field.fieldtype === 'Int'" v-else-if="field.fieldtype === 'Int'"
class="form-control" class="form-control"
type="text" type="text"
:value="document.doc[field.fieldname] || '0'" :value="doc[field.fieldname] || '0'"
:placeholder="field.placeholder" :placeholder="field.placeholder"
:debounce="500" :debounce="500"
@change.stop="fieldChange($event.target.value, field)" @change.stop="fieldChange($event.target.value, field)"
@ -305,9 +297,7 @@
v-else-if="field.fieldtype === 'Float'" v-else-if="field.fieldtype === 'Float'"
class="form-control" class="form-control"
type="text" type="text"
:value=" :value="getFormattedFloat(field.fieldname, doc)"
getFormattedFloat(field.fieldname, document.doc)
"
:placeholder="field.placeholder" :placeholder="field.placeholder"
:debounce="500" :debounce="500"
@change.stop=" @change.stop="
@ -319,9 +309,7 @@
v-else-if="field.fieldtype === 'Currency'" v-else-if="field.fieldtype === 'Currency'"
class="form-control" class="form-control"
type="text" type="text"
:value=" :value="getFormattedCurrency(field.fieldname, doc)"
getFormattedCurrency(field.fieldname, document.doc)
"
:placeholder="field.placeholder" :placeholder="field.placeholder"
:debounce="500" :debounce="500"
@change.stop=" @change.stop="
@ -333,7 +321,7 @@
v-else v-else
class="form-control" class="form-control"
type="text" type="text"
:value="document.doc[field.fieldname]" :value="doc[field.fieldname]"
:placeholder="field.placeholder" :placeholder="field.placeholder"
:debounce="500" :debounce="500"
@change.stop="fieldChange($event.target.value, field)" @change.stop="fieldChange($event.target.value, field)"
@ -344,23 +332,19 @@
v-if=" v-if="
field.fieldtype === 'Link' && field.fieldtype === 'Link' &&
field.link && field.link &&
document.doc[field.fieldname] doc[field.fieldname]
" "
class="h-4 w-4 shrink-0 cursor-pointer text-ink-gray-5 hover:text-ink-gray-8" class="h-4 w-4 shrink-0 cursor-pointer text-ink-gray-5 hover:text-ink-gray-8"
@click.stop=" @click.stop="field.link(doc[field.fieldname])"
field.link(document.doc[field.fieldname])
"
/> />
<EditIcon <EditIcon
v-if=" v-if="
field.fieldtype === 'Link' && field.fieldtype === 'Link' &&
field.edit && field.edit &&
document.doc[field.fieldname] doc[field.fieldname]
" "
class="size-3.5 shrink-0 cursor-pointer text-ink-gray-5 hover:text-ink-gray-8" class="size-3.5 shrink-0 cursor-pointer text-ink-gray-5 hover:text-ink-gray-8"
@click.stop=" @click.stop="field.edit(doc[field.fieldname])"
field.edit(document.doc[field.fieldname])
"
/> />
</div> </div>
</div> </div>
@ -442,6 +426,8 @@ if (props.docname) {
triggerOnChange = d.triggerOnChange triggerOnChange = d.triggerOnChange
} }
const doc = computed(() => document.doc || {})
const _sections = computed(() => { const _sections = computed(() => {
if (!props.sections?.length) return [] if (!props.sections?.length) return []
let editButtonAdded = false let editButtonAdded = false
@ -482,13 +468,10 @@ function parsedField(field) {
...field, ...field,
filters: field.link_filters && JSON.parse(field.link_filters), filters: field.link_filters && JSON.parse(field.link_filters),
placeholder: field.placeholder || field.label, placeholder: field.placeholder || field.label,
display_via_depends_on: evaluateDependsOnValue( display_via_depends_on: evaluateDependsOnValue(field.depends_on, doc.value),
field.depends_on,
document.doc,
),
mandatory_via_depends_on: evaluateDependsOnValue( mandatory_via_depends_on: evaluateDependsOnValue(
field.mandatory_depends_on, field.mandatory_depends_on,
document.doc, doc.value,
), ),
} }
@ -535,7 +518,7 @@ function isFieldVisible(field) {
if (props.preview) return true if (props.preview) return true
return ( return (
(field.fieldtype == 'Check' || (field.fieldtype == 'Check' ||
(field.read_only && document.doc?.[field.fieldname]) || (field.read_only && doc.value?.[field.fieldname]) ||
!field.read_only) && !field.read_only) &&
(!field.depends_on || field.display_via_depends_on) && (!field.depends_on || field.display_via_depends_on) &&
!field.hidden !field.hidden