MMT-4089: Editing based on CMR feedback

Author: mandyparson

static/src/js/components/CollectionAssociationForm/CollectionAssociationForm.jsx

@@ -286,6 +286,14 @@ const CollectionAssociationForm = () => {
         if (derivedConceptType === conceptIdTypes.O) {
           navigate(`/order-options/${conceptId}`)
         } else {
+          getConcept({
+            variables: {
+              params: {
+                conceptId
+              }
+            }
+          })
+
           navigate(`/${pluralize(camelCase(derivedConceptType)).toLowerCase()}/${conceptId}/collection-association`)
         }
 

static/src/js/components/ManageCollectionAssociation/ManageCollectionAssociation.jsx

@@ -74,11 +74,17 @@ const ManageCollectionAssociation = () => {
   }
 
   const { data, refetch } = useSuspenseQuery(conceptTypeQueries[derivedConceptType], {
-    variables: params,
-    fetchPolicy: 'network-only'
+    variables: params
   })
 
   const [deleteAssociationMutation] = useMutation(DELETE_ASSOCIATION, {
+    refetchQueries: [
+      {
+        query: conceptTypeQueries[derivedConceptType],
+        variables: params
+      }
+    ],
+    awaitRefetchQueries: true,
     onCompleted: () => {
       setShowDeleteModal(false)
 
@@ -89,7 +95,8 @@ const ManageCollectionAssociation = () => {
       })
 
       setCollectionConceptIds([])
-      refetch() // Refetch the data to update the associated collections list
+      console.log('refetching in onComplete in ManageCollectionAssociation....')
+      refetch()
     },
     onError: () => {
       setShowDeleteModal(false)

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

@@ -226,14 +226,15 @@ describe('ManageCollectionAssociation', () => {
     describe('when selecting Yes in the modal and results in a success ', () => {
       test('should remove the deleted collection', async () => {
         const { user } = setup({
-          overrideMocks: [
-            deletedAssociationResponse,
+          additionalMocks: [
             deleteAssociationResponse,
+            deletedAssociationResponse,
             deletedAssociationResponse
           ]
         })
+        await screen.findByText('Showing 2 Collection Associations')
 
-        const checkboxes = await screen.findAllByRole('checkbox')
+        const checkboxes = screen.queryAllByRole('checkbox')
         const firstCheckbox = checkboxes[0]
 
         await user.click(firstCheckbox)
@@ -247,6 +248,7 @@ describe('ManageCollectionAssociation', () => {
         const yesButton = screen.getByRole('button', { name: 'Yes' })
         await user.click(yesButton)
 
+        await screen.findByText('Showing 1 Collection Association')
         expect(screen.getByText('CIESIN_SEDAC_ESI_2001')).toBeInTheDocument()
       })
     })