chore: remove v1 location endpoints from gateway

CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## 2.0.0 Release Candidate
 
+### Breaking changes
+
+- **Removed following endpoints from gateway:**
+  | Path | Method |
+  |--------------------|--------|
+  | `/location` | `*` |
+  | `/location/{id}` | `*` |
+  | `/locations` | `GET` |
+  | `/locations` | `POST` |
+  | `/locations/{id}` | `*` |
+
 ### New features
 
 #### HTTP Input

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_MAP } from '../.storybook/default-request-handlers'
+import { V2_DEFAULT_MOCK_LOCATIONS_MAP } from '@client/tests/v2-events/locations-mock'
 
 const generator = testDataGenerator()
 

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

@@ -28,9 +28,11 @@ import {
   footballClubMembershipEvent,
   libraryMembershipEvent,
   LocationType,
-  TestUserRole
+  TestUserRole,
+  Location
 } from '@opencrvs/commons/client'
 import { testDataGenerator } from '@client/tests/test-data-generators'
+import { V2_DEFAULT_MOCK_LOCATIONS } from '@client/tests/v2-events/locations-mock'
 
 async function ensureCacheExists(cacheName: string) {
   const cacheNames = await caches.keys()
@@ -55,169 +57,6 @@ const tRPCMsw = createTRPCMsw<AppRouter>({
   transformer: { input: superjson, output: superjson }
 })
 
-export const V2_DEFAULT_MOCK_LOCATIONS = [
-  {
-    id: 'a45b982a-5c7b-4bd9-8fd8-a42d0994054c' as UUID,
-    name: 'Central',
-    locationType: LocationType.enum.ADMIN_STRUCTURE,
-    parentId: null,
-    validUntil: null
-  },
-  {
-    id: 'c599b691-fd2d-45e1-abf4-d185de727fb5' as UUID,
-    name: 'Sulaka',
-    locationType: LocationType.enum.ADMIN_STRUCTURE,
-    parentId: null,
-    validUntil: null
-  },
-  {
-    id: '7ef2b9c7-5e6d-49f6-ae05-656207d0fc64' as UUID,
-    name: 'Pualula',
-    locationType: LocationType.enum.ADMIN_STRUCTURE,
-    parentId: null,
-    validUntil: null
-  },
-  {
-    id: '6d1a59df-988c-4021-a846-ccbc021931a7' as UUID,
-    name: 'Chuminga',
-    locationType: LocationType.enum.ADMIN_STRUCTURE,
-    parentId: null,
-    validUntil: null
-  },
-  {
-    id: '62a0ccb4-880d-4f30-8882-f256007dfff9' as UUID,
-    name: 'Ibombo',
-    locationType: LocationType.enum.ADMIN_STRUCTURE,
-    parentId: 'a45b982a-5c7b-4bd9-8fd8-a42d0994054c' as UUID,
-    validUntil: null
-  },
-  {
-    // @NOTE: This happens to map to a valid location in events test environment. Updating it will break tests.
-    // @TODO:  Find a way to give out context aware mock values in the future.
-    id: '27160bbd-32d1-4625-812f-860226bfb92a' as UUID,
-    name: 'Isango',
-    locationType: LocationType.enum.ADMIN_STRUCTURE,
-    parentId: 'a45b982a-5c7b-4bd9-8fd8-a42d0994054c' as UUID,
-    validUntil: null
-  },
-  {
-    id: '967032fd-3f81-478a-826c-30cb8fe121bd' as UUID,
-    name: 'Isamba',
-    locationType: LocationType.enum.ADMIN_STRUCTURE,
-    parentId: 'a45b982a-5c7b-4bd9-8fd8-a42d0994054c' as UUID,
-    validUntil: null
-  },
-  {
-    id: '89a33893-b17d-481d-a26d-6461e7ac1651' as UUID,
-    name: 'Itambo',
-    locationType: LocationType.enum.ADMIN_STRUCTURE,
-    parentId: 'a45b982a-5c7b-4bd9-8fd8-a42d0994054c' as UUID,
-    validUntil: null
-  },
-  {
-    id: 'd42ab2fe-e7ed-470e-8b31-4fb27f9b8250' as UUID,
-    name: 'Ezhi',
-    locationType: LocationType.enum.ADMIN_STRUCTURE,
-    parentId: 'a45b982a-5c7b-4bd9-8fd8-a42d0994054c' as UUID,
-    validUntil: null
-  },
-  {
-    id: '423d000f-101b-47c0-8b86-21a908067cee' as UUID,
-    name: 'Chamakubi Health Post',
-    locationType: LocationType.enum.HEALTH_FACILITY,
-    parentId: '62a0ccb4-880d-4f30-8882-f256007dfff9' as UUID,
-    validUntil: null
-  },
-  {
-    id: '4d3279be-d026-420c-88f7-f0a4ae986973' as UUID,
-    name: 'Ibombo Rural Health Centre',
-    locationType: LocationType.enum.HEALTH_FACILITY,
-    parentId: '62a0ccb4-880d-4f30-8882-f256007dfff9' as UUID,
-    validUntil: null
-  },
-  {
-    id: '190902f4-1d77-476a-8947-41145af1db7d' as UUID,
-    name: 'Chikobo Rural Health Centre',
-    locationType: LocationType.enum.HEALTH_FACILITY,
-    parentId: '62a0ccb4-880d-4f30-8882-f256007dfff9' as UUID,
-    validUntil: null
-  },
-  {
-    id: 'f5ecbd9b-a01e-4a65-910e-70e86ab41b71' as UUID,
-    name: 'Chilochabalenje Health Post',
-    locationType: LocationType.enum.HEALTH_FACILITY,
-    parentId: '62a0ccb4-880d-4f30-8882-f256007dfff9' as UUID,
-    validUntil: null
-  },
-  {
-    id: 'dbfc178f-7295-4b90-b28d-111c95b03127' as UUID,
-    name: 'Chipeso Rural Health Centre',
-    locationType: LocationType.enum.HEALTH_FACILITY,
-    parentId: '62a0ccb4-880d-4f30-8882-f256007dfff9' as UUID,
-    validUntil: null
-  },
-  {
-    id: '09862bfe-c7ac-46cd-987b-668681533c80' as UUID,
-    name: 'Chisamba Rural Health Centre',
-    locationType: LocationType.enum.HEALTH_FACILITY,
-    parentId: '62a0ccb4-880d-4f30-8882-f256007dfff9' as UUID,
-    validUntil: null
-  },
-  {
-    id: '834ce389-e95b-4fb0-96a0-33e9ab323059' as UUID,
-    name: 'Chitanda Rural Health Centre',
-    locationType: LocationType.enum.HEALTH_FACILITY,
-    parentId: '62a0ccb4-880d-4f30-8882-f256007dfff9' as UUID,
-    validUntil: null
-  },
-  {
-    id: '0431c433-6062-4a4c-aee9-25271aec61ee' as UUID,
-    name: 'Golden Valley Rural Health Centre',
-    locationType: LocationType.enum.HEALTH_FACILITY,
-    parentId: '62a0ccb4-880d-4f30-8882-f256007dfff9' as UUID,
-    validUntil: null
-  },
-  {
-    id: 'bc84d0b6-7ba7-480d-a339-5d9920d90eb2' as UUID,
-    name: 'Ipongo Rural Health Centre',
-    locationType: LocationType.enum.HEALTH_FACILITY,
-    parentId: '62a0ccb4-880d-4f30-8882-f256007dfff9' as UUID,
-    validUntil: null
-  },
-  {
-    id: '4cf1f53b-b730-41d2-8649-dff7eeed970d' as UUID,
-    name: 'Itumbwe Health Post',
-    locationType: LocationType.enum.HEALTH_FACILITY,
-    parentId: '62a0ccb4-880d-4f30-8882-f256007dfff9' as UUID,
-    validUntil: null
-  },
-  {
-    id: '4b3676cb-9355-4942-9eb9-2ce46acaf0e0' as UUID,
-    name: 'Kabangalala Rural Health Centre',
-    locationType: LocationType.enum.HEALTH_FACILITY,
-    parentId: '62a0ccb4-880d-4f30-8882-f256007dfff9' as UUID,
-    validUntil: null
-  },
-  {
-    id: '028d2c85-ca31-426d-b5d1-2cef545a4902' as UUID,
-    name: 'Ibombo District Office',
-    locationType: LocationType.enum.CRVS_OFFICE,
-    parentId: '62a0ccb4-880d-4f30-8882-f256007dfff9' as UUID,
-    validUntil: null
-  },
-  {
-    id: '62a0ccb4-4f30-4f30-8882-f256007dff9f' as UUID,
-    name: 'Isamba District Office',
-    locationType: LocationType.enum.CRVS_OFFICE,
-    parentId: '967032fd-3f81-478a-826c-30cb8fe121bd' as UUID,
-    validUntil: null
-  }
-]
-
-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/src/App.test.tsx

@@ -13,7 +13,6 @@ import { createTestApp, flushPromises, getItem } from '@client/tests/util'
 import * as actions from '@client/notification/actions'
 import { AppStore } from '@client/store'
 import { createClient } from '@client/utils/apolloClient'
-import { referenceApi } from '@client/utils/referenceApi'
 import { ReactWrapper } from 'enzyme'
 import { vi } from 'vitest'
 import { waitFor } from './tests/wait-for-element'
@@ -110,16 +109,4 @@ describe('when user has a valid token in local storage', () => {
     await flushPromises()
     expect(assign.mock.calls).toHaveLength(0)
   })
-
-  it('loads languages, facilities and locations on startup', async () => {
-    const loadFacilities = vi.spyOn(referenceApi, 'loadFacilities')
-    const loadContent = vi.spyOn(referenceApi, 'loadContent')
-    const loadLocations = vi.spyOn(referenceApi, 'loadLocations')
-
-    createTestApp()
-    await flushPromises()
-    expect(loadFacilities).toHaveBeenCalled()
-    expect(loadContent).toHaveBeenCalled()
-    expect(loadLocations).toHaveBeenCalled()
-  })
 })

