MMT-3953: Fix for User is encountering latency issue with Save and Pu…

…blish (#1333)

* MMT-3953: Fix for User is encountering latency issue with Save and Publish

static/src/js/components/MetadataForm/MetadataForm.jsx

@@ -233,9 +233,12 @@ const MetadataForm = () => {
           variant: 'success'
         })
 
-        if (type === saveTypes.save) {
+        // We still need to navigate to the new draft revision on save and publish
+        // even though we will end up navigating to the preview page.  The reason
+        // being is because the publish mutation causes the cache to be cleared and as a
+        // result the draft is refetched.
+        if (type === saveTypes.save || type === saveTypes.saveAndPublish) {
           // Navigate to current form? just scroll to top of page instead?
-
           if (currentSection) navigate(`/drafts/${draftType}/${savedConceptId}/${currentSection}?revisionId=${savedRevisionId}`, { replace: true })
 
           window.scroll(0, 0)

static/src/js/components/MetadataForm/__tests__/MetadataForm.test.jsx

@@ -838,7 +838,7 @@ describe('MetadataForm', () => {
         const button = screen.getByRole('button', { name: 'Save & Publish' })
         await user.click(button)
 
-        expect(navigateSpy).toHaveBeenCalledTimes(1)
+        expect(navigateSpy).toHaveBeenCalledTimes(2)
         expect(navigateSpy).toHaveBeenCalledWith('/tools/T1000000-MMT')
       })
     })