viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 06:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream note email expand

Browse Source
This commit is contained in:
Yuri Kuznetsov
2024-11-16 15:03:02 +02:00
parent 74bde9868d
commit 3edb30285c
7 changed files with 274 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/Espo/Tools/Stream/RecordService.php
View File

@@ -424,7 +424,8 @@ class RecordService
{
if (
$note->getType() === Note::TYPE_POST ||
$note->getType() === Note::TYPE_EMAIL_RECEIVED
$note->getType() === Note::TYPE_EMAIL_RECEIVED ||
$note->getType() === Note::TYPE_EMAIL_SENT
) {
$note->loadAttachments();
}

49
application/Espo/Tools/Stream/Service.php
View File

@@ -496,20 +496,18 @@ class Service
$note->setSuperParent($email->getAccount());
}
$withContent = in_array($entityType, $this->config->get('streamEmailWithContentEntityTypeList', []));
$data = [
'emailId' => $email->getId(),
'emailName' => $email->getSubject(),
'isInitial' => $isInitial,
'hasAttachment' => count($email->getAttachmentIdList()) > 0,
];
$withContent = $this->toStoreEmailContent($entityType);
if ($withContent) {
$note->setPost($email->getBodyPlain());
}
$data = [];
$data['emailId'] = $email->getId();
$data['emailName'] = $email->getSubject();
$data['isInitial'] = $isInitial;
if ($withContent) {
$data['attachmentsIds'] = $email->get('attachmentsIds');
$data['attachmentsIds'] = $email->getAttachmentIdList();
}
$from = $email->getFromAddress();
@@ -532,7 +530,7 @@ class Service
}
}
$note->setData((object) $data);
$note->setData($data);
$this->entityManager->saveEntity($note);
@@ -556,19 +554,17 @@ class Service
$note->setSuperParent($email->getAccount());
}
$withContent = in_array($entityType, $this->config->get('streamEmailWithContentEntityTypeList', []));
$data = [
'emailId' => $email->getId(),
'emailName' => $email->getSubject(),
'hasAttachment' => count($email->getAttachmentIdList()) > 0,
];
$withContent = $this->toStoreEmailContent($entityType);
if ($withContent) {
$note->setPost($email->getBodyPlain());
}
$data = [];
$data['emailId'] = $email->getId();
$data['emailName'] = $email->getSubject();
if ($withContent) {
$data['attachmentsIds'] = $email->get('attachmentsIds');
$data['attachmentsIds'] = $email->getAttachmentIdList();
}
$user = $this->user;
@@ -578,7 +574,7 @@ class Service
if (!$user->isSystem()) {
$person = $user;
} else {
$from = $email->get('from');
$from = $email->getFromAddress();
if ($from) {
$person = $this->getEmailAddressRepository()->getEntityByAddress($from);
@@ -591,7 +587,7 @@ class Service
$data['personEntityId'] = $person->getId();
}
$note->set('data', (object) $data);
$note->setData($data);
$this->entityManager->saveEntity($note);
@@ -1369,4 +1365,9 @@ class Service
$this->entityManager->saveEntity($entity, [SaveOption::SKIP_ALL => true]);
}
private function toStoreEmailContent(string $entityType): bool
{
return in_array($entityType, $this->config->get('streamEmailWithContentEntityTypeList', []));
}
}

17
client/res/templates/stream/notes/email-received.tpl
View File

