Merge branch 'alpha' of github.com:withspectrum/spectrum into 3.1.5

withspectrum · Apr 15, 2019 · 5581ad5 · 5581ad5
2 parents 71cbca5 + 445833a
commit 5581ad5
Show file tree

Hide file tree

Showing 11 changed files with 72 additions and 73 deletions.
diff --git a/analytics/package.json b/analytics/package.json
@@ -22,7 +22,7 @@
     "rethinkhaberdashery": "^2.3.32",
     "sanitize-filename": "^1.6.1",
     "sha1": "^1.1.1",
-    "source-map-support": "^0.5.11",
+    "source-map-support": "^0.5.12",
     "toobusy-js": "^0.5.1"
   }
 }
diff --git a/analytics/yarn.lock b/analytics/yarn.lock
@@ -627,10 +627,10 @@ sha1@^1.1.1:
     charenc ">= 0.0.1"
     crypt ">= 0.0.1"
 
-source-map-support@^0.5.11:
-  version "0.5.11"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
-  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
+source-map-support@^0.5.12:
+  version "0.5.12"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599"
+  integrity sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"

diff --git a/api/package.json b/api/package.json
@@ -8,7 +8,7 @@
     "apollo-upload-client": "^9.1.0",
     "aws-sdk": "2.200.0",
     "axios": "^0.16.2",
-    "b2a": "^1.0.10",
+    "b2a": "^1.0.11",
     "babel-plugin-replace-dynamic-import-runtime": "^1.0.2",
     "babel-plugin-styled-components": "^1.10.0",
     "babel-plugin-transform-flow-strip-types": "^6.22.0",
@@ -44,7 +44,7 @@
     "express": "^4.16.4",
     "express-enforces-ssl": "^1.1.0",
     "express-hot-shots": "^1.0.2",
-    "express-session": "^1.15.2",
+    "express-session": "^1.16.1",
     "faker": "^4.1.0",
     "find-with-regex": "^1.1.3",
     "flow-typed": "^2.5.1",
@@ -106,7 +106,7 @@
     "react-router": "^4.0.0-beta.7",
     "react-router-dom": "^4.0.0-beta.7",
     "react-textarea-autosize": "^4.0.5",
-    "react-transition-group": "^2.8.0",
+    "react-transition-group": "^2.9.0",
     "react-trend": "^1.2.4",
     "recompose": "^0.23.1",
     "redis-tag-cache": "^1.2.1",

diff --git a/api/yarn.lock b/api/yarn.lock
@@ -1546,10 +1546,10 @@ axios@^0.16.2:
     follow-redirects "^1.2.3"
     is-buffer "^1.1.5"
 
-b2a@^1.0.10:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/b2a/-/b2a-1.0.10.tgz#979271967ae2dd6d0bafea827ab5d02bb0362c01"
-  integrity sha512-qRdfj/Abk64Wp1QKE5t4dG+ioF87/er959LgzyBg0DGBNNQMcOzljC5lpFeYeFFUcUdtUhwofDRRo/0YM8Il1Q==
+b2a@^1.0.11:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/b2a/-/b2a-1.0.11.tgz#3e1e27bab975606348ff24e8ea84a4fd6d3bec62"
+  integrity sha512-x+zEGHuG+mSvN+OxrKH8baFssxPjkXvgAjSuLbKrNstX6RpYIykp0BAvbuB1y8tfFwZ4EuXF5OC6m5/D3d12wQ==
 
 babel-code-frame@^6.26.0:
   version "6.26.0"
@@ -3024,11 +3024,6 @@ cors@^2.8.4, cors@^2.8.5:
     object-assign "^4"
     vary "^1"
 
-[email protected]:
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/crc/-/crc-3.4.4.tgz#9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"
-  integrity sha1-naHpgOO9RPxck79as9ozeNheRms=
-
 crc@^3.5.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
