fix: amend updating signatures in client and workflow

CHANGELOG.md

@@ -74,6 +74,7 @@
 - Fixed an issue where address line fields (e.g., address line 1, address line 2, etc.) were not being updated correctly when a user attempted to update a record's event location, such as place of birth or place of death. [#7531](https:/opencrvs/opencrvs-core/issues/7531)
 - When a declaration(birth/death) is created the event location information was not being parsed to ElasticSearch which caused the Advanced search feature to not work when searching for records by event location.[7494](https:/opencrvs/opencrvs-core/issues/7494)
 - When any user's role was updated, incorrect role was shown for that user's actions in the history section of a declaration's record audit page. [#7495](https:/opencrvs/opencrvs-core/issues/7495)
+- When a user updates a marriage declaration editing the signature of the bride, groom, witness one or witness two, handle the changed value of the signature properly. [#7462](https:/opencrvs/opencrvs-core/issues/7462)
 
 ## 1.5.0 (TBD)
 

packages/client/src/declarations/submissionMiddleware.ts

@@ -49,6 +49,7 @@ import { getOfflineData } from '@client/offline/selectors'
 import { IOfflineData } from '@client/offline/reducer'
 import type { MutationToRequestRegistrationCorrectionArgs } from '@client/utils/gateway-deprecated-do-not-use'
 import { UserDetails } from '@client/utils/userUtils'
+import { getReviewForm } from '@client/forms/register/review-selectors'
 
 type IReadyDeclaration = IDeclaration & {
  action: SubmissionAction
@@ -172,10 +173,16 @@ export const submissionMiddleware: Middleware<{}, IStoreState> =
  }
  }
 
- const form = getRegisterForm(getState())[event]
+ const isUpdateAction =
+ isValidationAction(submissionAction) || isRegisterAction(submissionAction)
+
+ const form = isUpdateAction
+ ? getReviewForm(getState())[event]
+ : getRegisterForm(getState())[event]
+
  const offlineData = getOfflineData(getState())
  const graphqlPayload = getGqlDetails(
- getRegisterForm(getState())[event],
+ form,
  declaration,
  getOfflineData(getState()),
  getState().offline.userDetails as UserDetails
@@ -189,10 +196,7 @@ export const submissionMiddleware: Middleware<{}, IStoreState> =
  graphqlPayload.registration.correction.values = changedValues
  }
 
