merge dev branch

Author: gondzo

README.md

@@ -29,7 +29,7 @@ Install dependencies by running the following in the root of the project:
  - **Note:** You must use npm 3. Type `npm -v` to ensure you have a 3.x version.
 
 ## NPM Commands
-- To run locally, run `npm start` and head to `http://localhost:3000/search/challenges`
+- To run locally, run `npm start` and head to `http://localhost:3000/new_project`
 - Run tests with `npm test` or use `npm run test:watch` to rerun tests after files change
 - To make sure your code passes linting: `npm run lint`
 - To create the build: `npm run build`

circle.yml

@@ -1,6 +1,6 @@
 machine:
   node:
-    version: 5.5.0
+    version: 6.11.2
   environment:
     CXX: g++-4.8
 
@@ -19,7 +19,7 @@ compile:
 
 deployment:
   development:
-    branch: dev
+    branch: [dev]
     owner: appirio-tech
     commands:
       - ./deploy.sh DEV

deploy.sh

@@ -21,21 +21,21 @@ deploy_s3bucket() {
 	cat dist/app.2e9868372e0e2992d5d2.css 
 	#aws s3 sync --dryrun ${HOME}/${CIRCLE_PROJECT_REPONAME}/dist s3://${AWS_S3_BUCKET} --cache-control private,no-store,no-cache,must-revalidate,max-age=0
 	#result=`aws s3 sync ${HOME}/${CIRCLE_PROJECT_REPONAME}/dist s3://${AWS_S3_BUCKET} --cache-control private,no-store,no-cache,must-revalidate,max-age=0`	
-	aws s3 sync --dryrun ${HOME}/${CIRCLE_PROJECT_REPONAME}/dist s3://${AWS_S3_BUCKET} --cache-control max-age=0,s-maxage=86400 --exclude "*.txt" --exclude "*.js" --exclude "*.map" --exclude "*.css"
-	result=`aws s3 sync ${HOME}/${CIRCLE_PROJECT_REPONAME}/dist s3://${AWS_S3_BUCKET} --cache-control max-age=0,s-maxage=86400 --exclude "*.txt" --exclude "*.js" --exclude "*.map" --exclude "*.css"`
+	aws s3 sync --dryrun ${HOME}/${CIRCLE_PROJECT_REPONAME}/dist s3://${AWS_S3_BUCKET} --cache-control max-age=0,s-maxage=86400 --exclude "*.txt" --exclude "*.js" --exclude "*.css"
+	result=`aws s3 sync ${HOME}/${CIRCLE_PROJECT_REPONAME}/dist s3://${AWS_S3_BUCKET} --cache-control max-age=0,s-maxage=86400 --exclude "*.txt" --exclude "*.js" --exclude "*.css"`
 	if [ $? -eq 0 ]; then
 		#echo $result
-		echo "All html, font, image and media files are Deployed without gzip encoding!"
+		echo "All html, font, image, map and media files are Deployed without gzip encoding!"
 	else
 		echo "Deployment Failed  - $result"
 		exit 1
 	fi
 	#result=`aws s3 sync ${HOME}/${CIRCLE_PROJECT_REPONAME}/dist s3://${AWS_S3_BUCKET} --cache-control private,no-store,no-cache,must-revalidate,max-age=0`
-	aws s3 sync --dryrun ${HOME}/${CIRCLE_PROJECT_REPONAME}/dist s3://${AWS_S3_BUCKET} --cache-control max-age=0,s-maxage=86400 --exclude "*" --include "*.txt" --include "*.js" --include "*.map" --include "*.css" --content-encoding gzip
-	result=`aws s3 sync ${HOME}/${CIRCLE_PROJECT_REPONAME}/dist s3://${AWS_S3_BUCKET}  --cache-control max-age=0,s-maxage=86400 --exclude "*" --include "*.txt" --include "*.js" --include "*.map" --include "*.css" --content-encoding gzip`
+	aws s3 sync --dryrun ${HOME}/${CIRCLE_PROJECT_REPONAME}/dist s3://${AWS_S3_BUCKET} --cache-control max-age=0,s-maxage=86400 --exclude "*" --include "*.txt" --include "*.js" --include "*.css" --content-encoding gzip
+	result=`aws s3 sync ${HOME}/${CIRCLE_PROJECT_REPONAME}/dist s3://${AWS_S3_BUCKET}  --cache-control max-age=0,s-maxage=86400 --exclude "*" --include "*.txt" --include "*.js" --include "*.css" --content-encoding gzip`
 	if [ $? -eq 0 ]; then
 		#echo $result
-		echo "All css, js, and map files are Deployed! with gzip"
+		echo "All txt, css, and js files are Deployed! with gzip"
 	else
 		echo "Deployment Failed  - $result"
 		exit 1

npm-shrinkwrap.json

@@ -4,7 +4,7 @@
   "description": "Customer pages in React and Redux",
   "scripts": {
     "start": "webpack-dev-server --history-api-fallback --dev --hot --inline --progress --tc --port 3000 --host 0.0.0.0",
-    "build": "webpack --bail --progress --build --tc",
+    "build": "npm rebuild node-sass; webpack --bail --progress --build --tc",
     "lint": "eslint --fix --format table --ext .js,.jsx .",
     "test": "cross-env NODE_ENV=test mocha  --colors --reporter nyan --compilers js:babel-core/register --require ignore-styles --recursive \"./src/**/*.spec.js\"",
     "test:watch": "watch-run -i -p 'src/**/*' npm run test"
@@ -44,6 +44,7 @@
     "draft-js-link-plugin": "^1.2.2",
     "draft-js-plugins-editor": "^2.0.0-rc2",
     "draft-js-utils": "^0.1.7",
+    "coffeescript": "^1.12.7",
     "fbemitter": "^2.1.1",
     "fbjs": "^0.8.12",
     "filepicker-js": "^2.4.17",
@@ -56,10 +57,10 @@
     "linkify-it": "^2.0.3",
     "lodash": "^4.16.4",
     "moment": "^2.14.1",
+    "query-string": "^4.3.4",
     "react": "^15.6.1",
     "react-addons-css-transition-group": "^15.6.0",
     "react-addons-pure-render-mixin": "^15.6.0",
-    "query-string": "^4.3.4",
     "react-color": "^2.13.1",
     "react-datetime": "2.7.1",
     "react-dom": "^15.6.1",

package.json

@@ -1,6 +1,6 @@
 import _ from 'lodash'
 import { axiosInstance as axios } from './requestInterceptor'
-import { TC_API_URL } from '../config/constants'
+import { TC_API_URL, CONNECT_MESSAGE_API_URL } from '../config/constants'
 
 export function getMembersById (userIds) {
   const _userIdArr = _.map(userIds, _id => `userId:${_id}`)
@@ -29,7 +29,9 @@ export function addProjectMember(projectId, newMember) {
   const url = `${TC_API_URL}/v4/projects/${projectId}/members/`
   return axios.post(url, { param: newMember})
   .then(resp => {
-    return resp.data.result.content
+    return axios.put(`${CONNECT_MESSAGE_API_URL}/v4/topics/syncUsers`,
+    { reference: 'project', referenceId: projectId })
+    .then(() => resp.data.result.content)
   })
 }
 
@@ -42,11 +44,23 @@ export function updateProjectMember(projectId, memberId, updatedProps) {
   })
 }
 
-export function removeProjectMember(projectId, memberId) {
+export function removeProjectMember(projectId, memberId, isUserLeaving) {
   const url = `${TC_API_URL}/v4/projects/${projectId}/members/${memberId}/`
-  return axios.delete(url)
-  .then(resp => { // eslint-disable-line no-unused-vars
-    // return the member id just removed
-    return memberId
+  let promise = { then: fn => fn() }
+  if (isUserLeaving) {
+    promise = axios.put(`${CONNECT_MESSAGE_API_URL}/v4/topics/syncUsers`,
+      { reference: 'project', referenceId: projectId, isUserLeaving })
+  }
+  return promise.then(() => {
+    return axios.delete(url)
+    .then(() => {
+      if (!isUserLeaving) {
+        return axios.put(`${CONNECT_MESSAGE_API_URL}/v4/topics/syncUsers`,
+          { reference: 'project', referenceId: projectId })
+        .then(() => memberId)
+      }
+      // return the member id just removed
+      return memberId
+    })
   })
 }

src/api/projectMembers.js

@@ -63,13 +63,23 @@ export function updateProject(projectId, updatedProps) {
 
 
 export function createProject(projectProps) {
+  // Phase out discussions
+  // TODO: Remove this once none of the active projects
+  // have the discussions tab enabled
+  projectProps.details.hideDiscussions = true
+  
   return axios.post(`${TC_API_URL}/v4/projects/`, { param: projectProps })
     .then( resp => {
       return _.get(resp.data, 'result.content', {})
     })
 }
 
 export function createProjectWithStatus(projectProps, status) {
+  // Phase out discussions
+  // TODO: Remove this once none of the active projects
+  // have the discussions tab enabled
+  projectProps.details.hideDiscussions = true
+
   return axios.post(`${TC_API_URL}/v4/projects/`, { param: projectProps })
     .then( resp => {
       return _.get(resp.data, 'result.content', {})