Merge pull request #11135 from opencrvs/ocrvs-11068

chore: remove v1 location references from v2-events

Author: jamil314

packages/client/.storybook/decorators.tsx

@@ -19,7 +19,7 @@ import {
 } from '@opencrvs/commons/client'
 import { testDataGenerator } from '@client/tests/test-data-generators'
 import { getLeafLocationIds } from '@client/v2-events/hooks/useLocations'
-import { V2_DEFAULT_MOCK_LOCATIONS } from '../.storybook/default-request-handlers'
+import { V2_DEFAULT_MOCK_LOCATIONS_MAP } from '../.storybook/default-request-handlers'
 
 const generator = testDataGenerator()
 
@@ -76,7 +76,7 @@ export function getTestValidatorContext(userRole?: TestUserRole) {
   )
 
   const leafAdminStructureLocationIds = getLeafLocationIds(
-    V2_DEFAULT_MOCK_LOCATIONS,
+    V2_DEFAULT_MOCK_LOCATIONS_MAP,
     [LocationType.enum.ADMIN_STRUCTURE]
   )
 

packages/client/.storybook/default-request-handlers.ts

@@ -214,6 +214,10 @@ export const V2_DEFAULT_MOCK_LOCATIONS = [
   }
 ]
 
+export const V2_DEFAULT_MOCK_LOCATIONS_MAP = new Map(
+  V2_DEFAULT_MOCK_LOCATIONS.map((l) => [l.id, l])
+)
+
 export const handlers = {
   drafts: [
     tRPCMsw.event.draft.list.query(() => {

packages/client/.storybook/preview.tsx

@@ -46,7 +46,8 @@ import {
   tennisClubMembershipEvent,
   TestUserRole,
   TokenUserType,
-  UUID
+  UUID,
+  ChildOnboardingEvent
 } from '@opencrvs/commons/client'
 import {
   tennisClubMembershipEventDocument,
@@ -289,7 +290,10 @@ const preview: Preview = {
        */
 
       const offlineConfigs: Array<EventConfig> = options.parameters?.offline
-        ?.configs ?? [tennisClubMembershipEventWithCustomAction]
+        ?.configs ?? [
+        tennisClubMembershipEventWithCustomAction,
+        ChildOnboardingEvent
+      ]
 
       offlineConfigs.forEach((config) => {
         addLocalEventConfig(config)

packages/client/src/offline/selectors.ts

@@ -8,17 +8,10 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import {
-  IOfflineDataState,
-  IOfflineData,
-  CRVSOffice,
-  AdminStructure,
-  Facility
-} from '@client/offline/reducer'
+import { IOfflineDataState, IOfflineData } from '@client/offline/reducer'
 import { IStoreState } from '@client/store'
 import { createSelector } from '@reduxjs/toolkit'
 import { merge } from 'lodash'
-import { IndexMap } from '@client/utils'
 
 const getOfflineState = (store: IStoreState): IOfflineDataState => store.offline
 
@@ -62,14 +55,6 @@ export const getCertificateTemplates = createSelector(
   getOfflineData,
   (data) => data.templates.certificates
 )
-export const getLocations = createSelector(
-  getOfflineData,
-  (data): IndexMap<AdminStructure | Facility | CRVSOffice> => ({
-    ...data.locations,
-    ...data.facilities,
-    ...data.offices
-  })
-)
 export const getCountryLogoFile = createSelector(
   getOfflineData,
   (data) => data.config.COUNTRY_LOGO.file

packages/client/src/tests/__snapshots__/token-generator.test.ts.snap

@@ -14,12 +14,14 @@ import {
   ActionType,
   generateActionDocument,
   tennisClubMembershipEvent,
+  ChildOnboardingEvent,
   TestUserRole,
   TokenUserType,
   generateUuid,
   createPrng,
   Draft,
-  EventState
+  EventState,
+  UUID
 } from '@opencrvs/commons/client'
 import { ROUTES } from '@client/v2-events/routes'
 import { router } from './router'
@@ -204,3 +206,73 @@ export const SummaryChangingAgeToDob: Story = {
     }
   }
 }
+
+const eventCorrectionAddress = {
+  trackingId: generateUuid(prng),
+  type: ChildOnboardingEvent.id,
+  id: generateUuid(prng),
+  createdAt: new Date().toISOString(),
+  updatedAt: new Date().toISOString(),
+  actions: [
+    generateActionDocument({
+      configuration: ChildOnboardingEvent,
+      action: ActionType.CREATE
+    }),
+    generateActionDocument({
+      configuration: ChildOnboardingEvent,
+      action: ActionType.DECLARE
+    }),
+    generateActionDocument({
+      configuration: ChildOnboardingEvent,
+      action: ActionType.VALIDATE
+    }),
+    generateActionDocument({
+      configuration: ChildOnboardingEvent,
+      action: ActionType.REGISTER
+    })
+  ]
+}
+
+const correctionDraftAddress = {
+  id: generateUuid(prng),
+  transactionId: generateUuid(prng),
+  action: {
+    createdAt: new Date(Date.now()).toISOString(),
+    status: ActionStatus.Accepted,
+    transactionId: generateUuid(prng),
+    createdBy: generateUuid(prng),
+    createdByUserType: TokenUserType.enum.user,
+    createdByRole: TestUserRole.enum.FIELD_AGENT,
+    type: ActionType.REQUEST_CORRECTION,
+    declaration: {
+      'child.placeOfBirth': 'PRIVATE_HOME',
+      'child.birthLocation.privateHome': {
+        country: 'FAR',
+        addressType: 'DOMESTIC' as const,
+        administrativeArea: '62a0ccb4-880d-4f30-8882-f256007dfff9' as UUID
+      }
+    },
+    annotation: {}
+  },
+  createdAt: new Date(Date.now()).toISOString(),
+  eventId: eventCorrectionAddress.id
+} satisfies Draft
+
+export const SummaryChangingAddress: Story = {
+  parameters: {
+    mockingDate: new Date(),
+    offline: {
+      drafts: [correctionDraftAddress],
+      events: [eventCorrectionAddress]
+    },
+    reactRouter: {
+      router: {
+        path: '/',
+        children: [router]
+      },
+      initialPath: ROUTES.V2.EVENTS.REQUEST_CORRECTION.SUMMARY.buildPath({
+        eventId: eventCorrectionAddress.id
+      })
+    }
+  }
+}

packages/client/src/tests/test-data-generators.ts

@@ -12,7 +12,6 @@ import * as React from 'react'
 import styled from 'styled-components'
 import { defineMessages, IntlShape, useIntl } from 'react-intl'
 import { useNavigate } from 'react-router-dom'
-import { useSelector } from 'react-redux'
 import format from 'date-fns/format'
 import { Table } from '@opencrvs/components/lib/Table'
 import { Text } from '@opencrvs/components/lib/Text'
@@ -23,11 +22,13 @@ import {
   EventState,
   isFieldVisible,
   isPageVisible,
+  Location,
   PageConfig,
   PageTypes,
   RequestedCorrectionAction,
   TranslationConfig,
   User,
+  UUID,
   ValidatorContext
 } from '@opencrvs/commons/client'
 import { ColumnContentAlignment, Link } from '@opencrvs/components'
@@ -41,7 +42,7 @@ import {
 import { ROUTES } from '@client/v2-events/routes'
 import { useUsers } from '@client/v2-events/hooks/useUsers'
 import { getUsersFullName } from '@client/v2-events/utils'
-import { getLocations } from '@client/offline/selectors'
+import { useLocations } from '@client/v2-events/hooks/useLocations'
 import { DeclarationComparisonTable } from './DeclarationComparisonTable'
 
 const messages = defineMessages({
@@ -80,14 +81,13 @@ const Label = styled.label`
 function getRequestActionDetails(
   correctionRequestAction: Action,
   users: User[],
-  locations: ReturnType<typeof getLocations>,
+  locations: Map<UUID, Location>,
   intl: IntlShape
 ): CorrectionDetail[] {
   const user = users.find((u) => u.id === correctionRequestAction.createdBy)
   const location =
     correctionRequestAction.createdAtLocation &&
-    locations[correctionRequestAction.createdAtLocation]
-
+    locations.get(correctionRequestAction.createdAtLocation)
   return [
     {
       label: messages.correctionSubmittedBy,
@@ -116,7 +116,7 @@ function buildCorrectionDetails(
   form: EventState,
   intl: IntlShape,
   users: User[],
-  locations: ReturnType<typeof getLocations>,
+  locations: Map<UUID, Location>,
   validatorContext: ValidatorContext,
   correctionRequestAction?: Action
 ): CorrectionDetail[] {
@@ -211,7 +211,9 @@ export function CorrectionDetails({
   const navigate = useNavigate()
   const { getUser } = useUsers()
   const users = getUser.getAllCached()
-  const locations = useSelector(getLocations)
+
+  const { getLocations } = useLocations()
+  const locations = getLocations.useSuspenseQuery()
 
   const correctionFormPages =
     eventConfiguration.actions.find(

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

@@ -171,7 +171,7 @@ export function Review() {
   const [users] = getUsers.useSuspenseQuery(userIds)
 
   const { getLocations } = useLocations()
-  const [locations] = getLocations.useSuspenseQuery()
+  const locations = getLocations.useSuspenseQuery()
 
   const { certificateTemplates, language } = useAppConfig()
   const certificateConfig = certificateTemplates.find(

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

@@ -104,7 +104,7 @@ describe('stringifyEventMetadata', () => {
         modifiedAt: new Date(2000, 1, 2).toISOString(),
         copiesPrintedForTemplate: 1
       },
-      locations,
+      locations: new Map(locations.map((loc) => [loc.id, loc])),
       users,
       intl: createIntl({ locale: 'en' }),
       adminLevels
@@ -186,7 +186,7 @@ function expectRenderOutput(template: string, output: string) {
       }
     },
     review: false,
-    locations: [],
+    locations: new Map(),
     users: [registrar.v2],
     language: { lang: 'en', messages: {} },
     config: tennisClubMembershipEvent,