Skip to content

issue 3149 fix #3150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rashmi73 wants to merge 2 commits into from
Closed

issue 3149 fix #3150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a13b6e
Update projects.js
rashmi73 Jul 5, 2019
126c825
issue 3149 patch
rashmi73 Jul 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/api/projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,15 @@ export function getProjectById(projectId) {
a.downloadUrl = `/projects/${projectId}/attachments/${a.id}`
})
if (!res.invites) res.invites = []
if (res.details.utm && !res.details.utm.code) {
res.details.utm.code = ""
}
if (res.details.appDefinition && !res.details.appDefinition.features) {
res.details.appDefinition.features = {}
}
if (res.details.apiDefinition && !res.details.apiDefinition.notes) {
res.details.apiDefinition.notes = ""
}
return res
})
}
Expand Down
10 changes: 9 additions & 1 deletion src/projects/reducers/project.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,15 @@ export const projectState = function (state=initialState, action) {
}

case PROJECT_DIRTY: {
const updatedProject = _.mergeWith({}, _.omit(state.project, 'isDirty'), action.payload,
let payload = action.payload
let stateProject = _.omit(state.project, 'isDirty')
if (action.payload.details.appDefinition.targetDevices) {
if (action.payload.details.appDefinition.targetDevices.indexOf('web-browser') == -1) {
payload = _.omit(action.payload, 'details.appDefinition.progressiveResponsive')
stateProject = _.omit(state.project, ['isDirty','details.appDefinition.progressiveResponsive'])
}
}
const updatedProject = _.mergeWith({}, stateProject, payload,
// customizer to override arrays with changed values
(objValue, srcValue, key) => {
// when we update some array values, we have to replace them completely, rather than merge
Expand Down