Merge branch 'release-v1.9.1' into release-v1.9.2

Author: Zangetsu101

development-environment/reindex.sh

@@ -18,12 +18,31 @@ get_reindexing_token() {
 }
 
 trigger_reindex() {
-  local token
+  local token raw status body
   token=$(get_reindexing_token)
-  curl -s -f -X POST \
+
+  raw=$(curl -X POST \
     -H "Authorization: Bearer ${token}" \
     -H "Content-Type: application/json" \
-    "${EVENTS_URL%/}/events/reindex"
+    -w "\n%{http_code}" \
+    "${EVENTS_URL%/}/events/reindex" 2>&1)
+
+  status=$(echo "$raw" | tail -n1)
+  body=$(echo "$raw" | sed '$d')
+
+  if [[ "$status" == "000" ]]; then
+    echo "curl failed (connection or TLS error)"
+    echo "$body"
+    return 1
+  fi
+
+  if (( status >= 200 && status < 300 )); then
+    return 0
+  fi
+
+  echo "curl failed with status $status"
+  echo "$body"
+  return 1
 }
 
 reindexing_attempts=0

packages/client/.storybook/preview.tsx

@@ -22,7 +22,6 @@ import { useApolloClient } from '@client/utils/apolloClient'
 import { ApolloProvider } from '@client/utils/ApolloProvider'
 import { queryClient, TRPCProvider } from '@client/v2-events/trpc'
 import { Provider, useSelector } from 'react-redux'
