From fccafe577e2d446579fb820d821dfb3f7d3ccf89 Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Wed, 9 Oct 2024 10:56:18 +0300
Subject: [PATCH] email folder string display sent and group

---
 .../src/views/email/fields/folder-string.js   | 57 ++++++++++++-------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/client/src/views/email/fields/folder-string.js b/client/src/views/email/fields/folder-string.js
index 7e62f075f7..da7ebeff15 100644
--- a/client/src/views/email/fields/folder-string.js
+++ b/client/src/views/email/fields/folder-string.js
@@ -34,7 +34,14 @@ class EmailFolderStringFieldView extends BaseFieldView {
     detailTemplateContent = `
         {{#if valueIsSet}}
             {{#if value}}
-                {{value}}
+                {{#if isList}}
+                    {{#each value}}
+                        <div class="multi-enum-item-container">{{this}}</div>
+                    {{/each}}
+                {{else}}
+                    {{value}}
+                {{/if}}
+
             {{else}}
                 <span class="none-value">{{translate 'None'}}</span>
             {{/if}}
@@ -45,14 +52,16 @@ class EmailFolderStringFieldView extends BaseFieldView {
 
     // noinspection JSCheckFunctionSignatures
     data() {
-        console.log(this.getFolderString());
         if (!this.model.has('folderId')) {
             return {valueIsSet: false};
         }
 
+        const value = this.getFolderString();
+
         return {
             valueIsSet: true,
             value: this.getFolderString(),
+            isList: Array.isArray(value),
         }
     }
 
@@ -71,26 +80,10 @@ class EmailFolderStringFieldView extends BaseFieldView {
     }
 
     /**
-     * @return {string}
+     * @return {string|string[]}
      */
     getFolderString() {
-        if (this.model.get('inTrash')) {
-            return this.translate('trash', 'presetFilters', 'Email');
-        }
-
-        if (this.model.get('isUsersSent')) {
-            return this.translate('sent', 'presetFilters', 'Email');
-        }
-
-        if (this.model.get('inArchive')) {
-            return this.translate('archive', 'presetFilters', 'Email');
-        }
-
-        if (this.model.attributes.folderName && this.model.attributes.folderId) {
-            return this.model.attributes.folderName;
-        }
-
-        if (this.model.get('groupFolderName')) {
+        if (this.model.attributes.groupFolderName) {
             let string = this.translate('group', 'strings', 'Email') + ' · ' + this.model.get('groupFolderName');
 
             if (this.model.attributes.groupStatusFolder === 'Archive') {
@@ -99,9 +92,33 @@ class EmailFolderStringFieldView extends BaseFieldView {
                 string += ' · ' + this.translate('trash', 'presetFilters', 'Email');
             }
 
+            if (this.model.attributes.isUsersSent) {
+                return [
+                    string,
+                    this.translate('sent', 'presetFilters', 'Email'),
+                ];
+            }
+
             return string;
         }
 
+        if (this.model.attributes.inTrash) {
+            return this.translate('trash', 'presetFilters', 'Email');
+        }
+
+        if (this.model.attributes.inArchive) {
+            return this.translate('archive', 'presetFilters', 'Email');
+        }
+
+
+        if (this.model.attributes.folderName && this.model.attributes.folderId) {
+            return this.model.attributes.folderName;
+        }
+
+        if (this.model.attributes.isUsersSent) {
+            return this.translate('sent', 'presetFilters', 'Email');
+        }
+
         if (this.model.get('isUsers')) {
             return this.translate('inbox', 'presetFilters', 'Email');
         }