feat: #6470 don't double save changes (#6476)

* feat: #6470 don't double save changes

* chore: pre-push fixes

* feat: #6470 refetch developer

packages/developer-portal/src/components/pages/apps/page/__tests__/submit-review-modal.test.tsx

@@ -3,7 +3,6 @@ import React from 'react'
 import { CurrentMemberRootState } from '../../../../../reducers/current-member'
 import { developerStub } from '../../../../../sagas/__stubs__/developer'
 import { reduxTestState, render } from '../../../../../tests/react-testing'
-import { defaultAppSavingParams } from '../../state/defaults'
 import { getTitle, handleCloseModal, SubmitReviewModal } from '../submit-review-modal'
 
 const mockUpdateDeveloper = jest.fn()
@@ -51,12 +50,20 @@ describe('SubmitReviewModal', () => {
         },
       },
     })
-    expect(render(<SubmitReviewModal closeModal={jest.fn()} developer={developerStub} />)).toMatchSnapshot()
+    expect(
+      render(<SubmitReviewModal closeModal={jest.fn()} developer={developerStub} refetchDeveloper={jest.fn()} />),
+    ).toMatchSnapshot()
   })
 
   it('should match a snapshot where a customer and status is pending', () => {
     expect(
-      render(<SubmitReviewModal closeModal={jest.fn()} developer={{ ...developerStub, status: 'pending' }} />),
+      render(
+        <SubmitReviewModal
+          closeModal={jest.fn()}
+          developer={{ ...developerStub, status: 'pending' }}
+          refetchDeveloper={jest.fn()}
+        />,
+      ),
     ).toMatchSnapshot()
   })
 
@@ -69,7 +76,9 @@ describe('SubmitReviewModal', () => {
         },
       } as CurrentMemberRootState,
     })
-    expect(render(<SubmitReviewModal closeModal={jest.fn()} developer={developerStub} />)).toMatchSnapshot()
+    expect(
+      render(<SubmitReviewModal closeModal={jest.fn()} developer={developerStub} refetchDeveloper={jest.fn()} />),
+    ).toMatchSnapshot()
   })
 
   it('should match a snapshot where a customer and status is incomplete and user is an admin', () => {
@@ -81,7 +90,9 @@ describe('SubmitReviewModal', () => {
         },
       } as CurrentMemberRootState,
     })
-    expect(render(<SubmitReviewModal closeModal={jest.fn()} developer={developerStub} />)).toMatchSnapshot()
+    expect(
+      render(<SubmitReviewModal closeModal={jest.fn()} developer={developerStub} refetchDeveloper={jest.fn()} />),
+    ).toMatchSnapshot()
   })
 })
 
@@ -101,24 +112,20 @@ describe('getTitle', () => {
 
 describe('handleCloseModal', () => {
   it('should close the modal', () => {
-    const setAppEditSaving = jest.fn()
     const closeModal = jest.fn()
-    const curried = handleCloseModal(setAppEditSaving, closeModal, true)
+    const refetchDeveloper = jest.fn()
+    const curried = handleCloseModal(closeModal, refetchDeveloper, true)
     curried()
     expect(closeModal).toHaveBeenCalled()
-    expect(setAppEditSaving).toHaveBeenCalledWith({
-      ...defaultAppSavingParams,
-      isRevalidating: true,
-      isListed: true,
-    })
+    expect(refetchDeveloper).toHaveBeenCalled()
   })
 
   it('should not close the modal', () => {
-    const setAppEditSaving = jest.fn()
     const closeModal = jest.fn()
-    const curried = handleCloseModal(setAppEditSaving, closeModal, false)
+    const refetchDeveloper = jest.fn()
+    const curried = handleCloseModal(closeModal, refetchDeveloper, false)
     curried()
     expect(closeModal).not.toHaveBeenCalled()
-    expect(setAppEditSaving).not.toHaveBeenCalled()
+    expect(refetchDeveloper).not.toHaveBeenCalled()
   })
 })

packages/developer-portal/src/components/pages/apps/page/helper.tsx

@@ -111,7 +111,7 @@ export const Helper: FC = () => {
     },
   })
 