-import { clear } from 'idb-keyval'
 import {
   createMemoryRouter,
   Outlet,
@@ -53,6 +52,7 @@ import {
 } from '@client/v2-events/features/events/fixtures'
 import { EventConfig } from '@opencrvs/commons/client'
 import { getUserDetails } from '@client/profile/profileSelectors'
+import { storage } from '@client/storage'
 
 WebFont.load({
   google: {
@@ -165,15 +165,6 @@ export const parameters = {
 
 const generator = testDataGenerator()
 
-/*
- * Clear all indexedDB databases before each story
- */
-export async function clearStorage() {
-  clear()
-}
-
-clearStorage()
-
 const preview: Preview = {
   loaders: [
     mswLoader,
@@ -197,7 +188,7 @@ const preview: Preview = {
       }
     },
     async (options) => {
-      await clearStorage()
+      await storage.clearStorage()
       queryClient.clear()
       const primaryOfficeId = '028d2c85-ca31-426d-b5d1-2cef545a4902' as UUID
 

packages/client/src/index.tsx

@@ -29,7 +29,7 @@ WebFont.load({
   }
 })
 
-storage.configStorage('OpenCRVS')
+storage.configStorage()
 
 const { store } = createStore()
 

packages/client/src/storage.ts

@@ -8,17 +8,37 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import { createStore, get, set, del, UseStore } from 'idb-keyval'
+import { createStore, get, set, del, entries, clear } from 'idb-keyval'
 import { validateApplicationVersion } from '@client/utils'
 
-let store: UseStore | undefined
-function configStorage(dbName: string) {
-  store = createStore(dbName, 'keyvaluepairs')
+const DATABASE_NAME = 'OpenCRVS'
+const STORE_NAME = 'keyvaluepairs'
+
+/**
+ * Create store when module is first loaded.
+ *
+ * Previously store was created on-demand, initiated at application root. (index.tsx).
+ * However, files are executed during import. React renders after everything is imported.
+ *
+ * There is no guarantee that application root is executed before other files that might use storage (e.g. useDrafts).
+ */
+let store = createStore(DATABASE_NAME, STORE_NAME)
+
+function configStorage() {
+  if (!store) {
+    store = createStore(DATABASE_NAME, STORE_NAME)
+  }
 
   validateApplicationVersion()
 }
 
 async function getItem<T = string>(key: string): Promise<T | null> {
+  if (!store) {
+    // eslint-disable-next-line no-console
+    console.error('IDB store not initialized before getItem:', key)
+    return null
+  }
+
   return (await get<T>(key, store)) || null
 }
 
@@ -30,8 +50,13 @@ async function removeItem(key: string) {
   return await del(key, store)
 }
 
+async function clearStorage() {
+  return clear(store)
+}
+
 export const storage = {
   configStorage,
+  clearStorage,
   getItem,
   setItem,
   removeItem

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

@@ -231,7 +231,7 @@ export function useDrafts() {
 
       createDraft.mutate({
         eventId: localDraft.eventId,
-        declaration: deepDropNulls(localDraft.action.declaration),
+        declaration: localDraft.action.declaration,
         annotation: deepDropNulls(localDraft.action.annotation),
         transactionId: localDraft.transactionId,
         type: localDraft.action.type,

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

@@ -21,7 +21,8 @@ import {
   generateEventDraftDocument,
   generateWorkqueues,
   getCurrentEventState,
-  tennisClubMembershipEvent
+  tennisClubMembershipEvent,
+  TestUserRole
 } from '@opencrvs/commons/client'
 import { AppRouter } from '@client/v2-events/trpc'
 import { ROUTES, routesConfig } from '@client/v2-events/routes'
@@ -72,17 +73,6 @@ const modifiedDraft = generateEventDraftDocument({
 })
 
 export const ViewRecordMenuItemInsideActionMenus: Story = {
-  loaders: [
-    async () => {
-      window.localStorage.setItem(
-        'opencrvs',
-        generator.user.token.localRegistrar
-      )
-      //  Intermittent failures starts to happen when global state gets out of whack.
-      // // This is a workaround to ensure that the state is reset when similar tests are run in parallel.
-      await new Promise((resolve) => setTimeout(resolve, 50))
-    }
-  ],
   play: async ({ canvasElement, step }) => {
     const canvas = within(canvasElement)
     await step('Finds view record menu item in action menu', async () => {
@@ -108,6 +98,7 @@ export const ViewRecordMenuItemInsideActionMenus: Story = {
     })
   },
   parameters: {
+    userRole: TestUserRole.enum.LOCAL_REGISTRAR,
     reactRouter: {
       router: routesConfig,
       initialPath: ROUTES.V2.EVENTS.OVERVIEW.buildPath({

packages/client/src/v2-events/features/events/components/Action/DeclarationAction.tsx

@@ -16,7 +16,6 @@ import {
   Draft,
   createEmptyDraft,
   findActiveDraftForEvent,
-  dangerouslyGetCurrentEventStateWithDrafts,
   getActionAnnotation,
   ActionType,
   deepMerge,
@@ -26,7 +25,8 @@ import {
   EventDocument,
   EventConfig,
   getAvailableActionsForEvent,
-  getCurrentEventState
+  getCurrentEventState,
+  applyDraftToEventIndex
 } from '@opencrvs/commons/client'
 import { withSuspense } from '@client/v2-events/components/withSuspense'
 import { useEventFormData } from '@client/v2-events/features/events/useEventFormData'
@@ -190,14 +190,10 @@ function DeclarationActionComponent({
     ? mergeDrafts(activeRemoteDraft, localDraftWithAdjustedTimestamp)
     : localDraftWithAdjustedTimestamp
 
-  const eventStateWithDrafts = useMemo(
-    () =>
-      dangerouslyGetCurrentEventStateWithDrafts({
-        event,
-        draft: mergedDraft,
-        configuration
-      }),
-    [mergedDraft, event, configuration]
+  const eventStateWithDraftApplied = applyDraftToEventIndex(
+    getCurrentEventState(event, configuration),
+    mergedDraft,
+    configuration
   )
 
   const actionAnnotation = useMemo(() => {
@@ -249,7 +245,7 @@ function DeclarationActionComponent({
     // Then use form values from drafts.
     const initialFormValues = deepMerge(
       currentDeclaration || {},
-      eventStateWithDrafts.declaration
+      eventStateWithDraftApplied.declaration
     )
 
     setFormValues(initialFormValues)

packages/client/src/v2-events/features/events/components/Output.stories.tsx

@@ -324,3 +324,63 @@ export const DataOutput: Story = {
     } satisfies FieldValue
   }
 }
+
+export const VerificationStatusOutputWhenStatusIsVerified: Story = {
+  args: {
+    value: 'verified',
+    field: {
+      type: FieldType.VERIFICATION_STATUS,
+      id: 'applicant.verificationStatus',
+      label: {
+        id: 'applicant.verificationStatus',
+        defaultMessage: 'Verification Status',
+        description: 'The verification status of the applicant'
+      },
+      configuration: {
+        status: {
+          id: 'verified.status.text',
+          defaultMessage:
+            '{value, select, authenticated {ID Authenticated} verified {ID Verified} failed {Unverified ID} pending {Pending verification} other {Invalid value}}',
+          description:
+            'Status text shown on the pill on both form declaration and review page'
+        },
+        description: {
+          id: 'verified.status.description',
+          defaultMessage:
+            "{value, select, authenticated {This identity has been successfully authenticated with the Farajaland’s National ID System. To make edits, please remove the authentication first.} verified {This identity data has been successfully verified with the Farajaland’s National ID System. Please note that their identity has not been authenticated using the individual's biometrics. To make edits, please remove the verification first.} pending {Identity pending verification with Farajaland’s National ID system} failed {The identity data does not match an entry in Farajaland’s National ID System} other {Invalid value}}",
+          description: 'Description text of the status'
+        }
+      }
+    }
+  }
+}
+
+export const VerificationStatusOutputWhenStatusIsNull: Story = {
+  args: {
+    value: null,
+    field: {
+      type: FieldType.VERIFICATION_STATUS,
+      id: 'applicant.verificationStatus',
+      label: {
+        id: 'applicant.verificationStatus',
+        defaultMessage: 'Verification Status',
+        description: 'The verification status of the applicant'
+      },
+      configuration: {
+        status: {
+          id: 'verified.status.text',
+          defaultMessage:
+            '{value, select, authenticated {ID Authenticated} verified {ID Verified} failed {Unverified ID} pending {Pending verification} other {Invalid value}}',
+          description:
+            'Status text shown on the pill on both form declaration and review page'
+        },
+        description: {
+          id: 'verified.status.description',
+          defaultMessage:
+            "{value, select, authenticated {This identity has been successfully authenticated with the Farajaland’s National ID System. To make edits, please remove the authentication first.} verified {This identity data has been successfully verified with the Farajaland’s National ID System. Please note that their identity has not been authenticated using the individual's biometrics. To make edits, please remove the verification first.} pending {Identity pending verification with Farajaland’s National ID system} failed {The identity data does not match an entry in Farajaland’s National ID System} other {Invalid value}}",
+          description: 'Description text of the status'
+        }
+      }
+    }
+  }
+}

packages/client/src/v2-events/features/events/registered-fields/LinkButton.tsx

@@ -35,23 +35,7 @@ function LinkButtonInput({
 }) {
   const intl = useIntl()
   const url = setRedirectURI(configuration.url)
-  const { submitLocalDraft, isLocalDraftSubmitted } = useDrafts()
 
-  useEffect(() => {
-    if (isLocalDraftSubmitted) {
-      window.location.href = url
-    }
-  }, [isLocalDraftSubmitted, url])
-
-  const handleClick = (e: React.MouseEvent) => {
-    e.preventDefault()
-    try {
-      submitLocalDraft()
-    } catch (err) {
-      // eslint-disable-next-line no-console
-      console.error('Error submitting local draft:', err)
-    }
-  }
   return (
     <Button
       fullWidth
@@ -61,7 +45,6 @@ function LinkButtonInput({
       id={id}
       size="large"
       type="secondary"
-      onClick={handleClick}
     >
       {configuration.icon && (
         <Icon

packages/client/src/v2-events/features/events/registered-fields/TimeField.interaction.stories.tsx

@@ -199,9 +199,9 @@ export const TimeInput12HourDisplay: StoryObj<typeof FormFieldGenerator> = {
     })
 
     await step('Verify output is in 24-hour format', async () => {
-      const outputDisplay = await canvas.findByTestId('time-output-12h')
+      const outputDisplay = await canvas.findByTestId('time-output-24h')
       await expect(outputDisplay).toBeInTheDocument()
-      await expect(outputDisplay).toHaveTextContent('14:30')
+      await expect(outputDisplay).toHaveTextContent('2:30')
     })
   },
   render: function Component(args) {
@@ -231,7 +231,7 @@ export const TimeInput12HourDisplay: StoryObj<typeof FormFieldGenerator> = {
             setFormData(data)
           }}
         />
-        <OutputDisplay data-testid="time-output-12h">
+        <OutputDisplay data-testid="time-output-24h">
           {'Output (always 24-hour): '}
           {formData['storybook.time'] || 'No value'}
         </OutputDisplay>