{isEdit ?
-
stopEdit(flow, old_flow)}>
+ stopEdit(flow, modifiedFlow)}>
:
@@ -29,8 +29,8 @@ function ToggleEdit({ isEdit, startEdit, stopEdit, flow, old_flow }) {
export default connect(
state => ({
isEdit: !!state.ui.flow.modifiedFlow,
- flow: state.ui.flow.modifiedFlow || state.flows.byId[state.flows.selected[0]],
- old_flow: state.flows.byId[state.flows.selected[0]]
+ modifiedFlow: state.ui.flow.modifiedFlow || state.flows.byId[state.flows.selected[0]],
+ flow: state.flows.byId[state.flows.selected[0]]
}),
{
startEdit,
diff --git a/web/src/js/components/common/CodeEditor.jsx b/web/src/js/components/common/CodeEditor.jsx
index ad7af39d0..95f1b98b0 100644
--- a/web/src/js/components/common/CodeEditor.jsx
+++ b/web/src/js/components/common/CodeEditor.jsx
@@ -3,24 +3,19 @@ import { render } from 'react-dom';
import Codemirror from 'react-codemirror';
-export default class CodeEditor extends Component{
- static propTypes = {
+CodeEditor.propTypes = {
content: PropTypes.string.isRequired,
onChange: PropTypes.func.isRequired,
- }
-
- constructor(props){
- super(props)
- }
-
- render() {
- let options = {
- lineNumbers: true
- };
- return (
-
e.stopPropagation()}>
-
-
- )
- }
+}
+
+export default function CodeEditor ( { content, onChange} ){
+
+ let options = {
+ lineNumbers: true
+ };
+ return (
+
e.stopPropagation()}>
+
+
+ )
}
diff --git a/web/src/js/ducks/ui/flow.js b/web/src/js/ducks/ui/flow.js
index e78f63731..268459559 100644
--- a/web/src/js/ducks/ui/flow.js
+++ b/web/src/js/ducks/ui/flow.js
@@ -1,4 +1,6 @@
import * as flowsActions from '../flows'
+import { getDiff } from "../../utils"
+
import _ from 'lodash'
export const SET_CONTENT_VIEW = 'UI_FLOWVIEW_SET_CONTENT_VIEW',
@@ -6,13 +8,15 @@ export const SET_CONTENT_VIEW = 'UI_FLOWVIEW_SET_CONTENT_VIEW',
SET_TAB = "UI_FLOWVIEW_SET_TAB",
START_EDIT = 'UI_FLOWVIEW_START_EDIT',
UPDATE_EDIT = 'UI_FLOWVIEW_UPDATE_EDIT',
- STOP_EDIT = 'UI_FLOWVIEW_STOP_EDIT'
+ STOP_EDIT = 'UI_FLOWVIEW_STOP_EDIT',
+ UPLOAD_CONTENT = 'UI_FLOWVIEW_UPLOAD_CONTENT'
const defaultState = {
displayLarge: false,
modifiedFlow: false,
contentView: 'ViewAuto',
+ lastFileUpload: false,
tab: 'request',
}
@@ -38,6 +42,12 @@ export default function reducer(state = defaultState, action) {
modifiedFlow: false
}
+ case UPLOAD_CONTENT:
+ return {
+ ... state,
+ lastFileUpload: new Date()
+ }
+
case flowsActions.SELECT:
return {
...state,
@@ -90,30 +100,25 @@ export function updateEdit(update) {
export function uploadContent(flow, content, type){
return (dispatch) => {
- dispatch(flowsActions.updateContent(flow, content, type)).then( () => {
- dispatch(flowsActions.updateFlow(flow))
- dispatch({ type: STOP_EDIT })
- })
+ dispatch(flowsActions.updateContent(flow, content, type))
+ dispatch({ type: UPLOAD_CONTENT })
}
}
-export function stopEdit(modified_flow, old_flow) {
- //make diff of modified_flow and old_flow
+export function stopEdit(flow, modified_flow) {
+ let diff = getDiff(flow, modified_flow)
return (dispatch) => {
- let flow = {...modified_flow}
-
- if (flow.response.content) {
- dispatch(flowsActions.updateContent(flow, flow.response.content, "response"))
- flow.response = _.omit(flow.response, "content")
+ if (diff.response && diff.response.content) {
+ dispatch(flowsActions.updateContent(flow, diff.response.content, "response"))
+ delete diff.response.content
}
- if (flow.request.content) {
- dispatch(flowsActions.updateContent(flow, flow.request.content, "request"))
- flow.request = _.omit(flow.request, "content")
+ if (diff.request && diff.request.content) {
+ dispatch(flowsActions.updateContent(flow, diff.request.content, "request"))
+ delete diff.request.content
}
-
- dispatch(flowsActions.update(flow)).then(() => {
- dispatch(flowsActions.updateFlow(flow))
+ dispatch(flowsActions.update(flow, diff)).then(() => {
+ dispatch(flowsActions.updateFlow(modified_flow))
dispatch({ type: STOP_EDIT })
})
}
diff --git a/web/src/js/utils.js b/web/src/js/utils.js
index eceda1959..ba07b00a1 100644
--- a/web/src/js/utils.js
+++ b/web/src/js/utils.js
@@ -105,3 +105,17 @@ fetchApi.put = (url, json, options) => fetchApi(
...options
}
)
+
+
+export function getDiff(obj1, obj2) {
+ let result = {...obj2};
+ _.forIn(obj1, (value, key) => {
+ if(_.isEqual(obj2[key], obj1[key]))
+ result[key] = undefined;
+ else if(typeof Array.isArray(obj2[key]) && Array.isArray(obj2[key]))
+ result[key] = {...obj2[key]};
+ else if(typeof obj2[key] == 'object' && typeof obj1[key] == 'object')
+ result[key] = getDiff(obj1[key], obj2[key]);
+ });
+ return result;
+}