Merge pull request #1920 from appirio-tech/dev

Release to prod

Author: vikasrohit

.build-info

@@ -1 +1 @@
-{"rndkey":"\\þû\u001c±7åI–\u0007ïˆRªÞǤ¦\u0015Š¦\u0007¥ç\u001e:ÄX)™P§","timestamp":"2018-02-17T13:13:13.277Z"}
+{"rndkey":"»#\u0003b\u001d-‹j¯±\u000e&nbO÷. ÁˆÂ¹?•öë»\u000fÜí","timestamp":"2018-03-08T11:50:21.658Z"}

config/webpack/development.js

@@ -46,6 +46,20 @@ combinedConfig.entry.main = combinedConfig.entry.main.filter((entry) => (
   entry !== 'webpack-hot-middleware/client?reload=true'
 ))
 
+/*
+  Remove ExtractTextPlugin, because we want hot reload when editing styles
+ */
+const extractTextPluginIndex = combinedConfig.plugins.findIndex(plugin => plugin.constructor.name === 'ExtractTextPlugin')
+combinedConfig.plugins.splice(extractTextPluginIndex, 1)
+
+combinedConfig.module.rules.forEach(rule => {
+  if (rule.use){
+    const extractTextLoaderIndex = rule.use.findIndex(use => use.loader && use.loader.indexOf('extract-css-chunks-webpack-plugin') >= 0)
+    if (extractTextLoaderIndex >= 0) {
+      rule.use.splice(extractTextLoaderIndex, 1)
+    }
+  }
+})
 /*
   Enable source maps.
   This also let us see original file names in browser console.

package-lock.json

@@ -49,7 +49,7 @@ export function loadUserSuccess(dispatch, token) {
   if (currentUser) {
     getUserProfile(currentUser.handle).then((profile) => {
       currentUser = _.assign(currentUser, profile)
-      // keeping profile for backward compaitability
+      // keeping profile for backward compatibility
       currentUser.profile = profile
       // determine user role
       let userRole

src/actions/loadUser.js

@@ -16,7 +16,10 @@ export function updateProjectAttachment(projectId, attachmentId, attachment) {
   return axios.patch(
     `${PROJECTS_API_URL}/v4/projects/${projectId}/attachments/${attachmentId}`,
     { param: attachment })
-    .then ( resp => resp.data.result.content )
+    .then ( resp => {
+      resp.data.result.content.downloadUrl = `/projects/${projectId}/attachments/${attachmentId}`
+      return _.get(resp.data, 'result.content', {})
+    })
 }
 
 export function removeProjectAttachment(projectId, attachmentId) {

src/api/projectAttachments.js

@@ -22,7 +22,7 @@ export function getProjects(criteria, pageNum) {
       filter.segment = `in(${filter.segment})`
     }
     // convert filter object to string
-    const filterStr = _.map(filter, (v, k) => `${k}=${v}`)
+    const filterStr = _.map(filter, (v, k) => `${k}=${encodeURIComponent(v)}`)
     params.filter = filterStr.join('&')
   }
   // sort fields
@@ -80,7 +80,7 @@ export function createProject(projectProps) {
   // TODO: Remove this once none of the active projects
   // have the discussions tab enabled
   projectProps.details.hideDiscussions = true
-  
+
   return axios.post(`${PROJECTS_API_URL}/v4/projects/`, { param: projectProps })
     .then( resp => {
       return _.get(resp.data, 'result.content', {})