Edit-action

packages/client/src/v2-events/custom-api/index.ts

@@ -20,7 +20,8 @@ import {
   ArchiveActionInput,
   MarkAsDuplicateActionInput,
   ActionStatus,
-  ValidatorContext
+  ValidatorContext,
+  EditActionInput
 } from '@opencrvs/commons/client'
 import { trpcClient } from '@client/v2-events/trpc'
 
@@ -34,6 +35,10 @@ export interface CustomMutationParams {
   annotation?: EventState
 }
 
+export interface EditRequestParams extends CustomMutationParams {
+  content: EditActionInput['content']
+}
+
 export interface CorrectionRequestParams extends CustomMutationParams {
   event: EventDocument
   context: ValidatorContext
@@ -77,21 +82,6 @@ export async function registerOnDeclare({
     return declaredEvent
   }
 
-  // update is a patch, no need to send again.
-  const validatedEvent = await trpcClient.event.actions.validate.request.mutate(
-    {
-      declaration: {},
-      annotation,
-      eventId,
-      transactionId,
-      keepAssignment: true
-    }
-  )
-
-  if (hasPotentialDuplicates(validatedEvent, eventConfiguration)) {
-    return validatedEvent
-  }
-
   const latestResponse = await trpcClient.event.actions.register.request.mutate(
     {
       declaration: {},
@@ -104,6 +94,92 @@ export async function registerOnDeclare({
   return latestResponse
 }
 
+export async function editAndRegister({
+  eventId,
+  declaration,
+  transactionId,
+  annotation,
+  content,
+  eventConfiguration
+}: EditRequestParams) {
+  await trpcClient.event.actions.edit.request.mutate({
+    declaration,
+    annotation,
+    eventId,
+    transactionId,
+    keepAssignment: true,
+    content
+  })
+
+  // TODO CIHAN: do declare only if its not been notified previously?
+  // const declaredEvent = await trpcClient.event.actions.declare.request.mutate({
+  //   declaration,
+  //   annotation,
+  //   eventId,
+  //   transactionId,
+  //   keepAssignment: true
+  // })
+
+  // if (hasPotentialDuplicates(declaredEvent, eventConfiguration)) {
+  //   return declaredEvent
+  // }
+
+  return trpcClient.event.actions.register.request.mutate({
+    declaration,
+    annotation,
+    eventId,
+    transactionId
+  })
+}
+
+export async function editAndDeclare({
+  eventId,
+  declaration,
+  transactionId,
+  annotation,
+  content
+}: EditRequestParams) {
+  await trpcClient.event.actions.edit.request.mutate({
+    declaration,
+    annotation,
+    eventId,
+    transactionId,
+    keepAssignment: true,
+    content
+  })
+
+  return trpcClient.event.actions.declare.request.mutate({
+    declaration,
+    annotation,
+    eventId,
+    transactionId
+  })
+}
+
+export async function editAndNotify({
+  eventId,
+  declaration,
+  transactionId,
+  annotation,
+  content
+}: EditRequestParams) {
+  await trpcClient.event.actions.edit.request.mutate({
+    declaration,
+    annotation,
+    eventId,
+    transactionId,
+    keepAssignment: true,
+    content
+  })
+
+  return trpcClient.event.actions.notify.request.mutate({
+    declaration,
+    annotation,
+    eventId,
+    transactionId
+  })
+}
+
 /**
  * Runs a sequence of actions from declare to validate.
  *

packages/client/src/v2-events/features/events/Search/ActionComponent.interaction.rejected.statuses.stories.tsx

@@ -103,11 +103,11 @@ export const DirectsRejectedNotifiedToDeclare: Story = {
             }
           },
           {
-            path: ROUTES.V2.EVENTS.DECLARE.REVIEW.path,
+            path: ROUTES.V2.EVENTS.EDIT.REVIEW.path,
             Component: () => {
               return (
                 <div>
-                  {ROUTES.V2.EVENTS.DECLARE.REVIEW.buildPath({
+                  {ROUTES.V2.EVENTS.EDIT.REVIEW.buildPath({
                     eventId: rejectedNotifiedEvent.event.id
                   })}
                 </div>
@@ -122,7 +122,7 @@ export const DirectsRejectedNotifiedToDeclare: Story = {
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement)
     const actionButton = await canvas.findByRole('button', {
-      name: 'Review'
+      name: 'Edit'
     })
 
     await userEvent.click(actionButton)
@@ -131,7 +131,7 @@ export const DirectsRejectedNotifiedToDeclare: Story = {
     await waitFor(async () => {
       await expect(
         canvas.getByText(
-          ROUTES.V2.EVENTS.DECLARE.REVIEW.buildPath({
+          ROUTES.V2.EVENTS.EDIT.REVIEW.buildPath({
             eventId: rejectedNotifiedEvent.event.id
           })
         )
@@ -177,11 +177,11 @@ export const DirectsRejectedDeclaredToDeclared: Story = {
             }
           },
           {
-            path: ROUTES.V2.EVENTS.DECLARE.REVIEW.path,
+            path: ROUTES.V2.EVENTS.EDIT.REVIEW.path,
             Component: () => {
               return (
                 <div>
-                  {ROUTES.V2.EVENTS.DECLARE.REVIEW.buildPath({
+                  {ROUTES.V2.EVENTS.EDIT.REVIEW.buildPath({
                     eventId: rejectedDeclaredEvent.event.id
                   })}
                 </div>
@@ -196,7 +196,7 @@ export const DirectsRejectedDeclaredToDeclared: Story = {
   play: async ({ canvasElement }) => {
     const canvas = within(canvasElement)
     const actionButton = await canvas.findByRole('button', {
-      name: 'Review'
+      name: 'Edit'
     })
 
     await userEvent.click(actionButton)
@@ -205,7 +205,7 @@ export const DirectsRejectedDeclaredToDeclared: Story = {
     await waitFor(async () => {
       await expect(
         canvas.getByText(
-          ROUTES.V2.EVENTS.DECLARE.REVIEW.buildPath({
+          ROUTES.V2.EVENTS.EDIT.REVIEW.buildPath({
             eventId: rejectedDeclaredEvent.event.id
           })
         )

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

@@ -16,7 +16,6 @@ import {
   EventConfig,
   EventDocument,
   EventState,
-  getAcceptedActions,
   getDeclaration,
   isFieldDisplayedOnReview,
   ValidatorContext

packages/client/src/v2-events/features/events/actions/correct/useActionForHistory.ts

@@ -30,7 +30,7 @@ import { hasAnnotationChanged, getDeclarationComparison } from './utils'
  * Indicates that declaration action changed declaration content. Satisfies V1 spec.
  */
 export const DECLARATION_ACTION_UPDATE = 'UPDATE' as const
-type DECLARATION_ACTION_UPDATE = typeof DECLARATION_ACTION_UPDATE
+export type DECLARATION_ACTION_UPDATE = typeof DECLARATION_ACTION_UPDATE
 
 type UpdateActionDocument = Omit<ActionDocument, 'type'> & {
   type: DECLARATION_ACTION_UPDATE
@@ -139,7 +139,7 @@ export function expandWithClientSpecificActions(
 ): EventHistoryActionDocument[] {
   return extractHistoryActions(fullEvent).flatMap<EventHistoryActionDocument>(
     (action) => {
-      if (isDeclarationAction(action)) {
+      if (isDeclarationAction(action) && action.type !== ActionType.EDIT) {
         if (
           !hasDeclarationChanged(
             fullEvent,