Merge pull request #5013 from withspectrum/3.1.2

3.1.2

Author: brianlovin

Diff for: api/mutations/directMessageThread/createDirectMessageThread.js

@@ -13,6 +13,7 @@ import {
   setUserLastSeenInDirectMessageThread,
   createMemberInDirectMessageThread,
 } from '../../models/usersDirectMessageThreads';
+import { addMessage } from '../message/addMessage';
 import type { FileUpload } from 'shared/types';
 import { events } from 'shared/analytics';
 import { trackQueue } from 'shared/bull/queues';
@@ -25,7 +26,7 @@ export type CreateDirectMessageThreadInput = {
     participants: Array<string>,
     message: {
       messageType: MessageType,
-      threadType: string,
+      threadType: 'directMessageThread',
       content: {
         body: string,
       },
@@ -81,65 +82,17 @@ export default requireAuth(
       threadId = threadToReturn.id;
     }
 
-    const handleStoreMessage = async message => {
-      if (
-        message.messageType === messageTypeObj.text ||
-        message.messageType === messageTypeObj.draftjs
-      ) {
-        // once we have an id we can generate a proper message object
-        const messageWithThread = {
-          ...message,
-          threadId,
-        };
-
-        return await storeMessage(messageWithThread, user.id);
-      } else if (message.messageType === messageTypeObj.media && message.file) {
-        let url;
-        try {
-          url = await uploadImage(message.file, 'threads', threadId);
-        } catch (err) {
-          trackQueue.add({
-            userId: user.id,
-            event: events.DIRECT_MESSAGE_THREAD_CREATED_FAILED,
-            properties: {
-              reason: 'image upload failed',
-            },
-          });
-          return new UserError(err.message);
-        }
-
-        // build a new message object with a new file field with metadata
-        const newMessage = Object.assign({}, message, {
-          ...message,
-          threadId: threadId,
-          content: {
-            body: url,
-          },
-          file: {
-            name: message.file && message.file.filename,
-            size: null,
-            type: message.file && message.file.mimetype,
-          },
-        });
-
-        return await storeMessage(newMessage, user.id);
-      } else {
-        trackQueue.add({
-          userId: user.id,
-          event: events.DIRECT_MESSAGE_THREAD_CREATED_FAILED,
-          properties: {
-            reason: 'unknown message type',
-          },
-        });
-        return new UserError('Unknown message type on this bad boy.');
-      }
-    };
-
     if (existingThread) {
       return await Promise.all([
         setUserLastSeenInDirectMessageThread(threadId, user.id),
         setDirectMessageThreadLastActive(threadId),
-        handleStoreMessage(message),
+        addMessage(
+          {
+            ...message,
+            threadId,
+          },
+          user.id
+        ),
       ]).then(() => threadToReturn);
     }
 
@@ -150,7 +103,13 @@ export default requireAuth(
 
     return await Promise.all([
       createMemberInDirectMessageThread(threadId, user.id, true),
-      handleStoreMessage(message),
+      addMessage(
+        {
+          ...message,
+          threadId,
+        },
+        user.id
+      ),
       participants.map(participant => {
         trackQueue.add({
           userId: participant,

Diff for: athena/package.json

@@ -23,8 +23,8 @@
     "now-env": "^3.1.0",
     "performance-now": "^2.1.0",
     "raven": "^2.6.4",
-    "react": "^16.8.5",
-    "react-dom": "^16.8.5",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
     "redis-tag-cache": "^1.2.1",
     "rethinkdb-inspector": "^0.3.3",
     "rethinkdbdash": "^2.3.31",

Diff for: athena/yarn.lock

@@ -713,30 +713,30 @@ rc@^1.0.0:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-react-dom@^16.8.5:
-  version "16.8.5"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.5.tgz#b3e37d152b49e07faaa8de41fdf562be3463335e"
-  integrity sha512-VIEIvZLpFafsfu4kgmftP5L8j7P1f0YThfVTrANMhZUFMDOsA6e0kfR6wxw/8xxKs4NB59TZYbxNdPCDW34x4w==
+react-dom@^16.8.6:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f"
+  integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.5"
+    scheduler "^0.13.6"
 
 react-is@^16.8.1:
   version "16.8.4"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2"
   integrity sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==
 
-react@^16.8.5:
-  version "16.8.5"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.8.5.tgz#49be3b655489d74504ad994016407e8a0445de66"
-  integrity sha512-daCb9TD6FZGvJ3sg8da1tRAtIuw29PbKZW++NN4wqkbEvxL+bZpaaYb4xuftW/SpXmgacf1skXl/ddX6CdOlDw==
+react@^16.8.6:
+  version "16.8.6"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe"
+  integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
     prop-types "^15.6.2"
-    scheduler "^0.13.5"
+    scheduler "^0.13.6"
 
 [email protected], redis-commands@^1.2.0:
   version "1.4.0"
@@ -813,10 +813,10 @@ sax@>=0.6.0:
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
 
-scheduler@^0.13.5:
-  version "0.13.5"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.5.tgz#b7226625167041298af3b98088a9dbbf6d7733a8"
-  integrity sha512-K98vjkQX9OIt/riLhp6F+XtDPtMQhqNcf045vsh+pcuvHq+PHy1xCrH3pq1P40m6yR46lpVvVhKdEOtnimuUJw==
+scheduler@^0.13.6:
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889"
+  integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"

Diff for: cypress/integration/channel/settings/edit_spec.js

@@ -40,8 +40,6 @@ describe('edit a channel', () => {
       .click();
 
     cy.visit(`/${community.slug}/${channel.slug}`);
-    cy.get('[data-cy="channel-profile-card"]').should('be.visible');
-    cy.get('[data-cy="channel-profile-card"]').contains(NEW_NAME);
-    cy.get('[data-cy="channel-profile-card"]').contains(NEW_DESCRIPTION);
+    cy.contains(NEW_NAME);
   });
 });

Diff for: cypress/integration/channel/view/membership_spec.js

@@ -8,10 +8,6 @@ const community = data.communities.find(
   community => community.id === publicChannel.communityId
 );
 
-const { userId: ownerInChannelId } = data.usersChannels.find(
-  ({ channelId, isOwner }) => channelId === publicChannel.id && isOwner
-);
-
 const { userId: memberInChannelId } = data.usersChannels.find(
   ({ channelId, isMember, isOwner }) =>
     channelId === publicChannel.id && isMember && !isOwner
@@ -25,20 +21,26 @@ const QUIET_USER_ID = constants.QUIET_USER_ID;
 
 const leave = () => {
   cy.get('[data-cy="channel-leave-button"]')
+    .last()
     .should('be.visible')
     .contains('Member');
 
-  cy.get('[data-cy="channel-leave-button"]').click();
+  cy.get('[data-cy="channel-leave-button"]')
+    .last()
+    .click();
 
-  cy.get('[data-cy="channel-join-button"]').contains(`Join channel`);
+  cy.get('[data-cy="channel-join-button"]').contains(`Join`);
 };
 
 const join = () => {
   cy.get('[data-cy="channel-join-button"]')
+    .last()
     .should('be.visible')
-    .contains('Join channel');
+    .contains('Join');
 
-  cy.get('[data-cy="channel-join-button"]').click();
+  cy.get('[data-cy="channel-join-button"]')
+    .last()
+    .click();
 
   cy.get('[data-cy="channel-leave-button"]').contains(`Member`);
 };
@@ -48,8 +50,8 @@ describe('logged out channel membership', () => {
     cy.visit(`/${community.slug}/${publicChannel.slug}`);
   });
 
-  it('should render join button that links to login view', () => {
-    cy.get('[data-cy="channel-login-join-button"]').should('be.visible');
+  it('should render community join button that links to login view', () => {
+    cy.get('[data-cy="profile-join-button"]').should('be.visible');
   });
 });
 
@@ -73,23 +75,8 @@ describe('channel profile as non-member', () => {
     );
   });
 
-  it('should render join channel button', () => {
-    join();
-    leave();
-  });
-});
-
-describe('channel profile as owner', () => {
-  beforeEach(() => {
-    cy.auth(ownerInChannelId).then(() =>
-      cy.visit(`/${community.slug}/${publicChannel.slug}`)
-    );
-  });
-
-  it('should render settings button', () => {
-    cy.get('[data-cy="channel-settings-button"]')
-      .should('be.visible')
-      .contains('Settings');
+  it('should render join community button', () => {
+    cy.get('[data-cy="profile-join-button"]').should('be.visible');
   });
 });
 

Diff for: cypress/integration/channel/view/notifications_spec.js

@@ -19,7 +19,10 @@ describe('channel notification preferences logged out', () => {
   it('should not render notifications settings', () => {
     cy.get('[data-cy="channel-view"]').should('be.visible');
 
-    cy.get('[data-cy="notifications-checkbox"]').should('not.be.visible');
+    cy.get('[data-cy="channel-notifications-muted"]').should('not.be.visible');
+    cy.get('[data-cy="channel-notifications-enabled"]').should(
+      'not.be.visible'
+    );
   });
 });
 
@@ -33,13 +36,21 @@ describe('channel notification preferences as member', () => {
   it('should render notification settings', () => {
     cy.get('[data-cy="channel-view"]').should('be.visible');
 
-    cy.get('[data-cy="notifications-checkbox-checked"]')
-      .should('be.visible')
-      .click();
+    cy.get('[data-cy="channel-notifications-enabled"]').should($p => {
+      expect($p).to.have.length(2);
+    });
 
-    cy.get('[data-cy="notifications-checkbox-unchecked"]')
-      .should('be.visible')
+    cy.get('[data-cy="channel-notifications-enabled"]')
+      .first()
       .click();
+
+    cy.get('[data-cy="channel-notifications-enabled"]').should($p => {
+      expect($p).to.have.length(1);
+    });
+
+    cy.get('[data-cy="channel-notifications-muted"]').should($p => {
+      expect($p).to.have.length(1);
+    });
   });
 });
 
@@ -53,7 +64,8 @@ describe('channel profile as non-member', () => {
   it('should not render notifications settings', () => {
     cy.get('[data-cy="channel-view"]').should('be.visible');
 
-    cy.get('[data-cy="notifications-checkbox-checked"]').should(
+    cy.get('[data-cy="channel-notifications-muted"]').should('not.be.visible');
+    cy.get('[data-cy="channel-notifications-enabled"]').should(
       'not.be.visible'
     );
   });

Diff for: cypress/integration/channel/view/profile_spec.js

@@ -39,13 +39,6 @@ describe('public channel', () => {
   it('should render profile', () => {
     cy.get('[data-cy="channel-view"]').should('be.visible');
   });
-
-  it('should contain channel metadata', () => {
-    cy.get('[data-cy="channel-profile-card"]').should('be.visible');
-    cy.contains(community.name);
-    cy.contains(publicChannel.description);
-    cy.contains(publicChannel.name);
-  });
 });
 
 describe('public channel in private community signed out', () => {
@@ -96,11 +89,6 @@ describe('archived channel', () => {
   it('should render profile', () => {
     cy.get('[data-cy="channel-view"]').should('be.visible');
   });
-
-  it('should contain archived tag', () => {
-    cy.get('[data-cy="channel-profile-card"]').should('be.visible');
-    cy.contains('Archived');
-  });
 });
 
 describe('deleted channel', () => {

Diff for: cypress/integration/thread/action_bar_spec.js

@@ -29,34 +29,46 @@ const memberInChannelUser = data.users.find(u => u.id === constants.BRYN_ID);
 const lockThread = () => {
   // lock the thread
   cy.get('[data-cy="thread-dropdown-lock"]').contains('Lock chat');
-  cy.get('[data-cy="thread-dropdown-lock"]').click();
+  cy.get('[data-cy="thread-dropdown-lock"]')
+    .first()
+    .click();
   cy.get('[data-cy="thread-dropdown-lock"]').contains('Unlock chat');
 
   // unlock the thread
-  cy.get('[data-cy="thread-dropdown-lock"]').click();
+  cy.get('[data-cy="thread-dropdown-lock"]')
+    .first()
+    .click();
   cy.get('[data-cy="thread-dropdown-lock"]').contains('Lock chat');
 };
 
 const pinThread = () => {
   // pin the thread
-  cy.get('[data-cy="thread-dropdown-pin"]').click();
+  cy.get('[data-cy="thread-dropdown-pin"]')
+    .first()
+    .click();
   cy.get('[data-cy="thread-dropdown-pin"]').contains('Unpin');
 
   // unpin the thread
-  cy.get('[data-cy="thread-dropdown-pin"]').click();
+  cy.get('[data-cy="thread-dropdown-pin"]')
+    .first()
+    .click();
   cy.get('[data-cy="thread-dropdown-pin"]').contains('Pin');
 };
 
 const triggerThreadDelete = () => {
-  cy.get('[data-cy="thread-dropdown-delete"]').click();
+  cy.get('[data-cy="thread-dropdown-delete"]')
+    .first()
+    .click();
   cy.get('[data-cy="delete-button"]').should('be.visible');
   cy.get('div.ReactModal__Overlay')
     .should('be.visible')
     .click('topLeft');
 };
 
 const triggerMovingThread = () => {
-  cy.get('[data-cy="thread-dropdown-move"]').click();
+  cy.get('[data-cy="thread-dropdown-move"]')
+    .first()
+    .click();
   cy.get('[data-cy="move-thread-modal"]').should('be.visible');
   cy.get('div.ReactModal__Overlay')
     .should('be.visible')
@@ -65,8 +77,9 @@ const triggerMovingThread = () => {
 
 const openSettingsDropdown = () => {
   cy.get('[data-cy="thread-actions-dropdown-trigger"]')
+    .last()
     .should('be.visible')
-    .click();
+    .click({ force: true });
 };
 
 describe('action bar renders', () => {