Merge pull request #4823 from withspectrum/watercooler-settings

brianlovin · web-flow · commit 6b8431526668 · 2019-03-06T11:46:23.000-05:00
Add watercooler to community settings
diff --git a/api/migrations/20190306125252-threads-watercooler-index.js b/api/migrations/20190306125252-threads-watercooler-index.js
@@ -0,0 +1,16 @@
+exports.up = function(r, conn) {
+  return r
+    .table('threads')
+    .indexCreate('communityIdAndWatercooler', [
+      r.row('communityId'),
+      r.row('watercooler'),
+    ])
+    .run(conn);
+};
+
+exports.down = function(r, conn) {
+  return r
+    .table('threads')
+    .indexDrop('communityIdAndWatercooler')
+    .run(conn);
+};
diff --git a/api/models/community.js b/api/models/community.js
@@ -212,6 +212,7 @@ export type EditCommunityInput = {
     coverFile: Object,
     coverPhoto: string,
     communityId: string,
+    watercoolerId?: boolean,
   },
 };
 
@@ -410,7 +411,7 @@ export const createCommunity = ({ input }: CreateCommunityInput, user: DBUser):
 
 // prettier-ignore
 export const editCommunity = async ({ input }: EditCommunityInput, userId: string): Promise<DBCommunity> => {
-  const { name, slug, description, website, file, coverPhoto, coverFile, communityId } = input
+  const { name, slug, description, website, watercoolerId, file, coverPhoto, coverFile, communityId } = input
 
   let community = await db.table('communities').get(communityId).run()
 
@@ -432,6 +433,7 @@ export const editCommunity = async ({ input }: EditCommunityInput, userId: strin
       slug,
       description,
       website,
+      watercoolerId: watercoolerId || community.watercoolerId,
       coverPhoto: coverFile 
         ? await uploadImage(coverFile, 'communities', community.id) 
         : updatedCoverPhoto,
@@ -474,6 +476,29 @@ export const editCommunity = async ({ input }: EditCommunityInput, userId: strin
     })
 };
 
+export const setCommunityWatercoolerId = (
+  communityId: string,
+  threadId: ?string
+) => {
+  return db
+    .table('communities')
+    .get(communityId)
+    .update(
+      {
+        watercoolerId: threadId,
+      },
+      {
+        returnChanges: true,
+      }
+    )
+    .run()
+    .then(result => {
+      if (!Array.isArray(result.changes) || result.changes.length === 0)
+        return getCommunityById(communityId);
+      return result.changes[0].new_val;
+    });
+};
+
 // prettier-ignore
 export const deleteCommunity = (communityId: string, userId: string): Promise<DBCommunity> => {
   return db
diff --git a/api/models/thread.js b/api/models/thread.js
@@ -418,6 +418,19 @@ export const getPublicParticipantThreadsByUser = (evalUser: string, options: Pag
     });
 };
 