- if (
- isValidationAction(submissionAction) ||
- isRegisterAction(submissionAction)
- ) {
+ if (isUpdateAction) {
  const changedValues = getChangedValues(form, declaration, offlineData)
  graphqlPayload.registration ??= {}
  graphqlPayload.registration.changedValues = changedValues

packages/client/src/views/RecordAudit/ActionDetailsModal.tsx

@@ -44,11 +44,13 @@ import { Pill } from '@opencrvs/components/lib/Pill'
 import { recordAuditMessages } from '@client/i18n/messages/views/recordAudit'
 import { formatLongDate } from '@client/utils/date-formatting'
 import { EMPTY_STRING } from '@client/utils/constants'
+import { IReviewFormState } from '@client/forms/register/reviewReducer'
 
 interface IActionDetailsModalListTable {
  actionDetailsData: History
  actionDetailsIndex: number
  registerForm: IForm
+ reviewForm: IReviewFormState
  intl: IntlShape
  offlineData: Partial<IOfflineData>
  draft: IDeclaration | null
@@ -207,6 +209,7 @@ const ActionDetailsModalListTable = ({
  actionDetailsData,
  actionDetailsIndex,
  registerForm,
+ reviewForm,
  intl,
  offlineData,
  draft
@@ -215,7 +218,8 @@ const ActionDetailsModalListTable = ({
 
  if (registerForm === undefined) return <></>
 
- const sections = registerForm?.sections || []
+ const event = draft?.event || 'birth'
+ const sections = reviewForm.reviewForm?.[event].sections || []
  const requesterColumn = [
  {
  key: 'requester',
@@ -322,7 +326,7 @@ const ActionDetailsModalListTable = ({
  (section) => section.id === item?.valueCode
  ) as IFormSection
 
- if (section.id === 'documents') {
+ if (['documents', 'review', 'preview'].includes(section.id)) {
  item.value = EMPTY_STRING
  editedValue.value = intl.formatMessage(dynamicConstantsMessages.updated)
  }
@@ -625,6 +629,7 @@ export const ActionDetailsModal = ({
  userDetails,
  goToUser,
  registerForm,
+ reviewForm,
  offlineData,
  draft
 }: {
@@ -636,6 +641,7 @@ export const ActionDetailsModal = ({
  userDetails: UserDetails | null
  goToUser: typeof goToUserProfile
  registerForm: IForm
+ reviewForm: IReviewFormState
  offlineData: Partial<IOfflineData>
  draft: IDeclaration | null
 }) => {
@@ -695,6 +701,7 @@ export const ActionDetailsModal = ({
  actionDetailsData={actionDetailsData}
  actionDetailsIndex={actionDetailsIndex}
  registerForm={registerForm}
+ reviewForm={reviewForm}
  intl={intl}
  offlineData={offlineData}
  draft={draft}

packages/client/src/views/RecordAudit/RecordAudit.tsx

@@ -125,6 +125,7 @@ import { Icon } from '@opencrvs/components/lib/Icon'
 
 import { UserDetails } from '@client/utils/userUtils'
 import { client } from '@client/utils/apolloClient'
+import { IReviewFormState } from '@client/forms/register/reviewReducer'
 
 const DesktopHeader = styled(Header)`
  @media (max-width: ${({ theme }) => theme.grid.breakpoints.lg}px) {
@@ -178,6 +179,7 @@ interface IStateProps {
  workqueueDeclaration: GQLEventSearchSet | null
  registerForm: IRegisterFormState
  offlineData: Partial<IOfflineData>
+ reviewForm: IReviewFormState
 }
 
 interface IDispatchProps {
@@ -295,7 +297,8 @@ function RecordAuditBody({
  goToUserProfile,
  goToTeamUserList,
  goBack,
- offlineData
+ offlineData,
+ reviewForm
 }: {
  declaration: IDeclarationData
  draft: IDeclaration | null
@@ -307,6 +310,7 @@ function RecordAuditBody({
  offlineData: Partial<IOfflineData>
  refetchDeclarationInfo?: () => void
  tab: IRecordAuditTabs
+ reviewForm: IReviewFormState
 } & IDispatchProps) {
  const [showDialog, setShowDialog] = React.useState(false)
  const [showActionDetails, setActionDetails] = React.useState(false)
@@ -558,7 +562,8 @@ function RecordAuditBody({
  goToUser: goToUserProfile,
  registerForm: regForm,
  offlineData,
- draft
+ draft,
+ reviewForm
  }
 
  const mobileProps: IAppBarProps = {
@@ -865,7 +870,8 @@ function mapStateToProps(state: IStoreState, props: RouteProps): IStateProps {
  state.workqueueState.workqueue.data[tab]?.results?.find(
  (gqlSearchSet) => gqlSearchSet?.id === declarationId
  )) ||
- null
+ null,
+ reviewForm: state.reviewForm
  }
 }
 

packages/workflow/src/records/handler/update.ts

@@ -20,7 +20,10 @@ import {
  InProgressRecord,
  ReadyForReviewRecord,
  getComposition,
- getInformantType
+ getInformantType,
+ getTaskFromSavedBundle,
+ findExtension,
+ SavedTask
 } from '@opencrvs/commons/types'
 import { z } from 'zod'
 import { indexBundle } from '@workflow/records/search'
@@ -82,6 +85,7 @@ export const updateRoute = createRoute({
  handler: async (request, record) => {
  const token = getToken(request)
  const payload = validateRequest(requestSchema, request.payload)
+ const oldRecord = JSON.parse(JSON.stringify(record))
 
  const informantTypeOfBundle = getInformantType(record)
  const payloadInformantType = payload.details.registration.informantType
@@ -115,9 +119,71 @@ export const updateRoute = createRoute({
  recordInputWithUploadedAttachments,
  event
  )
- const updatedRecord = await toUpdated(updatedBundle, token, updatedDetails)
+
+ const updatedBundleWithSignaturesUri = keepPreviousSignatureUris(
+ oldRecord,
+ updatedBundle
+ )
+
+ const updatedRecord = await toUpdated(
+ updatedBundleWithSignaturesUri,
+ token,
+ updatedDetails
+ )
 
  await indexBundle(updatedRecord, token)
  return updatedRecord
  }
 })
+
+const signatureExtensions = [
+ 'http://opencrvs.org/specs/extension/informants-signature',
+ 'http://opencrvs.org/specs/extension/groom-signature',
+ 'http://opencrvs.org/specs/extension/bride-signature',
+ 'http://opencrvs.org/specs/extension/witness-one-signature',
+ 'http://opencrvs.org/specs/extension/witness-two-signature'
+] as const
+
+function keepPreviousSignatureUris(
+ previousBundle: InProgressRecord | ReadyForReviewRecord,
+ updatedBundle: InProgressRecord | ReadyForReviewRecord
+) {
+ const oldTask = getTaskFromSavedBundle(previousBundle)
+ const newTask = getTaskFromSavedBundle(updatedBundle)
+ let newBundle: InProgressRecord | ReadyForReviewRecord = updatedBundle
+
+ for (const ext of signatureExtensions) {
+ if (
+ findExtension(ext, newTask.extension) &&
+ findExtension(ext, oldTask.extension)
+ ) {
+ const taskFromTheUpdatedBundle = getTaskFromSavedBundle(newBundle)
+ const replacingTaskExtension = oldTask.extension.find(
+ (e) => e.url === ext
+ )!
+
+ const replacingTask: SavedTask = {
+ ...taskFromTheUpdatedBundle,
+ extension: [
+ ...taskFromTheUpdatedBundle.extension.filter((e) => e.url !== ext),
+ replacingTaskExtension
+ ]
+ }
+
+ newBundle = {
+ ...newBundle,
+ entry: [
+ ...newBundle.entry.filter((e) => e.resource.resourceType !== 'Task'),
+ {
+ fullUrl: previousBundle.entry.find(
+ (e) => e.resource.resourceType === 'Task'
+ )!.fullUrl,
+ resource: replacingTask
+ }
+ ]
+ }
+ }
+ }
+
+ return newBundle
+}