packages/client/src/App.tsx

@@ -74,6 +74,7 @@ import { UserList } from './views/SysAdmin/Team/user/UserList'
 import VSExport from './views/SysAdmin/Vsexports/VSExport'
 import { UserAudit } from './views/UserAudit/UserAudit'
 import { config } from './config'
+import { TRPCProvider } from './v2-events/trpc'
 
 // Injecting global styles for the body tag - used only once
 const GlobalStyle = createGlobalStyle`
@@ -299,14 +300,6 @@ export const routesConfig = turnOffV2Events
             path: routes.PERFORMANCE_FIELD_AGENT_LIST,
             element: <FieldAgentList />
           },
-          {
-            path: routes.PERFORMANCE_HOME,
-            element: (
-              <ProtectedRoute scopes={[SCOPES.PERFORMANCE_READ]}>
-                <PerformanceHome />
-              </ProtectedRoute>
-            )
-          },
           {
             path: routes.EVENT_COMPLETENESS_RATES,
             element: <CompletenessRates />
@@ -331,19 +324,35 @@ export const routesConfig = turnOffV2Events
           },
           {
             path: routes.CREATE_USER_ON_LOCATION,
-            element: <CreateNewUser />
+            element: (
+              <TRPCProvider>
+                <CreateNewUser />
+              </TRPCProvider>
+            )
           },
           {
             path: routes.CREATE_USER_SECTION,
-            element: <CreateNewUser />
+            element: (
+              <TRPCProvider>
+                <CreateNewUser />
+              </TRPCProvider>
+            )
           },
           {
             path: routes.REVIEW_USER_FORM,
-            element: <CreateNewUser />
+            element: (
+              <TRPCProvider>
+                <CreateNewUser />
+              </TRPCProvider>
+            )
           },
           {
             path: routes.REVIEW_USER_DETAILS,
-            element: <CreateNewUser />
+            element: (
+              <TRPCProvider>
+                <CreateNewUser />
+              </TRPCProvider>
+            )
           }
         ]
       }
@@ -399,14 +408,6 @@ export const routesConfig = turnOffV2Events
             path: routes.PERFORMANCE_FIELD_AGENT_LIST,
             element: <FieldAgentList />
           },
-          {
-            path: routes.PERFORMANCE_HOME,
-            element: (
-              <ProtectedRoute scopes={[SCOPES.PERFORMANCE_READ]}>
-                <PerformanceHome />
-              </ProtectedRoute>
-            )
-          },
           {
             path: routes.EVENT_COMPLETENESS_RATES,
             element: <CompletenessRates />
@@ -431,19 +432,35 @@ export const routesConfig = turnOffV2Events
           },
           {
             path: routes.CREATE_USER_ON_LOCATION,
-            element: <CreateNewUser />
+            element: (
+              <TRPCProvider>
+                <CreateNewUser />
+              </TRPCProvider>
+            )
           },
           {
             path: routes.CREATE_USER_SECTION,
-            element: <CreateNewUser />
+            element: (
+              <TRPCProvider>
+                <CreateNewUser />
+              </TRPCProvider>
+            )
           },
           {
             path: routes.REVIEW_USER_FORM,
-            element: <CreateNewUser />
+            element: (
+              <TRPCProvider>
+                <CreateNewUser />
+              </TRPCProvider>
+            )
           },
           {
             path: routes.REVIEW_USER_DETAILS,
-            element: <CreateNewUser />
+            element: (
+              <TRPCProvider>
+                <CreateNewUser />
+              </TRPCProvider>
+            )
           }
         ]
       }

packages/client/src/components/LocationPicker.test.tsx

@@ -8,12 +8,13 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
+
+import { vi, beforeEach, afterEach, describe, it, expect } from 'vitest'
 import { AppStore, createStore } from '@client/store'
 import { createTestComponent, flushPromises } from '@client/tests/util'
 import { waitForElement } from '@client/tests/wait-for-element'
 import { ReactWrapper } from 'enzyme'
 import React from 'react'
-import { vi } from 'vitest'
 import { LocationPicker } from './LocationPicker'
 
 describe('location picker tests', () => {
@@ -29,7 +30,7 @@ describe('location picker tests', () => {
   beforeEach(async () => {
     const { component: testComponent } = await createTestComponent(
       <LocationPicker
-        selectedLocationId="bfe8306c-0910-48fe-8bf5-0db906cf3155"
+        selectedLocationId="028d2c85-ca31-426d-b5d1-2cef545a4902"
         onChangeLocation={onChangeLocationMock}
       />,
       { store },
@@ -48,7 +49,7 @@ describe('location picker tests', () => {
       '#location-range-picker-action'
     )
 
-    expect(actionElement.hostNodes().text()).toBe('Baniajan Union')
+    expect(actionElement.hostNodes().text()).toBe('Ibombo District Office')
   })
 
   it('focuses input on click action', async () => {