chore: cleanup + tests

Signed-off-by: Mac Deluca <Mac.Deluca@quartech.com>

Author: MacDeluca

app/__tests__/bcsc-theme/hooks/useFilterServiceClients.test.ts

@@ -20,6 +20,7 @@ const mockServiceClientA: ClientMetadata = {
   suppress_bookmark_prompt: false,
   allowed_identification_processes: [BCSCCardProcess.BCSC],
   bc_address: true,
+  service_listing_sort_order: undefined,
 }
 
 const mockServiceClientB: ClientMetadata = {
@@ -32,6 +33,20 @@ const mockServiceClientB: ClientMetadata = {
   suppress_bookmark_prompt: false,
   allowed_identification_processes: [BCSCCardProcess.NonBCSC],
   bc_address: false,
+  service_listing_sort_order: undefined,
+}
+
+const mockServiceClientC: ClientMetadata = {
+  client_ref_id: 'test-client-id-c',
+  client_name: 'TEST CLIENT CHARLIE',
+  client_uri: 'https://test.client.c',
+  application_type: 'web',
+  claims_description: 'claims',
+  suppress_confirmation_info: false,
+  suppress_bookmark_prompt: false,
+  allowed_identification_processes: [BCSCCardProcess.NonBCSC],
+  bc_address: false,
+  service_listing_sort_order: 1,
 }
 
 describe('useFilterServiceClients', () => {
@@ -45,6 +60,29 @@ describe('useFilterServiceClients', () => {
       const useApiMock = jest.mocked(useApi)
       const navigationMock = jest.mocked(navigation)
 
+      useApiMock.default.mockReturnValue({
+        metadata: {
+          getClientMetadata: jest.fn().mockResolvedValue([mockServiceClientB, mockServiceClientA, mockServiceClientC]),
+        },
+      } as any)
+      navigationMock.useNavigation.mockReturnValue({ navigation: jest.fn() })
+      bifoldMock.useServices.mockReturnValue([{ error: jest.fn() }] as any)
+
+      const hook = renderHook(() => useFilterServiceClients({}))
+
+      await waitFor(() => {
+        expect(hook.result.current).toHaveLength(3)
+        expect(hook.result.current[0].client_ref_id).toBe(mockServiceClientC.client_ref_id)
+        expect(hook.result.current[1].client_ref_id).toBe(mockServiceClientA.client_ref_id)
+        expect(hook.result.current[2].client_ref_id).toBe(mockServiceClientB.client_ref_id)
+      })
+    })
+
+    it('should sort by sort order then name', async () => {
+      const bifoldMock = jest.mocked(Bifold)
+      const useApiMock = jest.mocked(useApi)
+      const navigationMock = jest.mocked(navigation)
+
       useApiMock.default.mockReturnValue({
         metadata: {
           getClientMetadata: jest.fn().mockResolvedValue([mockServiceClientA, mockServiceClientB]),

app/src/bcsc-theme/features/home/Home.tsx

@@ -1,14 +1,12 @@
 import TabScreenWrapper from '@/bcsc-theme/components/TabScreenWrapper'
-import { useStore, useTheme, useServices, TOKENS } from '@bifold/core'
+import { useTheme, useServices, TOKENS } from '@bifold/core'
 import React, { useEffect, useState } from 'react'
 import { ActivityIndicator, StyleSheet, View } from 'react-native'
 import HomeHeader from './components/HomeHeader'
 import SavedServices from './components/SavedServices'
 import SectionButton from '../../components/SectionButton'
 import { StackScreenProps } from '@react-navigation/stack'
 import { BCSCScreens, BCSCTabStackParams } from '@/bcsc-theme/types/navigators'
-import { BCState } from '@/store'
-import { mockServices } from '@/bcsc-theme/fixtures/services'
 import { UserInfoResponseData } from '@/bcsc-theme/api/hooks/useUserApi'
 import useApi from '@/bcsc-theme/api/hooks/useApi'
 import { NotificationBannerContainer } from './components/NotificationBannerContainer'
@@ -24,7 +22,6 @@ type HomeProps = StackScreenProps<BCSCTabStackParams, BCSCScreens.Home>
 
 const Home: React.FC<HomeProps> = ({ navigation }) => {
   const { Spacing } = useTheme()
-  const [store] = useStore<BCState>()
   const { user } = useApi()
   const [loading, setLoading] = useState(true)
   const [userInfo, setUserInfo] = useState<Partial<UserInfoResponseData>>({})

app/src/bcsc-theme/features/pairing/ManualPairing.tsx

@@ -15,7 +15,6 @@ import { useTranslation } from 'react-i18next'
 import { StyleSheet, View } from 'react-native'
 
 import useApi from '@/bcsc-theme/api/hooks/useApi'
-import { mockServices } from '@/bcsc-theme/fixtures/services'
 import { BCSCRootStackParams, BCSCScreens } from '@bcsc-theme/types/navigators'
 import PairingCodeTextInput from './components/PairingCodeTextInput'
 

app/src/bcsc-theme/features/services/hooks/useFilterServiceClients.ts

@@ -40,13 +40,14 @@ export interface ServiceClientsFilter {
    * @format uuid
    * @type {string[]}
    */
-  clientRefIdsFilter?: string[]
+  serviceClientIdsFilter?: string[]
 }
 
 /**
- * A custom hook to filter service clients based on various criteria such as name, card process, and BC address requirement.
+ * A custom hook to filter service clients based on various criteria such as name,
+ * card process, and BC address requirement. Sorted by numeric listing order and name.
  *
- * TODO (MD): This hook might need to either return the full data loader state (loading, error, etc.)
+ * TODO (MD): This hook will eventually need to return the data loader (loading, error, etc.)
  *
  * @param {ServiceClientsFilter} filter The filter criteria to apply to the service clients.
  * @returns {*} {ClientMetadata[]} The filtered list of service clients.
@@ -103,8 +104,8 @@ export const useFilterServiceClients = (filter: ServiceClientsFilter): ClientMet
     }
 
     // Filter services based on the provided IDs
-    if (filter.clientRefIdsFilter) {
-      const idsSet = new Set(filter.clientRefIdsFilter)
+    if (filter.serviceClientIdsFilter) {
+      const idsSet = new Set(filter.serviceClientIdsFilter)
       serviceClientsCopy = serviceClientsCopy.filter((service) => idsSet.has(service.client_ref_id))
     }
 
@@ -119,7 +120,7 @@ export const useFilterServiceClients = (filter: ServiceClientsFilter): ClientMet
 
       return a.client_name.localeCompare(b.client_name)
     })
-  }, [serviceClients, filter.cardProcessFilter, filter.requireBCAddressFilter, filter.clientRefIdsFilter])
+  }, [serviceClients, filter.cardProcessFilter, filter.requireBCAddressFilter, filter.serviceClientIdsFilter])
 
   // Further filter services based on the partial name filter
   const queriedServiceClients = useMemo(() => {