@@ -3388,7 +3383,7 @@ denque@^1.1.0:
   resolved "https://registry.yarnpkg.com/denque/-/denque-1.4.0.tgz#79e2f0490195502107f24d9553f374837dabc916"
   integrity sha512-gh513ac7aiKrAgjiIBWZG0EASyDF9p4JMWwKA8YU5s9figrL5SRNEMT6FDynsegakuhWd1wVqTvqvqAoDxw7wQ==
 
-[email protected]:
+[email protected], depd@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
@@ -3475,7 +3470,7 @@ [email protected]:
     minimist "^1.1.1"
     rc "^1.0.0"
 
-dom-helpers@^3.3.1:
+dom-helpers@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8"
   integrity sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==
@@ -4070,20 +4065,19 @@ express-hot-shots@^1.0.2:
     hot-shots "^5.9.2"
     obj-extend "~0.1.0"
 
-express-session@^1.15.2:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.15.6.tgz#47b4160c88f42ab70fe8a508e31cbff76757ab0a"
-  integrity sha512-r0nrHTCYtAMrFwZ0kBzZEXa1vtPVrw0dKvGSrKP4dahwBQ1BJpF2/y1Pp4sCD/0kvxV4zZeclyvfmw0B4RMJQA==
+express-session@^1.16.1:
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.16.1.tgz#251ff9776c59382301de6c8c33411af357ed439c"
+  integrity sha512-pWvUL8Tl5jUy1MLH7DhgUlpoKeVPUTe+y6WQD9YhcN0C5qAhsh4a8feVjiUXo3TFhIy191YGZ4tewW9edbl2xQ==
   dependencies:
     cookie "0.3.1"
     cookie-signature "1.0.6"
-    crc "3.4.4"
     debug "2.6.9"
-    depd "~1.1.1"
-    on-headers "~1.0.1"
+    depd "~2.0.0"
+    on-headers "~1.0.2"
     parseurl "~1.3.2"
+    safe-buffer "5.1.2"
     uid-safe "~2.1.5"
-    utils-merge "1.0.1"
 
 express@^4.16.4:
   version "4.16.4"
@@ -8072,12 +8066,12 @@ react-textarea-autosize@^4.0.5:
   dependencies:
     prop-types "^15.5.8"
 
-react-transition-group@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.8.0.tgz#d6d8f635d81a0955b67348be5d017cff77d6c75f"
-  integrity sha512-So23a1MPn8CGoW5WNU4l0tLiVkOFmeXSS1K4Roe+dxxqqHvI/2XBmj76jx+u96LHnQddWG7LX8QovPAainSmWQ==
+react-transition-group@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.9.0.tgz#df9cdb025796211151a436c69a8f3b97b5b07c8d"
+  integrity sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==
   dependencies:
-    dom-helpers "^3.3.1"
+    dom-helpers "^3.4.0"
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
     react-lifecycles-compat "^3.0.4"

