Removethreads (#394)

* Update reducer REMOVE_THREADS

* Update version 0.11.0

Author: Erika Perugachi

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.9.3",
+  "version": "0.11.0",
   "author": {
     "name": "Criptext Inc.",
     "email": "[email protected]",

electron_app/src/utils/EmailUtils.js

@@ -77,7 +77,7 @@ const formIncomingEmailFromData = ({
   const content = body || '';
   const preview = body
     ? removeHTMLTags(content)
-        .slice(0, 50)
+        .slice(0, 100)
         .trim()
     : '';
   const status = isToMe ? EmailStatus.NONE : EmailStatus.DELIVERED;
@@ -132,7 +132,7 @@ const formOutgoingEmailFromData = ({
     key: Date.now(),
     subject: textSubject,
     content: body,
-    preview: removeHTMLTags(body).slice(0, 50),
+    preview: removeHTMLTags(body).slice(0, 100),
     date: Date.now(),
     status: EmailStatus.SENDING,
     unread: false,

email_mailbox/package.json

@@ -1,6 +1,6 @@
 {
   "name": "email_mailbox",
-  "version": "0.9.3",
+  "version": "0.11.0",
   "private": true,
   "dependencies": {
     "animejs": "^2.2.0",

email_mailbox/src/actions/index.js

@@ -20,13 +20,12 @@ import {
   removeLabelIdThreadDraftSuccess,
   removeLabelIdThreads,
   removeLabelIdThreadsSuccess,
-  removeThread,
-  removeThreadsByThreadIdsOnSuccess,
   updateEmailIdsThread,
   updateUnreadThreads,
   updateUnreadThreadsSuccess,
-  searchThreads,
   removeThreads,
+  removeThreadsSuccess,
+  searchThreads,
   sendOpenEvent,
   updateStatusThread
 } from './threads';
@@ -96,11 +95,10 @@ export {
   removeLabelIdThreads,
   removeLabelIdThreadsSuccess,
   removeLabelOnSuccess,
-  removeThread,
   removeFeedItem,
   removeFeedItemSuccess,
   removeThreads,
-  removeThreadsByThreadIdsOnSuccess,
+  removeThreadsSuccess,
   selectFeedItem,
   selectThread,
   searchThreads,

email_mailbox/src/actions/threads.js

@@ -133,7 +133,9 @@ export const addLabelIdThreadsSuccess = (threadIds, labelId) => ({
 export const addMoveLabelIdThreads = ({ threadsParams, labelId, notMove }) => {
   return async dispatch => {
     try {
-      const threadIds = threadsParams.map(param => param.threadIdDB);
+      const threadIds = threadsParams
+        .map(param => param.threadIdDB)
+        .filter(item => item !== null);
       const dbReponse = await Promise.all(
         threadIds.map(async threadId => {
           const threadEmails = await getEmailsByThreadId(threadId);
@@ -260,14 +262,42 @@ export const removeLabelIdThreadsSuccess = (threadIds, labelId) => ({
   labelId
 });
 
-export const removeThread = threadId => ({
-  type: Thread.REMOVE_THREAD,
-  targetThread: threadId
-});
+export const removeThreads = threadsParams => {
+  return async dispatch => {
+    try {
+      const emailIds = threadsParams
+        .map(param => param.emailId)
+        .filter(item => item !== null);
+      const threadIds = threadsParams
+        .map(param => param.threadIdDB)
+        .filter(item => item !== null);
+      if (threadIds.length) {
+        const eventParams = {
+          cmd: SocketCommand.PEER_THREAD_DELETED_PERMANENTLY,
+          params: { threadIds }
+        };
+        const { status } = await postPeerEvent(eventParams);
+        if (status === 200) {
+          await deleteEmailsByThreadId(threadIds);
+          dispatch(removeThreadsSuccess(threadIds));
+        } else {
+          sendRemoveThreadsErrorMessage();
+        }
+      }
+      if (emailIds.length) {
+        await deleteEmailsByIds(emailIds);
+        dispatch(removeThreadsSuccess(emailIds));
+      }
+      dispatch(loadFeedItems(true));
+    } catch (e) {
+      sendRemoveThreadsErrorMessage();
+    }
+  };
+};
 
-export const removeThreadsSuccess = threadsIds => ({
+export const removeThreadsSuccess = uniqueIds => ({
   type: Thread.REMOVE_THREADS,
-  threadsIds
+  uniqueIds
 });
 
 export const selectThread = threadId => ({
@@ -368,36 +398,6 @@ export const loadEvents = params => {
   };
 };
 
-export const removeThreads = (threadsParams, isDraft) => {
-  return async dispatch => {
-    try {
-      const storeIds = threadsParams.map(param => param.threadIdStore);
-      const threadIds = threadsParams
-        .map(param => param.threadIdDB)
-        .filter(item => item !== null);
-
-      const eventParams = {
-        cmd: SocketCommand.PEER_THREAD_DELETED_PERMANENTLY,
-        params: { threadIds }
-      };
-      const { status } = await postPeerEvent(eventParams);
-      if (status === 200) {
-        const dbResponse = isDraft
-          ? await deleteEmailsByIds(storeIds)
-          : await deleteEmailsByThreadId(threadIds);
-        if (dbResponse) {
-          dispatch(removeThreadsSuccess(storeIds));
-          dispatch(loadFeedItems(true));
-        }
-      } else {
-        sendRemoveThreadsErrorMessage();
-      }
-    } catch (e) {
-      sendRemoveThreadsErrorMessage();
-    }
-  };
-};
-
 export const sendOpenEvent = threadId => {
   return async () => {
     try {
@@ -427,8 +427,3 @@ const formRemoveThreadLabelParams = (emails, labelId) => {
     labelIds: [labelId]
   };
 };
-
-export const removeThreadsByThreadIdsOnSuccess = threadIds => ({
-  type: Thread.REMOVE_THREADS_BY_THREAD_ID,
-  threadIds
-});

email_mailbox/src/actions/types.js

@@ -11,7 +11,6 @@ export const Thread = {
   REMOVE_LABELID_THREAD: 'REMOVE_LABELID_THREAD',
   REMOVE_LABELID_THREAD_DRAFT: 'REMOVE_LABELID_THREAD_DRAFT',
   REMOVE_LABELID_THREADS: 'REMOVE_LABELID_THREADS',
-  REMOVE_THREAD: 'REMOVE_THREAD',
   REMOVE_THREADS: 'REMOVE_THREADS',
   REMOVE_THREADS_BY_THREAD_ID: 'REMOVE_THREADS_BY_THREAD_ID',
   UPDATE_EMAILIDS_THREAD: 'UPDATE_EMAILIDS_THREAD',

email_mailbox/src/components/HeaderThreadOptionsWrapper.js

@@ -105,6 +105,7 @@ class HeaderThreadOptionsWrapper extends Component {
       currentLabelId === LabelType.inbox.id ||
       currentLabelId === LabelType.sent.id ||
       currentLabelId === LabelType.starred.id ||
+      currentLabelId === LabelType.draft.id ||
       currentLabelId === LabelType.allmail.id
     );
   };
@@ -113,8 +114,7 @@ class HeaderThreadOptionsWrapper extends Component {
     const currentLabelId = LabelType[this.props.mailboxSelected].id;
     return (
       currentLabelId === LabelType.spam.id ||
-      currentLabelId === LabelType.trash.id ||
-      currentLabelId === LabelType.draft.id
+      currentLabelId === LabelType.trash.id
     );
   };
 
@@ -139,18 +139,13 @@ class HeaderThreadOptionsWrapper extends Component {
   };
 
   handleClickDeleteThread = () => {
-    const currentLabelId = LabelType[this.props.mailboxSelected].id;
-    if (currentLabelId === LabelType.draft.id) {
-      this.props.onRemoveDrafts(this.props.threadsSelected);
-    } else {
-      confirmPermanentDeleteThread(response => {
-        closeDialog();
-        if (response === CONFIRM_RESPONSE) {
-          const backFirst = true;
-          this.props.onRemoveThreads(this.props.threadsSelected, backFirst);
-        }
-      });
-    }
+    confirmPermanentDeleteThread(response => {
+      closeDialog();
+      if (response === CONFIRM_RESPONSE) {
+        const backFirst = true;
+        this.props.onRemoveThreads(this.props.threadsSelected, backFirst);
+      }
+    });
   };
 
   handleClickMoveToInbox = () => {
@@ -195,7 +190,6 @@ HeaderThreadOptionsWrapper.propTypes = {
   onAddLabel: PropTypes.func,
   onAddMoveLabel: PropTypes.func,
   onMarkRead: PropTypes.func,
-  onRemoveDrafts: PropTypes.func,
   onRemoveLabel: PropTypes.func,
   onRemoveThreads: PropTypes.func,
   threadsSelected: PropTypes.array

email_mailbox/src/components/SearchHints.js

@@ -33,7 +33,7 @@ const SearchHints = props => (
         {props.threads.map((thread, index) => (
           <SearchMail
             key={index}
-            id={thread.get('id')}
+            id={thread.get('threadId')}
             preview={thread.get('preview')}
             date={thread.get('date')}
             participants={thread.get('fromContactName')}

email_mailbox/src/containers/HeaderThreadOptions.js

@@ -10,7 +10,6 @@ const defineOneThreadSelected = (threads, threadId) => {
   });
   return [
     {
-      threadIdStore: thread.get('threadId'),
       threadIdDB: thread.get('threadId')
     }
   ];
@@ -22,7 +21,7 @@ const defineThreadsSelected = (threads, itemsChecked) => {
     .toArray()
     .map(thread => ({
       threadIdDB: thread.get('threadId'),
-      uniqueId: thread.get('uniqueId')
+      emailId: !thread.get('threadId') ? thread.get('id') : null
     }));
 };
 
@@ -91,7 +90,9 @@ const mapStateToProps = (state, ownProps) => {
   const threadsSelected = ownProps.itemsChecked
     ? defineThreadsSelected(threads, ownProps.itemsChecked)
     : defineOneThreadSelected(threads, ownProps.threadIdSelected);
-  const uniqueIdsSelected = threadsSelected.map(thread => thread.uniqueId);
+  const uniqueIdsSelected = threadsSelected.map(
+    thread => thread.threadIdDB || thread.emailId
+  );
   const threadsLabelIds = getLabelIdsFromThreadIds(threads, uniqueIdsSelected);
   const labels = getLabelIncluded(state.get('labels'), threadsLabelIds);
   const markAsUnread = ownProps.itemsChecked
@@ -149,21 +150,15 @@ const mapDispatchToProps = (dispatch, ownProps) => {
         () => ownProps.onBackOption()
       );
     },
-    onRemoveThreads: async (threadsIds, backFirst) => {
+    onRemoveThreads: async (threadIds, backFirst) => {
       if (backFirst) {
         await ownProps.onBackOption();
-        dispatch(actions.removeThreads(threadsIds));
+        dispatch(actions.removeThreads(threadIds));
       } else {
-        dispatch(actions.removeThreads(threadsIds)).then(() =>
+        dispatch(actions.removeThreads(threadIds)).then(() =>
           ownProps.onBackOption()
         );
       }
-    },
-    onRemoveDrafts: params => {
-      const isDraft = true;
-      dispatch(actions.removeThreads(params, isDraft)).then(() =>
-        ownProps.onBackOption()
-      );
     }
   };
 };

email_mailbox/src/containers/Message.js

@@ -90,7 +90,7 @@ const mapDispatchToProps = (dispatch, ownProps) => {
           const labelId = LabelType.trash.id;
           const emails = await getEmailsByLabelIds([labelId]);
           const threadsParams = emails.map(email => ({
-            threadIdStore: email.id,
+            emailId: email.id,
             threadIdDB: email.threadId
           }));
           dispatch(removeThreads(threadsParams));