fix: Wrong status shown in the Comparison View Page of duplicate record #7476

Siyasanga · 2024-08-13T23:17:53Z

naftis · 2024-08-14T10:18:16Z

packages/client/src/views/RegisterForm/duplicate/DuplicateFormTabs.tsx

+                    regStatusMessages[
+                      actualRegData.status as unknown as RegStatus
+                    ]


I prefer changing the status's original type to RegStatus here instead of this type assertion.

You'll need to change

opencrvs-core/packages/client/src/declarations/index.ts

Lines 1559 to 1563 in d46f47e

(eventData &&

eventData.registration &&

eventData.registration.status &&

eventData.registration.status[0].type) ||

''

these lines as well to something like

const downloadedAppStatus: RegStatus | undefined = eventData && eventData.registration && eventData.registration.status && eventData.registration.status[0].type

, but it would be a nice improvement to the technical debt we have in the front end.

Thanks man, I wasn't sure so I avoided touching other parts of the codebase as much as possible but I get your point, my thinking was, we could deal with the tech debt as a separate ticket. I'm avoiding a case of effort spent on refactors bloating up the effort required to do the fix. would you agree?

I'm honestly a bit confused regarding downloadedAppStatus: RegStatus | undefined does this mean the type of downloadedAppStatus is of RegStatus always? I'm asking because I saw the DOWNLOAD_STATUS enum with the values below, are they not related?

export enum DOWNLOAD_STATUS { READY_TO_DOWNLOAD = 'READY_TO_DOWNLOAD', DOWNLOADING = 'DOWNLOADING', DOWNLOADED = 'DOWNLOADED', FAILED = 'FAILED', FAILED_NETWORK = 'FAILED_NETWORK', READY_TO_UNASSIGN = 'READY_TO_UNASSIGN', UNASSIGNING = 'UNASSIGNING' }

Thanks man, I wasn't sure so I avoided touching other parts of the codebase as much as possible but I get your point, my thinking was, we could deal with the tech debt as a separate ticket. I'm avoiding a case of effort spent on refactors bloating up the effort required to do the fix. would you agree?

Thanks for explaining your thought process, I see you 👍🏻 In our team refactors in pull requests like these are good, unless it's specifically an urgent bug fix. In my opinion, feel free to always apply the 1% improvement to the pull requests :)

Missed recording the changes done on this PR in the CHANGELOG.md file #7476

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

Missed recording the changes done on this PR in the CHANGELOG.md file #7476

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

Siyasanga · 2024-08-20T12:18:23Z

packages/client/src/views/RegisterForm/review/ReviewSection.tsx

