Merge pull request #1090 from erikaperugachi/draft

Fix delete draft

Author: Erika Perugachi

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.20.1",
+  "version": "0.21.0",
   "author": {
     "name": "Criptext Inc",
     "email": "[email protected]",

electron_app/src/DBManager.js

@@ -502,12 +502,16 @@ const getEmailsByIds = ids => {
   GROUP_CONCAT(DISTINCT(CASE WHEN ${Table.EMAIL_CONTACT}.type = 'bcc' THEN ${
     Table.EMAIL_CONTACT
   }.contactId ELSE NULL END)) as 'bcc',
-  GROUP_CONCAT(DISTINCT(${Table.FILE}.token)) as fileTokens
+  GROUP_CONCAT(DISTINCT(${Table.FILE}.token)) as fileTokens,
+  GROUP_CONCAT(DISTINCT(${Table.EMAIL_LABEL}.labelId)) as labelIds
   FROM ${Table.EMAIL}
   LEFT JOIN ${Table.EMAIL_CONTACT} ON ${Table.EMAIL_CONTACT}.emailId = ${
     Table.EMAIL
   }.id
   LEFT JOIN ${Table.FILE} ON ${Table.FILE}.emailId = ${Table.EMAIL}.id
+  LEFT JOIN ${Table.EMAIL_LABEL} ON ${Table.EMAIL_LABEL}.emailId = ${
+    Table.EMAIL
+  }.id
   WHERE ${Table.EMAIL}.id IN (${idsString})
   GROUP BY ${Table.EMAIL}.id
   `;
@@ -540,12 +544,16 @@ const getEmailsByThreadId = threadId => {
   GROUP_CONCAT(DISTINCT(CASE WHEN ${Table.EMAIL_CONTACT}.type = 'bcc' THEN ${
     Table.EMAIL_CONTACT
   }.contactId ELSE NULL END)) as 'bcc',
-  GROUP_CONCAT(DISTINCT(${Table.FILE}.token)) as fileTokens
+  GROUP_CONCAT(DISTINCT(${Table.FILE}.token)) as fileTokens,
+  GROUP_CONCAT(DISTINCT(${Table.EMAIL_LABEL}.labelId)) as labelIds
   FROM ${Table.EMAIL}
   LEFT JOIN ${Table.EMAIL_CONTACT} ON ${Table.EMAIL_CONTACT}.emailId = ${
     Table.EMAIL
   }.id
   LEFT JOIN ${Table.FILE} ON ${Table.FILE}.emailId = ${Table.EMAIL}.id
+  LEFT JOIN ${Table.EMAIL_LABEL} ON ${Table.EMAIL_LABEL}.emailId = ${
+    Table.EMAIL
+  }.id
   WHERE threadId = '${threadId}'
   GROUP BY ${Table.EMAIL}.id
   `;

electron_app/src/windows/composer.js

@@ -155,34 +155,35 @@ const destroy = async ({
 }) => {
   const composer = BrowserWindow.fromId(composerId);
   const emailToEdit = globalManager.emailToEdit.get(composer.id);
-  let typeEmailSent = 'new-email';
-  let threadData = undefined;
+  let event = 'composer-email-sent';
+  let params = {
+    type: 'new-email',
+    threadId,
+    hasExternalPassphrase
+  };
   if (emailToEdit) {
     const { type, key } = emailToEdit;
     if (type === composerEvents.EDIT_DRAFT) {
-      typeEmailSent = 'draft-edited';
       const [oldDraftEmail] = await dbManager.getEmailByKey(key);
+      const oldEmailId = oldDraftEmail.id;
       await dbManager.deleteEmailLabelAndContactByEmailId(
-        oldDraftEmail.id,
+        oldEmailId,
         undefined
       );
+      event = 'composer-email-delete';
+      params = { threadId, oldEmailId };
     } else if (
       type === composerEvents.REPLY ||
       type === composerEvents.REPLY_ALL
     ) {
-      typeEmailSent = 'reply';
-      threadData = {
+      params.type = 'reply';
+      params.threadData = {
         threadId,
         newEmailId: emailId
       };
     }
   }
-  sendEventToMailbox('composer-email-sent', {
-    type: typeEmailSent,
-    threadId,
-    hasExternalPassphrase,
-    threadData
-  });
+  sendEventToMailbox(event, params);
   globalManager.composerData.delete(composer.id);
   composer.destroy();
 };

email_composer/src/containers/Composer.js

@@ -270,7 +270,8 @@ class ComposerWrapper extends Component {
   };
 
   handleClickDiscardDraft = () => {
-    closeComposerWindow({});
+    const threadId = this.state.threadId;
+    closeComposerWindow({ threadId });
   };
 
   handleDisableSendButtonOnInvalidEmail = () => {

email_mailbox/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_mailbox",
-  "version": "0.20.1",
+  "version": "0.21.0",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.1.2-rc5",

email_mailbox/src/components/PanelWrapper.js

@@ -415,7 +415,7 @@ class PanelWrapper extends Component {
     const currentLabelId = isRenderingMailbox
       ? this.state.sectionSelected.params.mailboxSelected.id
       : null;
-    const { threadId, newEmailId, oldEmailId } = eventParams;
+    const { threadId, newEmailId, oldEmailId, badgeLabelIds } = eventParams;
     if (!threadId && !newEmailId && !oldEmailId) return;
     if (currentLabelId) {
       this.props.onLoadEmails(threadId);
@@ -429,6 +429,10 @@ class PanelWrapper extends Component {
     if (!newEmailId && !oldEmailId) {
       this.props.onUpdateUnreadEmailsBadge([LabelType.inbox.id]);
     }
+
+    if (badgeLabelIds) {
+      this.props.onUpdateUnreadEmailsBadge(badgeLabelIds);
+    }
   };
 
   deviceRemovedListenerCallback = () => {

email_mailbox/src/utils/electronEventInterface.js

@@ -1024,6 +1024,7 @@ ipcRenderer.on(
           type: MessageType.SUCCESS,
           params: { threadId }
         };
+
     emitter.emit(Event.DISPLAY_MESSAGE, messageData);
     switch (type) {
       case 'new-email': {
@@ -1033,14 +1034,6 @@ ipcRenderer.on(
         });
         break;
       }
-      case 'draft-edited': {
-        emitter.emit(Event.STORE_LOAD, {
-          labelIds: [LabelType.sent.id, LabelType.draft.id],
-          badgeLabelIds: [LabelType.draft.id],
-          threadIds: [threadId]
-        });
-        break;
-      }
       case 'reply': {
         const { threadId, newEmailId, oldEmailId } = threadData;
         emitter.emit(Event.UPDATE_THREAD_EMAILS, {
@@ -1056,6 +1049,21 @@ ipcRenderer.on(
   }
 );
 
+ipcRenderer.on('composer-email-delete', (ev, { threadId, oldEmailId }) => {
+  if (threadId && oldEmailId) {
+    return emitter.emit(Event.UPDATE_THREAD_EMAILS, {
+      threadId,
+      oldEmailId,
+      badgeLabelIds: [LabelType.draft.id]
+    });
+  }
+  emitter.emit(Event.STORE_LOAD, {
+    labelIds: [LabelType.sent.id, LabelType.draft.id],
+    badgeLabelIds: [LabelType.draft.id],
+    threadIds: [threadId]
+  });
+});
+
 ipcRenderer.on('display-message-success-download', () => {
   const messageData = {
     ...Messages.success.downloadFile,