')
let emailContent = editor.getHTML()
emailContent = emailContent.startsWith('
')
@@ -236,22 +225,6 @@ async function submitComment() {
emit('scroll')
}
-function toggleCC() {
- newEmailEditor.value.cc = !newEmailEditor.value.cc
- newEmailEditor.value.cc &&
- nextTick(() => {
- newEmailEditor.value.ccInput.setFocus()
- })
-}
-
-function toggleBCC() {
- newEmailEditor.value.bcc = !newEmailEditor.value.bcc
- newEmailEditor.value.bcc &&
- nextTick(() => {
- newEmailEditor.value.bccInput.setFocus()
- })
-}
-
function toggleEmailBox() {
if (showCommentBox.value) {
showCommentBox.value = false
diff --git a/frontend/src/components/Controls/MultiselectInput.vue b/frontend/src/components/Controls/MultiselectInput.vue
index ed8b4102..a5cb6928 100644
--- a/frontend/src/components/Controls/MultiselectInput.vue
+++ b/frontend/src/components/Controls/MultiselectInput.vue
@@ -8,7 +8,7 @@
:label="value"
theme="gray"
variant="subtle"
- class="rounded-full"
+ class="rounded"
@keydown.delete.capture.stop="removeLastValue"
>
@@ -133,30 +133,26 @@ watchDebounced(
query,
(val) => {
val = val || ''
- if (text.value === val) return
+ if (text.value === val && options.value?.length) return
text.value = val
reload(val)
},
- { debounce: 300, immediate: true }
+ { debounce: 300, immediate: true },
)
const filterOptions = createResource({
- url: 'frappe.desk.search.search_link',
+ url: 'crm.api.contact.search_emails',
method: 'POST',
cache: [text.value, 'Contact'],
- params: {
- txt: text.value,
- doctype: 'Contact',
- },
+ params: { txt: text.value },
transform: (data) => {
let allData = data
- .filter((c) => {
- return c.description.split(', ')[1]
- })
.map((option) => {
- let email = option.description.split(', ')[1]
+ let fullName = option[0]
+ let email = option[1]
+ let name = option[2]
return {
- label: option.label || email,
+ label: fullName || name || email,
value: email,
}
})
@@ -177,10 +173,7 @@ const options = computed(() => {
function reload(val) {
filterOptions.update({
- params: {
- txt: val,
- doctype: 'Contact',
- },
+ params: { txt: val },
})
filterOptions.reload()
}
diff --git a/frontend/src/components/EmailContent.vue b/frontend/src/components/EmailContent.vue
index f68ea6b6..310a452b 100644
--- a/frontend/src/components/EmailContent.vue
+++ b/frontend/src/components/EmailContent.vue
@@ -4,9 +4,10 @@
:srcdoc="htmlContent"
class="prose-f block h-screen max-h-[500px] w-full"
style="
+ height: 40px;
mask-image: linear-gradient(
to bottom,
- black calc(100% - 30px),
+ black calc(100% - 20px),
transparent 100%
);
"
@@ -27,6 +28,90 @@ const files = import.meta.globEager('/src/index.css', { query: '?inline' })
const css = files['/src/index.css'].default
const iframeRef = ref(null)
+const _content = ref(props.content)
+
+const parser = new DOMParser()
+const doc = parser.parseFromString(_content.value, 'text/html')
+
+const gmailReplyToContent = doc.querySelectorAll('div.gmail_quote')
+const outlookReplyToContent = doc.querySelectorAll('div#appendonsend')
+const replyToContent = doc.querySelectorAll('p.reply-to-content')
+
+if (gmailReplyToContent.length) {
+ _content.value = parseReplyToContent(doc, 'div.gmail_quote', true)
+} else if (outlookReplyToContent.length) {
+ _content.value = parseReplyToContent(doc, 'div#appendonsend')
+} else if (replyToContent.length) {
+ _content.value = parseReplyToContent(doc, 'p.reply-to-content')
+}
+
+function parseReplyToContent(doc, selector, forGmail = false) {
+ function handleAllInstances(doc) {
+ const replyToContentElements = doc.querySelectorAll(selector)
+ if (replyToContentElements.length === 0) return
+ const replyToContentElement = replyToContentElements[0]
+ replaceReplyToContent(replyToContentElement, forGmail)
+ handleAllInstances(doc)
+ }
+
+ handleAllInstances(doc)
+
+ return doc.body.innerHTML
+}
+
+function replaceReplyToContent(replyToContentElement, forGmail) {
+ if (!replyToContentElement) return
+ let randomId = Math.random().toString(36).substring(2, 7)
+ const wrapper = doc.createElement('div')
+ wrapper.classList.add('replied-content')
+
+ const collapseLabel = doc.createElement('label')
+ collapseLabel.classList.add('collapse')
+ collapseLabel.setAttribute('for', randomId)
+ collapseLabel.innerHTML = '...'
+ wrapper.appendChild(collapseLabel)
+
+ const collapseInput = doc.createElement('input')
+ collapseInput.setAttribute('id', randomId)
+ collapseInput.setAttribute('class', 'replyCollapser')
+ collapseInput.setAttribute('type', 'checkbox')
+ wrapper.appendChild(collapseInput)
+
+ if (forGmail) {
+ const prevSibling = replyToContentElement.previousElementSibling
+ if (prevSibling && prevSibling.tagName === 'BR') {
+ prevSibling.remove()
+ }
+ let cloned = replyToContentElement.cloneNode(true)
+ cloned.classList.remove('gmail_quote')
+ wrapper.appendChild(cloned)
+ } else {
+ const allSiblings = Array.from(replyToContentElement.parentElement.children)
+ const replyToContentIndex = allSiblings.indexOf(replyToContentElement)
+ const followingSiblings = allSiblings.slice(replyToContentIndex + 1)
+
+ if (followingSiblings.length === 0) return
+
+ let clonedFollowingSiblings = followingSiblings.map((sibling) =>
+ sibling.cloneNode(true),
+ )
+
+ const div = doc.createElement('div')
+ div.append(...clonedFollowingSiblings)
+
+ wrapper.append(div)
+
+ // Remove all siblings after the reply-to-content element
+ for (let i = replyToContentIndex + 1; i < allSiblings.length; i++) {
+ replyToContentElement.parentElement.removeChild(allSiblings[i])
+ }
+ }
+
+ replyToContentElement.parentElement.replaceChild(
+ wrapper,
+ replyToContentElement,
+ )
+}
const htmlContent = `
@@ -35,6 +120,35 @@ const htmlContent = `
- ${props.content}
+ ${_content.value}