-                      declaration.registrationStatus ===
-                        SUBMISSION_STATUS.CORRECTION_REQUESTED ? null : (


@naftis This is an example of the type fields being compared

I left a couple of comments regarding this, see if they help

Missed recording the changes done on this PR in the CHANGELOG.md file #7476

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

Zangetsu101 · 2024-08-22T09:04:40Z

CHANGELOG.md

+## Refactor
+
+- Remove dependency on openhim. The openhim db is kept for backwards compatibility reasons and will be removed in v1.6. It has brought some major changes
+  in how the microservices are communicating among them. More on this can be found on the updated [sequence diagrams](https://github.com/opencrvs/opencrvs-core/tree/develop/sequence-diagrams/backend)


This doesn't seem related?

Oh this was me resolving a merge conflict, The refactor changelog entry was from develop which was conflicting with my bug changelog entry. I will look into it to see if I can resolve it differently

Zangetsu101 · 2024-08-22T09:11:37Z

packages/client/src/views/RegisterForm/RegisterForm.tsx

@@ -314,7 +314,7 @@ function FormAppBar({
    }
    const [exitModalTitle, exitModalDescription] =
      isCorrection(declaration) ||
-      declaration.registrationStatus === SUBMISSION_STATUS.CORRECTION_REQUESTED
+      declaration.submissionStatus === SUBMISSION_STATUS.CORRECTION_REQUESTED


This would probably change how the application behaves so it should rather be like this:

Suggested change

declaration.submissionStatus === SUBMISSION_STATUS.CORRECTION_REQUESTED

declaration.registrationStatus === RegStatus.CORRECTION_REQUESTED

Zangetsu101 · 2024-08-22T09:12:01Z

packages/client/src/views/RegisterForm/RegisterForm.tsx

+                  declaration.submissionStatus !==
                    SUBMISSION_STATUS.CORRECTION_REQUESTED && (


Suggested change

declaration.submissionStatus !==

SUBMISSION_STATUS.CORRECTION_REQUESTED && (

declaration.registrationStatus !==

RegStatus.CORRECTION_REQUESTED && (

Zangetsu101 · 2024-08-22T09:13:10Z

packages/client/src/views/RegisterForm/duplicate/DuplicateFormTabs.tsx

-        status: (props.declaration.data.history as unknown as History[]).find(
-          (data) => data.action === null
-        )?.regStatus,
+        status: props.declaration.registrationStatus,


Should we not do the same for duplicateRegData.status as well?

Zangetsu101 · 2024-08-22T09:14:45Z

packages/client/src/views/RegisterForm/review/ReviewSection.tsx

+                              (declaration.registrationStatus as string) !==
+                                (SUBMISSION_STATUS.CORRECTION_REQUESTED as string) && (


I think we can do the same here, basically use RegStatus

Zangetsu101 · 2024-08-22T09:15:35Z

packages/client/src/views/RegisterForm/review/ReviewSection.tsx

-                      declaration.registrationStatus ===
-                        SUBMISSION_STATUS.CORRECTION_REQUESTED ? null : (


I left a couple of comments regarding this, see if they help

Missed recording the changes done on this PR in the CHANGELOG.md file #7476

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

We were rendering a wrong status on the duplicate comparison tab #7439

Use RegStatus as a type instead of a generic string #7417

Missed recording the changes done on this PR in the CHANGELOG.md file #7476

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

The declaration status bug fix was incorrectly listed under 1.5.0 section of the CHANGELOG so we had to move it to 1.6.0 #7439

When we were doing the refactor to ensure declaration.status was using RegStatus we incorrectly changed the field to declaration.submissionStatus instead of `registrationStatus` #7439

The way we determine status for duplicateRegData should be the same as the actualData. So we needed to keep things consistent #7439

We were not using the correct type when doing the comparison, so using the correct types without forced assertions is cleaner #7439

We were incorrectly reading the status from the actualData object instead of reading from duplicateRegData #7439

Siyasanga · 2024-09-06T09:17:32Z

@Zangetsu101 thanks for catching this, I've addressed it now

Missed recording the changes done on this PR in the CHANGELOG.md file #7476

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

Missed recording the changes done on this PR in the CHANGELOG.md file #7476

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

This comment has been minimized.

Sign in to view

Siyasanga linked an issue Aug 13, 2024 that may be closed by this pull request

Wrong status shown in the Comparison View Page of duplicate record. #7439

Closed

naftis self-requested a review August 14, 2024 08:25

naftis requested changes Aug 14, 2024

View reviewed changes

naftis added the 🔧Waiting for fixes label Aug 14, 2024

Siyasanga added a commit that referenced this pull request Aug 16, 2024

Record declaration status fixes to the CHANGELOG.md

1854f16

Missed recording the changes done on this PR in the CHANGELOG.md file #7476

Siyasanga force-pushed the ocrvs-7439 branch from a10cd0e to 1854f16 Compare August 16, 2024 15:09

Siyasanga added 💅 Waiting For Review and removed 🔧Waiting for fixes labels Aug 19, 2024

Siyasanga added a commit that referenced this pull request Aug 19, 2024

Refactor createReviewDeclaration status 2 RegStatus

fd568b3

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

Siyasanga requested a review from naftis August 19, 2024 09:59

Siyasanga changed the title ~~OCRVS-7439 Wrong status shown in the Comparison View Page of duplicate record~~ fix: Wrong status shown in the Comparison View Page of duplicate record Aug 20, 2024

Siyasanga added this to the v1.6.0 milestone Aug 20, 2024

Siyasanga added a commit that referenced this pull request Aug 20, 2024

Record declaration status fixes to the CHANGELOG.md

d1a195e

Missed recording the changes done on this PR in the CHANGELOG.md file #7476

Siyasanga added a commit that referenced this pull request Aug 20, 2024

Refactor createReviewDeclaration status 2 RegStatus

1570844

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

Siyasanga force-pushed the ocrvs-7439 branch from fd568b3 to 1570844 Compare August 20, 2024 08:30

Siyasanga added a commit that referenced this pull request Aug 20, 2024

Refactor createReviewDeclaration status 2 RegStatus

73a30b8

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

Siyasanga force-pushed the ocrvs-7439 branch from 1570844 to 73a30b8 Compare August 20, 2024 10:36

Siyasanga added a commit that referenced this pull request Aug 20, 2024

Refactor createReviewDeclaration status 2 RegStatus

6355fcb

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

Siyasanga force-pushed the ocrvs-7439 branch from 73a30b8 to 6355fcb Compare August 20, 2024 10:56

Siyasanga commented Aug 20, 2024

View reviewed changes

Siyasanga added a commit that referenced this pull request Aug 21, 2024

Record declaration status fixes to the CHANGELOG.md

ceb54e3

Missed recording the changes done on this PR in the CHANGELOG.md file #7476

Siyasanga force-pushed the ocrvs-7439 branch from 1b8c8e4 to 20c3dc8 Compare August 21, 2024 20:40

Siyasanga added a commit that referenced this pull request Aug 21, 2024

Refactor createReviewDeclaration status 2 RegStatus

20c3dc8

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

Zangetsu101 requested changes Aug 22, 2024

View reviewed changes

Zangetsu101 added 🔧Waiting for fixes and removed 💅 Waiting For Review labels Aug 22, 2024

Siyasanga added a commit that referenced this pull request Aug 26, 2024

Record declaration status fixes to the CHANGELOG.md

4837733

Missed recording the changes done on this PR in the CHANGELOG.md file #7476

Siyasanga added a commit that referenced this pull request Aug 26, 2024

Refactor createReviewDeclaration status 2 RegStatus

a4b47de

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

Siyasanga force-pushed the ocrvs-7439 branch from 20c3dc8 to 8e29208 Compare August 26, 2024 22:17

Siyasanga added 9 commits September 6, 2024 10:58

Fix declaration status for dup. comparison view

271551b

We were rendering a wrong status on the duplicate comparison tab #7439

Use IRegStatus to IDeclaration.registrationStatus

41a5b39

Use RegStatus as a type instead of a generic string #7417

Record declaration status fixes to the CHANGELOG.md

b762eab

Missed recording the changes done on this PR in the CHANGELOG.md file #7476

Refactor createReviewDeclaration status 2 RegStatus

fcf9dd0

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

Move decl.status fix to 1.6.0 section of CHANGELOG

1f64788

The declaration status bug fix was incorrectly listed under 1.5.0 section of the CHANGELOG so we had to move it to 1.6.0 #7439

Fix faulty comparison in the RegisterForm.tsx

07929ae

When we were doing the refactor to ensure declaration.status was using RegStatus we incorrectly changed the field to declaration.submissionStatus instead of `registrationStatus` #7439

Fix duplicateRegData.status->declaration.regStatus

a2598ab

The way we determine status for duplicateRegData should be the same as the actualData. So we needed to keep things consistent #7439

RegStatus 2check if decl.status=CORRECTION_REQUESTED

280cea6

We were not using the correct type when doing the comparison, so using the correct types without forced assertions is cleaner #7439

Pass the correct data 4 duplicateRegData status

6d54cdf

We were incorrectly reading the status from the actualData object instead of reading from duplicateRegData #7439

Siyasanga force-pushed the ocrvs-7439 branch from 9b9ea0f to 6d54cdf Compare September 6, 2024 08:59

Siyasanga requested a review from Zangetsu101 September 6, 2024 09:17

Siyasanga added 💅 Waiting For Review and removed 🔧Waiting for fixes labels Sep 6, 2024

Zangetsu101 approved these changes Sep 17, 2024

View reviewed changes

Merge branch 'develop' into ocrvs-7439

98d5b3b

Zangetsu101 enabled auto-merge (squash) September 17, 2024 05:52

Zangetsu101 added ✅ Ready for merging and removed 💅 Waiting For Review labels Sep 17, 2024

Zangetsu101 disabled auto-merge September 17, 2024 13:18

Zangetsu101 merged commit c6092dd into develop Sep 17, 2024
36 of 39 checks passed

github-actions bot pushed a commit that referenced this pull request Sep 17, 2024

Placeholder commit for PR #7476

c48d85b

Siyasanga added a commit that referenced this pull request Sep 19, 2024

Record declaration status fixes to the CHANGELOG.md

404e477

Missed recording the changes done on this PR in the CHANGELOG.md file #7476

Siyasanga added a commit that referenced this pull request Sep 19, 2024

Refactor createReviewDeclaration status 2 RegStatus

16f55c0

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

Siyasanga added a commit that referenced this pull request Sep 19, 2024

Record declaration status fixes to the CHANGELOG.md

1766c69

Missed recording the changes done on this PR in the CHANGELOG.md file #7476

Siyasanga added a commit that referenced this pull request Sep 19, 2024

Refactor createReviewDeclaration status 2 RegStatus

a394787

The createReviewDeclaration() function was using a incorrect type<string> instead of the RegStatus type. #7476

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Wrong status shown in the Comparison View Page of duplicate record #7476

fix: Wrong status shown in the Comparison View Page of duplicate record #7476

Siyasanga commented Aug 13, 2024

This comment has been minimized.

naftis Aug 14, 2024

Siyasanga Aug 16, 2024 •

edited

Loading

naftis Aug 20, 2024

Siyasanga Aug 20, 2024

Zangetsu101 Aug 22, 2024

Zangetsu101 Aug 22, 2024

Siyasanga Aug 23, 2024

Zangetsu101 Aug 22, 2024

Zangetsu101 Aug 22, 2024

Zangetsu101 Aug 22, 2024

Zangetsu101 Aug 22, 2024

Zangetsu101 Aug 22, 2024

Siyasanga commented Sep 6, 2024

	(eventData &&
	eventData.registration &&
	eventData.registration.status &&
	eventData.registration.status[0].type) \|\|
	''

		declaration.registrationStatus ===
		SUBMISSION_STATUS.CORRECTION_REQUESTED ? null : (

	declaration.submissionStatus === SUBMISSION_STATUS.CORRECTION_REQUESTED
	declaration.registrationStatus === RegStatus.CORRECTION_REQUESTED

		declaration.submissionStatus !==
		SUBMISSION_STATUS.CORRECTION_REQUESTED && (

		(declaration.registrationStatus as string) !==
		(SUBMISSION_STATUS.CORRECTION_REQUESTED as string) && (

fix: Wrong status shown in the Comparison View Page of duplicate record #7476

fix: Wrong status shown in the Comparison View Page of duplicate record #7476

Conversation

Siyasanga commented Aug 13, 2024

This comment has been minimized.

Choose a reason for hiding this comment

Siyasanga Aug 16, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Siyasanga commented Sep 6, 2024

Siyasanga Aug 16, 2024 •

edited

Loading