refactor

Author: tareq89

packages/client/src/v2-events/components/DownloadButton.tsx

@@ -99,7 +99,7 @@ export function DownloadButton({
   )
   const assignmentStatus = getAssignmentStatus(event, authentication.sub)
 
-  const eventDocument = getEvent.findFromCache(event.id)
+  const eventDocument = getEvent.useFindEventFromCache(event.id)
   const isAssignMutationFetching = actions.assignment.assign.useIsAssigning(
     event.id
   )

packages/client/src/v2-events/components/forms/FormFieldGenerator/FormFieldGenerator.tsx

@@ -135,6 +135,8 @@ export const FormFieldGenerator: React.FC<FormFieldGeneratorProps> = React.memo(
         {(formikProps) => {
           const { touched } = formikProps
 
+          // Because react Hook "useEffect" cannot be called inside a callback,
+          // we disable the rule for this line
           // eslint-disable-next-line react-hooks/rules-of-hooks
           useEffect(() => {
             /**

packages/client/src/v2-events/features/drafts/useDrafts.ts

@@ -12,20 +12,14 @@
 import { useMutation, useSuspenseQuery } from '@tanstack/react-query'
 import { create } from 'zustand'
 import { createJSONStorage, persist } from 'zustand/middleware'
-import {
-  ActionDocument,
-  deepDropNulls,
-  Draft,
-  UUID
-} from '@opencrvs/commons/client'
+import { deepDropNulls, Draft, UUID } from '@opencrvs/commons/client'
 import { storage } from '@client/storage'
 import {
   clearPendingDraftCreationRequests,
   findLocalEventDocument,
   refetchDraftsList,
   refetchAllSearchQueries,
-  setDraftData,
-  updateLocalEventIndex
+  setDraftData
 } from '@client/v2-events/features/events/useEvents/api'
 import {
   createEventActionMutationFn,
@@ -239,10 +233,10 @@ export function useDrafts() {
       })
     },
     useRemoteDrafts,
-    getRemoteDraftByEventId: function useDraftList(
+    useGetRemoteDraftByEventId: (
       eventId: string,
       additionalOptions: QueryOptions<typeof trpc.event.draft.list> = {}
-    ): Draft | undefined {
+    ): Draft | undefined => {
       const eventDrafts = useRemoteDrafts(additionalOptions).filter(
         (draft) => draft.eventId === eventId
       )

packages/client/src/v2-events/features/events/ReadOnlyView.tsx

@@ -36,7 +36,7 @@ import { removeCachedFiles } from '../files/cache'
 function ReadonlyView() {
   const { eventId } = useTypedParams(ROUTES.V2.EVENTS.DECLARE.REVIEW)
   const events = useEvents()
-  const event = events.getEvent.viewEvent(eventId)
+  const event = events.getEvent.useViewEvent(eventId)
   const validatorContext = useValidatorContext()
 
   const maybeAuth = useAuthentication()
@@ -45,8 +45,8 @@ function ReadonlyView() {
     'Authentication is not available but is required'
   )
 
-  const { getRemoteDraftByEventId } = useDrafts()
-  const draft = getRemoteDraftByEventId(event.id)
+  const { useGetRemoteDraftByEventId } = useDrafts()
+  const draft = useGetRemoteDraftByEventId(event.id)
   const { eventConfiguration: configuration } = useEventConfiguration(
     event.type
   )

packages/client/src/v2-events/features/events/actions/correct/request/Onboarding/Onboarding.tsx

@@ -46,7 +46,7 @@ export function Onboarding() {
   const annotation = useActionAnnotation((state) => state.getAnnotation())
   const setAnnotation = useActionAnnotation((state) => state.setAnnotation)
 
-  const event = events.getEvent.getFromCache(eventId)
+  const event = events.getEvent.useGetEventFromCache(eventId)
 
   const navigate = useNavigate()
   const intl = useIntl()

packages/client/src/v2-events/features/events/actions/correct/request/Pages.tsx

@@ -50,7 +50,7 @@ export function Pages() {
   const events = useEvents()
   const { modal } = useEventFormNavigation()
 
-  const event = events.getEvent.getFromCache(eventId)
+  const event = events.getEvent.useGetEventFromCache(eventId)
 
   const { eventConfiguration: configuration } = useEventConfiguration(
     event.type

packages/client/src/v2-events/features/events/actions/correct/request/Review.tsx

@@ -44,7 +44,7 @@ export function Review() {
   const events = useEvents()
   const validatorContext = useValidatorContext()
 
-  const event = events.getEvent.getFromCache(eventId)
+  const event = events.getEvent.useGetEventFromCache(eventId)
 
   const { eventConfiguration: configuration } = useEventConfiguration(
     event.type

packages/client/src/v2-events/features/events/actions/correct/request/Summary/Summary.tsx

@@ -87,7 +87,7 @@ export function Summary() {
   const intl = useIntl()
 
   const events = useEvents()
-  const event = events.getEvent.getFromCache(eventId)
+  const event = events.getEvent.useGetEventFromCache(eventId)
   const { eventConfiguration } = useEventConfiguration(event.type)
   const eventIndex = getCurrentEventState(event, eventConfiguration)
   const togglePrompt = () => setShowPrompt(!showPrompt)

packages/client/src/v2-events/features/events/actions/correct/review/Review.tsx

@@ -34,7 +34,7 @@ export function Review() {
   const events = useEvents()
 
   const validatorContext = useValidatorContext()
-  const event = events.getEvent.getFromCache(eventId)
+  const event = events.getEvent.useGetEventFromCache(eventId)
 
   const { eventConfiguration: configuration } = useEventConfiguration(
     event.type

packages/client/src/v2-events/features/events/actions/correct/review/ReviewCorrection.tsx

@@ -236,7 +236,7 @@ export function ReviewCorrection({
   )
 
   const events = useEvents()
-  const event = events.getEvent.getFromCache(eventId)
+  const event = events.getEvent.useGetEventFromCache(eventId)
   const { isActionAllowed } = useUserAllowedActions(event.type)
   const [modal, openModal] = useModal()
   const navigate = useNavigate()