Thread (#402)

* Arrive new email and show in your own thread when this thread is open

* Add Spam label when new email arrive with param: labels["Spam"]. Close #375

* Update css

* Update version 0.11.2

Author: Erika Perugachi

electron_app/package.json

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

email_mailbox/package.json

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

email_mailbox/src/app.scss

@@ -638,6 +638,11 @@ button{
   &:focus{
     outline: 0;
   }
+
+  &:disabled {
+    opacity: 0.5;
+    pointer-events: none;
+  }
 }
 
 .button-a{

email_mailbox/src/components/PanelWrapper.js

@@ -144,17 +144,26 @@ class PanelWrapper extends Component {
 
   initEventHandlers = props => {
     addEvent(Event.NEW_EMAIL, emailParams => {
-      const { isToMe, labels } = emailParams;
-      const isRenderingMailbox =
-        this.state.sectionSelected.type === SectionType.MAILBOX;
+      const { emailId, isToMe, labels, threadId } = emailParams;
+      const currentSectionType = this.state.sectionSelected.type;
+      const isRenderingMailbox = currentSectionType === SectionType.MAILBOX;
+      const isRenderingThread = currentSectionType === SectionType.THREAD;
       const currentLabelId =
         LabelType[this.state.sectionSelected.params.mailboxSelected].id;
       const isNewEmailInMailbox = labels.indexOf(currentLabelId) > -1;
-      if (isNewEmailInMailbox && isRenderingMailbox) {
+      const currentThreadId = this.state.sectionSelected.params
+        .threadIdSelected;
+      if (isRenderingMailbox && isNewEmailInMailbox) {
         props.onLoadThreads({
           labelId: Number(currentLabelId),
           clear: true
         });
+      } else if (isRenderingThread && threadId === currentThreadId) {
+        props.onLoadEmails(threadId);
+        props.onUpdateEmailIdsThread({
+          threadId,
+          emailIdToAdd: emailId
+        });
       }
       if (isToMe) {
         props.onUpdateUnreadEmailsBadge({

email_mailbox/src/components/SettingGeneral.js

@@ -220,7 +220,7 @@ const ResendConfirmationRecoveryEmailLink = ({
       onComplete={onResendConfirmationCountdownEnd}
     >
       <button className="button-b" onClick={onClickResendConfirmationLink}>
-        Resend Link
+        <span>Resend Link</span>
       </button>
     </Countdown>
   );
@@ -231,9 +231,9 @@ const renderer = ({ minutes, seconds, completed, children }) => {
     return children;
   }
   return (
-    <span className="button-b disabled">
-      {`Resend Link available in ${minutes}:${seconds}`}
-    </span>
+    <button className="button-b" disabled={true}>
+      <span>{`Resend Link available in ${minutes}:${seconds}`}</span>
+    </button>
   );
 };
 

email_mailbox/src/utils/electronEventInterface.js

@@ -107,6 +107,7 @@ const handleNewMessageEvent = async ({ rowid, params }) => {
     fileKey,
     files,
     from,
+    labels,
     messageType,
     metadataKey,
     subject,
@@ -116,6 +117,9 @@ const handleNewMessageEvent = async ({ rowid, params }) => {
   } = params;
   const recipientId = EmailUtils.getRecipientIdFromEmailAddressTag(from);
   const [prevEmail] = await getEmailByKey(metadataKey);
+  const isSpam = labels
+    ? labels.find(label => label === LabelType.spam.text)
+    : undefined;
   const InboxLabel = LabelType.inbox.id;
   const SentLabel = LabelType.sent.id;
   const isToMe = EmailUtils.checkEmailIsTo({ to, cc, bcc, type: 'to' });
@@ -166,14 +170,13 @@ const handleNewMessageEvent = async ({ rowid, params }) => {
           })
         : null;
 
-    const labels = [];
+    const labels = isSpam ? [LabelType.spam.id] : [];
     if (isToMe) {
       labels.push(InboxLabel);
     }
     if (isFromMe) {
       labels.push(SentLabel);
     }
-
     const emailData = {
       email,
       labels,