Merge pull request #4283 from withspectrum/2.4.73

2.4.73

Author: brianlovin

analytics/utils/transformations.js

@@ -48,7 +48,7 @@ type AnalyticsThreadPermissions = {
 };
 
 type AnalyticsUser = {
-  createdAt: string,
+  createdAt: ?string,
   twitterAuthed: boolean,
   fbAuthed: boolean,
   githubAuthed: boolean,
@@ -74,11 +74,12 @@ type AnalyticsMessage = {
 };
 
 export const analyticsReaction = (reaction: ?DBReaction): AnalyticsReaction => {
-  if (!reaction)
+  if (!reaction) {
     return {
       id: null,
       type: null,
     };
+  }
 
   return {
     id: reaction.id,
@@ -89,11 +90,12 @@ export const analyticsReaction = (reaction: ?DBReaction): AnalyticsReaction => {
 export const analyticsThreadReaction = (
   reaction: ?DBThreadReaction
 ): AnalyticsThreadReaction => {
-  if (!reaction)
+  if (!reaction) {
     return {
       id: null,
       type: null,
     };
+  }
 
   return {
     id: reaction.id,
@@ -102,12 +104,13 @@ export const analyticsThreadReaction = (
 };
 
 export const analyticsMessage = (message: ?DBMessage): AnalyticsMessage => {
-  if (!message)
+  if (!message) {
     return {
       id: null,
       threadType: null,
       parentId: null,
     };
+  }
 
   return {
     id: message.id,
@@ -117,14 +120,15 @@ export const analyticsMessage = (message: ?DBMessage): AnalyticsMessage => {
 };
 
 export const analyticsChannel = (channel: ?DBChannel): AnalyticsChannel => {
-  if (!channel)
+  if (!channel) {
     return {
       id: null,
       name: null,
       slug: null,
       isPrivate: null,
       isArchived: null,
     };
+  }
 
   return {
     id: channel.id,
@@ -151,13 +155,14 @@ export const analyticsChannelPermissions = (
 export const analyticsCommunity = (
   community: DBCommunity
 ): AnalyticsCommunity => {
-  if (!community)
+  if (!community) {
     return {
       id: null,
       name: null,
       slug: null,
       isPrivate: false,
     };
+  }
 
   return {
     id: community.id,
@@ -170,11 +175,12 @@ export const analyticsCommunity = (
 export const analyticsCommunityPermissions = (
   communityPermissions: DBUsersCommunities
 ): AnalyticsCommunityPermissions => {
-  if (!communityPermissions)
+  if (!communityPermissions) {
     return {
       roles: [],
       reputation: 0,
     };
+  }
 
   return {
     roles: getTruthyValuesFromObject(communityPermissions),
@@ -183,12 +189,13 @@ export const analyticsCommunityPermissions = (
 };
 
 export const analyticsThread = (thread: ?DBThread): AnalyticsThread => {
-  if (!thread)
+  if (!thread) {
     return {
       id: null,
       isLocked: null,
       isWatercooler: null,
     };
+  }
 
   return {
     id: thread.id,
@@ -214,6 +221,17 @@ export const analyticsThreadPermissions = (
 };
 
 export const analyticsUser = (user: DBUser): AnalyticsUser => {
+  if (!user) {
+    return {
+      createdAt: null,
+      twitterAuthed: false,
+      fbAuthed: false,
+      githubAuthed: false,
+      googleAuthed: false,
+      hasUsername: false,
+      lastSeen: null,
+    };
+  }
   return {
     createdAt: user.createdAt,
     twitterAuthed: user.providerId ? true : false,

api/models/usersCommunities.js

@@ -478,6 +478,8 @@ export const approvePendingMemberInCommunity = async (
         context: { communityId },
       });
 
+      incrementMemberCount(communityId);
+
       return result.changes[0].new_val;
     });
 };

api/package.json

@@ -88,7 +88,6 @@
     "prismjs": "^1.15.0",
     "query-string": "5.1.1",
     "raven": "^2.6.4",
-    "raven-js": "^3.27.0",
     "react": "^15.4.1",
     "react-app-rewire-styled-components": "^3.0.2",
     "react-app-rewired": "^1.6.2",

api/yarn.lock

@@ -7668,11 +7668,6 @@ range-parser@~1.2.0:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
   integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
 
-raven-js@^3.27.0:
-  version "3.27.0"
-  resolved "https://registry.yarnpkg.com/raven-js/-/raven-js-3.27.0.tgz#9f47c03e17933ce756e189f3669d49c441c1ba6e"
-  integrity sha512-vChdOL+yzecfnGA+B5EhEZkJ3kY3KlMzxEhShKh6Vdtooyl0yZfYNFQfYzgMf2v4pyQa+OTZ5esTxxgOOZDHqw==
-
 raven@^2.6.4:
   version "2.6.4"
   resolved "https://registry.yarnpkg.com/raven/-/raven-2.6.4.tgz#458d4a380c8fbb59e0150c655625aaf60c167ea3"

config-overrides.js

@@ -151,6 +151,7 @@ module.exports = function override(config, env) {
   );
   if (process.env.NODE_ENV === 'production') {
     removeEslint(config);
+    config.plugins.push(new webpack.optimize.ModuleConcatenationPlugin());
     config.plugins.push(
       new webpack.DefinePlugin({
         'process.env': {

cypress/integration/apps_page_spec.js

@@ -1,10 +1,10 @@
-describe('Privacy View', () => {
+describe('Apps View', () => {
   describe('Loads page', () => {
     beforeEach(() => {
       cy.visit('/apps');
     });
 
-    it('should render the privacy page', () => {
+    it('should render the apps page', () => {
       cy.get('[data-cy="apps-page"]').should('be.visible');
     });
   });

cypress/integration/channel/settings/create_spec.js

@@ -12,9 +12,9 @@ const { userId: ownerInChannelId } = data.usersChannels.find(
 
 describe('create a channel', () => {
   beforeEach(() => {
-    cy.auth(ownerInChannelId);
-    // NOTE @brian: I can not get this to auth directly into /settings, having to work around for now
-    cy.visit(`/${community.slug}/settings`);
+    cy.auth(ownerInChannelId).then(() =>
+      cy.visit(`/${community.slug}/settings`)
+    );
   });
 
   it('should go through create a channel flow', () => {

cypress/integration/channel/settings/delete_spec.js

@@ -20,9 +20,10 @@ const { userId: ownerInPrivateChannelId } = data.usersChannels.find(
 );
 
 describe('deleting general channel', () => {
-  before(() => {
-    cy.auth(ownerInChannelId);
-    cy.visit(`/${community.slug}/${channel.slug}/settings`);
+  beforeEach(() => {
+    cy.auth(ownerInChannelId).then(() =>
+      cy.visit(`/${community.slug}/${channel.slug}/settings`)
+    );
   });
 
   it('should not allow general channel to be deleted', () => {
@@ -33,16 +34,16 @@ describe('deleting general channel', () => {
 });
 
 describe('deleting a channel', () => {
-  before(() => {
-    cy.auth(ownerInPrivateChannelId);
-    cy.visit(`/${privateCommunity.slug}/${privateChannel.slug}/settings`);
+  beforeEach(() => {
+    cy.auth(ownerInPrivateChannelId).then(() =>
+      cy.visit(`/${privateCommunity.slug}/${privateChannel.slug}/settings`)
+    );
   });
 
   it('should delete a channel', () => {
     cy.get('[data-cy="channel-overview"]').should('be.visible');
 
-    cy
-      .get('[data-cy="delete-channel-button"]')
+    cy.get('[data-cy="delete-channel-button"]')
       .should('be.visible')
       .click();
 

cypress/integration/channel/settings/edit_spec.js

@@ -15,29 +15,27 @@ const NEW_DESCRIPTION = 'New description';
 
 describe('edit a channel', () => {
   beforeEach(() => {
-    cy.auth(ownerInChannelId);
-    cy.visit(`/${community.slug}/${channel.slug}/settings`);
+    cy.auth(ownerInChannelId).then(() =>
+      cy.visit(`/${community.slug}/${channel.slug}/settings`)
+    );
   });
 
   it('should edit a channel', () => {
     cy.get('[data-cy="channel-overview"]').should('be.visible');
 
-    cy
-      .get('[data-cy="channel-name-input"]')
+    cy.get('[data-cy="channel-name-input"]')
       .should('be.visible')
       .click()
       .clear()
       .type(NEW_NAME);
 
-    cy
-      .get('[data-cy="channel-description-input"]')
+    cy.get('[data-cy="channel-description-input"]')
       .should('be.visible')
       .click()
       .clear()
       .type(NEW_DESCRIPTION);
 
-    cy
-      .get('[data-cy="save-button"]')
+    cy.get('[data-cy="save-button"]')
       .should('be.visible')
       .click();
 

cypress/integration/channel/settings/private_invite_link_spec.js

@@ -13,8 +13,7 @@ const enable = () => {
 
   cy.get('[data-cy="login-with-token-settings"]').scrollIntoView();
 
-  cy
-    .get('[data-cy="toggle-token-link-invites-unchecked"]')
+  cy.get('[data-cy="toggle-token-link-invites-unchecked"]')
     .should('be.visible')
     .click();
 
@@ -23,8 +22,9 @@ const enable = () => {
 
 describe('private channel invite link settings', () => {
   beforeEach(() => {
-    cy.auth(ownerInChannelId);
-    cy.visit(`/${community.slug}/${channel.slug}/settings`);
+    cy.auth(ownerInChannelId).then(() =>
+      cy.visit(`/${community.slug}/${channel.slug}/settings`)
+    );
   });
 
   it('should handle enable, reset, and disable', () => {
@@ -33,8 +33,7 @@ describe('private channel invite link settings', () => {
 
     // reset token
     cy.get('[data-cy="login-with-token-settings"]').scrollIntoView();
-    cy
-      .get('[data-cy="join-link-input"]')
+    cy.get('[data-cy="join-link-input"]')
       .invoke('val')
       .then(val1 => {
         // do more work here
@@ -46,15 +45,13 @@ describe('private channel invite link settings', () => {
 
         // grab the input again and compare its previous value
         // to the current value
-        cy
-          .get('[data-cy="join-link-input"]')
+        cy.get('[data-cy="join-link-input"]')
           .invoke('val')
           .should('not.eq', val1);
       });
 
     // disable
-    cy
-      .get('[data-cy="toggle-token-link-invites-checked"]')
+    cy.get('[data-cy="toggle-token-link-invites-checked"]')
       .should('be.visible')
       .click();