diff --git a/desktop/package.json b/desktop/package.json
@@ -12,15 +12,15 @@
   "private": true,
   "dependencies": {
     "electron-context-menu": "^0.10.1",
-    "electron-is-dev": "^1.0.1",
+    "electron-is-dev": "^1.1.0",
     "electron-log": "^2.2.17",
     "electron-updater": "^4.0.6",
     "electron-window-state": "^5.0.3"
   },
   "devDependencies": {
     "electron": "^3.0.13",
     "electron-builder": "^20.39.0",
-    "nodemon": "^1.18.10",
+    "nodemon": "^1.18.11",
     "rimraf": "^2.6.3"
   },
   "scripts": {

diff --git a/desktop/yarn.lock b/desktop/yarn.lock
@@ -429,10 +429,10 @@ chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chokidar@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.0.tgz#5fcb70d0b28ebe0867eb0f09d5f6a08f29a1efa0"
-  integrity sha512-5t6G2SH8eO6lCvYOoUpaRnF5Qfd//gd7qJAkwRUw9qlGVkiQ13uwQngqbWWaurOsaAm9+kUGbITADxt6H0XFNQ==
+chokidar@^2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.5.tgz#0ae8434d962281a5f56c72869e79cb6d9d86ad4d"
+  integrity sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==
   dependencies:
     anymatch "^2.0.0"
     async-each "^1.0.1"
@@ -444,7 +444,7 @@ chokidar@^2.1.0:
     normalize-path "^3.0.0"
     path-is-absolute "^1.0.0"
     readdirp "^2.2.1"
-    upath "^1.1.0"
+    upath "^1.1.1"
   optionalDependencies:
     fsevents "^1.2.7"
 
@@ -817,6 +817,11 @@ electron-is-dev@^1.0.1:
   resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.0.1.tgz#6e0a184736fe7aea77d18210b0b0f6a02402c4bc"
   integrity sha512-iwM3EotA9HTXqMGpQRkR/kT8OZqBbdfHTnlwcxsjSLYqY8svvsq0MuujsWCn3/vtgRmDv/PC/gKUUpoZvi5C1w==
 
+electron-is-dev@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/electron-is-dev/-/electron-is-dev-1.1.0.tgz#b15a2a600bdc48a51a857d460e05f15b19a2522c"
+  integrity sha512-Z1qA/1oHNowGtSBIcWk0pcLEqYT/j+13xUw/MYOrBUOL4X7VN0i0KCTf5SqyvMPmW5pSPKbo28wkxMxzZ20YnQ==
+
 electron-log@^2.2.17:
   version "2.2.17"
   resolved "https://registry.yarnpkg.com/electron-log/-/electron-log-2.2.17.tgz#e71e2ebb949fc96ded7cdb99eeee7202e48981d2"
@@ -2006,12 +2011,12 @@ node-pre-gyp@^0.10.0:
     semver "^5.3.0"
     tar "^4"
 
-nodemon@^1.18.10:
-  version "1.18.10"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.10.tgz#3ba63f64eb4c283cf3e4f75f30817e9d4f393afe"
-  integrity sha512-we51yBb1TfEvZamFchRgcfLbVYgg0xlGbyXmOtbBzDwxwgewYS/YbZ5tnlnsH51+AoSTTsT3A2E/FloUbtH8cQ==
+nodemon@^1.18.11:
+  version "1.18.11"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-1.18.11.tgz#d836ab663776e7995570b963da5bfc807e53f6b8"
+  integrity sha512-KdN3tm1zkarlqNo4+W9raU3ihM4H15MVMSE/f9rYDZmFgDHAfAJsomYrHhApAkuUemYjFyEeXlpCOQ2v5gtBEw==
   dependencies:
-    chokidar "^2.1.0"
+    chokidar "^2.1.5"
     debug "^3.1.0"
     ignore-by-default "^1.0.1"
     minimatch "^3.0.4"
@@ -3148,10 +3153,10 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
   integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
-upath@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
-  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
+upath@^1.1.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.2.tgz#3db658600edaeeccbe6db5e684d67ee8c2acd068"
+  integrity sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==
 
 update-notifier@^2.5.0:
   version "2.5.0"

diff --git a/src/components/modals/CreateChannelModal/index.js b/src/components/modals/CreateChannelModal/index.js
@@ -87,7 +87,7 @@ class CreateChannelModal extends React.Component<Props, State> {
     let lowercaseName = name.toLowerCase().trim();
     let slug = slugg(lowercaseName);
 
-    if (name.length >= 20) {
+    if (name.length > 20) {
       this.setState({
         nameError: true,
       });

diff --git a/src/views/communitySettings/components/editForm.js b/src/views/communitySettings/components/editForm.js
@@ -81,7 +81,7 @@ class EditForm extends React.Component<Props, State> {
   changeName = e => {
     const name = e.target.value;
 
-    if (name.length >= 20) {
+    if (name.length > 20) {
       this.setState({
         name,
         nameError: true,
@@ -307,13 +307,14 @@ class EditForm extends React.Component<Props, State> {
         <SectionTitle>Community Settings</SectionTitle>
         <Form onSubmit={this.save}>
           <ImageInputWrapper>
-            {coverPhoto && !/default_images/.test(coverPhoto) && (
-              <DeleteCoverWrapper>
-                <DeleteCoverButton onClick={e => this.deleteCoverPhoto(e)}>
-                  <Icon glyph="view-close-small" size={'16'} />
-                </DeleteCoverButton>
-              </DeleteCoverWrapper>
-            )}
+            {coverPhoto &&
+              !/default_images/.test(coverPhoto) && (
+                <DeleteCoverWrapper>
+                  <DeleteCoverButton onClick={e => this.deleteCoverPhoto(e)}>
+                    <Icon glyph="view-close-small" size={'16'} />
+                  </DeleteCoverButton>
+                </DeleteCoverWrapper>
+              )}
             <CoverInput
               onChange={this.setCommunityCover}
               defaultValue={coverPhoto}
@@ -398,8 +399,4 @@ class EditForm extends React.Component<Props, State> {
   }
 }
 
-export default compose(
-  connect(),
-  editCommunityMutation,
-  withRouter
-)(EditForm);
+export default compose(connect(), editCommunityMutation, withRouter)(EditForm);
diff --git a/src/views/newCommunity/components/createCommunityForm/index.js b/src/views/newCommunity/components/createCommunityForm/index.js
@@ -124,7 +124,7 @@ class CreateCommunityForm extends React.Component<Props, State> {
       .replace(/-{2,}/g, '-');
     let slug = slugg(lowercaseName);
 
-    if (name.length >= 20) {
+    if (name.length > 20) {
       this.setState({
         nameError: true,
       });
@@ -474,13 +474,14 @@ class CreateCommunityForm extends React.Component<Props, State> {
       <FormContainer data-cy="create-community-form">
         <Form>
           <ImageInputWrapper>
-            {coverPhoto && !/default_images/.test(coverPhoto) && (
-              <DeleteCoverWrapper>
-                <DeleteCoverButton onClick={e => this.deleteCoverPhoto(e)}>
-                  <Icon glyph="view-close-small" size={'16'} />
-                </DeleteCoverButton>
-              </DeleteCoverWrapper>
-            )}
+            {coverPhoto &&
+              !/default_images/.test(coverPhoto) && (
+                <DeleteCoverWrapper>
+                  <DeleteCoverButton onClick={e => this.deleteCoverPhoto(e)}>
+                    <Icon glyph="view-close-small" size={'16'} />
+                  </DeleteCoverButton>
+                </DeleteCoverWrapper>
+              )}
             <CoverInput
               onChange={this.setCommunityCover}
               defaultValue={coverPhoto}

diff --git a/src/views/newCommunity/components/editCommunityForm/index.js b/src/views/newCommunity/components/editCommunityForm/index.js
@@ -69,7 +69,7 @@ class CommunityWithData extends React.Component<Props, State> {
   changeName = e => {
     const name = e.target.value;
 
-    if (name.length >= 20) {
+    if (name.length > 20) {
       this.setState({
         name,
         nameError: true,

diff --git a/src/views/thread/components/stickyHeader.js b/src/views/thread/components/stickyHeader.js
@@ -3,7 +3,7 @@ import * as React from 'react';
 import { connect } from 'react-redux';
 import compose from 'recompose/compose';
 import { Link } from 'react-router-dom';
-import { UserHoverProfile } from 'src/components/hoverProfile';
+import { truncate } from 'src/helpers/utils';
 import { UserAvatar } from 'src/components/avatar';
 import { LikeButton } from 'src/components/threadLikes';
 import { convertTimestampToDate } from 'shared/time-formatting';
@@ -43,7 +43,9 @@ const StickyHeader = (props: Props) => {
             username={thread.author.user.username}
           />
           <CommunityHeaderMetaCol>
-            <CommunityHeaderName>{thread.content.title}</CommunityHeaderName>
+            <CommunityHeaderName>
+              {truncate(thread.content.title, 80)}
+            </CommunityHeaderName>
             <CommunityHeaderSubtitle>
               <Link to={getThreadLink(thread)}>{timestamp}</Link>
             </CommunityHeaderSubtitle>