fix: pass event document to conditionals

CHANGELOG.md

@@ -8,6 +8,12 @@
 
 HTTP input now accepts `field('..')` references in the HTTP body definition.
 
+## 1.9.2
+
+### Bug fixes
+
+- Fixes an issue where `event.hasAction` was not working in form configurations [#11074](https://github.com/opencrvs/opencrvs-core/issues/11074)
+
 ## 1.9.1
 
 ### Breaking changes

packages/client/.storybook/decorators.tsx

@@ -11,6 +11,7 @@
 import React from 'react'
 import type { Decorator } from '@storybook/react'
 import {
+  EventDocument,
   getOrThrow,
   getTokenPayload,
   LocationType,
@@ -57,7 +58,10 @@ export const withValidatorContext: Decorator = (Story, context) => {
     />
   )
 }
-export function getTestValidatorContext(userRole?: TestUserRole) {
+export function getTestValidatorContext(
+  userRole?: TestUserRole,
+  event?: EventDocument
+) {
   let token
 
   if (userRole === TestUserRole.Enum.FIELD_AGENT) {
@@ -82,6 +86,7 @@ export function getTestValidatorContext(userRole?: TestUserRole) {
 
   return {
     user,
-    leafAdminStructureLocationIds
+    leafAdminStructureLocationIds,
+    event
   }
 }

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

@@ -37,7 +37,7 @@ function ReadonlyView() {
   const { eventId } = useTypedParams(ROUTES.V2.EVENTS.DECLARE.REVIEW)
   const events = useEvents()
   const event = events.getEvent.viewEvent(eventId)
-  const validatorContext = useValidatorContext()
+  const validatorContext = useValidatorContext(event)
 
   const maybeAuth = useAuthentication()
   const authentication = getOrThrow(

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

@@ -41,12 +41,13 @@ export function Onboarding() {
   const [{ workqueue }] = useTypedSearchParams(
     ROUTES.V2.EVENTS.REQUEST_CORRECTION.ONBOARDING
   )
-  const validatorContext = useValidatorContext()
+
   const events = useEvents()
   const annotation = useActionAnnotation((state) => state.getAnnotation())
   const setAnnotation = useActionAnnotation((state) => state.setAnnotation)
 
   const event = events.getEvent.getFromCache(eventId)
+  const validatorContext = useValidatorContext(event)
 
   const navigate = useNavigate()
   const intl = useIntl()

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

@@ -41,7 +41,6 @@ function getCorrectablePages(formPages: PageConfig[]) {
 }
 
 export function Pages() {
-  const validatorContext = useValidatorContext()
   const { eventId, pageId } = useTypedParams(ROUTES.V2.EVENTS.REGISTER.PAGES)
   const [searchParams] = useTypedSearchParams(ROUTES.V2.EVENTS.REGISTER.PAGES)
   const setFormValues = useEventFormData((state) => state.setFormValues)
@@ -51,6 +50,7 @@ export function Pages() {
   const { modal } = useEventFormNavigation()
 
   const event = events.getEvent.getFromCache(eventId)
+  const validatorContext = useValidatorContext(event)
 
   const { eventConfiguration: configuration } = useEventConfiguration(
     event.type

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

@@ -42,9 +42,9 @@ export function Review() {
   const intl = useIntl()
   const navigate = useNavigate()
   const events = useEvents()
-  const validatorContext = useValidatorContext()
 
   const event = events.getEvent.getFromCache(eventId)
+  const validatorContext = useValidatorContext(event)
 
   const { eventConfiguration: configuration } = useEventConfiguration(
     event.type

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

@@ -80,14 +80,14 @@ export function Summary() {
     ROUTES.V2.EVENTS.REQUEST_CORRECTION.SUMMARY
   )
 
-  const validatorContext = useValidatorContext()
   const [showPrompt, setShowPrompt] = React.useState(false)
   const eventFormNavigation = useEventFormNavigation()
   const navigate = useNavigate()
   const intl = useIntl()
 
   const events = useEvents()
   const event = events.getEvent.getFromCache(eventId)
+  const validatorContext = useValidatorContext(event)
   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

@@ -33,8 +33,8 @@ export function Review() {
   const { eventId } = useTypedParams(ROUTES.V2.EVENTS.REVIEW_CORRECTION.REVIEW)
   const events = useEvents()
 
-  const validatorContext = useValidatorContext()
   const event = events.getEvent.getFromCache(eventId)
+  const validatorContext = useValidatorContext(event)
 
   const { eventConfiguration: configuration } = useEventConfiguration(
     event.type

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

@@ -39,8 +39,8 @@ export function Pages() {
   const { saveAndExitModal, handleSaveAndExit } = useSaveAndExitModal()
   const { getFormValues, setFormValues } = useEventFormData()
   const formValues = getFormValues()
-  const validatorContext = useValidatorContext()
   const event = events.getEvent.getFromCache(eventId)
+  const validatorContext = useValidatorContext(event)
 
   const { eventConfiguration: configuration } = useEventConfiguration(
     event.type

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

@@ -55,13 +55,13 @@ export function Review() {
   const drafts = useDrafts()
   const navigate = useNavigate()
 
-  const validatorContext = useValidatorContext()
   const [modal, openModal] = useModal()
   const { formatMessage } = useIntlFormatMessageWithFlattenedParams()
   const { closeActionView } = useEventFormNavigation()
   const { saveAndExitModal, handleSaveAndExit } = useSaveAndExitModal()
 
   const event = events.getEvent.getFromCache(eventId)
+  const validatorContext = useValidatorContext(event)
 
   const { eventConfiguration: config } = useEventConfiguration(event.type)
 

packages/client/src/v2-events/features/events/actions/dedup/DuplicateComparison.tsx

@@ -13,6 +13,7 @@ import styled from 'styled-components'
 import { useIntl } from 'react-intl'
 import {
   DeclarationFormConfig,
+  EventDocument,
   EventIndex,
   EventState,
   FieldConfig,
@@ -115,24 +116,31 @@ function UserFullName({ userId }: { userId: string }) {
 
 export function DuplicateComparison({
   originalEvent,
-  potentialDuplicateEvent
+  potentialDuplicateEvent,
+  originalEventState,
+  potentialDuplicateEventState
 }: {
-  originalEvent: EventIndex
-  potentialDuplicateEvent: EventIndex
+  originalEvent: EventDocument
+  potentialDuplicateEvent: EventDocument
+  originalEventState: EventIndex
+  potentialDuplicateEventState: EventIndex
 }) {
   const intl = useIntl()
-  const validatorContext = useValidatorContext()
+  const validatorContextOfOriginalEvent = useValidatorContext(originalEvent)
+  const validatorContextOfPotentialDuplicateEvent = useValidatorContext(
+    potentialDuplicateEvent
+  )
 
   const flattenedIntl = useIntlFormatMessageWithFlattenedParams()
-  const { eventConfiguration } = useEventConfiguration(originalEvent.type)
+  const { eventConfiguration } = useEventConfiguration(originalEventState.type)
 
   const flattenedPotentialDuplicateEvent = flattenEventIndex(
-    potentialDuplicateEvent
+    potentialDuplicateEventState
   )
-  const flattenedOriginalEvent = flattenEventIndex(originalEvent)
+  const flattenedOriginalEvent = flattenEventIndex(originalEventState)
 
-  const originalDeclaration = originalEvent.declaration
-  const potentialDuplicateDeclaration = potentialDuplicateEvent.declaration
+  const originalDeclaration = originalEventState.declaration
+  const potentialDuplicateDeclaration = potentialDuplicateEventState.declaration
 
   const hideFieldTypes = [
     ...FieldTypesToHideInReview,
@@ -144,8 +152,16 @@ export function DuplicateComparison({
     eventConfiguration.declaration.pages
       .filter(
         (page) =>
-          isPageVisible(page, originalDeclaration, validatorContext) ||
-          isPageVisible(page, potentialDuplicateDeclaration, validatorContext)
+          isPageVisible(
+            page,
+            originalDeclaration,
+            validatorContextOfOriginalEvent
+          ) ||
+          isPageVisible(
+            page,
+            potentialDuplicateDeclaration,
+            validatorContextOfPotentialDuplicateEvent
+          )
       )
       .map((page) => ({
         title: intl.formatMessage(page.title),
@@ -155,12 +171,12 @@ export function DuplicateComparison({
               isFieldDisplayedOnReview(
                 field,
                 originalDeclaration,
-                validatorContext
+                validatorContextOfOriginalEvent
               ) ||
               isFieldDisplayedOnReview(
                 field,
                 potentialDuplicateDeclaration,
-                validatorContext
+                validatorContextOfPotentialDuplicateEvent
               )
           )
           .filter(
@@ -209,10 +225,10 @@ export function DuplicateComparison({
       {
         label: intl.formatMessage(summaryMessages.status.label),
         rightValue: flattenedIntl.formatMessage(summaryMessages.status.value, {
-          'event.status': potentialDuplicateEvent.status
+          'event.status': potentialDuplicateEventState.status
         }),
         leftValue: flattenedIntl.formatMessage(summaryMessages.status.value, {
-          'event.status': originalEvent.status
+          'event.status': originalEventState.status
         })
       },
       {
@@ -225,13 +241,13 @@ export function DuplicateComparison({
         rightValue: flattenedIntl.formatMessage(
           summaryMessages.trackingId.value,
           {
-            'event.trackingId': potentialDuplicateEvent.trackingId
+            'event.trackingId': potentialDuplicateEventState.trackingId
           }
         ),
         leftValue: flattenedIntl.formatMessage(
           summaryMessages.trackingId.value,
           {
-            'event.trackingId': originalEvent.trackingId
+            'event.trackingId': originalEventState.trackingId
           }
         )
       },
@@ -286,10 +302,10 @@ export function DuplicateComparison({
             {
               actualTrackingId: (
                 <Text color="negative" element="span" variant="bold18">
-                  {originalEvent.trackingId}
+                  {originalEventState.trackingId}
                 </Text>
               ),
-              duplicateTrackingId: potentialDuplicateEvent.trackingId
+              duplicateTrackingId: potentialDuplicateEventState.trackingId
             }
           )}
         >
@@ -303,16 +319,16 @@ export function DuplicateComparison({
                   <ComparisonListView
                     key={`comparison-${index}`}
                     headings={[
-                      originalEvent.trackingId,
-                      potentialDuplicateEvent.trackingId
+                      originalEventState.trackingId,
+                      potentialDuplicateEventState.trackingId
                     ]}
                   >
                     {sections.data.map((item, id) => (
                       <ComparisonListView.Row
                         key={`row-${id}`}
                         heading={{
-                          right: potentialDuplicateEvent.trackingId,
-                          left: originalEvent.trackingId
+                          right: potentialDuplicateEventState.trackingId,
+                          left: originalEventState.trackingId
                         }}
                         label={
                           <Text color="grey600" element="span" variant="bold16">
@@ -355,7 +371,7 @@ export function DuplicateComparison({
           <SupportingDocumentWrapper gap={25} justifyContent={'space-between'}>
             <div style={{ flex: 1 }}>
               <Text color="redDark" element="p" variant="bold14">
-                {originalEvent.trackingId}
+                {originalEventState.trackingId}
               </Text>
               <DocumentViewer
                 comparisonView={true}
@@ -374,7 +390,7 @@ export function DuplicateComparison({
             </div>
             <div style={{ flex: 1 }}>
               <Text color="grey400" element="p" variant="bold14">
-                {potentialDuplicateEvent.trackingId}
+                {potentialDuplicateEventState.trackingId}
               </Text>
               <DocumentViewer
                 comparisonView={true}

packages/client/src/v2-events/features/events/actions/dedup/ReviewDuplicate.tsx

@@ -17,6 +17,7 @@ import styled from 'styled-components'
 import { useNavigate } from 'react-router-dom'
 import {
   ActionType,
+  EventDocument,
   EventIndex,
   getActionReview,
   getCurrentEventState,
@@ -127,12 +128,11 @@ const TopBar = styled.div`
 function ReviewDuplicate() {
   const { eventId } = useTypedParams(ROUTES.V2.EVENTS.DECLARE.REVIEW)
 
-  const validatorContext = useValidatorContext()
-
   const intl = useIntl()
   const navigate = useNavigate()
   const events = useEvents()
   const event = events.getEvent.findFromCache(eventId).data
+  const validatorContext = useValidatorContext(event)
 
   useEffect(() => {
     if (!event) {
@@ -157,15 +157,18 @@ function ReviewDuplicate() {
   const eventState = getCurrentEventState(event, configuration)
 
   const potentialDuplicates = eventState.potentialDuplicates.reduce<
-    Record<string, EventIndex>
+    Record<string, { eventState: EventIndex; event: EventDocument }>
   >((acc, { id, trackingId }) => {
     const localEvent = findLocalEventDocument(id)
     if (!localEvent) {
       throw new Error(
         `Event with id ${id} and trackingId ${trackingId} not found in cache.`
       )
     }
-    acc[trackingId] = getCurrentEventState(localEvent, configuration)
+    acc[trackingId] = {
+      eventState: getCurrentEventState(localEvent, configuration),
+      event: localEvent
+    }
     return acc
   }, {})
 
@@ -224,8 +227,12 @@ function ReviewDuplicate() {
         </React.Suspense>
       ) : (
         <DuplicateComparison
-          originalEvent={eventState}
-          potentialDuplicateEvent={potentialDuplicates[selectedTab]}
+          originalEvent={event}
+          originalEventState={eventState}
+          potentialDuplicateEvent={potentialDuplicates[selectedTab].event}
+          potentialDuplicateEventState={
+            potentialDuplicates[selectedTab].eventState
+          }
         />
       )}
     </Frame>

packages/client/src/v2-events/features/events/actions/print-certificate/Pages.tsx

@@ -49,7 +49,7 @@ export function Pages() {
   const { eventConfiguration: configuration } = useEventConfiguration(
     event.type
   )
-  const validatorContext = useValidatorContext()
+  const validatorContext = useValidatorContext(event)
   const eventIndex = getCurrentEventState(event, configuration)
   const certTemplateFieldConfig = useCertificateTemplateSelectorFieldConfig(
     event.type,

packages/client/src/v2-events/features/events/actions/print-certificate/Review.tsx

@@ -151,7 +151,6 @@ export function Review() {
 
   const { getAnnotation } = useActionAnnotation()
   const annotation = getAnnotation()
-  const validatorContext = useValidatorContext()
 
   if (!templateId) {
     throw new Error('Please select a template from the previous step')
@@ -163,8 +162,9 @@ export function Review() {
 
   const { getEvent, onlineActions } = useEvents()
   const fullEvent = getEvent.getFromCache(eventId)
-
+  const validatorContext = useValidatorContext(fullEvent)
   const actions = getAcceptedActions(fullEvent)
+
   const userIds = getUserIdsFromActions(actions, [SystemRole.enum.HEALTH])
 
   const { getUsers } = useUsers()