Merge pull request #3001 from withspectrum/2.2.9

2.2.9

Author: brianlovin

.circleci/config.yml

@@ -36,12 +36,15 @@ aliases:
     background: true
 
   - &setup-and-build-web
-    name: Setup and build
+    name: Setup and build web
     command:
       |
         cp now-secrets.example.json now-secrets.json
         yarn run build:web
-        yarn run build:api
+
+  - &build-api
+    name: Build API
+    command: yarn run build:api
 
   - &start-api
     name: Start the API in the background
@@ -98,21 +101,37 @@ jobs:
           at: ~/spectrum
       - run: node -e "const setup = require('./shared/testing/setup.js')().then(() => process.exit())"
       - run: *setup-and-build-web
+      - run: *build-api
       - run: *start-api
       - run: *start-web
       # Wait for the API and webserver to start
       - run: ./node_modules/.bin/wait-on http://localhost:3000 http://localhost:3001
       - run:
           name: Run Unit Tests
           command: yarn run test:ci
-      - run:
-          name: Danger
-          when: always
-          command: test $DANGER_GITHUB_API_TOKEN && yarn run danger ci || echo "forks are not allowed to run danger"
       - run:
           name: Run E2E Tests
           command: test $CYPRESS_RECORD_KEY && yarn run test:e2e -- --record || yarn run test:e2e
 
+  deploy_alpha:
+    <<: *js_defaults
+    docker:
+      - image: circleci/node:8-browsers
+    steps:
+      - attach_workspace:
+          at: ~/spectrum
+      - run: *build-api
+      - run:
+          name: Deploy and alias API
+          command: |
+            cd build-api
+            npx now-cd --alias "alpha=api.alpha.spectrum.chat" --team spaceprogram
+            cd ..
+      - run:
+          name: Deploy and alias Hyperion
+          command: npx now-cd --alias "alpha=hyperion.alpha.spectrum.chat" --team spaceprogram
+
+
   # Run eslint, flow etc.
   test_static_js:
     <<: *js_defaults
@@ -181,3 +200,10 @@ workflows:
       - test_static_js:
           requires:
             - checkout_environment
+      - deploy_alpha:
+          requires:
+            - test_static_js
+            - test_web
+          filters:
+            branches:
+              only: alpha

admin/README.md

