fix: Merging fix from Fix-Configurator-Cancel-Loading.

Evandro Carenho · Evandro Carenho · commit 9bce3c49bf6b · 2017-03-27T13:51:06.000-03:00
diff --git a/components/SubmitInstance/SubmitInstance.jsx b/components/SubmitInstance/SubmitInstance.jsx
@@ -38,16 +38,14 @@ export class SubmitInstance extends Component {
   }
 
   componentWillReceiveProps(nextProps) {
-    if (this.props.saved !== nextProps.saved) {
-      if (nextProps.saved) {
-        if (nextProps.operation === 'CREATE' || nextProps.operation === 'UPDATE') {
-          hashHistory.push('/instance-created');
-        } else if (nextProps.operation === 'REMOVE') {
-          hashHistory.push('/');
-        }
-      } else {
+    if (nextProps.saved) {
+      if (nextProps.operation === 'CREATE' || nextProps.operation === 'UPDATE') {
+        hashHistory.push('/instance-created');
+      } else if (nextProps.operation === 'REMOVE') {
         hashHistory.push('/');
       }
+    } else {
+      hashHistory.push('/');
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -38,16 +38,14 @@ export class SubmitInstance extends Component {`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`componentWillReceiveProps(nextProps) {`
`41`		`- if (this.props.saved !== nextProps.saved) {`
`42`		`- if (nextProps.saved) {`
`43`		`- if (nextProps.operation === 'CREATE' \|\| nextProps.operation === 'UPDATE') {`
`44`		`- hashHistory.push('/instance-created');`
`45`		`- } else if (nextProps.operation === 'REMOVE') {`
`46`		`- hashHistory.push('/');`
`47`		`- }`
`48`		`- } else {`
	`41`	`+ if (nextProps.saved) {`
	`42`	`+ if (nextProps.operation === 'CREATE' \|\| nextProps.operation === 'UPDATE') {`
	`43`	`+ hashHistory.push('/instance-created');`
	`44`	`+ } else if (nextProps.operation === 'REMOVE') {`
`49`	`45`	`hashHistory.push('/');`
`50`	`46`	`}`
	`47`	`+ } else {`
	`48`	`+ hashHistory.push('/');`
`51`	`49`	`}`
`52`	`50`	`}`
`53`	`51`