Merge pull request #2979 from withspectrum/2.2.8

2.2.8

api/loaders/channel.js

@@ -7,7 +7,6 @@ import {
 import { getChannelsSettings } from '../models/channelSettings';
 import createLoader from './create-loader';
 import { getPendingUsersInChannels } from '../models/usersChannels';
-import type { Loader } from './types';
 
 export const __createChannelLoader = createLoader(channels =>
   getChannels(channels)

api/loaders/index.js

@@ -37,6 +37,7 @@ import {
 } from './directMessageThread';
 import { __createReactionLoader } from './reaction';
 import { __createStripeCustomersLoader } from './stripe';
+import { __createMessageLoader } from './message';
 import type { DataLoaderOptions } from './types';
 
 // Create all the necessary loaders to be attached to the GraphQL context for each request
@@ -70,6 +71,7 @@ const createLoaders = (options?: DataLoaderOptions) => ({
   directMessageThread: __createDirectMessageThreadLoader(options),
   directMessageParticipants: __createDirectMessageParticipantsLoader(options),
   directMessageSnippet: __createDirectMessageSnippetLoader(options),
+  message: __createMessageLoader(options),
   messageReaction: __createReactionLoader(options),
 });
 

api/loaders/message.js

@@ -0,0 +1,14 @@
+// @flow
+import { getManyMessages } from '../models/message';
+import createLoader from './create-loader';
+import type { Loader } from './types';
+
+export const __createMessageLoader = createLoader((messages: string[]) =>
+  getManyMessages(messages)
+);
+
+export default () => {
+  throw new Error(
+    '⚠️ Do not import loaders directly, get them from the GraphQL context instead! ⚠️'
+  );
+};

api/loaders/user.js

@@ -12,7 +12,6 @@ import {
 import { getUsersPermissionsInChannels } from '../models/usersChannels';
 import { getThreadsNotificationStatusForUsers } from '../models/usersThreads';
 import createLoader from './create-loader';
-import type { Loader } from './types';
 
 export const __createUserLoader = createLoader(users => getUsers(users), 'id');
 

api/models/communitySettings.js

@@ -31,11 +31,12 @@ export const getCommunitiesSettings = (
     .getAll(...communityIds, { index: 'communityId' })
     .run()
     .then(data => {
-      if (!data || data.length === 0)
+      if (!data || data.length === 0) {
         return Array.from({ length: communityIds.length }, (_, index) => ({
           ...defaultSettings,
           communityId: communityIds[index],
         }));
+      }
 
       if (data.length === communityIds.length) {
         return data.map(
@@ -50,12 +51,23 @@ export const getCommunitiesSettings = (
       }
 
       if (data.length < communityIds.length) {
-        return communityIds.map(community => {
-          const record = data.find(o => o.communityId === community);
+        return communityIds.map(communityId => {
+          const record = data.find(o => o.communityId === communityId);
+          if (record) return record;
+          return {
+            ...defaultSettings,
+            communityId,
+          };
+        });
+      }
+
+      if (data.length > communityIds.length) {
+        return communityIds.map(communityId => {
+          const record = data.find(o => o.communityId === communityId);
           if (record) return record;
           return {
             ...defaultSettings,
-            communityId: community,
+            communityId,
           };
         });
       }

api/models/message.js

@@ -11,7 +11,6 @@ import { createChangefeed } from 'shared/changefeed-utils';
 import { setThreadLastActive } from './thread';
 
 export type MessageTypes = 'text' | 'media';
-// TODO: Fix this
 export type Message = Object;
 
 export const getMessage = (messageId: string): Promise<Message> => {
@@ -25,6 +24,16 @@ export const getMessage = (messageId: string): Promise<Message> => {
     });
 };
 
+export const getManyMessages = (messageIds: string[]): Promise<Message[]> => {
+  return db
+    .table('messages')
+    .getAll(...messageIds)
+    .run()
+    .then(messages => {
+      return messages.filter(message => message && !message.deletedAt);
+    });
+};
+
 type BackwardsPaginationOptions = { last?: number, before?: number | Date };
 
 const getBackwardsMessages = (

api/mutations/message/addMessage.js

@@ -4,7 +4,7 @@ import { EditorState } from 'draft-js';
 import type { GraphQLContext } from '../../';
 import UserError from '../../utils/UserError';
 import { uploadImage } from '../../utils/file-storage';
-import { storeMessage } from '../../models/message';
+import { storeMessage, getMessage } from '../../models/message';
 import { setDirectMessageThreadLastActive } from '../../models/directMessageThread';
 import { setUserLastSeenInDirectMessageThread } from '../../models/usersDirectMessageThreads';
 import { createMemberInChannel } from '../../models/usersChannels';
@@ -25,6 +25,7 @@ type AddMessageInput = {
     content: {
       body: string,
     },
+    parentId?: string,
     file?: FileUpload,
   },
 };
@@ -86,6 +87,12 @@ export default async (
     }
   }
 
+  if (message.parentId) {
+    const parent = await getMessage(message.parentId);
+    if (parent.threadId !== message.threadId)
+      throw new UserError('You can only quote messages from the same thread.');
+  }
+
   // construct the shape of the object to be stored in the db
   let messageForDb = Object.assign({}, message);
   if (message.file && message.messageType === 'media') {

api/queries/community/brandedLogin.js

@@ -1,6 +1,5 @@
 // @flow
 import type { DBCommunity } from 'shared/types';
-import { getCommunitySettings } from '../../models/communitySettings';
 import type { GraphQLContext } from '../../';
 
 export default async (

api/queries/message/index.js

@@ -5,6 +5,7 @@ import sender from './sender';
 import author from './author';
 import thread from './thread';
 import reactions from './reactions';
+import parent from './parent';
 
 module.exports = {
   Query: {
@@ -16,5 +17,6 @@ module.exports = {
     sender, // deprecated
     thread,
     reactions,
+    parent,
   },
 };

api/queries/message/parent.js

@@ -0,0 +1,12 @@
+// @flow
+import type { DBMessage } from 'shared/types';
+import type { GraphQLContext } from '../../';
+
+export default (
+  { parentId }: DBMessage,
+  _: void,
+  { loaders }: GraphQLContext
+) => {
+  if (!parentId) return null;
+  return loaders.message.load(parentId);
+};

api/queries/message/rootMessage.js

@@ -1,4 +1,6 @@
 // @flow
 import { getMessage } from '../../models/message';
+import type { GraphQLContext } from '../../';
 
-export default (_: any, { id }: { id: string }) => getMessage(id);
+export default (_: any, { id }: { id: string }, { loaders }: GraphQLContext) =>
+  loaders.message.load(id);

api/types/Message.js

@@ -28,6 +28,7 @@ const Message = /* GraphQL */ `
     author: ThreadParticipant! @cost(complexity: 2)
     reactions: ReactionData @cost(complexity: 1)
 		messageType: MessageTypes!
+    parent: Message
 
 		sender: User! @deprecated(reason:"Use Message.author field instead")
 	}
@@ -41,6 +42,7 @@ const Message = /* GraphQL */ `
 		threadType: ThreadTypes!
 		messageType: MessageTypes!
 		content: MessageContentInput!
+    parentId: String
 		file: Upload
 	}
 

athena/queues/new-message-in-thread/index.js

@@ -19,8 +19,11 @@ import {
 import { getThreadNotificationUsers } from '../../models/usersThreads';
 import { getUserPermissionsInChannel } from '../../models/usersChannels';
 import { getUserPermissionsInCommunity } from '../../models/usersCommunities';
+import { getUserById } from '../../models/user';
+import { getMessageById } from '../../models/message';
 import { sendMentionNotificationQueue } from 'shared/bull/queues';
 import type { MessageNotificationJobData, Job } from 'shared/bull/types';
+import type { DBMessage } from 'shared/types';
 
 export default async (job: Job<MessageNotificationJobData>) => {
   const { message: incomingMessage } = job.data;
@@ -97,7 +100,25 @@ export default async (job: Job<MessageNotificationJobData>) => {
       : incomingMessage.content.body;
 
   // get mentions in the message
-  const mentions = getMentions(body);
+  let mentions = getMentions(body);
+  // If the message quoted another message, send a mention notification to the author
+  // of the quoted message
+  if (typeof incomingMessage.parentId === 'string') {
+    // $FlowIssue
+    const parent = await getMessageById(incomingMessage.parentId);
+    // eslint-disable-next-line
+    (parent: DBMessage);
+    if (parent) {
+      const parentAuthor = await getUserById(parent.senderId);
+      if (
+        parentAuthor &&
+        parentAuthor.username &&
+        mentions.indexOf(parentAuthor.username) < 0
+      ) {
+        mentions.push(parentAuthor.username);
+      }
+    }
+  }
   if (mentions && mentions.length > 0) {
     mentions.forEach(username => {
       sendMentionNotificationQueue.add({

config-overrides.js

@@ -16,6 +16,7 @@ const WriteFilePlugin = require('write-file-webpack-plugin');
 const { ReactLoadablePlugin } = require('react-loadable/webpack');
 const OfflinePlugin = require('offline-plugin');
 const { BundleAnalyzerPlugin } = require('webpack-bundle-analyzer');
+const BundleBuddyWebpackPlugin = require('bundle-buddy-webpack-plugin');
 
 // Recursively walk a folder and get all file paths
 function walkFolder(currentDirPath, callback) {
@@ -147,6 +148,9 @@ module.exports = function override(config, env) {
       })
     );
   }
+  if (process.env.BUNDLE_BUDDY === 'true') {
+    config.plugins.push(new BundleBuddyWebpackPlugin());
+  }
   if (process.env.NODE_ENV === 'development') {
     config.plugins.push(
       WriteFilePlugin({
@@ -155,5 +159,13 @@ module.exports = function override(config, env) {
       })
     );
   }
+  config.plugins.push(
+    new webpack.optimize.CommonsChunkPlugin({
+      minChunks: 3,
+      name: 'main',
+      async: 'commons',
+      children: true,
+    })
+  );
   return rewireStyledComponents(config, env, { ssr: true });
 };

cypress/integration/messages_spec.js

@@ -0,0 +1,25 @@
+import data from '../../shared/testing/data';
+
+const thread = data.threads[0];
+const community = data.communities.find(
+  community => community.id === thread.communityId
+);
+const author = data.users.find(user => user.id === thread.creatorId);
+
+describe('/messages/new', () => {
+  beforeEach(() => {
+    cy.auth(author.id);
+    cy.visit('/messages/new');
+  });
+
+  it('should allow to continue composing message incase of crash or reload', () => {
+    const newMessage = 'Persist New Message';
+    cy.get('[contenteditable="true"]').type(newMessage);
+    cy.get('[contenteditable="true"]').contains(newMessage);
+
+    cy.wait(2000);
+    // Reload page(incase page closed or crashed ,reload should have same effect)
+    cy.reload();
+    cy.get('[contenteditable="true"]').contains(newMessage);
+  });
+});

cypress/integration/thread/chat_input_spec.js

@@ -83,6 +83,51 @@ describe('chat input', () => {
       cy.get('[contenteditable="true"]').type('');
       cy.contains(newMessage);
     });
+
+    it('should allow chat input to be maintained', () => {
+      const newMessage = 'Persist New Message';
+      cy.get('[data-cy="thread-view"]').should('be.visible');
+      cy.get('[contenteditable="true"]').type(newMessage);
+      cy.get('[contenteditable="true"]').contains(newMessage);
+      cy.get('[data-cy="message-group"]').should('be.visible');
+      cy.wait(1000);
+      // Reload page(incase page closed or crashed ,reload should have same effect)
+      cy.reload();
+      cy.get('[contenteditable="true"]').contains(newMessage);
+    });
+  });
+
+  describe('message attachments', () => {
+    beforeEach(() => {
+      cy.auth(memberInChannelUser.id);
+      cy.visit(`/thread/${publicThread.id}`);
+    });
+
+    it('should allow quoting a message', () => {
+      // Quote a message
+      cy.get('[data-cy="staged-quoted-message"]').should('not.be.visible');
+      cy
+        .get('[data-cy="message"]')
+        .first()
+        .should('be.visible')
+        .click();
+      cy
+        .get('[data-cy="reply-to-message"]')
+        .first()
+        .should('be.visible')
+        .click();
+      cy
+        .get('[data-cy="reply-to-message"]')
+        .first()
+        .should('not.be.visible');
+      cy.get('[data-cy="staged-quoted-message"]').should('be.visible');
+      // Remove quoted message again
+      cy
+        .get('[data-cy="remove-staged-quoted-message"]')
+        .should('be.visible')
+        .click();
+      cy.get('[data-cy="staged-quoted-message"]').should('not.be.visible');
+    });
   });
 
   // NOTE(@mxstbr): This fails in CI, but not locally for some reason

cypress/integration/thread_spec.js

@@ -126,4 +126,21 @@ describe('/new/thread', () => {
     cy.contains(title);
     cy.contains(body);
   });
+
+  it('should allow to continue composing thread incase of crash or reload', () => {
+    const title = 'Persist Title';
+    const body = 'with some persisting content';
+    cy.get('[data-cy="rich-text-editor"]').should('be.visible');
+    cy.get('[data-cy="composer-community-selector"]').should('be.visible');
+    cy.get('[data-cy="composer-channel-selector"]').should('be.visible');
+    // Type title and body
+    cy.get('[data-cy="composer-title-input"]').type(title);
+    cy.get('[contenteditable="true"]').type(body);
+    /////need time as our localstorage is not set
+    cy.wait(1000);
+    cy.reload();
+
+    cy.get('[data-cy="composer-title-input"]').contains(title);
+    cy.get('[contenteditable="true"]').contains(body);
+  });
 });

docs/api/graphql/fragments.md

@@ -146,7 +146,7 @@ const getStory = gql`
       ...frequencyInfo
     }
   }
-  ${userInfoFragment}
+  ${storyInfoFragment}
   ${frequencyInfoFragment}
 `;
 ```