CSCFAIRMETA-822: Fix cumulative state not updating correctly in v2 (#647

)
CSCfi · Dec 11, 2020 · 72bb2d2 · 72bb2d2
1 parent 10f1abf
commit 72bb2d2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/etsin_finder/frontend/__tests__/qvain.apiv2.test.jsx b/etsin_finder/frontend/__tests__/qvain.apiv2.test.jsx
@@ -126,7 +126,11 @@ describe('Submit.exec()', () => {
   beforeEach(() => {
     handleSubmitToBackend.mockReturnValue(generateDefaultDatasetForPublish())
     submitFunction = jest.fn(() => generalPostResponse)
-    mockQvain = createMockQvain()
+    mockQvain = createMockQvain({
+      original: {
+        identifier: 'some identifier',
+      },
+    })
     Submit = new SubmitClass(mockQvain)
   })
 
@@ -189,9 +193,9 @@ describe('Submit.exec()', () => {
 
   test(`when newCumulativeState, calls editDataset with data from backend`, async () => {
     mockQvain.newCumulativeState = 'new state'
-    axios.get.mockReturnValue(generalGetResponse)
+    axios.get.mockReturnValue(Promise.resolve(generalGetResponse))
     await exec()
-    expect(mockQvain.editDataset).toHaveBeenCalledWith(generalGetResponse.data)
+    await expect(mockQvain.editDataset).toHaveBeenCalledWith(generalGetResponse.data)
   })
 })
 

diff --git a/etsin_finder/frontend/js/stores/view/qvain/index.js b/etsin_finder/frontend/js/stores/view/qvain/index.js
@@ -205,7 +205,7 @@ class Qvain extends Resources {
   }
 
   // load fields that won't be duplicated by template copy
-  @action loadStatusAndFileFields = async (dataset) => {
+  @action loadStatusAndFileFields = async dataset => {
     this.deprecated = dataset.deprecated
 
     // Load data catalog
@@ -246,9 +246,9 @@ class Qvain extends Resources {
           r.download_url ? r.download_url.identifier : undefined,
           r.use_category
             ? {
-              label: r.use_category.pref_label.en,
-              value: r.use_category.identifier,
-            }
+                label: r.use_category.pref_label.en,
+                value: r.use_category.identifier,
+              }
             : undefined
         )
       )

diff --git a/etsin_finder/frontend/js/stores/view/qvain/qvain.submit.js b/etsin_finder/frontend/js/stores/view/qvain/qvain.submit.js
@@ -130,8 +130,19 @@ class Submit {
       await this.updateFiles(data.identifier, fileActions, metadataActions)
       setChanged(false)
 
-      if (fileActions || metadataActions || newCumulativeState) {
+      if (newCumulativeState != null) {
+        const obj = {
+          identifier: this.Qvain.original.identifier,
+          cumulative_state: this.Qvain.newCumulativeState,
+        }
+
+        const url = urls.v2.rpc.changeCumulativeState()
+        await axios.post(url, obj)
+      }
+
+      if (fileActions || metadataActions || newCumulativeState != null) {
         // Files changed, get updated dataset
+
         const url = urls.v2.dataset(data.identifier)
         const updatedResponse = await axios.get(url)
         await editDataset(updatedResponse.data)
@@ -145,6 +156,7 @@ class Submit {
       this.setResponse(undefined)
       if (!(error instanceof ValidationError)) {
         console.error(error)
+        this.setResponse(error)
       }
     } finally {
       this.setLoading(false)