-  const [developer] = useReapitGet<DeveloperModel>({
+  const [developer, , , refetchDeveloper] = useReapitGet<DeveloperModel>({
     reapitConnectBrowserSession,
     action: getActions(window.reapit.config.appEnv)[GetActionNames.getDeveloper],
     uriParams: {
@@ -235,7 +235,9 @@ export const Helper: FC = () => {
           </>
         )}
         <Modal title={getTitle(isCustomer, developerStatus)}>
-          {developer && <SubmitReviewModal developer={developer} closeModal={closeModal} />}
+          {developer && (
+            <SubmitReviewModal developer={developer} closeModal={closeModal} refetchDeveloper={refetchDeveloper} />
+          )}
         </Modal>
       </div>
     )

packages/developer-portal/src/components/pages/apps/page/submit-review-modal.tsx

@@ -2,7 +2,7 @@ import { useReapitConnect } from '@reapit/connect-session'
 import { BodyText, InputGroup, ButtonGroup, Button, Table, elMb6 } from '@reapit/elements'
 import { useReapitGet, useReapitUpdate } from '@reapit/utils-react'
 import { GetActionNames, getActions, UpdateActionNames, updateActions } from '@reapit/utils-common'
-import React, { Dispatch, FC, SetStateAction, useEffect } from 'react'
+import React, { FC, useEffect } from 'react'
 import { useSelector } from 'react-redux'
 import { reapitConnectBrowserSession } from '../../../../core/connect-session'
 import { selectIsCustomer } from '../../../../selector/auth'
@@ -12,12 +12,11 @@ import { useForm } from 'react-hook-form'
 import { object, SchemaOf, string } from 'yup'
 import errorMessages from '../../../../constants/error-messages'
 import { yupResolver } from '@hookform/resolvers/yup'
-import { AppSavingParams, useAppState } from '../state/use-app-state'
-import { defaultAppSavingParams } from '../state/defaults'
 
 interface SubmitReviewModalProps {
   developer: DeveloperModel
   closeModal: () => void
+  refetchDeveloper: () => void
 }
 
 const schema: SchemaOf<{ reapitReference: string }> = object().shape({
@@ -38,26 +37,14 @@ export const getTitle = (isCustomer: boolean, orgStatus?: string): string => {
 }
 
 export const handleCloseModal =
-  (
-    setAppEditSaving: Dispatch<SetStateAction<AppSavingParams>>,
-    closeModal: () => void,
-    updateDeveloperSuccess?: boolean,
-  ) =>
-  () => {
+  (closeModal: () => void, refetchDeveloper: () => void, updateDeveloperSuccess?: boolean) => () => {
     if (updateDeveloperSuccess) {
-      setAppEditSaving({
-        ...defaultAppSavingParams,
-        isRevalidating: true,
-        isListed: true,
-      })
-
       closeModal()
+      refetchDeveloper()
     }
   }
 
-export const SubmitReviewModal: FC<SubmitReviewModalProps> = ({ closeModal, developer }) => {
-  const { appEditState } = useAppState()
-
+export const SubmitReviewModal: FC<SubmitReviewModalProps> = ({ closeModal, refetchDeveloper, developer }) => {
   const {
     register,
     handleSubmit,
@@ -74,7 +61,6 @@ export const SubmitReviewModal: FC<SubmitReviewModalProps> = ({ closeModal, deve
 
   const { connectSession } = useReapitConnect(reapitConnectBrowserSession)
   const currentUser = useSelector(selectCurrentMemberData)
-  const { setAppEditSaving } = appEditState
 
   const [members] = useReapitGet<MemberModelPagedResult>({
     reapitConnectBrowserSession,
@@ -101,7 +87,7 @@ export const SubmitReviewModal: FC<SubmitReviewModalProps> = ({ closeModal, deve
     },
   })
 
-  useEffect(handleCloseModal(setAppEditSaving, closeModal, updateDeveloperSuccess), [updateDeveloperSuccess])
+  useEffect(handleCloseModal(closeModal, refetchDeveloper, updateDeveloperSuccess), [updateDeveloperSuccess])
 
   const isCustomer = selectIsCustomer(connectSession)
   const userRole = currentUser.role