+export const getWatercoolerThread = (
+  communityId: string
+): Promise<?DBThread> => {
+  return db
+    .table('threads')
+    .getAll([communityId, true], { index: 'communityIdAndWatercooler' })
+    .run()
+    .then(result => {
+      if (!Array.isArray(result) || result.length === 0) return null;
+      return result[0];
+    });
+};
+
 export const publishThread = (
   // eslint-disable-next-line
   { filesToUpload, ...thread }: Object,
diff --git a/api/mutations/community/disableCommunityWatercooler.js b/api/mutations/community/disableCommunityWatercooler.js
@@ -0,0 +1,43 @@
+// @flow
+import UserError from '../../utils/UserError';
+import {
+  isAuthedResolver as requireAuth,
+  canModerateCommunity,
+} from '../../utils/permissions';
+import { events } from 'shared/analytics';
+import { trackQueue } from 'shared/bull/queues';
+import { publishThread, getWatercoolerThread } from '../../models/thread';
+import { getChannelBySlug } from '../../models/channel';
+import { setCommunityWatercoolerId } from '../../models/community';
+import type { DBCommunity } from 'shared/types';
+import type { GraphQLContext } from '../../';
+
+type Args = {
+  input: {
+    id: string,
+  },
+};
+
+export default requireAuth(async (_: any, args: Args, ctx: GraphQLContext) => {
+  const { id: communityId } = args.input;
+  const { user, loaders } = ctx;
+
+  if (!(await canModerateCommunity(user.id, communityId, loaders))) {
+    trackQueue.add({
+      userId: user.id,
+      event: events.COMMUNITY_WATERCOOLER_DISABLED_FAILED,
+      context: { communityId },
+      properties: {
+        reason: 'no permission',
+      },
+    });
+
+    return new UserError("You don't have permission to do this.");
+  }
+
+  const community: DBCommunity = await loaders.community.load(communityId);
+
+  if (!community.watercoolerId) return community;
+
+  return setCommunityWatercoolerId(community.id, null);
+});
diff --git a/api/mutations/community/enableCommunityWatercooler.js b/api/mutations/community/enableCommunityWatercooler.js
@@ -0,0 +1,69 @@
+// @flow
+import UserError from '../../utils/UserError';
+import {
+  isAuthedResolver as requireAuth,
+  canModerateCommunity,
+} from '../../utils/permissions';
+import { events } from 'shared/analytics';
+import { trackQueue } from 'shared/bull/queues';
+import { publishThread, getWatercoolerThread } from '../../models/thread';
+import { getChannelBySlug } from '../../models/channel';
+import { setCommunityWatercoolerId } from '../../models/community';
+import type { DBCommunity } from 'shared/types';
+import type { GraphQLContext } from '../../';
+
+type Args = {
+  input: {
+    id: string,
+  },
+};
+
+export default requireAuth(async (_: any, args: Args, ctx: GraphQLContext) => {
+  const { id: communityId } = args.input;
+  const { user, loaders } = ctx;
+
+  if (!(await canModerateCommunity(user.id, communityId, loaders))) {
+    trackQueue.add({
+      userId: user.id,
+      event: events.COMMUNITY_WATERCOOLER_ENABLED_FAILED,
+      context: { communityId },
+      properties: {
+        reason: 'no permission',
+      },
+    });
+
+    return new UserError("You don't have permission to do this.");
+  }
+
+  const community: DBCommunity = await loaders.community.load(communityId);
+
+  if (community.watercoolerId) return community;
+
+  const channel = await getChannelBySlug('general', community.slug);
+
+  if (!channel) {
+    throw new Error(
+      `Community ${community.slug} does not have general channel.`
+    );
+  }
+
+  const existingWatercooler = await getWatercoolerThread(community.id);
+
+  if (existingWatercooler)
+    return setCommunityWatercoolerId(community.id, existingWatercooler.id);
+
+  const watercooler = await publishThread(
+    {
+      channelId: channel.id,
+      communityId: community.id,
+      content: {
+        title: `${community.name} watercooler`,
+      },
+      type: 'DRAFTJS',
+      watercooler: true,
+    },
+    user.id
+  );
+
+  return setCommunityWatercoolerId(community.id, watercooler.id);
+});
diff --git a/api/mutations/community/index.js b/api/mutations/community/index.js
@@ -14,6 +14,8 @@ import importSlackMembers from './importSlackMembers';
 import enableCommunityTokenJoin from './enableCommunityTokenJoin';
 import disableCommunityTokenJoin from './disableCommunityTokenJoin';
 import resetCommunityJoinToken from './resetCommunityJoinToken';
+import enableCommunityWatercooler from './enableCommunityWatercooler';
+import disableCommunityWatercooler from './disableCommunityWatercooler';
 
 module.exports = {
   Mutation: {
@@ -32,5 +34,7 @@ module.exports = {
     enableCommunityTokenJoin,
     disableCommunityTokenJoin,
     resetCommunityJoinToken,
+    enableCommunityWatercooler,
+    disableCommunityWatercooler,
   },
 };
diff --git a/api/types/Community.js b/api/types/Community.js
@@ -169,6 +169,7 @@ const Community = /* GraphQL */ `
     brandedLogin: BrandedLogin
     joinSettings: JoinSettings
     slackSettings: CommunitySlackSettings @cost(complexity: 2)
+    watercoolerId: String
     slackImport: SlackImport
       @cost(complexity: 2)
       @deprecated(reason: "Use slack settings field instead")
@@ -298,6 +299,14 @@ const Community = /* GraphQL */ `
     id: ID!
   }
 
+  input EnableCommunityWatercoolerInput {
+    id: ID!
+  }
+
+  input DisableCommunityWatercoolerInput {
+    id: ID!
+  }
+
   extend type Mutation {
     createCommunity(input: CreateCommunityInput!): Community
       @rateLimit(max: 3, window: "15m")
@@ -328,6 +337,12 @@ const Community = /* GraphQL */ `
     enableCommunityTokenJoin(input: EnableCommunityTokenJoinInput!): Community
     disableCommunityTokenJoin(input: DisableCommunityTokenJoinInput!): Community
     resetCommunityJoinToken(input: ResetCommunityJoinTokenInput!): Community
+    enableCommunityWatercooler(
+      input: EnableCommunityWatercoolerInput!
+    ): Community
+    disableCommunityWatercooler(
+      input: DisableCommunityWatercoolerInput!
+    ): Community
   }
 `;
 
diff --git a/cypress/integration/community_settings_overview_spec.js b/cypress/integration/community_settings_overview_spec.js
@@ -42,7 +42,7 @@ describe('Community settings overview tab', () => {
       .clear()
       .type(website);
     // Submit changes
-    cy.get('button[type="submit"]').click();
+    cy.get('[data-cy="community-settings-edit-save-button"]').click();
     cy.visit(`/${community.slug}`);
     cy.location('pathname').should('eq', `/${community.slug}`);
     // Make sure changes were applied
@@ -60,7 +60,7 @@ describe('Community settings overview tab', () => {
     cy.get('[data-cy="community-settings-website-input"]')
       .clear()
       .type(community.website);
-    cy.get('button[type="submit"]').click();
+    cy.get('[data-cy="community-settings-edit-save-button"]').click();
     cy.visit(`/${community.slug}`);
     cy.location('pathname').should('eq', `/${community.slug}`);
     cy.contains(community.name);
diff --git a/shared/analytics/event-types/community.js b/shared/analytics/event-types/community.js
@@ -41,4 +41,7 @@ export const COMMUNITY_VIEWED = 'Community Viewed';
 export const COMMUNITY_SETTINGS_VIEWED = 'Community Settings Viewed'
 export const COMMUNITY_ANALYTICS_VIEWED = 'Community Analytics Viewed'
 export const COMMUNITY_ANALYTICS_VIEWED_UPSELL = 'Community Analytics Viewed Upsell'
-export const COMMUNITY_ANALYTICS_LEARN_MORE_CLICKED = 'Community Analytics Learn More Clicked'
+export const COMMUNITY_ANALYTICS_LEARN_MORE_CLICKED = 'Community Analytics Learn More Clicked'
+
+export const COMMUNITY_WATERCOOLER_ENABLED_FAILED = 'Community Watercooler Enabled Failed';
+export const COMMUNITY_WATERCOOLER_DISABLED_FAILED = 'Community Watercooler Disabled Failed'
diff --git a/shared/graphql/fragments/community/communityInfo.js b/shared/graphql/fragments/community/communityInfo.js
@@ -11,6 +11,7 @@ export type CommunityInfoType = {
   profilePhoto: string,
   coverPhoto: string,
   pinnedThreadId: ?string,
+  watercoolerId: ?string,
   isPrivate: boolean,
   communityPermissions: {
     isMember: boolean,
@@ -37,6 +38,7 @@ export default gql`
     profilePhoto
     coverPhoto
     pinnedThreadId
+    watercoolerId
     isPrivate
     communityPermissions {
       isMember
diff --git a/shared/graphql/mutations/community/disableCommunityWatercooler.js b/shared/graphql/mutations/community/disableCommunityWatercooler.js
@@ -0,0 +1,31 @@
+// @flow
+import gql from 'graphql-tag';
+import { graphql } from 'react-apollo';
+import communityInfoFragment from 'shared/graphql/fragments/community/communityInfo';
+
+export const disableCommunityWatercoolerMutation = gql`
+  mutation disableCommunityWatercooler(
+    $input: DisableCommunityWatercoolerInput!
+  ) {
+    disableCommunityWatercooler(input: $input) {
+      ...communityInfo
+    }
+  }
+  ${communityInfoFragment}
+`;
+
+const disableCommunityWatercoolerOptions = {
+  props: ({ mutate }) => ({
+    disableCommunityWatercooler: input =>
+      mutate({
+        variables: {
+          input,
+        },
+      }),
+  }),
+};
+
+export default graphql(
+  disableCommunityWatercoolerMutation,
+  disableCommunityWatercoolerOptions
+);
diff --git a/shared/graphql/mutations/community/enableCommunityWatercooler.js b/shared/graphql/mutations/community/enableCommunityWatercooler.js
@@ -0,0 +1,31 @@
+// @flow
+import gql from 'graphql-tag';
+import { graphql } from 'react-apollo';
+import communityInfoFragment from 'shared/graphql/fragments/community/communityInfo';
+
+export const enableCommunityWatercoolerMutation = gql`
+  mutation enableCommunityWatercooler(
+    $input: EnableCommunityWatercoolerInput!
+  ) {
+    enableCommunityWatercooler(input: $input) {
+      ...communityInfo
+    }
+  }
+  ${communityInfoFragment}
+`;
+
+const enableCommunityWatercoolerOptions = {
+  props: ({ mutate }) => ({
+    enableCommunityWatercooler: input =>
+      mutate({
+        variables: {
+          input,
+        },
+      }),
+  }),
+};
+
+export default graphql(
+  enableCommunityWatercoolerMutation,
+  enableCommunityWatercoolerOptions
+);
diff --git a/src/views/communitySettings/components/editForm.js b/src/views/communitySettings/components/editForm.js
@@ -366,6 +366,7 @@ class EditForm extends React.Component<Props, State> {
               onClick={this.save}
               disabled={photoSizeError}
               type="submit"
+              dataCy="community-settings-edit-save-button"
             >
               Save
             </Button>
diff --git a/src/views/communitySettings/components/overview.js b/src/views/communitySettings/components/overview.js
@@ -5,6 +5,7 @@ import ChannelList from './channelList';
 import BrandedLogin from './brandedLogin';
 import { SectionsContainer, Column } from 'src/components/settingsViews/style';
 import SlackSettings from './slack';
+import Watercooler from './watercooler';
 import { ErrorBoundary, SettingsFallback } from 'src/components/error';
 
 type Props = {
@@ -32,6 +33,10 @@ class Overview extends React.Component<Props> {
             <BrandedLogin id={community.id} />
           </ErrorBoundary>
 
+          <ErrorBoundary fallbackComponent={SettingsFallback}>
+            <Watercooler id={community.id} />
+          </ErrorBoundary>
+
           <ErrorBoundary fallbackComponent={SettingsFallback}>
             <ChannelList id={community.id} communitySlug={communitySlug} />
           </ErrorBoundary>
diff --git a/src/views/communitySettings/components/watercooler.js b/src/views/communitySettings/components/watercooler.js
