add onDiscard without confirm #58

medialab · Jul 2, 2019 · 0ff1a3b · 0ff1a3b
1 parent c3f4159
commit 0ff1a3b
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 6 deletions.
diff --git a/importApp/src/components/FieldInput.js b/importApp/src/components/FieldInput.js
@@ -27,10 +27,16 @@ class FieldInput extends React.Component {
   }
 
   componentDidUpdate (prevProps) {
-    const {fieldDescriptor, fieldValue} = this.props;
-    if (fieldDescriptor.name === 'slug' && fieldValue !== prevProps.fieldValue ) {
+    const {fieldDescriptor, fieldValue, fixedValue} = this.props;
+    if (fieldDescriptor.name === 'slug' && fieldValue !== prevProps.fieldValue) {
       this.validateField(fieldValue)
     }
+    if (fixedValue !== prevProps.fixedValue && !fixedValue) {
+      const state = this.getStateFromProps();
+      this.setState({
+        ...state
+      })
+    }
   }
 
   getStateFromProps = () => {

diff --git a/importApp/src/components/ForeignkeyCorrection.js b/importApp/src/components/ForeignkeyCorrection.js
@@ -186,6 +186,21 @@ class ForeignKeyCorrection extends React.Component {
     })
   }
 
+  handleDiscard = () => {
+    const {modificationItem} = this.props;
+    this.props.onTouch(false);
+    const fixedValues = this.initFixedValues();
+    this.setState({
+      fixedValues,
+      showSolving: modificationItem.fixed ? false : true,
+      showNewForm: false,
+      newResource: null,
+      newReference: null,
+      newRefReference: null
+    });
+    this.props.onDiscard()
+  }
+
   renderFixed() {
     const {modificationItem} = this.props;
     const {field, fixedValues, fixedReferenceTable, unchangable}= modificationItem;
@@ -229,6 +244,7 @@ class ForeignKeyCorrection extends React.Component {
             foreignKeys={schema.foreignKeys}
             fieldDescriptor={fieldDescriptor} 
             referenceTables={referenceTables}
+            fixedValue={this.state.fixedValues[modificationItem.field]}
             fieldValue={this.state.fixedValues[modificationItem.field]}
             onClickCreate={this.handleClickCreate}
             onChange={this.handleSelectExist} />
@@ -247,8 +263,7 @@ class ForeignKeyCorrection extends React.Component {
   }
 
   render() {
-    const {newResource, fixedValues} = this.state;
-    const {modificationItem, foreignKeyField, descriptor, referenceTables} = this.props;
+    const {modificationItem, foreignKeyField, descriptor, referenceTables, isModificationTouched} = this.props;
     const {value, message, field}= modificationItem;
     const resourceName = foreignKeyField.reference.resource;  
     const referenceFieldResource = descriptor.resources.find((resource) => resource.name === resourceName);
@@ -333,11 +348,17 @@ class ForeignKeyCorrection extends React.Component {
           {
             this.state.showSolving &&
             <FieldContainer isGrouped>
-              {
+              {/* {
                 modificationItem.fixed &&
                 <Control>
                   <Button isColor="info" onClick={this.handleHideSolving}>Cancel</Button>
                 </Control>
+              } */}
+              {
+                isModificationTouched &&
+                <Control>
+                  <Button isColor="info" onClick={this.handleDiscard}>Discard modification</Button>
+                </Control>
               }
               <Control>
                 <Button isColor="info" isDisabled={isSubmitDisabled} onClick={this.handleSubmitForm}>Confirm this fix</Button>

diff --git a/importApp/src/components/FormatCorrection.js b/importApp/src/components/FormatCorrection.js
@@ -71,6 +71,14 @@ class FormatCorrection extends React.Component {
     })
   }
 
+  handleDiscard = () => {
+    this.props.onTouch(false);
+    const state = this.hydrateState()
+    this.setState({
+      ...state
+    });
+  }
+
   renderOriginal() {
     const {modificationItem} = this.props;
     const {value, message, field}= modificationItem;
@@ -99,7 +107,7 @@ class FormatCorrection extends React.Component {
   }
 
   renderInput() {
-    const {modificationItem, fieldDescriptor} = this.props;
+    const {modificationItem, fieldDescriptor, isModificationTouched} = this.props;
     const {fieldValid} = this.state;
     const isSubmitDisabled = !fieldValid || !fieldValid.valid
 
@@ -110,6 +118,7 @@ class FormatCorrection extends React.Component {
           isNonchangable={false}
           fieldDescriptor={fieldDescriptor} 
           fieldValue={modificationItem.value}
+          fixedValue={this.state.fixedValue}
           onChange={this.handleFieldChange} />
 
         <FieldContainer isGrouped>  
@@ -119,6 +128,12 @@ class FormatCorrection extends React.Component {
               <Button isColor="info" onClick={this.handleHideSolving}>Cancel</Button>
             </Control>
           }
+          {
+            isModificationTouched &&
+            <Control>
+              <Button isColor="info" onClick={this.handleDiscard}>Discard modification</Button>
+            </Control>
+          }
           <Control>
             <Button isColor="info" isDisabled={isSubmitDisabled} onClick={this.handleSubmitForm}>Confirm this fix</Button>
           </Control>

diff --git a/importApp/src/containers/DataModification/DataModification.js b/importApp/src/containers/DataModification/DataModification.js
@@ -206,7 +206,9 @@ class DataModification extends React.Component {
               isCurrencyFixDisabled={isCurrencyFixDisabled}
               modificationIndex={modificationIndex}
               modificationItem={modificationItem} 
+              isModificationTouched={this.state.isModificationTouched}
               onTouch={this.handleTouchModification}
+              onDiscard={this.props.goNextError}
               onSubmitModification={handleSubmitModification} />
 
             <div style={{

diff --git a/importApp/src/containers/DataModification/ModificationComponent.js b/importApp/src/containers/DataModification/ModificationComponent.js
@@ -14,8 +14,10 @@ const ModificationComponent = ({
   descriptor,
   schema,
   isCurrencyFixDisabled,
+  isModificationTouched,
   modificationItem,
   modificationIndex,
+  onDiscard,
   onTouch,
   onSubmitModification,
 }) => {
@@ -54,6 +56,8 @@ const ModificationComponent = ({
           fieldDescriptor={getFieldDescriptor()} 
           modificationItem={modificationItem}
           modificationIndex={modificationIndex}
+          isModificationTouched={isModificationTouched}
+          onDiscard={onDiscard}
           onTouch={onTouch}
           onSubmitForm={handleSubmitModification} 
         /> 
@@ -65,9 +69,11 @@ const ModificationComponent = ({
           descriptor={descriptor}
           foreignKeyField={getForeignKeyField()}
           isCurrencyFixDisabled={isCurrencyFixDisabled}
+          isModificationTouched={isModificationTouched}
           referenceTables={referenceTables}
           modificationItem={modificationItem}
           modificationIndex={modificationIndex}
+          onDiscard={onDiscard}
           onTouch={onTouch}
           onSubmitForm={handleSubmitModification} 
         />