@@ -213,8 +213,8 @@ To configure the syntax highlighting in your favorite text editor, head to the [
 
 ## Displaying Lint Output in the Editor
 
->Note: this feature is available with `[email protected]` and higher.<br>
->It also only works with npm 3 or higher.
+> Note: this feature is available with `[email protected]` and higher.<br>
+> It also only works with npm 3 or higher.
 
 Some editors, including Sublime Text, Atom, and Visual Studio Code, provide plugins for ESLint.
 
@@ -464,7 +464,7 @@ Then in `package.json`, add the following lines to `scripts`:
      "test": "react-scripts test --env=jsdom",
 ```
 
->Note: To use a different preprocessor, replace `build-css` and `watch-css` commands according to your preprocessor’s documentation.
+> Note: To use a different preprocessor, replace `build-css` and `watch-css` commands according to your preprocessor’s documentation.
 
 Now you can rename `src/App.css` to `src/App.scss` and run `npm run watch-css`. The watcher will find every Sass file in `src` subdirectories, and create a corresponding CSS file next to it, in our case overwriting `src/App.css`. Since `src/App.js` still imports `src/App.css`, the styles become a part of your application. You can now edit `src/App.scss`, and `src/App.css` will be regenerated.
 
@@ -565,7 +565,7 @@ An alternative way of handling static assets is described in the next section.
 
 ## Using the `public` Folder
 
->Note: this feature is available with `[email protected]` and higher.
+> Note: this feature is available with `[email protected]` and higher.
 
 ### Changing the HTML
 
@@ -586,7 +586,7 @@ This mechanism provides a number of benefits:
 
 However there is an **escape hatch** that you can use to add an asset outside of the module system.
 
-If you put a file into the `public` folder, it will **not** be processed by Webpack. Instead it will be copied into the build folder untouched.   To reference assets in the `public` folder, you need to use a special variable called `PUBLIC_URL`.
+If you put a file into the `public` folder, it will **not** be processed by Webpack. Instead it will be copied into the build folder untouched. To reference assets in the `public` folder, you need to use a special variable called `PUBLIC_URL`.
 
 Inside `index.html`, you can use it like this:
 
@@ -701,15 +701,15 @@ To learn more about Flow, check out [its documentation](https://flowtype.org/).
 
 ## Adding Custom Environment Variables
 
->Note: this feature is available with `[email protected]` and higher.
+> Note: this feature is available with `[email protected]` and higher.
 
 Your project can consume variables declared in your environment as if they were declared locally in your JS files. By
 default you will have `NODE_ENV` defined for you, and any other environment variables starting with
 `REACT_APP_`.
 
 **The environment variables are embedded during the build time**. Since Create React App produces a static HTML/CSS/JS bundle, it can’t possibly read them at runtime. To read them at runtime, you would need to load HTML into memory on the server and replace placeholders in runtime, just like [described here](#injecting-data-from-the-server-into-the-page). Alternatively you can rebuild the app on the server anytime you change them.
 
->Note: You must create custom environment variables beginning with `REACT_APP_`. Any other variables except `NODE_ENV` will be ignored to avoid accidentally [exposing a private key on the machine that could have the same name](https://github.com/facebookincubator/create-react-app/issues/865#issuecomment-252199527). Changing any environment variables will require you to restart the development server if it is running.
+> Note: You must create custom environment variables beginning with `REACT_APP_`. Any other variables except `NODE_ENV` will be ignored to avoid accidentally [exposing a private key on the machine that could have the same name](https://github.com/facebookincubator/create-react-app/issues/865#issuecomment-252199527). Changing any environment variables will require you to restart the development server if it is running.
 
 These environment variables will be defined for you on `process.env`. For example, having an environment
 variable named `REACT_APP_SECRET_CODE` will be exposed in your JS as `process.env.REACT_APP_SECRET_CODE`.
@@ -764,7 +764,7 @@ When you compile the app with `npm run build`, the minification step will strip
 
 ### Referencing Environment Variables in the HTML
 
->Note: this feature is available with `[email protected]` and higher.
+> Note: this feature is available with `[email protected]` and higher.
 
 You can also access the environment variables starting with `REACT_APP_` in the `public/index.html`. For example:
 
@@ -798,7 +798,7 @@ REACT_APP_SECRET_CODE=abcdef npm start
 
 ### Adding Development Environment Variables In `.env`
 
->Note: this feature is available with `[email protected]` and higher.
+> Note: this feature is available with `[email protected]` and higher.
 
 To define permanent environment variables, create a file called `.env` in the root of your project:
 
@@ -810,7 +810,7 @@ REACT_APP_SECRET_CODE=abcdef
 
 #### What other `.env` files are can be used?
 
->Note: this feature is **available with `[email protected]` and higher**.
+> Note: this feature is **available with `[email protected]` and higher**.
 
 * `.env`: Default.
 * `.env.local`: Local overrides. **This file is loaded for all environments except test.**
@@ -826,7 +826,7 @@ Files on the left have more priority than files on the right:
 These variables will act as the defaults if the machine does not explicitly set them.<br>
 Please refer to the [dotenv documentation](https://github.com/motdotla/dotenv) for more details.
 
->Note: If you are defining environment variables for development, your CI and/or hosting platform will most likely need
+> Note: If you are defining environment variables for development, your CI and/or hosting platform will most likely need
 these defined as well. Consult their documentation how to do this. For example, see the documentation for [Travis CI](https://docs.travis-ci.com/user/environment-variables/) or [Heroku](https://devcenter.heroku.com/articles/config-vars).
 
 ## Can I Use Decorators?
@@ -862,7 +862,7 @@ You can find the companion GitHub repository [here](https://github.com/fullstack
 
 ## Proxying API Requests in Development
 
->Note: this feature is available with `[email protected]` and higher.
+> Note: this feature is available with `[email protected]` and higher.
 
 People often serve the front-end React app from the same host and port as their backend implementation.<br>
 For example, a production setup might look like this after the app is deployed:
@@ -904,7 +904,7 @@ When you enable the `proxy` option, you opt into a more strict set of host check
 
 This shouldn’t affect you when developing on `localhost`, but if you develop remotely like [described here](https://github.com/facebookincubator/create-react-app/issues/2271), you will see this error in the browser after enabling the `proxy` option:
 
->Invalid Host header
+> Invalid Host header
 
 To work around it, you can specify your public development host in a file called `.env.development` in the root of your project:
 
@@ -926,7 +926,7 @@ We don’t recommend this approach.
 
 ### Configuring the Proxy Manually
 
->Note: this feature is available with `[email protected]` and higher.
+> Note: this feature is available with `[email protected]` and higher.
 
 If the `proxy` option is **not** flexible enough for you, you can specify an object in the following form (in `package.json`).<br>
 You may also specify any configuration value [`http-proxy-middleware`](https://github.com/chimurai/http-proxy-middleware#options) or [`http-proxy`](https://github.com/nodejitsu/node-http-proxy#options) supports.
@@ -984,7 +984,7 @@ You may also narrow down matches using `*` and/or `**`, to match the path exactl
 
 ## Using HTTPS in Development
 
->Note: this feature is available with `[email protected]` and higher.
+> Note: this feature is available with `[email protected]` and higher.
 
 You may require the dev server to serve pages over HTTPS. One particular case where this could be useful is when using [the "proxy" feature](#proxying-api-requests-in-development) to proxy requests to an API server when that API server is itself serving HTTPS.
 
@@ -1049,7 +1049,7 @@ Then, on the server, you can replace `__SERVER_DATA__` with a JSON of real data
 
 ## Running Tests
 
->Note: this feature is available with `[email protected]` and higher.<br>
+> Note: this feature is available with `[email protected]` and higher.<br>
 >[Read the migration guide to learn how to enable it in older projects!](https://github.com/facebookincubator/create-react-app/blob/master/CHANGELOG.md#migrating-from-023-to-030)
 
 Create React App uses [Jest](https://facebook.github.io/jest/) as its test runner. To prepare for this integration, we did a [major revamp](https://facebook.github.io/jest/blog/2016/09/01/jest-15.html) of Jest so if you heard bad things about it years ago, give it another try.
@@ -1198,7 +1198,7 @@ and then use them in your tests like you normally do.
 
 ### Initializing Test Environment
 
->Note: this feature is available with `[email protected]` and higher.
+> Note: this feature is available with `[email protected]` and higher.
 
 If your app uses a browser API that you need to mock in your tests or if you just need a global setup before running your tests, add a `src/setupTests.js` to your project. It will be automatically executed before running your tests.
 
@@ -1281,7 +1281,7 @@ CI=true npm run build
 
 The test command will force Jest to run tests once instead of launching the watcher.
 
->  If you find yourself doing this often in development, please [file an issue](https://github.com/facebookincubator/create-react-app/issues/new) to tell us about your use case because we want to make watcher the best experience and are open to changing how it works to accommodate more workflows.
+> If you find yourself doing this often in development, please [file an issue](https://github.com/facebookincubator/create-react-app/issues/new) to tell us about your use case because we want to make watcher the best experience and are open to changing how it works to accommodate more workflows.
 
 The build command will check for linter warnings and fail if any are found.
 
@@ -1561,7 +1561,7 @@ This will let Create React App correctly infer the root path to use in the gener
 
 #### Serving the Same Build from Different Paths
 
->Note: this feature is available with `[email protected]` and higher.
+> Note: this feature is available with `[email protected]` and higher.
 
 If you are not using the HTML5 `pushState` history API or not using client-side routing at all, it is unnecessary to specify the URL from which your app will be served. Instead, you can put this in your `package.json`:
 
@@ -1638,7 +1638,7 @@ For more information see [Add Firebase to your JavaScript Project](https://fireb
 
 ### GitHub Pages
 
->Note: this feature is available with `[email protected]` and higher.
+> Note: this feature is available with `[email protected]` and higher.
 
 #### Step 1: Add `homepage` to `package.json`
 

api/migrations/20180428001543-reset-slack-import-records.js

@@ -0,0 +1,14 @@
+exports.up = function(r, conn) {
+  return Promise.all([
+    r
+      .table('slackImports')
+      .update({
+        members: r.literal(),
+      })
+      .run(conn),
+  ]).catch(err => console.error(err));
+};
+
+exports.down = function(r, conn) {
+  return Promise.resolve();
+};

api/models/channelSettings.js

@@ -1,6 +1,6 @@
 // @flow
 const { db } = require('./db');
-import type { DBChannelSettings } from 'shared/types';
+import type { DBChannelSettings, DBChannel } from 'shared/types';
 import { getChannelById } from './channel';
 import shortid from 'shortid';
 
@@ -9,24 +9,39 @@ const defaultSettings = {
     tokenJoinEnabled: false,
     message: null,
   },
+  slackSettings: {
+    botLinks: {
+      threadCreated: null,
+    },
+  },
 };
 
-export const getChannelSettings = (id: string) => {
-  return db
+// prettier-ignore
+export const getOrCreateChannelSettings = async (channelId: string): Promise<DBChannelSettings> => {
+  const settings = await db
     .table('channelSettings')
-    .getAll(id, { index: 'channelId' })
-    .run()
-    .then(data => {
-      if (!data || data.length === 0) {
-        return defaultSettings;
-      }
-      return data[0];
-    });
+    .getAll(channelId, { index: 'channelId' })
+    .run();
+
+  if (!settings || settings.length === 0) {
+    return await db
+      .table('channelSettings')
+      .insert(
+        {
+          ...defaultSettings,
+          channelId,
+        },
+        { returnChanges: true }
+      )
+      .run()
+      .then(results => results.changes[0].new_val);
+  }
+
+  return settings[0];
 };
 
-export const getChannelsSettings = (
-  channelIds: Array<string>
-): Promise<?DBChannelSettings> => {
+// prettier-ignore
+export const getChannelsSettings = (channelIds: Array<string>): Promise<?DBChannelSettings> => {
   return db
     .table('channelSettings')
     .getAll(...channelIds, { index: 'channelId' })
@@ -50,20 +65,6 @@ export const getChannelsSettings = (
     });
 };
 
-export const createChannelSettings = (id: string) => {
-  return db
-    .table('channelSettings')
-    .insert({
-      channelId: id,
-      joinSettings: {
-        token: null,
-        tokenJoinEnabled: false,
-      },
-    })
-    .run()
-    .then(async () => await getChannelById(id));
-};
-
 export const enableChannelTokenJoin = (id: string) => {
   return db
     .table('channelSettings')
@@ -104,3 +105,45 @@ export const resetChannelJoinToken = (id: string) => {
     .run()
     .then(async () => await getChannelById(id));
 };
+
+type UpdateInput = {
+  channelId: string,
+  slackChannelId: ?string,
+  eventType: 'threadCreated',
+};
+
+// prettier-ignore
+export const updateChannelSlackBotLinks = async ({ channelId, slackChannelId, eventType }: UpdateInput): Promise<DBChannel> => {
+  const settings: DBChannelSettings = await getOrCreateChannelSettings(
+    channelId
+  );
+
+  let newSettings;
+  if (!settings.slackSettings) {
+    settings.slackSettings = {
+      botLinks: {
+        [eventType]:
+          slackChannelId && slackChannelId.length > 0 ? slackChannelId : null,
+      },
+    };
+    newSettings = Object.assign({}, settings);
+  } else {
+    newSettings = Object.assign({}, settings, {
+      slackSettings: {
+        botLinks: {
+          [eventType]:
+            slackChannelId && slackChannelId.length > 0 ? slackChannelId : null,
+        },
+      },
+    });
+  }
+
+  return db
+    .table('channelSettings')
+    .getAll(channelId, { index: 'channelId' })
+    .update({
+      ...newSettings,
+    })
+    .run()
+    .then(() => getChannelById(channelId));
+};