CSCFAIRMETA-840: Clear submit response between datasets (#645)

CSCfi · Dec 10, 2020 · 24fd0f9 · 24fd0f9
1 parent 33c14a9
commit 24fd0f9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/etsin_finder/frontend/js/components/qvain/views/main/index.jsx b/etsin_finder/frontend/js/components/qvain/views/main/index.jsx
@@ -156,9 +156,10 @@ export class Qvain extends Component {
   }
 
   clearSubmitResponse = () => {
+    const { clearResponse, setError } = this.props.Stores.Qvain.Submit
+    clearResponse()
+    setError(null)
     this.setState({
-      datasetLoading: false,
-      submitted: false,
       response: null,
     })
   }

diff --git a/etsin_finder/frontend/js/stores/view/qvain/index.js b/etsin_finder/frontend/js/stores/view/qvain/index.js
@@ -9,8 +9,8 @@ class Qvain extends Resources {
     super()
     this.Env = Env
     this.Files = new Files(this)
-    this.resetQvainStore()
     this.Submit = new Submit(this)
+    this.resetQvainStore()
     makeObservable(this)
   }
 
@@ -49,6 +49,8 @@ class Qvain extends Resources {
 
     this.changed = false
     this.deprecated = false
+
+    this.Submit.reset()
   }
 
   @action
@@ -259,6 +261,7 @@ class Qvain extends Resources {
   }
 
   @action editDataset = async dataset => {
+    this.Submit.reset()
     this.setChanged(false)
     this.original = { ...dataset }
     this.loadBasicFields(dataset)

diff --git a/etsin_finder/frontend/js/stores/view/qvain/qvain.submit.js b/etsin_finder/frontend/js/stores/view/qvain/qvain.submit.js
@@ -23,6 +23,13 @@ class Submit {
 
   @observable useDoiModalIsOpen = false
 
+  @action reset = () => {
+    this.isLoading = false
+    this.error = undefined
+    this.response = null
+    this.useDoiModalIsOpen = false
+  }
+
   @action setLoading = state => {
     this.isLoading = state
   }