@@ -17,6 +17,11 @@
data-id="{{emailId}}"
data-scope="Email"
></span><span class="message text-muted">{{{message}}}</span>
<a
role="button"
tabindex="0"
data-action="expandDetails"
><span class="fas {{#if detailsIsShown}} fa-chevron-up {{else}} fa-chevron-down {{/if}} "></span></a>
</div>
</div>
@@ -28,6 +33,17 @@
>{{emailName}}</a></span>
</div>
{{#if detailsIsShown}}
{{#if bodyField}}
<div class="details stream-details-container">
<div class="cell" data-name="body">{{{bodyField}}}</div>
{{#if attachmentsField}}
<div data-name="attachments" class="cell margin-top">{{{attachmentsField}}}</div>
{{/if}}
</div>
{{/if}}
{{/if}}
{{#if hasPost}}
<div class="stream-post-container">
<span class="cell cell-post">{{{post}}}</span>
@@ -46,4 +62,3 @@
<span class="fas fa-map-pin fa-sm pin-icon" title="{{translate 'Pinned' scope='Note'}}"></span>
{{/if}}
</div>

16
client/res/templates/stream/notes/email-sent.tpl
View File

@@ -17,6 +17,11 @@
data-id="{{emailId}}"
data-scope="Email"
></span><span class="text-muted">{{{message}}}</span>
<a
role="button"
tabindex="0"
data-action="expandDetails"
><span class="fas {{#if detailsIsShown}} fa-chevron-up {{else}} fa-chevron-down {{/if}} "></span></a>
</div>
</div>
@@ -28,6 +33,17 @@
>{{emailName}}</a></span>
</div>
{{#if detailsIsShown}}
{{#if bodyField}}
<div class="details stream-details-container">
<div class="cell" data-name="body">{{{bodyField}}}</div>
{{#if attachmentsField}}
<div data-name="attachments" class="cell margin-top">{{{attachmentsField}}}</div>
{{/if}}
</div>
{{/if}}
{{/if}}
{{#if hasPost}}
<div class="stream-post-container">
<span class="cell cell-post">{{{post}}}</span>

4
client/src/views/email/fields/body.js
View File

@@ -90,6 +90,10 @@ class EmailBodyFieldView extends WysiwygFieldView {
afterRender() {
super.afterRender();
if (!this.element) {
return;
}
this.controlInsertFieldButton();
if (this.isReadMode() && this.replyPart) {

108
client/src/views/stream/notes/email-received.js
View File

@@ -27,28 +27,68 @@
************************************************************************/
import NoteStreamView from 'views/stream/note';
import EmailBodyFieldView from 'views/email/fields/body';
import AttachmentMultipleFieldView from 'views/fields/attachment-multiple';
class EmailReceivedNoteStreamView extends NoteStreamView {
template = 'stream/notes/email-received'
isRemovable = false
isSystemAvatar = true
detailsIsShown = false
/**
* @private
* @type {import('views/fields/base').default}
*/
bodyFieldView
/**
* @private
* @type {import('views/fields/attachment-multiple').default}
*/
attachmentsFieldView
/**
* @private
* @type {import('model').default}
*/
formModel
/**
* @private
* @type {string}
*/
emailId
data() {
return {
...super.data(),
emailId: this.emailId,
emailName: this.emailName,
hasPost: this.hasPost,
hasPost: this.hasPost && !this.detailsIsShown,
hasAttachments: this.hasAttachments,
emailIconClassName: this.getMetadata().get(['clientDefs', 'Email', 'iconClass']) || '',
isPinned: this.isThis && this.model.get('isPinned') && this.model.collection &&
!this.model.collection.pinnedList,
detailsIsShown: this.detailsIsShown,
};
}
setup() {
const data = /** @type {Record} */this.model.get('data') || {};
this.addActionHandler('expandDetails', () => this.toggleDetails());
const data =
/**
* @type {{
* emailId: string,
* emailName: string,
* personEntityType?: string,
* personEntityId?: string,
* personEntityName?: string,
* isInitial?: boolean,
* }} */
this.model.get('data') || {};
this.emailId = data.emailId;
this.emailName = data.emailName;
@@ -118,6 +158,70 @@ class EmailReceivedNoteStreamView extends NoteStreamView {
this.createMessage();
}
/**
* @private
* Warning: The same method exists in email-sent.
*/
async toggleDetails() {
this.detailsIsShown = !this.detailsIsShown;
if (!this.detailsIsShown && this.formModel) {
this.formModel.abortLastFetch();
Espo.Ui.notify();
}
await this.reRender();
if (!this.detailsIsShown || !this.emailId) {
return;
}
if (this.bodyFieldView) {
this.bodyFieldView.toShowQuotePart = false;
await this.bodyFieldView.reRender();
return;
}
this.formModel = await this.getModelFactory().create('Email');
this.formModel.id = this.emailId;
Espo.Ui.notify(' ... ');
await this.formModel.fetch();
this.bodyFieldView = new EmailBodyFieldView({
name: 'body',
model: this.formModel,
mode: 'detail',
readOnly: true,
});
await this.assignView('bodyField', this.bodyFieldView, '[data-name="body"]');
if (
!this.hasAttachments &&
this.formModel.attributes.attachmentsIds &&
this.formModel.attributes.attachmentsIds.length
) {
this.attachmentsFieldView = new AttachmentMultipleFieldView({
name: 'attachments',
model: this.formModel,
mode: 'detail',
readOnly: true,
});
await this.assignView('attachmentsField', this.attachmentsFieldView, '[data-name="attachments"]');
}
Espo.Ui.notify();
await this.reRender();
}
}
export default EmailReceivedNoteStreamView;

107
client/src/views/stream/notes/email-sent.js
View File

@@ -27,27 +27,66 @@
************************************************************************/
import NoteStreamView from 'views/stream/note';
import EmailBodyFieldView from 'views/email/fields/body';
import AttachmentMultipleFieldView from 'views/fields/attachment-multiple';
class EmailSentNoteStreamView extends NoteStreamView {
template = 'stream/notes/email-sent'
isRemovable = false
/**
* @private
* @type {import('views/fields/base').default}
*/
bodyFieldView
/**
* @private
* @type {import('views/fields/attachment-multiple').default}
*/
attachmentsFieldView
/**
* @private
* @type {import('model').default}
*/
formModel
/**
* @private
* @type {string}
*/
emailId
data() {
return {
...super.data(),
emailId: this.emailId,
emailName: this.emailName,
hasPost: this.hasPost,
hasPost: this.hasPost && !this.detailsIsShown,
hasAttachments: this.hasAttachments,
emailIconClassName: this.getMetadata().get(['clientDefs', 'Email', 'iconClass']) || '',
isPinned: this.isThis && this.model.get('isPinned') && this.model.collection &&
!this.model.collection.pinnedList,
detailsIsShown: this.detailsIsShown,
};
}
setup() {
const data = /** @type {Record} */this.model.get('data') || {};
this.addActionHandler('expandDetails', () => this.toggleDetails());
const data =
/**
* @type {{
* emailId: string,
* emailName: string,
* personEntityType?: string,
* personEntityId?: string,
* personEntityName?: string,
* isInitial?: boolean,
* }} */
this.model.get('data') || {};
this.emailId = data.emailId;
this.emailName = data.emailName;
@@ -102,6 +141,70 @@ class EmailSentNoteStreamView extends NoteStreamView {
this.createMessage();
}
/**
* @private
* Warning: The same method exists in email-received.
*/
async toggleDetails() {
this.detailsIsShown = !this.detailsIsShown;
if (!this.detailsIsShown && this.formModel) {
this.formModel.abortLastFetch();
Espo.Ui.notify();
}
await this.reRender();
if (!this.detailsIsShown || !this.emailId) {
return;
}
if (this.bodyFieldView) {
this.bodyFieldView.toShowQuotePart = false;
await this.bodyFieldView.reRender();
return;
}
this.formModel = await this.getModelFactory().create('Email');
this.formModel.id = this.emailId;
Espo.Ui.notify(' ... ');
await this.formModel.fetch();
this.bodyFieldView = new EmailBodyFieldView({
name: 'body',
model: this.formModel,
mode: 'detail',
readOnly: true,
});
await this.assignView('bodyField', this.bodyFieldView, '[data-name="body"]');
if (
!this.hasAttachments &&
this.formModel.attributes.attachmentsIds &&
this.formModel.attributes.attachmentsIds.length
) {
this.attachmentsFieldView = new AttachmentMultipleFieldView({
name: 'attachments',
model: this.formModel,
mode: 'detail',
readOnly: true,
});
await this.assignView('attachmentsField', this.attachmentsFieldView, '[data-name="attachments"]');
}
Espo.Ui.notify();
await this.reRender();
}
}
export default EmailSentNoteStreamView;