From cd6670f9714a18b389122374188134bef33b04a2 Mon Sep 17 00:00:00 2001
From: Riku Rouvila <riku.rouvila@gmail.com>
Date: Mon, 13 May 2024 09:56:42 +0300
Subject: [PATCH 001/108] Code freeze 1.5.0 release

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ca3be238e6..98000d3fbf8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## 1.5.0 (TBD)
+## 1.5.0
 
 ## Breaking changes
 
@@ -43,7 +43,6 @@
 - Fix search result declaration record audit unassign issue [#5781](https://github.com/opencrvs/opencrvs-core/issues/5781)
 - In review page, Eliminating the 'No supporting documents' and 'upload' prompts when documents are already uploaded [#6231] (https://github.com/opencrvs/opencrvs-core/issues/6231)
 
-
 ## 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

From 1e12cea5b14d21c53b0fa7611a5dad05531afcf8 Mon Sep 17 00:00:00 2001
From: Tahmid Rahman <42269993+tahmidrahman-dsi@users.noreply.github.com>
Date: Tue, 14 May 2024 14:27:09 +0600
Subject: [PATCH 002/108] [OCRVS-6228] Remove record corrected action from
 history (#6976)

* Add a util function to exclude record corrected history from fhir bundle response

* Implement the util method to remove record corrected history from root resolvers

* Revert "Implement the util method to remove record corrected history from root resolvers"

This reverts commit fe1d6f5360393892a142ded9c8f3f33db1413f57.

* Refactor exclude record corrected history

* Revert "Refactor exclude record corrected history"

This reverts commit 588f9c8a3d8b6b98ad1b56930341b5035f7ea976.

* Create and implement a custom filtering predicate to remove corrected history

* Remove unused utils

* Remove unused imports

* Remove check for rejected action as there would be no corrected task after rejection

---------

Co-authored-by: Riku Rouvila <riku.rouvila@gmail.com>
---
 packages/commons/src/fhir/task.ts              | 18 ++++++++++++++++++
 .../features/registration/type-resolvers.ts    |  6 +++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/packages/commons/src/fhir/task.ts b/packages/commons/src/fhir/task.ts
index faaf0dc9fe9..4daf8b022e0 100644
--- a/packages/commons/src/fhir/task.ts
+++ b/packages/commons/src/fhir/task.ts
@@ -457,3 +457,21 @@ function updateTaskTemplate(
   }
   return task
 }
+
+export function notCorrectedHistory(
+  task: Task,
+  index: number,
+  allTasks: Task[]
+): boolean {
+  const currentAction = getActionFromTask(task)
+  if (currentAction === TaskAction.CORRECTED) {
+    const pastTasks = allTasks
+      .slice(0, index)
+      .filter((task) => getActionFromTask(task) !== TaskAction.ASSIGNED)
+    const lastAction = getActionFromTask(pastTasks[pastTasks.length - 1])
+    if (lastAction === TaskAction.APPROVED_CORRECTION) {
+      return false
+    }
+  }
+  return true
+}
diff --git a/packages/gateway/src/features/registration/type-resolvers.ts b/packages/gateway/src/features/registration/type-resolvers.ts
index 21db1bd9063..1ffd2d84b86 100644
--- a/packages/gateway/src/features/registration/type-resolvers.ts
+++ b/packages/gateway/src/features/registration/type-resolvers.ts
@@ -82,7 +82,8 @@ import {
   isQuestionnaireResponse,
   isTaskOrTaskHistory,
   resourceIdentifierToUUID,
-  Address
+  Address,
+  notCorrectedHistory
 } from '@opencrvs/commons/types'
 
 import { GQLQuestionnaireQuestion, GQLResolver } from '@gateway/graphql/schema'
@@ -1821,6 +1822,7 @@ export const typeResolvers: GQLResolver = {
       return record.entry
         .map(({ resource }) => resource)
         .filter(isTaskOrTaskHistory)
+        .filter(notCorrectedHistory)
         .sort(sortDescending)
     }
   },
@@ -1980,6 +1982,7 @@ export const typeResolvers: GQLResolver = {
       return record.entry
         .map(({ resource }) => resource)
         .filter(isTaskOrTaskHistory)
+        .filter(notCorrectedHistory)
         .sort(sortDescending)
     }
   },
@@ -2117,6 +2120,7 @@ export const typeResolvers: GQLResolver = {
       return record.entry
         .map(({ resource }) => resource)
         .filter(isTaskOrTaskHistory)
+        .filter(notCorrectedHistory)
         .sort(sortDescending)
     }
   }

From 7192fcbad41b8ef8aec940a56ab03602149df0a6 Mon Sep 17 00:00:00 2001
From: tahmidrahman-dsi <tahmid.rahman@dsinnovators.com>
Date: Tue, 14 May 2024 14:49:11 +0600
Subject: [PATCH 003/108] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98000d3fbf8..8b2868e0a19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,7 +41,8 @@
 - Fix certificate templates not getting populated for health facility event locations & ADMIN_LEVEL > 2
 - Fix download failure for incomplete (without date of death) death declarations [#6807](https://github.com/opencrvs/opencrvs-core/issues/6807)
 - Fix search result declaration record audit unassign issue [#5781](https://github.com/opencrvs/opencrvs-core/issues/5781)
-- In review page, Eliminating the 'No supporting documents' and 'upload' prompts when documents are already uploaded [#6231] (https://github.com/opencrvs/opencrvs-core/issues/6231)
+- In review page, Eliminating the 'No supporting documents' and 'upload' prompts when documents are already uploaded [#6231](https://github.com/opencrvs/opencrvs-core/issues/6231)
+- In record audit page, after 'Correction request approved' the “record corrected” action is removed from history [#6228](https://github.com/opencrvs/opencrvs-core/issues/6228)
 
 ## Refactor
 

From 5ac4a52cbc23fa5de8f556a524c10f0892d7cbd4 Mon Sep 17 00:00:00 2001
From: tahmidrahman-dsi <tahmid.rahman@dsinnovators.com>
Date: Tue, 14 May 2024 19:12:28 +0600
Subject: [PATCH 004/108] Fix: Ocrvs 6247 Registrar of any location should be
 able to review a correction request (#6981)

* review button role status updated for national registrar

* updated changelog.md

* In search result page, navigate to review correction page if registration status is `CORRECTION_REQUESTED`

* Update CHANGELOG.md

---------

Co-authored-by: tahmidrahman-dsi <tahmid.rahman@dsinnovators.com>
Co-authored-by: Tahmid Rahman <42269993+tahmidrahman-dsi@users.noreply.github.com>
---
 CHANGELOG.md                                            | 1 +
 packages/client/src/views/RecordAudit/ActionButtons.tsx | 6 +++++-
 packages/client/src/views/SearchResult/SearchResult.tsx | 9 +++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b2868e0a19..b5b8100e3af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@
 - Fix search result declaration record audit unassign issue [#5781](https://github.com/opencrvs/opencrvs-core/issues/5781)
 - In review page, Eliminating the 'No supporting documents' and 'upload' prompts when documents are already uploaded [#6231](https://github.com/opencrvs/opencrvs-core/issues/6231)
 - In record audit page, after 'Correction request approved' the “record corrected” action is removed from history [#6228](https://github.com/opencrvs/opencrvs-core/issues/6228)
+- Fix Registrar of any location should be able to review a correction request [#6247](https://github.com/opencrvs/opencrvs-core/issues/6247)
 
 ## Refactor
 
diff --git a/packages/client/src/views/RecordAudit/ActionButtons.tsx b/packages/client/src/views/RecordAudit/ActionButtons.tsx
index 439dc001881..e01353e2e45 100644
--- a/packages/client/src/views/RecordAudit/ActionButtons.tsx
+++ b/packages/client/src/views/RecordAudit/ActionButtons.tsx
@@ -394,7 +394,11 @@ export const ShowReviewButton = ({
       EVENT_STATUS.DECLARED,
       EVENT_STATUS.CORRECTION_REQUESTED
     ],
-    NATIONAL_REGISTRAR: [EVENT_STATUS.VALIDATED, EVENT_STATUS.DECLARED]
+    NATIONAL_REGISTRAR: [
+      EVENT_STATUS.VALIDATED,
+      EVENT_STATUS.DECLARED,
+      EVENT_STATUS.CORRECTION_REQUESTED
+    ]
   }
 
   if (
diff --git a/packages/client/src/views/SearchResult/SearchResult.tsx b/packages/client/src/views/SearchResult/SearchResult.tsx
index d6a0cdec931..9cc6eedac09 100644
--- a/packages/client/src/views/SearchResult/SearchResult.tsx
+++ b/packages/client/src/views/SearchResult/SearchResult.tsx
@@ -34,7 +34,10 @@ import {
   goToPage as goToPageAction,
   goToPrintCertificate as goToPrintCertificateAction
 } from '@client/navigation'
-import { REVIEW_EVENT_PARENT_FORM_PAGE } from '@client/navigation/routes'
+import {
+  REVIEW_CORRECTION,
+  REVIEW_EVENT_PARENT_FORM_PAGE
+} from '@client/navigation/routes'
 import { getScope, getUserDetails } from '@client/profile/profileSelectors'
 import { SEARCH_EVENTS } from '@client/search/queries'
 import { transformData } from '@client/search/transformer'
@@ -319,7 +322,9 @@ class SearchResultView extends React.Component<
                   : this.props.intl.formatMessage(constantsMessages.review),
               handler: () =>
                 this.props.goToPage(
-                  REVIEW_EVENT_PARENT_FORM_PAGE,
+                  reg.declarationStatus === 'CORRECTION_REQUESTED'
+                    ? REVIEW_CORRECTION
+                    : REVIEW_EVENT_PARENT_FORM_PAGE,
                   reg.id,
                   'review',
                   reg.event.toLowerCase()

From 5dd2bd0c45d7ae948c6373e7448257a61aa105e4 Mon Sep 17 00:00:00 2001
From: Tahmid Rahman <42269993+tahmidrahman-dsi@users.noreply.github.com>
Date: Mon, 20 May 2024 18:40:05 +0600
Subject: [PATCH 005/108] [OCRVS-6163] Fix login config load issue (#7010)

* Rename component file names according to the current convention

* Rename PhoneNumberVerificationForm -> AuthDetailsVerificationForm

- as we also verify email if the user notification method is set 'email'

* Fetch config before rendering react app

* Amend withRetry function implementation

Co-authored-by: Riku Rouvila <riku.rouvila@gmail.com>

* Update CHANGELOG.md

---------

Co-authored-by: Riku Rouvila <riku.rouvila@gmail.com>
---
 CHANGELOG.md                                  |  1 +
 packages/login/src/App.tsx                    | 14 ++++++-------
 packages/login/src/Page.tsx                   |  8 ++-----
 packages/login/src/index.tsx                  | 21 ++++++++++++++++++-
 .../AuthDetailsVerificationForm.test.tsx}     |  0
 .../AuthDetailsVerificationForm.tsx}          |  6 +++---
 .../Commons.tsx}                              |  0
 .../ForgottenItemForm.test.tsx}               |  2 +-
 .../ForgottenItemForm.tsx}                    |  0
 .../RecoveryCodeEntryForm.tsx}                |  0
 .../ResetCredentialsSuccessPage.test.tsx}     |  0
 .../ResetCredentialsSuccessPage.tsx}          |  2 +-
 .../SecurityQuestionForm.tsx}                 |  0
 .../UpdatePasswordForm.test.tsx}              |  0
 .../UpdatePasswordForm.tsx}                   |  0
 15 files changed, 35 insertions(+), 19 deletions(-)
 rename packages/login/src/views/{resetCredentialsForm/phoneNumberVerificationForm.test.tsx => ResetCredentialsForm/AuthDetailsVerificationForm.test.tsx} (100%)
 rename packages/login/src/views/{resetCredentialsForm/phoneNumberVerificationForm.tsx => ResetCredentialsForm/AuthDetailsVerificationForm.tsx} (98%)
 rename packages/login/src/views/{resetCredentialsForm/commons.tsx => ResetCredentialsForm/Commons.tsx} (100%)
 rename packages/login/src/views/{resetCredentialsForm/forgottenItemForm.test.tsx => ResetCredentialsForm/ForgottenItemForm.test.tsx} (96%)
 rename packages/login/src/views/{resetCredentialsForm/forgottenItemForm.tsx => ResetCredentialsForm/ForgottenItemForm.tsx} (100%)
 rename packages/login/src/views/{resetCredentialsForm/recoveryCodeEntryForm.tsx => ResetCredentialsForm/RecoveryCodeEntryForm.tsx} (100%)
 rename packages/login/src/views/{resetCredentialsForm/resetCredentialsSuccessPage.test.tsx => ResetCredentialsForm/ResetCredentialsSuccessPage.test.tsx} (100%)
 rename packages/login/src/views/{resetCredentialsForm/resetCredentialsSuccessPage.tsx => ResetCredentialsForm/ResetCredentialsSuccessPage.tsx} (98%)
 rename packages/login/src/views/{resetCredentialsForm/securityQuestionForm.tsx => ResetCredentialsForm/SecurityQuestionForm.tsx} (100%)
 rename packages/login/src/views/{resetCredentialsForm/updatePasswordForm.test.tsx => ResetCredentialsForm/UpdatePasswordForm.test.tsx} (100%)
 rename packages/login/src/views/{resetCredentialsForm/updatePasswordForm.tsx => ResetCredentialsForm/UpdatePasswordForm.tsx} (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b5b8100e3af..1f06957dcbf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@
 - In review page, Eliminating the 'No supporting documents' and 'upload' prompts when documents are already uploaded [#6231](https://github.com/opencrvs/opencrvs-core/issues/6231)
 - In record audit page, after 'Correction request approved' the “record corrected” action is removed from history [#6228](https://github.com/opencrvs/opencrvs-core/issues/6228)
 - Fix Registrar of any location should be able to review a correction request [#6247](https://github.com/opencrvs/opencrvs-core/issues/6247)
+- Fix issues of invisible inputs when navigating from can't login link in login page [#6163](https://github.com/opencrvs/opencrvs-core/issues/6163)
 
 ## Refactor
 
diff --git a/packages/login/src/App.tsx b/packages/login/src/App.tsx
index 035e8b4c9a5..958d2f8e0a6 100644
--- a/packages/login/src/App.tsx
+++ b/packages/login/src/App.tsx
@@ -21,12 +21,12 @@ import { Provider } from 'react-redux'
 import { Route, Switch } from 'react-router'
 import { ConnectedRouter } from 'connected-react-router'
 import { createGlobalStyle, ThemeProvider } from 'styled-components'
-import { ForgottenItem } from './views/resetCredentialsForm/forgottenItemForm'
-import { ResetCredentialsSuccessPage } from './views/resetCredentialsForm/resetCredentialsSuccessPage'
-import { PhoneNumberVerification } from './views/resetCredentialsForm/phoneNumberVerificationForm'
-import { RecoveryCodeEntry } from './views/resetCredentialsForm/recoveryCodeEntryForm'
-import { SecurityQuestion } from './views/resetCredentialsForm/securityQuestionForm'
-import { UpdatePassword } from './views/resetCredentialsForm/updatePasswordForm'
+import { ForgottenItem } from './views/ResetCredentialsForm/ForgottenItemForm'
+import { ResetCredentialsSuccessPage } from './views/ResetCredentialsForm/ResetCredentialsSuccessPage'
+import { AuthDetailsVerification } from './views/ResetCredentialsForm/AuthDetailsVerificationForm'
+import { RecoveryCodeEntry } from './views/ResetCredentialsForm/RecoveryCodeEntryForm'
+import { SecurityQuestion } from './views/ResetCredentialsForm/SecurityQuestionForm'
+import { UpdatePassword } from './views/ResetCredentialsForm/UpdatePasswordForm'
 import { Page } from './Page'
 import { LoginBackgroundWrapper } from '@login/common/LoginBackgroundWrapper'
 import { StepTwoContainer } from '@login/views/StepTwo/StepTwoContainer'
@@ -72,7 +72,7 @@ export const App = ({ store, history }: IAppProps) => (
                 </Route>
                 <Route exact path={routes.PHONE_NUMBER_VERIFICATION}>
                   <PageContainer>
-                    <PhoneNumberVerification />
+                    <AuthDetailsVerification />
                   </PageContainer>
                 </Route>
                 <Route exact path={routes.RECOVERY_CODE_ENTRY}>
diff --git a/packages/login/src/Page.tsx b/packages/login/src/Page.tsx
index e7177329775..f17824e437a 100644
--- a/packages/login/src/Page.tsx
+++ b/packages/login/src/Page.tsx
@@ -10,10 +10,7 @@
  */
 import * as React from 'react'
 import { useDispatch, useSelector } from 'react-redux'
-import {
-  applicationConfigLoadAction,
-  storeClientRedirectRoute
-} from './login/actions'
+import { storeClientRedirectRoute } from './login/actions'
 import { changeLanguage, loadLanguages } from './i18n/actions'
 import {
   getDefaultLanguage,
@@ -39,7 +36,6 @@ function useLoadConfigurations() {
   const dispatch = useDispatch()
   React.useEffect(() => {
     dispatch(loadLanguages())
-    dispatch(applicationConfigLoadAction())
   }, [dispatch])
 }
 
@@ -50,7 +46,7 @@ function useStoreClientRedirectRoute() {
     if (!!paramRedirectTo) {
       dispatch(storeClientRedirectRoute(paramRedirectTo))
     }
-  }, [dispatch])
+  }, [dispatch, paramRedirectTo])
 }
 
 function useSyncLanguage() {
diff --git a/packages/login/src/index.tsx b/packages/login/src/index.tsx
index a6884793144..b5d70fb8c7e 100644
--- a/packages/login/src/index.tsx
+++ b/packages/login/src/index.tsx
@@ -19,6 +19,11 @@ import { BrowserTracing } from '@sentry/tracing'
 // eslint-disable-next-line import/no-unassigned-import
 import 'focus-visible/dist/focus-visible.js'
 import WebFont from 'webfontloader'
+import { authApi } from './utils/authApi'
+import { delay } from 'lodash'
+import { applicationConfigLoadedAction } from './login/actions'
+
+const RETRY_TIMEOUT = 5000
 
 WebFont.load({
   google: {
@@ -44,4 +49,18 @@ const { store, history } = createStore()
 
 const container = document.getElementById('root')
 const root = createRoot(container!)
-root.render(<App store={store} history={history} />)
+
+async function renderAppWithConfig() {
+  return authApi.getApplicationConfig().then((res) => {
+    store.dispatch(applicationConfigLoadedAction(res))
+    root.render(<App store={store} history={history} />)
+  })
+}
+
+function withRetry(render: () => Promise<void>) {
+  render().catch(() => {
+    delay(() => withRetry(render), RETRY_TIMEOUT)
+  })
+}
+
+withRetry(renderAppWithConfig)
diff --git a/packages/login/src/views/resetCredentialsForm/phoneNumberVerificationForm.test.tsx b/packages/login/src/views/ResetCredentialsForm/AuthDetailsVerificationForm.test.tsx
similarity index 100%
rename from packages/login/src/views/resetCredentialsForm/phoneNumberVerificationForm.test.tsx
rename to packages/login/src/views/ResetCredentialsForm/AuthDetailsVerificationForm.test.tsx
diff --git a/packages/login/src/views/resetCredentialsForm/phoneNumberVerificationForm.tsx b/packages/login/src/views/ResetCredentialsForm/AuthDetailsVerificationForm.tsx
similarity index 98%
rename from packages/login/src/views/resetCredentialsForm/phoneNumberVerificationForm.tsx
rename to packages/login/src/views/ResetCredentialsForm/AuthDetailsVerificationForm.tsx
index 1bbde1130e7..accd32c701b 100644
--- a/packages/login/src/views/resetCredentialsForm/phoneNumberVerificationForm.tsx
+++ b/packages/login/src/views/ResetCredentialsForm/AuthDetailsVerificationForm.tsx
@@ -58,7 +58,7 @@ type Props = BaseProps &
   RouteComponentProps<{}, {}, { forgottenItem: FORGOTTEN_ITEMS }> &
   WrappedComponentProps
 
-class PhoneNumberVerificationComponent extends React.Component<Props, State> {
+class AuthDetailsVerificationComponent extends React.Component<Props, State> {
   constructor(props: Props) {
     super(props)
     this.state = {
@@ -298,8 +298,8 @@ class PhoneNumberVerificationComponent extends React.Component<Props, State> {
   }
 }
 
-export const PhoneNumberVerification = connect(null, {
+export const AuthDetailsVerification = connect(null, {
   goToForgottenItemForm,
   goToRecoveryCodeEntryForm,
   goToSecurityQuestionForm
-})(withRouter(injectIntl(PhoneNumberVerificationComponent)))
+})(withRouter(injectIntl(AuthDetailsVerificationComponent)))
diff --git a/packages/login/src/views/resetCredentialsForm/commons.tsx b/packages/login/src/views/ResetCredentialsForm/Commons.tsx
similarity index 100%
rename from packages/login/src/views/resetCredentialsForm/commons.tsx
rename to packages/login/src/views/ResetCredentialsForm/Commons.tsx
diff --git a/packages/login/src/views/resetCredentialsForm/forgottenItemForm.test.tsx b/packages/login/src/views/ResetCredentialsForm/ForgottenItemForm.test.tsx
similarity index 96%
rename from packages/login/src/views/resetCredentialsForm/forgottenItemForm.test.tsx
rename to packages/login/src/views/ResetCredentialsForm/ForgottenItemForm.test.tsx
index 8d28c06e796..25915bdcb6d 100644
--- a/packages/login/src/views/resetCredentialsForm/forgottenItemForm.test.tsx
+++ b/packages/login/src/views/ResetCredentialsForm/ForgottenItemForm.test.tsx
@@ -11,7 +11,7 @@
 import { createTestComponent, wait } from '@login/tests/util'
 import { ReactWrapper } from 'enzyme'
 import * as React from 'react'
-import { ForgottenItem } from './forgottenItemForm'
+import { ForgottenItem } from './ForgottenItemForm'
 
 describe('Test forgotten item form', () => {
   let component: ReactWrapper
diff --git a/packages/login/src/views/resetCredentialsForm/forgottenItemForm.tsx b/packages/login/src/views/ResetCredentialsForm/ForgottenItemForm.tsx
similarity index 100%
rename from packages/login/src/views/resetCredentialsForm/forgottenItemForm.tsx
rename to packages/login/src/views/ResetCredentialsForm/ForgottenItemForm.tsx
diff --git a/packages/login/src/views/resetCredentialsForm/recoveryCodeEntryForm.tsx b/packages/login/src/views/ResetCredentialsForm/RecoveryCodeEntryForm.tsx
similarity index 100%
rename from packages/login/src/views/resetCredentialsForm/recoveryCodeEntryForm.tsx
rename to packages/login/src/views/ResetCredentialsForm/RecoveryCodeEntryForm.tsx
diff --git a/packages/login/src/views/resetCredentialsForm/resetCredentialsSuccessPage.test.tsx b/packages/login/src/views/ResetCredentialsForm/ResetCredentialsSuccessPage.test.tsx
similarity index 100%
rename from packages/login/src/views/resetCredentialsForm/resetCredentialsSuccessPage.test.tsx
rename to packages/login/src/views/ResetCredentialsForm/ResetCredentialsSuccessPage.test.tsx
diff --git a/packages/login/src/views/resetCredentialsForm/resetCredentialsSuccessPage.tsx b/packages/login/src/views/ResetCredentialsForm/ResetCredentialsSuccessPage.tsx
similarity index 98%
rename from packages/login/src/views/resetCredentialsForm/resetCredentialsSuccessPage.tsx
rename to packages/login/src/views/ResetCredentialsForm/ResetCredentialsSuccessPage.tsx
index 96b30e4ff5e..7995f10a213 100644
--- a/packages/login/src/views/resetCredentialsForm/resetCredentialsSuccessPage.tsx
+++ b/packages/login/src/views/ResetCredentialsForm/ResetCredentialsSuccessPage.tsx
@@ -17,7 +17,7 @@ import { Box } from '@opencrvs/components/lib/Box'
 import { Stack } from '@opencrvs/components/lib/Stack'
 import { Text } from '@opencrvs/components/lib/Text'
 import { CountryLogo } from '@opencrvs/components/lib/icons'
-import { LogoContainer } from '@login/views/resetCredentialsForm/commons'
+import { LogoContainer } from '@login/views/ResetCredentialsForm/Commons'
 import React, { useEffect } from 'react'
 import { injectIntl, WrappedComponentProps as IntlShapeProps } from 'react-intl'
 import { connect } from 'react-redux'
diff --git a/packages/login/src/views/resetCredentialsForm/securityQuestionForm.tsx b/packages/login/src/views/ResetCredentialsForm/SecurityQuestionForm.tsx
similarity index 100%
rename from packages/login/src/views/resetCredentialsForm/securityQuestionForm.tsx
rename to packages/login/src/views/ResetCredentialsForm/SecurityQuestionForm.tsx
diff --git a/packages/login/src/views/resetCredentialsForm/updatePasswordForm.test.tsx b/packages/login/src/views/ResetCredentialsForm/UpdatePasswordForm.test.tsx
similarity index 100%
rename from packages/login/src/views/resetCredentialsForm/updatePasswordForm.test.tsx
rename to packages/login/src/views/ResetCredentialsForm/UpdatePasswordForm.test.tsx
diff --git a/packages/login/src/views/resetCredentialsForm/updatePasswordForm.tsx b/packages/login/src/views/ResetCredentialsForm/UpdatePasswordForm.tsx
similarity index 100%
rename from packages/login/src/views/resetCredentialsForm/updatePasswordForm.tsx
rename to packages/login/src/views/ResetCredentialsForm/UpdatePasswordForm.tsx

From 65a5bb2e31bedee76daaceecab5ce27751d9cfc2 Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <32668488+Nil20@users.noreply.github.com>
Date: Mon, 27 May 2024 13:31:58 +0600
Subject: [PATCH 006/108] fix: handle informant change (#7039)

* fix: amend updated record type

* chore: add comment and change function name

* fix: handle no informant info for in-progress declaration
---
 .../workflow/src/records/handler/update.ts    | 59 ++++++++++++++++++-
 .../workflow/src/records/state-transitions.ts |  4 +-
 2 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/packages/workflow/src/records/handler/update.ts b/packages/workflow/src/records/handler/update.ts
index e930d44f8cf..718a507c3ed 100644
--- a/packages/workflow/src/records/handler/update.ts
+++ b/packages/workflow/src/records/handler/update.ts
@@ -16,7 +16,13 @@ import {
   MarriageRegistration as GQLMarriageRegistration,
   EVENT_TYPE,
   updateFHIRBundle,
-  Registration
+  Registration,
+  InProgressRecord,
+  ReadyForReviewRecord,
+  getComposition,
+  findCompositionSection,
+  findEntryFromBundle,
+  RelatedPerson
 } from '@opencrvs/commons/types'
 import { z } from 'zod'
 import { indexBundle } from '@workflow/records/search'
@@ -43,6 +49,47 @@ const requestSchema = z.object({
   >()
 })
 
+function filterInformantSectionFromComposition<
+  T extends InProgressRecord | ReadyForReviewRecord
+>(record: T): T {
+  const composition = getComposition(record)
+
+  const filteredComposition = composition.section.filter(
+    (sec) => sec.code.coding[0].code !== 'informant-details'
+  )
+
+  return {
+    ...record,
+    entry: [
+      {
+        fullUrl: record.entry.find(
+          (e) => e.resource.resourceType === 'Composition'
+        )!.fullUrl,
+        resource: {
+          ...composition,
+          section: filteredComposition
+        }
+      },
+      ...record.entry.filter((e) => e.resource.resourceType !== 'Composition')
+    ]
+  }
+}
+
+function getInformantType(record: InProgressRecord | ReadyForReviewRecord) {
+  const compositionSection = findCompositionSection(
+    'informant-details',
+    getComposition(record)
+  )
+  if (!compositionSection) return undefined
+  const personSectionEntry = compositionSection.entry[0]
+  const personEntry = findEntryFromBundle<RelatedPerson>(
+    record,
+    personSectionEntry.reference
+  )
+
+  return personEntry?.resource.relationship?.coding?.[0].code
+}
+
 export const updateRoute = createRoute({
   method: 'POST',
   path: '/records/{recordId}/update',
@@ -52,6 +99,16 @@ export const updateRoute = createRoute({
     const token = getToken(request)
     const payload = validateRequest(requestSchema, request.payload)
 
+    const informantTypeOfBundle = getInformantType(record)
+    const payloadInformantType = payload.details.registration.informantType
+
+    // When new informant details are provided, we should create a patient entry
+    // by removing the composition section from the bundle.
+    // If the section is not found, the builders from updateFhirBundle
+    // create a new patient resource from scratch.
+    if (informantTypeOfBundle && informantTypeOfBundle !== payloadInformantType)
+      record = filterInformantSectionFromComposition(record)
+
     const { details, event } = payload
     const {
       registration: registrationWithChangedValues,
diff --git a/packages/workflow/src/records/state-transitions.ts b/packages/workflow/src/records/state-transitions.ts
index 20f7da89c9c..1ba122c25da 100644
--- a/packages/workflow/src/records/state-transitions.ts
+++ b/packages/workflow/src/records/state-transitions.ts
@@ -240,7 +240,7 @@ export async function toUpdated(
   record: InProgressRecord | ReadyForReviewRecord,
   token: string,
   updatedDetails: ChangedValuesInput
-): Promise<InProgressRecord | ReadyForReviewRecord> {
+): Promise<ReadyForReviewRecord> {
   const previousTask = getTaskFromSavedBundle(record)
 
   const updatedTaskWithoutPractitionerExtensions = createUpdatedTask(
@@ -275,7 +275,7 @@ export async function toUpdated(
       recordWithUpdatedTask,
       practitionerResourcesBundle
     ),
-    ['IN_PROGRESS', 'READY_FOR_REVIEW']
+    'READY_FOR_REVIEW'
   )
 }
 

From 370775cdd9454c43900ee1480322384c62d6ffde Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <32668488+Nil20@users.noreply.github.com>
Date: Mon, 27 May 2024 13:44:47 +0600
Subject: [PATCH 007/108] fix: open print record page in the current tab
 (#7042)

* fix: update print record page to open in the same tab

* chore: add X icon in the print record page

* docs: update changelog
---
 CHANGELOG.md                                  |  1 +
 packages/client/src/navigation/index.ts       |  9 +-
 .../src/views/PrintRecord/PrintRecord.tsx     | 86 ++++++++++++-------
 3 files changed, 62 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f06957dcbf..6ec36eb3f50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -45,6 +45,7 @@
 - In record audit page, after 'Correction request approved' the “record corrected” action is removed from history [#6228](https://github.com/opencrvs/opencrvs-core/issues/6228)
 - Fix Registrar of any location should be able to review a correction request [#6247](https://github.com/opencrvs/opencrvs-core/issues/6247)
 - Fix issues of invisible inputs when navigating from can't login link in login page [#6163](https://github.com/opencrvs/opencrvs-core/issues/6163)
+- Fix print record page for an unsaved declaration [#6893](https://github.com/opencrvs/opencrvs-core/issues/6893)
 
 ## Refactor
 
diff --git a/packages/client/src/navigation/index.ts b/packages/client/src/navigation/index.ts
index ce0b003a3cd..89a7d701a48 100644
--- a/packages/client/src/navigation/index.ts
+++ b/packages/client/src/navigation/index.ts
@@ -58,7 +58,8 @@ import {
   ISSUE_CERTIFICATE_PAYMENT,
   DRAFT_BIRTH_PARENT_FORM,
   DRAFT_MARRIAGE_FORM,
-  ALL_USER_EMAIL
+  ALL_USER_EMAIL,
+  PRINT_RECORD
 } from '@client/navigation/routes'
 import {
   NATL_ADMIN_ROLES,
@@ -691,7 +692,11 @@ export function goToOrganisationView(userDetails: UserDetails) {
 }
 
 export function goToPrintRecordView(declarationId: string) {
-  window.open(`/print-record/${declarationId}`, '_blank')
+  return push(
+    formatUrl(PRINT_RECORD, {
+      declarationId
+    })
+  )
 }
 export type INavigationState = undefined
 
diff --git a/packages/client/src/views/PrintRecord/PrintRecord.tsx b/packages/client/src/views/PrintRecord/PrintRecord.tsx
index dafceabadc6..69f58fe5a9d 100644
--- a/packages/client/src/views/PrintRecord/PrintRecord.tsx
+++ b/packages/client/src/views/PrintRecord/PrintRecord.tsx
@@ -11,10 +11,10 @@
 import React from 'react'
 import { PrintRecordHeader as Header } from '@client/views/PrintRecord/Header'
 import { WORKQUEUE_TABS } from '@client/components/interface/Navigation'
-import { formatUrl } from '@client/navigation'
+import { formatUrl, goBack } from '@client/navigation'
 import { REGISTRAR_HOME_TAB } from '@client/navigation/routes'
 import { IStoreState } from '@client/store'
-import { useSelector } from 'react-redux'
+import { useSelector, useDispatch } from 'react-redux'
 import { useParams, Redirect } from 'react-router'
 import { IDeclaration } from '@client/declarations'
 import styled from 'styled-components'
@@ -30,6 +30,7 @@ import { getOfflineData } from '@client/offline/selectors'
 import { messages as reviewMessages } from '@client/i18n/messages/views/review'
 import { printRecordMessages } from '@client/i18n/messages/views/printRecord'
 import { constantsMessages } from '@client/i18n/messages'
+import { AppBar, Button, Icon } from '@opencrvs/components/lib'
 
 const Container = styled.div`
   padding: 16px;
@@ -46,7 +47,14 @@ const AvoidBreak = styled.div`
     page-break-after: avoid;
   }
 `
+const StyledAppBar = styled(AppBar)`
+  @media print {
+    display: none;
+  }
+`
+
 export function PrintRecord() {
+  const dispatch = useDispatch()
   const languages = useSelector(getLanguages)
   const offlineData = useSelector(getOfflineData)
   const cache = createIntlCache()
@@ -72,36 +80,50 @@ export function PrintRecord() {
   }
 
   return (
-    <Container>
-      <Content>
-        <AvoidBreak>
-          <Header
-            logoSrc={offlineData.config.COUNTRY_LOGO.file}
-            title={formatMessage(intls, reviewMessages.govtName)}
-            heading={formatMessage(
-              intls,
-              printRecordMessages.civilRegistrationCentre
-            )}
-            subject={formatMessage(
-              intls,
-              reviewMessages.headerSubjectWithoutName,
-              {
-                eventType: declaration.event
+    <>
+      <StyledAppBar
+        desktopRight={
+          <Button type="icon" size="small" onClick={() => dispatch(goBack())}>
+            <Icon name="X" />
+          </Button>
+        }
+        mobileRight={
+          <Button type="icon" size="small" onClick={() => dispatch(goBack())}>
+            <Icon name="X" />
+          </Button>
+        }
+      />
+      <Container>
+        <Content>
+          <AvoidBreak>
+            <Header
+              logoSrc={offlineData.config.COUNTRY_LOGO.file}
+              title={formatMessage(intls, reviewMessages.govtName)}
+              heading={formatMessage(
+                intls,
+                printRecordMessages.civilRegistrationCentre
+              )}
+              subject={formatMessage(
+                intls,
+                reviewMessages.headerSubjectWithoutName,
+                {
+                  eventType: declaration.event
+                }
+              )}
+              info={
+                declaration.data?.registration?.trackingId
+                  ? {
+                      label: formatMessage(intls, constantsMessages.trackingId),
+                      value: declaration.data.registration.trackingId as string
+                    }
+                  : undefined
               }
-            )}
-            info={
-              declaration.data?.registration?.trackingId
-                ? {
-                    label: formatMessage(intls, constantsMessages.trackingId),
-                    value: declaration.data.registration.trackingId as string
-                  }
-                : undefined
-            }
-            subjectColor={getEventwiseSubjectColor(declaration.event)}
-          />
-        </AvoidBreak>
-        <Body declaration={declaration} intls={intls} />
-      </Content>
-    </Container>
+              subjectColor={getEventwiseSubjectColor(declaration.event)}
+            />
+          </AvoidBreak>
+          <Body declaration={declaration} intls={intls} />
+        </Content>
+      </Container>
+    </>
   )
 }

From d2995e6acb8bd42c4c4dc2ce87c0b9c0cbdf8b44 Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <32668488+Nil20@users.noreply.github.com>
Date: Mon, 27 May 2024 13:47:20 +0600
Subject: [PATCH 008/108] fix: set correction requested declaration to be
 retreived (#7040)

* fix: set correction requested declaration to be retreived

* chore: improve condition readability
---
 .../components/interface/DownloadButton.tsx   | 23 +++++++++++++------
 .../workflow/src/records/handler/download.ts  |  3 ++-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/packages/client/src/components/interface/DownloadButton.tsx b/packages/client/src/components/interface/DownloadButton.tsx
index 46fd1bbc9d9..304395ac037 100644
--- a/packages/client/src/components/interface/DownloadButton.tsx
+++ b/packages/client/src/components/interface/DownloadButton.tsx
@@ -256,15 +256,23 @@ function DownloadButtonComponent(props: DownloadButtonProps & HOCProps) {
       status === DOWNLOAD_STATUS.FAILED_NETWORK,
     [status]
   )
+  const isSentForApprovalDeclaration =
+    downloadConfigs.declarationStatus &&
+    ['VALIDATED', 'CORRECTION_REQUESTED'].includes(
+      downloadConfigs.declarationStatus
+    )
+
+  // user roles of users who can not retrieve a declaration
+  const nonRetrievalUserRoles =
+    userRole !== ROLE_REGISTRATION_AGENT &&
+    !FIELD_AGENT_ROLES.includes(String(userRole))
 
   const onClickDownload = useCallback(
     (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
       if (
         (assignment?.userId !== userId ||
           status === DOWNLOAD_STATUS.DOWNLOADED) &&
-        (downloadConfigs.declarationStatus !== 'VALIDATED' ||
-          userRole !== ROLE_REGISTRATION_AGENT) &&
-        !FIELD_AGENT_ROLES.includes(String(userRole))
+        (!isSentForApprovalDeclaration || nonRetrievalUserRoles)
       ) {
         setAssignModal(
           getAssignModalOptions(
@@ -291,13 +299,14 @@ function DownloadButtonComponent(props: DownloadButtonProps & HOCProps) {
     },
     [
       assignment,
-      userRole,
-      download,
       userId,
       status,
-      unassign,
+      isSentForApprovalDeclaration,
+      nonRetrievalUserRoles,
+      userRole,
       hideModal,
-      downloadConfigs
+      download,
+      unassign
     ]
   )
 
diff --git a/packages/workflow/src/records/handler/download.ts b/packages/workflow/src/records/handler/download.ts
index 9443e825680..3e8dcc5a2e0 100644
--- a/packages/workflow/src/records/handler/download.ts
+++ b/packages/workflow/src/records/handler/download.ts
@@ -33,7 +33,8 @@ function getDownloadedOrAssignedExtension(
 ) {
   if (
     inScope(authHeader, ['declare', 'recordsearch']) ||
-    (hasScope(authHeader, 'validate') && status === 'VALIDATED')
+    (hasScope(authHeader, 'validate') &&
+      ['CORRECTION_REQUESTED', 'VALIDATED'].includes(status))
   ) {
     return `http://opencrvs.org/specs/extension/regDownloaded` as const
   }

From d4ea536ea7702da395e2083d474c7680d0717419 Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <32668488+Nil20@users.noreply.github.com>
Date: Mon, 27 May 2024 13:48:39 +0600
Subject: [PATCH 009/108] chore: handle configuration option restructure
 (#7041)

---
 packages/client/src/tests/forms.json             | 16 ++++++++--------
 packages/client/src/tests/mock-offline-data.ts   |  6 +++---
 packages/client/src/utils/referenceApi.ts        |  4 ++--
 .../views/RegisterForm/review/ReviewSection.tsx  |  5 +++--
 packages/client/typings/window.d.ts              |  4 ++--
 .../application/applicationConfigHandler.ts      |  6 +++---
 6 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/packages/client/src/tests/forms.json b/packages/client/src/tests/forms.json
index fcd0cb032a4..59d18a6163c 100644
--- a/packages/client/src/tests/forms.json
+++ b/packages/client/src/tests/forms.json
@@ -975,7 +975,7 @@
                   "conditionals": [
                     {
                       "action": "hide",
-                      "expression": "!window.config.DATE_OF_BIRTH_UNKNOWN || !values.detailsExist"
+                      "expression": "!window.config.FEATURES.DATE_OF_BIRTH_UNKNOWN || !values.detailsExist"
                     }
                   ],
                   "mapping": {
@@ -2372,7 +2372,7 @@
                   "conditionals": [
                     {
                       "action": "hide",
-                      "expression": "!window.config.DATE_OF_BIRTH_UNKNOWN || (!values.detailsExist)"
+                      "expression": "!window.config.FEATURES.DATE_OF_BIRTH_UNKNOWN || (!values.detailsExist)"
                     }
                   ],
                   "mapping": {
@@ -2903,7 +2903,7 @@
                   "conditionals": [
                     {
                       "action": "hide",
-                      "expression": "!window.config.DATE_OF_BIRTH_UNKNOWN || (!values.detailsExist)"
+                      "expression": "!window.config.FEATURES.DATE_OF_BIRTH_UNKNOWN || (!values.detailsExist)"
                     }
                   ],
                   "mapping": {
@@ -3737,7 +3737,7 @@
                   "conditionals": [
                     {
                       "action": "hide",
-                      "expression": "!window.config.DATE_OF_BIRTH_UNKNOWN"
+                      "expression": "!window.config.FEATURES.DATE_OF_BIRTH_UNKNOWN"
                     }
                   ],
                   "mapping": {
@@ -4714,7 +4714,7 @@
                   "conditionals": [
                     {
                       "action": "hide",
-                      "expression": "!window.config.DATE_OF_BIRTH_UNKNOWN || !values.detailsExist"
+                      "expression": "!window.config.FEATURES.DATE_OF_BIRTH_UNKNOWN || !values.detailsExist"
                     }
                   ],
                   "mapping": {
@@ -6588,7 +6588,7 @@
                   "conditionals": [
                     {
                       "action": "hide",
-                      "expression": "!window.config.DATE_OF_BIRTH_UNKNOWN || !values.detailsExist"
+                      "expression": "!window.config.FEATURES.DATE_OF_BIRTH_UNKNOWN || !values.detailsExist"
                     }
                   ],
                   "mapping": {
@@ -7958,7 +7958,7 @@
                   "conditionals": [
                     {
                       "action": "hide",
-                      "expression": "!window.config.DATE_OF_BIRTH_UNKNOWN || !values.detailsExist"
+                      "expression": "!window.config.FEATURES.DATE_OF_BIRTH_UNKNOWN || !values.detailsExist"
                     }
                   ],
                   "mapping": {
@@ -9211,7 +9211,7 @@
                   "conditionals": [
                     {
                       "action": "hide",
-                      "expression": "!window.config.DATE_OF_BIRTH_UNKNOWN || !values.detailsExist"
+                      "expression": "!window.config.FEATURES.DATE_OF_BIRTH_UNKNOWN || !values.detailsExist"
                     }
                   ],
                   "mapping": {
diff --git a/packages/client/src/tests/mock-offline-data.ts b/packages/client/src/tests/mock-offline-data.ts
index 6c197ae88a6..25da8514b92 100644
--- a/packages/client/src/tests/mock-offline-data.ts
+++ b/packages/client/src/tests/mock-offline-data.ts
@@ -454,7 +454,9 @@ export const mockOfflineData = {
       MARRIAGE_REGISTRATION: true,
       EXTERNAL_VALIDATION_WORKQUEUE: true,
       INFORMANT_SIGNATURE: false,
-      PRINT_DECLARATION: true
+      PRINT_DECLARATION: true,
+      DATE_OF_BIRTH_UNKNOWN: true,
+      INFORMANT_SIGNATURE_REQUIRED: false
     },
     HEALTH_FACILITY_FILTER: 'DISTRICT',
     LANGUAGES: 'en,bn',
@@ -481,8 +483,6 @@ export const mockOfflineData = {
     DEATH_REGISTRATION_TARGET: 45,
     NID_NUMBER_PATTERN: /^[0-9]{9}$/,
     SENTRY: 'https://sentry.com',
-    DATE_OF_BIRTH_UNKNOWN: true,
-    INFORMANT_SIGNATURE_REQUIRED: false,
     USER_NOTIFICATION_DELIVERY_METHOD: 'email',
     INFORMANT_NOTIFICATION_DELIVERY_METHOD: 'email',
     SIGNATURE_REQUIRED_FOR_ROLES: ['LOCAL_REGISTRAR', 'NATIONAL_REGISTRAR']
diff --git a/packages/client/src/utils/referenceApi.ts b/packages/client/src/utils/referenceApi.ts
index 2b51c36e653..3617e5df5fb 100644
--- a/packages/client/src/utils/referenceApi.ts
+++ b/packages/client/src/utils/referenceApi.ts
@@ -123,13 +123,13 @@ export interface IApplicationConfig {
     EXTERNAL_VALIDATION_WORKQUEUE: boolean
     INFORMANT_SIGNATURE: boolean
     PRINT_DECLARATION: boolean
+    DATE_OF_BIRTH_UNKNOWN: boolean
+    INFORMANT_SIGNATURE_REQUIRED: boolean
   }
   FIELD_AGENT_AUDIT_LOCATIONS: string
   DECLARATION_AUDIT_LOCATIONS: string
   PHONE_NUMBER_PATTERN: RegExp
   NID_NUMBER_PATTERN: RegExp
-  DATE_OF_BIRTH_UNKNOWN: boolean
-  INFORMANT_SIGNATURE_REQUIRED: boolean
   LOGIN_BACKGROUND: ILoginBackground
   USER_NOTIFICATION_DELIVERY_METHOD: string
   INFORMANT_NOTIFICATION_DELIVERY_METHOD: string
diff --git a/packages/client/src/views/RegisterForm/review/ReviewSection.tsx b/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
index a4a1442f85d..6b8f2b5476b 100644
--- a/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
+++ b/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
@@ -1678,7 +1678,8 @@ class ReviewSectionComp extends React.Component<FullProps, State> {
       } else {
         if (event === Event.Birth || event === Event.Death) {
           return (
-            offlineCountryConfiguration.config.INFORMANT_SIGNATURE_REQUIRED &&
+            offlineCountryConfiguration.config.FEATURES
+              .INFORMANT_SIGNATURE_REQUIRED &&
             !declaration.data.registration?.informantsSignature
           )
         } else if (event === Event.Marriage) {
@@ -1767,7 +1768,7 @@ class ReviewSectionComp extends React.Component<FullProps, State> {
           'informants_signature',
           declaration.data.registration?.informantsSignature as string,
           intl.formatMessage(messages.informantsSignature),
-          window.config.INFORMANT_SIGNATURE_REQUIRED
+          window.config.FEATURES.INFORMANT_SIGNATURE_REQUIRED
         )
         return (
           <>
diff --git a/packages/client/typings/window.d.ts b/packages/client/typings/window.d.ts
index 4ec83b69179..c67120df95b 100644
--- a/packages/client/typings/window.d.ts
+++ b/packages/client/typings/window.d.ts
@@ -55,6 +55,8 @@ interface Window {
       INFORMANT_SIGNATURE: boolean
       EXTERNAL_VALIDATION_WORKQUEUE: boolean
       PRINT_DECLARATION: boolean
+      DATE_OF_BIRTH_UNKNOWN: boolean
+      INFORMANT_SIGNATURE_REQUIRED: boolean
     }
     LANGUAGES: string
     LOGIN_URL: string
@@ -69,8 +71,6 @@ interface Window {
     NID_NUMBER_PATTERN: RegExp
     DECLARATION_AUDIT_LOCATIONS: string
     SENTRY: string
-    DATE_OF_BIRTH_UNKNOWN: boolean
-    INFORMANT_SIGNATURE_REQUIRED: boolean
     REGISTRATIONS_DASHBOARD_URL: string
     STATISTICS_DASHBOARD_URL: string
     LEADERBOARDS_DASHBOARD_URL: string
diff --git a/packages/config/src/handlers/application/applicationConfigHandler.ts b/packages/config/src/handlers/application/applicationConfigHandler.ts
index 1b24ab614fd..8a4c94b97a3 100644
--- a/packages/config/src/handlers/application/applicationConfigHandler.ts
+++ b/packages/config/src/handlers/application/applicationConfigHandler.ts
@@ -281,10 +281,10 @@ const applicationConfigResponseValidation = Joi.object({
     MARRIAGE_REGISTRATION: Joi.boolean().required(),
     EXTERNAL_VALIDATION_WORKQUEUE: Joi.boolean().required(),
     INFORMANT_SIGNATURE: Joi.boolean().required(),
-    PRINT_DECLARATION: Joi.boolean().required()
+    PRINT_DECLARATION: Joi.boolean().required(),
+    DATE_OF_BIRTH_UNKNOWN: Joi.boolean().required(),
+    INFORMANT_SIGNATURE_REQUIRED: Joi.boolean().required()
   },
-  DATE_OF_BIRTH_UNKNOWN: Joi.boolean().required(),
-  INFORMANT_SIGNATURE_REQUIRED: Joi.boolean().required(),
   USER_NOTIFICATION_DELIVERY_METHOD: Joi.string().allow('').optional(),
   INFORMANT_NOTIFICATION_DELIVERY_METHOD: Joi.string().allow('').optional(),
   SIGNATURE_REQUIRED_FOR_ROLES: Joi.array().items(

From e69c23fc7f861116162c8eac07c23a56cee7a835 Mon Sep 17 00:00:00 2001
From: Tahmid Rahman <42269993+tahmidrahman-dsi@users.noreply.github.com>
Date: Mon, 27 May 2024 15:57:17 +0600
Subject: [PATCH 010/108] fix: dashboard cron job not working (#7027)

* Remove authentication from dashboard queries api endpoints

* Update CHANGELOG.md
---
 CHANGELOG.md                                      |  1 +
 packages/config/src/config/routes.ts              |  1 +
 .../handlers/dashboardQueries/dashboardQueries.ts | 10 +---------
 packages/metrics/src/config/routes.ts             |  2 +-
 packages/metrics/src/configApi.ts                 | 10 ++++------
 .../src/features/performance/viewRefresher.ts     | 15 ++++++---------
 6 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ec36eb3f50..ee86657cbd5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@
 - Fix Registrar of any location should be able to review a correction request [#6247](https://github.com/opencrvs/opencrvs-core/issues/6247)
 - Fix issues of invisible inputs when navigating from can't login link in login page [#6163](https://github.com/opencrvs/opencrvs-core/issues/6163)
 - Fix print record page for an unsaved declaration [#6893](https://github.com/opencrvs/opencrvs-core/issues/6893)
+- Fix dashboard cron jobs not working [#7016](https://github.com/opencrvs/opencrvs-core/issues/7016)
 
 ## Refactor
 
diff --git a/packages/config/src/config/routes.ts b/packages/config/src/config/routes.ts
index c0e08da89e3..2965fac730c 100644
--- a/packages/config/src/config/routes.ts
+++ b/packages/config/src/config/routes.ts
@@ -279,6 +279,7 @@ export default function getRoutes(): ServerRoute[] {
       handler: getDashboardQueries,
       options: {
         tags: ['api'],
+        auth: false,
         description: 'Fetch dashboard queries from country config'
       }
     }
diff --git a/packages/config/src/handlers/dashboardQueries/dashboardQueries.ts b/packages/config/src/handlers/dashboardQueries/dashboardQueries.ts
index 51c315bdf0c..1a10c880f49 100644
--- a/packages/config/src/handlers/dashboardQueries/dashboardQueries.ts
+++ b/packages/config/src/handlers/dashboardQueries/dashboardQueries.ts
@@ -17,15 +17,7 @@ export default async function getDashboardQueries(
   request: Hapi.Request,
   h: Hapi.ResponseToolkit
 ) {
-  const token = request.headers.authorization
-  const response = await fetch(
-    `${COUNTRY_CONFIG_URL}/dashboards/queries.json`,
-    {
-      headers: {
-        Authorization: token
-      }
-    }
-  )
+  const response = await fetch(`${COUNTRY_CONFIG_URL}/dashboards/queries.json`)
 
   if (response.status === 404) {
     return defaultQueries()
diff --git a/packages/metrics/src/config/routes.ts b/packages/metrics/src/config/routes.ts
index 78b1a7a2284..c243eb679ba 100644
--- a/packages/metrics/src/config/routes.ts
+++ b/packages/metrics/src/config/routes.ts
@@ -102,7 +102,7 @@ function analyticsDataRefreshingRoute<
   // Consider triggering this a task that will be left to be run in the background.
   return (request: Request, response: Response) => {
     if (!PRODUCTION || QA_ENV) {
-      refresh(request.headers.authorization)
+      refresh()
     }
     return handler(request, response)
   }
diff --git a/packages/metrics/src/configApi.ts b/packages/metrics/src/configApi.ts
index 961222187e3..0d3f6d50269 100644
--- a/packages/metrics/src/configApi.ts
+++ b/packages/metrics/src/configApi.ts
@@ -91,15 +91,13 @@ export async function getApplicationConfig(
     })
 }
 
-export async function getDashboardQueries(
-  authorization: string
-): Promise<Array<{ collection: string; aggregate: Document[] }>> {
-  const token = authorization.replace('Bearer ', '')
+export async function getDashboardQueries(): Promise<
+  Array<{ collection: string; aggregate: Document[] }>
+> {
   return fetch(`${CONFIG_API_URL}/dashboardQueries`, {
     method: 'GET',
     headers: {
-      'Content-Type': 'application/json',
-      Authorization: `Bearer ${token}`
+      'Content-Type': 'application/json'
     }
   })
     .then((response) => {
diff --git a/packages/metrics/src/features/performance/viewRefresher.ts b/packages/metrics/src/features/performance/viewRefresher.ts
index 6bdde683cb1..7cd8f9a6ea0 100644
--- a/packages/metrics/src/features/performance/viewRefresher.ts
+++ b/packages/metrics/src/features/performance/viewRefresher.ts
@@ -34,7 +34,7 @@ export async function performanceDataRefreshHandler(
   request: Hapi.Request,
   h: Hapi.ResponseToolkit
 ) {
-  refresh(request.headers.authorization).catch((error) => {
+  refresh().catch((error) => {
     logger.error(`Error on performance data refresh triggered: ${error}`)
   })
   return h.response({
@@ -43,7 +43,7 @@ export async function performanceDataRefreshHandler(
   })
 }
 
-export async function refresh(authorization: string) {
+export async function refresh() {
   if (updateInProgress) {
     logger.info('Performance materialised views already being refreshed')
     nextUpdateRequested = true
@@ -54,7 +54,7 @@ export async function refresh(authorization: string) {
   try {
     updateInProgress = true
     const connectedClient = await client.connect()
-    await refreshPerformanceMaterialisedViews(connectedClient, authorization)
+    await refreshPerformanceMaterialisedViews(connectedClient)
     logger.info('Performance materialised views refreshed')
   } catch (error) {
     logger.error(`Error refreshing performances materialised views ${error}`)
@@ -64,17 +64,14 @@ export async function refresh(authorization: string) {
     updateInProgress = false
     if (nextUpdateRequested) {
       nextUpdateRequested = false
-      refresh(authorization)
+      refresh()
     }
   }
 }
 
-async function refreshPerformanceMaterialisedViews(
-  client: MongoClient,
-  authorization: string
-) {
+async function refreshPerformanceMaterialisedViews(client: MongoClient) {
   const db = client.db()
-  const queries = await getDashboardQueries(authorization)
+  const queries = await getDashboardQueries()
 
   for (const { collection, aggregate } of queries) {
     await db

From 9d1733a8c2e4b976eb3d77aab0097702c18d0cb4 Mon Sep 17 00:00:00 2001
From: Tahmid Rahman <42269993+tahmidrahman-dsi@users.noreply.github.com>
Date: Tue, 4 Jun 2024 13:38:40 +0600
Subject: [PATCH 011/108] fix(ocrvs-7068): show requester, reason, comment, id
 verfied sections in action modal for action CORRECTED (#7094)

---
 .../src/views/RecordAudit/ActionDetailsModal.tsx     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx b/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
index 9af524ac78f..8dade4616ed 100644
--- a/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
+++ b/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
@@ -107,7 +107,8 @@ function prepareComments(
   if (
     !draft ||
     (actionDetailsData.action &&
-      actionDetailsData.action !== RegAction.RequestedCorrection)
+      actionDetailsData.action !== RegAction.RequestedCorrection &&
+      actionDetailsData.action !== RegAction.Corrected)
   ) {
     return []
   }
@@ -447,7 +448,8 @@ const ActionDetailsModalListTable = ({
 
       {/* Correction Requester */}
       {actionDetailsData.requester &&
-        actionDetailsData.action === RegAction.RequestedCorrection && (
+        (actionDetailsData.action === RegAction.RequestedCorrection ||
+          actionDetailsData.action === RegAction.Corrected) && (
           <Table
             noResultText=" "
             columns={requesterColumn}
@@ -465,7 +467,8 @@ const ActionDetailsModalListTable = ({
         )}
 
       {/* Correction Requester Id Verified */}
-      {actionDetailsData.action === RegAction.RequestedCorrection &&
+      {(actionDetailsData.action === RegAction.RequestedCorrection ||
+        actionDetailsData.action === RegAction.Corrected) &&
         actionDetailsData.requester !== CorrectorRelationship.ANOTHER_AGENT &&
         actionDetailsData.requester !== CorrectorRelationship.REGISTRAR && (
           <Table
@@ -490,7 +493,8 @@ const ActionDetailsModalListTable = ({
 
       {/* For Correction Reason */}
       {actionDetailsData.reason &&
-        actionDetailsData.action === RegAction.RequestedCorrection && (
+        (actionDetailsData.action === RegAction.RequestedCorrection ||
+          actionDetailsData.action === RegAction.Corrected) && (
           <Table
             noResultText=" "
             columns={correctionReasonColumn}

From d74838e7ccaecec00b91abaaae83c9a719975e7f Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <ashikul.alam@dsinnovators.com>
Date: Tue, 4 Jun 2024 13:10:37 +0600
Subject: [PATCH 012/108] fix: show correction rejection reason in history

---
 .../src/views/RecordAudit/ActionDetailsModal.tsx  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx b/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
index 8dade4616ed..df9de1f6105 100644
--- a/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
+++ b/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
@@ -457,14 +457,13 @@ const ActionDetailsModalListTable = ({
           />
         )}
       {/* Correction rejected */}
-      {actionDetailsData.requester &&
-        actionDetailsData.action === RegAction.RejectedCorrection && (
-          <Table
-            noResultText=" "
-            columns={reasonColumn}
-            content={[{ text: actionDetailsData.reason }]}
-          />
-        )}
+      {actionDetailsData.action === RegAction.RejectedCorrection && (
+        <Table
+          noResultText=" "
+          columns={reasonColumn}
+          content={[{ text: actionDetailsData.reason }]}
+        />
+      )}
 
       {/* Correction Requester Id Verified */}
       {(actionDetailsData.action === RegAction.RequestedCorrection ||

From 21244468f007d26ebe5681c96ead8e8907e77adf Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <32668488+Nil20@users.noreply.github.com>
Date: Fri, 7 Jun 2024 13:03:43 +0600
Subject: [PATCH 013/108] fix: update correction request task  (#7106)

* fix: update correction request task

* fix: update snapshot for task output

* fix: set correction changes to read from output

* fix: amend correction values and type in client
---
 .../views/ReviewCorrection/ReviewCorrection.tsx    | 14 ++++++++++----
 .../__snapshots__/state-transitions.test.ts.snap   |  1 +
 packages/workflow/src/records/fhir.ts              | 13 +++++++++++++
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/views/ReviewCorrection/ReviewCorrection.tsx b/packages/client/src/views/ReviewCorrection/ReviewCorrection.tsx
index 101f5de3b6b..ee6c586f751 100644
--- a/packages/client/src/views/ReviewCorrection/ReviewCorrection.tsx
+++ b/packages/client/src/views/ReviewCorrection/ReviewCorrection.tsx
@@ -615,7 +615,13 @@ function applyCorrectionToData(record: IDeclaration) {
     )
   }
 
-  const proposedChangesPatch = correctionRequestTask.input.reduce(
+  if (!correctionRequestTask.output) {
+    throw new Error(
+      'Correction request task did not have an output field. Should never happen'
+    )
+  }
+
+  const proposedChangesPatch = correctionRequestTask.output.reduce(
     (acc: Record<string, Record<string, IFormFieldValue>>, curr: any) => {
       acc[curr.valueCode] = acc[curr.valueCode] || {}
 
@@ -647,11 +653,11 @@ function applyCorrectionToData(record: IDeclaration) {
     },
     reason: correctionRequestTask.reason!,
     requester: correctionRequestTask.requester!,
-    values: correctionRequestTask.input.map((input) => ({
+    values: correctionRequestTask.input.map((input, index) => ({
       fieldName: input!.valueId,
-      newValue: input!.value!,
+      newValue: correctionRequestTask.output![index]?.value,
       section: input!.valueCode,
-      oldValue: (record.data[input!.valueCode][input!.valueId] || '').toString()
+      oldValue: input!.value!
     }))
   }
 
diff --git a/packages/workflow/src/records/__snapshots__/state-transitions.test.ts.snap b/packages/workflow/src/records/__snapshots__/state-transitions.test.ts.snap
index 5c59125a116..f7f25cf584a 100644
--- a/packages/workflow/src/records/__snapshots__/state-transitions.test.ts.snap
+++ b/packages/workflow/src/records/__snapshots__/state-transitions.test.ts.snap
@@ -103,6 +103,7 @@ Array [
         "text": "Note",
       },
     ],
+    "output": Array [],
     "reason": Object {
       "extension": Array [
         Object {
diff --git a/packages/workflow/src/records/fhir.ts b/packages/workflow/src/records/fhir.ts
index 90e81859b17..30bbe914767 100644
--- a/packages/workflow/src/records/fhir.ts
+++ b/packages/workflow/src/records/fhir.ts
@@ -1034,6 +1034,19 @@ export function createCorrectionRequestTask(
       }
     ],
     input: correctionDetails.values.map((update) => ({
+      valueCode: update.section,
+      valueId: update.fieldName,
+      type: {
+        coding: [
+          {
+            system: 'http://terminology.hl7.org/CodeSystem/action-type',
+            code: 'update'
+          }
+        ]
+      },
+      ...getFHIRValueField(update.oldValue)
+    })),
+    output: correctionDetails.values.map((update) => ({
       valueCode: update.section,
       valueId: update.fieldName,
       type: {

From 43e8b1afa59b20ee8aa79bab945827db0bfe1d50 Mon Sep 17 00:00:00 2001
From: Tameem Bin Haider <tameem.haider@dsinnovators.com>
Date: Wed, 15 May 2024 13:18:41 +0600
Subject: [PATCH 014/108] feat: add new handlebars (#6914)

* feat: add new handlebars

* docs: update CHANGELOG

* test: add registered history entry to mock data
---
 CHANGELOG.md                                  |  2 +
 .../ReviewCertificateAction.test.tsx          | 30 ++++++-------
 .../usePrintableCertificate.ts                | 44 +++++++++++++++----
 3 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee86657cbd5..79e47e140ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,8 @@
 - Add loading spinners before JavaScript bundle has loaded for both login and client
 - Support for landscape certificate templates
 - Allow defining maxLength attribute for number type fields [#6356](https://github.com/opencrvs/opencrvs-core/issues/6356)
+- Certificate handlebar for registration fees `registrationFees` [#6817](https://github.com/opencrvs/opencrvs-core/issues/6817)
+- Logged in user details handlebar `loggedInUser` [#6529](https://github.com/opencrvs/opencrvs-core/issues/6529)
 
 ## Bug fixes
 
diff --git a/packages/client/src/views/PrintCertificate/ReviewCertificateAction.test.tsx b/packages/client/src/views/PrintCertificate/ReviewCertificateAction.test.tsx
index da50d66d3c6..8a07f5b7384 100644
--- a/packages/client/src/views/PrintCertificate/ReviewCertificateAction.test.tsx
+++ b/packages/client/src/views/PrintCertificate/ReviewCertificateAction.test.tsx
@@ -8,7 +8,7 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import { vi, Mock } from 'vitest'
+import { Mock } from 'vitest'
 import * as React from 'react'
 import { createStore } from '@client/store'
 import { storeDeclaration, IDeclaration } from '@client/declarations'
@@ -28,7 +28,6 @@ import { Event } from '@client/utils/gateway'
 import { cloneDeep } from 'lodash'
 import { waitForElement } from '@client/tests/wait-for-element'
 import { push } from 'connected-react-router'
-import * as pdfRender from '@client/pdfRenderer'
 import { useParams } from 'react-router'
 
 const deathDeclaration = {
@@ -47,8 +46,6 @@ const deathDeclaration = {
 }
 
 describe('when user wants to review death certificate', () => {
-  const spy = vi.spyOn(pdfRender, 'printPDF').mockImplementation(() => {})
-
   it('displays the "Confirm & Print" button', async () => {
     const { history, match } = createRouterProps(
       '/',
@@ -87,7 +84,16 @@ describe('when user wants to review death certificate', () => {
 describe('back button behavior tests of review certificate action', () => {
   let component: ReactWrapper
 
-  const mockBirthDeclarationData = cloneDeep(mockDeclarationData)
+  const mockBirthDeclarationData = {
+    ...cloneDeep(mockDeclarationData),
+    history: [
+      {
+        date: '2022-03-21T08:16:24.467+00:00',
+        regStatus: 'REGISTERED',
+        reinstated: false
+      }
+    ]
+  }
   mockBirthDeclarationData.registration.certificates[0] = {
     collector: {
       type: 'PRINT_IN_ADVANCE'
@@ -114,16 +120,7 @@ describe('back button behavior tests of review certificate action', () => {
     loginAsFieldAgent(store)
     const birthDeclaration = {
       id: 'asdhdqe2472487jsdfsdf',
-      data: {
-        ...mockBirthDeclarationData,
-        history: [
-          {
-            date: '2022-03-21T08:16:24.467+00:00',
-            regStatus: 'REGISTERED',
-            reinstated: false
-          }
-        ]
-      },
+      data: mockBirthDeclarationData,
       event: Event.Birth
     }
     store.dispatch(
@@ -155,6 +152,7 @@ describe('back button behavior tests of review certificate action', () => {
 
     loginAsFieldAgent(store)
     store.dispatch(
+      // @ts-ignore
       storeDeclaration({
         id: 'asdhdqe2472487jsdfsdf',
         data: mockBirthDeclarationData,
@@ -256,7 +254,7 @@ describe('when user wants to review marriage certificate', () => {
   let component: ReactWrapper<{}, {}>
 
   beforeEach(async () => {
-    const { history, location, match } = createRouterProps(
+    const { history, match } = createRouterProps(
       '/',
       { isNavigatedInsideApp: false },
       {
diff --git a/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts b/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts
index c7a1f41d025..3447fc37d83 100644
--- a/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts
+++ b/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts
@@ -16,7 +16,11 @@ import {
   writeDeclaration
 } from '@client/declarations'
 import { useDeclaration } from '@client/declarations/selectors'
-import { CorrectionSection, SubmissionAction } from '@client/forms'
+import {
+  CorrectionSection,
+  IFormSectionData,
+  SubmissionAction
+} from '@client/forms'
 import { goToCertificateCorrection, goToHomeTab } from '@client/navigation'
 import { getOfflineData } from '@client/offline/selectors'
 import { getScope, getUserDetails } from '@client/profile/profileSelectors'
@@ -44,22 +48,44 @@ import {
   getCountryTranslations
 } from './utils'
 import { Event } from '@client/utils/gateway'
+import { getUserName, UserDetails } from '@client/utils/userUtils'
+import { formatLongDate } from '@client/utils/date-formatting'
+import { IOfflineData } from '@client/offline/reducer'
 
 const withEnhancedTemplateVariables = (
-  declaration: IPrintableDeclaration | undefined
+  declaration: IPrintableDeclaration | undefined,
+  userDetails: UserDetails | null,
+  offlineData: IOfflineData
 ) => {
-  if (!declaration || !isCertificateForPrintInAdvance(declaration)) {
+  if (!declaration) {
     return declaration
   }
 
+  const registeredDate = getRegisteredDate(declaration.data)
+  const eventDate = getEventDate(declaration.data, declaration.event)
+  const registrationFees = calculatePrice(
+    declaration.event,
+    eventDate,
+    registeredDate,
+    offlineData
+  )
   return {
     ...declaration,
     data: {
       ...declaration.data,
       template: {
         ...declaration.data.template,
-        printInAdvance: true
-      }
+        printInAdvance: isCertificateForPrintInAdvance(declaration),
+        certificateDate: formatLongDate(new Date().toISOString()),
+        registrationFees,
+        ...(userDetails && {
+          loggedInUser: {
+            name: getUserName(userDetails),
+            officeId: userDetails.primaryOffice?.id,
+            signature: userDetails.localRegistrar?.signature
+          }
+        })
+      } as IFormSectionData
     }
   }
 }
@@ -68,11 +94,14 @@ export const usePrintableCertificate = (declarationId: string) => {
   const declarationWithoutAllTemplateVariables = useDeclaration<
     IPrintableDeclaration | undefined
   >(declarationId)
+  const userDetails = useSelector(getUserDetails)
+  const offlineData = useSelector(getOfflineData)
   const declaration = withEnhancedTemplateVariables(
-    declarationWithoutAllTemplateVariables
+    declarationWithoutAllTemplateVariables,
+    userDetails,
+    offlineData
   )
 
-  const offlineData = useSelector(getOfflineData)
   const state = useSelector((store: IStoreState) => store)
   const [svg, setSvg] = useState<string>()
   const isPrintInAdvance = isCertificateForPrintInAdvance(declaration)
@@ -85,7 +114,6 @@ export const usePrintableCertificate = (declarationId: string) => {
   const canUserEditRecord =
     declaration?.event !== Event.Marriage &&
     (hasRegisterScope(scope) || hasRegistrationClerkScope(scope))
-  const userDetails = useSelector(getUserDetails)
 
   useEffect(() => {
     if (declaration)

From e3fdfbb485adc9e4904f1aac7969d448e53c8b8d Mon Sep 17 00:00:00 2001
From: Anamul Haque <anamul1414@gmail.com>
Date: Wed, 29 May 2024 16:03:05 +0600
Subject: [PATCH 015/108] fix: client modal glitches on Integrations-page
 (#7056)

* ocrvs-7002

* replaced 'auto' with 'scroll'

* changelog.md updated

* fix: react issue with exhaustive deps

---------

Co-authored-by: Pyry <pyry.rouvila@gmail.com>
---
 CHANGELOG.md                                           |  1 +
 .../components/src/ResponsiveModal/ResponsiveModal.tsx | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79e47e140ff..3503dd04c4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@
 - Fix issues of invisible inputs when navigating from can't login link in login page [#6163](https://github.com/opencrvs/opencrvs-core/issues/6163)
 - Fix print record page for an unsaved declaration [#6893](https://github.com/opencrvs/opencrvs-core/issues/6893)
 - Fix dashboard cron jobs not working [#7016](https://github.com/opencrvs/opencrvs-core/issues/7016)
+- Fix client modal glitches on integrations page [#7002] (https://github.com/opencrvs/opencrvs-core/issues/7002)
 
 ## Refactor
 
diff --git a/packages/components/src/ResponsiveModal/ResponsiveModal.tsx b/packages/components/src/ResponsiveModal/ResponsiveModal.tsx
index 285527676ec..b5aafbbdd78 100644
--- a/packages/components/src/ResponsiveModal/ResponsiveModal.tsx
+++ b/packages/components/src/ResponsiveModal/ResponsiveModal.tsx
@@ -8,7 +8,7 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import React, { useEffect } from 'react'
+import React, { useCallback, useEffect } from 'react'
 import styled from 'styled-components'
 import { Cross } from '../icons'
 import { CircleButton } from '../buttons'
@@ -110,7 +110,7 @@ const Body = styled.div<{
     height ? `${height}px` : autoHeight ? `auto` : `250px`};
   max-height: calc(100vh - 180px);
   color: ${({ theme }) => theme.colors.supportingCopy};
-  overflow-y: ${({ scrollableY }) => (scrollableY ? 'visible' : 'auto')};
+  overflow-y: ${({ scrollableY }) => (scrollableY ? 'visible' : 'scroll')};
   padding: 0 24px 16px;
   display: flex;
   flex-direction: column;
@@ -186,13 +186,13 @@ export const ResponsiveModal = ({
   showHeaderBorder,
   children
 }: IProps) => {
-  const toggleScroll = () => {
+  const toggleScroll = useCallback(() => {
     const body = document.querySelector('body') as HTMLBodyElement
     if (show) {
       return (body.style.overflow = 'hidden')
     }
     return body.style.removeProperty('overflow')
-  }
+  }, [show])
 
   useEffect(() => {
     toggleScroll()
@@ -201,7 +201,7 @@ export const ResponsiveModal = ({
       const body = document.querySelector('body') as HTMLBodyElement
       body.style.removeProperty('overflow')
     }
-  }, [show])
+  }, [show, toggleScroll])
 
   if (!show) {
     return null

From 4e26db5d092503912a476c0c40bf1cda3ae22046 Mon Sep 17 00:00:00 2001
From: Anamul Haque <anamul1414@gmail.com>
Date: Thu, 30 May 2024 12:30:32 +0600
Subject: [PATCH 016/108] fix: french translation missing for relationship to
 informant when trying to correct, print or issue record (#7061)

* failed tests fixed

* removeing labelformat for informant

* failed test fixed, removeing labelformat for informant

* remove labelformatterForInformant

* removed labelformatter for requesterLabelMapper in ActionDetailsModal.tsx
---
 CHANGELOG.md                                                | 1 +
 .../forms/certificate/fieldDefinitions/collectorSection.ts  | 5 ++---
 packages/client/src/forms/correction/corrector.ts           | 4 +---
 .../client/src/views/CorrectionForm/CorrectorForm.test.tsx  | 2 +-
 .../PrintCertificate/collectorForm/CollectorForm.test.tsx   | 6 +++---
 .../client/src/views/RecordAudit/ActionDetailsModal.tsx     | 3 +--
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3503dd04c4f..023498de077 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -47,6 +47,7 @@
 - In record audit page, after 'Correction request approved' the “record corrected” action is removed from history [#6228](https://github.com/opencrvs/opencrvs-core/issues/6228)
 - Fix Registrar of any location should be able to review a correction request [#6247](https://github.com/opencrvs/opencrvs-core/issues/6247)
 - Fix issues of invisible inputs when navigating from can't login link in login page [#6163](https://github.com/opencrvs/opencrvs-core/issues/6163)
+- Fix French translation missing for relationship to informant when trying to correct record, print and issue record [#6341] (https://github.com/opencrvs/opencrvs-core/issues/6341)
 - Fix print record page for an unsaved declaration [#6893](https://github.com/opencrvs/opencrvs-core/issues/6893)
 - Fix dashboard cron jobs not working [#7016](https://github.com/opencrvs/opencrvs-core/issues/7016)
 - Fix client modal glitches on integrations page [#7002] (https://github.com/opencrvs/opencrvs-core/issues/7002)
diff --git a/packages/client/src/forms/certificate/fieldDefinitions/collectorSection.ts b/packages/client/src/forms/certificate/fieldDefinitions/collectorSection.ts
index 6cf3639eec9..328906fdc0a 100644
--- a/packages/client/src/forms/certificate/fieldDefinitions/collectorSection.ts
+++ b/packages/client/src/forms/certificate/fieldDefinitions/collectorSection.ts
@@ -36,7 +36,6 @@ import { identityHelperTextMapper, identityNameMapper } from './messages'
 import { Event } from '@client/utils/gateway'
 import { IDeclaration } from '@client/declarations'
 import { issueMessages } from '@client/i18n/messages/issueCertificate'
-import { labelFormatterForInformant } from '@client/views/CorrectionForm/utils'
 
 interface INameField {
   firstNamesField: string
@@ -1023,7 +1022,7 @@ function getCertCollectorGroupForEvent(
       value: 'INFORMANT',
       label: formMessages.certifyRecordToInformant,
       param: {
-        informant: labelFormatterForInformant(informant)
+        informant: informant
       }
     },
     { value: 'OTHER', label: formMessages.someoneElseCollector },
@@ -1088,7 +1087,7 @@ export function getIssueCertCollectorGroupForEvent(
       value: 'INFORMANT',
       label: issueMessages.issueToInformant,
       param: {
-        informant: labelFormatterForInformant(informant)
+        informant: informant
       }
     },
     { value: 'OTHER', label: issueMessages.issueToSomeoneElse }
diff --git a/packages/client/src/forms/correction/corrector.ts b/packages/client/src/forms/correction/corrector.ts
index 8d661efc309..d3a1bf4e1a7 100644
--- a/packages/client/src/forms/correction/corrector.ts
+++ b/packages/client/src/forms/correction/corrector.ts
@@ -22,7 +22,6 @@ import { messages } from '@client/i18n/messages/views/correction'
 import { Event } from '@client/utils/gateway'
 import { RadioSize } from '@opencrvs/components/lib/Radio'
 import { getFilteredRadioOptions } from '@client/forms/certificate/fieldDefinitions/collectorSection'
-import { labelFormatterForInformant } from '@client/views/CorrectionForm/utils'
 
 export enum CorrectorRelationship {
   //death
@@ -108,13 +107,12 @@ export const getCorrectorSection = (
 ): IFormSection => {
   const informant = (declaration.data.informant.otherInformantType ||
     declaration.data.informant.informantType) as string
-
   const initialOptions: IRadioOption[] = [
     {
       value: CorrectorRelationship.INFORMANT,
       label: messages.informant,
       param: {
-        informant: labelFormatterForInformant(informant)
+        informant: informant
       }
     },
     {
diff --git a/packages/client/src/views/CorrectionForm/CorrectorForm.test.tsx b/packages/client/src/views/CorrectionForm/CorrectorForm.test.tsx
index 8be8261f19c..a667ebc6710 100644
--- a/packages/client/src/views/CorrectionForm/CorrectorForm.test.tsx
+++ b/packages/client/src/views/CorrectionForm/CorrectorForm.test.tsx
@@ -176,7 +176,7 @@ describe('Corrector form', () => {
 
     it('should not disable the continue button if an option is selected', () => {
       wrapper
-        .find('#relationship_INFORMANT_Spouse')
+        .find('#relationship_INFORMANT_SPOUSE')
         .hostNodes()
         .simulate('change', { target: { checked: true } })
       wrapper.update()
diff --git a/packages/client/src/views/PrintCertificate/collectorForm/CollectorForm.test.tsx b/packages/client/src/views/PrintCertificate/collectorForm/CollectorForm.test.tsx
index a4ad5e07f6c..5ef66cf40c1 100644
--- a/packages/client/src/views/PrintCertificate/collectorForm/CollectorForm.test.tsx
+++ b/packages/client/src/views/PrintCertificate/collectorForm/CollectorForm.test.tsx
@@ -559,7 +559,7 @@ describe('Certificate collector test for a death registration', () => {
     })
 
     it('informant will be spouse', async () => {
-      const element = await waitForElement(component, '#type_INFORMANT_Spouse')
+      const element = await waitForElement(component, '#type_INFORMANT_SPOUSE')
       expect(element.hostNodes()).toHaveLength(1)
     })
 
@@ -611,7 +611,7 @@ describe('Certificate collector test for a marriage registration', () => {
     })
 
     it('informant will be grrom', async () => {
-      const element = await waitForElement(component, '#type_INFORMANT_Groom')
+      const element = await waitForElement(component, '#type_INFORMANT_GROOM')
       expect(element.hostNodes()).toHaveLength(1)
     })
 
@@ -669,7 +669,7 @@ describe('Certificate collector test for a birth registration without father and
     })
 
     it('informant will be mother', () => {
-      expect(component.find('#type_INFORMANT_Mother').hostNodes()).toHaveLength(
+      expect(component.find('#type_INFORMANT_MOTHER').hostNodes()).toHaveLength(
         1
       )
     })
diff --git a/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx b/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
index df9de1f6105..07417d47ba7 100644
--- a/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
+++ b/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
@@ -44,7 +44,6 @@ 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 { labelFormatterForInformant } from '@client/views/CorrectionForm/utils'
 
 interface IActionDetailsModalListTable {
   actionDetailsData: History
@@ -154,7 +153,7 @@ const requesterLabelMapper = (
   // informant info added for corrector being informant
   return requesterIndividual?.label
     ? intl.formatMessage(requesterIndividual.label, {
-        informant: labelFormatterForInformant(informant)
+        informant
       })
     : ''
 }

From 848f064ba32923d45d4842b13c75efc8cf56d3eb Mon Sep 17 00:00:00 2001
From: Anamul Haque <anamul1414@gmail.com>
Date: Mon, 3 Jun 2024 12:32:41 +0600
Subject: [PATCH 017/108] fix: remove upload button when no supporting docs are
 configured (#7006)

* initial fix

* updated changelog.md

* updated changelog

* filtered with isVisibleField

* isUploadButtonVisible now boolean
---
 CHANGELOG.md                                               | 1 +
 .../client/src/views/RegisterForm/review/ReviewSection.tsx | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 023498de077..d18cd952705 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,6 +46,7 @@
 - In review page, Eliminating the 'No supporting documents' and 'upload' prompts when documents are already uploaded [#6231](https://github.com/opencrvs/opencrvs-core/issues/6231)
 - In record audit page, after 'Correction request approved' the “record corrected” action is removed from history [#6228](https://github.com/opencrvs/opencrvs-core/issues/6228)
 - Fix Registrar of any location should be able to review a correction request [#6247](https://github.com/opencrvs/opencrvs-core/issues/6247)
+- remove upload button when no supporting docs are configured [#5944](https://github.com/opencrvs/opencrvs-core/issues/5944)
 - Fix issues of invisible inputs when navigating from can't login link in login page [#6163](https://github.com/opencrvs/opencrvs-core/issues/6163)
 - Fix French translation missing for relationship to informant when trying to correct record, print and issue record [#6341] (https://github.com/opencrvs/opencrvs-core/issues/6341)
 - Fix print record page for an unsaved declaration [#6893](https://github.com/opencrvs/opencrvs-core/issues/6893)
diff --git a/packages/client/src/views/RegisterForm/review/ReviewSection.tsx b/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
index 6b8f2b5476b..17e059030ec 100644
--- a/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
+++ b/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
@@ -1834,6 +1834,12 @@ class ReviewSectionComp extends React.Component<FullProps, State> {
     }
 
     const options = this.prepSectionDocOptions(declaration)
+    const isUploadButtonVisible = Boolean(
+      documentsSection.groups[0].fields.filter((field) =>
+        this.isVisibleField(field, documentsSection)
+      ).length
+    )
+
     return (
       <Wrapper>
         <Row>
@@ -2047,6 +2053,7 @@ class ReviewSectionComp extends React.Component<FullProps, State> {
                     )}
                     {viewRecord ||
                     isDuplicate ||
+                    !isUploadButtonVisible ||
                     declaration.registrationStatus ===
                       SUBMISSION_STATUS.CORRECTION_REQUESTED ? null : (
                       <LinkButton

From 9a5d9c6310d8b5362bc97dce8c597df7b2a71a1a Mon Sep 17 00:00:00 2001
From: Anamul Haque <anamul1414@gmail.com>
Date: Thu, 6 Jun 2024 16:07:54 +0600
Subject: [PATCH 018/108] fix: place of certification showing wrong location in
 certificates (#7084)

---
 CHANGELOG.md                                  |  2 ++
 .../usePrintableCertificate.ts                | 22 +++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d18cd952705..7a18e32b185 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,8 @@
 - Fix Registrar of any location should be able to review a correction request [#6247](https://github.com/opencrvs/opencrvs-core/issues/6247)
 - remove upload button when no supporting docs are configured [#5944](https://github.com/opencrvs/opencrvs-core/issues/5944)
 - Fix issues of invisible inputs when navigating from can't login link in login page [#6163](https://github.com/opencrvs/opencrvs-core/issues/6163)
+- Remove leading slash from `resendAuthenticationCode` in login to fix resend email button [#6987](https://github.com/opencrvs/opencrvs-core/issues/6987) [#7037](https://github.com/opencrvs/opencrvs-core/issues/7037)
+- Fix 'Place of Certification' is showing wrong in certificate [#7060] (https://github.com/opencrvs/opencrvs-core/issues/7060)
 - Fix French translation missing for relationship to informant when trying to correct record, print and issue record [#6341] (https://github.com/opencrvs/opencrvs-core/issues/6341)
 - Fix print record page for an unsaved declaration [#6893](https://github.com/opencrvs/opencrvs-core/issues/6893)
 - Fix dashboard cron jobs not working [#7016](https://github.com/opencrvs/opencrvs-core/issues/7016)
diff --git a/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts b/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts
index 3447fc37d83..1cbe40b6095 100644
--- a/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts
+++ b/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts
@@ -50,7 +50,8 @@ import {
 import { Event } from '@client/utils/gateway'
 import { getUserName, UserDetails } from '@client/utils/userUtils'
 import { formatLongDate } from '@client/utils/date-formatting'
-import { IOfflineData } from '@client/offline/reducer'
+import { AdminStructure, IOfflineData } from '@client/offline/reducer'
+import { getLocationHierarchy } from '@client/utils/locationUtils'
 
 const withEnhancedTemplateVariables = (
   declaration: IPrintableDeclaration | undefined,
@@ -69,6 +70,22 @@ const withEnhancedTemplateVariables = (
     registeredDate,
     offlineData
   )
+
+  const locationKey = userDetails?.primaryOffice?.id
+    ? offlineData.offices[userDetails.primaryOffice.id].partOf.split('/')[1]
+    : ''
+  const { country, ...locationHierarchyIds } = getLocationHierarchy(
+    locationKey,
+    offlineData.locations
+  )
+
+  const locationHierarchy: Record<string, string | AdminStructure | undefined> =
+    { country }
+
+  for (const [key, value] of Object.entries(locationHierarchyIds)) {
+    locationHierarchy[`${key}Id`] = value
+  }
+
   return {
     ...declaration,
     data: {
@@ -82,7 +99,8 @@ const withEnhancedTemplateVariables = (
           loggedInUser: {
             name: getUserName(userDetails),
             officeId: userDetails.primaryOffice?.id,
-            signature: userDetails.localRegistrar?.signature
+            signature: userDetails.localRegistrar?.signature,
+            ...locationHierarchy
           }
         })
       } as IFormSectionData

From 2a213676fd16d112bfca752b40a42a5696e37e79 Mon Sep 17 00:00:00 2001
From: Muhammed Tareq Aziz <tareq.aziz@dsinnovators.com>
Date: Wed, 5 Jun 2024 12:59:35 +0600
Subject: [PATCH 019/108] Fix "Print and issue to groom|bride" is added to a
 different variable (#7066)

* Fix "Print and issue to groom|bride" is added to a different variable

* groom and bride default name fix

---------

Co-authored-by: Tameem Bin Haider <tameem.haider@dsinnovators.com>
---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a18e32b185..4a3288a12cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,7 +53,10 @@
 - Fix French translation missing for relationship to informant when trying to correct record, print and issue record [#6341] (https://github.com/opencrvs/opencrvs-core/issues/6341)
 - Fix print record page for an unsaved declaration [#6893](https://github.com/opencrvs/opencrvs-core/issues/6893)
 - Fix dashboard cron jobs not working [#7016](https://github.com/opencrvs/opencrvs-core/issues/7016)
-- Fix client modal glitches on integrations page [#7002] (https://github.com/opencrvs/opencrvs-core/issues/7002)
+- Fix Reset pagination to default page (1) when location changes in UserList [#6481](https://github.com/opencrvs/opencrvs-core/issues/6481)
+- Fix client modal glitches on integrations page [#7002](https://github.com/opencrvs/opencrvs-core/issues/7002)
+- Fix "Print and issue to groom|bride" is added to a different variable [#7066](https://github.com/opencrvs/opencrvs-core/pull/7066)
+- Fix Removed duplicateTrackingId check in createDuplicateTask method [#7081](https://github.com/opencrvs/opencrvs-core/pull/7081)
 
 ## Refactor
 

From 18d5e2f99153cb012bc52cfd8506cac493ba0cd9 Mon Sep 17 00:00:00 2001
From: Tareq <tareq.aziz@dsinnovators.com>
Date: Fri, 7 Jun 2024 18:35:30 +0600
Subject: [PATCH 020/108] fix: remove leading slash to make it relative (#7036)

* Fix URL path by removing leading slash

This change ensures that the constructed URL uses a relative path instead of an absolute path, appending 'resendAuthenticationCode' correctly to the base URL 'https://gateway.farajaland-qa.opencrvs.org/auth/'.

* chore(changelog)

---------

Co-authored-by: naftis <pyry.rouvila@gmail.com>
---
 CHANGELOG.md                        | 2 ++
 packages/login/src/utils/authApi.ts | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a3288a12cb..c33b2e0d265 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,6 +50,8 @@
 - Fix issues of invisible inputs when navigating from can't login link in login page [#6163](https://github.com/opencrvs/opencrvs-core/issues/6163)
 - Remove leading slash from `resendAuthenticationCode` in login to fix resend email button [#6987](https://github.com/opencrvs/opencrvs-core/issues/6987) [#7037](https://github.com/opencrvs/opencrvs-core/issues/7037)
 - Fix 'Place of Certification' is showing wrong in certificate [#7060] (https://github.com/opencrvs/opencrvs-core/issues/7060)
+- Fix dashboard cron jobs not working [#7016](https://github.com/opencrvs/opencrvs-core/issues/7016)
+- Fix Check for valid date to handle incomplete marriage declarations [#7017](https://github.com/opencrvs/opencrvs-core/issues/7017)
 - Fix French translation missing for relationship to informant when trying to correct record, print and issue record [#6341] (https://github.com/opencrvs/opencrvs-core/issues/6341)
 - Fix print record page for an unsaved declaration [#6893](https://github.com/opencrvs/opencrvs-core/issues/6893)
 - Fix dashboard cron jobs not working [#7016](https://github.com/opencrvs/opencrvs-core/issues/7016)
diff --git a/packages/login/src/utils/authApi.ts b/packages/login/src/utils/authApi.ts
index 33e6290985d..0cbdc629e9b 100644
--- a/packages/login/src/utils/authApi.ts
+++ b/packages/login/src/utils/authApi.ts
@@ -117,7 +117,7 @@ const resendAuthenticationCode = (
 ) => {
   return request({
     url: new URL(
-      '/resendAuthenticationCode',
+      'resendAuthenticationCode',
       window.config.AUTH_API_URL
     ).toString(),
     method: 'POST',

From 0a025e1a3fc81557e280abae6b3237fb6ea8d3c3 Mon Sep 17 00:00:00 2001
From: Muhammed Tareq Aziz <tareq.aziz@dsinnovators.com>
Date: Tue, 4 Jun 2024 15:41:16 +0600
Subject: [PATCH 021/108] fix: remove duplicateTrackingId check in
 createDuplicateTask method (#7081)

* Removed duplicateTrackingId check in createDuplicateTask method

* changelog updated
---
 packages/commons/src/fhir/extension.ts |  2 +-
 packages/workflow/src/records/fhir.ts  | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/commons/src/fhir/extension.ts b/packages/commons/src/fhir/extension.ts
index 8fa4b1c1fd2..9948f03f220 100644
--- a/packages/commons/src/fhir/extension.ts
+++ b/packages/commons/src/fhir/extension.ts
@@ -17,7 +17,7 @@ export type StringExtensionType = {
   }
   'http://opencrvs.org/specs/extension/markedAsDuplicate': {
     url: 'http://opencrvs.org/specs/extension/markedAsDuplicate'
-    valueString: string
+    valueString?: string
   }
   'http://opencrvs.org/specs/extension/educational-attainment': {
     url: 'http://opencrvs.org/specs/extension/educational-attainment'
diff --git a/packages/workflow/src/records/fhir.ts b/packages/workflow/src/records/fhir.ts
index 30bbe914767..0aa5103ac73 100644
--- a/packages/workflow/src/records/fhir.ts
+++ b/packages/workflow/src/records/fhir.ts
@@ -873,12 +873,10 @@ export function createDuplicateTask(
   duplicateTrackingId?: string
 ): SavedTask {
   const newExtensions: Extension[] = []
-  if (duplicateTrackingId) {
-    newExtensions.push({
-      url: 'http://opencrvs.org/specs/extension/markedAsDuplicate',
-      valueString: duplicateTrackingId
-    })
-  }
+  newExtensions.push({
+    url: 'http://opencrvs.org/specs/extension/markedAsDuplicate',
+    valueString: duplicateTrackingId
+  })
 
   const duplicateTask = createNewTaskResource(previousTask, newExtensions)
 

From 2b7449216f438bb5b4e2965112b9cf217521c647 Mon Sep 17 00:00:00 2001
From: Muhammed Tareq Aziz <tareqaziz.aust.cse@gmail.com>
Date: Thu, 30 May 2024 12:54:07 +0600
Subject: [PATCH 022/108] fix: check for valid date to handle incomplete
 marriage declarations (#7038)

* Fix issue #7017: Check for valid date to handle incomplete marriage declarations

Updated logic to use isValidPlainDate function to check date values, ensuring that null or invalid date values do not cause issues. This change allows the retrieval of incomplete marriage declarations even when the date of marriage is missing.

* changelog updated
---
 .../marriage/query/event-mappings.ts                      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/forms/register/mappings/event-specific-fields/marriage/query/event-mappings.ts b/packages/client/src/forms/register/mappings/event-specific-fields/marriage/query/event-mappings.ts
index 241a33a35ca..271f9491948 100644
--- a/packages/client/src/forms/register/mappings/event-specific-fields/marriage/query/event-mappings.ts
+++ b/packages/client/src/forms/register/mappings/event-specific-fields/marriage/query/event-mappings.ts
@@ -9,7 +9,10 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import { IFormField, IFormData } from '@client/forms'
-import { formatPlainDate } from '@client/utils/date-formatting'
+import {
+  formatPlainDate,
+  isValidPlainDate
+} from '@client/utils/date-formatting'
 
 export const marriageDateToFieldTransformation =
   (alternativeSectionIds?: string[]) =>
@@ -67,8 +70,7 @@ export const marriageDateFormatTransformation =
       queryValue = queryData[fromSectionIds].dateOfMarriage
     }
 
-    const date = new Date(queryValue)
-    if (!Number.isNaN(date.getTime())) {
+    if (isValidPlainDate(queryValue)) {
       const prevLocale = window.__localeId__
       window.__localeId__ = locale
 

From 44cfcf3e8c28a40aa0afce734c79b534cbf5371e Mon Sep 17 00:00:00 2001
From: Muhammed Tareq Aziz <tareqaziz.aust.cse@gmail.com>
Date: Wed, 29 May 2024 17:44:32 +0600
Subject: [PATCH 023/108] fix: reset pagination to page 1 when location changes
 (#7043)

* Fix: Reset pagination to page 1 when location changes

Ensure the currentPageNumber is reset to 1 whenever the location parameter changes to avoid issues where no data is found and the table and pagination components disappear.

* changelog updated
---
 CHANGELOG.md                                              | 5 +++--
 packages/client/src/views/SysAdmin/Team/user/UserList.tsx | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c33b2e0d265..cfe26288079 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,12 +53,13 @@
 - Fix dashboard cron jobs not working [#7016](https://github.com/opencrvs/opencrvs-core/issues/7016)
 - Fix Check for valid date to handle incomplete marriage declarations [#7017](https://github.com/opencrvs/opencrvs-core/issues/7017)
 - Fix French translation missing for relationship to informant when trying to correct record, print and issue record [#6341] (https://github.com/opencrvs/opencrvs-core/issues/6341)
-- Fix print record page for an unsaved declaration [#6893](https://github.com/opencrvs/opencrvs-core/issues/6893)
 - Fix dashboard cron jobs not working [#7016](https://github.com/opencrvs/opencrvs-core/issues/7016)
-- Fix Reset pagination to default page (1) when location changes in UserList [#6481](https://github.com/opencrvs/opencrvs-core/issues/6481)
 - Fix client modal glitches on integrations page [#7002](https://github.com/opencrvs/opencrvs-core/issues/7002)
 - Fix "Print and issue to groom|bride" is added to a different variable [#7066](https://github.com/opencrvs/opencrvs-core/pull/7066)
 - Fix Removed duplicateTrackingId check in createDuplicateTask method [#7081](https://github.com/opencrvs/opencrvs-core/pull/7081)
+- Fix print record page for an unsaved declaration [#6893](https://github.com/opencrvs/opencrvs-core/issues/6893)
+- Fix Reset pagination to default page (1) when location changes in UserList [#6481](https://github.com/opencrvs/opencrvs-core/issues/6481)
+- Fix client modal glitches on integrations page [#7002] (https://github.com/opencrvs/opencrvs-core/issues/7002)
 
 ## Refactor
 
diff --git a/packages/client/src/views/SysAdmin/Team/user/UserList.tsx b/packages/client/src/views/SysAdmin/Team/user/UserList.tsx
index 8a9e5ac7d00..34a7659c9ab 100644
--- a/packages/client/src/views/SysAdmin/Team/user/UserList.tsx
+++ b/packages/client/src/views/SysAdmin/Team/user/UserList.tsx
@@ -84,6 +84,8 @@ import { getLocalizedLocationName } from '@client/utils/locationUtils'
 import { HOME } from '@client/navigation/routes'
 
 const DEFAULT_FIELD_AGENT_LIST_SIZE = 10
+const DEFAULT_PAGE_NUMBER = 1
+
 const { useState } = React
 
 const UserTable = styled(BodyContent)`
@@ -269,7 +271,8 @@ function UserListComponent(props: IProps) {
     selectedUser: null
   })
 
-  const [currentPageNumber, setCurrentPageNumber] = useState<number>(1)
+  const [currentPageNumber, setCurrentPageNumber] =
+    useState<number>(DEFAULT_PAGE_NUMBER)
   const recordCount = DEFAULT_FIELD_AGENT_LIST_SIZE * currentPageNumber
   const searchedLocation: ILocation | undefined = offlineOffices.find(
     ({ id }) => locationId === id
@@ -633,6 +636,7 @@ function UserListComponent(props: IProps) {
           selectedLocationId={locationId}
           onChangeLocation={(locationId) => {
             props.goToTeamUserList(locationId)
+            setCurrentPageNumber(DEFAULT_PAGE_NUMBER)
           }}
           requiredLocationTypes={'CRVS_OFFICE'}
         />

From 4edbd563bdc5b20de399afa804432cd24355c149 Mon Sep 17 00:00:00 2001
From: Tareq <tareq.aziz@dsinnovators.com>
Date: Fri, 7 Jun 2024 19:28:08 +0600
Subject: [PATCH 024/108] changelog edited

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cfe26288079..ed19983dd6d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,7 +59,6 @@
 - Fix Removed duplicateTrackingId check in createDuplicateTask method [#7081](https://github.com/opencrvs/opencrvs-core/pull/7081)
 - Fix print record page for an unsaved declaration [#6893](https://github.com/opencrvs/opencrvs-core/issues/6893)
 - Fix Reset pagination to default page (1) when location changes in UserList [#6481](https://github.com/opencrvs/opencrvs-core/issues/6481)
-- Fix client modal glitches on integrations page [#7002] (https://github.com/opencrvs/opencrvs-core/issues/7002)
 
 ## Refactor
 

From 082edb1b181c30c99d4cfbedc1fbcb4cbefa09a4 Mon Sep 17 00:00:00 2001
From: Tareq <tareq.aziz@dsinnovators.com>
Date: Fri, 7 Jun 2024 19:30:38 +0600
Subject: [PATCH 025/108] changelog edited

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed19983dd6d..81cbd097d41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,7 +53,6 @@
 - Fix dashboard cron jobs not working [#7016](https://github.com/opencrvs/opencrvs-core/issues/7016)
 - Fix Check for valid date to handle incomplete marriage declarations [#7017](https://github.com/opencrvs/opencrvs-core/issues/7017)
 - Fix French translation missing for relationship to informant when trying to correct record, print and issue record [#6341] (https://github.com/opencrvs/opencrvs-core/issues/6341)
-- Fix dashboard cron jobs not working [#7016](https://github.com/opencrvs/opencrvs-core/issues/7016)
 - Fix client modal glitches on integrations page [#7002](https://github.com/opencrvs/opencrvs-core/issues/7002)
 - Fix "Print and issue to groom|bride" is added to a different variable [#7066](https://github.com/opencrvs/opencrvs-core/pull/7066)
 - Fix Removed duplicateTrackingId check in createDuplicateTask method [#7081](https://github.com/opencrvs/opencrvs-core/pull/7081)

From 4ef8fa6b3cc3be9b786f7887eb90a745230d3e7a Mon Sep 17 00:00:00 2001
From: tahmidrahman-dsi <tahmid.rahman@dsinnovators.com>
Date: Mon, 10 Jun 2024 20:15:06 +0600
Subject: [PATCH 026/108] feat: configurable image compression options (#7019)

* Covert DocumentUploaderWithOption to functional component

* Introduce a prop compressImagesToSizeMB to define maximum size of compressed file

* Minor refactor

* Add a maxSize prop to prevent uploading document bigger than a defined size

* Updates to the messages having variable maximum sizes

* Update FormFieldGenerator to make document uploader with options configurable from country config forms

* Fix typo

* Apply suggestions from code review

Co-authored-by: Tameem Bin Haider <tameem.haider@dsinnovators.com>

* Update CHANGELOG.md
---
 CHANGELOG.md                                  |   3 +
 .../DocumentUploaderWithOption.tsx            | 347 +++++++++---------
 .../components/form/FormFieldGenerator.tsx    |   2 +
 packages/client/src/forms/index.ts            |   4 +
 .../src/i18n/messages/views/imageUpload.ts    |  10 +-
 packages/client/src/utils/imageUtils.ts       |   7 +-
 .../client/src/views/Settings/ImageLoader.tsx |  20 +-
 .../Config/Certificates/Certificates.tsx      |   9 +-
 8 files changed, 210 insertions(+), 192 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81cbd097d41..0864d2ee8bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,9 @@
 - Allow defining maxLength attribute for number type fields [#6356](https://github.com/opencrvs/opencrvs-core/issues/6356)
 - Certificate handlebar for registration fees `registrationFees` [#6817](https://github.com/opencrvs/opencrvs-core/issues/6817)
 - Logged in user details handlebar `loggedInUser` [#6529](https://github.com/opencrvs/opencrvs-core/issues/6529)
+- Introduce two new properties to the form field `DOCUMENT_UPLOADER_WITH_OPTION`
+  - `compressImagesToSizeMB` : An optional prop of number type to define a compressed size. Compression is ignored when the input file is already smaller or equal of the given value or a falsy given value.
+  - `maxSizeMB`: An optional validation prop to prevent input of a file bigger than a defined value.
 
 ## Bug fixes
 
diff --git a/packages/client/src/components/form/DocumentUploadfield/DocumentUploaderWithOption.tsx b/packages/client/src/components/form/DocumentUploadfield/DocumentUploaderWithOption.tsx
index b5a929c0314..96ce3d6ec62 100644
--- a/packages/client/src/components/form/DocumentUploadfield/DocumentUploaderWithOption.tsx
+++ b/packages/client/src/components/form/DocumentUploadfield/DocumentUploaderWithOption.tsx
@@ -14,20 +14,19 @@ import { ErrorText } from '@opencrvs/components/lib/ErrorText'
 import { DocumentPreview } from '@client/components/form/DocumentUploadfield/DocumentPreview'
 import { IFileValue, IFormFieldValue, IAttachmentValue } from '@client/forms'
 import { ALLOWED_IMAGE_TYPE, EMPTY_STRING } from '@client/utils/constants'
-import * as React from 'react'
-import {
-  WrappedComponentProps as IntlShapeProps,
-  injectIntl,
-  MessageDescriptor
-} from 'react-intl'
+import React, { useState } from 'react'
+import { MessageDescriptor, useIntl } from 'react-intl'
 import styled from 'styled-components'
 import { DocumentListPreview } from './DocumentListPreview'
 import { remove, clone } from 'lodash'
-import { buttonMessages, formMessages } from '@client/i18n/messages'
+import { formMessages } from '@client/i18n/messages'
 import { messages } from '@client/i18n/messages/views/imageUpload'
 import imageCompression from 'browser-image-compression'
+import { bytesToMB } from '@client/utils/imageUtils'
 
-const options = {
+const DEFAULT_MAX_SIZE_MB = 5
+
+const defaultOptions = {
   maxSizeMB: 0.4,
   maxWidthOrHeight: 1920,
   useWebWorker: true
@@ -67,21 +66,15 @@ type IFullProps = {
   touched?: boolean
   onUploadingStateChanged?: (isUploading: boolean) => void
   requiredErrorMessage?: MessageDescriptor
-} & IntlShapeProps
+  compressImagesToSizeMB?: number
+  maxSizeMB?: number
+}
 
 type DocumentFields = {
   documentType: string
   documentData: string
 }
 
-type IState = {
-  errorMessage: string
-  fields: DocumentFields
-  previewImage: IFileValue | null
-  filesBeingProcessed: Array<{ label: string }>
-  dropDownOptions: ISelectOption[]
-}
-
 export const getBase64String = (file: File) => {
   return new Promise<string | ArrayBuffer>((resolve, reject) => {
     const reader = new FileReader()
@@ -95,72 +88,74 @@ export const getBase64String = (file: File) => {
   })
 }
 
-class DocumentUploaderWithOptionComp extends React.Component<
-  IFullProps,
-  IState
-> {
-  constructor(props: IFullProps) {
-    super(props)
-    this.state = {
-      errorMessage: EMPTY_STRING,
-      previewImage: null,
-      dropDownOptions: this.initializeDropDownOption(),
-      filesBeingProcessed: [],
-      fields: {
-        documentType: EMPTY_STRING,
-        documentData: EMPTY_STRING
-      }
-    }
-  }
+const initializeDropDownOption = (
+  options: ISelectOption[],
+  files: IFileValue[]
+): ISelectOption[] => {
+  const outputOptions = clone(options)
+  files &&
+    files.forEach((element: IFileValue) => {
+      remove(
+        outputOptions,
+        (option: ISelectOption) => option.value === element.optionValues[1]
+      )
+    })
 
-  initializeDropDownOption = (): ISelectOption[] => {
-    const options = clone(this.props.options)
-    this.props.files &&
-      this.props.files.forEach((element: IFileValue) => {
-        remove(
-          options,
-          (option: ISelectOption) => option.value === element.optionValues[1]
-        )
-      })
+  return outputOptions
+}
 
-    return options
-  }
+export const DocumentUploaderWithOption = (props: IFullProps) => {
+  const intl = useIntl()
+  const [errorMessage, setErrorMessage] = useState(EMPTY_STRING)
+  const [previewImage, setPreviewImage] = useState<IFileValue | null>(null)
+  const [dropdownOptions, setDropdownOptions] = useState<ISelectOption[]>(
+    initializeDropDownOption(props.options, props.files)
+  )
+  const [filesBeingProcessed, setFilesBeingProcessed] = useState<
+    Array<{ label: string }>
+  >([])
+  const [fields, setFields] = useState<DocumentFields>({
+    documentType: EMPTY_STRING,
+    documentData: EMPTY_STRING
+  })
+  const maxSize = props.maxSizeMB ?? DEFAULT_MAX_SIZE_MB
 
-  onChange = (documentType: string) => {
-    const currentState = this.state
-    currentState.fields.documentType = documentType
-    this.setState(currentState)
+  const onChange = (documentType: string) => {
+    setFields((currentFields) => ({
+      ...currentFields,
+      documentType
+    }))
   }
 
-  isValid = (): boolean => {
-    const isValid = !!this.state.fields.documentType
+  const isValid = (): boolean => {
+    const isValid = !!fields.documentType
 
-    this.setState({
-      errorMessage: isValid
-        ? EMPTY_STRING
-        : this.props.intl.formatMessage(messages.documentTypeRequired)
-    })
+    setErrorMessage(
+      isValid ? EMPTY_STRING : intl.formatMessage(messages.documentTypeRequired)
+    )
 
     return isValid
   }
 
-  processImage = async (uploadedImage: File) => {
+  const processImage = async (uploadedImage: File) => {
+    const options = { ...defaultOptions }
     if (!ALLOWED_IMAGE_TYPE.includes(uploadedImage.type)) {
-      this.setState({
-        errorMessage: this.props.intl.formatMessage(messages.uploadError)
-      })
+      setErrorMessage(intl.formatMessage(messages.uploadError, { maxSize }))
       throw new Error('File type not supported')
     }
 
-    if (uploadedImage.size > 5242880) {
-      this.setState({
-        errorMessage: this.props.intl.formatMessage(messages.overSized)
-      })
-      throw new Error(this.props.intl.formatMessage(messages.overSized))
+    if (bytesToMB(uploadedImage.size) > maxSize) {
+      setErrorMessage(intl.formatMessage(messages.overSized, { maxSize }))
+      throw new Error(intl.formatMessage(messages.overSized, { maxSize }))
     }
 
+    if (props.compressImagesToSizeMB !== undefined) {
+      options.maxSizeMB = props.compressImagesToSizeMB
+    }
+    // disable compression with a falsy value
     const resized =
-      uploadedImage.size > 512000 &&
+      Boolean(options.maxSizeMB) &&
+      bytesToMB(uploadedImage.size) > options.maxSizeMB &&
       (await imageCompression(uploadedImage, options))
 
     const fileAsBase64 = await getBase64String(resized || uploadedImage)
@@ -168,28 +163,27 @@ class DocumentUploaderWithOptionComp extends React.Component<
     return fileAsBase64.toString()
   }
 
-  handleFileChange = async (uploadedImage: File) => {
+  const handleFileChange = async (uploadedImage: File) => {
     if (!uploadedImage) {
       return
     }
 
     let fileAsBase64: string
     const optionValues: [IFormFieldValue, string] = [
-      this.props.extraValue,
-      this.state.fields.documentType
+      props.extraValue,
+      fields.documentType
     ]
 
-    this.setState((state) => ({
-      filesBeingProcessed: [
-        ...state.filesBeingProcessed,
-        {
-          label: optionValues[1]
-        }
-      ]
-    }))
+    setFilesBeingProcessed((filesCurrentlyBeingProcessed) => [
+      ...filesCurrentlyBeingProcessed,
+      {
+        label: optionValues[1]
+      }
+    ])
 
-    this.props.onUploadingStateChanged &&
-      this.props.onUploadingStateChanged(true)
+    if (props.onUploadingStateChanged) {
+      props.onUploadingStateChanged(true)
+    }
 
     const minimumProcessingTime = new Promise<void>((resolve) =>
       setTimeout(resolve, 2000)
@@ -198,30 +192,30 @@ class DocumentUploaderWithOptionComp extends React.Component<
     try {
       // Start processing
       ;[fileAsBase64] = await Promise.all([
-        this.processImage(uploadedImage),
+        processImage(uploadedImage),
         minimumProcessingTime
       ])
     } catch (error) {
-      this.props.onUploadingStateChanged &&
-        this.props.onUploadingStateChanged(false)
-
-      this.setState({
-        errorMessage:
-          this.state.errorMessage ||
-          this.props.intl.formatMessage(messages.uploadError),
-        // Remove from processing files
-        filesBeingProcessed: this.state.filesBeingProcessed.filter(
+      if (props.onUploadingStateChanged) {
+        props.onUploadingStateChanged(false)
+      }
+
+      setErrorMessage(
+        (msg) => msg || intl.formatMessage(messages.uploadError, { maxSize })
+      )
+      setFilesBeingProcessed((filesCurrentlyBeingProcessed) =>
+        filesCurrentlyBeingProcessed.filter(
           ({ label }) => label !== optionValues[1]
         )
-      })
+      )
       return
     }
 
-    const tempOptions = this.state.dropDownOptions
+    const tempOptions = dropdownOptions
 
     remove(
       tempOptions,
-      (option: ISelectOption) => option.value === this.state.fields.documentType
+      (option: ISelectOption) => option.value === fields.documentType
     )
 
     const newDocument: IFileValue = {
@@ -231,77 +225,70 @@ class DocumentUploaderWithOptionComp extends React.Component<
       fileSize: uploadedImage.size
     }
 
-    this.props.onComplete([...this.props.files, newDocument])
-    this.props.onUploadingStateChanged &&
-      this.props.onUploadingStateChanged(false)
-
-    this.setState((prevState) => {
-      return {
-        ...prevState,
-        errorMessage: EMPTY_STRING,
-        fields: {
-          documentType: EMPTY_STRING,
-          documentData: EMPTY_STRING
-        },
-        dropDownOptions: tempOptions,
-        // Remove from processing files
-        filesBeingProcessed: this.state.filesBeingProcessed.filter(
-          ({ label }) => label !== optionValues[1]
-        )
-      }
+    props.onComplete([...props.files, newDocument])
+    if (props.onUploadingStateChanged) {
+      props.onUploadingStateChanged(false)
+    }
+
+    setErrorMessage(EMPTY_STRING)
+    setFields({
+      documentType: EMPTY_STRING,
+      documentData: EMPTY_STRING
     })
+    setDropdownOptions(tempOptions)
+    setFilesBeingProcessed((filesCurrentlyBeingProcessed) =>
+      filesCurrentlyBeingProcessed.filter(
+        ({ label }) => label !== optionValues[1]
+      )
+    )
   }
 
-  onDelete = (image: IFileValue | IAttachmentValue) => {
+  const onDelete = (image: IFileValue | IAttachmentValue) => {
     const previewImage = image as IFileValue
-    const addableOption = this.props.options.find(
+    const addableOption = props.options.find(
       (item: ISelectOption) => item.value === previewImage.optionValues[1]
     ) as ISelectOption
-    const dropDownOptions = this.state.dropDownOptions.concat(addableOption)
-    this.setState(() => ({ dropDownOptions }))
-    this.props.onComplete(
-      this.props.files.filter((file) => file !== previewImage)
-    )
-    this.closePreviewSection()
+    setDropdownOptions((options) => options.concat(addableOption))
+    props.onComplete(props.files.filter((file) => file !== previewImage))
+    closePreviewSection()
   }
 
-  closePreviewSection = () => {
-    this.setState({ previewImage: null })
+  const closePreviewSection = () => {
+    setPreviewImage(null)
   }
 
-  selectForPreview = (previewImage: IFileValue | IAttachmentValue) => {
-    this.setState({ previewImage: previewImage as IFileValue })
+  const selectForPreview = (previewImage: IFileValue | IAttachmentValue) => {
+    setPreviewImage(previewImage as IFileValue)
   }
 
-  getFormattedLabelForDocType = (docType: string) => {
+  const getFormattedLabelForDocType = (docType: string) => {
     const matchingOptionForDocType =
-      this.props.options &&
-      this.props.options.find((option) => option.value === docType)
+      props.options && props.options.find((option) => option.value === docType)
     return matchingOptionForDocType && matchingOptionForDocType.label
   }
 
-  renderDocumentUploaderWithDocumentTypeBlock = () => {
-    const { name, intl, placeholder } = this.props
-    return this.props.splitView ? (
-      this.state.dropDownOptions.map((opt, idx) => (
+  const renderDocumentUploaderWithDocumentTypeBlock = () => {
+    const { name, placeholder } = props
+    return props.splitView ? (
+      dropdownOptions.map((opt, idx) => (
         <Flex splitView key={idx}>
           <Select
             id={`${name}${idx}`}
             placeholder={placeholder}
             options={[opt]}
             value={opt.value}
-            onChange={this.onChange}
+            onChange={onChange}
           />
 
           <ImageUploader
             id={`upload_document${idx}`}
             title={intl.formatMessage(formMessages.addFile)}
             onClick={(e) => {
-              this.onChange(opt.value)
-              return !this.isValid() && e.preventDefault()
+              onChange(opt.value)
+              return !isValid() && e.preventDefault()
             }}
-            handleFileChange={this.handleFileChange}
-            disabled={this.state.filesBeingProcessed.length > 0}
+            handleFileChange={handleFileChange}
+            disabled={filesBeingProcessed.length > 0}
           />
         </Flex>
       ))
@@ -310,65 +297,59 @@ class DocumentUploaderWithOptionComp extends React.Component<
         <Select
           id={name}
           placeholder={placeholder}
-          options={this.state.dropDownOptions}
-          value={this.state.fields.documentType}
-          onChange={this.onChange}
-          isDisabled={this.state.filesBeingProcessed.length > 0}
+          options={dropdownOptions}
+          value={fields.documentType}
+          onChange={onChange}
+          isDisabled={filesBeingProcessed.length > 0}
         />
 
         <ImageUploader
           id="upload_document"
           title={intl.formatMessage(formMessages.addFile)}
-          onClick={(e) => !this.isValid() && e.preventDefault()}
-          handleFileChange={this.handleFileChange}
-          disabled={this.state.filesBeingProcessed.length > 0}
+          onClick={(e) => !isValid() && e.preventDefault()}
+          handleFileChange={handleFileChange}
+          disabled={filesBeingProcessed.length > 0}
         />
       </Flex>
     )
   }
 
-  render() {
-    const { label, intl, requiredErrorMessage } = this.props
-
-    return (
-      <UploaderWrapper>
-        <ErrorMessage id="upload-error">
-          {this.state.errorMessage && (
-            <ErrorText>
-              {(requiredErrorMessage &&
-                intl.formatMessage(requiredErrorMessage)) ||
-                this.state.errorMessage}
-            </ErrorText>
+  const { requiredErrorMessage, label } = props
+
+  return (
+    <UploaderWrapper>
+      <ErrorMessage id="upload-error">
+        {errorMessage && (
+          <ErrorText>
+            {(requiredErrorMessage &&
+              intl.formatMessage(requiredErrorMessage)) ||
+              errorMessage}
+          </ErrorText>
+        )}
+      </ErrorMessage>
+
+      <Label>{label}</Label>
+      <DocumentListPreview
+        processingDocuments={filesBeingProcessed}
+        documents={props.files}
+        onSelect={selectForPreview}
+        dropdownOptions={props.options}
+        onDelete={onDelete}
+      />
+      {props.hideOnEmptyOption && dropdownOptions.length === 0
+        ? null
+        : renderDocumentUploaderWithDocumentTypeBlock()}
+
+      {previewImage && (
+        <DocumentPreview
+          previewImage={previewImage}
+          title={getFormattedLabelForDocType(
+            previewImage.optionValues[1] as string
           )}
-        </ErrorMessage>
-
-        <Label>{label}</Label>
-        <DocumentListPreview
-          processingDocuments={this.state.filesBeingProcessed}
-          documents={this.props.files}
-          onSelect={this.selectForPreview}
-          dropdownOptions={this.props.options}
-          onDelete={this.onDelete}
+          goBack={closePreviewSection}
+          onDelete={onDelete}
         />
-        {this.props.hideOnEmptyOption && this.state.dropDownOptions.length === 0
-          ? null
-          : this.renderDocumentUploaderWithDocumentTypeBlock()}
-
-        {this.state.previewImage && (
-          <DocumentPreview
-            previewImage={this.state.previewImage}
-            title={this.getFormattedLabelForDocType(
-              this.state.previewImage.optionValues[1] as string
-            )}
-            goBack={this.closePreviewSection}
-            onDelete={this.onDelete}
-          />
-        )}
-      </UploaderWrapper>
-    )
-  }
+      )}
+    </UploaderWrapper>
+  )
 }
-
-export const DocumentUploaderWithOption = injectIntl<'intl', IFullProps>(
-  DocumentUploaderWithOptionComp
-)
diff --git a/packages/client/src/components/form/FormFieldGenerator.tsx b/packages/client/src/components/form/FormFieldGenerator.tsx
index 501591da02e..4233683397d 100644
--- a/packages/client/src/components/form/FormFieldGenerator.tsx
+++ b/packages/client/src/components/form/FormFieldGenerator.tsx
@@ -270,6 +270,8 @@ const GeneratedInputField = React.memo<GeneratedInputFieldProps>(
           splitView={fieldDefinition.splitView}
           files={value as IFileValue[]}
           extraValue={fieldDefinition.extraValue || ''}
+          compressImagesToSizeMB={fieldDefinition.compressImagesToSizeMB}
+          maxSizeMB={fieldDefinition.maxSizeMB}
           hideOnEmptyOption={fieldDefinition.hideOnEmptyOption}
           onComplete={(files: IFileValue[]) => {
             onSetFieldValue(fieldDefinition.name, files)
diff --git a/packages/client/src/forms/index.ts b/packages/client/src/forms/index.ts
index 1b2c5e6e2b2..a5cf744cce9 100644
--- a/packages/client/src/forms/index.ts
+++ b/packages/client/src/forms/index.ts
@@ -644,6 +644,8 @@ export interface IImageUploaderWithOptionsFormField extends IFormFieldBase {
 }
 export interface IDocumentUploaderWithOptionsFormField extends IFormFieldBase {
   type: typeof DOCUMENT_UPLOADER_WITH_OPTION
+  compressImagesToSizeMB?: number
+  maxSizeMB?: number
   options: ISelectOption[]
   hideOnEmptyOption?: boolean
   splitView?: boolean
@@ -1140,6 +1142,8 @@ export interface Ii18nImageUploaderWithOptionsFormField
 export interface Ii18nDocumentUploaderWithOptions extends Ii18nFormFieldBase {
   type: typeof DOCUMENT_UPLOADER_WITH_OPTION
   options: SelectComponentOption[]
+  compressImagesToSizeMB?: number
+  maxSizeMB?: number
   hideOnEmptyOption?: boolean
   splitView?: boolean
 }
diff --git a/packages/client/src/i18n/messages/views/imageUpload.ts b/packages/client/src/i18n/messages/views/imageUpload.ts
index 1fa686ecd97..5e110681152 100644
--- a/packages/client/src/i18n/messages/views/imageUpload.ts
+++ b/packages/client/src/i18n/messages/views/imageUpload.ts
@@ -22,13 +22,13 @@ const messagesToDefine: IImageUploadMessages = {
   uploadError: {
     id: 'imageUploadOption.upload.error',
     defaultMessage:
-      'File format not supported. Please attach a png, jpg or pdf (max 5mb)',
+      'File format not supported. Please attach a png, jpg or pdf (max {maxSize}mb)',
     description: 'Show error messages while uploading'
   },
   imageFormat: {
     id: 'imageUploadOption.upload.imageFormat',
     defaultMessage:
-      'Image format not supported. Please attach a png or jpg (max 5mb)',
+      'Image format not supported. Please attach a png or jpg (max {maxSize}mb)',
     description:
       'Show error message if the selected image type is not supported'
   },
@@ -39,8 +39,10 @@ const messagesToDefine: IImageUploadMessages = {
   },
   overSized: {
     id: 'imageUploadOption.upload.overSized',
-    defaultMessage: 'File is too large. Please attach file less than 5mb',
-    description: 'Error message for Attachment size greater than 5mb.'
+    defaultMessage:
+      'File is too large. Please attach file less than {maxSize}mb',
+    description:
+      'Error message for Attachment size greater than defined max size.'
   }
 }
 
diff --git a/packages/client/src/utils/imageUtils.ts b/packages/client/src/utils/imageUtils.ts
index 4308939a7e7..606aa8ca34f 100644
--- a/packages/client/src/utils/imageUtils.ts
+++ b/packages/client/src/utils/imageUtils.ts
@@ -24,6 +24,8 @@ export const ERROR_TYPES = {
   OVERSIZED: 'overSized'
 }
 
+export const IMAGE_UPLOAD_MAX_SIZE_IN_BYTES = 5242880
+
 export const getBase64String = (file: File) => {
   return new Promise<string | ArrayBuffer>((resolve, reject) => {
     const reader = new FileReader()
@@ -55,7 +57,7 @@ export const validateImage = async (uploadedImage: File) => {
     throw new Error(ERROR_TYPES.IMAGE_TYPE)
   }
 
-  if (uploadedImage.size > 5242880) {
+  if (uploadedImage.size > IMAGE_UPLOAD_MAX_SIZE_IN_BYTES) {
     throw new Error(ERROR_TYPES.OVERSIZED)
   }
 
@@ -131,3 +133,6 @@ export async function fetchImageAsBase64(url: string): Promise<string> {
     reader.readAsDataURL(blob)
   })
 }
+
+export const bytesToMB = (bytes: number) =>
+  Number(Number(bytes / (1024 * 1024)).toFixed(2))
diff --git a/packages/client/src/views/Settings/ImageLoader.tsx b/packages/client/src/views/Settings/ImageLoader.tsx
index ba0eff5ee59..0d07878f33d 100644
--- a/packages/client/src/views/Settings/ImageLoader.tsx
+++ b/packages/client/src/views/Settings/ImageLoader.tsx
@@ -10,7 +10,13 @@
  */
 import * as React from 'react'
 import styled from 'styled-components'
-import { IImage, validateImage, ERROR_TYPES } from '@client/utils/imageUtils'
+import {
+  IImage,
+  validateImage,
+  ERROR_TYPES,
+  IMAGE_UPLOAD_MAX_SIZE_IN_BYTES,
+  bytesToMB
+} from '@client/utils/imageUtils'
 import { ALLOWED_IMAGE_TYPE } from '@client/utils/constants'
 import { messages } from '@client/i18n/messages/views/imageUpload'
 import { WrappedComponentProps as IntlShapeProps, injectIntl } from 'react-intl'
@@ -47,9 +53,17 @@ function ImageLoaderComp({
       } catch (error) {
         if (error instanceof Error) {
           if (error.message === ERROR_TYPES.OVERSIZED) {
-            onError(intl.formatMessage(messages.overSized))
+            onError(
+              intl.formatMessage(messages.overSized, {
+                maxSize: bytesToMB(IMAGE_UPLOAD_MAX_SIZE_IN_BYTES)
+              })
+            )
           } else {
-            onError(intl.formatMessage(messages.imageFormat))
+            onError(
+              intl.formatMessage(messages.imageFormat, {
+                maxSize: bytesToMB(IMAGE_UPLOAD_MAX_SIZE_IN_BYTES)
+              })
+            )
           }
         }
       } finally {
diff --git a/packages/client/src/views/SysAdmin/Config/Certificates/Certificates.tsx b/packages/client/src/views/SysAdmin/Config/Certificates/Certificates.tsx
index 1e067195cae..fcaa68db555 100644
--- a/packages/client/src/views/SysAdmin/Config/Certificates/Certificates.tsx
+++ b/packages/client/src/views/SysAdmin/Config/Certificates/Certificates.tsx
@@ -68,6 +68,10 @@ import { Link, Text, Toggle } from '@client/../../components/lib'
 import { NOTIFICATION_STATUS } from '@client/views/SysAdmin/Config/Application/utils'
 import { configApplicationMutations } from '@client/views/SysAdmin/Config/Application/mutations'
 import { UserDetails } from '@client/utils/userUtils'
+import {
+  bytesToMB,
+  IMAGE_UPLOAD_MAX_SIZE_IN_BYTES
+} from '@client/utils/imageUtils'
 
 const Value = styled.span`
   ${({ theme }) => theme.fonts.reg16};
@@ -341,7 +345,10 @@ class CertificatesConfigComponent extends React.Component<Props, State> {
     } catch (err) {
       this.setState({
         imageLoadingError: this.props.intl.formatMessage(
-          imageUploadMessages.imageFormat
+          imageUploadMessages.imageFormat,
+          {
+            maxSize: bytesToMB(IMAGE_UPLOAD_MAX_SIZE_IN_BYTES)
+          }
         )
       })
     }

From bf7de7e89e60496ca849e577f6576fe8eb3dd593 Mon Sep 17 00:00:00 2001
From: Euan Millar <euanmillar@users.noreply.github.com>
Date: Thu, 13 Jun 2024 17:01:07 +0100
Subject: [PATCH 027/108] Merge pull request #7067 from
 opencrvs/remove-nonce-from-mosip-esignet

Remove nonce check from MOSIP E-Signet
---
 packages/client/src/setupTests.ts             |  3 +-
 .../OIDPVerificationCallback.test.tsx         |  3 +-
 .../OIDPVerificationCallback.tsx              |  5 +--
 .../views/OIDPVerificationCallback/utils.ts   | 35 -------------------
 packages/gateway/src/constants.ts             |  3 +-
 .../OIDPUserInfo/root-resolvers.test.ts       |  5 ++-
 .../src/features/OIDPUserInfo/utils.ts        | 13 +++----
 packages/gateway/test/setupJest.ts            |  5 ++-
 packages/user-mgnt/src/constants.ts           |  3 --
 9 files changed, 16 insertions(+), 59 deletions(-)

diff --git a/packages/client/src/setupTests.ts b/packages/client/src/setupTests.ts
index 8998f0fb76c..55c0027e4d3 100644
--- a/packages/client/src/setupTests.ts
+++ b/packages/client/src/setupTests.ts
@@ -291,6 +291,5 @@ vi.mock('@client/views/OIDPVerificationCallback/utils', async () => ({
     '@client/views/OIDPVerificationCallback/utils'
   )) as any),
   useExtractCallBackState: vi.fn(),
-  useQueryParams: vi.fn(),
-  useCheckNonce: vi.fn()
+  useQueryParams: vi.fn()
 }))
diff --git a/packages/client/src/views/OIDPVerificationCallback/OIDPVerificationCallback.test.tsx b/packages/client/src/views/OIDPVerificationCallback/OIDPVerificationCallback.test.tsx
index d3c9cd1129e..953a5628f77 100644
--- a/packages/client/src/views/OIDPVerificationCallback/OIDPVerificationCallback.test.tsx
+++ b/packages/client/src/views/OIDPVerificationCallback/OIDPVerificationCallback.test.tsx
@@ -20,7 +20,7 @@ import { waitFor, waitForElement } from '@client/tests/wait-for-element'
 import { vi, Mock } from 'vitest'
 import { OIDPVerificationCallback } from './OIDPVerificationCallback'
 import { URLSearchParams } from 'url'
-import { useQueryParams, useExtractCallBackState, useCheckNonce } from './utils'
+import { useQueryParams, useExtractCallBackState } from './utils'
 import { GET_OIDP_USER_INFO } from './queries'
 import { createDeclaration, storeDeclaration } from '@client/declarations'
 import { Event } from '@client/utils/gateway'
@@ -131,7 +131,6 @@ beforeEach(async () => {
   ;(useQueryParams as Mock).mockImplementation(
     () => new URLSearchParams({ code: '1234' })
   )
-  ;(useCheckNonce as Mock).mockImplementation(() => true)
 
   await store.dispatch(checkAuth())
   await store.dispatch(storeDeclaration(draft))
diff --git a/packages/client/src/views/OIDPVerificationCallback/OIDPVerificationCallback.tsx b/packages/client/src/views/OIDPVerificationCallback/OIDPVerificationCallback.tsx
index 749c2640531..627166ed96b 100644
--- a/packages/client/src/views/OIDPVerificationCallback/OIDPVerificationCallback.tsx
+++ b/packages/client/src/views/OIDPVerificationCallback/OIDPVerificationCallback.tsx
@@ -19,7 +19,6 @@ import { useIntl } from 'react-intl'
 import { useDispatch, useSelector } from 'react-redux'
 import {
   addNidUserInfoToDeclaration,
-  useCheckNonce,
   useExtractCallBackState,
   useQueryParams
 } from '@client/views/OIDPVerificationCallback/utils'
@@ -38,7 +37,6 @@ import { OIDP_VERIFICATION_CALLBACK } from '@client/navigation/routes'
 // OIDP Verification Callback
 // --
 // Checks the ?state= query parameter for a JSON string like: { pathname: "/path/somewhere" }
-// Checks that the &nonce= parameter matches the one in localStorage, removes it if yes, throws if not
 // Redirects to the pathname in state
 
 const Page = styled.div`
@@ -65,7 +63,6 @@ const UserActionsContainer = styled.div`
 export const OIDPVerificationCallback = () => {
   const params = useQueryParams()
   const { pathname, declarationId, section } = useExtractCallBackState()
-  const isNonceOk = useCheckNonce()
   const code = params.get('code')
   const offlineData = useSelector(getOfflineData)
   const clientId = offlineData.systems.find((s) => s.type === 'NATIONAL_ID')
@@ -91,7 +88,7 @@ export const OIDPVerificationCallback = () => {
     }
   })
 
-  if (!pathname || !isNonceOk) {
+  if (!pathname) {
     // Do not redirect and let the hooks throw
     return null
   }
diff --git a/packages/client/src/views/OIDPVerificationCallback/utils.ts b/packages/client/src/views/OIDPVerificationCallback/utils.ts
index c748ad1c3fb..0f9b13eb526 100644
--- a/packages/client/src/views/OIDPVerificationCallback/utils.ts
+++ b/packages/client/src/views/OIDPVerificationCallback/utils.ts
@@ -22,8 +22,6 @@ import { useDispatch, useSelector } from 'react-redux'
 import { useLocation, useRouteMatch } from 'react-router'
 import { v4 as uuid } from 'uuid'
 
-const OIDP_VERIFICATION_NONCE_LOCALSTORAGE_KEY = 'oidp-verification-nonce'
-
 interface OIDPUserAddress {
   formatted?: string | null
   street_address?: string | null
@@ -183,10 +181,6 @@ export function addNidUserInfoToDeclaration(
   declarationDataSection[`${section}NidVerification`] = oidpUserInfo.sub
 }
 
-function generateNonce() {
-  return uuid()
-}
-
 function splitName(name: string | undefined | null = '') {
   if (!name) {
     return { firstName: '', lastName: '' }
@@ -231,8 +225,6 @@ export function redirectToNidIntegration(
   currentSection: string,
   currentPathname: string
 ) {
-  const nonce = generateNonce()
-  window.localStorage.setItem(OIDP_VERIFICATION_NONCE_LOCALSTORAGE_KEY, nonce)
   const nidSystemSetting = offlineCountryConfig.systems.find(
     (s) => s.type === 'NATIONAL_ID'
   )?.settings
@@ -242,7 +234,6 @@ export function redirectToNidIntegration(
   }
   const url = new URL(`${nidSystemSetting?.openIdProviderBaseUrl}authorize`)
 
-  url.searchParams.append('nonce', nonce)
   url.searchParams.append(
     'client_id',
     nidSystemSetting?.openIdProviderClientId || ''
@@ -264,32 +255,6 @@ export function redirectToNidIntegration(
   window.location.href = url.toString()
 }
 
-export const useCheckNonce = () => {
-  const params = useQueryParams()
-  const [nonceOk, setNonceOk] = useState(false)
-
-  useEffect(() => {
-    if (!params.get('nonce')) {
-      throw new Error('No nonce provided from OIDP callback.')
-    }
-
-    const nonceMatches =
-      window.localStorage.getItem(OIDP_VERIFICATION_NONCE_LOCALSTORAGE_KEY) ===
-      params.get('nonce')
-
-    if (nonceMatches) {
-      window.localStorage.removeItem(OIDP_VERIFICATION_NONCE_LOCALSTORAGE_KEY)
-      setNonceOk(true)
-    } else {
-      throw new Error(
-        'Nonce did not match the one sent to the integration before callback'
-      )
-    }
-  }, [params])
-
-  return nonceOk
-}
-
 export const useExtractCallBackState = () => {
   const params = useQueryParams()
 
diff --git a/packages/gateway/src/constants.ts b/packages/gateway/src/constants.ts
index 2b39de2352f..ffda6697ff0 100644
--- a/packages/gateway/src/constants.ts
+++ b/packages/gateway/src/constants.ts
@@ -77,7 +77,8 @@ export const DEFAULT_TIMEOUT = 600000
 export const MINIO_BUCKET = process.env.MINIO_BUCKET || 'ocrvs'
 
 export const OIDP_BASE_URL = process.env.NATIONAL_ID_OIDP_BASE_URL
-export const OIDP_REST_URL = process.env.NATIONAL_ID_OIDP_REST_URL
+export const OIDP_TOKEN_URL = process.env.NATIONAL_ID_OIDP_TOKEN_URL
+export const OIDP_USERINFO_URL = process.env.NATIONAL_ID_OIDP_USERINFO_URL
 /** Base64 encoded RS256 JSON Web Key */
 export const OIDP_CLIENT_PRIVATE_KEY =
   process.env.NATIONAL_ID_OIDP_CLIENT_PRIVATE_KEY
diff --git a/packages/gateway/src/features/OIDPUserInfo/root-resolvers.test.ts b/packages/gateway/src/features/OIDPUserInfo/root-resolvers.test.ts
index 940423f700f..56b1a3a6534 100644
--- a/packages/gateway/src/features/OIDPUserInfo/root-resolvers.test.ts
+++ b/packages/gateway/src/features/OIDPUserInfo/root-resolvers.test.ts
@@ -221,9 +221,8 @@ describe('get user info from OIDP national id integration', () => {
         redirectUri: 'http://localhost:3000/mosip-callback'
       }
     )
-
-    expect(fetch.mock.calls[0][0]).toMatch(/oauth\/token$/)
-    expect(fetch.mock.calls[1][0]).toMatch(/oidc\/userinfo$/)
+    expect(fetch.mock.calls[0][0]).toMatch(/oauth\/v2\/token$/)
+    expect(fetch.mock.calls[1][0]).toMatch(/oidc\/v2\/userinfo$/)
     expect(fetch.mock.calls[2][0]).toMatch(
       /Location\?name=Farajaland&type=ADMIN_STRUCTURE$/
     )
diff --git a/packages/gateway/src/features/OIDPUserInfo/utils.ts b/packages/gateway/src/features/OIDPUserInfo/utils.ts
index c552df60b5e..33cfccff04c 100644
--- a/packages/gateway/src/features/OIDPUserInfo/utils.ts
+++ b/packages/gateway/src/features/OIDPUserInfo/utils.ts
@@ -12,9 +12,10 @@ import * as jwt from 'jsonwebtoken'
 import * as jose from 'jose'
 import fetch from '@gateway/fetch'
 import {
-  OIDP_REST_URL,
   OIDP_CLIENT_PRIVATE_KEY,
-  OIDP_JWT_AUD_CLAIM
+  OIDP_JWT_AUD_CLAIM,
+  OIDP_TOKEN_URL,
+  OIDP_USERINFO_URL
 } from '@gateway/constants'
 
 import { logger } from '@gateway/logger'
@@ -25,10 +26,6 @@ import { fetchFromHearth } from '@gateway/features/fhir/service'
 const TOKEN_GRANT_TYPE = 'authorization_code'
 const CLIENT_ASSERTION_TYPE =
   'urn:ietf:params:oauth:client-assertion-type:jwt-bearer'
-const OIDP_TOKEN_ENDPOINT =
-  OIDP_REST_URL && new URL('oauth/token', OIDP_REST_URL).toString()
-const OIDP_USERINFO_ENDPOINT =
-  OIDP_REST_URL && new URL('oidc/userinfo', OIDP_REST_URL).toString()
 
 const JWT_ALG = 'RS256'
 const JWT_EXPIRATION_TIME = '1h'
@@ -94,7 +91,7 @@ export const fetchToken = async ({
     client_assertion: await generateSignedJwt(clientId)
   })
 
-  const request = await fetch(OIDP_TOKEN_ENDPOINT!, {
+  const request = await fetch(OIDP_TOKEN_URL!, {
     method: 'POST',
     headers: {
       'Content-Type': 'application/x-www-form-urlencoded'
@@ -107,7 +104,7 @@ export const fetchToken = async ({
 }
 
 export const fetchUserInfo = async (accessToken: string) => {
-  const request = await fetch(OIDP_USERINFO_ENDPOINT!, {
+  const request = await fetch(OIDP_USERINFO_URL!, {
     headers: {
       Authorization: 'Bearer ' + accessToken
     }
diff --git a/packages/gateway/test/setupJest.ts b/packages/gateway/test/setupJest.ts
index ba602b45377..12052b031da 100644
--- a/packages/gateway/test/setupJest.ts
+++ b/packages/gateway/test/setupJest.ts
@@ -20,6 +20,9 @@ process.env.CERT_PUBLIC_KEY_PATH = join(__dirname, './cert.key.pub')
 process.env.NATIONAL_ID_OIDP_CLIENT_PRIVATE_KEY =
   'ewogICAgInAiOiAiMVRMMlRPOWxNZnZOWThzeWVReFFrd3F1RThfdll5bV85ZS1yUkxRaV9reWJvLUMwUXJYVklQRFNfN2laV3I4WFB0MGlMWnJkemtjSzU0dGtKWGRkYWk3bEhxM3VyNndLU09uUHVPMURNS0stLXlNR3lCd0RfazdTbUdLUDlsTml3Q0pDT1Q2dDdjWEM1SnBEaVBNc05HQWNEUDZyRGFQQ2tlMzZUcjV5LW5NIiwKICAgICJrdHkiOiAiUlNBIiwKICAgICJxIjogIng4U1FwSHc2UlFnWmxHUC1EdWpiS1pRcUZxczAxU0ZsczFQa1lya25yM01rV1FrUFVGVDlubW5CbTlHWlVwbUV0TU9WZDc4SWVfdHV1UGZFVFo1SWYwTmt0bTNJdS1Pcm9jQzJBU3IzQnF0dUZyUnhUWTRJbnVBVnhHd0VuV0Frd1ZWR1dJQklEVkhSeHhGblAwZUo0YWNmVGVDcWs4QTE1cFRhOUo2MmY4ayIsCiAgICAiZCI6ICJubms3Q2RtT2hucVdyMTU1cW5hc25PY2pPamYyVEJLNlVpYUJOcWw1S1FBMmlJSnJGa0F1ZXFYcmwzM1J0eVgtZFFtOU1NTnhNLUYwMUpac3REME50eW1ZdXlzOVFMbGhKbld2RHlGLXlmMHJHOFJPVHROQkNuZjgxNUE2STQ1UzhqVUlXMGI1dl9lQlAxY1lKdWRLSW5QNlY0NVRZUEFlSjhKQ2hPeFJ2RlJHX2loOFVRaTdDZFZWNXFvVUVpX1lOWXNleTc1cTZpTFRiRVFFOExsNE9lMnRFNDMxTnltMTBaa185R2FNVEp0SU1YMm1iMW01blFfMTZmRC1ZNDZvWDlucW9zUUtUZ19uYmRoUFU3QWQwNW5MSjZFRER0X0JIbDNfc0d1blhrN3BhMjFTN1hfRjBQT0JrdG42dlNUV0FEZjQtM2pXaFNHa21yX3pyR3hLc1EiLAogICAgImUiOiAiQVFBQiIsCiAgICAicWkiOiAiRlpCaE55Uk5nMVhJVW44d1VFVGRCSEh4Qmx0Wk9tbDJhUzNXYlVZb3VuQlN1NDhoVk9BOGpWdFJFaWFBc25xUkxtaGNIN3V0aWVCTHBKazZsZ2pyM3RINnh3WklOSDRCb1NBYnRyUW5DMXd1ZE1fa1FCX1hpRk4tSFhPX0oyU2thV05nb19JSFFING1udXZnRUkxUEdpZGdwZzJ2NnJ6V3R3ZW5rbXhHblJnIiwKICAgICJkcCI6ICJNYkhMVDJ1TnZ2VGVqeUJTQjMwald1TG1hSl9UUU4zLWJLa00xdHJXUFVoR0R4RFZjNmRHb29MXzY3TnZxNE5YTzhQM3I0R2xxZXROVTJOZVdJMVdMT1g1YWdsSTFaSFlZOTU4R0xMVk1vVDgxelQyNDdZRUNFYl9ONTNoeUp6dks3SFFsZDlTVTFZQmM1LXhsajU0VTAwRHZOT3ZzMkkwZkNkb2JPcGZpcGsiLAogICAgImFsZyI6ICJSUzI1NiIsCiAgICAiZHEiOiAiYlJkRjJkMVJRTk5zaktHU1l2ZjhmeGNfYU1PMEJWUElvd2FFS1BsdDE1MHNVMGJrU3YwdXh1eF80eVN4OHU2TkR0M2o2TkcwdzJnS0RnNlg3NzhwWGY0aXFKRUpWcm04eDRkaW5QNm1pY2ppUkpuamFmUFBkMXR0NTZjSldodmYxb2hIOHhxU3ZsdFpFTG5MUlQ0LTZMQ0lJdEkydEpyNWxHTGpzMFJjNnlrIiwKICAgICJuIjogInBsNVE4QWVsT1ozWERyc093ems5T0ExNzR1WEF3ZnpxOW1NVXB2cVEwMC1sMFlKWGljZUlfWU13ZVJnS0tGTnpEMklEajhGNnJqaDh1THEwdjhiTE5oLWQzUEFwRHBTMTVOc3ZhN2U4VFZNR1paLVZJVDVKVGZqMzZsNWR2Q1oxa21MRUJ2ZjJhbzFHOVowMXU0NDNMZDRueEgzNHpkLTlUZU5VRXp4ejAweXUtOFBrRkJ5OGNySGVCR2JmcUlTLV9nbVJ6ZEIwclFQM29GT3hiNWJfa01WYUR6Wm5YSFVVemFIdDRNOEcxcHF2QjJOZzQzUDQ0d2NJME1YMVNHVkRQbGMtZVBfNjFjNW5qTzhoVnhnbUZzOUt0WVR5a0t3OXhsYUh6U1dCbG9ObVZFeG1Yd1ItckVzSTdJczdxOUpWTjdEVzNaNmYzRnk3NVpnN21rZXhTdyIKfQ=='
 process.env.NATIONAL_ID_OIDP_BASE_URL = 'http://localhost:27501/v1/oid/'
-process.env.NATIONAL_ID_OIDP_REST_URL = 'http://localhost:27502/v1/oid/'
+process.env.NATIONAL_ID_OIDP_TOKEN_URL =
+  'http://localhost:27502/v1/esignet/oauth/v2/token'
+process.env.NATIONAL_ID_OIDP_USERINFO_URL =
+  'http://localhost:27502/v1/esignet/oidc/v2/userinfo'
 process.env.NATIONAL_ID_OIDP_JWT_AUD_CLAIM =
   'http://localhost:27501/v1/idp/oauth/token'
diff --git a/packages/user-mgnt/src/constants.ts b/packages/user-mgnt/src/constants.ts
index d87807fb9ad..c8af7df6cc2 100644
--- a/packages/user-mgnt/src/constants.ts
+++ b/packages/user-mgnt/src/constants.ts
@@ -29,9 +29,6 @@ export const METRICS_URL = process.env.METRICS_URL || 'http://localhost:1050'
 export const NATIONAL_ID_OIDP_BASE_URL =
   process.env.NATIONAL_ID_OIDP_BASE_URL || null // e.g. https://api.esignet.io/v1/idp
 
-export const NATIONAL_ID_OIDP_REST_URL =
-  process.env.NATIONAL_ID_OIDP_REST_URL || null
-
 export const NATIONAL_ID_OIDP_CLIENT_ID =
   process.env.NATIONAL_ID_OIDP_CLIENT_ID || null
 

From ac79a11c279c16a4e29e5ec2eeae552110b327d0 Mon Sep 17 00:00:00 2001
From: Pyry Rouvila <pyry.rouvila@gmail.com>
Date: Thu, 23 May 2024 12:10:57 +0300
Subject: [PATCH 028/108] chore: ignore metabase vulnerability (#7034)

tested running trivy for v0.49 and the error isn't there anymore
---
 .trivyignore.yaml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.trivyignore.yaml b/.trivyignore.yaml
index 2d51dc5d3ec..5b5318f4dc1 100644
--- a/.trivyignore.yaml
+++ b/.trivyignore.yaml
@@ -40,10 +40,12 @@ vulnerabilities:
   - id: CVE-2022-1471
     statement: Dashboards vulns (java libs)
   - id: CVE-2024-25710
-    statement: Metabase v0.46 vulnerability (remove when v0.49 is released)
+    statement: Metabase v0.46 vulnerability, fixed in Metabase v0.49
   - id: CVE-2024-26308
-    statement: Metabase v0.46 vulnerability (remove when v0.49 is released)
+    statement: Metabase v0.46 vulnerability, fixed in Metabase v0.49
   - id: CVE-2024-22201
-    statement: Metabase v0.46 vulnerability (remove when v0.49 is released)
+    statement: Metabase v0.46 vulnerability, fixed in Metabase v0.49
   - id: CVE-2023-36478
-    statement: Metabase v0.46 vulnerability (remove when v0.49 is released)
+    statement: Metabase v0.46 vulnerability, fixed in Metabase v0.49
+  - id: CVE-2024-21634
+    statement: Metabase v0.46 vulnerability, fixed in Metabase v0.49

From 7dc8e1e9057607c09586711da7c5892deab64d66 Mon Sep 17 00:00:00 2001
From: Pyry Rouvila <pyry.rouvila@gmail.com>
Date: Tue, 11 Jun 2024 15:30:23 +0300
Subject: [PATCH 029/108] chore: ignore braces vulnerability issue (#7127)

Co-authored-by: Riku Rouvila <riku.rouvila@gmail.com>
---
 .trivyignore.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.trivyignore.yaml b/.trivyignore.yaml
index 5b5318f4dc1..b9a54ee9952 100644
--- a/.trivyignore.yaml
+++ b/.trivyignore.yaml
@@ -49,3 +49,5 @@ vulnerabilities:
     statement: Metabase v0.46 vulnerability, fixed in Metabase v0.49
   - id: CVE-2024-21634
     statement: Metabase v0.46 vulnerability, fixed in Metabase v0.49
+  - id: CVE-2024-4068
+    statement: Transitive dependency of lint-staged, jest and msw. Not running in production. Likely fixed by upgrading.

From 25729cf45f42c3cab007af12fd42efd07ad4f6ee Mon Sep 17 00:00:00 2001
From: Riku Rouvila <riku.rouvila@gmail.com>
Date: Fri, 14 Jun 2024 11:15:26 +0300
Subject: [PATCH 030/108] Merge pull request #7021 from opencrvs/ocrvs-7005

OCRVS-7005: Default to retrying the submission of records if something goes wrong in the backend
---
 packages/client/src/SubmissionController.ts   | 22 ++++-
 .../src/components/interface/Navigation.tsx   |  3 +-
 .../src/declarations/submissionMiddleware.ts  | 23 ++---
 .../src/i18n/messages/views/notifications.ts  | 11 +++
 packages/client/src/utils/referenceApi.ts     |  4 +-
 .../src/views/OfficeHome/outbox/Outbox.tsx    | 99 +++++++++++++------
 6 files changed, 113 insertions(+), 49 deletions(-)

diff --git a/packages/client/src/SubmissionController.ts b/packages/client/src/SubmissionController.ts
index d22361195c5..26dec84c31d 100644
--- a/packages/client/src/SubmissionController.ts
+++ b/packages/client/src/SubmissionController.ts
@@ -47,7 +47,7 @@ export const INPROGRESS_STATUS = [
   SUBMISSION_STATUS.REQUESTING_CORRECTION
 ] as const
 
-function isSubmissionAction(action: Action): action is SubmissionAction {
+export function isSubmissionAction(action: Action): action is SubmissionAction {
   return Object.values(SubmissionAction).includes(action as SubmissionAction)
 }
 
@@ -104,6 +104,7 @@ export class SubmissionController {
   /* eslint-disable no-console */
 
   public sync = () => {
+    const firstSync = this.syncCount === 0
     this.syncCount++
     console.debug(`[${this.syncCount}] Starting sync...`)
     if (!isNavigatorOnline() || this.syncRunning) {
@@ -116,11 +117,24 @@ export class SubmissionController {
     this.syncRunning = true
 
     this.requeueHangingDeclarations()
-    const declarations = this.getSubmitableDeclarations()
+    const submitableDeclarations = this.getSubmitableDeclarations()
+
+    if (firstSync) {
+      const failedDeclarations = this.getDeclarations().filter(
+        (declaration) =>
+          declaration.submissionStatus === SUBMISSION_STATUS.FAILED
+      )
+
+      submitableDeclarations.push(...failedDeclarations)
+      console.debug(
+        `[${this.syncCount}] First sync, adding ${failedDeclarations.length} failed declarations`
+      )
+    }
+
     console.debug(
-      `[${this.syncCount}] Syncing ${declarations.length} declarations`
+      `[${this.syncCount}] Syncing ${submitableDeclarations.length} declarations`
     )
-    for (const declaration of declarations) {
+    for (const declaration of submitableDeclarations) {
       const action = declaration.action
       if (action && isSubmissionAction(action)) {
         this.store.dispatch(
diff --git a/packages/client/src/components/interface/Navigation.tsx b/packages/client/src/components/interface/Navigation.tsx
index faf110be929..ef0f03f5c48 100644
--- a/packages/client/src/components/interface/Navigation.tsx
+++ b/packages/client/src/components/interface/Navigation.tsx
@@ -407,7 +407,8 @@ const NavigationView = (props: IFullProps) => {
       (
         [
           ...ALLOWED_STATUS_FOR_RETRY,
-          ...INPROGRESS_STATUS
+          ...INPROGRESS_STATUS,
+          SUBMISSION_STATUS.FAILED
         ] as SUBMISSION_STATUS[]
       ).includes(draft.submissionStatus as SUBMISSION_STATUS)
     ).length
diff --git a/packages/client/src/declarations/submissionMiddleware.ts b/packages/client/src/declarations/submissionMiddleware.ts
index cd3a5e22925..ff895be522b 100644
--- a/packages/client/src/declarations/submissionMiddleware.ts
+++ b/packages/client/src/declarations/submissionMiddleware.ts
@@ -326,15 +326,8 @@ export const submissionMiddleware: Middleware<{}, IStoreState> =
         2000
       )
     } catch (error) {
-      if (!(error instanceof ApolloError)) {
-        updateDeclaration(dispatch, {
-          ...declaration,
-          submissionStatus: SUBMISSION_STATUS.FAILED
-        })
-        captureException(error)
-        return
-      }
       if (
+        error instanceof ApolloError &&
         error.graphQLErrors.length > 0 &&
         error.graphQLErrors[0].extensions.code === 'UNASSIGNED'
       ) {
@@ -346,11 +339,19 @@ export const submissionMiddleware: Middleware<{}, IStoreState> =
         dispatch(deleteDeclaration(declaration.id, client))
         return
       }
+      if (error instanceof ApolloError && error.networkError) {
+        updateDeclaration(dispatch, {
+          ...declaration,
+          submissionStatus: SUBMISSION_STATUS.FAILED_NETWORK
+        })
+        captureException(error)
+        return
+      }
+
       updateDeclaration(dispatch, {
         ...declaration,
-        submissionStatus: error.networkError
-          ? SUBMISSION_STATUS.FAILED_NETWORK
-          : SUBMISSION_STATUS.FAILED
+        submissionStatus: SUBMISSION_STATUS.FAILED
       })
+      captureException(error)
     }
   }
diff --git a/packages/client/src/i18n/messages/views/notifications.ts b/packages/client/src/i18n/messages/views/notifications.ts
index 29911d63288..a419dffc8f2 100644
--- a/packages/client/src/i18n/messages/views/notifications.ts
+++ b/packages/client/src/i18n/messages/views/notifications.ts
@@ -129,6 +129,12 @@ const messagesToDefine = {
     description: 'Label for declaration status waiting for reject',
     id: 'regHome.outbox.statusWaitingToSubmit'
   },
+  retry: {
+    id: 'regHome.outbox.retry',
+    defaultMessage: 'Retry',
+    description:
+      'Copy for "Retry" button in Outbox shown for records that failed to send'
+  },
   userAuditSuccess: {
     defaultMessage:
       '{name} was {action, select, DEACTIVATE {deactivated} REACTIVATE {reactivated} other {deactivated}}',
@@ -164,6 +170,11 @@ const messagesToDefine = {
     description: 'Label for declaration status waiting for connection',
     id: 'regHome.outbox.waitingToRetry'
   },
+  failed: {
+    defaultMessage: 'Failed to send',
+    description: 'Label for declaration status failed',
+    id: 'regHome.outbox.failed'
+  },
   downloadDeclarationFailed: {
     defaultMessage: 'Failed to download declaration. Please try again',
     description: 'Label for declaration downloading failed',
diff --git a/packages/client/src/utils/referenceApi.ts b/packages/client/src/utils/referenceApi.ts
index 3617e5df5fb..79c8ec7f18f 100644
--- a/packages/client/src/utils/referenceApi.ts
+++ b/packages/client/src/utils/referenceApi.ts
@@ -199,8 +199,8 @@ async function loadForms(): Promise<LoadFormsResponse> {
     throw err
   }
 
-  if (res && res.status !== 201) {
-    throw Error(res.statusText)
+  if (res && !res.ok) {
+    throw new Error(res.statusText)
   }
 
   const response = await res.json()
diff --git a/packages/client/src/views/OfficeHome/outbox/Outbox.tsx b/packages/client/src/views/OfficeHome/outbox/Outbox.tsx
index 20c4ea0aefa..f0935889c4f 100644
--- a/packages/client/src/views/OfficeHome/outbox/Outbox.tsx
+++ b/packages/client/src/views/OfficeHome/outbox/Outbox.tsx
@@ -8,33 +8,29 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import * as React from 'react'
-import { WQContentWrapper } from '@client/views/OfficeHome/WQContentWrapper'
-import { useIntl } from 'react-intl'
-import { navigationMessages } from '@client/i18n/messages/views/navigation'
-import { getTheme } from '@opencrvs/components/lib/theme'
+import {
+  ALLOWED_STATUS_FOR_RETRY,
+  IInProgressStatus,
+  INPROGRESS_STATUS,
+  IRetryStatus,
+  isSubmissionAction
+} from '@client/SubmissionController'
+import { IDeclaration, SUBMISSION_STATUS } from '@client/declarations'
+import { declarationReadyForStatusChange } from '@client/declarations/submissionMiddleware'
 import {
   constantsMessages,
   dynamicConstantsMessages
 } from '@client/i18n/messages'
-import {
-  ColumnContentAlignment,
-  COLUMNS,
-  Workqueue,
-  SORT_ORDER
-} from '@opencrvs/components/lib/Workqueue'
+import { navigationMessages } from '@client/i18n/messages/views/navigation'
 import { messages } from '@client/i18n/messages/views/notifications'
-import { IDeclaration, SUBMISSION_STATUS } from '@client/declarations'
-import {
-  ConnectionError,
-  StatusSubmissionWaiting as StatusWaiting
-} from '@opencrvs/components/lib/icons'
-import { useSelector } from 'react-redux'
 import { IStoreState } from '@client/store'
+import { useOnlineStatus } from '@client/utils'
 import {
   formatPlainDate,
   isValidPlainDate
 } from '@client/utils/date-formatting'
+import { getDeclarationFullName } from '@client/utils/draftUtils'
+import { WQContentWrapper } from '@client/views/OfficeHome/WQContentWrapper'
 import {
   IconWithName,
   IconWithNameEvent,
@@ -45,15 +41,21 @@ import {
   changeSortedColumn,
   getSortedItems
 } from '@client/views/OfficeHome/utils'
-import {
-  ALLOWED_STATUS_FOR_RETRY,
-  IInProgressStatus,
-  INPROGRESS_STATUS,
-  IRetryStatus
-} from '@client/SubmissionController'
-import { useOnlineStatus } from '@client/utils'
 import { Spinner } from '@opencrvs/components/lib'
-import { getDeclarationFullName } from '@client/utils/draftUtils'
+import {
+  COLUMNS,
+  ColumnContentAlignment,
+  SORT_ORDER,
+  Workqueue
+} from '@opencrvs/components/lib/Workqueue'
+import {
+  ConnectionError,
+  StatusSubmissionWaiting as StatusWaiting
+} from '@opencrvs/components/lib/icons'
+import { getTheme } from '@opencrvs/components/lib/theme'
+import * as React from 'react'
+import { useIntl } from 'react-intl'
+import { useDispatch, useSelector } from 'react-redux'
 
 const statusMessageMap = {
   [SUBMISSION_STATUS.READY_TO_SUBMIT]: messages.statusWaitingToSubmit,
@@ -77,7 +79,8 @@ const statusMessageMap = {
   [SUBMISSION_STATUS.READY_TO_ISSUE]: messages.statusWaitingToIssue,
   [SUBMISSION_STATUS.CERTIFYING]: messages.statusCertifying,
   [SUBMISSION_STATUS.ISSUING]: messages.statusIssuing,
-  [SUBMISSION_STATUS.FAILED_NETWORK]: messages.waitingToRetry
+  [SUBMISSION_STATUS.FAILED_NETWORK]: messages.waitingToRetry,
+  [SUBMISSION_STATUS.FAILED]: messages.failed
 } as const
 
 const statusInprogressIconIdMap = {
@@ -92,7 +95,10 @@ const statusInprogressIconIdMap = {
   [SUBMISSION_STATUS.ISSUING]: 'issuing'
 }
 
-type OutboxSubmissionStatus = IRetryStatus | IInProgressStatus
+type OutboxSubmissionStatus =
+  | IRetryStatus
+  | IInProgressStatus
+  | SUBMISSION_STATUS.FAILED
 
 function isInprogressStatus(
   status: OutboxSubmissionStatus
@@ -130,7 +136,11 @@ const isOutboxDeclaration = (
 } =>
   Boolean(declaration.submissionStatus) &&
   (
-    [...ALLOWED_STATUS_FOR_RETRY, ...INPROGRESS_STATUS] as SUBMISSION_STATUS[]
+    [
+      ...ALLOWED_STATUS_FOR_RETRY,
+      ...INPROGRESS_STATUS,
+      SUBMISSION_STATUS.FAILED
+    ] as SUBMISSION_STATUS[]
   ).includes(declaration.submissionStatus as SUBMISSION_STATUS)
 
 export function Outbox() {
@@ -143,6 +153,7 @@ export function Outbox() {
   const declarations = useSelector((state: IStoreState) =>
     state.declarationsState?.declarations.filter(isOutboxDeclaration)
   )
+  const dispatch = useDispatch()
 
   React.useEffect(() => {
     function recordWindowWidth() {
@@ -214,7 +225,33 @@ export function Outbox() {
           />
         ),
         submissionStatus: statusText,
-        statusIndicator: icon ? [{ actionComponent: icon }] : null,
+        statusIndicator:
+          declaration.submissionStatus === SUBMISSION_STATUS.FAILED
+            ? [
+                {
+                  label: intl.formatMessage(messages.retry),
+                  disabled: false,
+                  handler: (
+                    e:
+                      | React.MouseEvent<HTMLButtonElement, MouseEvent>
+                      | undefined
+                  ) => {
+                    e && e.stopPropagation()
+                    if (!isSubmissionAction(declaration.action!)) {
+                      return
+                    }
+                    dispatch(
+                      declarationReadyForStatusChange({
+                        ...declaration,
+                        action: declaration.action
+                      })
+                    )
+                  }
+                }
+              ]
+            : icon
+            ? [{ actionComponent: icon }]
+            : null,
         dateOfEvent
       }
     })
@@ -267,14 +304,14 @@ export function Outbox() {
           },
           {
             label: '',
-            width: 21,
+            width: 15,
             key: 'submissionStatus',
             alignment: ColumnContentAlignment.RIGHT,
             color: theme.colors.supportingCopy
           },
           {
             label: '',
-            width: 4,
+            width: 10,
             key: 'statusIndicator',
             isActionColumn: true
           }

From c944f93ad666092e1e5231ec3d10dc532cd2902e Mon Sep 17 00:00:00 2001
From: Riku Rouvila <riku.rouvila@gmail.com>
Date: Thu, 13 Jun 2024 13:58:05 +0300
Subject: [PATCH 031/108] Merge pull request #7022 from
 opencrvs/consolidate-logging

Only use hapi-pino in production, consolidate different logging modules under commons
---
 development-environment/dev.sh                |  1 -
 packages/auth/package.json                    |  2 +-
 packages/auth/src/config/plugins.ts           | 20 ++--
 packages/auth/src/database.ts                 |  2 +-
 .../auth/src/features/authenticate/service.ts |  2 +-
 .../src/features/invalidateToken/handler.ts   |  2 +-
 .../sendUserName/handler.test.ts              |  2 +-
 .../retrievalSteps/sendUserName/handler.ts    |  2 +-
 .../retrievalSteps/verifyNumber/handler.ts    |  2 +-
 .../auth/src/features/verifyCode/handler.ts   |  2 +-
 packages/auth/src/server.ts                   |  2 +-
 packages/commons/package.json                 |  7 +-
 packages/commons/src/index.ts                 |  1 +
 packages/{auth => commons}/src/logger.ts      | 13 ++-
 packages/config/package.json                  |  2 +-
 packages/config/src/config/database.test.ts   |  3 +-
 packages/config/src/config/database.ts        |  6 +-
 packages/config/src/config/logger.ts          | 17 ----
 packages/config/src/config/plugins.ts         | 20 ++--
 .../application/applicationConfigHandler.ts   |  2 +-
 .../certificate/certificateHandler.ts         |  2 +-
 .../config/src/handlers/forms/formsHandler.ts | 11 ++-
 .../updateInformantSMSNotification/handler.ts |  2 +-
 packages/config/src/logger.ts                 | 17 ----
 packages/config/src/server.ts                 |  4 +-
 packages/config/src/services/documents.ts     |  2 +-
 packages/documents/package.json               |  2 +-
 packages/documents/src/config/plugins.ts      | 63 ++++++------
 packages/documents/src/logger.ts              | 17 ----
 packages/gateway/package.json                 |  6 +-
 packages/gateway/src/config/plugins.ts        | 21 ++--
 .../src/features/OIDPUserInfo/utils.ts        |  2 +-
 .../src/features/user/root-resolvers.ts       |  2 +-
 .../src/features/user/utils/index.test.ts     |  2 +-
 .../gateway/src/features/user/utils/index.ts  |  2 +-
 packages/gateway/src/logger.ts                | 17 ----
 .../gateway/src/routes/verifyCode/handler.ts  |  2 +-
 packages/gateway/src/server.ts                |  2 +-
 packages/gateway/src/utils/documents.ts       |  2 +-
 packages/gateway/src/utils/logger.ts          | 22 -----
 packages/gateway/src/utils/redis.ts           |  2 +-
 packages/metrics/package.json                 |  2 +-
 packages/metrics/src/config/database.test.ts  |  4 +-
 packages/metrics/src/config/database.ts       |  6 +-
 packages/metrics/src/config/plugins.ts        | 63 ++++++------
 .../src/features/performance/viewRefresher.ts |  2 +-
 packages/metrics/src/influxdb/client.ts       |  2 +-
 packages/metrics/src/logger.ts                | 18 ----
 packages/notification/package.json            |  2 +-
 packages/notification/src/config/plugins.ts   | 20 ++--
 packages/notification/src/database.test.ts    |  3 +-
 packages/notification/src/database.ts         |  6 +-
 .../src/features/email/all-user-handler.ts    |  2 +-
 .../src/features/email/service..ts            |  2 +-
 .../src/features/sms/birth-handler.ts         |  2 +-
 .../src/features/sms/death-handler.ts         |  2 +-
 .../src/features/sms/service.test.ts          |  2 +-
 .../notification/src/features/sms/service.ts  |  2 +-
 .../src/features/sms/user-handler.ts          |  2 +-
 packages/notification/src/logger.ts           | 17 ----
 packages/search/package.json                  |  2 +-
 packages/search/src/config/plugins.ts         | 20 ++--
 packages/search/src/config/routes.ts          |  2 +-
 .../search/src/elasticsearch/dbhelper.test.ts |  2 +-
 packages/search/src/elasticsearch/dbhelper.ts |  4 +-
 .../search/src/features/delete/handler.ts     |  2 +-
 .../search/src/features/fhir/fhir-utils.ts    |  2 +-
 .../registration/assignment/handler.ts        |  2 +-
 .../features/registration/birth/handler.ts    |  2 +-
 .../features/registration/death/handler.ts    |  2 +-
 .../registration/deduplicate/handler.ts       |  2 +-
 .../registration/deduplicate/service.ts       |  2 +-
 .../features/registration/marriage/handler.ts |  2 +-
 .../search/src/features/search/handler.ts     |  2 +-
 .../search/src/features/search/service.ts     |  2 +-
 packages/search/src/logger.ts                 | 17 ----
 packages/user-mgnt/package.json               |  2 +-
 packages/user-mgnt/src/config/plugins.ts      | 20 ++--
 packages/user-mgnt/src/database.test.ts       |  3 +-
 packages/user-mgnt/src/database.ts            |  6 +-
 .../src/features/activateUser/handler.test.ts |  2 +-
 .../src/features/activateUser/handler.ts      |  2 +-
 .../src/features/changeAvatar/handler.ts      |  2 +-
 .../src/features/changeEmail/handler.ts       |  2 +-
 .../src/features/changePassword/handler.ts    |  2 +-
 .../src/features/changePhone/handler.ts       |  2 +-
 .../src/features/createUser/handler.ts        |  2 +-
 .../src/features/createUser/service.test.ts   |  2 +-
 .../src/features/createUser/service.ts        |  2 +-
 .../src/features/resetPassword/handler.ts     |  2 +-
 .../user-mgnt/src/features/system/handler.ts  |  2 +-
 .../src/features/updateRole/handler.ts        |  2 +-
 .../src/features/updateUser/handler.ts        |  2 +-
 .../src/features/userAudit/handler.test.ts    |  2 +-
 .../src/features/userAudit/handler.ts         |  2 +-
 .../features/userSearchRecord/handler.test.ts |  2 +-
 .../src/features/userSearchRecord/handler.ts  |  2 +-
 .../usernameSMSReminderInvite/handler.ts      |  2 +-
 .../features/verifySecurityAnswer/handler.ts  |  2 +-
 packages/user-mgnt/src/logger.ts              | 17 ----
 packages/user-mgnt/src/server.ts              |  2 +-
 packages/webhooks/package.json                |  2 +-
 packages/webhooks/src/config/plugins.ts       | 20 ++--
 packages/webhooks/src/database.ts             | 11 ++-
 .../webhooks/src/features/event/handler.ts    |  2 +-
 .../webhooks/src/features/manage/handler.ts   |  2 +-
 packages/webhooks/src/logger.ts               | 17 ----
 packages/webhooks/src/processor.ts            |  2 +-
 packages/webhooks/src/queue.ts                |  2 +-
 packages/workflow/package.json                |  2 +-
 packages/workflow/src/config/plugins.ts       | 22 +++--
 .../registration/fhir/fhir-bundle-modifier.ts |  9 +-
 .../features/registration/fhir/fhir-utils.ts  |  2 +-
 .../registration/sms-notification-utils.ts    |  2 +-
 .../src/features/registration/utils.ts        |  8 +-
 packages/workflow/src/logger.ts               | 17 ----
 .../workflow/src/records/handler/create.ts    |  2 +-
 .../workflow/src/records/handler/download.ts  |  2 +-
 yarn.lock                                     | 97 ++++++++++++++++++-
 119 files changed, 406 insertions(+), 441 deletions(-)
 rename packages/{auth => commons}/src/logger.ts (70%)
 delete mode 100644 packages/config/src/config/logger.ts
 delete mode 100644 packages/config/src/logger.ts
 delete mode 100644 packages/documents/src/logger.ts
 delete mode 100644 packages/gateway/src/logger.ts
 delete mode 100644 packages/gateway/src/utils/logger.ts
 delete mode 100644 packages/metrics/src/logger.ts
 delete mode 100644 packages/notification/src/logger.ts
 delete mode 100644 packages/search/src/logger.ts
 delete mode 100644 packages/user-mgnt/src/logger.ts
 delete mode 100644 packages/webhooks/src/logger.ts
 delete mode 100644 packages/workflow/src/logger.ts

diff --git a/development-environment/dev.sh b/development-environment/dev.sh
index 3175d8b7a1e..b3ab7f3c66f 100755
--- a/development-environment/dev.sh
+++ b/development-environment/dev.sh
@@ -10,7 +10,6 @@ set -e
 DIR=$(cd "$(dirname "$0")"; pwd)
 
 export LANGUAGES="en,fr"
-export LOG_LEVEL="error"
 
 if [  -n "$(uname -a | grep Ubuntu)" ]; then
   OS="UBUNTU"
diff --git a/packages/auth/package.json b/packages/auth/package.json
index 8ad5eb6a1a1..62a65c9d2b9 100644
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@@ -5,7 +5,7 @@
   "license": "MPL-2.0",
   "private": true,
   "scripts": {
-    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --exec ts-node -r tsconfig-paths/register src/index.ts",
+    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --quiet --exec ts-node -r tsconfig-paths/register src/index.ts",
     "start:prod": "TS_NODE_BASEURL=./build/dist/src node -r tsconfig-paths/register build/dist/src/index.js",
     "test": "jest --coverage --silent --noStackTrace && yarn test:compilation",
     "test:watch": "jest --watch",
diff --git a/packages/auth/src/config/plugins.ts b/packages/auth/src/config/plugins.ts
index f3f7c841b28..0f733247518 100644
--- a/packages/auth/src/config/plugins.ts
+++ b/packages/auth/src/config/plugins.ts
@@ -8,27 +8,27 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
+import { SENTRY_DSN } from '@auth/constants'
+import { ServerRegisterPluginObject } from '@hapi/hapi'
+import { logger } from '@opencrvs/commons'
 import * as Pino from 'hapi-pino'
 import * as Sentry from 'hapi-sentry'
-import { SENTRY_DSN } from '@auth/constants'
-import { logger } from '@auth/logger'
 
-interface IHapiPlugin {
-  plugin: typeof Sentry | typeof Pino
-  options: Record<string, unknown>
-}
+type IHapiPlugin<T = any> = ServerRegisterPluginObject<T>
 
 export default function getPlugins() {
-  const plugins: IHapiPlugin[] = [
-    {
+  const plugins: IHapiPlugin[] = []
+
+  if (process.env.NODE_ENV === 'production') {
+    plugins.push({
       plugin: Pino,
       options: {
         prettyPrint: false,
         logPayload: false,
         instance: logger
       }
-    }
-  ]
+    })
+  }
 
   if (SENTRY_DSN) {
     plugins.push({
diff --git a/packages/auth/src/database.ts b/packages/auth/src/database.ts
index c1db79b41c0..c48ece96897 100644
--- a/packages/auth/src/database.ts
+++ b/packages/auth/src/database.ts
@@ -11,7 +11,7 @@
 import * as redis from 'redis'
 import { REDIS_HOST } from '@auth/constants'
 import { promisify } from 'util'
-import { logger } from '@auth/logger'
+import { logger } from '@opencrvs/commons'
 
 let redisClient: redis.RedisClient
 
diff --git a/packages/auth/src/features/authenticate/service.ts b/packages/auth/src/features/authenticate/service.ts
index e20fb42f285..6e372a3a1e2 100644
--- a/packages/auth/src/features/authenticate/service.ts
+++ b/packages/auth/src/features/authenticate/service.ts
@@ -31,7 +31,7 @@ import {
   sendVerificationCode,
   storeVerificationCode
 } from '@auth/features/verifyCode/service'
-import { logger } from '@auth/logger'
+import { logger } from '@opencrvs/commons'
 import { unauthorized } from '@hapi/boom'
 import { chainW, tryCatch } from 'fp-ts/Either'
 import { pipe } from 'fp-ts/function'
diff --git a/packages/auth/src/features/invalidateToken/handler.ts b/packages/auth/src/features/invalidateToken/handler.ts
index 615204830a4..986bf8cce3e 100644
--- a/packages/auth/src/features/invalidateToken/handler.ts
+++ b/packages/auth/src/features/invalidateToken/handler.ts
@@ -13,7 +13,7 @@ import * as Joi from 'joi'
 import { internal } from '@hapi/boom'
 import { invalidateToken } from '@auth/features/invalidateToken/service'
 import { postUserActionToMetrics } from '@auth/features/authenticate/service'
-import { logger } from '@auth/logger'
+import { logger } from '@opencrvs/commons'
 
 interface IInvalidateTokenPayload {
   token: string
diff --git a/packages/auth/src/features/retrievalSteps/sendUserName/handler.test.ts b/packages/auth/src/features/retrievalSteps/sendUserName/handler.test.ts
index 1af0225e33b..ca0c667cd36 100644
--- a/packages/auth/src/features/retrievalSteps/sendUserName/handler.test.ts
+++ b/packages/auth/src/features/retrievalSteps/sendUserName/handler.test.ts
@@ -14,7 +14,7 @@ import {
   storeRetrievalStepInformation,
   RetrievalSteps
 } from '@auth/features/retrievalSteps/verifyUser/service'
-import { logger } from '@auth/logger'
+import { logger } from '@opencrvs/commons'
 
 const fetch = fetchAny as fetchAny.FetchMock
 
diff --git a/packages/auth/src/features/retrievalSteps/sendUserName/handler.ts b/packages/auth/src/features/retrievalSteps/sendUserName/handler.ts
index 08dc387800a..3eb07c40bdd 100644
--- a/packages/auth/src/features/retrievalSteps/sendUserName/handler.ts
+++ b/packages/auth/src/features/retrievalSteps/sendUserName/handler.ts
@@ -19,7 +19,7 @@ import {
   RetrievalSteps,
   deleteRetrievalStepInformation
 } from '@auth/features/retrievalSteps/verifyUser/service'
-import { logger } from '@auth/logger'
+import { logger } from '@opencrvs/commons'
 import { PRODUCTION } from '@auth/constants'
 import { postUserActionToMetrics } from '@auth/features/authenticate/service'
 
diff --git a/packages/auth/src/features/retrievalSteps/verifyNumber/handler.ts b/packages/auth/src/features/retrievalSteps/verifyNumber/handler.ts
index 029f0a574a6..d87ba82857e 100644
--- a/packages/auth/src/features/retrievalSteps/verifyNumber/handler.ts
+++ b/packages/auth/src/features/retrievalSteps/verifyNumber/handler.ts
@@ -17,7 +17,7 @@ import {
 } from '@auth/features/retrievalSteps/verifyUser/service'
 import { checkVerificationCode } from '@auth/features/verifyCode/service'
 import { unauthorized } from '@hapi/boom'
-import { logger } from '@auth/logger'
+import { logger } from '@opencrvs/commons'
 
 interface IVerifyNumberPayload {
   nonce: string
diff --git a/packages/auth/src/features/verifyCode/handler.ts b/packages/auth/src/features/verifyCode/handler.ts
index 00d65975c5d..2d913920494 100644
--- a/packages/auth/src/features/verifyCode/handler.ts
+++ b/packages/auth/src/features/verifyCode/handler.ts
@@ -20,7 +20,7 @@ import {
   createToken,
   postUserActionToMetrics
 } from '@auth/features/authenticate/service'
-import { logger } from '@auth/logger'
+import { logger } from '@opencrvs/commons'
 import { WEB_USER_JWT_AUDIENCES, JWT_ISSUER } from '@auth/constants'
 interface IVerifyPayload {
   nonce: string
diff --git a/packages/auth/src/server.ts b/packages/auth/src/server.ts
index 425756dc547..bb8def41742 100644
--- a/packages/auth/src/server.ts
+++ b/packages/auth/src/server.ts
@@ -67,7 +67,7 @@ import sendUserNameHandler, {
   requestSchema as reqSendUserNameSchema
 } from '@auth/features/retrievalSteps/sendUserName/handler'
 import { tokenHandler } from '@auth/features/system/handler'
-import { logger } from '@auth/logger'
+import { logger } from '@opencrvs/commons'
 import { getPublicKey } from '@auth/features/authenticate/service'
 import anonymousTokenHandler, {
   responseSchema
diff --git a/packages/commons/package.json b/packages/commons/package.json
index a456da0153d..18b548ecb56 100644
--- a/packages/commons/package.json
+++ b/packages/commons/package.json
@@ -8,6 +8,7 @@
     ".": "./build/dist/index.js",
     "./monitoring": "./build/dist/monitoring.js",
     "./types": "./build/dist/types.js",
+    "./logger": "./build/dist/logger.js",
     "./authentication": "./build/dist/authentication.js",
     "./http": "./build/dist/http.js",
     "./fixtures": "./build/dist/fixtures.js"
@@ -19,7 +20,7 @@
     "test:compilation": "tsc --noEmit",
     "postinstall": "yarn build",
     "build": "tsc --project tsconfig.build.json",
-    "build:watch": "tsc --watch",
+    "build:watch": "tsc --watch --preserveWatchOutput",
     "build:clean": "rm -rf build"
   },
   "private": true,
@@ -40,7 +41,8 @@
     "node-fetch": "^2.6.7",
     "pkg-up": "^3.1.0",
     "typescript": "4.9.5",
-    "uuid": "^9.0.0"
+    "uuid": "^9.0.0",
+    "pino": "^7.0.0"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^4.5.0",
@@ -50,6 +52,7 @@
     "eslint-plugin-import": "^2.17.3",
     "eslint-plugin-prettier": "^4.0.0",
     "jest-fetch-mock": "^2.1.2",
+    "pino-pretty": "^11.0.0",
     "ts-jest": "^26.4.4"
   },
   "lint-staged": {
diff --git a/packages/commons/src/index.ts b/packages/commons/src/index.ts
index d6c2f371441..491c5b6a8b8 100644
--- a/packages/commons/src/index.ts
+++ b/packages/commons/src/index.ts
@@ -12,3 +12,4 @@ export * from './token-verifier'
 export * from './uuid'
 export * from './documents'
 export * from './http'
+export * from './logger'
diff --git a/packages/auth/src/logger.ts b/packages/commons/src/logger.ts
similarity index 70%
rename from packages/auth/src/logger.ts
rename to packages/commons/src/logger.ts
index bc3f171a97d..a04b1567533 100644
--- a/packages/auth/src/logger.ts
+++ b/packages/commons/src/logger.ts
@@ -9,7 +9,18 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import pino from 'pino'
-export const logger = pino()
+export const logger =
+  process.env.NODE_ENV === 'production'
+    ? pino()
+    : pino({
+        transport: {
+          target: 'pino-pretty',
+          options: {
+            colorize: true,
+            ignore: 'pid,hostname'
+          }
+        }
+      })
 
 const level = process.env.NODE_ENV === 'test' ? 'silent' : process.env.LOG_LEVEL
 if (level) {
diff --git a/packages/config/package.json b/packages/config/package.json
index fea6ba4645e..462c9c3f139 100644
--- a/packages/config/package.json
+++ b/packages/config/package.json
@@ -4,7 +4,7 @@
   "description": "OpenCRVS public configuration microservice",
   "license": "MPL-2.0",
   "scripts": {
-    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --exec ts-node -r tsconfig-paths/register src/index.ts",
+    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --quiet --exec ts-node -r tsconfig-paths/register src/index.ts",
     "start:prod": "TS_NODE_BASEURL=./build/dist/src node -r tsconfig-paths/register build/dist/src/index.js",
     "test": "jest --coverage --silent --noStackTrace && yarn test:compilation",
     "test:watch": "jest --watch",
diff --git a/packages/config/src/config/database.test.ts b/packages/config/src/config/database.test.ts
index 9d786aa848b..aa8b972d95b 100644
--- a/packages/config/src/config/database.test.ts
+++ b/packages/config/src/config/database.test.ts
@@ -10,12 +10,13 @@
  */
 import * as mongoose from 'mongoose'
 import { start, stop } from '@config/config/database'
-import { logger } from '@config/config/logger'
+import { logger } from '@opencrvs/commons'
 
 jest.mock('mongoose', () => ({
   connection: {
     on: jest.fn()
   },
+  set: () => {},
   connect: () => Promise.reject(),
   disconnect: () => {}
 }))
diff --git a/packages/config/src/config/database.ts b/packages/config/src/config/database.ts
index 5f9a309fe85..f356240fda7 100644
--- a/packages/config/src/config/database.ts
+++ b/packages/config/src/config/database.ts
@@ -10,10 +10,14 @@
  */
 import * as mongoose from 'mongoose'
 import { MONGO_URL } from '@config/config/constants'
-import { logger } from '@config/config/logger'
+import { logger } from '@opencrvs/commons'
 
 const db = mongoose.connection
 
+// This prepares code for Mongoose >7 where strictQuery
+// is set to false by default
+mongoose.set('strictQuery', false)
+
 db.on('disconnected', () => {
   logger.info('MongoDB disconnected')
 })
diff --git a/packages/config/src/config/logger.ts b/packages/config/src/config/logger.ts
deleted file mode 100644
index bc3f171a97d..00000000000
--- a/packages/config/src/config/logger.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * OpenCRVS is also distributed under the terms of the Civil Registration
- * & Healthcare Disclaimer located at http://opencrvs.org/license.
- *
- * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
- */
-import pino from 'pino'
-export const logger = pino()
-
-const level = process.env.NODE_ENV === 'test' ? 'silent' : process.env.LOG_LEVEL
-if (level) {
-  logger.level = level
-}
diff --git a/packages/config/src/config/plugins.ts b/packages/config/src/config/plugins.ts
index e56a526119b..1112d36fd00 100644
--- a/packages/config/src/config/plugins.ts
+++ b/packages/config/src/config/plugins.ts
@@ -8,24 +8,28 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import * as Pino from 'hapi-pino'
-import * as Sentry from 'hapi-sentry'
+import { logger } from '@opencrvs/commons'
 import { SENTRY_DSN } from '@config/config/constants'
+import { ServerRegisterPluginObject } from '@hapi/hapi'
 import * as JWT from 'hapi-auth-jwt2'
-import { logger } from '@config/config/logger'
+import * as Pino from 'hapi-pino'
+import * as Sentry from 'hapi-sentry'
+
+type IHapiPlugin<T = any> = ServerRegisterPluginObject<T>
 
 export default function getPlugins() {
-  const plugins: any[] = [
-    JWT,
-    {
+  const plugins: IHapiPlugin[] = [{ plugin: JWT, options: {} }]
+
+  if (process.env.NODE_ENV === 'production') {
+    plugins.push({
       plugin: Pino,
       options: {
         prettyPrint: false,
         logPayload: false,
         instance: logger
       }
-    }
-  ]
+    })
+  }
 
   if (SENTRY_DSN) {
     plugins.push({
diff --git a/packages/config/src/handlers/application/applicationConfigHandler.ts b/packages/config/src/handlers/application/applicationConfigHandler.ts
index 8a4c94b97a3..cfa2ff5885c 100644
--- a/packages/config/src/handlers/application/applicationConfigHandler.ts
+++ b/packages/config/src/handlers/application/applicationConfigHandler.ts
@@ -12,7 +12,7 @@ import * as Hapi from '@hapi/hapi'
 import ApplicationConfig, {
   IApplicationConfigurationModel
 } from '@config/models/config'
-import { logger } from '@config/config/logger'
+import { logger } from '@opencrvs/commons'
 import { badData, internal } from '@hapi/boom'
 import * as Joi from 'joi'
 import { merge, pick } from 'lodash'
diff --git a/packages/config/src/handlers/certificate/certificateHandler.ts b/packages/config/src/handlers/certificate/certificateHandler.ts
index c4ebc5ab79b..7081820aba0 100644
--- a/packages/config/src/handlers/certificate/certificateHandler.ts
+++ b/packages/config/src/handlers/certificate/certificateHandler.ts
@@ -14,7 +14,7 @@ import Certificate, {
   Status,
   Event
 } from '@config/models/certificate' //   IDeclarationConfigurationModel
-import { logger } from '@config/config/logger'
+import { logger } from '@opencrvs/commons'
 import * as Joi from 'joi'
 import { badRequest, notFound } from '@hapi/boom'
 import { verifyToken } from '@config/utils/verifyToken'
diff --git a/packages/config/src/handlers/forms/formsHandler.ts b/packages/config/src/handlers/forms/formsHandler.ts
index 2d6dd9b12ff..b5284cf45dc 100644
--- a/packages/config/src/handlers/forms/formsHandler.ts
+++ b/packages/config/src/handlers/forms/formsHandler.ts
@@ -15,7 +15,7 @@ import FormVersions, {
 } from '@config/models/formVersions'
 import * as Hapi from '@hapi/hapi'
 import fetch from 'node-fetch'
-import { logger } from '@config/config/logger'
+import { logger } from '@opencrvs/commons'
 import { badData } from '@hapi/boom'
 import { registrationForms } from './validation'
 import { fromZodError } from 'zod-validation-error'
@@ -39,8 +39,11 @@ export default async function getForm(
   })
 
   if (response.status !== 200) {
-    logger.error('Country config did not return 200 on forms endpoint')
-    return h.response().code(400)
+    logger.error(
+      `Core failed to fetch form definition from ${COUNTRY_CONFIG_URL}/forms. Check country config logs for more details`
+    )
+
+    return h.response().code(500)
   }
 
   const forms: IFormsPayload = await response.json()
@@ -76,5 +79,5 @@ export default async function getForm(
       return h.response().code(400)
     }
   }
-  return h.response(forms).code(201)
+  return h.response(forms).code(200)
 }
diff --git a/packages/config/src/handlers/informantSMSNotifications/updateInformantSMSNotification/handler.ts b/packages/config/src/handlers/informantSMSNotifications/updateInformantSMSNotification/handler.ts
index 01c5488abc7..d8f849762a5 100644
--- a/packages/config/src/handlers/informantSMSNotifications/updateInformantSMSNotification/handler.ts
+++ b/packages/config/src/handlers/informantSMSNotifications/updateInformantSMSNotification/handler.ts
@@ -10,7 +10,7 @@
  */
 
 import * as Hapi from '@hapi/hapi'
-import { logger } from '@config/config/logger'
+import { logger } from '@opencrvs/commons'
 import * as Joi from 'joi'
 import InformantSMSNotification from '@config/models/informantSMSNotifications'
 import { badRequest } from '@hapi/boom'
diff --git a/packages/config/src/logger.ts b/packages/config/src/logger.ts
deleted file mode 100644
index bc3f171a97d..00000000000
--- a/packages/config/src/logger.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * OpenCRVS is also distributed under the terms of the Civil Registration
- * & Healthcare Disclaimer located at http://opencrvs.org/license.
- *
- * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
- */
-import pino from 'pino'
-export const logger = pino()
-
-const level = process.env.NODE_ENV === 'test' ? 'silent' : process.env.LOG_LEVEL
-if (level) {
-  logger.level = level
-}
diff --git a/packages/config/src/server.ts b/packages/config/src/server.ts
index 33e94b3ff60..484a8bd062b 100644
--- a/packages/config/src/server.ts
+++ b/packages/config/src/server.ts
@@ -24,11 +24,9 @@ import {
 import getRoutes from '@config/config/routes'
 import getPlugins from '@config/config/plugins'
 import * as database from '@config/config/database'
-import { validateFunc } from '@opencrvs/commons'
+import { validateFunc, logger } from '@opencrvs/commons'
 import { readFileSync } from 'fs'
-import { logger } from '@config/logger'
 import { Boom, badRequest } from '@hapi/boom'
-
 export const publicCert = readFileSync(CERT_PUBLIC_KEY_PATH)
 
 export async function createServer() {
diff --git a/packages/config/src/services/documents.ts b/packages/config/src/services/documents.ts
index 196a30b75cd..7158c86c94f 100644
--- a/packages/config/src/services/documents.ts
+++ b/packages/config/src/services/documents.ts
@@ -11,7 +11,7 @@
 import fetch from 'node-fetch'
 import { DOCUMENTS_URL } from '@config/config/constants'
 import { internal } from '@hapi/boom'
-import { logger } from '@config/logger'
+import { logger } from '@opencrvs/commons'
 
 interface IAuthHeader {
   Authorization: string
diff --git a/packages/documents/package.json b/packages/documents/package.json
index 88b5bbf94b4..f67d1c2ec9c 100644
--- a/packages/documents/package.json
+++ b/packages/documents/package.json
@@ -5,7 +5,7 @@
   "license": "MPL-2.0",
   "private": true,
   "scripts": {
-    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first  nodemon --exec ts-node -r tsconfig-paths/register src/index.ts",
+    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first  nodemon --quiet --exec ts-node -r tsconfig-paths/register src/index.ts",
     "start:prod": "TS_NODE_BASEURL=./build/dist/src node -r tsconfig-paths/register build/dist/src/index.js",
     "test": "yarn test:compilation && jest --coverage --silent --noStackTrace",
     "test:watch": "jest --watch",
diff --git a/packages/documents/src/config/plugins.ts b/packages/documents/src/config/plugins.ts
index 76e92f42be7..276595b4b23 100644
--- a/packages/documents/src/config/plugins.ts
+++ b/packages/documents/src/config/plugins.ts
@@ -8,42 +8,41 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import * as Pino from 'hapi-pino'
+import { SENTRY_DSN } from '@documents/constants'
+import { logger } from '@opencrvs/commons'
 import * as JWT from 'hapi-auth-jwt2'
+import * as Pino from 'hapi-pino'
 import * as Sentry from 'hapi-sentry'
-import { SENTRY_DSN } from '@documents/constants'
-import { logger } from '@documents/logger'
+
+import { ServerRegisterPluginObject } from '@hapi/hapi'
+
+type IHapiPlugin<T = any> = ServerRegisterPluginObject<T>
 
 export default function getPlugins() {
-  const plugins: any[] = [
-    JWT,
-    ...(process.env.NODE_ENV === 'test' || process.env.LOG_LEVEL === 'silent'
-      ? []
-      : [
-          {
-            plugin: Pino,
-            options: {
-              prettyPrint: false,
-              logPayload: false,
-              instance: logger
-            }
-          },
-          ...(!SENTRY_DSN
-            ? []
-            : [
-                {
-                  plugin: Sentry,
-                  options: {
-                    client: {
-                      environment: process.env.DOMAIN,
-                      dsn: SENTRY_DSN
-                    },
-                    catchLogErrors: true
-                  }
-                }
-              ])
-        ])
-  ]
+  const plugins: IHapiPlugin[] = [{ plugin: JWT, options: {} }]
+
+  if (process.env.NODE_ENV === 'production') {
+    plugins.push({
+      plugin: Pino,
+      options: {
+        prettyPrint: false,
+        logPayload: false,
+        instance: logger
+      }
+    })
+  }
 
+  if (SENTRY_DSN) {
+    plugins.push({
+      plugin: Sentry,
+      options: {
+        client: {
+          environment: process.env.DOMAIN,
+          dsn: SENTRY_DSN
+        },
+        catchLogErrors: true
+      }
+    })
+  }
   return plugins
 }
diff --git a/packages/documents/src/logger.ts b/packages/documents/src/logger.ts
deleted file mode 100644
index bc3f171a97d..00000000000
--- a/packages/documents/src/logger.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * OpenCRVS is also distributed under the terms of the Civil Registration
- * & Healthcare Disclaimer located at http://opencrvs.org/license.
- *
- * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
- */
-import pino from 'pino'
-export const logger = pino()
-
-const level = process.env.NODE_ENV === 'test' ? 'silent' : process.env.LOG_LEVEL
-if (level) {
-  logger.level = level
-}
diff --git a/packages/gateway/package.json b/packages/gateway/package.json
index 7d7c0edda7a..068f519fa74 100644
--- a/packages/gateway/package.json
+++ b/packages/gateway/package.json
@@ -5,7 +5,7 @@
   "license": "MPL-2.0",
   "scripts": {
     "postinstall": "if [ \"$NODE_ENV\" != \"production\" ]; then npx crlf --set=LF ../../node_modules/graphql-schema-typescript/**/* || npx crlf --set=LF ./node_modules/graphql-schema-typescript/**/* || true; fi",
-    "start": "yarn gen:schema && yarn gen:types && concurrently \"NODE_OPTIONS=--dns-result-order=ipv4first nodemon --exec ts-node -r tsconfig-paths/register src/index.ts\" \"yarn gen:types:watch\" \"yarn gen:schema:watch\"",
+    "start": "yarn gen:schema && yarn gen:types && concurrently \"NODE_OPTIONS=--dns-result-order=ipv4first nodemon --quiet --exec ts-node -r tsconfig-paths/register src/index.ts\" \"yarn gen:types:watch\" \"yarn gen:schema:watch\"",
     "start:prod": "TS_NODE_BASEURL=./build/dist/src node -r tsconfig-paths/register build/dist/src/index.js",
     "test": "jest && yarn test:compilation",
     "test:watch": "jest --watch",
@@ -14,8 +14,8 @@
     "build:clean": "rm -rf build",
     "gen:schema": "node -e \"const importSchema = require('graphql-import').importSchema; console.log(importSchema('src/graphql/index.graphql'))\" > src/graphql/schema.graphql && yarn prettier --write src/graphql/schema.graphql",
     "gen:types": "graphql-schema-typescript generate-ts src/graphql/schema.graphql --output src/graphql/schema.d.ts --importStatements 'import {Context} from \"./context\"' --contextType Context && yarn prettier --write src/graphql/schema.d.ts",
-    "gen:schema:watch": "nodemon --on-change-only -e graphql -i src/graphql/schema.graphql -x 'yarn gen:schema'",
-    "gen:types:watch": "nodemon --on-change-only -w src/graphql/schema.graphql -x 'yarn gen:types'",
+    "gen:schema:watch": "nodemon --quiet --on-change-only -e graphql -i src/graphql/schema.graphql -x 'yarn gen:schema'",
+    "gen:types:watch": "nodemon --quiet --on-change-only -w src/graphql/schema.graphql -x 'yarn gen:types'",
     "open:cov": "yarn test && opener coverage/index.html",
     "lint": "eslint -c .eslintrc.js --fix ./src",
     "precommit": "lint-staged"
diff --git a/packages/gateway/src/config/plugins.ts b/packages/gateway/src/config/plugins.ts
index b4e110c8498..f34cb6b42c8 100644
--- a/packages/gateway/src/config/plugins.ts
+++ b/packages/gateway/src/config/plugins.ts
@@ -13,7 +13,7 @@ import * as JWT from 'hapi-auth-jwt2'
 import * as Pino from 'hapi-pino'
 import * as Sentry from 'hapi-sentry'
 import { SENTRY_DSN } from '@gateway/constants'
-import { logger } from '@gateway/logger'
+import { logger } from '@opencrvs/commons'
 import * as HapiSwagger from 'hapi-swagger'
 import { ServerRegisterPluginObject } from '@hapi/hapi'
 import * as H2o2 from '@hapi/h2o2'
@@ -33,14 +33,6 @@ export const getPlugins = () => {
 
   const plugins = [
     JWT,
-    {
-      plugin: Pino,
-      options: {
-        prettyPrint: true,
-        logPayload: false,
-        instance: logger
-      }
-    },
     {
       plugin: HapiSwagger,
       options: swaggerOptions
@@ -48,6 +40,17 @@ export const getPlugins = () => {
     H2o2
   ] as Array<ServerRegisterPluginObject<any>>
 
+  if (process.env.NODE_ENV === 'production') {
+    plugins.push({
+      plugin: Pino,
+      options: {
+        prettyPrint: false,
+        logPayload: false,
+        instance: logger
+      }
+    })
+  }
+
   if (SENTRY_DSN) {
     plugins.push({
       plugin: Sentry,
diff --git a/packages/gateway/src/features/OIDPUserInfo/utils.ts b/packages/gateway/src/features/OIDPUserInfo/utils.ts
index 33cfccff04c..aa42fd4dae2 100644
--- a/packages/gateway/src/features/OIDPUserInfo/utils.ts
+++ b/packages/gateway/src/features/OIDPUserInfo/utils.ts
@@ -18,7 +18,7 @@ import {
   OIDP_USERINFO_URL
 } from '@gateway/constants'
 
-import { logger } from '@gateway/logger'
+import { logger } from '@opencrvs/commons'
 import { OIDPUserInfo } from './oidp-types'
 import { Bundle, Location } from '@opencrvs/commons/types'
 import { fetchFromHearth } from '@gateway/features/fhir/service'
diff --git a/packages/gateway/src/features/user/root-resolvers.ts b/packages/gateway/src/features/user/root-resolvers.ts
index c27f068e0f6..bb80c257f54 100644
--- a/packages/gateway/src/features/user/root-resolvers.ts
+++ b/packages/gateway/src/features/user/root-resolvers.ts
@@ -29,7 +29,7 @@ import {
   GQLUserIdentifierInput,
   GQLUserInput
 } from '@gateway/graphql/schema'
-import { logger } from '@gateway/logger'
+import { logger } from '@opencrvs/commons'
 import { checkVerificationCode } from '@gateway/routes/verifyCode/handler'
 import { UserInputError } from 'apollo-server-hapi'
 import fetch from '@gateway/fetch'
diff --git a/packages/gateway/src/features/user/utils/index.test.ts b/packages/gateway/src/features/user/utils/index.test.ts
index 7213503c10c..34cca636403 100644
--- a/packages/gateway/src/features/user/utils/index.test.ts
+++ b/packages/gateway/src/features/user/utils/index.test.ts
@@ -8,7 +8,7 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import { logger } from '@gateway/logger'
+import { logger } from '@opencrvs/commons'
 import { getUserMobile } from '@gateway/features/user/utils/'
 import * as fetchAny from 'jest-fetch-mock'
 const fetch = fetchAny as any
diff --git a/packages/gateway/src/features/user/utils/index.ts b/packages/gateway/src/features/user/utils/index.ts
index eb5de2f3f7c..f69d0094562 100644
--- a/packages/gateway/src/features/user/utils/index.ts
+++ b/packages/gateway/src/features/user/utils/index.ts
@@ -14,7 +14,7 @@ import {
   ISystemModelData,
   IUserModelData
 } from '@gateway/features/user/type-resolvers'
-import { logger } from '@gateway/logger'
+import { logger } from '@opencrvs/commons'
 import * as decode from 'jwt-decode'
 import fetch from '@gateway/fetch'
 import { Scope } from '@opencrvs/commons/authentication'
diff --git a/packages/gateway/src/logger.ts b/packages/gateway/src/logger.ts
deleted file mode 100644
index bc3f171a97d..00000000000
--- a/packages/gateway/src/logger.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * OpenCRVS is also distributed under the terms of the Civil Registration
- * & Healthcare Disclaimer located at http://opencrvs.org/license.
- *
- * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
- */
-import pino from 'pino'
-export const logger = pino()
-
-const level = process.env.NODE_ENV === 'test' ? 'silent' : process.env.LOG_LEVEL
-if (level) {
-  logger.level = level
-}
diff --git a/packages/gateway/src/routes/verifyCode/handler.ts b/packages/gateway/src/routes/verifyCode/handler.ts
index 731229d5cdd..2ce99dcb62a 100644
--- a/packages/gateway/src/routes/verifyCode/handler.ts
+++ b/packages/gateway/src/routes/verifyCode/handler.ts
@@ -24,7 +24,7 @@ import { readFileSync } from 'fs'
 import * as jwt from 'jsonwebtoken'
 import fetch from '@gateway/fetch'
 import { unauthorized } from '@hapi/boom'
-import { logger } from '@gateway/logger'
+import { logger } from '@opencrvs/commons'
 import * as t from 'io-ts'
 import * as F from 'fp-ts'
 
diff --git a/packages/gateway/src/server.ts b/packages/gateway/src/server.ts
index d3077cccb04..5c00d3d8d9e 100644
--- a/packages/gateway/src/server.ts
+++ b/packages/gateway/src/server.ts
@@ -32,7 +32,7 @@ import {
 import { ApolloServerPluginLandingPageGraphQLPlayground } from 'apollo-server-core'
 import { getApolloConfig } from '@gateway/graphql/config'
 import * as database from '@gateway/utils/redis'
-import { logger } from '@gateway/logger'
+import { logger } from '@opencrvs/commons'
 import { badRequest, Boom } from '@hapi/boom'
 import { RateLimitError } from './rate-limit'
 
diff --git a/packages/gateway/src/utils/documents.ts b/packages/gateway/src/utils/documents.ts
index 66d6ff8356a..2c0dc1ae737 100644
--- a/packages/gateway/src/utils/documents.ts
+++ b/packages/gateway/src/utils/documents.ts
@@ -11,7 +11,7 @@
 import fetch from '@gateway/fetch'
 import { DOCUMENTS_URL } from '@gateway/constants'
 import { internal } from '@hapi/boom'
-import { logger } from '@gateway/logger'
+import { logger } from '@opencrvs/commons'
 import { IAuthHeader } from '@opencrvs/commons'
 
 export async function uploadSvg(fileData: string, authHeader: IAuthHeader) {
diff --git a/packages/gateway/src/utils/logger.ts b/packages/gateway/src/utils/logger.ts
deleted file mode 100644
index 00570937227..00000000000
--- a/packages/gateway/src/utils/logger.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * OpenCRVS is also distributed under the terms of the Civil Registration
- * & Healthcare Disclaimer located at http://opencrvs.org/license.
- *
- * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
- */
-import * as Bunyan from 'bunyan'
-
-export const getLogger = (
-  logLevel: number | undefined,
-  appName: string | undefined
-) => {
-  return Bunyan.createLogger({
-    name: appName ? appName : 'testApp',
-    level: logLevel ? logLevel : 0,
-    serializers: Bunyan.stdSerializers
-  })
-}
diff --git a/packages/gateway/src/utils/redis.ts b/packages/gateway/src/utils/redis.ts
index 77cdcab2b7c..cda564209f1 100644
--- a/packages/gateway/src/utils/redis.ts
+++ b/packages/gateway/src/utils/redis.ts
@@ -11,7 +11,7 @@
 import * as redis from 'redis'
 import { REDIS_HOST } from '@gateway/constants'
 import { promisify } from 'util'
-import { logger } from '@gateway/logger'
+import { logger } from '@opencrvs/commons'
 
 let redisClient: redis.RedisClient
 
diff --git a/packages/metrics/package.json b/packages/metrics/package.json
index 0e56159778f..50eda6defda 100644
--- a/packages/metrics/package.json
+++ b/packages/metrics/package.json
@@ -5,7 +5,7 @@
   "license": "MPL-2.0",
   "private": true,
   "scripts": {
-    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --exec ts-node -r tsconfig-paths/register src/index.ts",
+    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --quiet --exec ts-node -r tsconfig-paths/register src/index.ts",
     "start:prod": "TS_NODE_BASEURL=./build/dist/src node -r tsconfig-paths/register build/dist/src/index.js",
     "test": "yarn test:compilation && jest --coverage --silent --noStackTrace",
     "test:watch": "jest --watch",
diff --git a/packages/metrics/src/config/database.test.ts b/packages/metrics/src/config/database.test.ts
index d6f89776e1d..9c62263e207 100644
--- a/packages/metrics/src/config/database.test.ts
+++ b/packages/metrics/src/config/database.test.ts
@@ -10,14 +10,14 @@
  */
 import * as mongoose from 'mongoose'
 import { start, stop } from '@metrics/config/database'
-import { logger } from '@metrics/logger'
+import { logger } from '@opencrvs/commons'
 
 jest.mock('mongoose', () => ({
   connection: {
     on: jest.fn()
   },
+  set: () => {},
   connect: () => Promise.reject(),
-  // tslint:disable-next-line no-empty
   disconnect: () => {}
 }))
 const wait = (time: number) =>
diff --git a/packages/metrics/src/config/database.ts b/packages/metrics/src/config/database.ts
index 362de546d33..101e4c1df33 100644
--- a/packages/metrics/src/config/database.ts
+++ b/packages/metrics/src/config/database.ts
@@ -10,10 +10,14 @@
  */
 import * as mongoose from 'mongoose'
 import { MONGO_URL } from '@metrics/constants'
-import { logger } from '@metrics/logger'
+import { logger } from '@opencrvs/commons'
 
 const db = mongoose.connection
 
+// This prepares code for Mongoose >7 where strictQuery
+// is set to false by default
+mongoose.set('strictQuery', false)
+
 db.on('disconnected', () => {
   logger.info('MongoDB disconnected')
 })
diff --git a/packages/metrics/src/config/plugins.ts b/packages/metrics/src/config/plugins.ts
index 1a61ddf7229..89e5bd35fe5 100644
--- a/packages/metrics/src/config/plugins.ts
+++ b/packages/metrics/src/config/plugins.ts
@@ -8,42 +8,41 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import * as Pino from 'hapi-pino'
+import { SENTRY_DSN } from '@metrics/constants'
+import { logger } from '@opencrvs/commons'
 import * as JWT from 'hapi-auth-jwt2'
+import * as Pino from 'hapi-pino'
 import * as Sentry from 'hapi-sentry'
-import { SENTRY_DSN } from '@metrics/constants'
-import { logger } from '@metrics/logger'
+
+import { ServerRegisterPluginObject } from '@hapi/hapi'
+
+type IHapiPlugin<T = any> = ServerRegisterPluginObject<T>
 
 export default function getPlugins() {
-  const plugins: any[] = [
-    JWT,
-    ...(process.env.NODE_ENV === 'test' || process.env.LOG_LEVEL === 'silent'
-      ? []
-      : [
-          {
-            plugin: Pino,
-            options: {
-              prettyPrint: false,
-              logPayload: false,
-              instance: logger
-            }
-          },
-          ...(!SENTRY_DSN
-            ? []
-            : [
-                {
-                  plugin: Sentry,
-                  options: {
-                    client: {
-                      environment: process.env.DOMAIN,
-                      dsn: SENTRY_DSN
-                    },
-                    catchLogErrors: true
-                  }
-                }
-              ])
-        ])
-  ]
+  const plugins: IHapiPlugin[] = [{ plugin: JWT, options: {} }]
+
+  if (process.env.NODE_ENV === 'production') {
+    plugins.push({
+      plugin: Pino,
+      options: {
+        prettyPrint: false,
+        logPayload: false,
+        instance: logger
+      }
+    })
+  }
 
+  if (SENTRY_DSN) {
+    plugins.push({
+      plugin: Sentry,
+      options: {
+        client: {
+          environment: process.env.DOMAIN,
+          dsn: SENTRY_DSN
+        },
+        catchLogErrors: true
+      }
+    })
+  }
   return plugins
 }
diff --git a/packages/metrics/src/features/performance/viewRefresher.ts b/packages/metrics/src/features/performance/viewRefresher.ts
index 7cd8f9a6ea0..0190137ba4a 100644
--- a/packages/metrics/src/features/performance/viewRefresher.ts
+++ b/packages/metrics/src/features/performance/viewRefresher.ts
@@ -9,7 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import { HEARTH_MONGO_URL } from '@metrics/constants'
-import { logger } from '@metrics/logger'
+import { logger } from '@opencrvs/commons'
 import { MongoClient } from 'mongodb'
 
 /*
diff --git a/packages/metrics/src/influxdb/client.ts b/packages/metrics/src/influxdb/client.ts
index b02161bde59..890a8d485c5 100644
--- a/packages/metrics/src/influxdb/client.ts
+++ b/packages/metrics/src/influxdb/client.ts
@@ -14,7 +14,7 @@ import {
   INFLUX_HOST,
   INFLUX_PORT
 } from '@metrics/influxdb/constants'
-import { logger } from '@metrics/logger'
+import { logger } from '@opencrvs/commons'
 import { IPoints } from '@metrics/features/registration'
 import fetch from 'node-fetch'
 
diff --git a/packages/metrics/src/logger.ts b/packages/metrics/src/logger.ts
deleted file mode 100644
index 1b5fc33092c..00000000000
--- a/packages/metrics/src/logger.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * OpenCRVS is also distributed under the terms of the Civil Registration
- * & Healthcare Disclaimer located at http://opencrvs.org/license.
- *
- * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
- */
-import pino from 'pino'
-export const logger = pino()
-
-const level = process.env.NODE_ENV === 'test' ? 'silent' : process.env.LOG_LEVEL
-
-if (level) {
-  logger.level = level
-}
diff --git a/packages/notification/package.json b/packages/notification/package.json
index cb4d66bcb9a..030c985ee67 100644
--- a/packages/notification/package.json
+++ b/packages/notification/package.json
@@ -5,7 +5,7 @@
   "license": "MPL-2.0",
   "private": true,
   "scripts": {
-    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --exec ts-node -r tsconfig-paths/register src/index.ts",
+    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --quiet --exec ts-node -r tsconfig-paths/register src/index.ts",
     "start:prod": "TS_NODE_BASEURL=./build/dist/src node -r tsconfig-paths/register build/dist/src/index.js",
     "test": "jest --coverage --silent --noStackTrace && yarn test:compilation",
     "test:watch": "jest --watch",
diff --git a/packages/notification/src/config/plugins.ts b/packages/notification/src/config/plugins.ts
index fa2c863d419..809bb945721 100644
--- a/packages/notification/src/config/plugins.ts
+++ b/packages/notification/src/config/plugins.ts
@@ -9,24 +9,28 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 
-import * as Pino from 'hapi-pino'
+import { ServerRegisterPluginObject } from '@hapi/hapi'
+import { SENTRY_DSN } from '@notification/constants'
+import { logger } from '@opencrvs/commons'
 import * as JWT from 'hapi-auth-jwt2'
+import * as Pino from 'hapi-pino'
 import * as Sentry from 'hapi-sentry'
-import { SENTRY_DSN } from '@notification/constants'
-import { logger } from '@notification/logger'
+
+type IHapiPlugin<T = any> = ServerRegisterPluginObject<T>
 
 export default function getPlugins() {
-  const plugins: any[] = [
-    JWT,
-    {
+  const plugins: IHapiPlugin[] = [{ plugin: JWT, options: {} }]
+
+  if (process.env.NODE_ENV === 'production') {
+    plugins.push({
       plugin: Pino,
       options: {
         prettyPrint: false,
         logPayload: false,
         instance: logger
       }
-    }
-  ]
+    })
+  }
 
   if (SENTRY_DSN) {
     plugins.push({
diff --git a/packages/notification/src/database.test.ts b/packages/notification/src/database.test.ts
index b92795d1271..68d8d4e560c 100644
--- a/packages/notification/src/database.test.ts
+++ b/packages/notification/src/database.test.ts
@@ -12,13 +12,14 @@ jest.mock('mongoose', () => ({
   connection: {
     on: jest.fn()
   },
+  set: () => {},
   connect: () => Promise.reject(),
   disconnect: () => {}
 }))
 
 import * as mongoose from 'mongoose'
 import { start, stop } from '@notification/database'
-import { logger } from '@notification/logger'
+import { logger } from '@opencrvs/commons'
 
 const wait = (time: number) =>
   new Promise((resolve) => setTimeout(resolve, time))
diff --git a/packages/notification/src/database.ts b/packages/notification/src/database.ts
index 0f538e900a5..d238a47a102 100644
--- a/packages/notification/src/database.ts
+++ b/packages/notification/src/database.ts
@@ -11,10 +11,14 @@
 import * as mongoose from 'mongoose'
 
 import { MONGO_URL } from '@notification/constants'
-import { logger } from '@notification/logger'
+import { logger } from '@opencrvs/commons'
 
 const db = mongoose.connection
 
+// This prepares code for Mongoose >7 where strictQuery
+// is set to false by default
+mongoose.set('strictQuery', false)
+
 db.on('disconnected', () => {
   logger.info('MongoDB disconnected')
 })
diff --git a/packages/notification/src/features/email/all-user-handler.ts b/packages/notification/src/features/email/all-user-handler.ts
index 587bbf56514..1470683c756 100644
--- a/packages/notification/src/features/email/all-user-handler.ts
+++ b/packages/notification/src/features/email/all-user-handler.ts
@@ -9,7 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import * as Hapi from '@hapi/hapi'
-import { logger } from '@notification/logger'
+import { logger } from '@opencrvs/commons'
 import * as Joi from 'joi'
 import { sendAllUserEmails } from './service.'
 
diff --git a/packages/notification/src/features/email/service..ts b/packages/notification/src/features/email/service..ts
index 9e933776e5e..0891ccf3f7b 100644
--- a/packages/notification/src/features/email/service..ts
+++ b/packages/notification/src/features/email/service..ts
@@ -12,7 +12,7 @@
 import NotificationQueue, {
   NotificationQueueRecord
 } from '@notification/model/notificationQueue'
-import { logger } from '@notification/logger'
+import { logger } from '@opencrvs/commons'
 import { notifyCountryConfig } from '@notification/features/sms/service'
 import { internal, tooManyRequests } from '@hapi/boom'
 import * as Hapi from '@hapi/hapi'
diff --git a/packages/notification/src/features/sms/birth-handler.ts b/packages/notification/src/features/sms/birth-handler.ts
index 524f6d728c6..59fd8da5edd 100644
--- a/packages/notification/src/features/sms/birth-handler.ts
+++ b/packages/notification/src/features/sms/birth-handler.ts
@@ -14,7 +14,7 @@ import {
   sendNotification,
   IEventMessageRecipient
 } from '@notification/features/sms/utils'
-import { logger } from '@notification/logger'
+import { logger } from '@opencrvs/commons'
 import { messageKeys } from '@notification/i18n/messages'
 
 export interface IInProgressPayload extends IEventMessageRecipient {
diff --git a/packages/notification/src/features/sms/death-handler.ts b/packages/notification/src/features/sms/death-handler.ts
index 27e197cf3dc..2817d909157 100644
--- a/packages/notification/src/features/sms/death-handler.ts
+++ b/packages/notification/src/features/sms/death-handler.ts
@@ -16,7 +16,7 @@ import {
   IRejectionPayload
 } from '@notification/features/sms/birth-handler'
 import { sendNotification } from '@notification/features/sms/utils'
-import { logger } from '@notification/logger'
+import { logger } from '@opencrvs/commons'
 import { messageKeys } from '@notification/i18n/messages'
 
 export async function sendDeathInProgressConfirmation(
diff --git a/packages/notification/src/features/sms/service.test.ts b/packages/notification/src/features/sms/service.test.ts
index 6d5b95eaeba..f34eb2f8ee4 100644
--- a/packages/notification/src/features/sms/service.test.ts
+++ b/packages/notification/src/features/sms/service.test.ts
@@ -8,7 +8,7 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import { logger } from '@notification/logger'
+import { logger } from '@opencrvs/commons'
 import { notifyCountryConfig } from '@notification/features/sms/service'
 import * as fetchAny from 'jest-fetch-mock'
 
diff --git a/packages/notification/src/features/sms/service.ts b/packages/notification/src/features/sms/service.ts
index ad7662e4ad3..c0732a174b2 100644
--- a/packages/notification/src/features/sms/service.ts
+++ b/packages/notification/src/features/sms/service.ts
@@ -11,7 +11,7 @@
 import fetch from 'node-fetch'
 
 import { COUNTRY_CONFIG_URL } from '@notification/constants'
-import { logger } from '@notification/logger'
+import { logger } from '@opencrvs/commons'
 
 export async function notifyCountryConfig(
   templateName: {
diff --git a/packages/notification/src/features/sms/user-handler.ts b/packages/notification/src/features/sms/user-handler.ts
index 3795e23b1fc..316a74d15ab 100644
--- a/packages/notification/src/features/sms/user-handler.ts
+++ b/packages/notification/src/features/sms/user-handler.ts
@@ -14,7 +14,7 @@ import {
   IMessageRecipient,
   sendNotification
 } from '@notification/features/sms/utils'
-import { logger } from '@notification/logger'
+import { logger } from '@opencrvs/commons'
 import { templateNames } from '@notification/i18n/messages'
 
 interface ICredentialsPayload extends IMessageRecipient {
diff --git a/packages/notification/src/logger.ts b/packages/notification/src/logger.ts
deleted file mode 100644
index bc3f171a97d..00000000000
--- a/packages/notification/src/logger.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * OpenCRVS is also distributed under the terms of the Civil Registration
- * & Healthcare Disclaimer located at http://opencrvs.org/license.
- *
- * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
- */
-import pino from 'pino'
-export const logger = pino()
-
-const level = process.env.NODE_ENV === 'test' ? 'silent' : process.env.LOG_LEVEL
-if (level) {
-  logger.level = level
-}
diff --git a/packages/search/package.json b/packages/search/package.json
index ee24cf940d9..851a6eb0c2d 100644
--- a/packages/search/package.json
+++ b/packages/search/package.json
@@ -5,7 +5,7 @@
   "license": "MPL-2.0",
   "private": true,
   "scripts": {
-    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --exec ts-node -r tsconfig-paths/register src/index.ts",
+    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --quiet --exec ts-node -r tsconfig-paths/register src/index.ts",
     "start:prod": "TS_NODE_BASEURL=./build/dist/src node -r tsconfig-paths/register build/dist/src/index.js",
     "test": "jest --coverage --silent --noStackTrace && yarn test:compilation",
     "test:watch": "jest --watch",
diff --git a/packages/search/src/config/plugins.ts b/packages/search/src/config/plugins.ts
index d341c8ab684..e3e1310a8d5 100644
--- a/packages/search/src/config/plugins.ts
+++ b/packages/search/src/config/plugins.ts
@@ -8,24 +8,28 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import * as Pino from 'hapi-pino'
+import { ServerRegisterPluginObject } from '@hapi/hapi'
+import { SENTRY_DSN } from '@search/constants'
+import { logger } from '@opencrvs/commons'
 import * as JWT from 'hapi-auth-jwt2'
+import * as Pino from 'hapi-pino'
 import * as Sentry from 'hapi-sentry'
-import { SENTRY_DSN } from '@search/constants'
-import { logger } from '@search/logger'
+
+type IHapiPlugin<T = any> = ServerRegisterPluginObject<T>
 
 export default function getPlugins() {
-  const plugins: any[] = [
-    JWT,
-    {
+  const plugins: IHapiPlugin[] = [{ plugin: JWT, options: {} }]
+
+  if (process.env.NODE_ENV === 'production') {
+    plugins.push({
       plugin: Pino,
       options: {
         prettyPrint: false,
         logPayload: false,
         instance: logger
       }
-    }
-  ]
+    })
+  }
 
   if (SENTRY_DSN) {
     plugins.push({
diff --git a/packages/search/src/config/routes.ts b/packages/search/src/config/routes.ts
index dbdddc3f681..ae937a33d00 100644
--- a/packages/search/src/config/routes.ts
+++ b/packages/search/src/config/routes.ts
@@ -24,7 +24,7 @@ import {
 } from '@search/features/registration/assignment/handler'
 import { deleteOCRVSIndexHandler } from '@search/features/delete/handler'
 import { client } from '@search/elasticsearch/client'
-import { logger } from '@search/logger'
+import { logger } from '@opencrvs/commons'
 import { recordHandler } from '@search/features/registration/record/handler'
 import { getRecordByIdHandler } from '@search/features/records/handler'
 
diff --git a/packages/search/src/elasticsearch/dbhelper.test.ts b/packages/search/src/elasticsearch/dbhelper.test.ts
index 948abd282a9..00471361ec2 100644
--- a/packages/search/src/elasticsearch/dbhelper.test.ts
+++ b/packages/search/src/elasticsearch/dbhelper.test.ts
@@ -14,7 +14,7 @@ import {
   searchByCompositionId
 } from '@search/elasticsearch/dbhelper'
 import { mockCompositionBody } from '@search/test/utils'
-import { logger } from '@search/logger'
+import { logger } from '@opencrvs/commons'
 import { IBirthCompositionBody } from '@search/elasticsearch/utils'
 import { searchForBirthDuplicates } from '@search/features/registration/deduplicate/service'
 import { client } from '@search/elasticsearch/client'
diff --git a/packages/search/src/elasticsearch/dbhelper.ts b/packages/search/src/elasticsearch/dbhelper.ts
index 0e3ec347463..f212c3dd4f8 100644
--- a/packages/search/src/elasticsearch/dbhelper.ts
+++ b/packages/search/src/elasticsearch/dbhelper.ts
@@ -8,11 +8,11 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
+import * as elasticsearch from '@elastic/elasticsearch'
+import { logger } from '@opencrvs/commons'
 import { OPENCRVS_INDEX_NAME } from '@search/constants'
 import { ISearchResponse } from '@search/elasticsearch/client'
 import { ICompositionBody } from '@search/elasticsearch/utils'
-import { logger } from '@search/logger'
-import * as elasticsearch from '@elastic/elasticsearch'
 
 export const indexComposition = async (
   compositionIdentifier: string,
diff --git a/packages/search/src/features/delete/handler.ts b/packages/search/src/features/delete/handler.ts
index a47b15045cd..c53c90146d7 100644
--- a/packages/search/src/features/delete/handler.ts
+++ b/packages/search/src/features/delete/handler.ts
@@ -9,7 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import * as Hapi from '@hapi/hapi'
-import { logger } from '@search/logger'
+import { logger } from '@opencrvs/commons'
 import { internal } from '@hapi/boom'
 import { client } from '@search/elasticsearch/client'
 import { OPENCRVS_INDEX_NAME } from '@search/constants'
diff --git a/packages/search/src/features/fhir/fhir-utils.ts b/packages/search/src/features/fhir/fhir-utils.ts
index 352420f1b4e..474778a1180 100644
--- a/packages/search/src/features/fhir/fhir-utils.ts
+++ b/packages/search/src/features/fhir/fhir-utils.ts
@@ -32,7 +32,7 @@ import {
   ICompositionBody,
   IDeathCompositionBody
 } from '@search/elasticsearch/utils'
-import { logger } from '@search/logger'
+import { logger } from '@opencrvs/commons'
 import fetch from 'node-fetch'
 
 export interface ITemplatedComposition extends fhir.Composition {
diff --git a/packages/search/src/features/registration/assignment/handler.ts b/packages/search/src/features/registration/assignment/handler.ts
index dcadd6c0da3..5172aa4eb46 100644
--- a/packages/search/src/features/registration/assignment/handler.ts
+++ b/packages/search/src/features/registration/assignment/handler.ts
@@ -12,7 +12,7 @@ import {
   updateEventToAddAssignment,
   updateEventToRemoveAssignment
 } from '@search/features/registration/assignment/service'
-import { logger } from '@search/logger'
+import { logger } from '@opencrvs/commons'
 import { internal } from '@hapi/boom'
 import * as Hapi from '@hapi/hapi'
 import { getTokenPayload } from '@search/utils/authUtils'
diff --git a/packages/search/src/features/registration/birth/handler.ts b/packages/search/src/features/registration/birth/handler.ts
index dfcb4c19fb0..455b091b8ac 100644
--- a/packages/search/src/features/registration/birth/handler.ts
+++ b/packages/search/src/features/registration/birth/handler.ts
@@ -9,7 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import { upsertEvent } from '@search/features/registration/birth/service'
-import { logger } from '@search/logger'
+import { logger } from '@opencrvs/commons'
 import { internal } from '@hapi/boom'
 import * as Hapi from '@hapi/hapi'
 
diff --git a/packages/search/src/features/registration/death/handler.ts b/packages/search/src/features/registration/death/handler.ts
index e4dacb54e75..b6759ef6cdc 100644
--- a/packages/search/src/features/registration/death/handler.ts
+++ b/packages/search/src/features/registration/death/handler.ts
@@ -9,7 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import { upsertEvent } from '@search/features/registration/death/service'
-import { logger } from '@search/logger'
+import { logger } from '@opencrvs/commons'
 import { internal } from '@hapi/boom'
 import * as Hapi from '@hapi/hapi'
 
diff --git a/packages/search/src/features/registration/deduplicate/handler.ts b/packages/search/src/features/registration/deduplicate/handler.ts
index df41576ed62..2cf923420ce 100644
--- a/packages/search/src/features/registration/deduplicate/handler.ts
+++ b/packages/search/src/features/registration/deduplicate/handler.ts
@@ -9,7 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import * as Hapi from '@hapi/hapi'
-import { logger } from '@search/logger'
+import { logger } from '@opencrvs/commons'
 import { internal } from '@hapi/boom'
 import { removeDuplicate } from '@search/features/registration/deduplicate/service'
 import { client } from '@search/elasticsearch/client'
diff --git a/packages/search/src/features/registration/deduplicate/service.ts b/packages/search/src/features/registration/deduplicate/service.ts
index 593dad36667..832a68dad6c 100644
--- a/packages/search/src/features/registration/deduplicate/service.ts
+++ b/packages/search/src/features/registration/deduplicate/service.ts
@@ -21,7 +21,7 @@ import {
 import { get } from 'lodash'
 import { ISearchResponse } from '@search/elasticsearch/client'
 import { OPENCRVS_INDEX_NAME } from '@search/constants'
-import { logger } from '@search/logger'
+import { logger } from '@opencrvs/commons'
 import {
   subYears,
   addYears,
diff --git a/packages/search/src/features/registration/marriage/handler.ts b/packages/search/src/features/registration/marriage/handler.ts
index 93ddf3d576f..e6e07703173 100644
--- a/packages/search/src/features/registration/marriage/handler.ts
+++ b/packages/search/src/features/registration/marriage/handler.ts
@@ -9,7 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import { upsertEvent } from '@search/features/registration/marriage/service'
-import { logger } from '@search/logger'
+import { logger } from '@opencrvs/commons'
 import { internal } from '@hapi/boom'
 import * as Hapi from '@hapi/hapi'
 
diff --git a/packages/search/src/features/search/handler.ts b/packages/search/src/features/search/handler.ts
index daab49afff9..4b6848a7d0a 100644
--- a/packages/search/src/features/search/handler.ts
+++ b/packages/search/src/features/search/handler.ts
@@ -9,7 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import * as Hapi from '@hapi/hapi'
-import { logger } from '@search/logger'
+import { logger } from '@opencrvs/commons'
 import { badRequest, internal } from '@hapi/boom'
 import { DEFAULT_SIZE, advancedSearch } from '@search/features/search/service'
 import { ISearchCriteria } from '@search/features/search/types'
diff --git a/packages/search/src/features/search/service.ts b/packages/search/src/features/search/service.ts
index 212046cd308..5f8488c70c3 100644
--- a/packages/search/src/features/search/service.ts
+++ b/packages/search/src/features/search/service.ts
@@ -12,7 +12,7 @@ import { client, ISearchResponse } from '@search/elasticsearch/client'
 import { ApiResponse } from '@elastic/elasticsearch'
 import { ISearchCriteria, SortOrder } from '@search/features/search/types'
 import { advancedQueryBuilder } from '@search/features/search/utils'
-import { logger } from '@search/logger'
+import { logger } from '@opencrvs/commons'
 import { OPENCRVS_INDEX_NAME } from '@search/constants'
 
 export const DEFAULT_SIZE = 10
diff --git a/packages/search/src/logger.ts b/packages/search/src/logger.ts
deleted file mode 100644
index bc3f171a97d..00000000000
--- a/packages/search/src/logger.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * OpenCRVS is also distributed under the terms of the Civil Registration
- * & Healthcare Disclaimer located at http://opencrvs.org/license.
- *
- * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
- */
-import pino from 'pino'
-export const logger = pino()
-
-const level = process.env.NODE_ENV === 'test' ? 'silent' : process.env.LOG_LEVEL
-if (level) {
-  logger.level = level
-}
diff --git a/packages/user-mgnt/package.json b/packages/user-mgnt/package.json
index 1c69e5f6247..296324b7abd 100644
--- a/packages/user-mgnt/package.json
+++ b/packages/user-mgnt/package.json
@@ -5,7 +5,7 @@
   "license": "MPL-2.0",
   "private": true,
   "scripts": {
-    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --exec ts-node -r tsconfig-paths/register src/index.ts",
+    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --quiet --exec ts-node -r tsconfig-paths/register src/index.ts",
     "start:prod": "TS_NODE_BASEURL=./build/dist/src node -r tsconfig-paths/register build/dist/src/index.js",
     "test": "jest  --coverage --silent --noStackTrace && yarn test:compilation",
     "test:watch": "jest --watch",
diff --git a/packages/user-mgnt/src/config/plugins.ts b/packages/user-mgnt/src/config/plugins.ts
index fb03d1f1c8a..40487a91d66 100644
--- a/packages/user-mgnt/src/config/plugins.ts
+++ b/packages/user-mgnt/src/config/plugins.ts
@@ -8,24 +8,28 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import * as Pino from 'hapi-pino'
+import { ServerRegisterPluginObject } from '@hapi/hapi'
+import { SENTRY_DSN } from '@user-mgnt/constants'
+import { logger } from '@opencrvs/commons'
 import * as JWT from 'hapi-auth-jwt2'
+import * as Pino from 'hapi-pino'
 import * as Sentry from 'hapi-sentry'
-import { SENTRY_DSN } from '@user-mgnt/constants'
-import { logger } from '@user-mgnt/logger'
+
+type IHapiPlugin<T = any> = ServerRegisterPluginObject<T>
 
 export default function getPlugins() {
-  const plugins: any[] = [
-    JWT,
-    {
+  const plugins: IHapiPlugin[] = [{ plugin: JWT, options: {} }]
+
+  if (process.env.NODE_ENV === 'production') {
+    plugins.push({
       plugin: Pino,
       options: {
         prettyPrint: false,
         logPayload: false,
         instance: logger
       }
-    }
-  ]
+    })
+  }
 
   if (SENTRY_DSN) {
     plugins.push({
diff --git a/packages/user-mgnt/src/database.test.ts b/packages/user-mgnt/src/database.test.ts
index 9c90fc4eadb..5077c71867f 100644
--- a/packages/user-mgnt/src/database.test.ts
+++ b/packages/user-mgnt/src/database.test.ts
@@ -12,13 +12,14 @@ jest.mock('mongoose', () => ({
   connection: {
     on: jest.fn()
   },
+  set: () => {},
   connect: () => Promise.reject(),
   disconnect: () => {}
 }))
 
 import * as mongoose from 'mongoose'
 import { start, stop } from '@user-mgnt/database'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 
 const wait = (time: number) =>
   new Promise((resolve) => setTimeout(resolve, time))
diff --git a/packages/user-mgnt/src/database.ts b/packages/user-mgnt/src/database.ts
index 3b7ab471166..cf4bedf42b1 100644
--- a/packages/user-mgnt/src/database.ts
+++ b/packages/user-mgnt/src/database.ts
@@ -11,10 +11,14 @@
 import * as mongoose from 'mongoose'
 
 import { MONGO_URL } from '@user-mgnt/constants'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 
 const db = mongoose.connection
 
+// This prepares code for Mongoose >7 where strictQuery
+// is set to false by default
+mongoose.set('strictQuery', false)
+
 db.on('disconnected', () => {
   logger.info('MongoDB disconnected')
 })
diff --git a/packages/user-mgnt/src/features/activateUser/handler.test.ts b/packages/user-mgnt/src/features/activateUser/handler.test.ts
index 78d72237128..594bd14e5fa 100644
--- a/packages/user-mgnt/src/features/activateUser/handler.test.ts
+++ b/packages/user-mgnt/src/features/activateUser/handler.test.ts
@@ -13,7 +13,7 @@ import * as jwt from 'jsonwebtoken'
 import { readFileSync } from 'fs'
 import * as fetchMock from 'jest-fetch-mock'
 import User, { IUser } from '@user-mgnt/model/user'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import * as mockingoose from 'mockingoose'
 import { cloneDeep } from 'lodash'
 import { Types } from 'mongoose'
diff --git a/packages/user-mgnt/src/features/activateUser/handler.ts b/packages/user-mgnt/src/features/activateUser/handler.ts
index ea853ac11a1..0981d8539e7 100644
--- a/packages/user-mgnt/src/features/activateUser/handler.ts
+++ b/packages/user-mgnt/src/features/activateUser/handler.ts
@@ -13,7 +13,7 @@ import * as Joi from 'joi'
 import { unauthorized } from '@hapi/boom'
 import User, { IUserModel } from '@user-mgnt/model/user'
 import { generateSaltedHash, generateHash } from '@user-mgnt/utils/hash'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import { statuses } from '@user-mgnt/utils/userUtils'
 
 interface ISecurityQNA {
diff --git a/packages/user-mgnt/src/features/changeAvatar/handler.ts b/packages/user-mgnt/src/features/changeAvatar/handler.ts
index d3a0bc51cac..69eee5b484a 100644
--- a/packages/user-mgnt/src/features/changeAvatar/handler.ts
+++ b/packages/user-mgnt/src/features/changeAvatar/handler.ts
@@ -12,7 +12,7 @@ import * as Hapi from '@hapi/hapi'
 import * as Joi from 'joi'
 import { unauthorized } from '@hapi/boom'
 import User, { IUserModel } from '@user-mgnt/model/user'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import { statuses } from '@user-mgnt/utils/userUtils'
 
 interface IChangeAvatarPayload {
diff --git a/packages/user-mgnt/src/features/changeEmail/handler.ts b/packages/user-mgnt/src/features/changeEmail/handler.ts
index 2fad93cac75..747eb11eb3a 100644
--- a/packages/user-mgnt/src/features/changeEmail/handler.ts
+++ b/packages/user-mgnt/src/features/changeEmail/handler.ts
@@ -12,7 +12,7 @@ import * as Hapi from '@hapi/hapi'
 import * as Joi from 'joi'
 import { unauthorized } from '@hapi/boom'
 import User, { IUserModel } from '@user-mgnt/model/user'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import { statuses } from '@user-mgnt/utils/userUtils'
 import { resolve } from 'url'
 import fetch from 'node-fetch'
diff --git a/packages/user-mgnt/src/features/changePassword/handler.ts b/packages/user-mgnt/src/features/changePassword/handler.ts
index e4826cfa591..0187e0efb1f 100644
--- a/packages/user-mgnt/src/features/changePassword/handler.ts
+++ b/packages/user-mgnt/src/features/changePassword/handler.ts
@@ -13,7 +13,7 @@ import * as Joi from 'joi'
 import { unauthorized } from '@hapi/boom'
 import User, { IUserModel } from '@user-mgnt/model/user'
 import { generateHash } from '@user-mgnt/utils/hash'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import { statuses } from '@user-mgnt/utils/userUtils'
 import { postUserActionToMetrics } from '@user-mgnt/features/changePhone/handler'
 
diff --git a/packages/user-mgnt/src/features/changePhone/handler.ts b/packages/user-mgnt/src/features/changePhone/handler.ts
index 06a78306b3a..7ad4afc464f 100644
--- a/packages/user-mgnt/src/features/changePhone/handler.ts
+++ b/packages/user-mgnt/src/features/changePhone/handler.ts
@@ -12,7 +12,7 @@ import * as Hapi from '@hapi/hapi'
 import * as Joi from 'joi'
 import { unauthorized } from '@hapi/boom'
 import User, { IUserModel } from '@user-mgnt/model/user'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import { statuses } from '@user-mgnt/utils/userUtils'
 import { resolve } from 'url'
 import fetch from 'node-fetch'
diff --git a/packages/user-mgnt/src/features/createUser/handler.ts b/packages/user-mgnt/src/features/createUser/handler.ts
index 705f20b88ca..902cd9842f0 100644
--- a/packages/user-mgnt/src/features/createUser/handler.ts
+++ b/packages/user-mgnt/src/features/createUser/handler.ts
@@ -17,7 +17,7 @@ import {
   sendCredentialsNotification,
   getCatchmentAreaIdsByPrimaryOfficeId
 } from '@user-mgnt/features/createUser/service'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import User, { IUser, IUserModel } from '@user-mgnt/model/user'
 import {
   generateSaltedHash,
diff --git a/packages/user-mgnt/src/features/createUser/service.test.ts b/packages/user-mgnt/src/features/createUser/service.test.ts
index 83cec5213e3..c789ff750e2 100644
--- a/packages/user-mgnt/src/features/createUser/service.test.ts
+++ b/packages/user-mgnt/src/features/createUser/service.test.ts
@@ -14,7 +14,7 @@ import * as mockingoose from 'mockingoose'
 import * as fetchMock from 'jest-fetch-mock'
 import * as jwt from 'jsonwebtoken'
 import { readFileSync } from 'fs'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 
 const fetch = fetchMock as fetchMock.FetchMock
 const mockUser = {
diff --git a/packages/user-mgnt/src/features/createUser/service.ts b/packages/user-mgnt/src/features/createUser/service.ts
index d87d8e8f725..54a17b62213 100644
--- a/packages/user-mgnt/src/features/createUser/service.ts
+++ b/packages/user-mgnt/src/features/createUser/service.ts
@@ -11,7 +11,7 @@
 import { FHIR_URL, NOTIFICATION_SERVICE_URL } from '@user-mgnt/constants'
 import User, { IUser, IUserName, UserRole } from '@user-mgnt/model/user'
 import fetch from 'node-fetch'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 
 export const createFhirPractitioner = (
   user: IUser,
diff --git a/packages/user-mgnt/src/features/resetPassword/handler.ts b/packages/user-mgnt/src/features/resetPassword/handler.ts
index 49d7b0c6fcf..20d7b96efb2 100644
--- a/packages/user-mgnt/src/features/resetPassword/handler.ts
+++ b/packages/user-mgnt/src/features/resetPassword/handler.ts
@@ -18,7 +18,7 @@ import {
 } from '@user-mgnt/utils/hash'
 import { getUserId, hasDemoScope, statuses } from '@user-mgnt/utils/userUtils'
 import { NOTIFICATION_SERVICE_URL } from '@user-mgnt/constants'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import { postUserActionToMetrics } from '@user-mgnt/features/changePhone/handler'
 import fetch from 'node-fetch'
 
diff --git a/packages/user-mgnt/src/features/system/handler.ts b/packages/user-mgnt/src/features/system/handler.ts
index 2258e0902d3..664986db97b 100644
--- a/packages/user-mgnt/src/features/system/handler.ts
+++ b/packages/user-mgnt/src/features/system/handler.ts
@@ -18,7 +18,7 @@ import {
   createFhirPractitionerRole,
   postFhir
 } from '@user-mgnt/features/createUser/service'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import System, {
   ISystemModel,
   WebhookPermissions
diff --git a/packages/user-mgnt/src/features/updateRole/handler.ts b/packages/user-mgnt/src/features/updateRole/handler.ts
index 60a8a6fcb98..f37daecea84 100644
--- a/packages/user-mgnt/src/features/updateRole/handler.ts
+++ b/packages/user-mgnt/src/features/updateRole/handler.ts
@@ -11,7 +11,7 @@
 
 import * as Hapi from '@hapi/hapi'
 import { Types } from 'mongoose'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import { UserRole } from '@user-mgnt/model/user'
 import SystemRole, {
   ISystemRoleModel,
diff --git a/packages/user-mgnt/src/features/updateUser/handler.ts b/packages/user-mgnt/src/features/updateUser/handler.ts
index 0e38516c86e..fdeafc4a209 100644
--- a/packages/user-mgnt/src/features/updateUser/handler.ts
+++ b/packages/user-mgnt/src/features/updateUser/handler.ts
@@ -18,7 +18,7 @@ import {
   getCatchmentAreaIdsByPrimaryOfficeId,
   postFhir
 } from '@user-mgnt/features/createUser/service'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import User, { IUser, IUserModel } from '@user-mgnt/model/user'
 import { getUserId } from '@user-mgnt/utils/userUtils'
 import { QA_ENV } from '@user-mgnt/constants'
diff --git a/packages/user-mgnt/src/features/userAudit/handler.test.ts b/packages/user-mgnt/src/features/userAudit/handler.test.ts
index 4e011e29387..ddea64e750e 100644
--- a/packages/user-mgnt/src/features/userAudit/handler.test.ts
+++ b/packages/user-mgnt/src/features/userAudit/handler.test.ts
@@ -9,7 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import { createServer } from '@user-mgnt/server'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import User, { AUDIT_ACTION, AUDIT_REASON, IUser } from '@user-mgnt/model/user'
 import { readFileSync } from 'fs'
 import * as fetchMock from 'jest-fetch-mock'
diff --git a/packages/user-mgnt/src/features/userAudit/handler.ts b/packages/user-mgnt/src/features/userAudit/handler.ts
index a41f25c0efa..359dfc32163 100644
--- a/packages/user-mgnt/src/features/userAudit/handler.ts
+++ b/packages/user-mgnt/src/features/userAudit/handler.ts
@@ -8,7 +8,7 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import User, {
   AUDIT_ACTION,
   AUDIT_REASON,
diff --git a/packages/user-mgnt/src/features/userSearchRecord/handler.test.ts b/packages/user-mgnt/src/features/userSearchRecord/handler.test.ts
index 058188ff6a0..7cc66c80593 100644
--- a/packages/user-mgnt/src/features/userSearchRecord/handler.test.ts
+++ b/packages/user-mgnt/src/features/userSearchRecord/handler.test.ts
@@ -9,7 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import { createServer } from '@user-mgnt/server'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import User, { IUser } from '@user-mgnt/model/user'
 import { readFileSync } from 'fs'
 import * as fetchMock from 'jest-fetch-mock'
diff --git a/packages/user-mgnt/src/features/userSearchRecord/handler.ts b/packages/user-mgnt/src/features/userSearchRecord/handler.ts
index 250d285b948..aef505b9977 100644
--- a/packages/user-mgnt/src/features/userSearchRecord/handler.ts
+++ b/packages/user-mgnt/src/features/userSearchRecord/handler.ts
@@ -8,7 +8,7 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import User, { IUserModel, Event } from '@user-mgnt/model/user'
 import { unauthorized } from '@hapi/boom'
 import * as Hapi from '@hapi/hapi'
diff --git a/packages/user-mgnt/src/features/usernameSMSReminderInvite/handler.ts b/packages/user-mgnt/src/features/usernameSMSReminderInvite/handler.ts
index d9c44f403bf..7658f25019a 100644
--- a/packages/user-mgnt/src/features/usernameSMSReminderInvite/handler.ts
+++ b/packages/user-mgnt/src/features/usernameSMSReminderInvite/handler.ts
@@ -14,7 +14,7 @@ import User, { IUserModel } from '@user-mgnt/model/user'
 import { unauthorized } from '@hapi/boom'
 import { sendUserName } from './service'
 import { postUserActionToMetrics } from '@user-mgnt/features/changePhone/handler'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import { getUserId } from '@user-mgnt/utils/userUtils'
 
 interface IResendUsernameSMSPayload {
diff --git a/packages/user-mgnt/src/features/verifySecurityAnswer/handler.ts b/packages/user-mgnt/src/features/verifySecurityAnswer/handler.ts
index 02968cd03d9..4e572b422b4 100644
--- a/packages/user-mgnt/src/features/verifySecurityAnswer/handler.ts
+++ b/packages/user-mgnt/src/features/verifySecurityAnswer/handler.ts
@@ -13,7 +13,7 @@ import * as Joi from 'joi'
 import { unauthorized, conflict } from '@hapi/boom'
 import User, { IUserModel } from '@user-mgnt/model/user'
 import { generateHash } from '@user-mgnt/utils/hash'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import { getRandomQuestionKey } from '@user-mgnt/features/verifyUser/handler'
 import { isNonEmptyArray } from '@user-mgnt/utils/non-empty-array'
 
diff --git a/packages/user-mgnt/src/logger.ts b/packages/user-mgnt/src/logger.ts
deleted file mode 100644
index bc3f171a97d..00000000000
--- a/packages/user-mgnt/src/logger.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * OpenCRVS is also distributed under the terms of the Civil Registration
- * & Healthcare Disclaimer located at http://opencrvs.org/license.
- *
- * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
- */
-import pino from 'pino'
-export const logger = pino()
-
-const level = process.env.NODE_ENV === 'test' ? 'silent' : process.env.LOG_LEVEL
-if (level) {
-  logger.level = level
-}
diff --git a/packages/user-mgnt/src/server.ts b/packages/user-mgnt/src/server.ts
index 7936b15fd44..ddd862ab7b7 100644
--- a/packages/user-mgnt/src/server.ts
+++ b/packages/user-mgnt/src/server.ts
@@ -20,7 +20,7 @@ import getPlugins from '@user-mgnt/config/plugins'
 import * as database from '@user-mgnt/database'
 import { readFileSync } from 'fs'
 import { getRoutes } from '@user-mgnt/config/routes'
-import { logger } from '@user-mgnt/logger'
+import { logger } from '@opencrvs/commons'
 import { badRequest, Boom } from '@hapi/boom'
 
 const publicCert = readFileSync(CERT_PUBLIC_KEY_PATH)
diff --git a/packages/webhooks/package.json b/packages/webhooks/package.json
index 0270c3ee426..f3eb6976e5a 100644
--- a/packages/webhooks/package.json
+++ b/packages/webhooks/package.json
@@ -5,7 +5,7 @@
   "license": "MPL-2.0",
   "private": true,
   "scripts": {
-    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --exec ts-node -r tsconfig-paths/register src/index.ts",
+    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --quiet --exec ts-node -r tsconfig-paths/register src/index.ts",
     "start:prod": "TS_NODE_BASEURL=./build/dist/src node -r tsconfig-paths/register build/dist/src/index.js",
     "test": "jest  --coverage --silent --noStackTrace --forceExit && yarn test:compilation",
     "test:watch": "jest --watch",
diff --git a/packages/webhooks/src/config/plugins.ts b/packages/webhooks/src/config/plugins.ts
index a9e46cca461..1eed22f0da1 100644
--- a/packages/webhooks/src/config/plugins.ts
+++ b/packages/webhooks/src/config/plugins.ts
@@ -8,24 +8,28 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import * as Pino from 'hapi-pino'
+import { ServerRegisterPluginObject } from '@hapi/hapi'
+import { logger } from '@opencrvs/commons'
+import { SENTRY_DSN } from '@webhooks/constants'
 import * as JWT from 'hapi-auth-jwt2'
+import * as Pino from 'hapi-pino'
 import * as Sentry from 'hapi-sentry'
-import { SENTRY_DSN } from '@webhooks/constants'
-import { logger } from '@webhooks/logger'
+
+type IHapiPlugin<T = any> = ServerRegisterPluginObject<T>
 
 export default function getPlugins() {
-  const plugins: any[] = [
-    JWT,
-    {
+  const plugins: IHapiPlugin[] = [{ plugin: JWT, options: {} }]
+
+  if (process.env.NODE_ENV === 'production') {
+    plugins.push({
       plugin: Pino,
       options: {
         prettyPrint: false,
         logPayload: false,
         instance: logger
       }
-    }
-  ]
+    })
+  }
 
   if (SENTRY_DSN) {
     plugins.push({
diff --git a/packages/webhooks/src/database.ts b/packages/webhooks/src/database.ts
index abac86b821a..87ae1b8b3ae 100644
--- a/packages/webhooks/src/database.ts
+++ b/packages/webhooks/src/database.ts
@@ -10,10 +10,14 @@
  */
 import * as mongoose from 'mongoose'
 import { MONGO_URL, REDIS_HOST } from '@webhooks/constants'
-import { logger } from '@webhooks/logger'
+import { logger } from '@opencrvs/commons'
 import Redis, * as IORedis from 'ioredis'
 const db = mongoose.connection
 
+// This prepares code for Mongoose >7 where strictQuery
+// is set to false by default
+mongoose.set('strictQuery', false)
+
 db.on('disconnected', () => {
   logger.info('MongoDB disconnected')
 })
@@ -33,7 +37,10 @@ export function getRedis(): IORedis.Redis {
 
 const connect = async (): Promise<void> => {
   try {
-    redisConnection = new Redis(REDIS_HOST)
+    redisConnection = new Redis({
+      host: REDIS_HOST,
+      maxRetriesPerRequest: null
+    })
 
     redisConnection.on('error', (error) => {
       logger.error('Redis connection error', error)
diff --git a/packages/webhooks/src/features/event/handler.ts b/packages/webhooks/src/features/event/handler.ts
index 28965aba19f..ca4728e190c 100644
--- a/packages/webhooks/src/features/event/handler.ts
+++ b/packages/webhooks/src/features/event/handler.ts
@@ -17,7 +17,7 @@ import {
   transformDeathBundle
 } from '@webhooks/features/event/service'
 import { EventType, ISystem } from '@webhooks/features/manage/service'
-import { logger } from '@webhooks/logger'
+import { logger } from '@opencrvs/commons'
 import Webhook, { IWebhookModel, TRIGGERS } from '@webhooks/model/webhook'
 import { getQueue } from '@webhooks/queue'
 import { Queue } from 'bullmq'
diff --git a/packages/webhooks/src/features/manage/handler.ts b/packages/webhooks/src/features/manage/handler.ts
index 51ad15c2cf9..7965b309b6c 100644
--- a/packages/webhooks/src/features/manage/handler.ts
+++ b/packages/webhooks/src/features/manage/handler.ts
@@ -19,7 +19,7 @@ import {
 } from '@webhooks/features/manage/service'
 import { internal } from '@hapi/boom'
 import Webhook, { TRIGGERS } from '@webhooks/model/webhook'
-import { logger } from '@webhooks/logger'
+import { logger } from '@opencrvs/commons'
 import * as uuid from 'uuid/v4'
 import fetch from 'node-fetch'
 import { resolve } from 'url'
diff --git a/packages/webhooks/src/logger.ts b/packages/webhooks/src/logger.ts
deleted file mode 100644
index bc3f171a97d..00000000000
--- a/packages/webhooks/src/logger.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * OpenCRVS is also distributed under the terms of the Civil Registration
- * & Healthcare Disclaimer located at http://opencrvs.org/license.
- *
- * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
- */
-import pino from 'pino'
-export const logger = pino()
-
-const level = process.env.NODE_ENV === 'test' ? 'silent' : process.env.LOG_LEVEL
-if (level) {
-  logger.level = level
-}
diff --git a/packages/webhooks/src/processor.ts b/packages/webhooks/src/processor.ts
index 3e71cb330a4..b8cbed6fa19 100644
--- a/packages/webhooks/src/processor.ts
+++ b/packages/webhooks/src/processor.ts
@@ -10,7 +10,7 @@
  */
 
 import fetch from 'node-fetch'
-import { logger } from '@webhooks/logger'
+import { logger } from '@opencrvs/commons'
 import { Worker } from 'bullmq'
 import * as IORedis from 'ioredis'
 
diff --git a/packages/webhooks/src/queue.ts b/packages/webhooks/src/queue.ts
index 7fe9f89145f..fc528ca1c44 100644
--- a/packages/webhooks/src/queue.ts
+++ b/packages/webhooks/src/queue.ts
@@ -12,7 +12,7 @@
 import { REDIS_HOST, QUEUE_NAME } from '@webhooks/constants'
 import { Queue, QueueEvents, Worker, Job } from 'bullmq'
 import { EventEmitter } from 'events'
-import { logger } from '@webhooks/logger'
+import { logger } from '@opencrvs/commons'
 import { getRedis } from '@webhooks/database'
 import { initWorker } from '@webhooks/processor'
 
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 0f661c6e7cb..14fcd65e17f 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -5,7 +5,7 @@
   "license": "MPL-2.0",
   "private": true,
   "scripts": {
-    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --exec ts-node -r tsconfig-paths/register src/index.ts",
+    "start": "cross-env NODE_ENV=development NODE_OPTIONS=--dns-result-order=ipv4first nodemon --quiet --exec ts-node -r tsconfig-paths/register src/index.ts",
     "start:prod": "TS_NODE_BASEURL=./build/dist/src node -r tsconfig-paths/register build/dist/src/index.js",
     "test": "jest --coverage --silent --noStackTrace && yarn test:compilation",
     "test:watch": "jest --watch",
diff --git a/packages/workflow/src/config/plugins.ts b/packages/workflow/src/config/plugins.ts
index 8b42a971dc2..b84086c20d5 100644
--- a/packages/workflow/src/config/plugins.ts
+++ b/packages/workflow/src/config/plugins.ts
@@ -8,24 +8,28 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import * as Pino from 'hapi-pino'
+import { ServerRegisterPluginObject } from '@hapi/hapi'
+import { SENTRY_DSN } from '@workflow/constants'
+import { logger } from '@opencrvs/commons'
 import * as JWT from 'hapi-auth-jwt2'
+import * as Pino from 'hapi-pino'
 import * as Sentry from 'hapi-sentry'
-import { SENTRY_DSN } from '@workflow/constants'
-import { logger } from '@workflow/logger'
+
+type IHapiPlugin<T = any> = ServerRegisterPluginObject<T>
 
 export default function getPlugins() {
-  const plugins: any[] = [
-    JWT,
-    {
+  const plugins: IHapiPlugin[] = [{ plugin: JWT, options: {} }]
+
+  if (process.env.NODE_ENV === 'production') {
+    plugins.push({
       plugin: Pino,
       options: {
-        prettyPrint: true,
+        prettyPrint: false,
         logPayload: false,
         instance: logger
       }
-    }
-  ]
+    })
+  }
 
   if (SENTRY_DSN) {
     plugins.push({
diff --git a/packages/workflow/src/features/registration/fhir/fhir-bundle-modifier.ts b/packages/workflow/src/features/registration/fhir/fhir-bundle-modifier.ts
index 06886748e72..d79694f029a 100644
--- a/packages/workflow/src/features/registration/fhir/fhir-bundle-modifier.ts
+++ b/packages/workflow/src/features/registration/fhir/fhir-bundle-modifier.ts
@@ -9,20 +9,20 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import * as Hapi from '@hapi/hapi'
-import { UUID } from '@opencrvs/commons'
+import { UUID, logger } from '@opencrvs/commons'
 import {
   Bundle,
   Composition,
   Patient,
   Practitioner,
   RegistrationNumber,
+  RegistrationStatus,
+  ResourceIdentifier,
   Saved,
   Task,
-  findExtension,
-  RegistrationStatus,
   WaitingForValidationRecord,
+  findExtension,
   getResourceFromBundleById,
-  ResourceIdentifier,
   resourceIdentifierToUUID
 } from '@opencrvs/commons/types'
 import { APPLICATION_CONFIG_URL, COUNTRY_CONFIG_URL } from '@workflow/constants'
@@ -49,7 +49,6 @@ import {
   getPractitionerRef,
   getSystem
 } from '@workflow/features/user/utils'
-import { logger } from '@workflow/logger'
 import {
   ITokenPayload,
   USER_SCOPE,
diff --git a/packages/workflow/src/features/registration/fhir/fhir-utils.ts b/packages/workflow/src/features/registration/fhir/fhir-utils.ts
index 796e629e045..7c0cf597d24 100644
--- a/packages/workflow/src/features/registration/fhir/fhir-utils.ts
+++ b/packages/workflow/src/features/registration/fhir/fhir-utils.ts
@@ -29,7 +29,6 @@ import {
   getPatientBySection
 } from '@workflow/features/registration/utils'
 import * as Hapi from '@hapi/hapi'
-import { logger } from '@workflow/logger'
 import { SECTION_CODE } from '@workflow/features/events/utils'
 import { getTaskEventType } from '@workflow/features/task/fhir/utils'
 import {
@@ -45,6 +44,7 @@ import {
   findExtension,
   isSaved
 } from '@opencrvs/commons/types'
+import { logger } from '@opencrvs/commons'
 
 export async function getSharedContactMsisdn(fhirBundle: Bundle) {
   if (!fhirBundle || !fhirBundle.entry) {
diff --git a/packages/workflow/src/features/registration/sms-notification-utils.ts b/packages/workflow/src/features/registration/sms-notification-utils.ts
index cdffd0b78f8..bcf34081e14 100644
--- a/packages/workflow/src/features/registration/sms-notification-utils.ts
+++ b/packages/workflow/src/features/registration/sms-notification-utils.ts
@@ -10,7 +10,7 @@
  */
 import { APPLICATION_CONFIG_URL } from '@workflow/constants'
 import fetch from 'node-fetch'
-import { logger } from '@workflow/logger'
+import { logger } from '@opencrvs/commons'
 
 export enum InformantNotificationName {
   birthInProgressSMS = 'birthInProgressSMS',
diff --git a/packages/workflow/src/features/registration/utils.ts b/packages/workflow/src/features/registration/utils.ts
index 07c556cd052..b433ff3da4d 100644
--- a/packages/workflow/src/features/registration/utils.ts
+++ b/packages/workflow/src/features/registration/utils.ts
@@ -15,9 +15,7 @@ import {
 } from '@workflow/constants'
 import { EVENT_TYPE } from '@workflow/features/registration/fhir/constants'
 import { concatenateName } from '@workflow/features/registration/fhir/fhir-utils'
-import { logger } from '@workflow/logger'
-import fetch from 'node-fetch'
-import * as ShortUIDGen from 'short-uid'
+
 import {
   Bundle,
   BundleEntry,
@@ -32,6 +30,10 @@ import {
 import { MAKE_CORRECTION_EXTENSION_URL } from '@workflow/features/task/fhir/constants'
 import { getTaskEventType } from '@workflow/features/task/fhir/utils'
 
+import { logger } from '@opencrvs/commons'
+import fetch from 'node-fetch'
+import * as ShortUIDGen from 'short-uid'
+
 export enum FHIR_RESOURCE_TYPE {
   COMPOSITION = 'Composition',
   TASK = 'Task',
diff --git a/packages/workflow/src/logger.ts b/packages/workflow/src/logger.ts
deleted file mode 100644
index dfdcc123e73..00000000000
--- a/packages/workflow/src/logger.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * OpenCRVS is also distributed under the terms of the Civil Registration
- * & Healthcare Disclaimer located at http://opencrvs.org/license.
- *
- * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
- */
-import pino from 'pino'
-export const logger = pino()
-
-const level = process.env.NODE_ENV === 'test' ? 'error' : process.env.LOG_LEVEL
-if (level) {
-  logger.level = level
-}
diff --git a/packages/workflow/src/records/handler/create.ts b/packages/workflow/src/records/handler/create.ts
index c70bc1a627d..202608d7ed9 100644
--- a/packages/workflow/src/records/handler/create.ts
+++ b/packages/workflow/src/records/handler/create.ts
@@ -69,7 +69,7 @@ import {
   toValidated,
   toWaitingForExternalValidationState
 } from '@workflow/records/state-transitions'
-import { logger } from '@workflow/logger'
+import { logger } from '@opencrvs/commons'
 
 const requestSchema = z.object({
   event: z.custom<EVENT_TYPE>(),
diff --git a/packages/workflow/src/records/handler/download.ts b/packages/workflow/src/records/handler/download.ts
index 3e8dcc5a2e0..0017e5e8a51 100644
--- a/packages/workflow/src/records/handler/download.ts
+++ b/packages/workflow/src/records/handler/download.ts
@@ -24,7 +24,7 @@ import { toDownloaded } from '@workflow/records/state-transitions'
 import { hasScope, inScope } from '@opencrvs/commons/authentication'
 import { sendBundleToHearth } from '@workflow/records/fhir'
 import { indexBundleToRoute } from '@workflow/records/search'
-import { logger } from '@workflow/logger'
+import { logger } from '@opencrvs/commons'
 import { auditEvent } from '@workflow/records/audit'
 
 function getDownloadedOrAssignedExtension(
diff --git a/yarn.lock b/yarn.lock
index fe2423c1c01..cbf2527aca9 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8591,6 +8591,13 @@ abbrev@1, abbrev@^1.0.0:
   resolved "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
+abort-controller@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
+  integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
+  dependencies:
+    event-target-shim "^5.0.0"
+
 abstract-logging@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.1.tgz"
@@ -10031,6 +10038,14 @@ buffer@^5.1.0, buffer@^5.5.0, buffer@^5.6.0:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
+buffer@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
+  dependencies:
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
+
 buildcheck@~0.0.6:
   version "0.0.6"
   resolved "https://registry.npmjs.org/buildcheck/-/buildcheck-0.0.6.tgz"
@@ -10749,7 +10764,7 @@ colord@^2.9.3:
   resolved "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz"
   integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
 
-colorette@^2.0.16, colorette@^2.0.20:
+colorette@^2.0.16, colorette@^2.0.20, colorette@^2.0.7:
   version "2.0.20"
   resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz"
   integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
@@ -11633,6 +11648,11 @@ dateformat@^3.0.0:
   resolved "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz"
   integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
 
+dateformat@^4.6.3:
+  version "4.6.3"
+  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5"
+  integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==
+
 debounce@^1.2.0:
   version "1.2.1"
   resolved "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz"
@@ -13242,6 +13262,11 @@ event-emitter@^0.3.5, event-emitter@~0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
+event-target-shim@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
+  integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
+
 eventemitter3@^3.0.0:
   version "3.1.2"
   resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz"
@@ -13493,6 +13518,11 @@ extract-zip@^2.0.1:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
+fast-copy@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/fast-copy/-/fast-copy-3.0.2.tgz#59c68f59ccbcac82050ba992e0d5c389097c9d35"
+  integrity sha512-dl0O9Vhju8IrcLndv2eU4ldt1ftXMqqfgN4H1cpmGV7P6jeB9FwpN9a2c8DPGE1Ys88rNUJVYDHq73CGAGOPfQ==
+
 fast-csv@^4.3.6:
   version "4.3.6"
   resolved "https://registry.npmjs.org/fast-csv/-/fast-csv-4.3.6.tgz"
@@ -13586,7 +13616,7 @@ fast-redact@^3.0.0:
   resolved "https://registry.npmjs.org/fast-redact/-/fast-redact-3.3.0.tgz"
   integrity sha512-6T5V1QK1u4oF+ATxs1lWUmlEk6P2T9HqJG3e2DnHOdVgZy2rFJBoEnrIedcTXlkAHU/zKC+7KETJ+KGGKwxgMQ==
 
-fast-safe-stringify@^2.0.7, fast-safe-stringify@^2.0.8:
+fast-safe-stringify@^2.0.7, fast-safe-stringify@^2.0.8, fast-safe-stringify@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz"
   integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==
@@ -14846,6 +14876,11 @@ headers-utils@^1.2.0:
   resolved "https://registry.npmjs.org/headers-utils/-/headers-utils-1.2.5.tgz"
   integrity sha512-DAzV5P/pk3wTU/8TLZN+zFTDv4Xa1QDTU8pRvovPetcOMbmqq8CwsAvZBLPZHH6usxyy31zMp7I4aCYb6XIf6w==
 
+help-me@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/help-me/-/help-me-5.0.0.tgz#b1ebe63b967b74060027c2ac61f9be12d354a6f6"
+  integrity sha512-7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==
+
 history@^4.7.2, history@^4.9.0:
   version "4.10.1"
   resolved "https://registry.npmjs.org/history/-/history-4.10.1.tgz"
@@ -16579,6 +16614,11 @@ jose@^4.13.1:
   resolved "https://registry.yarnpkg.com/jose/-/jose-4.15.5.tgz#6475d0f467ecd3c630a1b5dadd2735a7288df706"
   integrity sha512-jc7BFxgKPKi94uOvEmzlSWFFe2+vASyXaKUpdQKatWAESU2MWjDfFf0fdfc83CDKcA5QecabZeNLyfhe3yKNkg==
 
+joycon@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
+  integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==
+
 js-levenshtein@^1.1.6:
   version "1.1.6"
   resolved "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz"
@@ -19463,6 +19503,11 @@ on-exit-leak-free@^0.2.0:
   resolved "https://registry.npmjs.org/on-exit-leak-free/-/on-exit-leak-free-0.2.0.tgz"
   integrity sha512-dqaz3u44QbRXQooZLTUKU41ZrzYrcvLISVgbrzbyCMxpmSLJvZ3ZamIJIZ29P6OhZIkNIQKosdeM6t1LYbA9hg==
 
+on-exit-leak-free@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-2.1.2.tgz#fed195c9ebddb7d9e4c3842f93f281ac8dadd3b8"
+  integrity sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==
+
 on-finished@2.4.1:
   version "2.4.1"
   resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"
@@ -20101,6 +20146,14 @@ pify@^5.0.0:
   resolved "https://registry.npmjs.org/pify/-/pify-5.0.0.tgz"
   integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
 
+pino-abstract-transport@^1.0.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-1.2.0.tgz#97f9f2631931e242da531b5c66d3079c12c9d1b5"
+  integrity sha512-Guhh8EZfPCfH+PMXAb6rKOjGQEoy0xlAIn+irODG5kgfYV+BQ0rGYYWTIel3P5mmyXqkYkPmdIkywsn6QKUR1Q==
+  dependencies:
+    readable-stream "^4.0.0"
+    split2 "^4.0.0"
+
 pino-abstract-transport@v0.5.0:
   version "0.5.0"
   resolved "https://registry.npmjs.org/pino-abstract-transport/-/pino-abstract-transport-0.5.0.tgz"
@@ -20109,6 +20162,26 @@ pino-abstract-transport@v0.5.0:
     duplexify "^4.1.2"
     split2 "^4.0.0"
 
+pino-pretty@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-11.0.0.tgz#9b883f7b933f58fa94caa44225aab302409461ef"
+  integrity sha512-YFJZqw59mHIY72wBnBs7XhLGG6qpJMa4pEQTRgEPEbjIYbng2LXEZZF1DoyDg9CfejEy8uZCyzpcBXXG0oOCwQ==
+  dependencies:
+    colorette "^2.0.7"
+    dateformat "^4.6.3"
+    fast-copy "^3.0.0"
+    fast-safe-stringify "^2.1.1"
+    help-me "^5.0.0"
+    joycon "^3.1.1"
+    minimist "^1.2.6"
+    on-exit-leak-free "^2.1.0"
+    pino-abstract-transport "^1.0.0"
+    pump "^3.0.0"
+    readable-stream "^4.0.0"
+    secure-json-parse "^2.4.0"
+    sonic-boom "^3.0.0"
+    strip-json-comments "^3.1.1"
+
 pino-std-serializers@^3.1.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-3.2.0.tgz"
@@ -21191,6 +21264,17 @@ readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@^2.0.5, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
+readable-stream@^4.0.0:
+  version "4.5.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.5.2.tgz#9e7fc4c45099baeed934bff6eb97ba6cf2729e09"
+  integrity sha512-yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==
+  dependencies:
+    abort-controller "^3.0.0"
+    buffer "^6.0.3"
+    events "^3.3.0"
+    process "^0.11.10"
+    string_decoder "^1.3.0"
+
 readable-stream@~1.0.31:
   version "1.0.34"
   resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
@@ -22442,6 +22526,13 @@ sonic-boom@^2.2.1:
   dependencies:
     atomic-sleep "^1.0.0"
 
+sonic-boom@^3.0.0:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-3.8.1.tgz#d5ba8c4e26d6176c9a1d14d549d9ff579a163422"
+  integrity sha512-y4Z8LCDBuum+PBP3lSV7RHrXscqksve/bi0as7mhwVnBW+/wUqKT/2Kb7um8yqcFy0duYbbPxzt89Zy2nOCaxg==
+  dependencies:
+    atomic-sleep "^1.0.0"
+
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/sort-keys/-/sort-keys-2.0.0.tgz"
@@ -22955,7 +23046,7 @@ string.prototype.trimstart@^1.0.7:
     define-properties "^1.2.0"
     es-abstract "^1.22.1"
 
-string_decoder@^1.1.1:
+string_decoder@^1.1.1, string_decoder@^1.3.0:
   version "1.3.0"
   resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
   integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==

From 604db1fe78121938ba15ffc16694358e048c6276 Mon Sep 17 00:00:00 2001
From: Pyry Rouvila <pyry@opencrvs.org>
Date: Wed, 19 Jun 2024 10:23:25 +0300
Subject: [PATCH 032/108] chore(v1.5.0): handle `ws` security error (#7192)

* chore: handle  security error

* fix: yaml format
---
 .trivyignore.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.trivyignore.yaml b/.trivyignore.yaml
index b9a54ee9952..1d7f2b383d0 100644
--- a/.trivyignore.yaml
+++ b/.trivyignore.yaml
@@ -51,3 +51,5 @@ vulnerabilities:
     statement: Metabase v0.46 vulnerability, fixed in Metabase v0.49
   - id: CVE-2024-4068
     statement: Transitive dependency of lint-staged, jest and msw. Not running in production. Likely fixed by upgrading.
+  - id: CVE-2024-37890
+    statement: ws vulnerability, transitive dependency of jest, storybook, graphql-codegen, not running in production.

From c31c4f70552476d7a234c1ff330a7ebfaa7ffbfd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:34:37 +0300
Subject: [PATCH 033/108] chore(v1.5.0): deprecate admin UI menu items (#7191)

* Placeholder commit for PR #7155

* chore: deprecate admin UI menu items (#7155)

* chore: deprecate admin ui menu items

* chore(changelog)

* fix: remove tests for application and certificate

* chore(changelog): update wording

---------

Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Pyry Rouvila <pyry@opencrvs.org>
---
 CHANGELOG.md                                  |   4 +
 packages/client/src/App.tsx                   |  38 ------
 .../components/interface/Navigation.test.tsx  |   2 -
 .../src/components/interface/Navigation.tsx   | 113 ++++--------------
 4 files changed, 26 insertions(+), 131 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0864d2ee8bd..c7ac9a5d8d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,10 @@
 
   We are dropping support for 'agentDefault' to be used as initial value for SELECT_WITH_DYNAMIC_OPTIONS type of fields. The country config package now must return the form with prepopulated initial values to show default addresses. [#6871](https://github.com/opencrvs/opencrvs-core/issues/6871)
 
+- #### Remove system admin UI items: Application, Certificates, User roles, Informant notifications
+
+  We have now moved to configuring these items directly from country configuration repository.
+
 ## New features
 
 - Add loading spinners before JavaScript bundle has loaded for both login and client
diff --git a/packages/client/src/App.tsx b/packages/client/src/App.tsx
index 84d79b934b5..af613f7f7ae 100644
--- a/packages/client/src/App.tsx
+++ b/packages/client/src/App.tsx
@@ -47,8 +47,6 @@ import { AppStore } from './store'
 import { CorrectionForm, CorrectionReviewForm } from './views/CorrectionForm'
 import { VerifyCorrector } from './views/CorrectionForm/VerifyCorrector'
 import { RecordAudit } from './views/RecordAudit/RecordAudit'
-import { ApplicationConfig } from './views/SysAdmin/Config/Application'
-import { CertificatesConfig } from './views/SysAdmin/Config/Certificates'
 import { UserList } from './views/SysAdmin/Team/user/UserList'
 import { SystemList } from './views/SysAdmin/Config/Systems/Systems'
 import VSExport from './views/SysAdmin/Vsexports/VSExport'
@@ -62,11 +60,9 @@ import { Leaderboards } from '@client/views/Performance/Leaderboards'
 import { PerformanceDashboard } from '@client/views/Performance/Dashboard'
 import { SystemRoleType } from '@client/utils/gateway'
 import { AdministrativeLevels } from '@client/views/Organisation/AdministrativeLevels'
-import InformantNotification from '@client/views/SysAdmin/Communications/InformantSMSNotification/InformantSMSNotification'
 import { VerifyCertificatePage } from '@client/views/VerifyCertificate/VerifyCertificatePage'
 import { IssueCertificate } from '@client/views/IssueCertificate/IssueCertificate'
 import { IssuePayment } from '@client/views/IssueCertificate/IssueCollectorForm/IssuePayment'
-import UserRoles from '@client/views/SysAdmin/Config/UserRoles/UserRoles'
 import { OIDPVerificationCallback } from './views/OIDPVerificationCallback/OIDPVerificationCallback'
 import { ApolloProvider } from '@client/utils/ApolloProvider'
 import { Home } from '@client/views/OfficeHome/Home'
@@ -257,24 +253,6 @@ export function App(props: IAppProps) {
                                               }
                                               component={OfficeHome}
                                             />
-                                            <ProtectedRoute
-                                              exact
-                                              roles={[
-                                                SystemRoleType.NationalSystemAdmin
-                                              ]}
-                                              path={routes.CERTIFICATE_CONFIG}
-                                              component={CertificatesConfig}
-                                            />
-                                            <ProtectedRoute
-                                              exact
-                                              roles={[
-                                                SystemRoleType.NationalSystemAdmin
-                                              ]}
-                                              path={
-                                                routes.INFORMANT_NOTIFICATION
-                                              }
-                                              component={InformantNotification}
-                                            />
                                             <ProtectedRoute
                                               exact
                                               roles={[
@@ -305,22 +283,6 @@ export function App(props: IAppProps) {
                                               }
                                               component={AdvancedSearchResult}
                                             />
-                                            <ProtectedRoute
-                                              exact
-                                              roles={[
-                                                SystemRoleType.NationalSystemAdmin
-                                              ]}
-                                              path={routes.APPLICATION_CONFIG}
-                                              component={ApplicationConfig}
-                                            />
-                                            <ProtectedRoute
-                                              exact
-                                              roles={[
-                                                SystemRoleType.NationalSystemAdmin
-                                              ]}
-                                              path={routes.USER_ROLES_CONFIG}
-                                              component={UserRoles}
-                                            />
                                             <ProtectedRoute
                                               path={
                                                 routes.DECLARATION_RECORD_AUDIT
diff --git a/packages/client/src/components/interface/Navigation.test.tsx b/packages/client/src/components/interface/Navigation.test.tsx
index e0baa618c7c..1a08cd527f7 100644
--- a/packages/client/src/components/interface/Navigation.test.tsx
+++ b/packages/client/src/components/interface/Navigation.test.tsx
@@ -109,8 +109,6 @@ describe('Navigation for national system admin related tests', () => {
     expect(testComponent.exists('#navigation_config_main')).toBeTruthy()
     testComponent.find('#navigation_config_main').hostNodes().simulate('click')
     testComponent.update()
-    expect(testComponent.exists('#navigation_application')).toBeTruthy()
-    expect(testComponent.exists('#navigation_certificate')).toBeTruthy()
   })
 
   it('No application related tabs', async () => {
diff --git a/packages/client/src/components/interface/Navigation.tsx b/packages/client/src/components/interface/Navigation.tsx
index ef0f03f5c48..2a89c4bb893 100644
--- a/packages/client/src/components/interface/Navigation.tsx
+++ b/packages/client/src/components/interface/Navigation.tsx
@@ -19,11 +19,8 @@ import { navigationMessages } from '@client/i18n/messages/views/navigation'
 import {
   goToAdvancedSearchResult,
   goToAllUserEmail,
-  goToApplicationConfig,
-  goToCertificateConfig,
   goToDashboardView,
   goToHomeTab,
-  goToInformantNotification,
   goToLeaderBoardsView,
   goToOrganisationView,
   goToPerformanceStatistics,
@@ -31,7 +28,6 @@ import {
   goToSettings,
   goToSystemList,
   goToTeamView,
-  goToUserRolesConfig,
   goToVSExport
 } from '@client/navigation'
 import { ADVANCED_SEARCH_RESULT } from '@client/navigation/routes'
@@ -223,10 +219,7 @@ interface IProps {
 
 interface IDispatchProps {
   goToHomeTab: typeof goToHomeTab
-  goToCertificateConfigAction: typeof goToCertificateConfig
   goToVSExportsAction: typeof goToVSExport
-  goToUserRolesConfigAction: typeof goToUserRolesConfig
-  goToApplicationConfigAction: typeof goToApplicationConfig
   goToAdvancedSearchResultAction: typeof goToAdvancedSearchResult
   redirectToAuthentication: typeof redirectToAuthentication
   goToPerformanceViewAction: typeof goToPerformanceView
@@ -239,7 +232,6 @@ interface IDispatchProps {
   goToPerformanceStatistics: typeof goToPerformanceStatistics
   updateRegistrarWorkqueue: typeof updateRegistrarWorkqueue
   setAdvancedSearchParam: typeof setAdvancedSearchParam
-  goToInformantNotification: typeof goToInformantNotification
   goToAllUserEmail: typeof goToAllUserEmail
 }
 
@@ -303,11 +295,8 @@ const NavigationView = (props: IFullProps) => {
     enableMenuSelection = true,
     loadWorkqueueStatuses = true,
     activeMenuItem,
-    goToCertificateConfigAction,
-    goToUserRolesConfigAction,
     goToVSExportsAction,
     goToSystemViewAction,
-    goToApplicationConfigAction,
     goToAdvancedSearchResultAction,
     navigationWidth,
     workqueue,
@@ -321,7 +310,6 @@ const NavigationView = (props: IFullProps) => {
     goToPerformanceStatistics,
     goToDashboardView,
     goToLeaderBoardsView,
-    goToInformantNotification,
     goToAllUserEmail,
     className
   } = props
@@ -721,54 +709,17 @@ const NavigationView = (props: IFullProps) => {
                       />
                       {(isConfigExpanded ||
                         configTab.includes(activeMenuItem)) && (
-                        <>
-                          <NavigationSubItem
-                            label={intl.formatMessage(
-                              navigationMessages[WORKQUEUE_TABS.application]
-                            )}
-                            id={`navigation_${WORKQUEUE_TABS.application}`}
-                            onClick={goToApplicationConfigAction}
-                            isSelected={
-                              enableMenuSelection &&
-                              activeMenuItem === WORKQUEUE_TABS.application
-                            }
-                          />
-                          <NavigationSubItem
-                            label={intl.formatMessage(
-                              navigationMessages[WORKQUEUE_TABS.certificate]
-                            )}
-                            id={`navigation_${WORKQUEUE_TABS.certificate}`}
-                            onClick={goToCertificateConfigAction}
-                            isSelected={
-                              enableMenuSelection &&
-                              activeMenuItem === WORKQUEUE_TABS.certificate
-                            }
-                          />
-
-                          <NavigationSubItem
-                            id={`navigation_${WORKQUEUE_TABS.systems}`}
-                            label={intl.formatMessage(
-                              navigationMessages[WORKQUEUE_TABS.systems]
-                            )}
-                            onClick={goToSystemViewAction}
-                            isSelected={
-                              enableMenuSelection &&
-                              activeMenuItem === WORKQUEUE_TABS.systems
-                            }
-                          />
-
-                          <NavigationSubItem
-                            id={`navigation_${WORKQUEUE_TABS.userRoles}`}
-                            label={intl.formatMessage(
-                              navigationMessages[WORKQUEUE_TABS.userRoles]
-                            )}
-                            onClick={goToUserRolesConfigAction}
-                            isSelected={
-                              enableMenuSelection &&
-                              activeMenuItem === WORKQUEUE_TABS.userRoles
-                            }
-                          />
-                        </>
+                        <NavigationSubItem
+                          id={`navigation_${WORKQUEUE_TABS.systems}`}
+                          label={intl.formatMessage(
+                            navigationMessages[WORKQUEUE_TABS.systems]
+                          )}
+                          onClick={goToSystemViewAction}
+                          isSelected={
+                            enableMenuSelection &&
+                            activeMenuItem === WORKQUEUE_TABS.systems
+                          }
+                        />
                       )}
                     </>
                   )}
@@ -802,33 +753,17 @@ const NavigationView = (props: IFullProps) => {
                       />
                       {(isCommunationExpanded ||
                         conmmunicationTab.includes(activeMenuItem)) && (
-                        <>
-                          <NavigationSubItem
-                            label={intl.formatMessage(
-                              navigationMessages[
-                                WORKQUEUE_TABS.informantNotification
-                              ]
-                            )}
-                            id={`navigation_${WORKQUEUE_TABS.informantNotification}`}
-                            onClick={goToInformantNotification}
-                            isSelected={
-                              enableMenuSelection &&
-                              activeMenuItem ===
-                                WORKQUEUE_TABS.informantNotification
-                            }
-                          />
-                          <NavigationSubItem
-                            label={intl.formatMessage(
-                              navigationMessages[WORKQUEUE_TABS.emailAllUsers]
-                            )}
-                            id={`navigation_${WORKQUEUE_TABS.emailAllUsers}`}
-                            onClick={goToAllUserEmail}
-                            isSelected={
-                              enableMenuSelection &&
-                              activeMenuItem === WORKQUEUE_TABS.emailAllUsers
-                            }
-                          />
-                        </>
+                        <NavigationSubItem
+                          label={intl.formatMessage(
+                            navigationMessages[WORKQUEUE_TABS.emailAllUsers]
+                          )}
+                          id={`navigation_${WORKQUEUE_TABS.emailAllUsers}`}
+                          onClick={goToAllUserEmail}
+                          isSelected={
+                            enableMenuSelection &&
+                            activeMenuItem === WORKQUEUE_TABS.emailAllUsers
+                          }
+                        />
                       )}
                     </>
                   )}
@@ -1027,9 +962,6 @@ export const Navigation = connect<
   IStoreState
 >(mapStateToProps, {
   goToHomeTab,
-  goToCertificateConfigAction: goToCertificateConfig,
-  goToUserRolesConfigAction: goToUserRolesConfig,
-  goToApplicationConfigAction: goToApplicationConfig,
   goToAdvancedSearchResultAction: goToAdvancedSearchResult,
   goToVSExportsAction: goToVSExport,
   goToPerformanceViewAction: goToPerformanceView,
@@ -1043,7 +975,6 @@ export const Navigation = connect<
   goToPerformanceStatistics,
   goToLeaderBoardsView,
   goToDashboardView,
-  goToInformantNotification,
   goToAllUserEmail
 })(injectIntl(withRouter(NavigationView)))
 

From d913c88de992b88c7d86cf3e9366afb556574abc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 10:34:54 +0300
Subject: [PATCH 034/108] fix(v1.5.0): certificate overflowing on the preview
 screen (#7193)

* Placeholder commit for PR #7157

* fix: certificate overflowing on the preview screen (#7157)

* fix: certificate overflowing on the preview screen

* fix: add the mobile title/actions back

* fix: linter not understanding css comment

* chore(changelog)

---------

Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Pyry Rouvila <pyry@opencrvs.org>
---
 CHANGELOG.md                                  |  3 +++
 .../ReviewCertificateAction.tsx               | 23 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7ac9a5d8d7..49db2688c26 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,9 @@
 - Fix Removed duplicateTrackingId check in createDuplicateTask method [#7081](https://github.com/opencrvs/opencrvs-core/pull/7081)
 - Fix print record page for an unsaved declaration [#6893](https://github.com/opencrvs/opencrvs-core/issues/6893)
 - Fix Reset pagination to default page (1) when location changes in UserList [#6481](https://github.com/opencrvs/opencrvs-core/issues/6481)
+- Fix Disabling 'Mark as duplicate' button when duplicate reason is empty too [#7083](https://github.com/opencrvs/opencrvs-core/pull/7083)
+- Fix certificate overflowing in preview certificate view [#7157](https://github.com/opencrvs/opencrvs-core/pull/7157)
+- Fix records going completely missing when an unexpected error happens in the backend [#7021](https://github.com/opencrvs/opencrvs-core/pull/7021)
 
 ## Refactor
 
diff --git a/packages/client/src/views/PrintCertificate/ReviewCertificateAction.tsx b/packages/client/src/views/PrintCertificate/ReviewCertificateAction.tsx
index a77159b9ec4..ee0ef030366 100644
--- a/packages/client/src/views/PrintCertificate/ReviewCertificateAction.tsx
+++ b/packages/client/src/views/PrintCertificate/ReviewCertificateAction.tsx
@@ -33,7 +33,12 @@ import styled from 'styled-components'
 import { constantsMessages } from '@client/i18n/messages'
 import { usePrintableCertificate } from './usePrintableCertificate'
 
-const CertificateContainer = styled.div``
+const CertificateContainer = styled.div`
+  svg {
+    /* limits the certificate overflowing on small screens */
+    max-width: 100%;
+  }
+`
 
 const ReviewCertificateFrame = ({
   children
@@ -77,6 +82,22 @@ const ReviewCertificateFrame = ({
               <Icon name="X" size="large" />
             </Button>
           }
+          mobileTitle={intl.formatMessage(
+            certificateMessages.certificateCollectionTitle
+          )}
+          mobileLeft={
+            <Button type="icon" onClick={back} id="action_page_back_button">
+              <Icon name="ArrowLeft" size="large" />
+            </Button>
+          }
+          mobileRight={
+            <Button
+              type="icon"
+              onClick={() => dispatch(goToHomeTab(WORKQUEUE_TABS.readyToPrint))}
+            >
+              <Icon name="X" size="large" />
+            </Button>
+          }
         />
       }
       skipToContentText={intl.formatMessage(

From 9a59d744dd5b0fbdc9ab54af576d06169655a9ee Mon Sep 17 00:00:00 2001
From: Muhammed Tareq Aziz <muhammedtareqaziz@Muhammeds-MacBook-Pro.local>
Date: Thu, 13 Jun 2024 11:57:50 +0600
Subject: [PATCH 035/108] added missing 'requesterOther' params in client
 queries

---
 packages/client/src/utils/gateway.ts                    | 4 ++++
 packages/client/src/views/DataProvider/death/queries.ts | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/packages/client/src/utils/gateway.ts b/packages/client/src/utils/gateway.ts
index 3ab96d5f388..04fe091d432 100644
--- a/packages/client/src/utils/gateway.ts
+++ b/packages/client/src/utils/gateway.ts
@@ -4516,6 +4516,7 @@ export type FetchDeathRegistrationForReviewQuery = {
       __typename?: 'History'
       otherReason?: string | null
       requester?: string | null
+      requesterOther?: string | null
       hasShowedVerifiedDocument?: boolean | null
       noSupportingDocumentationRequired?: boolean | null
       date?: any | null
@@ -4843,6 +4844,7 @@ export type FetchDeathRegistrationForCertificationQuery = {
       __typename?: 'History'
       otherReason?: string | null
       requester?: string | null
+      requesterOther?: string | null
       date?: any | null
       action?: RegAction | null
       regStatus?: RegStatus | null
@@ -5244,6 +5246,7 @@ export type FetchMarriageRegistrationForReviewQuery = {
       __typename?: 'History'
       otherReason?: string | null
       requester?: string | null
+      requesterOther?: string | null
       hasShowedVerifiedDocument?: boolean | null
       noSupportingDocumentationRequired?: boolean | null
       date?: any | null
@@ -5603,6 +5606,7 @@ export type FetchMarriageRegistrationForCertificateQuery = {
       __typename?: 'History'
       otherReason?: string | null
       requester?: string | null
+      requesterOther?: string | null
       hasShowedVerifiedDocument?: boolean | null
       date?: any | null
       action?: RegAction | null
diff --git a/packages/client/src/views/DataProvider/death/queries.ts b/packages/client/src/views/DataProvider/death/queries.ts
index 9f742134b88..0315d6b98bd 100644
--- a/packages/client/src/views/DataProvider/death/queries.ts
+++ b/packages/client/src/views/DataProvider/death/queries.ts
@@ -287,6 +287,7 @@ export const GET_DEATH_REGISTRATION_FOR_REVIEW = gql`
         }
         otherReason
         requester
+        requesterOther
         hasShowedVerifiedDocument
         noSupportingDocumentationRequired
         date
@@ -555,6 +556,7 @@ export const GET_DEATH_REGISTRATION_FOR_CERTIFICATION = gql`
       history {
         otherReason
         requester
+        requesterOther
         date
         action
         regStatus

From 4cc0814e3bd2b84e2e5e6022c7a58c452d42929f Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 20 Jun 2024 07:46:47 +0000
Subject: [PATCH 036/108] Placeholder commit for PR #7200


From f4addb25c364a72b7031c232c3b828d78c298fb0 Mon Sep 17 00:00:00 2001
From: Tameem Bin Haider <tameem.haider@dsinnovators.com>
Date: Fri, 21 Jun 2024 12:29:51 +0600
Subject: [PATCH 037/108] feat: added progressbar when loading #6641 (#6894)

* feat: added progressbar when loading

* fix: handling unhandled error

* amend: enforce progressbars min visiblity in PROD only

* feat: reused LoadingBar in page.tsx

* refactor the speed of the loading bar and texts

* refactor: moved styles from progress-container into root

* refactor: moved `LoadingBar` to `@opencrvs/components`

* Revert "refactor: moved styles from progress-container into root"

This reverts commit 1c8d4ce3987f76d3c2409790b895bd4e2f8aa802.

* refactor: change class to avoid clash

* amend: change id in index.html

---------

Co-authored-by: naftis <pyry.rouvila@gmail.com>
---
 packages/client/index.html                    | 101 ++++++++++--------
 packages/client/public/images/logo-90x90.svg  |  22 ++++
 packages/client/src/components/Page.tsx       |  25 +----
 .../client/src/components/ProtectedPage.tsx   |  42 +++-----
 .../components/src/LoadingBar/LoadingBar.tsx  |  66 ++++++++++++
 packages/components/src/LoadingBar/index.ts   |  11 ++
 packages/components/src/index.ts              |   1 +
 7 files changed, 171 insertions(+), 97 deletions(-)
 create mode 100644 packages/client/public/images/logo-90x90.svg
 create mode 100644 packages/components/src/LoadingBar/LoadingBar.tsx
 create mode 100644 packages/components/src/LoadingBar/index.ts

diff --git a/packages/client/index.html b/packages/client/index.html
index 6dc526a4a58..75f6c3f8e1a 100644
--- a/packages/client/index.html
+++ b/packages/client/index.html
@@ -39,70 +39,81 @@
     <style>
       body,
       html {
-        background-color: #f5f5f5;
+        background-color: #f8f8f8;
+        margin: 0;
       }
-      #spinner {
+      .pgrs-wrapper1240 {
+        height: 100vh;
+        width: 100vw;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
         opacity: 0;
-        position: absolute;
-        left: 50%;
-        top: 50%;
-        transform: translate(-25px, -25px);
-        animation: a 2s forwards;
+        animation: fadeIn 2s forwards;
+        font-family: sans-serif;
       }
-      #spinner g {
-        transform-origin: center;
-        animation: b 2s linear infinite;
+      .progress-bar {
+        width: 276px;
+        height: 8px;
+        margin-top: 27px;
+        border-radius: 100px;
+        background: #d9d9d9;
       }
-      #spinner g circle {
-        stroke-linecap: round;
-        animation: c 1.5s ease-in-out infinite;
+      #root-app-progress {
+        width: 0;
+        height: 8px;
+        border-radius: 100px;
+        background: #4972bb;
+        animation: progressAnimation 200s ease-out forwards;
       }
-      @keyframes a {
-        85% {
-          opacity: 0;
+      @keyframes progressAnimation {
+        0%,
+        1% {
+          min-width: 0%;
         }
-        100% {
-          opacity: 1;
+        3% {
+          min-width: 80%;
+        }
+        6% {
+          min-width: 91%;
+        }
+        10% {
+          min-width: 94%;
+        }
+        30% {
+          min-width: 96%;
         }
-      }
-      @keyframes b {
         100% {
-          transform: rotate(360deg);
+          min-width: 99%;
         }
       }
-      @keyframes c {
-        0% {
-          stroke-dasharray: 0 150;
-          stroke-dashoffset: 0;
-        }
-        47.5% {
-          stroke-dasharray: 42 150;
-          stroke-dashoffset: -16;
+      @keyframes fadeIn {
+        0%,
+        85% {
+          opacity: 0;
         }
-        95%,
         100% {
-          stroke-dasharray: 42 150;
-          stroke-dashoffset: -59;
+          opacity: 1;
         }
       }
     </style>
   </head>
-
   <body>
     <noscript> You need to enable JavaScript to run this app. </noscript>
     <div id="root">
-      <svg
-        id="spinner"
-        width="50"
-        height="50"
-        stroke="#4C68C1"
-        viewBox="0 0 24 24"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <g>
-          <circle cx="12" cy="12" r="9.5" fill="none" stroke-width="2"></circle>
-        </g>
-      </svg>
+      <div class="pgrs-wrapper1240">
+        <img
+          src="./images/logo-90x90.svg"
+          width="90"
+          height="90"
+          alt="OpenCRVS logo"
+        />
+        <div class="progress-bar">
+          <div id="root-app-progress"></div>
+        </div>
+        <p>Installing application...</p>
+      </div>
     </div>
     <script type="module" src="/src/index.tsx"></script>
   </body>
diff --git a/packages/client/public/images/logo-90x90.svg b/packages/client/public/images/logo-90x90.svg
new file mode 100644
index 00000000000..7e24a831b0c
--- /dev/null
+++ b/packages/client/public/images/logo-90x90.svg
@@ -0,0 +1,22 @@
+<!--
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+OpenCRVS is also distributed under the terms of the Civil Registration
+& Healthcare Disclaimer located at http://opencrvs.org/license.
+
+Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
+-->
+ <svg
+width="90"
+height="90"
+viewBox="0 0 90 90"
+fill="none"
+xmlns="http://www.w3.org/2000/svg"
+>
+<path
+  d="M59.6405 12.8296H59.5766C59.2506 12.8266 58.935 12.9447 58.6911 13.1611C58.4472 13.3775 58.2923 13.6767 58.2565 14.0007C57.9651 17.3156 56.4424 20.4011 53.9885 22.6488C51.5346 24.8965 48.3277 26.1432 45 26.1432C41.6723 26.1432 38.4653 24.8965 36.0115 22.6488C33.5576 20.4011 32.0348 17.3156 31.7435 14.0007C31.7076 13.6767 31.5527 13.3775 31.3088 13.1611C31.0649 12.9447 30.7494 12.8266 30.4234 12.8296H30.3638C25.775 12.8296 21.3742 14.6525 18.1294 17.8973C14.8847 21.142 13.0618 25.5429 13.0618 30.1316V59.4041C13.0618 63.9929 14.8847 68.3937 18.1294 71.6384C21.3742 74.8832 25.775 76.7061 30.3638 76.7061H30.4234C30.7494 76.7091 31.0649 76.591 31.3088 76.3746C31.5527 76.1583 31.7076 75.8591 31.7435 75.535C32.0348 72.2201 33.5576 69.1346 36.0115 66.8869C38.4653 64.6393 41.6723 63.3925 45 63.3925C48.3277 63.3925 51.5346 64.6393 53.9885 66.8869C56.4424 69.1346 57.9651 72.2201 58.2565 75.535C58.2923 75.8591 58.4472 76.1583 58.6911 76.3746C58.935 76.591 59.2506 76.7091 59.5766 76.7061H59.6405C64.2285 76.705 68.6282 74.8816 71.8721 71.6369C75.1159 68.3923 76.9382 63.9921 76.9382 59.4041V30.1316C76.9382 25.5436 75.1159 21.1434 71.8721 17.8988C68.6282 14.6542 64.2285 12.8308 59.6405 12.8296ZM45 58.0755C42.368 58.0755 39.7951 57.295 37.6067 55.8327C35.4183 54.3705 33.7126 52.2921 32.7054 49.8605C31.6982 47.4288 31.4346 44.7531 31.9481 42.1717C32.4616 39.5903 33.729 37.2191 35.5901 35.358C37.4512 33.4969 39.8224 32.2294 42.4038 31.716C44.9852 31.2025 47.6609 31.466 50.0926 32.4733C52.5242 33.4805 54.6026 35.1861 56.0648 37.3746C57.5271 39.563 58.3076 42.1359 58.3076 44.7679C58.3076 48.2973 56.9055 51.6821 54.4099 54.1778C51.9142 56.6734 48.5294 58.0755 45 58.0755Z"
+  fill="#1470FF"
+/>
+</svg>
\ No newline at end of file
diff --git a/packages/client/src/components/Page.tsx b/packages/client/src/components/Page.tsx
index 5f83989a72a..d1a60ba15b6 100644
--- a/packages/client/src/components/Page.tsx
+++ b/packages/client/src/components/Page.tsx
@@ -9,12 +9,11 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import * as React from 'react'
-import styled, { keyframes } from 'styled-components'
+import styled from 'styled-components'
 import { RouteComponentProps, withRouter } from 'react-router'
 import { connect } from 'react-redux'
 import { IStoreState } from '@opencrvs/client/src/store'
 import { setInitialDeclarations } from '@client/declarations'
-import { Spinner } from '@opencrvs/components/lib/Spinner'
 import {
   getOfflineData,
   getOfflineDataLoaded,
@@ -32,6 +31,7 @@ import { getInitialDeclarationsLoaded } from '@client/declarations/selectors'
 import { isRegisterFormReady } from '@client/forms/register/declaration-selectors'
 import { IOfflineData } from '@client/offline/reducer'
 import { isNavigatorOnline } from '@client/utils'
+import { LoadingBar } from '@opencrvs/components/src/LoadingBar/LoadingBar'
 
 const StyledPage = styled.div<IPageProps>`
   background: ${({ theme }) => theme.colors.background};
@@ -51,25 +51,6 @@ const StyledPage = styled.div<IPageProps>`
     box-sizing: border-box;
   }
 `
-
-const spinnerAppearAnimation = keyframes`
-  85% { opacity: 0; }
-  100% {  opacity: 1; }
-`
-
-const StyledSpinner = styled(Spinner)`
-  opacity: 0;
-  position: absolute;
-  margin-left: -24px;
-  margin-top: -24px;
-  top: calc(50% - 20px);
-  left: 50%;
-  width: 40px;
-  height: 40px;
-  /** Show spinner after 2 seconds */
-  animation: ${spinnerAppearAnimation} 2s forwards;
-`
-
 interface IPageProps {
   initialDeclarationsLoaded: boolean
   offlineDataLoaded: boolean
@@ -144,7 +125,7 @@ class Component extends React.Component<
     } else {
       return (
         <>
-          <StyledSpinner id="appSpinner" />
+          <LoadingBar />
         </>
       )
     }
diff --git a/packages/client/src/components/ProtectedPage.tsx b/packages/client/src/components/ProtectedPage.tsx
index 472483b88cf..08373911ec1 100644
--- a/packages/client/src/components/ProtectedPage.tsx
+++ b/packages/client/src/components/ProtectedPage.tsx
@@ -26,12 +26,11 @@ import {
 import { connect } from 'react-redux'
 import { refreshOfflineData } from '@client/offline/actions'
 import { PropsWithChildren } from 'react'
-import styled, { keyframes } from 'styled-components'
-import { Spinner } from '@opencrvs/components/lib/Spinner'
 import { ForgotPIN } from '@client/views/Unlock/ForgotPIN'
 import { showPINUpdateSuccessToast } from '@client/notification/actions'
 import { CreatePin } from '@client/views/PIN/CreatePin'
 import { redirectToAuthentication } from '@client/profile/profileActions'
+import { LoadingBar } from '@opencrvs/components/src/LoadingBar/LoadingBar'
 export const SCREEN_LOCK = 'screenLock'
 
 type OwnProps = PropsWithChildren<{
@@ -54,28 +53,6 @@ interface IProtectPageState {
 
 type Props = OwnProps & DispatchProps & RouteComponentProps<{}>
 
-const SpinnerBackground = styled.div`
-  background: ${({ theme }) => theme.colors.grey100};
-  min-height: 100vh;
-`
-
-const spinnerAppearAnimation = keyframes`
-  85% { opacity: 0; }
-  100% {  opacity: 1; }
-`
-
-const StyledSpinner = styled(Spinner)`
-  opacity: 0;
-  position: absolute;
-  margin-left: -24px;
-  margin-top: -24px;
-  top: calc(50% - 20px);
-  left: 50%;
-  width: 40px;
-  height: 40px;
-  /** Show spinner after 2 seconds */
-  animation: ${spinnerAppearAnimation} 2s forwards;
-`
 class ProtectedPageComponent extends React.Component<Props, IProtectPageState> {
   constructor(props: Props) {
     super(props)
@@ -93,6 +70,7 @@ class ProtectedPageComponent extends React.Component<Props, IProtectPageState> {
   }
 
   async componentDidMount() {
+    const mountedOn = Date.now()
     const newState = { ...this.state }
 
     if (await storage.getItem(SCREEN_LOCK)) {
@@ -113,7 +91,15 @@ class ProtectedPageComponent extends React.Component<Props, IProtectPageState> {
     }
 
     newState.loading = false
-    this.setState(newState)
+    const timeSinceMount = Date.now() - mountedOn
+    const progress = document.getElementById('progress')
+    if (progress != null) progress.style.width = '100%'
+    setTimeout(
+      () => {
+        this.setState(newState)
+      },
+      import.meta.env.PROD ? Math.max(200, 2000 - timeSinceMount) : 0
+    )
 
     setInterval(async () => {
       if (!(await refreshToken())) this.props.redirectToAuthentication()
@@ -180,11 +166,7 @@ class ProtectedPageComponent extends React.Component<Props, IProtectPageState> {
   }
 
   renderLoadingScreen() {
-    return (
-      <SpinnerBackground>
-        <StyledSpinner id="pin_loading_spinner" />
-      </SpinnerBackground>
-    )
+    return <LoadingBar />
   }
 
   conditionalRenderUponSecuredState() {
diff --git a/packages/components/src/LoadingBar/LoadingBar.tsx b/packages/components/src/LoadingBar/LoadingBar.tsx
new file mode 100644
index 00000000000..6f9e09f9e51
--- /dev/null
+++ b/packages/components/src/LoadingBar/LoadingBar.tsx
@@ -0,0 +1,66 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * OpenCRVS is also distributed under the terms of the Civil Registration
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
+ *
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
+ */
+import { Text } from '../Text'
+import React from 'react'
+import styled, { keyframes } from 'styled-components'
+
+const ProgressBackground = styled.div`
+  background: ${({ theme }) => theme.colors.grey100};
+  height: 100vh;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+`
+
+const ProgressBar = styled.div`
+  width: 276px;
+  height: 8px;
+  margin-top: 27px;
+  border-radius: 100px;
+  opacity: 0px;
+  background: ${({ theme }) => theme.colors.grey300};
+`
+
+const ProgressAnimation = keyframes`
+  0% { min-width: 5%; }
+  1% { min-width: 20%; }
+  2% { min-width: 40%; }
+  10% { min-width: 60%; }
+  50% { min-width: 80%; }
+  100% { min-width: 90%; }
+  `
+const Progress = styled.div`
+  width: 0;
+  height: 8px;
+  gap: 0px;
+  border-radius: 100px;
+  opacity: 0px;
+  background: ${({ theme }) => theme.colors.blueDark};
+  animation: ${ProgressAnimation} 300s ease;
+`
+export const LoadingBar = () => (
+  <ProgressBackground>
+    <img
+      src="images/logo-90x90.svg"
+      alt="OpenCRVS Logo"
+      width={90}
+      height={90}
+    />
+    <ProgressBar id="appSpinner">
+      <Progress id="progress" />
+    </ProgressBar>
+    <Text variant="reg16" element="p">
+      Loading records...
+    </Text>
+  </ProgressBackground>
+)
diff --git a/packages/components/src/LoadingBar/index.ts b/packages/components/src/LoadingBar/index.ts
new file mode 100644
index 00000000000..89af8652e18
--- /dev/null
+++ b/packages/components/src/LoadingBar/index.ts
@@ -0,0 +1,11 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * OpenCRVS is also distributed under the terms of the Civil Registration
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
+ *
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
+ */
+export * from './LoadingBar'
diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts
index 445ce514067..e8be3cd7af5 100644
--- a/packages/components/src/index.ts
+++ b/packages/components/src/index.ts
@@ -46,6 +46,7 @@ export * from './ListReview'
 export * from './ListUser'
 export * from './ListViewSimplified'
 export * from './Loader'
+export * from './LoadingBar'
 export * from './LoadingGrey'
 export * from './LocationSearch'
 export * from './Modal'

From a5b6af11e0f1d6608693e095df1b2b7a76a63b0a Mon Sep 17 00:00:00 2001
From: Jamil <jamil31415926@gmail.com>
Date: Fri, 7 Jun 2024 13:06:32 +0600
Subject: [PATCH 038/108] amend: make src of logo global (#7102)

chore: update changelog
---
 CHANGELOG.md                                      | 1 +
 packages/components/src/LoadingBar/LoadingBar.tsx | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49db2688c26..9ccd675b7eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
 ## New features
 
 - Add loading spinners before JavaScript bundle has loaded for both login and client
+- Add loading bar before javaScript bundle has loaded for client and when fetching records [#6641](https://github.com/opencrvs/opencrvs-core/issues/6641)
 - Support for landscape certificate templates
 - Allow defining maxLength attribute for number type fields [#6356](https://github.com/opencrvs/opencrvs-core/issues/6356)
 - Certificate handlebar for registration fees `registrationFees` [#6817](https://github.com/opencrvs/opencrvs-core/issues/6817)
diff --git a/packages/components/src/LoadingBar/LoadingBar.tsx b/packages/components/src/LoadingBar/LoadingBar.tsx
index 6f9e09f9e51..22a559fd843 100644
--- a/packages/components/src/LoadingBar/LoadingBar.tsx
+++ b/packages/components/src/LoadingBar/LoadingBar.tsx
@@ -51,7 +51,7 @@ const Progress = styled.div`
 export const LoadingBar = () => (
   <ProgressBackground>
     <img
-      src="images/logo-90x90.svg"
+      src="/images/logo-90x90.svg"
       alt="OpenCRVS Logo"
       width={90}
       height={90}

From 1908a35400301cde5a2dd943104c1893c3d6daca Mon Sep 17 00:00:00 2001
From: Muhammed Tareq Aziz <muhammedtareqaziz@Muhammeds-MacBook-Pro.local>
Date: Thu, 13 Jun 2024 11:57:50 +0600
Subject: [PATCH 039/108] added missing 'requesterOther' params in client
 queries

---
 packages/client/src/utils/gateway.ts                    | 4 ++++
 packages/client/src/views/DataProvider/death/queries.ts | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/packages/client/src/utils/gateway.ts b/packages/client/src/utils/gateway.ts
index 3ab96d5f388..04fe091d432 100644
--- a/packages/client/src/utils/gateway.ts
+++ b/packages/client/src/utils/gateway.ts
@@ -4516,6 +4516,7 @@ export type FetchDeathRegistrationForReviewQuery = {
       __typename?: 'History'
       otherReason?: string | null
       requester?: string | null
+      requesterOther?: string | null
       hasShowedVerifiedDocument?: boolean | null
       noSupportingDocumentationRequired?: boolean | null
       date?: any | null
@@ -4843,6 +4844,7 @@ export type FetchDeathRegistrationForCertificationQuery = {
       __typename?: 'History'
       otherReason?: string | null
       requester?: string | null
+      requesterOther?: string | null
       date?: any | null
       action?: RegAction | null
       regStatus?: RegStatus | null
@@ -5244,6 +5246,7 @@ export type FetchMarriageRegistrationForReviewQuery = {
       __typename?: 'History'
       otherReason?: string | null
       requester?: string | null
+      requesterOther?: string | null
       hasShowedVerifiedDocument?: boolean | null
       noSupportingDocumentationRequired?: boolean | null
       date?: any | null
@@ -5603,6 +5606,7 @@ export type FetchMarriageRegistrationForCertificateQuery = {
       __typename?: 'History'
       otherReason?: string | null
       requester?: string | null
+      requesterOther?: string | null
       hasShowedVerifiedDocument?: boolean | null
       date?: any | null
       action?: RegAction | null
diff --git a/packages/client/src/views/DataProvider/death/queries.ts b/packages/client/src/views/DataProvider/death/queries.ts
index 9f742134b88..0315d6b98bd 100644
--- a/packages/client/src/views/DataProvider/death/queries.ts
+++ b/packages/client/src/views/DataProvider/death/queries.ts
@@ -287,6 +287,7 @@ export const GET_DEATH_REGISTRATION_FOR_REVIEW = gql`
         }
         otherReason
         requester
+        requesterOther
         hasShowedVerifiedDocument
         noSupportingDocumentationRequired
         date
@@ -555,6 +556,7 @@ export const GET_DEATH_REGISTRATION_FOR_CERTIFICATION = gql`
       history {
         otherReason
         requester
+        requesterOther
         date
         action
         regStatus

From 12e86aa484c89cc52bdabf04a1ec5f5dd68d196f Mon Sep 17 00:00:00 2001
From: Tareq <tareq.aziz@dsinnovators.com>
Date: Mon, 10 Jun 2024 20:21:50 +0600
Subject: [PATCH 040/108] removed 'declarationJurisdictionId' while calculating
 AdvancedSearchForm validity

---
 packages/client/src/views/SearchResult/AdvancedSearch.tsx | 4 +++-
 packages/components/src/SearchTool/SearchTool.tsx         | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/views/SearchResult/AdvancedSearch.tsx b/packages/client/src/views/SearchResult/AdvancedSearch.tsx
index df6572dd29d..21beee054eb 100644
--- a/packages/client/src/views/SearchResult/AdvancedSearch.tsx
+++ b/packages/client/src/views/SearchResult/AdvancedSearch.tsx
@@ -80,7 +80,9 @@ const dateFieldTypes = [
 export const isAdvancedSearchFormValid = (value: IBaseAdvancedSearchState) => {
   const validNonDateFields = Object.keys(value).filter(
     (key) =>
-      !['event', 'eventLocationType'].includes(key) &&
+      !['event', 'eventLocationType', 'declarationJurisdictionId'].includes(
+        key
+      ) &&
       !dateFieldTypes.includes(key) &&
       Boolean(value[key as keyof IBaseAdvancedSearchState])
   )
diff --git a/packages/components/src/SearchTool/SearchTool.tsx b/packages/components/src/SearchTool/SearchTool.tsx
index f42a7c0cf11..c8dce6b53a0 100644
--- a/packages/components/src/SearchTool/SearchTool.tsx
+++ b/packages/components/src/SearchTool/SearchTool.tsx
@@ -274,10 +274,9 @@ export class SearchTool extends React.Component<IProps, IState> {
           })}
           {this.props.navigationList?.map((item) => {
             return (
-              <AdvancedSearchWrapper>
+              <AdvancedSearchWrapper key={item.id}>
                 <Button
                   id={item.id}
-                  key={item.id}
                   type="tertiary"
                   size="small"
                   onClick={() => item.onClick()}

From fe7cb1a8527f7bd7be0742df0dfdb15f2b20a414 Mon Sep 17 00:00:00 2001
From: Tareq <tareq.aziz@dsinnovators.com>
Date: Fri, 21 Jun 2024 14:14:49 +0600
Subject: [PATCH 041/108] refactor: simplify and correct country data
 transformation logic

- Simplify the assignment of the `value` variable for non-country properties.
- Correct the logic for transforming the country field by ensuring it uses the proper type conversion for `label`.

This change ensures that country data is correctly transformed and other address fields are handled more clearly.
---
 CHANGELOG.md                                          |  5 +++--
 .../forms/register/mappings/query/field-mappings.ts   | 11 +++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49db2688c26..30182fe29cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,13 +61,14 @@
 - Fix Check for valid date to handle incomplete marriage declarations [#7017](https://github.com/opencrvs/opencrvs-core/issues/7017)
 - Fix French translation missing for relationship to informant when trying to correct record, print and issue record [#6341] (https://github.com/opencrvs/opencrvs-core/issues/6341)
 - Fix client modal glitches on integrations page [#7002](https://github.com/opencrvs/opencrvs-core/issues/7002)
-- Fix "Print and issue to groom|bride" is added to a different variable [#7066](https://github.com/opencrvs/opencrvs-core/pull/7066)
-- Fix Removed duplicateTrackingId check in createDuplicateTask method [#7081](https://github.com/opencrvs/opencrvs-core/pull/7081)
 - Fix print record page for an unsaved declaration [#6893](https://github.com/opencrvs/opencrvs-core/issues/6893)
 - Fix Reset pagination to default page (1) when location changes in UserList [#6481](https://github.com/opencrvs/opencrvs-core/issues/6481)
 - Fix Disabling 'Mark as duplicate' button when duplicate reason is empty too [#7083](https://github.com/opencrvs/opencrvs-core/pull/7083)
 - Fix certificate overflowing in preview certificate view [#7157](https://github.com/opencrvs/opencrvs-core/pull/7157)
 - Fix records going completely missing when an unexpected error happens in the backend [#7021](https://github.com/opencrvs/opencrvs-core/pull/7021)
+- Fix "Print and issue to groom|bride" is added to a different variable [#7046](https://github.com/opencrvs/opencrvs-core/issues/7046)
+- Fix removed duplicateTrackingId check in createDuplicateTask method [#7024](https://github.com/opencrvs/opencrvs-core/issues/7024)
+- Fiz address property handling and corrected country data transformation logic [#6989](https://github.com/opencrvs/opencrvs-core/issues/6989)
 
 ## Refactor
 
diff --git a/packages/client/src/forms/register/mappings/query/field-mappings.ts b/packages/client/src/forms/register/mappings/query/field-mappings.ts
index 607d3d51fef..98b898271e0 100644
--- a/packages/client/src/forms/register/mappings/query/field-mappings.ts
+++ b/packages/client/src/forms/register/mappings/query/field-mappings.ts
@@ -831,13 +831,12 @@ const setAddressPropFromFHIRProp = (
   fieldName: string,
   offlineData?: IOfflineData
 ) => {
-  const value =
-    fhirProp === 'country'
-      ? (countries.find(({ value }) => value === addressFromQuery?.[fhirProp])
-          ?.label.defaultMessage as string) || ''
-      : addressFromQuery[fhirProp] || ''
+  const value = addressFromQuery[fhirProp] || ''
+
   if (fhirProp === 'country') {
-    transformedData[sectionId][fieldName] = value
+    transformedData[sectionId][fieldName] =
+      (countries.find(({ value }) => value === addressFromQuery?.[fhirProp])
+        ?.label as MessageDescriptor as IFormData) || ''
   } else if (
     addressFromQuery?.['country'] === window.config.COUNTRY &&
     !fieldName.includes('international')

From 434142475267f751af79a97147381c5f9c2e326c Mon Sep 17 00:00:00 2001
From: Muhammed Tareq Aziz <tareq.aziz@dsinnovators.com>
Date: Wed, 19 Jun 2024 19:28:56 +0600
Subject: [PATCH 042/108] Fix CHANGELOG.md typo

Co-authored-by: Tameem Bin Haider <tameem.haider@dsinnovators.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30182fe29cb..5e22e64064c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -68,7 +68,7 @@
 - Fix records going completely missing when an unexpected error happens in the backend [#7021](https://github.com/opencrvs/opencrvs-core/pull/7021)
 - Fix "Print and issue to groom|bride" is added to a different variable [#7046](https://github.com/opencrvs/opencrvs-core/issues/7046)
 - Fix removed duplicateTrackingId check in createDuplicateTask method [#7024](https://github.com/opencrvs/opencrvs-core/issues/7024)
-- Fiz address property handling and corrected country data transformation logic [#6989](https://github.com/opencrvs/opencrvs-core/issues/6989)
+- Fix address property handling and corrected country data transformation logic [#6989](https://github.com/opencrvs/opencrvs-core/issues/6989)
 
 ## Refactor
 

From 9150633faedf0992f358a4d5d08b0566c207284d Mon Sep 17 00:00:00 2001
From: Tareq <tareq.aziz@dsinnovators.com>
Date: Fri, 31 May 2024 17:52:56 +0600
Subject: [PATCH 043/108] disabling 'Mark as duplicate' button when duplicate
 reason is empty too

---
 .../client/src/views/RegisterForm/duplicate/DuplicateForm.tsx   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx b/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx
index 5f157495398..77ea5985dc9 100644
--- a/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx
+++ b/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx
@@ -178,7 +178,7 @@ export const DuplicateForm = (props: IProps) => {
                 dispatch(goToHome())
               }
             }}
-            disabled={!Boolean(selectedTrackingId)}
+            disabled={!Boolean(selectedTrackingId) || !Boolean(comment)}
           >
             {intl.formatMessage(duplicateMessages.markAsDuplicateButton)}
           </Button>

From 625f13239229a35c689244214a0c5ff6c77e2d5b Mon Sep 17 00:00:00 2001
From: Tareq <tareq.aziz@dsinnovators.com>
Date: Fri, 31 May 2024 17:56:46 +0600
Subject: [PATCH 044/108] changelog updated

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e22e64064c..400df9e4eb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,6 +69,7 @@
 - Fix "Print and issue to groom|bride" is added to a different variable [#7046](https://github.com/opencrvs/opencrvs-core/issues/7046)
 - Fix removed duplicateTrackingId check in createDuplicateTask method [#7024](https://github.com/opencrvs/opencrvs-core/issues/7024)
 - Fix address property handling and corrected country data transformation logic [#6989](https://github.com/opencrvs/opencrvs-core/issues/6989)
+- Fix client modal glitches on integrations page [#7002] (https://github.com/opencrvs/opencrvs-core/issues/7002)
 
 ## Refactor
 

From 8d696f001b4525d37b01d521b3365e74f9780afc Mon Sep 17 00:00:00 2001
From: Tareq <tareq.aziz@dsinnovators.com>
Date: Fri, 21 Jun 2024 14:21:28 +0600
Subject: [PATCH 045/108] Fix "Print and issue to groom|bride" is added to a
 different variable

---
 .../certificate/fieldDefinitions/collectorSection.ts   |  8 ++++----
 packages/client/src/i18n/messages/form.ts              | 10 ++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/forms/certificate/fieldDefinitions/collectorSection.ts b/packages/client/src/forms/certificate/fieldDefinitions/collectorSection.ts
index 328906fdc0a..d306f3df5be 100644
--- a/packages/client/src/forms/certificate/fieldDefinitions/collectorSection.ts
+++ b/packages/client/src/forms/certificate/fieldDefinitions/collectorSection.ts
@@ -623,8 +623,8 @@ export const collectMarriageCertificateFormSection: IFormSection = {
             )
           ],
           options: [
-            { value: 'BRIDE', label: formMessages.brideName },
-            { value: 'GROOM', label: formMessages.groomName },
+            { value: 'BRIDE', label: formMessages.certifyRecordToBride },
+            { value: 'GROOM', label: formMessages.certifyRecordToGroom },
             { value: 'OTHER', label: formMessages.someoneElseCollector },
             {
               value: 'PRINT_IN_ADVANCE',
@@ -997,8 +997,8 @@ const birthCertCollectorOptions = [
 ]
 
 const marriageCertCollectorOptions = [
-  { value: 'BRIDE', label: formMessages.brideName },
-  { value: 'GROOM', label: formMessages.groomName }
+  { value: 'BRIDE', label: formMessages.certifyRecordToBride },
+  { value: 'GROOM', label: formMessages.certifyRecordToGroom }
 ]
 
 const birthIssueCollectorFormOptions = [
diff --git a/packages/client/src/i18n/messages/form.ts b/packages/client/src/i18n/messages/form.ts
index dbed7f96ac8..deb82eb168c 100644
--- a/packages/client/src/i18n/messages/form.ts
+++ b/packages/client/src/i18n/messages/form.ts
@@ -222,6 +222,16 @@ export const formMessageDescriptors = {
     description: 'Label for father select option to certify record',
     id: 'form.field.label.app.certifyRecordTo.father'
   },
+  certifyRecordToGroom: {
+    defaultMessage: 'Print and issue to groom',
+    description: 'Label for groom select option to certify record',
+    id: 'form.field.label.app.certifyRecordTo.groom'
+  },
+  certifyRecordToBride: {
+    defaultMessage: 'Print and issue to bride',
+    description: 'Label for bride select option to certify record',
+    id: 'form.field.label.app.certifyRecordTo.bride'
+  },
   typeOfId: {
     defaultMessage: 'Type of ID',
     description: "Input label for certificate collector's id type options",

From 8e6b5c84500c4f300869ce17fbde368d42ea51f7 Mon Sep 17 00:00:00 2001
From: Tareq <tareq.aziz@dsinnovators.com>
Date: Thu, 30 May 2024 16:34:56 +0600
Subject: [PATCH 046/108] groom and bride default name fix

---
 packages/client/src/i18n/messages/form.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/i18n/messages/form.ts b/packages/client/src/i18n/messages/form.ts
index deb82eb168c..f454c5a3545 100644
--- a/packages/client/src/i18n/messages/form.ts
+++ b/packages/client/src/i18n/messages/form.ts
@@ -268,12 +268,12 @@ export const formMessageDescriptors = {
     id: 'form.field.label.informantsRelationWithDeceased'
   },
   brideName: {
-    defaultMessage: 'Print and issue to bride',
+    defaultMessage: 'Bride',
     description: 'Form section name for Bride',
     id: 'form.section.bride.name'
   },
   groomName: {
-    defaultMessage: 'Print and issue to groom',
+    defaultMessage: 'Groom',
     description: 'Form section name for Groom',
     id: 'form.section.groom.name'
   },

From 0cf8e800bfa375cb2ca41427dd6bfcea3f4bf203 Mon Sep 17 00:00:00 2001
From: Tareq <tareq.aziz@dsinnovators.com>
Date: Wed, 19 Jun 2024 18:36:49 +0600
Subject: [PATCH 047/108] removed 'declarationJurisdictionId' from
 IAdvancedSearchFormState

---
 .../src/components/form/FormFieldGenerator.tsx |  4 ++--
 .../client/src/search/advancedSearch/utils.ts  | 10 ++++------
 .../src/views/SearchResult/AdvancedSearch.tsx  | 18 ++++++++----------
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/packages/client/src/components/form/FormFieldGenerator.tsx b/packages/client/src/components/form/FormFieldGenerator.tsx
index 4233683397d..37477cb7c8c 100644
--- a/packages/client/src/components/form/FormFieldGenerator.tsx
+++ b/packages/client/src/components/form/FormFieldGenerator.tsx
@@ -123,7 +123,7 @@ import { generateLocations } from '@client/utils/locationUtils'
 import { getUserDetails } from '@client/profile/profileSelectors'
 import { buttonMessages } from '@client/i18n/messages/buttons'
 import { DateRangePickerForFormField } from '@client/components/DateRangePickerForFormField'
-import { IBaseAdvancedSearchState } from '@client/search/advancedSearch/utils'
+import { IAdvancedSearchFormState } from '@client/search/advancedSearch/utils'
 import { UserDetails } from '@client/utils/userUtils'
 import { VerificationButton } from '@opencrvs/components/lib/VerificationButton'
 import { useOnlineStatus } from '@client/utils'
@@ -713,7 +713,7 @@ interface IFormSectionProps {
   onSetTouched?: (func: ISetTouchedFunction) => void
   requiredErrorMessage?: MessageDescriptor
   onUploadingStateChanged?: (isUploading: boolean) => void
-  initialValues?: IBaseAdvancedSearchState
+  initialValues?: IAdvancedSearchFormState
 }
 
 interface IStateProps {
diff --git a/packages/client/src/search/advancedSearch/utils.ts b/packages/client/src/search/advancedSearch/utils.ts
index 691411fecf6..a6d13c55ae8 100644
--- a/packages/client/src/search/advancedSearch/utils.ts
+++ b/packages/client/src/search/advancedSearch/utils.ts
@@ -60,7 +60,6 @@ const baseKeysSameAsStore = [
   'registrationNumber',
   'trackingId',
   'declarationLocationId',
-  'declarationJurisdictionId',
   'eventCountry',
   'eventLocationId',
   'eventLocationLevel1',
@@ -82,7 +81,7 @@ const baseKeysSameAsStore = [
   'informantFamilyName'
 ] as const
 
-export interface IBaseAdvancedSearchState {
+export interface IAdvancedSearchFormState {
   event?: string
   registrationStatuses?: string
   dateOfEvent?: IDateRangePickerValue
@@ -95,7 +94,6 @@ export interface IBaseAdvancedSearchState {
   dateOfRegistrationEnd?: string
   placeOfRegistration?: string
   declarationLocationId?: string
-  declarationJurisdictionId?: string
   eventLocationType?: string
   eventCountry?: string
   eventLocationId?: string
@@ -134,7 +132,7 @@ export interface IBaseAdvancedSearchState {
 }
 
 export const transformAdvancedSearchLocalStateToStoreData = (
-  localState: IBaseAdvancedSearchState,
+  localState: IAdvancedSearchFormState,
   offlineData: IOfflineData
 ): IAdvancedSearchParamState => {
   let transformedStoreState: IAdvancedSearchParamState =
@@ -273,8 +271,8 @@ export const transformStoreDataToAdvancedSearchLocalState = (
   reduxState: IAdvancedSearchParamState,
   offlineData: IOfflineData,
   eventType: string
-): IBaseAdvancedSearchState => {
-  const localState: IBaseAdvancedSearchState = baseKeysSameAsStore.reduce(
+): IAdvancedSearchFormState => {
+  const localState: IAdvancedSearchFormState = baseKeysSameAsStore.reduce(
     (ac, curr) => {
       return { ...ac, [curr]: reduxState[curr] }
     },
diff --git a/packages/client/src/views/SearchResult/AdvancedSearch.tsx b/packages/client/src/views/SearchResult/AdvancedSearch.tsx
index 21beee054eb..9b63ce6d388 100644
--- a/packages/client/src/views/SearchResult/AdvancedSearch.tsx
+++ b/packages/client/src/views/SearchResult/AdvancedSearch.tsx
@@ -35,7 +35,7 @@ import { getOfflineData } from '@client/offline/selectors'
 import { Accordion } from '@client/../../components/lib/Accordion'
 import {
   getAccordionActiveStateMap,
-  IBaseAdvancedSearchState,
+  IAdvancedSearchFormState,
   isValidDateRangePickerValue,
   transformAdvancedSearchLocalStateToStoreData,
   transformStoreDataToAdvancedSearchLocalState
@@ -77,21 +77,19 @@ const dateFieldTypes = [
   'informantDoB'
 ]
 
-export const isAdvancedSearchFormValid = (value: IBaseAdvancedSearchState) => {
+export const isAdvancedSearchFormValid = (value: IAdvancedSearchFormState) => {
   const validNonDateFields = Object.keys(value).filter(
     (key) =>
-      !['event', 'eventLocationType', 'declarationJurisdictionId'].includes(
-        key
-      ) &&
+      !['event', 'eventLocationType'].includes(key) &&
       !dateFieldTypes.includes(key) &&
-      Boolean(value[key as keyof IBaseAdvancedSearchState])
+      Boolean(value[key as keyof IAdvancedSearchFormState])
   )
   //handle date fields separately
   const validDateFields = dateFieldTypes.filter(
     (key) =>
-      value[key as keyof IBaseAdvancedSearchState] &&
+      value[key as keyof IAdvancedSearchFormState] &&
       isValidDateRangePickerValue(
-        value[key as keyof IBaseAdvancedSearchState] as IDateRangePickerValue
+        value[key as keyof IAdvancedSearchFormState] as IDateRangePickerValue
       )
   )
 
@@ -103,7 +101,7 @@ const BirthSection = () => {
   const intl = useIntl()
   const advancedSearchParamsState = useSelector(AdvancedSearchParamsSelector)
   const offlineData = useSelector(getOfflineData)
-  const [formState, setFormState] = useState<IBaseAdvancedSearchState>({
+  const [formState, setFormState] = useState<IAdvancedSearchFormState>({
     ...transformStoreDataToAdvancedSearchLocalState(
       advancedSearchParamsState,
       offlineData,
@@ -306,7 +304,7 @@ const DeathSection = () => {
   const intl = useIntl()
   const advancedSearchParamsState = useSelector(AdvancedSearchParamsSelector)
   const offlineData = useSelector(getOfflineData)
-  const [formState, setFormState] = useState<IBaseAdvancedSearchState>({
+  const [formState, setFormState] = useState<IAdvancedSearchFormState>({
     ...transformStoreDataToAdvancedSearchLocalState(
       advancedSearchParamsState,
       offlineData,

From 9db14b4e5a61ec73f57a111a5844d25742b66ece Mon Sep 17 00:00:00 2001
From: Muhammed Tareq Aziz <muhammedtareqaziz@Muhammeds-MacBook-Pro.local>
Date: Thu, 20 Jun 2024 23:31:13 +0600
Subject: [PATCH 048/108] correct import in test file

---
 packages/client/src/search/advancedSearch/utils.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/search/advancedSearch/utils.test.ts b/packages/client/src/search/advancedSearch/utils.test.ts
index 0575f287c34..16852aa09aa 100644
--- a/packages/client/src/search/advancedSearch/utils.test.ts
+++ b/packages/client/src/search/advancedSearch/utils.test.ts
@@ -9,7 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import {
-  IBaseAdvancedSearchState,
+  IAdvancedSearchFormState,
   transformAdvancedSearchLocalStateToStoreData,
   transformStoreDataToAdvancedSearchLocalState
 } from '@client/search/advancedSearch/utils'
@@ -17,7 +17,7 @@ import { mockOfflineData } from '@client/tests/mock-offline-data'
 import { IAdvancedSearchParamState } from '@client/search/advancedSearch/reducer'
 
 describe('Transforms advancedSearch local state to advancedSearch store state properly', () => {
-  const mockLocalState: IBaseAdvancedSearchState = {
+  const mockLocalState: IAdvancedSearchFormState = {
     event: 'birth',
     registrationStatuses: 'IN_REVIEW',
     eventCountry: 'FAR',

From f660cbc81617d454445b6c4cb65a76219b6a94ac Mon Sep 17 00:00:00 2001
From: Tareq <tareq.aziz@dsinnovators.com>
Date: Fri, 21 Jun 2024 15:30:12 +0600
Subject: [PATCH 049/108] DuplicateForm test code updated - the change now
 ensures that duplicate tracking id and reason both are populated in order to
 duplicate a declaration

---
 .../views/RegisterForm/duplicate/DuplicateForm.test.tsx   | 8 +++++++-
 .../src/views/RegisterForm/duplicate/DuplicateForm.tsx    | 5 +++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.test.tsx b/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.test.tsx
index 0170af08e5e..aae94005d82 100644
--- a/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.test.tsx
+++ b/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.test.tsx
@@ -107,13 +107,19 @@ describe('when in device of large viewport', () => {
             .props().disabled
         ).toBeTruthy()
       })
-      it('enable the duplicate button on modal when select duplicate Id', async () => {
+      it('enable the duplicate button on modal when select duplicate Id and describe-reason has valu', async () => {
         duplicateFormComponent
           .find('#mark-as-duplicate')
           .hostNodes()
           .first()
           .simulate('click')
         selectOption(duplicateFormComponent, '#selectTrackingId', 'BK7VQ0U')
+        duplicateFormComponent
+          .find(`#describe-reason`)
+          .hostNodes()
+          .simulate('change', {
+            target: { id: `#describe-reason`, value: 'Duplicate' }
+          })
         expect(
           duplicateFormComponent
             .find('#mark-as-duplicate-button')
diff --git a/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx b/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx
index 77ea5985dc9..3a2d4f80e67 100644
--- a/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx
+++ b/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx
@@ -178,7 +178,7 @@ export const DuplicateForm = (props: IProps) => {
                 dispatch(goToHome())
               }
             }}
-            disabled={!Boolean(selectedTrackingId) || !Boolean(comment)}
+            disabled={!(Boolean(selectedTrackingId) && Boolean(comment))}
           >
             {intl.formatMessage(duplicateMessages.markAsDuplicateButton)}
           </Button>
@@ -203,11 +203,12 @@ export const DuplicateForm = (props: IProps) => {
                   label: id.trackingId
                 }))}
               />
-              <StyledText id="describe-reason" variant="reg18" element="span">
+              <StyledText variant="reg18" element="span">
                 {intl.formatMessage(duplicateMessages.markAsDuplicateReason)}
               </StyledText>
               <StyledTextArea
                 ignoreMediaQuery
+                id="describe-reason"
                 {...{
                   onChange: handleCommentChange
                 }}

From b9cc9c7855a25679667dc4444dad25fd961ba463 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 16:32:12 +0600
Subject: [PATCH 050/108] fix(v1.5.0): missing heading in mobile view for
 duplicate (#7217)

* Placeholder commit for PR #7210

* fix: missing heading in mobile view for duplicate

Co-authored-by: Jamil <jamil31415926@gmail.com>
---
 .../client/src/views/RegisterForm/duplicate/DuplicateForm.tsx    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx b/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx
index 5f157495398..9174160bb65 100644
--- a/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx
+++ b/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx
@@ -135,6 +135,7 @@ export const DuplicateForm = (props: IProps) => {
             name: getName(),
             trackingId: String(data.registration.trackingId)
           })}
+          showTitleOnMobile={true}
           subtitle={intl.formatMessage(
             duplicateMessages.duplicateContentSubtitle,
             {

From 1fa41b87984767edf8aef0a4f6df7377210c171a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 21 Jun 2024 16:32:59 +0600
Subject: [PATCH 051/108] fix(v1.5.0): amend date of certification for
 verifying certificate (#7218)

* fix: show certified date in qr code verification page

* chore: add comment for last certfied date

* fix: amend certificate time extraction logic

* fix: update certified at message id

---------

Co-authored-by: Md. Ashikul Alam <ashikul.alam@dsinnovators.com>
---
 .../i18n/messages/views/verifyCertificate.ts   |  6 +++---
 .../VerifyCertificatePage.tsx                  | 18 ++++++++++++++++--
 .../useVerificationRecordDetails.ts            |  1 +
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/i18n/messages/views/verifyCertificate.ts b/packages/client/src/i18n/messages/views/verifyCertificate.ts
index 3bf07583c0d..031cc323c78 100644
--- a/packages/client/src/i18n/messages/views/verifyCertificate.ts
+++ b/packages/client/src/i18n/messages/views/verifyCertificate.ts
@@ -29,7 +29,7 @@ interface IVerifyCertificateMessages
   registar: MessageDescriptor
   brn: MessageDescriptor
   drn: MessageDescriptor
-  createdAt: MessageDescriptor
+  certifiedAt: MessageDescriptor
   toastMessage: MessageDescriptor
 }
 
@@ -110,8 +110,8 @@ const messagesToDefine: IVerifyCertificateMessages = {
     defaultMessage: 'Name of registar',
     description: 'Label for name of registar center'
   },
-  createdAt: {
-    id: 'verifyCertificate.createdAt',
+  certifiedAt: {
+    id: 'verifyCertificate.certifiedAt',
     defaultMessage: 'Date of certification',
     description: 'Label for date of certification'
   },
diff --git a/packages/client/src/views/VerifyCertificate/VerifyCertificatePage.tsx b/packages/client/src/views/VerifyCertificate/VerifyCertificatePage.tsx
index fd5afffc9ee..19e3207caa7 100644
--- a/packages/client/src/views/VerifyCertificate/VerifyCertificatePage.tsx
+++ b/packages/client/src/views/VerifyCertificate/VerifyCertificatePage.tsx
@@ -49,6 +49,7 @@ import { EMPTY_STRING } from '@client/utils/constants'
 import { compact } from 'lodash'
 import { useVerificationRecordDetails } from './useVerificationRecordDetails'
 import { generateFullAddress } from '@client/utils/locationUtils'
+import { SUBMISSION_STATUS } from '@client/declarations'
 
 const Container = styled.div<{ size: string; checking: boolean }>`
   position: relative;
@@ -244,6 +245,16 @@ export function VerifyCertificatePage() {
     if (isDeathRegistration(data)) return data.deceased?.gender
   }
 
+  const getLastCertifiedDate = (data: RecordDetails) => {
+    // find first certified action from history sorted in ascending order by time
+    return (
+      data.history &&
+      data.history.find(
+        (item) => item?.regStatus?.toString() === SUBMISSION_STATUS.CERTIFIED
+      )
+    )?.date
+  }
+
   // This function currently supports upto two location levels
   const getLocation = (data: RecordDetails) => {
     const location = data.eventLocation
@@ -466,12 +477,15 @@ export function VerifyCertificatePage() {
                     <ListViewItemSimplified
                       label={
                         <Text variant={'bold16'} element={'span'}>
-                          {intl.formatMessage(messageToDefine.createdAt)}
+                          {intl.formatMessage(messageToDefine.certifiedAt)}
                         </Text>
                       }
                       value={
                         <Text variant={'reg16'} element={'span'}>
-                          {formatDate(new Date(data.createdAt), 'dd MMMM yyyy')}
+                          {formatDate(
+                            new Date(getLastCertifiedDate(data)),
+                            'dd MMMM yyyy'
+                          )}
                         </Text>
                       }
                     />
diff --git a/packages/client/src/views/VerifyCertificate/useVerificationRecordDetails.ts b/packages/client/src/views/VerifyCertificate/useVerificationRecordDetails.ts
index 251971838f9..eeb211f80c6 100644
--- a/packages/client/src/views/VerifyCertificate/useVerificationRecordDetails.ts
+++ b/packages/client/src/views/VerifyCertificate/useVerificationRecordDetails.ts
@@ -48,6 +48,7 @@ const FETCH_RECORD_DETAILS_FOR_VERIFICATION = gql`
         history {
           action
           regStatus
+          date
           user {
             name {
               firstNames

From ac7ca00f3b7eacc212d54e23e9d11171c4feb0a0 Mon Sep 17 00:00:00 2001
From: Jamil <jamil31415926@gmail.com>
Date: Fri, 21 Jun 2024 17:53:36 +0600
Subject: [PATCH 052/108] fix: made `completenessRate` a number before sorting
 (#7221)

---
 .../completenessRates/CompletenessDataTable.tsx     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/views/SysAdmin/Performance/reports/completenessRates/CompletenessDataTable.tsx b/packages/client/src/views/SysAdmin/Performance/reports/completenessRates/CompletenessDataTable.tsx
index ffc9f55d7d6..84e582f4c6e 100644
--- a/packages/client/src/views/SysAdmin/Performance/reports/completenessRates/CompletenessDataTable.tsx
+++ b/packages/client/src/views/SysAdmin/Performance/reports/completenessRates/CompletenessDataTable.tsx
@@ -101,9 +101,8 @@ function CompletenessDataTableComponent(props: ITableProps) {
             ? item.estimated.toFixed(2)
             : Math.round(item.estimated)
         ),
-        completenessRate: `${Number(
+        completenessRate:
           (item[props.completenessRateTime] / item.estimated) * 100
-        ).toFixed(2)}%`
       }))
 
       return locationContent
@@ -126,9 +125,8 @@ function CompletenessDataTableComponent(props: ITableProps) {
             ? item.estimated.toFixed(2)
             : Math.round(item.estimated)
         ),
-        completenessRate: `${Number(
+        completenessRate:
           (item[props.completenessRateTime] / item.estimated) * 100
-        ).toFixed(2)}%`
       }))
 
       return timeContent
@@ -158,7 +156,12 @@ function CompletenessDataTableComponent(props: ITableProps) {
     content,
     sortOrder.map(({ key }) => key),
     sortOrder.map(({ value }) => value)
-  )
+  ).map((item) => {
+    return {
+      ...item,
+      completenessRate: item.completenessRate.toFixed(2) + '%'
+    }
+  })
 
   const firstColProp =
     base.baseType === COMPLETENESS_RATE_REPORT_BASE.LOCATION

From 874f2c59daad1fa1d588aa11516e8038e2a73d21 Mon Sep 17 00:00:00 2001
From: jamil314 <jamil31415926@gmail.com>
Date: Wed, 19 Jun 2024 19:59:00 +0600
Subject: [PATCH 053/108] feat: added `Correction requested` option to advance
 search dropdown

---
 .../src/forms/advancedSearch/fieldDefinitions/Birth.ts      | 4 ++++
 .../client/src/i18n/messages/views/advancedSearchForm.ts    | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/packages/client/src/forms/advancedSearch/fieldDefinitions/Birth.ts b/packages/client/src/forms/advancedSearch/fieldDefinitions/Birth.ts
index 4eb3bf37728..d7ecb69d184 100644
--- a/packages/client/src/forms/advancedSearch/fieldDefinitions/Birth.ts
+++ b/packages/client/src/forms/advancedSearch/fieldDefinitions/Birth.ts
@@ -74,6 +74,10 @@ export const advancedSearchBirthSectionRegistrationDetails: IFormSectionGroup =
           {
             value: 'ARCHIVED',
             label: advancedSearchForm.recordStatusAchived
+          },
+          {
+            value: 'CORRECTION_REQUESTED',
+            label: advancedSearchForm.recordStatusCorrectionRequested
           }
         ]
       }
diff --git a/packages/client/src/i18n/messages/views/advancedSearchForm.ts b/packages/client/src/i18n/messages/views/advancedSearchForm.ts
index 386a88cd6c4..9b13ad49e96 100644
--- a/packages/client/src/i18n/messages/views/advancedSearchForm.ts
+++ b/packages/client/src/i18n/messages/views/advancedSearchForm.ts
@@ -30,6 +30,7 @@ interface IAdvancedSearchMessages
   recordStatusRegistered: MessageDescriptor
   recordStatusCertified: MessageDescriptor
   recordStatusAchived: MessageDescriptor
+  recordStatusCorrectionRequested: MessageDescriptor
   show: MessageDescriptor
   hide: MessageDescriptor
 }
@@ -125,6 +126,11 @@ const messagesToDefine: IAdvancedSearchMessages = {
     description: 'Option for form field: status of record',
     id: 'advancedSearch.form.recordStatusAchived'
   },
+  recordStatusCorrectionRequested: {
+    defaultMessage: 'Correction requested',
+    description: 'Option for form field: status of record',
+    id: 'advancedSearch.form.recordStatusCorrectionRequested'
+  },
   hide: {
     defaultMessage: 'Hide',
     description: 'Label for hide button when accordion is closed',

From b40daa7892d2f8859097db6ea88d4d96526b305b Mon Sep 17 00:00:00 2001
From: jamil314 <jamil31415926@gmail.com>
Date: Thu, 20 Jun 2024 10:38:33 +0600
Subject: [PATCH 054/108] amend: add `correction requested` in `death`

---
 .../client/src/forms/advancedSearch/fieldDefinitions/Death.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/client/src/forms/advancedSearch/fieldDefinitions/Death.ts b/packages/client/src/forms/advancedSearch/fieldDefinitions/Death.ts
index ac0b8936201..d2fca692f7d 100644
--- a/packages/client/src/forms/advancedSearch/fieldDefinitions/Death.ts
+++ b/packages/client/src/forms/advancedSearch/fieldDefinitions/Death.ts
@@ -74,6 +74,10 @@ export const advancedSearchDeathSectionRegistrationDetails: IFormSectionGroup =
           {
             value: 'ARCHIVED',
             label: advancedSearchForm.recordStatusAchived
+          },
+          {
+            value: 'CORRECTION_REQUESTED',
+            label: advancedSearchForm.recordStatusCorrectionRequested
           }
         ]
       }

From 3b32499c3736dded25624c14eef0ac15f522361e Mon Sep 17 00:00:00 2001
From: Tareq <tareq.aziz@dsinnovators.com>
Date: Fri, 21 Jun 2024 18:12:27 +0600
Subject: [PATCH 055/108] ITextAreaProps updated in TextArea element

---
 .../client/src/components/form/FormFieldGenerator.tsx    | 1 +
 .../src/views/RegisterForm/duplicate/DuplicateForm.tsx   | 4 +++-
 .../src/views/RegisterForm/review/ReviewSection.tsx      | 9 ++++-----
 .../Communications/AllUserEmail/AllUserEmail.tsx         | 2 +-
 packages/components/src/TextArea/TextArea.tsx            | 3 ++-
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/client/src/components/form/FormFieldGenerator.tsx b/packages/client/src/components/form/FormFieldGenerator.tsx
index 37477cb7c8c..0588937baf8 100644
--- a/packages/client/src/components/form/FormFieldGenerator.tsx
+++ b/packages/client/src/components/form/FormFieldGenerator.tsx
@@ -448,6 +448,7 @@ const GeneratedInputField = React.memo<GeneratedInputFieldProps>(
           <TextArea
             maxLength={(fieldDefinition as Ii18nTextareaFormField).maxLength}
             {...inputProps}
+            value={inputProps.value as string}
           />
         </InputField>
       )
diff --git a/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx b/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx
index 3a2d4f80e67..5d9a2d122bd 100644
--- a/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx
+++ b/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.tsx
@@ -90,7 +90,9 @@ export const DuplicateForm = (props: IProps) => {
     setShowModal((prev) => !prev)
   }
 
-  const handleCommentChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+  const handleCommentChange = (
+    event: React.ChangeEvent<HTMLTextAreaElement>
+  ) => {
     setComment(event.target.value)
   }
 
diff --git a/packages/client/src/views/RegisterForm/review/ReviewSection.tsx b/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
index 17e059030ec..720a9c14da7 100644
--- a/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
+++ b/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
@@ -1704,17 +1704,16 @@ class ReviewSectionComp extends React.Component<FullProps, State> {
 
     const textAreaProps = {
       id: 'additional_comments',
-      onChange: (e: React.ChangeEvent<HTMLInputElement>) => {
+      onChange: (e: React.ChangeEvent<HTMLTextAreaElement>) => {
         ;(this.props.onChangeReviewForm as onChangeReviewForm)(
           { commentsOrNotes: e.target.value },
           registrationSection,
           declaration
         )
       },
-      value:
-        (declaration.data.registration &&
-          declaration.data.registration.commentsOrNotes) ||
-        '',
+      value: ((declaration.data.registration &&
+        declaration.data.registration.commentsOrNotes) ||
+        '') as any,
       ignoreMediaQuery: true
     }
 
diff --git a/packages/client/src/views/SysAdmin/Communications/AllUserEmail/AllUserEmail.tsx b/packages/client/src/views/SysAdmin/Communications/AllUserEmail/AllUserEmail.tsx
index 4836af23e23..68665e2816b 100644
--- a/packages/client/src/views/SysAdmin/Communications/AllUserEmail/AllUserEmail.tsx
+++ b/packages/client/src/views/SysAdmin/Communications/AllUserEmail/AllUserEmail.tsx
@@ -132,7 +132,7 @@ const AllUserEmail = () => {
                 ignoreMediaQuery
                 {...{
                   value: body,
-                  onChange: (e: React.ChangeEvent<HTMLInputElement>) =>
+                  onChange: (e: React.ChangeEvent<HTMLTextAreaElement>) =>
                     setBody(e.target.value)
                 }}
               />
diff --git a/packages/components/src/TextArea/TextArea.tsx b/packages/components/src/TextArea/TextArea.tsx
index 4a41df2db59..3e4afe17909 100644
--- a/packages/components/src/TextArea/TextArea.tsx
+++ b/packages/components/src/TextArea/TextArea.tsx
@@ -11,7 +11,8 @@
 import * as React from 'react'
 import styled from 'styled-components'
 
-interface ITextAreaProps {
+interface ITextAreaProps
+  extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {
   ignoreMediaQuery?: boolean
   maxLength?: number
   readonly?: boolean

From 6bec2c2ab12737ad181ddb6b7224e6a51c238128 Mon Sep 17 00:00:00 2001
From: Muhammed Tareq Aziz <tareq.aziz@dsinnovators.com>
Date: Mon, 24 Jun 2024 14:50:08 +0600
Subject: [PATCH 056/108] Update CHANGELOG.md

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66610b24bba..7c61b1896b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,7 +70,6 @@
 - Fix "Print and issue to groom|bride" is added to a different variable [#7046](https://github.com/opencrvs/opencrvs-core/issues/7046)
 - Fix removed duplicateTrackingId check in createDuplicateTask method [#7024](https://github.com/opencrvs/opencrvs-core/issues/7024)
 - Fix address property handling and corrected country data transformation logic [#6989](https://github.com/opencrvs/opencrvs-core/issues/6989)
-- Fix client modal glitches on integrations page [#7002] (https://github.com/opencrvs/opencrvs-core/issues/7002)
 
 ## Refactor
 

From c3fae9b76ee517082bedb3475a215fb2d5e20fe0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 25 Jun 2024 10:47:38 +0300
Subject: [PATCH 057/108] feat(v1.5.0): log and mask the notification details
 (#7237)

* feat: log and mask the notification details

* refactor: update how short strings are handled

---------

Co-authored-by: Pyry Rouvila <pyry@opencrvs.org>
Co-authored-by: Riku Rouvila <riku.rouvila@gmail.com>
---
 packages/commons/src/logger.ts                 | 18 ++++++++++++++++++
 .../notification/src/features/sms/service.ts   | 10 ++++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/packages/commons/src/logger.ts b/packages/commons/src/logger.ts
index a04b1567533..9b7e334616c 100644
--- a/packages/commons/src/logger.ts
+++ b/packages/commons/src/logger.ts
@@ -26,3 +26,21 @@ const level = process.env.NODE_ENV === 'test' ? 'silent' : process.env.LOG_LEVEL
 if (level) {
   logger.level = level
 }
+
+export function maskEmail(email: string) {
+  if (email.length <= 10)
+    return `${email.at(0)}${'*'.repeat(email.length - 2)}${email.at(-1)}`
+
+  // The regex matches everything EXCEPT the first 3 and last 4 characters.
+  return email.replace(/(?<=.{3}).*(?=.{4})/, (match) =>
+    '*'.repeat(match.length)
+  )
+}
+
+export function maskSms(sms: string) {
+  if (sms.length <= 8)
+    return `${sms.at(0)}${'*'.repeat(sms.length - 2)}${sms.at(-1)}`
+
+  // The regex matches everything EXCEPT the first 3 and last 2 characters.
+  return sms.replace(/(?<=.{3}).*(?=.{2})/, (match) => '*'.repeat(match.length))
+}
diff --git a/packages/notification/src/features/sms/service.ts b/packages/notification/src/features/sms/service.ts
index c0732a174b2..b2fb7b417da 100644
--- a/packages/notification/src/features/sms/service.ts
+++ b/packages/notification/src/features/sms/service.ts
@@ -11,7 +11,7 @@
 import fetch from 'node-fetch'
 
 import { COUNTRY_CONFIG_URL } from '@notification/constants'
-import { logger } from '@opencrvs/commons'
+import { logger, maskEmail, maskSms } from '@opencrvs/commons'
 
 export async function notifyCountryConfig(
   templateName: {
@@ -31,8 +31,14 @@ export async function notifyCountryConfig(
   const url = `${COUNTRY_CONFIG_URL}/notification`
   try {
     logger.info(
-      `Sending the following message template "${templateName}" from notifyCountryConfig`
+      `Sending notification to countryconfig.
+
+Template: ${JSON.stringify(templateName, null, 4)}
+${recipient.email ? `Email: ${maskEmail(recipient.email)}` : ''}
+${recipient.sms ? `SMS: ${maskSms(recipient.sms)}` : ''}
+${recipient.bcc ? `Amount of recipients: ${recipient.bcc.length}` : ''}`
     )
+
     return await fetch(url, {
       method: 'POST',
       body: JSON.stringify({

From f5bb47ab67ab366fc204f7f63764c4e8a49b9f68 Mon Sep 17 00:00:00 2001
From: Tameem Bin Haider <tameem.haider@dsinnovators.com>
Date: Tue, 25 Jun 2024 16:40:00 +0600
Subject: [PATCH 058/108] fix: typo in test name

---
 .../src/views/RegisterForm/duplicate/DuplicateForm.test.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.test.tsx b/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.test.tsx
index aae94005d82..68c2d5f3d18 100644
--- a/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.test.tsx
+++ b/packages/client/src/views/RegisterForm/duplicate/DuplicateForm.test.tsx
@@ -107,7 +107,7 @@ describe('when in device of large viewport', () => {
             .props().disabled
         ).toBeTruthy()
       })
-      it('enable the duplicate button on modal when select duplicate Id and describe-reason has valu', async () => {
+      it('enable the duplicate button on modal when select duplicate Id and describe-reason has value', async () => {
         duplicateFormComponent
           .find('#mark-as-duplicate')
           .hostNodes()

From b693ed861a3ad16f28be33360a2dd9c1db23fe98 Mon Sep 17 00:00:00 2001
From: Euan Millar <euanmillar@users.noreply.github.com>
Date: Tue, 25 Jun 2024 12:42:37 +0100
Subject: [PATCH 059/108] Enforce token for seedign roles and users

---
 packages/data-seeder/src/roles.ts | 16 +++++++++++-----
 packages/data-seeder/src/users.ts | 12 +++++++++---
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/packages/data-seeder/src/roles.ts b/packages/data-seeder/src/roles.ts
index 1243321f379..e088a17562f 100644
--- a/packages/data-seeder/src/roles.ts
+++ b/packages/data-seeder/src/roles.ts
@@ -65,7 +65,7 @@ interface GQLSystemRoleInput {
 
 type SystemRole = {
   id: string
-  value: typeof SYSTEM_ROLES[number]
+  value: (typeof SYSTEM_ROLES)[number]
   roles: Array<Role>
   active: boolean
 }
@@ -149,9 +149,15 @@ async function updateRoles(
   return roleIdMap
 }
 
-async function fetchCountryRoles() {
+async function fetchCountryRoles(token: string) {
   const url = new URL('roles', COUNTRY_CONFIG_HOST).toString()
-  const res = await fetch(url)
+  const res = await fetch(url, {
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${token}`
+    }
+  })
   if (!res.ok) {
     raise(`Expected to get the roles from ${url}`)
   }
@@ -189,10 +195,10 @@ export async function seedRoles(token: string) {
     }),
     {}
   )
-  const countryRoles = await fetchCountryRoles()
+  const countryRoles = await fetchCountryRoles(token)
   const usedSystemRoles = Object.keys(
     countryRoles
-  ) as typeof SYSTEM_ROLES[number][]
+  ) as (typeof SYSTEM_ROLES)[number][]
   const updatedRoleIdMap = await updateRoles(
     token,
     systemRoles
diff --git a/packages/data-seeder/src/users.ts b/packages/data-seeder/src/users.ts
index 4ef92a749f4..81ccb32bdf8 100644
--- a/packages/data-seeder/src/users.ts
+++ b/packages/data-seeder/src/users.ts
@@ -65,9 +65,15 @@ const createUserMutation = print(gql`
   }
 `)
 
-async function getUseres() {
+async function getUsers(token: string) {
   const url = new URL('users', COUNTRY_CONFIG_HOST).toString()
-  const res = await fetch(url)
+  const res = await fetch(url, {
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${token}`
+    }
+  })
   if (!res.ok) {
     raise(`Expected to get the users from ${url}`)
   }
@@ -147,7 +153,7 @@ export async function seedUsers(
   token: string,
   roleIdMap: Record<string, string | undefined>
 ) {
-  const rawUsers = await getUseres()
+  const rawUsers = await getUsers(token)
   for (const userMetadata of rawUsers) {
     const {
       givenNames,

From be7b23a54fe66f11a3ccaf3c2145de9e01003e1e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 26 Jun 2024 08:23:05 +0000
Subject: [PATCH 060/108] =?UTF-8?q?=F0=9F=8D=92=20Merge=20changes=20from?=
 =?UTF-8?q?=20PR=20#7058=20to=20release-v1.5.0=20(#7242)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Placeholder commit for PR #7058

* [OCRVS-6578] Enforce metabase default admin credentials to be changed (#7058)

* Update dashboard run script

* Update query dev env changes

* Generate password hash via node and update run-dev script

* Improve naming env variable

* revert node bcrypt generation approach & generate from metabase util method instead

* Update CHANGELOG.md

* keep metabase admin default credentials as same as doc for dev mode

* generate uuid salt instead of hard coded one

---------

Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Tahmid Rahman <42269993+tahmidrahman-dsi@users.noreply.github.com>
---
 CHANGELOG.md                                    |  1 +
 packages/dashboards/Dockerfile                  |  4 ++--
 .../dashboards/environment-configuration.sql    | 17 +++++++++++++----
 packages/dashboards/package.json                |  1 +
 packages/dashboards/run-dev.sh                  |  6 +++++-
 packages/dashboards/run.sh                      | 13 +++++++++++++
 6 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c61b1896b8..aba92a5bacc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@
 - Introduce two new properties to the form field `DOCUMENT_UPLOADER_WITH_OPTION`
   - `compressImagesToSizeMB` : An optional prop of number type to define a compressed size. Compression is ignored when the input file is already smaller or equal of the given value or a falsy given value.
   - `maxSizeMB`: An optional validation prop to prevent input of a file bigger than a defined value.
+- Metabase default credentials now must be configured via countryconfig repository environment variables and secrets otherwise the dashboard service won't start [#6578](https://github.com/opencrvs/opencrvs-core/issues/6578)
 
 ## Bug fixes
 
diff --git a/packages/dashboards/Dockerfile b/packages/dashboards/Dockerfile
index 21bcbdfeb85..a9b7d95487f 100644
--- a/packages/dashboards/Dockerfile
+++ b/packages/dashboards/Dockerfile
@@ -10,7 +10,7 @@ ENV MB_DB_INIT_SQL_FILE=/metabase.init.db.sql
 ENV MB_DB_FILE=/data/metabase/metabase.mv.db
 ENV OPENCRVS_ENVIRONMENT_CONFIGURATION_SQL_FILE=/environment-configuration.sql
 
-# Install envsubst
-RUN apk update && apk upgrade && apk add --no-cache gettext
+# Install envsubst, uuidgen
+RUN apk update && apk upgrade && apk add --no-cache gettext && apk add --no-cache util-linux
 
 ENTRYPOINT ["/bin/sh", "/run.sh"]
diff --git a/packages/dashboards/environment-configuration.sql b/packages/dashboards/environment-configuration.sql
index 6e732e21717..e3ca03d6a37 100644
--- a/packages/dashboards/environment-configuration.sql
+++ b/packages/dashboards/environment-configuration.sql
@@ -2,21 +2,21 @@ UPDATE
   PUBLIC.SETTING
 SET
   "VALUE" = '$OPENCRVS_METABASE_SITE_NAME'
-where
+WHERE
   "KEY" = 'site-name';
 
 UPDATE
   PUBLIC.SETTING
 SET
   "VALUE" = '$OPENCRVS_METABASE_SITE_URL'
-where
+WHERE
   "KEY" = 'site-url';
 
 UPDATE
   PUBLIC.SETTING
 SET
   "VALUE" = '{"cdc1d5eb-c7f8-8b01-b296-eda34d06b6da":{"name":"$OPENCRVS_METABASE_MAP_NAME","url":"$OPENCRVS_METABASE_MAP_URL","region_key":"$OPENCRVS_METABASE_MAP_REGION_KEY","region_name":"$OPENCRVS_METABASE_MAP_REGION_NAME"}}'
-where
+WHERE
   "KEY" = 'custom-geojson';
 
 UPDATE
@@ -24,4 +24,13 @@ UPDATE
 SET
   DETAILS = '{"additional-options":null,"ssl":false,"use-srv":false,"let-user-control-scheduling":null,"authdb":"$OPENCRVS_METABASE_DB_AUTH_DB","port":27017,"advanced-options":true,"dbname":"performance","use-connection-uri":false,"host":"$OPENCRVS_METABASE_DB_HOST","tunnel-enabled":false,"pass":"$OPENCRVS_METABASE_DB_PASS","version":"4.4.18","user":"$OPENCRVS_METABASE_DB_USER","client-ssl-key-value":null}'
 WHERE
-  NAME = 'Performance';
\ No newline at end of file
+  NAME = 'Performance';
+
+UPDATE 
+  PUBLIC.CORE_USER
+SET 
+  EMAIL = '$OPENCRVS_METABASE_ADMIN_EMAIL',
+  PASSWORD = '$OPENCRVS_METABASE_ADMIN_PASSWORD_HASH',
+  PASSWORD_SALT = '$OPENCRVS_METABASE_ADMIN_PASSWORD_SALT'
+WHERE 
+ IS_SUPERUSER = true;
\ No newline at end of file
diff --git a/packages/dashboards/package.json b/packages/dashboards/package.json
index 44a62da6bce..cd015e3713d 100644
--- a/packages/dashboards/package.json
+++ b/packages/dashboards/package.json
@@ -2,6 +2,7 @@
   "name": "@opencrvs/dashboards",
   "version": "1.5.0",
   "description": "OpenCRVS performance dashboards",
+  "type": "module",
   "main": "index.js",
   "scripts": {
     "start": "./run-dev.sh",
diff --git a/packages/dashboards/run-dev.sh b/packages/dashboards/run-dev.sh
index 6cc55e5e524..0235d5137a7 100755
--- a/packages/dashboards/run-dev.sh
+++ b/packages/dashboards/run-dev.sh
@@ -54,7 +54,11 @@ export OPENCRVS_METABASE_MAP_NAME=${OPENCRVS_METABASE_MAP_NAME:-"Farajaland"}
 export OPENCRVS_METABASE_MAP_URL=${OPENCRVS_METABASE_MAP_URL:-"http://localhost:3040/content/farajaland-map.geojson"}
 export OPENCRVS_METABASE_MAP_REGION_KEY=${OPENCRVS_METABASE_MAP_REGION_KEY:-"State"}
 export OPENCRVS_METABASE_MAP_REGION_NAME=${OPENCRVS_METABASE_MAP_REGION_NAME:-"State"}
-
+export OPENCRVS_METABASE_ADMIN_EMAIL=${OPENCRVS_METABASE_ADMIN_EMAIL:-"user@opencrvs.org"}
+export OPENCRVS_METABASE_ADMIN_PASSWORD_SALT=$(uuidgen)
+export OPENCRVS_METABASE_ADMIN_PASSWORD=${OPENCRVS_METABASE_ADMIN_PASSWORD:-"m3tabase"}
+SALT_AND_PASSWORD=$OPENCRVS_METABASE_ADMIN_PASSWORD_SALT$OPENCRVS_METABASE_ADMIN_PASSWORD
+export OPENCRVS_METABASE_ADMIN_PASSWORD_HASH=$(java -cp $METABASE_JAR clojure.main -e "(require 'metabase.util.password) (println (metabase.util.password/hash-bcrypt \"$SALT_AND_PASSWORD\"))" 2>/dev/null | tail -n 1)
 metabase_db_path=${MB_DB_FILE:-'/data/metabase/metabase.mv.db'}
 metabase_db_path="${metabase_db_path}"
 metabase_db_path_for_metabase=${metabase_db_path%.mv.db}
diff --git a/packages/dashboards/run.sh b/packages/dashboards/run.sh
index 6d0b1bdf93e..6e42886719b 100644
--- a/packages/dashboards/run.sh
+++ b/packages/dashboards/run.sh
@@ -74,8 +74,21 @@ if [ -z "${OPENCRVS_METABASE_MAP_REGION_NAME}" ]; then
   exit 1
 fi
 
+if [ -z "${OPENCRVS_METABASE_ADMIN_EMAIL}" ]; then
+  echo "Error: OPENCRVS_METABASE_ADMIN_EMAIL environment variable is not defined"
+  exit 1
+fi
+
+if [ -z "${OPENCRVS_METABASE_ADMIN_PASSWORD}" ]; then
+  echo "Error: OPENCRVS_METABASE_ADMIN_PASSWORD environment variable is not defined"
+  exit 1
+fi
+
 export MB_JETTY_PORT=${MB_JETTY_PORT:-4444}
 export MB_DB_FILE=/data/metabase/metabase.mv.db
+export OPENCRVS_METABASE_ADMIN_PASSWORD_SALT=$(uuidgen)
+SALT_AND_PASSWORD=$OPENCRVS_METABASE_ADMIN_PASSWORD_SALT$OPENCRVS_METABASE_ADMIN_PASSWORD
+export OPENCRVS_METABASE_ADMIN_PASSWORD_HASH=$(java -cp $METABASE_JAR clojure.main -e "(require 'metabase.util.password) (println (metabase.util.password/hash-bcrypt \"$SALT_AND_PASSWORD\"))" 2>/dev/null | tail -n 1)
 
 source /initialize-database.sh
 source /update-database.sh

From 26f52019e31fc3f343be7131f4a8d376f1248fb0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 10:07:30 +0300
Subject: [PATCH 061/108] fix(v1.5.0): rename geojson endpoint to not tie
 implementations to example country name (#7257)

* fix: update 'farajaland-map.geojson' to 'map.geojson' for making it more generic

* chore(changelog)

* chore: change Farajaland to 'Full country'

Co-authored-by: Pyry Rouvila <pyry@opencrvs.org>
---
 CHANGELOG.md                             | 2 ++
 packages/dashboards/metabase.init.db.sql | 2 +-
 packages/dashboards/run-dev.sh           | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aba92a5bacc..07b39446f03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -71,6 +71,8 @@
 - Fix "Print and issue to groom|bride" is added to a different variable [#7046](https://github.com/opencrvs/opencrvs-core/issues/7046)
 - Fix removed duplicateTrackingId check in createDuplicateTask method [#7024](https://github.com/opencrvs/opencrvs-core/issues/7024)
 - Fix address property handling and corrected country data transformation logic [#6989](https://github.com/opencrvs/opencrvs-core/issues/6989)
+- Fix search indexing BRN's in place of identifiers. Adds spouseIdentifier to search with [#7189](https://github.com/opencrvs/opencrvs-core/pull/7189)
+- Rename `farajaland-map.geojson` in dashboards to `map.geojson` to not tie opencrvs-core into a specific country implementation name [#7251](https://github.com/opencrvs/opencrvs-core/pull/7251)
 
 ## Refactor
 
diff --git a/packages/dashboards/metabase.init.db.sql b/packages/dashboards/metabase.init.db.sql
index e8aabc19f1e..92a5d5cf81f 100644
--- a/packages/dashboards/metabase.init.db.sql
+++ b/packages/dashboards/metabase.init.db.sql
@@ -785,7 +785,7 @@ INSERT INTO "PUBLIC"."SETTING" VALUES
 ('version-info', SYSTEM_COMBINE_CLOB(0)),
 ('site-name', 'OpenCRVS Local'),
 ('site-url', 'http://localhost:4444'),
-('custom-geojson', '{"cdc1d5eb-c7f8-8b01-b296-eda34d06b6da":{"name":"Farajaland","url":"http://localhost:3040/content/farajaland-map.geojson","region_key":"State","region_name":"State"}}'),
+('custom-geojson', '{"cdc1d5eb-c7f8-8b01-b296-eda34d06b6da":{"name":"Full country","url":"http://localhost:3040/content/map.geojson","region_key":"State","region_name":"State"}}'),
 ('startup-time-millis', '6453'),
 ('settings-last-updated', '2024-02-29 13:43:53.376747+02'); 
 CREATE CACHED TABLE "PUBLIC"."METRIC_IMPORTANT_FIELD"(
diff --git a/packages/dashboards/run-dev.sh b/packages/dashboards/run-dev.sh
index 0235d5137a7..20272b36284 100755
--- a/packages/dashboards/run-dev.sh
+++ b/packages/dashboards/run-dev.sh
@@ -50,8 +50,8 @@ export OPENCRVS_METABASE_DB_USER=${OPENCRVS_METABASE_DB_USER:-""}
 export OPENCRVS_METABASE_DB_PASS=${OPENCRVS_METABASE_DB_PASS:-""}
 export OPENCRVS_METABASE_DB_AUTH_DB=${OPENCRVS_METABASE_DB_AUTH_DB:-""}
 
-export OPENCRVS_METABASE_MAP_NAME=${OPENCRVS_METABASE_MAP_NAME:-"Farajaland"}
-export OPENCRVS_METABASE_MAP_URL=${OPENCRVS_METABASE_MAP_URL:-"http://localhost:3040/content/farajaland-map.geojson"}
+export OPENCRVS_METABASE_MAP_NAME=${OPENCRVS_METABASE_MAP_NAME:-"Full country"}
+export OPENCRVS_METABASE_MAP_URL=${OPENCRVS_METABASE_MAP_URL:-"http://localhost:3040/content/map.geojson"}
 export OPENCRVS_METABASE_MAP_REGION_KEY=${OPENCRVS_METABASE_MAP_REGION_KEY:-"State"}
 export OPENCRVS_METABASE_MAP_REGION_NAME=${OPENCRVS_METABASE_MAP_REGION_NAME:-"State"}
 export OPENCRVS_METABASE_ADMIN_EMAIL=${OPENCRVS_METABASE_ADMIN_EMAIL:-"user@opencrvs.org"}

From ab461aa733a779a7ef9ce0805a13c4507787b8bd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 08:08:43 +0000
Subject: [PATCH 062/108] fix: sort not working in performance on
 `totalRegistered`, `registeredWithinTargetd`, `estimated` (#7260)

Co-authored-by: jamil314 <jamil31415926@gmail.com>
---
 .../CompletenessDataTable.tsx                 | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/packages/client/src/views/SysAdmin/Performance/reports/completenessRates/CompletenessDataTable.tsx b/packages/client/src/views/SysAdmin/Performance/reports/completenessRates/CompletenessDataTable.tsx
index 84e582f4c6e..300137a1fbf 100644
--- a/packages/client/src/views/SysAdmin/Performance/reports/completenessRates/CompletenessDataTable.tsx
+++ b/packages/client/src/views/SysAdmin/Performance/reports/completenessRates/CompletenessDataTable.tsx
@@ -92,15 +92,9 @@ function CompletenessDataTableComponent(props: ITableProps) {
     if (data && isLocationData(data)) {
       const locationContent = data.map((item) => ({
         location: item.locationName,
-        totalRegistered: String(Math.round(item.total)),
-        registeredWithinTargetd: String(
-          Math.round(item[props.completenessRateTime])
-        ),
-        estimated: String(
-          item.estimated < 10
-            ? item.estimated.toFixed(2)
-            : Math.round(item.estimated)
-        ),
+        totalRegistered: item.total,
+        registeredWithinTargetd: item[props.completenessRateTime],
+        estimated: item.estimated,
         completenessRate:
           (item[props.completenessRateTime] / item.estimated) * 100
       }))
@@ -116,15 +110,9 @@ function CompletenessDataTableComponent(props: ITableProps) {
           intl.locale,
           'MMMM yyyy'
         ),
-        totalRegistered: String(Math.round(item.total)),
-        registeredWithinTargetd: String(
-          Math.round(item[props.completenessRateTime])
-        ),
-        estimated: String(
-          item.estimated < 10
-            ? item.estimated.toFixed(2)
-            : Math.round(item.estimated)
-        ),
+        totalRegistered: item.total,
+        registeredWithinTargetd: item[props.completenessRateTime],
+        estimated: item.estimated,
         completenessRate:
           (item[props.completenessRateTime] / item.estimated) * 100
       }))
@@ -159,6 +147,13 @@ function CompletenessDataTableComponent(props: ITableProps) {
   ).map((item) => {
     return {
       ...item,
+      totalRegistered: String(Math.round(item.totalRegistered)),
+      registeredWithinTargetd: String(Math.round(item.registeredWithinTargetd)),
+      estimated: String(
+        item.estimated < 10
+          ? item.estimated.toFixed(2)
+          : Math.round(item.estimated)
+      ),
       completenessRate: item.completenessRate.toFixed(2) + '%'
     }
   })

From b9ade07f7f8ab654324afe1905da4f8cb3d36546 Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <ashikul.alam@dsinnovators.com>
Date: Mon, 3 Jun 2024 15:57:56 +0600
Subject: [PATCH 063/108] fix: delete certificate properties of payload for
 correction

---
 packages/client/src/declarations/submissionMiddleware.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/declarations/submissionMiddleware.ts b/packages/client/src/declarations/submissionMiddleware.ts
index ff895be522b..c3488d4e423 100644
--- a/packages/client/src/declarations/submissionMiddleware.ts
+++ b/packages/client/src/declarations/submissionMiddleware.ts
@@ -187,6 +187,7 @@ export const submissionMiddleware: Middleware<{}, IStoreState> =
       graphqlPayload.registration.correction =
         declaration.data.registration.correction ?? {}
       graphqlPayload.registration.correction.values = changedValues
+      delete graphqlPayload.registration.certificates
     }
 
     if (

From 3527516594f3037f3db95e440d5176dbd912110c Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <ashikul.alam@dsinnovators.com>
Date: Tue, 4 Jun 2024 17:30:24 +0600
Subject: [PATCH 064/108] docs: add comment

---
 packages/client/src/declarations/submissionMiddleware.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/declarations/submissionMiddleware.ts b/packages/client/src/declarations/submissionMiddleware.ts
index c3488d4e423..94baed48f4f 100644
--- a/packages/client/src/declarations/submissionMiddleware.ts
+++ b/packages/client/src/declarations/submissionMiddleware.ts
@@ -187,6 +187,7 @@ export const submissionMiddleware: Middleware<{}, IStoreState> =
       graphqlPayload.registration.correction =
         declaration.data.registration.correction ?? {}
       graphqlPayload.registration.correction.values = changedValues
+      // Delete certificate properties during print record corrections.
       delete graphqlPayload.registration.certificates
     }
 

From b4046351f74a0c08265792875404195781c07e3e Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <ashikul.alam@dsinnovators.com>
Date: Wed, 5 Jun 2024 13:22:55 +0600
Subject: [PATCH 065/108] docs: update changelog(#7065)

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ccd675b7eb..058159aed12 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -69,6 +69,7 @@
 - Fix Disabling 'Mark as duplicate' button when duplicate reason is empty too [#7083](https://github.com/opencrvs/opencrvs-core/pull/7083)
 - Fix certificate overflowing in preview certificate view [#7157](https://github.com/opencrvs/opencrvs-core/pull/7157)
 - Fix records going completely missing when an unexpected error happens in the backend [#7021](https://github.com/opencrvs/opencrvs-core/pull/7021)
+- Fix correction done from a certificate preview page [#7065](https://github.com/opencrvs/opencrvs-core/pull/7093)
 
 ## Refactor
 

From 1dd702e945c92981226e9d1353d5fb3014dbe671 Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <ashikul.alam@dsinnovators.com>
Date: Thu, 13 Jun 2024 14:17:43 +0600
Subject: [PATCH 066/108] fix: delete certificate properties from store

---
 .../client/src/declarations/submissionMiddleware.ts  |  2 --
 .../PrintCertificate/usePrintableCertificate.ts      | 12 +++++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/declarations/submissionMiddleware.ts b/packages/client/src/declarations/submissionMiddleware.ts
index 94baed48f4f..ff895be522b 100644
--- a/packages/client/src/declarations/submissionMiddleware.ts
+++ b/packages/client/src/declarations/submissionMiddleware.ts
@@ -187,8 +187,6 @@ export const submissionMiddleware: Middleware<{}, IStoreState> =
       graphqlPayload.registration.correction =
         declaration.data.registration.correction ?? {}
       graphqlPayload.registration.correction.values = changedValues
-      // Delete certificate properties during print record corrections.
-      delete graphqlPayload.registration.certificates
     }
 
     if (
diff --git a/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts b/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts
index 1cbe40b6095..5b17568673a 100644
--- a/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts
+++ b/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts
@@ -196,10 +196,20 @@ export const usePrintableCertificate = (declarationId: string) => {
     dispatch(goToHomeTab(WORKQUEUE_TABS.readyToPrint))
   }
 
-  const handleEdit = () =>
+  const handleEdit = () => {
+    // Delete certificate properties during print record corrections
+    // since correction flow doesn't handle certificates
+    if (declaration?.data?.registration.certificates) {
+      delete (declaration?.data?.registration as { certificates: any })
+        ?.certificates
+      dispatch(modifyDeclaration(declaration))
+      dispatch(writeDeclaration(declaration))
+    }
+
     dispatch(
       goToCertificateCorrection(declarationId, CorrectionSection.Corrector)
     )
+  }
 
   return {
     svg,

From 7942d13f92749689f3629686921b4d5acdda80ee Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <ashikul.alam@dsinnovators.com>
Date: Fri, 14 Jun 2024 17:51:34 +0600
Subject: [PATCH 067/108] fix: amend certificate in declaration

---
 .../PrintCertificate/usePrintableCertificate.ts | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts b/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts
index 5b17568673a..f4ecc62edd7 100644
--- a/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts
+++ b/packages/client/src/views/PrintCertificate/usePrintableCertificate.ts
@@ -200,10 +200,19 @@ export const usePrintableCertificate = (declarationId: string) => {
     // Delete certificate properties during print record corrections
     // since correction flow doesn't handle certificates
     if (declaration?.data?.registration.certificates) {
-      delete (declaration?.data?.registration as { certificates: any })
-        ?.certificates
-      dispatch(modifyDeclaration(declaration))
-      dispatch(writeDeclaration(declaration))
+      const { certificates, ...rest } = declaration.data.registration
+      const updatedDeclaration = {
+        ...declaration,
+        data: {
+          ...declaration.data,
+          registration: {
+            ...rest
+          }
+        }
+      }
+
+      dispatch(modifyDeclaration(updatedDeclaration))
+      dispatch(writeDeclaration(updatedDeclaration))
     }
 
     dispatch(

From ca70ad0a4ecda0972d437affc9b641cba5bfd50b Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <ashikul.alam@dsinnovators.com>
Date: Tue, 11 Jun 2024 13:09:24 +0600
Subject: [PATCH 068/108] fix: amend download button on click functionality

---
 .../components/interface/DownloadButton.tsx   | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/components/interface/DownloadButton.tsx b/packages/client/src/components/interface/DownloadButton.tsx
index 304395ac037..80f4a66725f 100644
--- a/packages/client/src/components/interface/DownloadButton.tsx
+++ b/packages/client/src/components/interface/DownloadButton.tsx
@@ -256,23 +256,25 @@ function DownloadButtonComponent(props: DownloadButtonProps & HOCProps) {
       status === DOWNLOAD_STATUS.FAILED_NETWORK,
     [status]
   )
-  const isSentForApprovalDeclaration =
+
+  // reg agent can only retrieve validated and correction requested declarations
+  const isRetrieveableDeclarationsOfRegAgent =
     downloadConfigs.declarationStatus &&
     ['VALIDATED', 'CORRECTION_REQUESTED'].includes(
       downloadConfigs.declarationStatus
-    )
+    ) &&
+    userRole === ROLE_REGISTRATION_AGENT
 
-  // user roles of users who can not retrieve a declaration
-  const nonRetrievalUserRoles =
-    userRole !== ROLE_REGISTRATION_AGENT &&
-    !FIELD_AGENT_ROLES.includes(String(userRole))
+  // field agents can only retrieve declarations
+  const isNotFieldAgent = !FIELD_AGENT_ROLES.includes(String(userRole))
 
   const onClickDownload = useCallback(
     (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
       if (
         (assignment?.userId !== userId ||
           status === DOWNLOAD_STATUS.DOWNLOADED) &&
-        (!isSentForApprovalDeclaration || nonRetrievalUserRoles)
+        !isRetrieveableDeclarationsOfRegAgent &&
+        isNotFieldAgent
       ) {
         setAssignModal(
           getAssignModalOptions(
@@ -293,6 +295,7 @@ function DownloadButtonComponent(props: DownloadButtonProps & HOCProps) {
           )
         )
       } else if (status !== DOWNLOAD_STATUS.DOWNLOADED) {
+        // retrieve declaration
         download()
       }
       e.stopPropagation()
@@ -301,10 +304,10 @@ function DownloadButtonComponent(props: DownloadButtonProps & HOCProps) {
       assignment,
       userId,
       status,
-      isSentForApprovalDeclaration,
-      nonRetrievalUserRoles,
-      userRole,
+      isRetrieveableDeclarationsOfRegAgent,
+      isNotFieldAgent,
       hideModal,
+      userRole,
       download,
       unassign
     ]

From 2e49888562d7f7ee7329be1605e5a98b7d040e14 Mon Sep 17 00:00:00 2001
From: jamil314 <jamil31415926@gmail.com>
Date: Wed, 26 Jun 2024 14:02:46 +0600
Subject: [PATCH 069/108] fix: added `showTitleOnMobile` in missing pages

---
 packages/client/src/views/Performance/FieldAgentList.tsx         | 1 +
 packages/client/src/views/Performance/RegistrationsList.tsx      | 1 +
 .../client/src/views/SysAdmin/Performance/CompletenessRates.tsx  | 1 +
 .../client/src/views/SysAdmin/Performance/WorkflowStatus.tsx     | 1 +
 4 files changed, 4 insertions(+)

diff --git a/packages/client/src/views/Performance/FieldAgentList.tsx b/packages/client/src/views/Performance/FieldAgentList.tsx
index dd5e47e094e..a8def4a5ba5 100644
--- a/packages/client/src/views/Performance/FieldAgentList.tsx
+++ b/packages/client/src/views/Performance/FieldAgentList.tsx
@@ -398,6 +398,7 @@ function FieldAgentListComponent(props: IProps) {
     >
       <Content
         title={intl.formatMessage(messages.declarationsStartedFieldAgents)}
+        showTitleOnMobile={true}
         size={ContentSize.LARGE}
         filterContent={
           <>
diff --git a/packages/client/src/views/Performance/RegistrationsList.tsx b/packages/client/src/views/Performance/RegistrationsList.tsx
index b2d8ab665cd..03d7a6b3993 100644
--- a/packages/client/src/views/Performance/RegistrationsList.tsx
+++ b/packages/client/src/views/Performance/RegistrationsList.tsx
@@ -568,6 +568,7 @@ function RegistrationListComponent(props: IProps) {
     >
       <Content
         title={intl.formatMessage(messages.performanceTotalRegitrationsHeader)}
+        showTitleOnMobile={true}
         size={ContentSize.LARGE}
         filterContent={
           <>
diff --git a/packages/client/src/views/SysAdmin/Performance/CompletenessRates.tsx b/packages/client/src/views/SysAdmin/Performance/CompletenessRates.tsx
index 8d352bbee92..e8aba47901e 100644
--- a/packages/client/src/views/SysAdmin/Performance/CompletenessRates.tsx
+++ b/packages/client/src/views/SysAdmin/Performance/CompletenessRates.tsx
@@ -259,6 +259,7 @@ function CompletenessRatesComponent(props: ICompletenessRateProps) {
     >
       <Content
         title={intl.formatMessage(navigationMessages.completenessRates)}
+        showTitleOnMobile={true}
         size={ContentSize.LARGE}
         filterContent={getFilter()}
       >
diff --git a/packages/client/src/views/SysAdmin/Performance/WorkflowStatus.tsx b/packages/client/src/views/SysAdmin/Performance/WorkflowStatus.tsx
index 0797919a05a..95aa1ebd909 100644
--- a/packages/client/src/views/SysAdmin/Performance/WorkflowStatus.tsx
+++ b/packages/client/src/views/SysAdmin/Performance/WorkflowStatus.tsx
@@ -705,6 +705,7 @@ function WorkflowStatusComponent(props: WorkflowStatusProps) {
     >
       <Content
         title={intl.formatMessage(messages.registrationByStatus)}
+        showTitleOnMobile={true}
         size={ContentSize.LARGE}
         filterContent={
           <>

From 49b589f75e2a36effa8f84ff4df6ba19c817894d Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <ashikul.alam@dsinnovators.com>
Date: Mon, 10 Jun 2024 16:08:03 +0600
Subject: [PATCH 070/108] fix: allow correction requested reg status for search
 request

---
 packages/user-mgnt/src/features/userSearchRecord/handler.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/user-mgnt/src/features/userSearchRecord/handler.ts b/packages/user-mgnt/src/features/userSearchRecord/handler.ts
index aef505b9977..d9f78ce5b58 100644
--- a/packages/user-mgnt/src/features/userSearchRecord/handler.ts
+++ b/packages/user-mgnt/src/features/userSearchRecord/handler.ts
@@ -25,7 +25,8 @@ enum RegStatus {
   REGISTERED = 'REGISTERED',
   CERTIFIED = 'CERTIFIED',
   REJECTED = 'REJECTED',
-  ISSUED = 'ISSUED'
+  ISSUED = 'ISSUED',
+  CORRECTION_REQUESTED = 'CORRECTION_REQUESTED'
 }
 interface IUserCreateSearchPayload {
   userId: string
@@ -170,7 +171,8 @@ export const createSearchrequestSchema = Joi.object({
         RegStatus.REGISTERED,
         RegStatus.CERTIFIED,
         RegStatus.REJECTED,
-        RegStatus.ISSUED
+        RegStatus.ISSUED,
+        RegStatus.CORRECTION_REQUESTED
       )
     ),
     dateOfEvent: Joi.string(),

From bf704e14f3a01346a59cff8e43cd8754bc570c05 Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <ashikul.alam@dsinnovators.com>
Date: Fri, 14 Jun 2024 15:59:16 +0600
Subject: [PATCH 071/108] docs: update changelog(7110)

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e1cc852bf2..db62ba8d6d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,6 +70,7 @@
 - Fix records going completely missing when an unexpected error happens in the backend [#7021](https://github.com/opencrvs/opencrvs-core/pull/7021)
 - Fix correction done from a certificate preview page [#7065](https://github.com/opencrvs/opencrvs-core/pull/7093)
 - Fix "Print and issue to groom|bride" is added to a different variable [#7046](https://github.com/opencrvs/opencrvs-core/issues/7046)
+- Fix search query is not being saved in the advanced search results [#7110](https://github.com/opencrvs/opencrvs-core/pull/7117)
 - Fix removed duplicateTrackingId check in createDuplicateTask method [#7024](https://github.com/opencrvs/opencrvs-core/issues/7024)
 - Fix address property handling and corrected country data transformation logic [#6989](https://github.com/opencrvs/opencrvs-core/issues/6989)
 - Fix search indexing BRN's in place of identifiers. Adds spouseIdentifier to search with [#7189](https://github.com/opencrvs/opencrvs-core/pull/7189)

From 06f51ba758dfa3be357361fcd1037019568c2fa0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 28 Jun 2024 15:09:26 +0300
Subject: [PATCH 072/108] fix(v1.5.0): increase rate limit on team searches
 #7277 (#7278)

Co-authored-by: Pyry Rouvila <pyry@opencrvs.org>
---
 packages/gateway/src/features/user/root-resolvers.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/gateway/src/features/user/root-resolvers.ts b/packages/gateway/src/features/user/root-resolvers.ts
index bb80c257f54..fcab92e1be9 100644
--- a/packages/gateway/src/features/user/root-resolvers.ts
+++ b/packages/gateway/src/features/user/root-resolvers.ts
@@ -42,7 +42,7 @@ import { rateLimitedResolver } from '@gateway/rate-limit'
 export const resolvers: GQLResolver = {
   Query: {
     getUser: rateLimitedResolver(
-      { requestsPerMinute: 10 },
+      { requestsPerMinute: 20 },
       async (_, { userId }, { dataSources }) => {
         const user = await dataSources.usersAPI.getUserById(userId!)
         return user
@@ -50,21 +50,21 @@ export const resolvers: GQLResolver = {
     ),
 
     getUserByMobile: rateLimitedResolver(
-      { requestsPerMinute: 10 },
+      { requestsPerMinute: 20 },
       async (_, { mobile }, { dataSources }) => {
         return dataSources.usersAPI.getUserByMobile(mobile!)
       }
     ),
 
     getUserByEmail: rateLimitedResolver(
-      { requestsPerMinute: 10 },
+      { requestsPerMinute: 20 },
       (_, { email }, { dataSources }) => {
         return dataSources.usersAPI.getUserByEmail(email!)
       }
     ),
 
     searchUsers: rateLimitedResolver(
-      { requestsPerMinute: 10 },
+      { requestsPerMinute: 20 },
       async (
         _,
         {
@@ -125,7 +125,7 @@ export const resolvers: GQLResolver = {
     ),
 
     searchFieldAgents: rateLimitedResolver(
-      { requestsPerMinute: 10 },
+      { requestsPerMinute: 20 },
       async (
         _,
         {

From a7319d56503c90a6d87d081d3c3418d7846a449d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 28 Jun 2024 16:58:17 +0300
Subject: [PATCH 073/108] fix(v1.5.0): storybook #7282 (#7283)

* fix: storybook

* fix: update version for example

* chore: move divider to input as it's related to forms

* fix: button stories

* fix: remove unused dependencies

* chore: leave the version as 1.5.0 to help if it needs to be cherrypicked

Co-authored-by: Pyry Rouvila <pyry@opencrvs.org>
---
 packages/components/.storybook/main.ts        |  13 +-
 packages/components/package.json              |   1 -
 .../components/src/Button/Button.stories.mdx  |  19 +-
 .../src/Divider/Divider.stories.tsx           |   2 +-
 .../SideNavigation/LeftNavigation.stories.tsx |   2 +-
 .../components/stories/colors.stories.mdx     |  10 -
 .../stories/iconography.stories.mdx           |  84 +--
 packages/components/stories/intro.stories.mdx |  12 +-
 .../components/stories/releases.stories.mdx   |  17 +-
 .../components/stories/typography.stories.mdx |  10 -
 yarn.lock                                     | 569 +-----------------
 11 files changed, 61 insertions(+), 678 deletions(-)

diff --git a/packages/components/.storybook/main.ts b/packages/components/.storybook/main.ts
index 4a247153cbd..5fb1c8a54cf 100644
--- a/packages/components/.storybook/main.ts
+++ b/packages/components/.storybook/main.ts
@@ -9,9 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import { mergeConfig } from 'vite'
-import remarkGfm from 'remark-gfm'
 import type { StorybookConfig } from '@storybook/react-vite'
-import BRAND_BLUE from './theme'
 
 const viteFinal = async (config: Record<string, any>) => {
   // return the customized config
@@ -38,16 +36,7 @@ const config: StorybookConfig = {
     '@storybook/addon-links',
     '@storybook/addon-essentials',
     '@storybook/addon-a11y',
-    {
-      name: '@storybook/addon-docs',
-      options: {
-        mdxPluginOptions: {
-          mdxCompileOptions: {
-            remarkPlugins: [remarkGfm]
-          }
-        }
-      }
-    }
+    '@storybook/addon-docs'
   ],
   staticDirs: ['../public'],
   framework: {
diff --git a/packages/components/package.json b/packages/components/package.json
index e1d40313406..f0b4415e3b5 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -75,7 +75,6 @@
     "eslint-plugin-styled-components-a11y": "^2.0.0",
     "lint-staged": "^7.1.0",
     "prettier": "2.8.8",
-    "remark-gfm": "4.0.0",
     "rimraf": "^5.0.0",
     "storybook": "^7.0.2",
     "stylelint": "^14.11.0",
diff --git a/packages/components/src/Button/Button.stories.mdx b/packages/components/src/Button/Button.stories.mdx
index a11f5920ab1..0bdacac69ee 100644
--- a/packages/components/src/Button/Button.stories.mdx
+++ b/packages/components/src/Button/Button.stories.mdx
@@ -1,21 +1,4 @@
-{/*This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-OpenCRVS is also distributed under the terms of the Civil Registration
-& Healthcare Disclaimer located at http://opencrvs.org/license.
-
-Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
-*/}
-
-import {
-  Meta,
-  Story,
-  Canvas,
-  ArgsTable,
-  Source,
-  Preview
-} from '@storybook/addon-docs'
+import { Meta, Story, Canvas, ArgsTable, Source } from '@storybook/addon-docs'
 import dedent from 'ts-dedent'
 import { Button } from './Button'
 import { Stack } from '../Stack'
diff --git a/packages/components/src/Divider/Divider.stories.tsx b/packages/components/src/Divider/Divider.stories.tsx
index 6c5612e9022..d2f810da202 100644
--- a/packages/components/src/Divider/Divider.stories.tsx
+++ b/packages/components/src/Divider/Divider.stories.tsx
@@ -14,7 +14,7 @@ import { Meta, Story } from '@storybook/react'
 import { Divider, DividerProps } from './Divider'
 
 export default {
-  title: 'Components/Divider',
+  title: 'Input/Divider',
   component: Divider,
   argTypes: {
     ref: { table: { disable: true } },
diff --git a/packages/components/src/SideNavigation/LeftNavigation.stories.tsx b/packages/components/src/SideNavigation/LeftNavigation.stories.tsx
index 321fbef15cf..dae3eb0a04e 100644
--- a/packages/components/src/SideNavigation/LeftNavigation.stories.tsx
+++ b/packages/components/src/SideNavigation/LeftNavigation.stories.tsx
@@ -68,7 +68,7 @@ export const SideNav = () => (
 
 SideNav.args = {
   applicationName: 'OpenCRVS',
-  applicationVersion: '1.3.0',
+  applicationVersion: '1.6.0',
   buildVersion: 'Development'
 }
 
diff --git a/packages/components/stories/colors.stories.mdx b/packages/components/stories/colors.stories.mdx
index ce76e4bad5c..9e3db7b5fed 100644
--- a/packages/components/stories/colors.stories.mdx
+++ b/packages/components/stories/colors.stories.mdx
@@ -1,13 +1,3 @@
-{/*This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-OpenCRVS is also distributed under the terms of the Civil Registration
-& Healthcare Disclaimer located at http://opencrvs.org/license.
-
-Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
-*/}
-
 import { Meta, ColorPalette, ColorItem } from '@storybook/addon-docs'
 import { colors, shadows, gradients } from '@opencrvs/components/lib/colors'
 import { Box } from '@opencrvs/components/lib/Box'
diff --git a/packages/components/stories/iconography.stories.mdx b/packages/components/stories/iconography.stories.mdx
index 20717b5e696..b66acb893d9 100644
--- a/packages/components/stories/iconography.stories.mdx
+++ b/packages/components/stories/iconography.stories.mdx
@@ -1,53 +1,63 @@
-{/*This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-OpenCRVS is also distributed under the terms of the Civil Registration
-& Healthcare Disclaimer located at http://opencrvs.org/license.
-
-Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
-*/}
-
 import { Meta, IconGallery, IconItem } from '@storybook/addon-docs'
-import { Icon } from '../src'
+import { Icon } from '../src/Icon'
 
 export const PHOSPHER_ICONS = [
-  'GitBranch',
+  'Activity',
   'Archive',
-  'List',
-  'Target',
-  'Medal',
-  'CreditCard',
-  'Phone',
-  'User',
-  'Users',
+  'ArchiveTray',
   'ArrowLeft',
   'ArrowRight',
-  'Share',
-  'Lock',
-  'ListBullets',
-  'Compass',
-  'NotePencil',
+  'Buildings',
+  'CaretDown',
+  'CaretLeft',
+  'CaretRight',
+  'ChartBar',
+  'ChartLine',
   'ChatCircle',
-  'Star',
+  'CheckSquare',
+  'Compass',
+  'Check',
+  'Copy',
+  'Database',
+  'DotsThreeVertical',
+  'DownloadSimple',
+  'ArrowCounterClockwise',
+  'MagnifyingGlassMinus',
+  'MagnifyingGlassPlus',
+  'Export',
+  'Eye',
+  'Envelope',
+  'Gear',
+  'GitBranch',
+  'IdentificationCard',
+  'List',
+  'ListBullets',
+  'Lock',
   'MagnifyingGlass',
+  'MapPin',
+  'Medal',
+  'NotePencil',
+  'Paperclip',
+  'PaperPlaneTilt',
+  'Pen',
+  'Pencil',
+  'PencilSimpleLine',
+  'Phone',
   'Plus',
+  'Printer',
   'SignOut',
-  'Pencil',
-  'CaretRight',
-  'CaretDown',
-  'Copy',
-  'Paperclip',
-  'TrashSimple',
+  'Star',
+  'Target',
   'TextT',
-  'Database',
-  'CheckSquare',
+  'TrashSimple',
+  'UploadSimple',
+  'User',
+  'UserPlus',
+  'Users',
   'WarningCircle',
   'X',
-  'Activity',
-  'ChartLine',
-  'ChartBar',
-  'PaperPlaneTilt'
+  'CircleWavyCheck',
+  'CircleWavyQuestion'
 ]
 
 <Meta title="Styles/Iconography" />
diff --git a/packages/components/stories/intro.stories.mdx b/packages/components/stories/intro.stories.mdx
index 0ebcf0c9c95..21dbc6c3b20 100644
--- a/packages/components/stories/intro.stories.mdx
+++ b/packages/components/stories/intro.stories.mdx
@@ -1,13 +1,3 @@
-{/*This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-OpenCRVS is also distributed under the terms of the Civil Registration
-& Healthcare Disclaimer located at http://opencrvs.org/license.
-
-Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
-*/}
-
 import { Meta, DocsContainer } from '@storybook/addon-docs'
 import { Pill } from '@opencrvs/components/lib/Pill'
 import { Button } from '@opencrvs/components/lib/Button'
@@ -42,7 +32,7 @@ export const ExternalLinkIcon = () => (
   </svg>
 )
 
-<Pill label="v 1.3.0" type="default" size="small" />
+<Pill label="v 1.5.0" type="default" size="small" />
 <br />
 <br />
 
diff --git a/packages/components/stories/releases.stories.mdx b/packages/components/stories/releases.stories.mdx
index 87a95c7710e..73513acf296 100644
--- a/packages/components/stories/releases.stories.mdx
+++ b/packages/components/stories/releases.stories.mdx
@@ -1,13 +1,3 @@
-{/*This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-OpenCRVS is also distributed under the terms of the Civil Registration
-& Healthcare Disclaimer located at http://opencrvs.org/license.
-
-Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
-*/}
-
 import { Meta, DocsContainer } from '@storybook/addon-docs'
 import { Pill } from '@opencrvs/components/lib/Pill'
 import { Stack } from '@opencrvs/components/lib/Stack'
@@ -40,6 +30,13 @@ export const ReleasePill = ({ date, version }) => (
 
 {/* https://gitmoji.dev/ Emoji convention */}
 
+<ReleasePill date="July 2024" version="1.5.0" />
+
+- 💄 Update **Accordion** with an active style by @jpye-finch
+- 💄 Update **Checkbox**, **DateField**, **InputField**, **PasswordInput**, **TextArea**, **TextInput** and **TimeField** general looks by @jpye-finch
+- 💄 Update multiple components spacings by @jpye-finch
+- ♻️ Refactor a lot of components from class to functional components by @Eezi
+
 <ReleasePill date="September 2023" version="1.3.0" />
 
 - ✨ Create [ListConfig](?path=/docs/data-list-config--docs) to replace ListViewSimplified
diff --git a/packages/components/stories/typography.stories.mdx b/packages/components/stories/typography.stories.mdx
index 3e5d94f3652..fb4933c7130 100644
--- a/packages/components/stories/typography.stories.mdx
+++ b/packages/components/stories/typography.stories.mdx
@@ -1,13 +1,3 @@
-{/*This Source Code Form is subject to the terms of the Mozilla Public
-License, v. 2.0. If a copy of the MPL was not distributed with this
-file, You can obtain one at https://mozilla.org/MPL/2.0/.
-
-OpenCRVS is also distributed under the terms of the Civil Registration
-& Healthcare Disclaimer located at http://opencrvs.org/license.
-
-Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
-*/}
-
 import { Meta, Typeset, ColorPalette, ColorItem } from '@storybook/addon-docs'
 import styled from 'styled-components'
 import { getTheme } from '@opencrvs/components/lib/theme'
diff --git a/yarn.lock b/yarn.lock
index cbf2527aca9..e29d1957506 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7407,13 +7407,6 @@
   resolved "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.1.tgz"
   integrity sha512-GGTvzKccVEhxmRfJEB6zhY9ieT4UhGVUIQaBzFpUO9OXy2ycAlnPCSJLzmGGgqt3KVjqN3QCQB4g1rsZnHsWhg==
 
-"@types/debug@^4.0.0":
-  version "4.1.10"
-  resolved "https://registry.npmjs.org/@types/debug/-/debug-4.1.10.tgz"
-  integrity sha512-tOSCru6s732pofZ+sMv9o4o3Zc+Sa8l3bxd/tweTQudFn06vAzb13ZX46Zi6m6EJ+RUbRTHvgQJ1gBtSgkaUYA==
-  dependencies:
-    "@types/ms" "*"
-
 "@types/debug@^4.1.7":
   version "4.1.12"
   resolved "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz"
@@ -7808,13 +7801,6 @@
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.2.tgz#b74129719fc8d11c01868010082d483b7545591a"
   integrity sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==
 
-"@types/mdast@^4.0.0":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-4.0.3.tgz#1e011ff013566e919a4232d1701ad30d70cab333"
-  integrity sha512-LsjtqsyF+d2/yFOYaN22dHZI1Cpwkrj+g06G8+qtUKlhovPW89YhqSnfKtMbkgmEtYpH2gydRNULd6y8mciAFg==
-  dependencies:
-    "@types/unist" "*"
-
 "@types/mdx@^2.0.0":
   version "2.0.9"
   resolved "https://registry.npmjs.org/@types/mdx/-/mdx-2.0.9.tgz"
@@ -8231,11 +8217,6 @@
   resolved "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz"
   integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==
 
-"@types/unist@*", "@types/unist@^3.0.0":
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-3.0.2.tgz#6dd61e43ef60b34086287f83683a5c1b2dc53d20"
-  integrity sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==
-
 "@types/unist@^2.0.0":
   version "2.0.10"
   resolved "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz"
@@ -9686,11 +9667,6 @@ babel-runtime@6.x, babel-runtime@^6.26.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
-bail@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz"
-  integrity sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
@@ -10325,11 +10301,6 @@ capture-exit@^2.0.0:
   dependencies:
     rsvp "^4.8.4"
 
-ccount@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz"
-  integrity sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==
-
 chai@^4.3.6, chai@^4.3.7:
   version "4.3.10"
   resolved "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz"
@@ -10427,11 +10398,6 @@ char-regex@^1.0.2:
   resolved "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz"
   integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==
 
-character-entities@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz"
-  integrity sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==
-
 chardet@^0.7.0:
   version "0.7.0"
   resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"
@@ -11658,7 +11624,7 @@ debounce@^1.2.0:
   resolved "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz"
   integrity sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==
 
-debug@*, debug@4, debug@4.3.4, debug@4.x, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4:
+debug@*, debug@4, debug@4.3.4, debug@4.x, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.0, debug@^4.3.1, debug@^4.3.3, debug@^4.3.4:
   version "4.3.4"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
@@ -11707,13 +11673,6 @@ decimal.js@^10.2.1:
   resolved "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz"
   integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
 
-decode-named-character-reference@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.0.2.tgz"
-  integrity sha512-O8x12RzrUF8xyVcY0KJowWsmaJxQbmy0/EtnNtHRpsOcT7dFk5W598coHqBVpmWo1oQQfsCqfCmkZN5DJrZVdg==
-  dependencies:
-    character-entities "^2.0.0"
-
 decode-uri-component@^0.2.0, decode-uri-component@^0.2.2:
   version "0.2.2"
   resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz"
@@ -11908,7 +11867,7 @@ deprecation@^2.0.0:
   resolved "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz"
   integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
 
-dequal@^2.0.0, dequal@^2.0.2, dequal@^2.0.3:
+dequal@^2.0.2, dequal@^2.0.3:
   version "2.0.3"
   resolved "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz"
   integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
@@ -11958,13 +11917,6 @@ detect-port@^1.3.0:
     address "^1.0.1"
     debug "4"
 
-devlop@^1.0.0, devlop@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/devlop/-/devlop-1.1.0.tgz#4db7c2ca4dc6e0e834c30be70c94bbc976dc7018"
-  integrity sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==
-  dependencies:
-    dequal "^2.0.0"
-
 dezalgo@^1.0.0:
   version "1.0.4"
   resolved "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz"
@@ -12906,11 +12858,6 @@ escape-string-regexp@^4.0.0:
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
-escape-string-regexp@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz"
-  integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
-
 escodegen@^1.11.1:
   version "1.14.3"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
@@ -15816,11 +15763,6 @@ is-plain-obj@^2.0.0:
   resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz"
   integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
 
-is-plain-obj@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz"
-  integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==
-
 is-plain-object@5.0.0, is-plain-object@^5.0.0:
   version "5.0.0"
   resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"
@@ -17526,11 +17468,6 @@ long@^4.0.0:
   resolved "https://registry.npmjs.org/long/-/long-4.0.0.tgz"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
-longest-streak@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz"
-  integrity sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==
-
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
@@ -17765,11 +17702,6 @@ mapcap@^1.0.0:
   resolved "https://registry.npmjs.org/mapcap/-/mapcap-1.0.0.tgz"
   integrity sha512-KcNlZSlFPx+r1jYZmxEbTVymG+dIctf10WmWkuhrhrblM+KMoF77HelwihL5cxYlORye79KoR4IlOOk99lUJ0g==
 
-markdown-table@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.3.tgz"
-  integrity sha512-Z1NL3Tb1M9wH4XESsCDEksWoKTdlUafKc4pt0GRwjUyXaCFZ+dc3g2erqB6zm3szA2IUSi7VnPI+o/9jnxh9hw==
-
 markdown-to-jsx@^7.1.8:
   version "7.3.2"
   resolved "https://registry.npmjs.org/markdown-to-jsx/-/markdown-to-jsx-7.3.2.tgz"
@@ -17792,133 +17724,11 @@ mdast-util-definitions@^4.0.0:
   dependencies:
     unist-util-visit "^2.0.0"
 
-mdast-util-find-and-replace@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/mdast-util-find-and-replace/-/mdast-util-find-and-replace-3.0.1.tgz#a6fc7b62f0994e973490e45262e4bc07607b04e0"
-  integrity sha512-SG21kZHGC3XRTSUhtofZkBzZTJNM5ecCi0SK2IMKmSXR8vO3peL+kb1O0z7Zl83jKtutG4k5Wv/W7V3/YHvzPA==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    escape-string-regexp "^5.0.0"
-    unist-util-is "^6.0.0"
-    unist-util-visit-parents "^6.0.0"
-
-mdast-util-from-markdown@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.0.tgz#52f14815ec291ed061f2922fd14d6689c810cb88"
-  integrity sha512-n7MTOr/z+8NAX/wmhhDji8O3bRvPTV/U0oTCaZJkjhPSKTPhS3xufVhKGF8s1pJ7Ox4QgoIU7KHseh09S+9rTA==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    "@types/unist" "^3.0.0"
-    decode-named-character-reference "^1.0.0"
-    devlop "^1.0.0"
-    mdast-util-to-string "^4.0.0"
-    micromark "^4.0.0"
-    micromark-util-decode-numeric-character-reference "^2.0.0"
-    micromark-util-decode-string "^2.0.0"
-    micromark-util-normalize-identifier "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-    unist-util-stringify-position "^4.0.0"
-
-mdast-util-gfm-autolink-literal@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-autolink-literal/-/mdast-util-gfm-autolink-literal-2.0.0.tgz#5baf35407421310a08e68c15e5d8821e8898ba2a"
-  integrity sha512-FyzMsduZZHSc3i0Px3PQcBT4WJY/X/RCtEJKuybiC6sjPqLv7h1yqAkmILZtuxMSsUyaLUWNp71+vQH2zqp5cg==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    ccount "^2.0.0"
-    devlop "^1.0.0"
-    mdast-util-find-and-replace "^3.0.0"
-    micromark-util-character "^2.0.0"
-
-mdast-util-gfm-footnote@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-footnote/-/mdast-util-gfm-footnote-2.0.0.tgz#25a1753c7d16db8bfd53cd84fe50562bd1e6d6a9"
-  integrity sha512-5jOT2boTSVkMnQ7LTrd6n/18kqwjmuYqo7JUPe+tRCY6O7dAuTFMtTPauYYrMPpox9hlN0uOx/FL8XvEfG9/mQ==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    devlop "^1.1.0"
-    mdast-util-from-markdown "^2.0.0"
-    mdast-util-to-markdown "^2.0.0"
-    micromark-util-normalize-identifier "^2.0.0"
-
-mdast-util-gfm-strikethrough@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-strikethrough/-/mdast-util-gfm-strikethrough-2.0.0.tgz#d44ef9e8ed283ac8c1165ab0d0dfd058c2764c16"
-  integrity sha512-mKKb915TF+OC5ptj5bJ7WFRPdYtuHv0yTRxK2tJvi+BDqbkiG7h7u/9SI89nRAYcmap2xHQL9D+QG/6wSrTtXg==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    mdast-util-from-markdown "^2.0.0"
-    mdast-util-to-markdown "^2.0.0"
-
-mdast-util-gfm-table@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-table/-/mdast-util-gfm-table-2.0.0.tgz#7a435fb6223a72b0862b33afbd712b6dae878d38"
-  integrity sha512-78UEvebzz/rJIxLvE7ZtDd/vIQ0RHv+3Mh5DR96p7cS7HsBhYIICDBCu8csTNWNO6tBWfqXPWekRuj2FNOGOZg==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    devlop "^1.0.0"
-    markdown-table "^3.0.0"
-    mdast-util-from-markdown "^2.0.0"
-    mdast-util-to-markdown "^2.0.0"
-
-mdast-util-gfm-task-list-item@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm-task-list-item/-/mdast-util-gfm-task-list-item-2.0.0.tgz#e68095d2f8a4303ef24094ab642e1047b991a936"
-  integrity sha512-IrtvNvjxC1o06taBAVJznEnkiHxLFTzgonUdy8hzFVeDun0uTjxxrRGVaNFqkU1wJR3RBPEfsxmU6jDWPofrTQ==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    devlop "^1.0.0"
-    mdast-util-from-markdown "^2.0.0"
-    mdast-util-to-markdown "^2.0.0"
-
-mdast-util-gfm@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-gfm/-/mdast-util-gfm-3.0.0.tgz#3f2aecc879785c3cb6a81ff3a243dc11eca61095"
-  integrity sha512-dgQEX5Amaq+DuUqf26jJqSK9qgixgd6rYDHAv4aTBuA92cTknZlKpPfa86Z/s8Dj8xsAQpFfBmPUHWJBWqS4Bw==
-  dependencies:
-    mdast-util-from-markdown "^2.0.0"
-    mdast-util-gfm-autolink-literal "^2.0.0"
-    mdast-util-gfm-footnote "^2.0.0"
-    mdast-util-gfm-strikethrough "^2.0.0"
-    mdast-util-gfm-table "^2.0.0"
-    mdast-util-gfm-task-list-item "^2.0.0"
-    mdast-util-to-markdown "^2.0.0"
-
-mdast-util-phrasing@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-phrasing/-/mdast-util-phrasing-4.1.0.tgz#7cc0a8dec30eaf04b7b1a9661a92adb3382aa6e3"
-  integrity sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    unist-util-is "^6.0.0"
-
-mdast-util-to-markdown@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.0.tgz#9813f1d6e0cdaac7c244ec8c6dabfdb2102ea2b4"
-  integrity sha512-SR2VnIEdVNCJbP6y7kVTJgPLifdr8WEU440fQec7qHoHOUz/oJ2jmNRqdDQ3rbiStOXb2mCDGTuwsK5OPUgYlQ==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    "@types/unist" "^3.0.0"
-    longest-streak "^3.0.0"
-    mdast-util-phrasing "^4.0.0"
-    mdast-util-to-string "^4.0.0"
-    micromark-util-decode-string "^2.0.0"
-    unist-util-visit "^5.0.0"
-    zwitch "^2.0.0"
-
 mdast-util-to-string@^1.0.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz"
   integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==
 
-mdast-util-to-string@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz#7a5121475556a04e7eddeb67b264aae79d312814"
-  integrity sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-
 measured-core@^1.51.1:
   version "1.51.1"
   resolved "https://registry.npmjs.org/measured-core/-/measured-core-1.51.1.tgz"
@@ -18045,279 +17855,6 @@ methods@~1.1.2:
   resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
   integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
-micromark-core-commonmark@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-core-commonmark/-/micromark-core-commonmark-2.0.0.tgz#50740201f0ee78c12a675bf3e68ffebc0bf931a3"
-  integrity sha512-jThOz/pVmAYUtkroV3D5c1osFXAMv9e0ypGDOIZuCeAe91/sD6BoE2Sjzt30yuXtwOYUmySOhMas/PVyh02itA==
-  dependencies:
-    decode-named-character-reference "^1.0.0"
-    devlop "^1.0.0"
-    micromark-factory-destination "^2.0.0"
-    micromark-factory-label "^2.0.0"
-    micromark-factory-space "^2.0.0"
-    micromark-factory-title "^2.0.0"
-    micromark-factory-whitespace "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-chunked "^2.0.0"
-    micromark-util-classify-character "^2.0.0"
-    micromark-util-html-tag-name "^2.0.0"
-    micromark-util-normalize-identifier "^2.0.0"
-    micromark-util-resolve-all "^2.0.0"
-    micromark-util-subtokenize "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-extension-gfm-autolink-literal@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-autolink-literal/-/micromark-extension-gfm-autolink-literal-2.0.0.tgz#f1e50b42e67d441528f39a67133eddde2bbabfd9"
-  integrity sha512-rTHfnpt/Q7dEAK1Y5ii0W8bhfJlVJFnJMHIPisfPK3gpVNuOP0VnRl96+YJ3RYWV/P4gFeQoGKNlT3RhuvpqAg==
-  dependencies:
-    micromark-util-character "^2.0.0"
-    micromark-util-sanitize-uri "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-extension-gfm-footnote@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-footnote/-/micromark-extension-gfm-footnote-2.0.0.tgz#91afad310065a94b636ab1e9dab2c60d1aab953c"
-  integrity sha512-6Rzu0CYRKDv3BfLAUnZsSlzx3ak6HAoI85KTiijuKIz5UxZxbUI+pD6oHgw+6UtQuiRwnGRhzMmPRv4smcz0fg==
-  dependencies:
-    devlop "^1.0.0"
-    micromark-core-commonmark "^2.0.0"
-    micromark-factory-space "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-normalize-identifier "^2.0.0"
-    micromark-util-sanitize-uri "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-extension-gfm-strikethrough@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-strikethrough/-/micromark-extension-gfm-strikethrough-2.0.0.tgz#6917db8e320da70e39ffbf97abdbff83e6783e61"
-  integrity sha512-c3BR1ClMp5fxxmwP6AoOY2fXO9U8uFMKs4ADD66ahLTNcwzSCyRVU4k7LPV5Nxo/VJiR4TdzxRQY2v3qIUceCw==
-  dependencies:
-    devlop "^1.0.0"
-    micromark-util-chunked "^2.0.0"
-    micromark-util-classify-character "^2.0.0"
-    micromark-util-resolve-all "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-extension-gfm-table@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-table/-/micromark-extension-gfm-table-2.0.0.tgz#2cf3fe352d9e089b7ef5fff003bdfe0da29649b7"
-  integrity sha512-PoHlhypg1ItIucOaHmKE8fbin3vTLpDOUg8KAr8gRCF1MOZI9Nquq2i/44wFvviM4WuxJzc3demT8Y3dkfvYrw==
-  dependencies:
-    devlop "^1.0.0"
-    micromark-factory-space "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-extension-gfm-tagfilter@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-tagfilter/-/micromark-extension-gfm-tagfilter-2.0.0.tgz#f26d8a7807b5985fba13cf61465b58ca5ff7dc57"
-  integrity sha512-xHlTOmuCSotIA8TW1mDIM6X2O1SiX5P9IuDtqGonFhEK0qgRI4yeC6vMxEV2dgyr2TiD+2PQ10o+cOhdVAcwfg==
-  dependencies:
-    micromark-util-types "^2.0.0"
-
-micromark-extension-gfm-task-list-item@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm-task-list-item/-/micromark-extension-gfm-task-list-item-2.0.1.tgz#ee8b208f1ced1eb9fb11c19a23666e59d86d4838"
-  integrity sha512-cY5PzGcnULaN5O7T+cOzfMoHjBW7j+T9D2sucA5d/KbsBTPcYdebm9zUd9zzdgJGCwahV+/W78Z3nbulBYVbTw==
-  dependencies:
-    devlop "^1.0.0"
-    micromark-factory-space "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-extension-gfm@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-extension-gfm/-/micromark-extension-gfm-3.0.0.tgz#3e13376ab95dd7a5cfd0e29560dfe999657b3c5b"
-  integrity sha512-vsKArQsicm7t0z2GugkCKtZehqUm31oeGBV/KVSorWSy8ZlNAv7ytjFhvaryUiCUJYqs+NoE6AFhpQvBTM6Q4w==
-  dependencies:
-    micromark-extension-gfm-autolink-literal "^2.0.0"
-    micromark-extension-gfm-footnote "^2.0.0"
-    micromark-extension-gfm-strikethrough "^2.0.0"
-    micromark-extension-gfm-table "^2.0.0"
-    micromark-extension-gfm-tagfilter "^2.0.0"
-    micromark-extension-gfm-task-list-item "^2.0.0"
-    micromark-util-combine-extensions "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-factory-destination@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-destination/-/micromark-factory-destination-2.0.0.tgz#857c94debd2c873cba34e0445ab26b74f6a6ec07"
-  integrity sha512-j9DGrQLm/Uhl2tCzcbLhy5kXsgkHUrjJHg4fFAeoMRwJmJerT9aw4FEhIbZStWN8A3qMwOp1uzHr4UL8AInxtA==
-  dependencies:
-    micromark-util-character "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-factory-label@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-label/-/micromark-factory-label-2.0.0.tgz#17c5c2e66ce39ad6f4fc4cbf40d972f9096f726a"
-  integrity sha512-RR3i96ohZGde//4WSe/dJsxOX6vxIg9TimLAS3i4EhBAFx8Sm5SmqVfR8E87DPSR31nEAjZfbt91OMZWcNgdZw==
-  dependencies:
-    devlop "^1.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-factory-space@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-space/-/micromark-factory-space-2.0.0.tgz#5e7afd5929c23b96566d0e1ae018ae4fcf81d030"
-  integrity sha512-TKr+LIDX2pkBJXFLzpyPyljzYK3MtmllMUMODTQJIUfDGncESaqB90db9IAUcz4AZAJFdd8U9zOp9ty1458rxg==
-  dependencies:
-    micromark-util-character "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-factory-title@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-title/-/micromark-factory-title-2.0.0.tgz#726140fc77892af524705d689e1cf06c8a83ea95"
-  integrity sha512-jY8CSxmpWLOxS+t8W+FG3Xigc0RDQA9bKMY/EwILvsesiRniiVMejYTE4wumNc2f4UbAa4WsHqe3J1QS1sli+A==
-  dependencies:
-    micromark-factory-space "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-factory-whitespace@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-factory-whitespace/-/micromark-factory-whitespace-2.0.0.tgz#9e92eb0f5468083381f923d9653632b3cfb5f763"
-  integrity sha512-28kbwaBjc5yAI1XadbdPYHX/eDnqaUFVikLwrO7FDnKG7lpgxnvk/XGRhX/PN0mOZ+dBSZ+LgunHS+6tYQAzhA==
-  dependencies:
-    micromark-factory-space "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-util-character@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-character/-/micromark-util-character-2.1.0.tgz#31320ace16b4644316f6bf057531689c71e2aee1"
-  integrity sha512-KvOVV+X1yLBfs9dCBSopq/+G1PcgT3lAK07mC4BzXi5E7ahzMAF8oIupDDJ6mievI6F+lAATkbQQlQixJfT3aQ==
-  dependencies:
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-util-chunked@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-chunked/-/micromark-util-chunked-2.0.0.tgz#e51f4db85fb203a79dbfef23fd41b2f03dc2ef89"
-  integrity sha512-anK8SWmNphkXdaKgz5hJvGa7l00qmcaUQoMYsBwDlSKFKjc6gjGXPDw3FNL3Nbwq5L8gE+RCbGqTw49FK5Qyvg==
-  dependencies:
-    micromark-util-symbol "^2.0.0"
-
-micromark-util-classify-character@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-classify-character/-/micromark-util-classify-character-2.0.0.tgz#8c7537c20d0750b12df31f86e976d1d951165f34"
-  integrity sha512-S0ze2R9GH+fu41FA7pbSqNWObo/kzwf8rN/+IGlW/4tC6oACOs8B++bh+i9bVyNnwCcuksbFwsBme5OCKXCwIw==
-  dependencies:
-    micromark-util-character "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-util-combine-extensions@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-combine-extensions/-/micromark-util-combine-extensions-2.0.0.tgz#75d6ab65c58b7403616db8d6b31315013bfb7ee5"
-  integrity sha512-vZZio48k7ON0fVS3CUgFatWHoKbbLTK/rT7pzpJ4Bjp5JjkZeasRfrS9wsBdDJK2cJLHMckXZdzPSSr1B8a4oQ==
-  dependencies:
-    micromark-util-chunked "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-util-decode-numeric-character-reference@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.1.tgz#2698bbb38f2a9ba6310e359f99fcb2b35a0d2bd5"
-  integrity sha512-bmkNc7z8Wn6kgjZmVHOX3SowGmVdhYS7yBpMnuMnPzDq/6xwVA604DuOXMZTO1lvq01g+Adfa0pE2UKGlxL1XQ==
-  dependencies:
-    micromark-util-symbol "^2.0.0"
-
-micromark-util-decode-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-decode-string/-/micromark-util-decode-string-2.0.0.tgz#7dfa3a63c45aecaa17824e656bcdb01f9737154a"
-  integrity sha512-r4Sc6leeUTn3P6gk20aFMj2ntPwn6qpDZqWvYmAG6NgvFTIlj4WtrAudLi65qYoaGdXYViXYw2pkmn7QnIFasA==
-  dependencies:
-    decode-named-character-reference "^1.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-decode-numeric-character-reference "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-
-micromark-util-encode@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-encode/-/micromark-util-encode-2.0.0.tgz#0921ac7953dc3f1fd281e3d1932decfdb9382ab1"
-  integrity sha512-pS+ROfCXAGLWCOc8egcBvT0kf27GoWMqtdarNfDcjb6YLuV5cM3ioG45Ys2qOVqeqSbjaKg72vU+Wby3eddPsA==
-
-micromark-util-html-tag-name@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-html-tag-name/-/micromark-util-html-tag-name-2.0.0.tgz#ae34b01cbe063363847670284c6255bb12138ec4"
-  integrity sha512-xNn4Pqkj2puRhKdKTm8t1YHC/BAjx6CEwRFXntTaRf/x16aqka6ouVoutm+QdkISTlT7e2zU7U4ZdlDLJd2Mcw==
-
-micromark-util-normalize-identifier@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-2.0.0.tgz#91f9a4e65fe66cc80c53b35b0254ad67aa431d8b"
-  integrity sha512-2xhYT0sfo85FMrUPtHcPo2rrp1lwbDEEzpx7jiH2xXJLqBuy4H0GgXk5ToU8IEwoROtXuL8ND0ttVa4rNqYK3w==
-  dependencies:
-    micromark-util-symbol "^2.0.0"
-
-micromark-util-resolve-all@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-resolve-all/-/micromark-util-resolve-all-2.0.0.tgz#189656e7e1a53d0c86a38a652b284a252389f364"
-  integrity sha512-6KU6qO7DZ7GJkaCgwBNtplXCvGkJToU86ybBAUdavvgsCiG8lSSvYxr9MhwmQ+udpzywHsl4RpGJsYWG1pDOcA==
-  dependencies:
-    micromark-util-types "^2.0.0"
-
-micromark-util-sanitize-uri@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.0.tgz#ec8fbf0258e9e6d8f13d9e4770f9be64342673de"
-  integrity sha512-WhYv5UEcZrbAtlsnPuChHUAsu/iBPOVaEVsntLBIdpibO0ddy8OzavZz3iL2xVvBZOpolujSliP65Kq0/7KIYw==
-  dependencies:
-    micromark-util-character "^2.0.0"
-    micromark-util-encode "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-
-micromark-util-subtokenize@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-subtokenize/-/micromark-util-subtokenize-2.0.0.tgz#9f412442d77e0c5789ffdf42377fa8a2bcbdf581"
-  integrity sha512-vc93L1t+gpR3p8jxeVdaYlbV2jTYteDje19rNSS/H5dlhxUYll5Fy6vJ2cDwP8RnsXi818yGty1ayP55y3W6fg==
-  dependencies:
-    devlop "^1.0.0"
-    micromark-util-chunked "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
-micromark-util-symbol@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-symbol/-/micromark-util-symbol-2.0.0.tgz#12225c8f95edf8b17254e47080ce0862d5db8044"
-  integrity sha512-8JZt9ElZ5kyTnO94muPxIGS8oyElRJaiJO8EzV6ZSyGQ1Is8xwl4Q45qU5UOg+bGH4AikWziz0iN4sFLWs8PGw==
-
-micromark-util-types@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/micromark-util-types/-/micromark-util-types-2.0.0.tgz#63b4b7ffeb35d3ecf50d1ca20e68fc7caa36d95e"
-  integrity sha512-oNh6S2WMHWRZrmutsRmDDfkzKtxF+bc2VxLC9dvtrDIRFln627VsFP6fLMgTryGDljgLPjkrzQSDcPrjPyDJ5w==
-
-micromark@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/micromark/-/micromark-4.0.0.tgz#84746a249ebd904d9658cfabc1e8e5f32cbc6249"
-  integrity sha512-o/sd0nMof8kYff+TqcDx3VSrgBTcZpSvYcAHIfHhv5VAuNmisCxjhx6YmxS8PFEpb9z5WKWKPdzf0jM23ro3RQ==
-  dependencies:
-    "@types/debug" "^4.0.0"
-    debug "^4.0.0"
-    decode-named-character-reference "^1.0.0"
-    devlop "^1.0.0"
-    micromark-core-commonmark "^2.0.0"
-    micromark-factory-space "^2.0.0"
-    micromark-util-character "^2.0.0"
-    micromark-util-chunked "^2.0.0"
-    micromark-util-combine-extensions "^2.0.0"
-    micromark-util-decode-numeric-character-reference "^2.0.0"
-    micromark-util-encode "^2.0.0"
-    micromark-util-normalize-identifier "^2.0.0"
-    micromark-util-resolve-all "^2.0.0"
-    micromark-util-sanitize-uri "^2.0.0"
-    micromark-util-subtokenize "^2.0.0"
-    micromark-util-symbol "^2.0.0"
-    micromark-util-types "^2.0.0"
-
 micromatch@4.0.5, micromatch@^4.0.2, micromatch@^4.0.4, micromatch@^4.0.5:
   version "4.0.5"
   resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
@@ -21585,28 +21122,6 @@ remark-external-links@^8.0.0:
     space-separated-tokens "^1.0.0"
     unist-util-visit "^2.0.0"
 
-remark-gfm@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/remark-gfm/-/remark-gfm-4.0.0.tgz#aea777f0744701aa288b67d28c43565c7e8c35de"
-  integrity sha512-U92vJgBPkbw4Zfu/IiW2oTZLSL3Zpv+uI7My2eq8JxKgqraFdU8YUGicEJCEgSbeaG+QDFqIcwwfMTOEelPxuA==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    mdast-util-gfm "^3.0.0"
-    micromark-extension-gfm "^3.0.0"
-    remark-parse "^11.0.0"
-    remark-stringify "^11.0.0"
-    unified "^11.0.0"
-
-remark-parse@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-11.0.0.tgz#aa60743fcb37ebf6b069204eb4da304e40db45a1"
-  integrity sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    mdast-util-from-markdown "^2.0.0"
-    micromark-util-types "^2.0.0"
-    unified "^11.0.0"
-
 remark-slug@^6.0.0:
   version "6.1.0"
   resolved "https://registry.npmjs.org/remark-slug/-/remark-slug-6.1.0.tgz"
@@ -21616,15 +21131,6 @@ remark-slug@^6.0.0:
     mdast-util-to-string "^1.0.0"
     unist-util-visit "^2.0.0"
 
-remark-stringify@^11.0.0:
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/remark-stringify/-/remark-stringify-11.0.0.tgz#4c5b01dd711c269df1aaae11743eb7e2e7636fd3"
-  integrity sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==
-  dependencies:
-    "@types/mdast" "^4.0.0"
-    mdast-util-to-markdown "^2.0.0"
-    unified "^11.0.0"
-
 remedial@^1.0.7:
   version "1.0.8"
   resolved "https://registry.npmjs.org/remedial/-/remedial-1.0.8.tgz"
@@ -23845,11 +23351,6 @@ triple-beam@^1.3.0:
   resolved "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz"
   integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==
 
-trough@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/trough/-/trough-2.1.0.tgz"
-  integrity sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==
-
 ts-dedent@^2.0.0, ts-dedent@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz"
@@ -24288,19 +23789,6 @@ unicode-trie@^2.0.0:
     pako "^0.2.5"
     tiny-inflate "^1.0.0"
 
-unified@^11.0.0:
-  version "11.0.4"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-11.0.4.tgz#f4be0ac0fe4c88cb873687c07c64c49ed5969015"
-  integrity sha512-apMPnyLjAX+ty4OrNap7yumyVAMlKx5IWU2wlzzUdYJO9A8f1p9m/gywF/GM2ZDFcjQPrx59Mc90KwmxsoklxQ==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    bail "^2.0.0"
-    devlop "^1.0.0"
-    extend "^3.0.0"
-    is-plain-obj "^4.0.0"
-    trough "^2.0.0"
-    vfile "^6.0.0"
-
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"
@@ -24351,20 +23839,6 @@ unist-util-is@^4.0.0:
   resolved "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.1.0.tgz"
   integrity sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==
 
-unist-util-is@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-is/-/unist-util-is-6.0.0.tgz#b775956486aff107a9ded971d996c173374be424"
-  integrity sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==
-  dependencies:
-    "@types/unist" "^3.0.0"
-
-unist-util-stringify-position@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz#449c6e21a880e0855bf5aabadeb3a740314abac2"
-  integrity sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==
-  dependencies:
-    "@types/unist" "^3.0.0"
-
 unist-util-visit-parents@^3.0.0:
   version "3.1.1"
   resolved "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz"
@@ -24373,14 +23847,6 @@ unist-util-visit-parents@^3.0.0:
     "@types/unist" "^2.0.0"
     unist-util-is "^4.0.0"
 
-unist-util-visit-parents@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz#4d5f85755c3b8f0dc69e21eca5d6d82d22162815"
-  integrity sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-is "^6.0.0"
-
 unist-util-visit@^2.0.0:
   version "2.0.3"
   resolved "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz"
@@ -24390,15 +23856,6 @@ unist-util-visit@^2.0.0:
     unist-util-is "^4.0.0"
     unist-util-visit-parents "^3.0.0"
 
-unist-util-visit@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/unist-util-visit/-/unist-util-visit-5.0.0.tgz#a7de1f31f72ffd3519ea71814cccf5fd6a9217d6"
-  integrity sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-is "^6.0.0"
-    unist-util-visit-parents "^6.0.0"
-
 universal-user-agent@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz"
@@ -24682,23 +24139,6 @@ vary@~1.1.2:
   resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
   integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
-vfile-message@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/vfile-message/-/vfile-message-4.0.2.tgz#c883c9f677c72c166362fd635f21fc165a7d1181"
-  integrity sha512-jRDZ1IMLttGj41KcZvlrYAaI3CfqpLpfpf+Mfig13viT6NKvRzWZ+lXz0Y5D60w6uJIBAOGq9mSHf0gktF0duw==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-stringify-position "^4.0.0"
-
-vfile@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/vfile/-/vfile-6.0.1.tgz#1e8327f41eac91947d4fe9d237a2dd9209762536"
-  integrity sha512-1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==
-  dependencies:
-    "@types/unist" "^3.0.0"
-    unist-util-stringify-position "^4.0.0"
-    vfile-message "^4.0.0"
-
 victory-vendor@^36.6.8:
   version "36.6.11"
   resolved "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.6.11.tgz"
@@ -25734,8 +25174,3 @@ zod@^3.17.3:
   version "3.23.0"
   resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.0.tgz#a25dab5052702834233e0041e9dd8b6a8480e744"
   integrity sha512-OFLT+LTocvabn6q76BTwVB0hExEBS0IduTr3cqZyMqEDbOnYmcU+y0tUAYbND4uwclpBGi4I4UUBGzylWpjLGA==
-
-zwitch@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz"
-  integrity sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==

From f6d449c29cb9656174a25eeb38d1888aa2c38f2e Mon Sep 17 00:00:00 2001
From: Anamul Haque <anamul1414@gmail.com>
Date: Mon, 1 Jul 2024 16:44:15 +0600
Subject: [PATCH 074/108] fix: system crash in the 'Registration by Status'
 section under Performance (#7129)

* requested correction status added

* mapped with RegStatus

* removed statusmapping from utils

* removed optonal chaining for labelDescriptor
---
 .../SysAdmin/Performance/PerformanceHome.tsx  |  2 +-
 .../SysAdmin/Performance/WorkflowStatus.tsx   | 31 +++++-----
 .../StatusWiseDeclarationCountView.tsx        | 11 ++--
 .../src/views/SysAdmin/Performance/utils.tsx  | 58 -------------------
 4 files changed, 25 insertions(+), 77 deletions(-)

diff --git a/packages/client/src/views/SysAdmin/Performance/PerformanceHome.tsx b/packages/client/src/views/SysAdmin/Performance/PerformanceHome.tsx
index ca44f33c59d..175e76e26b2 100644
--- a/packages/client/src/views/SysAdmin/Performance/PerformanceHome.tsx
+++ b/packages/client/src/views/SysAdmin/Performance/PerformanceHome.tsx
@@ -50,13 +50,13 @@ import { GET_TOTAL_PAYMENTS } from '@client/views/SysAdmin/Performance/queries'
 import { PaymentsAmountComponent } from '@client/views/SysAdmin/Performance/PaymentsAmountComponent'
 import { CertificationRatesReport } from '@client/views/SysAdmin/Performance/CertificationRatesReport'
 import {
-  StatusMapping,
   getAdditionalLocations,
   CompletenessRateTime,
   isCountry,
   NATIONAL_ADMINISTRATIVE_LEVEL,
   calculateTotal
 } from '@client/views/SysAdmin/Performance/utils'
+import { StatusMapping } from './WorkflowStatus'
 import { constantsMessages } from '@client/i18n/messages/constants'
 import { CorrectionsReport } from '@client/views/SysAdmin/Performance/CorrectionsReport'
 import { AppSources } from './ApplicationSourcesReport'
diff --git a/packages/client/src/views/SysAdmin/Performance/WorkflowStatus.tsx b/packages/client/src/views/SysAdmin/Performance/WorkflowStatus.tsx
index 95aa1ebd909..79c75d4080a 100644
--- a/packages/client/src/views/SysAdmin/Performance/WorkflowStatus.tsx
+++ b/packages/client/src/views/SysAdmin/Performance/WorkflowStatus.tsx
@@ -12,7 +12,7 @@ import { GenericErrorToast } from '@client/components/GenericErrorToast'
 import { LocationPicker } from '@client/components/LocationPicker'
 import { Query } from '@client/components/Query'
 import { formatTimeDuration } from '@client/DateUtils'
-import { Event } from '@client/utils/gateway'
+import { Event, RegStatus } from '@client/utils/gateway'
 import { getStatusWiseWQTab } from '@client/views/OfficeHome/utils'
 import {
   constantsMessages,
@@ -121,42 +121,45 @@ const INITIAL_SORT_MAP = {
 }
 
 export const StatusMapping: IStatusMapping = {
-  IN_PROGRESS: {
+  [RegStatus.InProgress]: {
     labelDescriptor: statusMessages.inProgress,
     color: colors.purple
   },
-  DECLARED: {
+  [RegStatus.Declared]: {
     labelDescriptor: statusMessages.readyForReview,
     color: colors.orange
   },
-  REJECTED: {
+  [RegStatus.Rejected]: {
     labelDescriptor: statusMessages.sentForUpdates,
     color: colors.red
   },
-  VALIDATED: {
+  [RegStatus.Validated]: {
     labelDescriptor: statusMessages.sentForApprovals,
     color: colors.grey300
   },
-  WAITING_VALIDATION: {
+  [RegStatus.WaitingValidation]: {
     labelDescriptor: statusMessages.sentForExternalValidation,
     color: colors.grey500
   },
-  REGISTERED: {
+  [RegStatus.Registered]: {
     labelDescriptor: statusMessages.readyToPrint,
     color: colors.green
   },
-  CERTIFIED: {
+  [RegStatus.Certified]: {
     labelDescriptor: statusMessages.certified,
     color: colors.blue
   },
-
-  ARCHIVED: {
+  [RegStatus.Archived]: {
     labelDescriptor: statusMessages.archived,
     color: colors.blue
   },
-  ISSUED: {
+  [RegStatus.Issued]: {
     labelDescriptor: statusMessages.issued,
     color: colors.blue
+  },
+  [RegStatus.CorrectionRequested]: {
+    labelDescriptor: statusMessages.requestedCorrection,
+    color: colors.blue
   }
 }
 
@@ -529,7 +532,9 @@ function WorkflowStatusComponent(props: WorkflowStatusProps) {
             (eventProgress.registration &&
               eventProgress.registration.status &&
               intl.formatMessage(
-                StatusMapping[eventProgress.registration.status].labelDescriptor
+                StatusMapping[
+                  eventProgress.registration.status as keyof IStatusMapping
+                ].labelDescriptor
               )) ||
             ''
 
@@ -759,7 +764,7 @@ function WorkflowStatusComponent(props: WorkflowStatusProps) {
                   locationId,
                   new Date(timeStart),
                   new Date(timeEnd),
-                  value,
+                  value as keyof IStatusMapping,
                   event
                 )
               }}
diff --git a/packages/client/src/views/SysAdmin/Performance/reports/operational/StatusWiseDeclarationCountView.tsx b/packages/client/src/views/SysAdmin/Performance/reports/operational/StatusWiseDeclarationCountView.tsx
index 58af4407b2b..14f0b6b7c24 100644
--- a/packages/client/src/views/SysAdmin/Performance/reports/operational/StatusWiseDeclarationCountView.tsx
+++ b/packages/client/src/views/SysAdmin/Performance/reports/operational/StatusWiseDeclarationCountView.tsx
@@ -9,6 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import { messages as performanceMessages } from '@client/i18n/messages/views/performance'
+import { RegStatus } from '@client/utils/gateway'
 
 import {
   Description,
@@ -28,8 +29,8 @@ import { Event } from '@client/utils/gateway'
 
 type Props = WrappedComponentProps & BaseProps
 
-export interface IStatusMapping {
-  [status: string]: { labelDescriptor: MessageDescriptor; color: string }
+export type IStatusMapping = {
+  [status in Exclude<RegStatus, RegStatus.DeclarationUpdated>]: { labelDescriptor: MessageDescriptor; color: string }
 }
 
 interface BaseProps {
@@ -76,13 +77,13 @@ class StatusWiseDeclarationCountViewComponent extends React.Component<
                   <ProgressBar
                     id={`${statusCount.status.toLowerCase()}-${index}`}
                     title={intl.formatMessage(
-                      statusMapping![statusCount.status].labelDescriptor
+                      statusMapping![statusCount.status as keyof IStatusMapping].labelDescriptor
                     )}
-                    color={statusMapping![statusCount.status].color}
+                    color={statusMapping![statusCount?.status as keyof IStatusMapping].color}
                     totalPoints={total}
                     disabled={!isAccessibleOffice}
                     onClick={() =>
-                      this.props.onClickStatusDetails(statusCount.status)
+                      this.props.onClickStatusDetails(statusCount.status as keyof IStatusMapping)
                     }
                     currentPoints={statusCount.count}
                   />
diff --git a/packages/client/src/views/SysAdmin/Performance/utils.tsx b/packages/client/src/views/SysAdmin/Performance/utils.tsx
index 2ecc3e1747e..0fc49aff693 100644
--- a/packages/client/src/views/SysAdmin/Performance/utils.tsx
+++ b/packages/client/src/views/SysAdmin/Performance/utils.tsx
@@ -26,9 +26,6 @@ import { FormattedNumber, IntlShape } from 'react-intl'
 import { ISearchLocation } from '@opencrvs/components/lib/LocationSearch'
 import { ListViewSimplified } from '@opencrvs/components/lib/ListViewSimplified'
 import { constantsMessages } from '@client/i18n/messages'
-import { messages as statusMessages } from '@client/i18n/messages/views/registrarHome'
-import { colors } from '@opencrvs/components/lib/colors'
-import { IStatusMapping } from './reports/operational/StatusWiseDeclarationCountView'
 import {
   PERFORMANCE_METRICS,
   PERFORMANCE_STATS,
@@ -259,61 +256,6 @@ export function isCountry(location: ISearchLocation) {
   return location.id === NATIONAL_ADMINISTRATIVE_LEVEL
 }
 
-export const StatusMapping: IStatusMapping = {
-  IN_PROGRESS: {
-    labelDescriptor: statusMessages.inProgress,
-    color: colors.purple
-  },
-  DECLARED: {
-    labelDescriptor: statusMessages.readyForReview,
-    color: colors.orange
-  },
-  REJECTED: {
-    labelDescriptor: statusMessages.sentForUpdates,
-    color: colors.red
-  },
-  VALIDATED: {
-    labelDescriptor: statusMessages.sentForApprovals,
-    color: colors.grey300
-  },
-  WAITING_VALIDATION: {
-    labelDescriptor: statusMessages.sentForExternalValidation,
-    color: colors.grey500
-  },
-  REGISTERED: {
-    labelDescriptor: statusMessages.readyToPrint,
-    color: colors.green
-  },
-  CERTIFIED: {
-    labelDescriptor: statusMessages.certified,
-    color: colors.blue
-  },
-  REQUESTED_CORRECTION: {
-    labelDescriptor: statusMessages.requestedCorrection,
-    color: colors.blue
-  },
-  CORRECTED: {
-    labelDescriptor: statusMessages.requestedCorrection,
-    color: colors.blue
-  },
-  APPROVED_CORRECTION: {
-    labelDescriptor: statusMessages.requestedCorrection,
-    color: colors.blue
-  },
-  REJECTED_CORRECTION: {
-    labelDescriptor: statusMessages.requestedCorrection,
-    color: colors.blue
-  },
-  ARCHIVED: {
-    labelDescriptor: statusMessages.archived,
-    color: colors.blue
-  },
-  MARKED_AS_DUPLICATE: {
-    labelDescriptor: statusMessages.archived,
-    color: colors.blue
-  }
-}
-
 export const mockPerformanceMetricsRequest = {
   request: {
     query: PERFORMANCE_METRICS,

From 7e14b136500a09fbcb23375a593bdacdf7e30fb5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 13:49:58 +0300
Subject: [PATCH 075/108] fix(v1.5.0): date of certification not being visible
 on death #7290 (#7292)

* fix: date of certification not being visible on death (#7290)

* fix: improve type safety and fix the problems arised

* fix: remove unnecessary null check

* fix: generate gateway types for 1.5

---------

Co-authored-by: Pyry Rouvila <pyry@opencrvs.org>
Co-authored-by: naftis <pyry.rouvila@gmail.com>
---
 packages/client/src/utils/gateway.ts          |  5 ++-
 .../VerifyCertificatePage.tsx                 | 37 ++++++++-----------
 .../useVerificationRecordDetails.ts           |  9 ++++-
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/packages/client/src/utils/gateway.ts b/packages/client/src/utils/gateway.ts
index 04fe091d432..6cd1b66da3f 100644
--- a/packages/client/src/utils/gateway.ts
+++ b/packages/client/src/utils/gateway.ts
@@ -5246,7 +5246,6 @@ export type FetchMarriageRegistrationForReviewQuery = {
       __typename?: 'History'
       otherReason?: string | null
       requester?: string | null
-      requesterOther?: string | null
       hasShowedVerifiedDocument?: boolean | null
       noSupportingDocumentationRequired?: boolean | null
       date?: any | null
@@ -5606,7 +5605,6 @@ export type FetchMarriageRegistrationForCertificateQuery = {
       __typename?: 'History'
       otherReason?: string | null
       requester?: string | null
-      requesterOther?: string | null
       hasShowedVerifiedDocument?: boolean | null
       date?: any | null
       action?: RegAction | null
@@ -8576,6 +8574,7 @@ export type FetchRecordDetailsForVerificationQuery = {
             state?: string | null
             city?: string | null
             country?: string | null
+            line?: Array<string | null> | null
           } | null
         } | null
         registration?: {
@@ -8588,6 +8587,7 @@ export type FetchRecordDetailsForVerificationQuery = {
           __typename?: 'History'
           action?: RegAction | null
           regStatus?: RegStatus | null
+          date?: any | null
           user?: {
             __typename?: 'User'
             name: Array<{
@@ -8644,6 +8644,7 @@ export type FetchRecordDetailsForVerificationQuery = {
           __typename?: 'History'
           action?: RegAction | null
           regStatus?: RegStatus | null
+          date?: any | null
           user?: {
             __typename?: 'User'
             name: Array<{
diff --git a/packages/client/src/views/VerifyCertificate/VerifyCertificatePage.tsx b/packages/client/src/views/VerifyCertificate/VerifyCertificatePage.tsx
index 19e3207caa7..a570d2ee204 100644
--- a/packages/client/src/views/VerifyCertificate/VerifyCertificatePage.tsx
+++ b/packages/client/src/views/VerifyCertificate/VerifyCertificatePage.tsx
@@ -38,8 +38,6 @@ import formatDate, { formatPlainDate } from '@client/utils/date-formatting'
 import {
   BirthRegistration,
   DeathRegistration,
-  History,
-  RecordDetails,
   RegistrationType,
   RegStatus
 } from '@client/utils/gateway'
@@ -47,9 +45,11 @@ import { useTimeout } from '@client/hooks/useTimeout'
 import { goToHome } from '@client/navigation'
 import { EMPTY_STRING } from '@client/utils/constants'
 import { compact } from 'lodash'
-import { useVerificationRecordDetails } from './useVerificationRecordDetails'
+import {
+  RegistrationToBeVerified,
+  useVerificationRecordDetails
+} from './useVerificationRecordDetails'
 import { generateFullAddress } from '@client/utils/locationUtils'
-import { SUBMISSION_STATUS } from '@client/declarations'
 
 const Container = styled.div<{ size: string; checking: boolean }>`
   position: relative;
@@ -165,13 +165,13 @@ const TimeOutState = () => {
 }
 
 const isBirthRegistration = (
-  data: RecordDetails
+  data: RegistrationToBeVerified
 ): data is BirthRegistration => {
   return data.registration?.type === RegistrationType.Birth
 }
 
 const isDeathRegistration = (
-  data: RecordDetails
+  data: RegistrationToBeVerified
 ): data is DeathRegistration => {
   return data.registration?.type === RegistrationType.Death
 }
@@ -212,7 +212,7 @@ export function VerifyCertificatePage() {
     blank?.close()
   }
 
-  const getFullName = (data: RecordDetails) => {
+  const getFullName = (data: RegistrationToBeVerified) => {
     if (isBirthRegistration(data)) {
       return (
         data.child?.name?.[0]?.firstNames +
@@ -221,7 +221,7 @@ export function VerifyCertificatePage() {
       )
     }
 
-    if (data.registration?.type === RegistrationType.Death) {
+    if (isDeathRegistration(data)) {
       return (
         data.deceased?.name?.[0]?.firstNames +
         ' ' +
@@ -230,7 +230,7 @@ export function VerifyCertificatePage() {
     }
   }
 
-  const getDateOfBirthOrOfDeceased = (data: RecordDetails) => {
+  const getDateOfBirthOrOfDeceased = (data: RegistrationToBeVerified) => {
     if (isBirthRegistration(data) && data.child?.birthDate) {
       return formatPlainDate(data.child.birthDate)
     }
@@ -240,23 +240,19 @@ export function VerifyCertificatePage() {
     return undefined
   }
 
-  const getGender = (data: RecordDetails) => {
+  const getGender = (data: RegistrationToBeVerified) => {
     if (isBirthRegistration(data)) return data.child?.gender
     if (isDeathRegistration(data)) return data.deceased?.gender
   }
 
-  const getLastCertifiedDate = (data: RecordDetails) => {
+  const getLastCertifiedDate = (data: RegistrationToBeVerified) => {
     // find first certified action from history sorted in ascending order by time
-    return (
-      data.history &&
-      data.history.find(
-        (item) => item?.regStatus?.toString() === SUBMISSION_STATUS.CERTIFIED
-      )
-    )?.date
+    return data.history?.find((item) => item?.regStatus === RegStatus.Certified)
+      ?.date
   }
 
   // This function currently supports upto two location levels
-  const getLocation = (data: RecordDetails) => {
+  const getLocation = (data: RegistrationToBeVerified) => {
     const location = data.eventLocation
 
     if (location?.type === 'HEALTH_FACILITY') {
@@ -289,10 +285,9 @@ export function VerifyCertificatePage() {
       .join(', ')
   }
 
-  const getRegistarData = (data: RecordDetails) => {
+  const getRegistarData = (data: RegistrationToBeVerified) => {
     const history = compact(data.history).find(
-      ({ action, regStatus }: History) =>
-        !action && regStatus === RegStatus.Registered
+      ({ action, regStatus }) => !action && regStatus === RegStatus.Registered
     )
 
     return {
diff --git a/packages/client/src/views/VerifyCertificate/useVerificationRecordDetails.ts b/packages/client/src/views/VerifyCertificate/useVerificationRecordDetails.ts
index eeb211f80c6..05d7823423e 100644
--- a/packages/client/src/views/VerifyCertificate/useVerificationRecordDetails.ts
+++ b/packages/client/src/views/VerifyCertificate/useVerificationRecordDetails.ts
@@ -10,7 +10,7 @@
  */
 
 import { gql, useQuery } from '@apollo/client'
-import { Query } from '@client/utils/gateway'
+import { FetchRecordDetailsForVerificationQuery } from '@client/utils/gateway'
 import { useParams } from 'react-router'
 
 const FETCH_RECORD_DETAILS_FOR_VERIFICATION = gql`
@@ -94,6 +94,7 @@ const FETCH_RECORD_DETAILS_FOR_VERIFICATION = gql`
         history {
           action
           regStatus
+          date
           user {
             name {
               firstNames
@@ -115,7 +116,7 @@ export const useVerificationRecordDetails = () => {
     loading,
     error,
     data: queryData
-  } = useQuery<Pick<Query, 'fetchRecordDetailsForVerification'>>(
+  } = useQuery<FetchRecordDetailsForVerificationQuery>(
     FETCH_RECORD_DETAILS_FOR_VERIFICATION,
     {
       variables: { id: declarationId },
@@ -126,3 +127,7 @@ export const useVerificationRecordDetails = () => {
 
   return { loading, error, data }
 }
+
+export type RegistrationToBeVerified = NonNullable<
+  FetchRecordDetailsForVerificationQuery['fetchRecordDetailsForVerification']
+>

From 57b4c5cba053f1f311d1c43194c44401677e876b Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <32668488+Nil20@users.noreply.github.com>
Date: Mon, 1 Jul 2024 17:42:03 +0600
Subject: [PATCH 076/108] fix: workflow status' informant information (#7142)

* chore: move reusable func to commons

* fix: save informant type in search

* fix: return search result contact information

* fix: amend messages for other informant type and spouse

* fix: put email in ui and make new line visible in table
---
 packages/client/src/i18n/messages/form.ts     |  5 +++
 .../i18n/messages/views/selectInformant.ts    |  6 ----
 .../SysAdmin/Performance/WorkflowStatus.tsx   | 31 +++++++++----------
 .../src/views/SysAdmin/Performance/queries.ts |  1 +
 packages/commons/src/fhir/index.ts            | 15 +++++++++
 packages/components/src/Table/Table.tsx       |  1 +
 .../src/features/search/type-resolvers.ts     | 14 +++++++++
 .../features/registration/birth/service.ts    | 11 +++++--
 .../features/registration/death/service.ts    | 11 +++++--
 .../features/registration/marriage/service.ts | 11 +++++--
 .../workflow/src/records/handler/update.ts    | 19 +-----------
 11 files changed, 75 insertions(+), 50 deletions(-)

diff --git a/packages/client/src/i18n/messages/form.ts b/packages/client/src/i18n/messages/form.ts
index f454c5a3545..63d655dc2bc 100644
--- a/packages/client/src/i18n/messages/form.ts
+++ b/packages/client/src/i18n/messages/form.ts
@@ -425,6 +425,11 @@ export const formMessageDescriptors = {
     description: 'Label for option Sister',
     id: 'form.field.label.informantRelation.sister'
   },
+  spouse: {
+    defaultMessage: 'Spouse',
+    description: 'Label for option Spouse',
+    id: 'form.field.label.informantRelation.spouse'
+  },
   userFormTitle: {
     defaultMessage: 'Create new user',
     description: 'The title of user form',
diff --git a/packages/client/src/i18n/messages/views/selectInformant.ts b/packages/client/src/i18n/messages/views/selectInformant.ts
index b522dcd2e8a..74348cd2f37 100644
--- a/packages/client/src/i18n/messages/views/selectInformant.ts
+++ b/packages/client/src/i18n/messages/views/selectInformant.ts
@@ -24,7 +24,6 @@ interface IFormMessages
   SISTER: MessageDescriptor
   LEGAL_GUARDIAN: MessageDescriptor
   informantError: MessageDescriptor
-  SPOUSE: MessageDescriptor
   SON: MessageDescriptor
   OTHER: MessageDescriptor
   SON_IN_LAW: MessageDescriptor
@@ -136,11 +135,6 @@ const messagesToDefine: IFormMessages = {
     description: 'Who is applying for marriage registration',
     id: 'register.selectInformant.marriageInformantTitle'
   },
-  SPOUSE: {
-    defaultMessage: 'Spouse',
-    description: 'Label for option Spouse',
-    id: 'form.field.label.informantRelation.spouse'
-  },
   SON: {
     defaultMessage: 'Son',
     description: 'Label for option Son',
diff --git a/packages/client/src/views/SysAdmin/Performance/WorkflowStatus.tsx b/packages/client/src/views/SysAdmin/Performance/WorkflowStatus.tsx
index 79c75d4080a..91b28f73d7d 100644
--- a/packages/client/src/views/SysAdmin/Performance/WorkflowStatus.tsx
+++ b/packages/client/src/views/SysAdmin/Performance/WorkflowStatus.tsx
@@ -17,8 +17,7 @@ import { getStatusWiseWQTab } from '@client/views/OfficeHome/utils'
 import {
   constantsMessages,
   dynamicConstantsMessages,
-  formMessages,
-  userMessages
+  formMessages
 } from '@client/i18n/messages'
 import { messages } from '@client/i18n/messages/views/performance'
 import {
@@ -67,14 +66,6 @@ import { Pagination } from '@opencrvs/components/lib/Pagination'
 import { getUserRole } from '@client/views/SysAdmin/Config/UserRoles/utils'
 import { getLanguage } from '@client/i18n/selectors'
 
-type IDispatchProps = {
-  goToSearchResult: typeof goToSearchResult
-}
-
-interface IBasePrintTabProps {
-  goToDeclarationRecordAudit: typeof goToDeclarationRecordAudit
-}
-
 const ToolTipContainer = styled.span`
   text-align: center;
 `
@@ -181,12 +172,13 @@ const PrimaryContactLabelMapping = {
   MOTHER: formMessages.contactDetailsMother,
   FATHER: formMessages.contactDetailsFather,
   INFORMANT: formMessages.contactDetailsInformant,
-  OTHER_FAMILY_MEMBER: formMessages.otherFamilyMember,
+  OTHER: formMessages.otherFamilyMember,
   LEGAL_GUARDIAN: formMessages.legalGuardian,
   GRANDMOTHER: formMessages.grandmother,
   GRANDFATHER: formMessages.grandfather,
   BROTHER: formMessages.brother,
-  SISTER: formMessages.sister
+  SISTER: formMessages.sister,
+  SPOUSE: formMessages.spouse
 }
 
 type PrimaryContact = keyof typeof PrimaryContactLabelMapping
@@ -603,11 +595,16 @@ function WorkflowStatusComponent(props: WorkflowStatusProps) {
             nameLocal,
             informant:
               (eventProgress.registration &&
-                ((eventProgress.registration.contactRelationship &&
-                  conditioanllyFormatContactRelationship(
-                    eventProgress.registration.contactRelationship
-                  ) + ' ') ||
-                  '') + (eventProgress.registration.contactNumber || '')) ||
+                [
+                  eventProgress.registration.contactRelationship &&
+                    conditioanllyFormatContactRelationship(
+                      eventProgress.registration.contactRelationship
+                    ),
+                  eventProgress.registration.contactNumber,
+                  eventProgress.registration.contactEmail
+                ]
+                  .filter(Boolean)
+                  .join('\n')) ||
               '',
             declarationStartedOn: formateDateWithRelationalText(
               eventProgress.startedAt
diff --git a/packages/client/src/views/SysAdmin/Performance/queries.ts b/packages/client/src/views/SysAdmin/Performance/queries.ts
index fc0f84b3705..8bad0574eb3 100644
--- a/packages/client/src/views/SysAdmin/Performance/queries.ts
+++ b/packages/client/src/views/SysAdmin/Performance/queries.ts
@@ -100,6 +100,7 @@ export const FETCH_EVENTS_WITH_PROGRESS = gql`
           status
           contactNumber
           contactRelationship
+          contactEmail
           dateOfDeclaration
           trackingId
           registrationNumber
diff --git a/packages/commons/src/fhir/index.ts b/packages/commons/src/fhir/index.ts
index 7f63ce61a75..31ba091c9ea 100644
--- a/packages/commons/src/fhir/index.ts
+++ b/packages/commons/src/fhir/index.ts
@@ -446,3 +446,18 @@ export function toHistoryResource<T extends Saved<Resource>>(resource: T) {
     : never
 }
 export { updateFHIRBundle, buildFHIRBundle } from './transformers'
+
+export function getInformantType(record: ValidRecord) {
+  const compositionSection = findCompositionSection(
+    'informant-details',
+    getComposition(record)
+  )
+  if (!compositionSection) return undefined
+  const personSectionEntry = compositionSection.entry[0]
+  const personEntry = findEntryFromBundle<RelatedPerson>(
+    record,
+    personSectionEntry.reference
+  )
+
+  return personEntry?.resource.relationship?.coding?.[0].code
+}
diff --git a/packages/components/src/Table/Table.tsx b/packages/components/src/Table/Table.tsx
index 8bcdfffa563..e6c4765b3ba 100644
--- a/packages/components/src/Table/Table.tsx
+++ b/packages/components/src/Table/Table.tsx
@@ -157,6 +157,7 @@ const ValueWrapper = styled.span<{
   text-align: ${({ alignment }) => (alignment ? alignment.toString() : 'left')};
   padding: 0 4px;
   align-self: center;
+  white-space: pre-wrap;
   ${({ color }) => color && `color: ${color};`}
 `
 const Error = styled.span`
diff --git a/packages/gateway/src/features/search/type-resolvers.ts b/packages/gateway/src/features/search/type-resolvers.ts
index 1eba092ca65..4f61be4f2e4 100644
--- a/packages/gateway/src/features/search/type-resolvers.ts
+++ b/packages/gateway/src/features/search/type-resolvers.ts
@@ -26,6 +26,11 @@ interface ISearchEventDataTemplate {
 }
 interface ISearchDataTemplate {
   [key: string]: any
+  compositionId: string
+  informantType?: string
+  contactNumber?: string
+  contactEmail?: string
+  eventLocationId?: string
 }
 
 interface IAssignment {
@@ -326,6 +331,15 @@ export const searchTypeResolvers: GQLResolver = {
     },
     duplicates(searchData: ISearchDataTemplate) {
       return searchData.relatesTo
+    },
+    contactRelationship(searchData: ISearchDataTemplate) {
+      return searchData.informantType
+    },
+    contactNumber(searchData: ISearchDataTemplate) {
+      return searchData.contactNumber
+    },
+    contactEmail(searchData: ISearchDataTemplate) {
+      return searchData.contactEmail
     }
   },
   OperationHistorySearchSet: {
diff --git a/packages/search/src/features/registration/birth/service.ts b/packages/search/src/features/registration/birth/service.ts
index 341b7844b96..7e74f17863a 100644
--- a/packages/search/src/features/registration/birth/service.ts
+++ b/packages/search/src/features/registration/birth/service.ts
@@ -38,14 +38,15 @@ import { getSubmittedIdentifier } from '@search/features/search/utils'
 import {
   getComposition,
   SavedComposition,
-  ValidRecord,
   SavedBundle,
   Patient,
   getFromBundleById,
   getTaskFromSavedBundle,
   SavedTask,
   resourceIdentifierToUUID,
-  SavedRelatedPerson
+  SavedRelatedPerson,
+  getInformantType,
+  ValidRecord
 } from '@opencrvs/commons/types'
 
 const MOTHER_CODE = 'mother-details'
@@ -309,10 +310,14 @@ async function createDeclarationIndex(
       (code) => code.system === 'http://opencrvs.org/doc-types'
     )
 
-  body.informantType =
+  const otherInformantType =
     (contactPersonRelationshipExtention &&
       contactPersonRelationshipExtention.valueString) ||
     (contactPersonExtention && contactPersonExtention.valueString)
+
+  const informantType = getInformantType(bundle as ValidRecord)
+
+  body.informantType = informantType || otherInformantType
   body.contactNumber =
     contactNumberExtension && contactNumberExtension.valueString
   body.contactEmail = emailExtension && emailExtension.valueString
diff --git a/packages/search/src/features/registration/death/service.ts b/packages/search/src/features/registration/death/service.ts
index b3bf035d24b..ac83be78003 100644
--- a/packages/search/src/features/registration/death/service.ts
+++ b/packages/search/src/features/registration/death/service.ts
@@ -39,13 +39,14 @@ import { getSubmittedIdentifier } from '@search/features/search/utils'
 import {
   getComposition,
   SavedComposition,
-  ValidRecord,
   getFromBundleById,
   getTaskFromSavedBundle,
   Patient,
   SavedBundle,
   SavedRelatedPerson,
-  resourceIdentifierToUUID
+  resourceIdentifierToUUID,
+  getInformantType,
+  ValidRecord
 } from '@opencrvs/commons/types'
 
 const DECEASED_CODE = 'deceased-details'
@@ -316,10 +317,14 @@ async function createDeclarationIndex(
       (code) => code.system === 'http://opencrvs.org/doc-types'
     )
 
-  body.informantType =
+  const otherInformantType =
     (contactPersonRelationshipExtention &&
       contactPersonRelationshipExtention.valueString) ||
     (contactPersonExtention && contactPersonExtention.valueString)
+
+  const informantType = getInformantType(bundle as ValidRecord)
+
+  body.informantType = informantType || otherInformantType
   body.contactNumber =
     contactNumberExtension && contactNumberExtension.valueString
   body.contactEmail = emailExtension && emailExtension.valueString
diff --git a/packages/search/src/features/registration/marriage/service.ts b/packages/search/src/features/registration/marriage/service.ts
index 2df10dc3e48..eb33b2843aa 100644
--- a/packages/search/src/features/registration/marriage/service.ts
+++ b/packages/search/src/features/registration/marriage/service.ts
@@ -40,13 +40,14 @@ import { getSubmittedIdentifier } from '@search/features/search/utils'
 import {
   getComposition,
   SavedComposition,
-  ValidRecord,
   getFromBundleById,
   getTaskFromSavedBundle,
   Patient,
   SavedBundle,
   resourceIdentifierToUUID,
-  SavedRelatedPerson
+  SavedRelatedPerson,
+  getInformantType,
+  ValidRecord
 } from '@opencrvs/commons/types'
 
 const BRIDE_CODE = 'bride-details'
@@ -317,10 +318,14 @@ async function createDeclarationIndex(
       (code) => code.system === 'http://opencrvs.org/doc-types'
     )
 
-  body.informantType =
+  const otherInformantType =
     (contactPersonRelationshipExtention &&
       contactPersonRelationshipExtention.valueString) ||
     (contactPersonExtention && contactPersonExtention.valueString)
+
+  const informantType = getInformantType(bundle as ValidRecord)
+
+  body.informantType = informantType || otherInformantType
   body.contactNumber =
     contactNumberExtension && contactNumberExtension.valueString
   body.contactEmail = emailExtension && emailExtension.valueString
diff --git a/packages/workflow/src/records/handler/update.ts b/packages/workflow/src/records/handler/update.ts
index 718a507c3ed..7e689d92bd7 100644
--- a/packages/workflow/src/records/handler/update.ts
+++ b/packages/workflow/src/records/handler/update.ts
@@ -20,9 +20,7 @@ import {
   InProgressRecord,
   ReadyForReviewRecord,
   getComposition,
-  findCompositionSection,
-  findEntryFromBundle,
-  RelatedPerson
+  getInformantType
 } from '@opencrvs/commons/types'
 import { z } from 'zod'
 import { indexBundle } from '@workflow/records/search'
@@ -75,21 +73,6 @@ function filterInformantSectionFromComposition<
   }
 }
 
-function getInformantType(record: InProgressRecord | ReadyForReviewRecord) {
-  const compositionSection = findCompositionSection(
-    'informant-details',
-    getComposition(record)
-  )
-  if (!compositionSection) return undefined
-  const personSectionEntry = compositionSection.entry[0]
-  const personEntry = findEntryFromBundle<RelatedPerson>(
-    record,
-    personSectionEntry.reference
-  )
-
-  return personEntry?.resource.relationship?.coding?.[0].code
-}
-
 export const updateRoute = createRoute({
   method: 'POST',
   path: '/records/{recordId}/update',

From 617e073cafe1271a461011aeba05ee01d072032e Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <32668488+Nil20@users.noreply.github.com>
Date: Mon, 1 Jul 2024 20:10:02 +0600
Subject: [PATCH 077/108] feat: make assign/unassign more robust (#7280)

* fix: update assignment check for unassign declaration

* chore(workflow): check for assignment before unassign action

* fix: amend unassign handler and add comments

* chore(workflow): amend assignment check

* chore(gateway): filter consecutive assignment in history

* fix: remove delete declaration test

* chore: refactor task sorting function

* docs: amend changelog(#7035)

* fix: amend task function types

* chore: amend assignment check

* fix: amend task filter func type

* fix: update unassign test

* chore: remove unused util functions

* fix: revert filtering consecutive assignments of history

* chore: check a record is already assigned

* fix: copy find assignment func to release and update types

* fix: update review changes
---
 CHANGELOG.md                                  |  1 +
 .../interface/DownloadButton.test.tsx         |  7 --
 .../components/interface/DownloadButton.tsx   | 18 +----
 packages/commons/src/assignment.ts            | 80 +++++++++++++++++++
 packages/commons/src/authentication.ts        |  2 +-
 packages/commons/src/fhir/constants.ts        |  4 +
 packages/commons/src/fhir/extension.ts        | 27 ++++++-
 packages/commons/src/fhir/location.ts         | 39 +++++++++
 packages/commons/src/fhir/task.ts             | 13 +++
 packages/commons/src/index.ts                 |  1 +
 .../workflow/src/features/task/fhir/utils.ts  |  4 +-
 packages/workflow/src/features/user/utils.ts  | 59 +++++++++++---
 .../workflow/src/records/handler/download.ts  | 13 ++-
 .../src/records/handler/unassign.test.ts      |  7 ++
 .../workflow/src/records/handler/unassign.ts  | 18 +++++
 packages/workflow/src/records/user.ts         | 37 ++++++++-
 packages/workflow/src/test/utils.ts           |  2 +-
 .../workflow/test/mocks/unassignedTask.ts     | 42 ++++++++++
 packages/workflow/test/mocks/user.ts          | 29 +++++++
 19 files changed, 360 insertions(+), 43 deletions(-)
 create mode 100644 packages/commons/src/assignment.ts
 create mode 100644 packages/commons/src/fhir/location.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db62ba8d6d3..51e6cec52c5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -75,6 +75,7 @@
 - Fix address property handling and corrected country data transformation logic [#6989](https://github.com/opencrvs/opencrvs-core/issues/6989)
 - Fix search indexing BRN's in place of identifiers. Adds spouseIdentifier to search with [#7189](https://github.com/opencrvs/opencrvs-core/pull/7189)
 - Rename `farajaland-map.geojson` in dashboards to `map.geojson` to not tie opencrvs-core into a specific country implementation name [#7251](https://github.com/opencrvs/opencrvs-core/pull/7251)
+- Fix unassign action not appearing in audit history [#7035](https://github.com/opencrvs/opencrvs-core/pull/7072)
 
 ## Refactor
 
diff --git a/packages/client/src/components/interface/DownloadButton.test.tsx b/packages/client/src/components/interface/DownloadButton.test.tsx
index c53cd9bc8aa..597ade8466b 100644
--- a/packages/client/src/components/interface/DownloadButton.test.tsx
+++ b/packages/client/src/components/interface/DownloadButton.test.tsx
@@ -45,14 +45,12 @@ describe('download button tests', () => {
   let store: AppStore
   let history: History<unknown>
   let testComponent: ReactWrapper<{}, {}>
-  let deleteSpy: SpyInstance
   let unassignSpy: SpyInstance
   let client: ApolloClient<{}>
 
   describe('for download status downloaded', () => {
     describe('when assignment object is undefined in props', () => {
       beforeEach(async () => {
-        deleteSpy = vi.spyOn(declarationReducer, 'deleteDeclaration')
         const testStore = await createTestStore()
         store = testStore.store
         history = testStore.history
@@ -80,11 +78,6 @@ describe('download button tests', () => {
         const modal = getAssignmentModal(testComponent)
         expect(modal.text()).toContain('Unassign record?')
       })
-
-      it('clicking on unassign button triggers deleteDeclaration action', () => {
-        clickOnModalAction(testComponent, '#unassign')
-        expect(deleteSpy).toBeCalledWith('123', client)
-      })
     })
     describe('when assignment object is defined in props', () => {
       beforeEach(async () => {
diff --git a/packages/client/src/components/interface/DownloadButton.tsx b/packages/client/src/components/interface/DownloadButton.tsx
index 80f4a66725f..571a68ec0e6 100644
--- a/packages/client/src/components/interface/DownloadButton.tsx
+++ b/packages/client/src/components/interface/DownloadButton.tsx
@@ -220,8 +220,7 @@ function DownloadButtonComponent(props: DownloadButtonProps & HOCProps) {
     downloadDeclaration,
     userRole,
     userId,
-    unassignDeclaration,
-    deleteDeclaration
+    unassignDeclaration
   } = props
   const { assignment, compositionId } = downloadConfigs
   const [assignModal, setAssignModal] = useState<AssignModalOptions | null>(
@@ -238,18 +237,9 @@ function DownloadButtonComponent(props: DownloadButtonProps & HOCProps) {
   }, [downloadConfigs, client, downloadDeclaration])
   const hideModal = useCallback(() => setAssignModal(null), [])
   const unassign = useCallback(async () => {
-    if (assignment) {
-      unassignDeclaration(compositionId, client)
-    } else {
-      deleteDeclaration(compositionId, client)
-    }
-  }, [
-    compositionId,
-    client,
-    unassignDeclaration,
-    assignment,
-    deleteDeclaration
-  ])
+    unassignDeclaration(compositionId, client)
+  }, [compositionId, client, unassignDeclaration])
+
   const isFailed = useMemo(
     () =>
       status === DOWNLOAD_STATUS.FAILED ||
diff --git a/packages/commons/src/assignment.ts b/packages/commons/src/assignment.ts
new file mode 100644
index 00000000000..e62a54a377e
--- /dev/null
+++ b/packages/commons/src/assignment.ts
@@ -0,0 +1,80 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * OpenCRVS is also distributed under the terms of the Civil Registration
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
+ *
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
+ */
+
+import {
+  getTaskFromSavedBundle,
+  findTaskHistories,
+  sortTasksDescending,
+  getStatusFromTask,
+  findExtension,
+  UNASSIGNED_EXTENSION_URL,
+  ASSIGNED_EXTENSION_URL,
+  LAST_USER_EXTENSION_URL,
+  LAST_OFFICE_EXTENSION_URL,
+  resourceIdentifierToUUID,
+  findResourceFromBundleById,
+  SavedPractitioner,
+  SavedBundle
+} from './fhir'
+import { SavedOffice } from './fhir/location'
+
+export const findAssignment = <T extends SavedBundle>(bundle: T) => {
+  const task = getTaskFromSavedBundle(bundle)
+  const taskHistories = findTaskHistories(bundle, sortTasksDescending)
+
+  const allTasks = [task, ...taskHistories]
+  const latestStatus = getStatusFromTask(task)
+
+  for (const task of allTasks) {
+    // if the first task found is unassignment, it's sure that the bundle is unassigned
+    const isUnassigned = findExtension(UNASSIGNED_EXTENSION_URL, task.extension)
+
+    if (isUnassigned) {
+      return null
+    }
+
+    // if the status has changed before finding assignment, it's unassigned
+    if (latestStatus !== getStatusFromTask(task)) {
+      return null
+    }
+
+    // else.. if assignment is being found
+    const isAssigned = findExtension(ASSIGNED_EXTENSION_URL, task.extension)
+
+    if (!isAssigned) {
+      continue
+    }
+
+    const regLastUserExtension = findExtension(
+      LAST_USER_EXTENSION_URL,
+      task.extension
+    )
+    const regLastOfficeExtension = findExtension(
+      LAST_OFFICE_EXTENSION_URL,
+      task.extension
+    )
+    const practitionerId = resourceIdentifierToUUID(
+      regLastUserExtension!.valueReference.reference
+    )
+    const officeId = resourceIdentifierToUUID(
+      regLastOfficeExtension!.valueReference.reference
+    )
+    const practitioner = findResourceFromBundleById<SavedPractitioner>(
+      bundle,
+      practitionerId
+    )!
+    const office = findResourceFromBundleById<SavedOffice>(bundle, officeId)!
+
+    return { practitioner, office }
+  }
+
+  return null
+}
diff --git a/packages/commons/src/authentication.ts b/packages/commons/src/authentication.ts
index 0739673508d..8b0f09afa8f 100644
--- a/packages/commons/src/authentication.ts
+++ b/packages/commons/src/authentication.ts
@@ -85,7 +85,7 @@ export interface ITokenPayload {
   sub: string
   exp: string
   algorithm: string
-  scope: string[]
+  scope: Scope[]
 }
 
 export function hasScope(authHeader: IAuthHeader, scope: Scope) {
diff --git a/packages/commons/src/fhir/constants.ts b/packages/commons/src/fhir/constants.ts
index 30e66d54961..6e05de43fe2 100644
--- a/packages/commons/src/fhir/constants.ts
+++ b/packages/commons/src/fhir/constants.ts
@@ -51,3 +51,7 @@ export const DUPLICATE_TRACKING_ID =
   `${OPENCRVS_SPECIFICATION_URL}extension/duplicateTrackingId` as const
 export const FLAGGED_AS_POTENTIAL_DUPLICATE =
   `${OPENCRVS_SPECIFICATION_URL}extension/flaggedAsPotentialDuplicate` as const
+export const LAST_USER_EXTENSION_URL =
+  `${OPENCRVS_SPECIFICATION_URL}extension/regLastUser` as const
+export const LAST_OFFICE_EXTENSION_URL =
+  `${OPENCRVS_SPECIFICATION_URL}extension/regLastOffice` as const
diff --git a/packages/commons/src/fhir/extension.ts b/packages/commons/src/fhir/extension.ts
index 9948f03f220..35ca17f73a7 100644
--- a/packages/commons/src/fhir/extension.ts
+++ b/packages/commons/src/fhir/extension.ts
@@ -8,7 +8,14 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import { ResourceIdentifier, URNReference, Location } from '../fhir'
+
+import {
+  Address,
+  FhirResourceType,
+  URNReference,
+  WithStrictExtensions
+} from '.'
+import { UUID } from '..'
 
 export type StringExtensionType = {
   'http://opencrvs.org/specs/extension/makeCorrection': {
@@ -130,7 +137,7 @@ export type StringExtensionType = {
   }
   'http://opencrvs.org/specs/extension/regLastOffice': {
     url: 'http://opencrvs.org/specs/extension/regLastOffice'
-    valueReference: { reference: string }
+    valueReference: { reference: ResourceIdentifier }
     /**
      * Human readable office name
      */
@@ -272,3 +279,19 @@ export function findExtension<URL extends AllExtensions['url']>(
       extension.url === url
   )
 }
+
+export type Location = WithStrictExtensions<
+  Omit<fhir3.Location, 'address' | 'partOf'> & {
+    address?: Address
+    partOf?: {
+      reference: ResourceIdentifier
+    }
+  }
+>
+
+// Patient/${UUID}
+export type ResourceIdentifier<
+  Resource extends { resourceType: FhirResourceType } = {
+    resourceType: FhirResourceType
+  }
+> = `${Resource['resourceType']}/${UUID}`
diff --git a/packages/commons/src/fhir/location.ts b/packages/commons/src/fhir/location.ts
new file mode 100644
index 00000000000..d7fe32c07a3
--- /dev/null
+++ b/packages/commons/src/fhir/location.ts
@@ -0,0 +1,39 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * OpenCRVS is also distributed under the terms of the Civil Registration
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
+ *
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
+ */
+import { Address, ResourceIdentifier, WithStrictExtensions } from '.'
+import { UUID } from '..'
+
+export type Location = WithStrictExtensions<
+  Omit<fhir3.Location, 'address' | 'partOf'> & {
+    address?: Address
+    partOf?: {
+      reference: ResourceIdentifier
+    }
+  }
+>
+
+export type Office = Omit<Location, 'partOf' | 'type'> & {
+  type: {
+    coding: [
+      {
+        system: 'http://opencrvs.org/specs/location-type'
+        code: 'CRVS_OFFICE'
+      }
+    ]
+  }
+  partOf: {
+    reference: ResourceIdentifier
+  }
+}
+
+export type SavedOffice = Omit<Office, 'id'> & {
+  id: UUID
+}
diff --git a/packages/commons/src/fhir/task.ts b/packages/commons/src/fhir/task.ts
index 4daf8b022e0..cfab1692b50 100644
--- a/packages/commons/src/fhir/task.ts
+++ b/packages/commons/src/fhir/task.ts
@@ -215,6 +215,19 @@ export function sortTasksDescending(tasks: Task[]) {
   })
 }
 
+export const findTaskHistories = (
+  bundle: Bundle,
+  sort = sortTasksAscending
+) => {
+  return sort(
+    bundle.entry
+      .filter((entry): entry is BundleEntry<TaskHistory> =>
+        isTaskHistory(entry.resource)
+      )
+      .map(({ resource }) => resource)
+  )
+}
+
 export function addTaskToRecord<T extends Bundle>(
   bundle: T,
   resource: Resource
diff --git a/packages/commons/src/index.ts b/packages/commons/src/index.ts
index 491c5b6a8b8..1b518f68e36 100644
--- a/packages/commons/src/index.ts
+++ b/packages/commons/src/index.ts
@@ -13,3 +13,4 @@ export * from './uuid'
 export * from './documents'
 export * from './http'
 export * from './logger'
+export * from './assignment'
diff --git a/packages/workflow/src/features/task/fhir/utils.ts b/packages/workflow/src/features/task/fhir/utils.ts
index a15cbcaa0b6..660328d091b 100644
--- a/packages/workflow/src/features/task/fhir/utils.ts
+++ b/packages/workflow/src/features/task/fhir/utils.ts
@@ -9,7 +9,7 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 
-import { Composition, Task } from '@opencrvs/commons/types'
+import { Composition, Task, TaskHistory } from '@opencrvs/commons/types'
 import { RegStatus } from '@workflow/features/registration/fhir/constants'
 
 export function isRejectedTask(taskResource: Task) {
@@ -21,7 +21,7 @@ export function isArchiveTask(taskResource: Task) {
 }
 
 export function getTaskBusinessStatus(
-  taskResource: Task
+  taskResource: Task | TaskHistory
 ): RegStatus | undefined {
   return taskResource.businessStatus?.coding?.[0]?.code as RegStatus | undefined
 }
diff --git a/packages/workflow/src/features/user/utils.ts b/packages/workflow/src/features/user/utils.ts
index 778261c9245..09a2e4d2072 100644
--- a/packages/workflow/src/features/user/utils.ts
+++ b/packages/workflow/src/features/user/utils.ts
@@ -19,6 +19,11 @@ import {
 } from '@opencrvs/commons/types'
 import { UUID } from '@opencrvs/commons'
 
+type UserSearchCriteria = 'userId' | 'practitionerId' | 'mobile' | 'email'
+export type SearchCriteria = {
+  [K in UserSearchCriteria]?: string
+}
+
 export async function getUser(
   userId: string,
   authHeader: { Authorization: string }
@@ -96,7 +101,6 @@ export function getPrimaryLocationFromLocationList(
   if (!primaryLocationId) {
     throw new Error('No primary location found')
   }
-
   const location = locations.find((loc) => loc.id === primaryLocationId)
   if (!location) {
     throw new Error(
@@ -119,23 +123,58 @@ function getOfficeLocationFromLocationList(
       })
     }
   })
-
   if (!office) {
     throw new Error('No CRVS office found')
   }
   return office
 }
 
-export async function getLoggedInPractitionerLocations(
-  token: string
-): Promise<[fhir3.Location]> {
-  const practitionerResource = await getLoggedInPractitionerResource(token)
+export async function getUserByCriteria(
+  authHeader: { Authorization: string },
+  criteria: SearchCriteria
+) {
+  const res = await fetch(`${USER_MANAGEMENT_URL}getUser`, {
+    method: 'POST',
+    body: JSON.stringify(criteria),
+    headers: {
+      'Content-Type': 'application/json',
+      ...authHeader
+    }
+  })
+
+  if (!res.ok) {
+    throw new Error(
+      `Unable to retrieve user in workflow. Error: ${res.status} status received`
+    )
+  }
+
+  const body = await res.json()
+
+  return body
+}
 
-  if (!practitionerResource || !practitionerResource.id) {
-    throw new Error('Invalid practioner found')
+export async function getSystemByCriteria(
+  authHeader: { Authorization: string },
+  criteria: SearchCriteria
+) {
+  const res = await fetch(`${USER_MANAGEMENT_URL}getSystem`, {
+    method: 'POST',
+    body: JSON.stringify(criteria),
+    headers: {
+      'Content-Type': 'application/json',
+      ...authHeader
+    }
+  })
+
+  if (!res.ok) {
+    throw new Error(
+      `Unable to retrieve system in workflow. Error: ${res.status} status received`
+    )
   }
-  /* getting location list for practitioner */
-  return await getPractitionerLocations(practitionerResource.id)
+
+  const body = await res.json()
+
+  return body
 }
 
 export async function getLoggedInPractitionerResource(
diff --git a/packages/workflow/src/records/handler/download.ts b/packages/workflow/src/records/handler/download.ts
index 0017e5e8a51..90d41b78140 100644
--- a/packages/workflow/src/records/handler/download.ts
+++ b/packages/workflow/src/records/handler/download.ts
@@ -19,13 +19,13 @@ import * as z from 'zod'
 import { validateRequest } from '@workflow/utils/index'
 import { getValidRecordById } from '@workflow/records/index'
 import { getToken } from '@workflow/utils/auth-utils'
-import { IAuthHeader } from '@opencrvs/commons'
+import { IAuthHeader, logger, findAssignment } from '@opencrvs/commons'
 import { toDownloaded } from '@workflow/records/state-transitions'
 import { hasScope, inScope } from '@opencrvs/commons/authentication'
 import { sendBundleToHearth } from '@workflow/records/fhir'
 import { indexBundleToRoute } from '@workflow/records/search'
-import { logger } from '@opencrvs/commons'
 import { auditEvent } from '@workflow/records/audit'
+import { getUserOrSystem } from '@workflow/records/user'
 
 function getDownloadedOrAssignedExtension(
   authHeader: IAuthHeader,
@@ -55,6 +55,15 @@ export async function downloadRecordHandler(
   const token = getToken(request)
   // Task history is fetched rather than the task only
   const record = await getValidRecordById(payload.id, token, true)
+  const assignment = findAssignment(record)
+
+  if (assignment) {
+    const userOrSystem = await getUserOrSystem(token)
+    const practitionerId = userOrSystem.practitionerId
+
+    if (assignment.practitioner.id !== practitionerId)
+      throw new Error('Record is assigned to a different user')
+  }
 
   const task = getTaskFromSavedBundle(record)
   const businessStatus = getStatusFromTask(task)
diff --git a/packages/workflow/src/records/handler/unassign.test.ts b/packages/workflow/src/records/handler/unassign.test.ts
index c3620c4cffa..9a40b498415 100644
--- a/packages/workflow/src/records/handler/unassign.test.ts
+++ b/packages/workflow/src/records/handler/unassign.test.ts
@@ -16,6 +16,7 @@ import { rest } from 'msw'
 import { server as mswServer } from '@test/setupServer'
 import { bundleWithAssignedTask } from '@test/mocks/unassignedTask'
 import { getTaskFromSavedBundle, Task } from '@opencrvs/commons/types'
+import { registrar } from '@test/mocks/user'
 
 function checkForUnassignExtenstion(task: Task) {
   return task.extension.find(
@@ -63,6 +64,12 @@ describe('unassign record endpoint', () => {
       })
     )
 
+    mswServer.use(
+      rest.post('http://localhost:3030/getUser', (_, res, ctx) => {
+        return res(ctx.json(registrar))
+      })
+    )
+
     const res = await server.server.inject({
       method: 'POST',
       url: '/unassign-record',
diff --git a/packages/workflow/src/records/handler/unassign.ts b/packages/workflow/src/records/handler/unassign.ts
index 51db4e2a7e8..fde3404b6a4 100644
--- a/packages/workflow/src/records/handler/unassign.ts
+++ b/packages/workflow/src/records/handler/unassign.ts
@@ -17,6 +17,9 @@ import { toUnassigned } from '@workflow/records/state-transitions'
 import { indexBundleToRoute } from '@workflow/records/search'
 import { sendBundleToHearth } from '@workflow/records/fhir'
 import { auditEvent } from '@workflow/records/audit'
+import { getTokenPayload } from '@opencrvs/commons/authentication'
+import { getUserOrSystemByCriteria } from '@workflow/records/user'
+import { findAssignment } from '@opencrvs/commons'
 
 export async function unassignRecordHandler(
   request: Hapi.Request,
@@ -30,6 +33,7 @@ export async function unassignRecordHandler(
   )
 
   const token = getToken(request)
+  const tokenPayload = getTokenPayload(token)
   const record = await getRecordById(
     // Task history is fetched rather than the task only
     `${payload.id}?includeHistoryResources`,
@@ -45,6 +49,20 @@ export async function unassignRecordHandler(
     ]
   )
 
+  const assignment = findAssignment(record)
+  if (!assignment) throw new Error('The declaration is not assigned')
+
+  const practitionerId = assignment.practitioner.id
+  const lastUser = await getUserOrSystemByCriteria({ practitionerId }, token)
+
+  // Non-registrars can't unassign declarations from registrars
+  if (
+    !tokenPayload.scope.includes('register') &&
+    lastUser.scope?.includes('register')
+  ) {
+    throw new Error('The declaration cannot be unassigned by this type of user')
+  }
+
   const { unassignedRecord, unassignedRecordWithTaskOnly } = await toUnassigned(
     record,
     token
diff --git a/packages/workflow/src/records/user.ts b/packages/workflow/src/records/user.ts
index d0fd1b61171..3bb169eb792 100644
--- a/packages/workflow/src/records/user.ts
+++ b/packages/workflow/src/records/user.ts
@@ -9,8 +9,14 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 
-import { getTokenPayload } from '@opencrvs/commons/authentication'
-import { getSystem, getUser } from '@workflow/features/user/utils'
+import { getTokenPayload, Scope } from '@opencrvs/commons/authentication'
+import {
+  getSystem,
+  getSystemByCriteria,
+  getUser,
+  getUserByCriteria,
+  SearchCriteria
+} from '@workflow/features/user/utils'
 
 type Label = {
   lang: string
@@ -46,8 +52,8 @@ export interface IUserModelData {
   device: string
 }
 
-export interface ISystemModelData {
-  scope?: string[]
+interface ISystemModelData {
+  scope?: Scope[]
   name: string
   createdBy: string
   client_id: string
@@ -83,3 +89,26 @@ export async function getUserOrSystem(
     Authorization: `Bearer ${token}`
   })
 }
+
+export async function getUserOrSystemByCriteria(
+  criteria: SearchCriteria,
+  token: string
+) {
+  const user = await getUserByCriteria(
+    {
+      Authorization: `Bearer ${token}`
+    },
+    criteria
+  )
+
+  if (user) return user as IUserModelData
+
+  const system = await getSystemByCriteria(
+    {
+      Authorization: `Bearer ${token}`
+    },
+    criteria
+  )
+
+  return system as ISystemModelData
+}
diff --git a/packages/workflow/src/test/utils.ts b/packages/workflow/src/test/utils.ts
index f4d97f64e68..40c65b9fae7 100644
--- a/packages/workflow/src/test/utils.ts
+++ b/packages/workflow/src/test/utils.ts
@@ -239,7 +239,7 @@ export const testFhirBundle: StrictBundle<
           },
           {
             url: 'http://opencrvs.org/specs/extension/regLastOffice',
-            valueReference: { reference: '123' }
+            valueReference: { reference: 'Location/123' }
           },
           {
             url: 'http://opencrvs.org/specs/extension/regLastLocation',
diff --git a/packages/workflow/test/mocks/unassignedTask.ts b/packages/workflow/test/mocks/unassignedTask.ts
index fc7a30d4194..4cefeaaefe1 100644
--- a/packages/workflow/test/mocks/unassignedTask.ts
+++ b/packages/workflow/test/mocks/unassignedTask.ts
@@ -9,10 +9,14 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 
+import { READY_FOR_REVIEW_BIRTH_RECORD } from './records/readyForReview'
+
 export const bundleWithAssignedTask = {
   resourceType: 'Bundle',
   type: 'document',
   entry: [
+    // mock composition
+    READY_FOR_REVIEW_BIRTH_RECORD.entry[0],
     {
       resource: {
         resourceType: 'Task',
@@ -86,6 +90,44 @@ export const bundleWithAssignedTask = {
           versionId: '757f0e0e-2df4-4f8f-b4a4-065047bb35c0'
         }
       }
+    },
+    {
+      fullUrl:
+        '/fhir/Practitioner/f20ad76d-87c3-46ab-8fbc-0d104a5b3e69/_history/d98a5727-eb9b-41b8-9851-f9be7b8d0eec',
+      resource: {
+        resourceType: 'Practitioner',
+        identifier: [],
+        telecom: [
+          {
+            system: 'phone',
+            value: '0933333333'
+          },
+          {
+            system: 'email',
+            value: ''
+          }
+        ],
+        name: [
+          {
+            use: 'en',
+            family: 'Mweene',
+            given: ['Kennedy']
+          }
+        ],
+        meta: {
+          lastUpdated: '2024-06-06T10:45:05.773+00:00',
+          versionId: 'd98a5727-eb9b-41b8-9851-f9be7b8d0eec'
+        },
+        _transforms: {
+          meta: {
+            lastUpdated: '2024-06-06T10:45:05.773Z'
+          }
+        },
+        _request: {
+          method: 'POST'
+        },
+        id: 'f20ad76d-87c3-46ab-8fbc-0d104a5b3e69'
+      }
     }
   ]
 }
diff --git a/packages/workflow/test/mocks/user.ts b/packages/workflow/test/mocks/user.ts
index 601212dbb81..a5d7b1f51b3 100644
--- a/packages/workflow/test/mocks/user.ts
+++ b/packages/workflow/test/mocks/user.ts
@@ -56,3 +56,32 @@ export const user = {
   searches: [],
   __v: 0
 }
+
+export const registrar = {
+  _id: '66619331a6a4a835aa689dfd',
+  name: [
+    {
+      use: 'en',
+      given: ['Kennedy'],
+      family: 'Mweene'
+    }
+  ],
+  username: 'k.mweene',
+  identifiers: [],
+  email: '',
+  emailForNotification: 'kalushabwalya1.7@gmail.com',
+  mobile: '0933333333',
+  passwordHash: '$2a$10$Ss1IOh7BmD6wje96VMppheEpHywYjfQgvAy6BRB.ISwM79TvjfnN6',
+  salt: '$2a$10$Ss1IOh7BmD6wje96VMpphe',
+  systemRole: 'LOCAL_REGISTRAR',
+  role: '66619330a6a4a835aa689ddb',
+  practitionerId: '648c914d-de38-4c24-bdc9-ce8ee8cacd4c',
+  primaryOfficeId: '435e5301-063d-4f22-958e-24176cfb4e54',
+  scope: ['register', 'performance', 'certify', 'demo'],
+  status: 'active',
+  securityQuestionAnswers: [],
+  creationDate: 1717670705858,
+  auditHistory: [],
+  searches: [],
+  __v: 0
+}

From 053062d2ac7f52b879f3749fa0c8a3911d240fdc Mon Sep 17 00:00:00 2001
From: jamil314 <jamil31415926@gmail.com>
Date: Mon, 24 Jun 2024 19:28:01 +0600
Subject: [PATCH 078/108] fix: preserve selection for `fees required`

---
 .../CorrectionForm/CorrectionSummary.tsx      | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx b/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
index a69b63cb4d4..8c4879042e1 100644
--- a/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
+++ b/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
@@ -137,27 +137,6 @@ class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
     }
   }
 
-  componentDidMount() {
-    this.group = {
-      ...this.group,
-      fields: replaceInitialValues(
-        this.group.fields,
-        this.props.declaration.data[this.section.id] || {},
-        this.props.declaration.data
-      )
-    }
-    const currency = getCurrencySymbol(
-      this.props.offlineResources.config.CURRENCY
-    )
-
-    ;(
-      this.group.fields[0].nestedFields as any
-    ).REQUIRED[0].label.defaultMessage = this.props.intl.formatMessage(
-      messages.correctionSummaryTotalPaymentLabel,
-      { currency }
-    )
-  }
-
   onUploadingStateChanged = (isUploading: boolean) => {
     this.setState({
       ...this.state,
@@ -178,6 +157,26 @@ class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
       declaration: { event },
       userRole
     } = this.props
+
+    const group = {
+      ...this.group,
+      fields: replaceInitialValues(
+        this.group.fields,
+        this.props.declaration.data[this.section.id] || {},
+        this.props.declaration.data
+      )
+    }
+
+    const currency = getCurrencySymbol(
+      this.props.offlineResources.config.CURRENCY
+    )
+
+    ;(group.fields[0].nestedFields as any).REQUIRED[0].label.defaultMessage =
+      this.props.intl.formatMessage(
+        messages.correctionSummaryTotalPaymentLabel,
+        { currency }
+      )
+
     const { showPrompt } = this.state
     const formSections = getViewableSection(registerForm[event], declaration)
     const relationShip = (
@@ -208,7 +207,7 @@ class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
             : this.makeCorrection(userRole)
         }}
         disabled={
-          sectionHasError(this.group, this.section, declaration) ||
+          sectionHasError(group, this.section, declaration) ||
           this.state.isFileUploading
         }
         icon={() => <Check />}
@@ -365,7 +364,7 @@ class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
               noResultText={intl.formatMessage(constantsMessages.noResults)}
             ></Table>
             <FormFieldGenerator
-              id={this.group.id}
+              id={group.id}
               onChange={(values) => {
                 this.modifyDeclaration(
                   values,
@@ -374,7 +373,7 @@ class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
                 )
               }}
               setAllFieldsDirty={false}
-              fields={this.group.fields}
+              fields={group.fields}
               draftData={declaration.data}
               onUploadingStateChanged={this.onUploadingStateChanged}
               requiredErrorMessage={messages.correctionRequiredLabel}

From 1bd9d1cb2ddc1f437fd9d89f87cc460df80c0e62 Mon Sep 17 00:00:00 2001
From: jamil314 <jamil31415926@gmail.com>
Date: Mon, 24 Jun 2024 19:40:30 +0600
Subject: [PATCH 079/108] :fix: show `Correct record ?` modal

---
 .../client/src/i18n/messages/views/correction.ts | 16 ++++++++++++++++
 .../views/CorrectionForm/CorrectionSummary.tsx   | 16 +++++++++-------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/i18n/messages/views/correction.ts b/packages/client/src/i18n/messages/views/correction.ts
index a45cf2c3a1f..3bacf96d0fd 100644
--- a/packages/client/src/i18n/messages/views/correction.ts
+++ b/packages/client/src/i18n/messages/views/correction.ts
@@ -70,6 +70,8 @@ interface ICorrectionMessages
   correctionSummarySubmitter: MessageDescriptor
   correctionSummaryOffice: MessageDescriptor
   correctionSummaryRequestedOn: MessageDescriptor
+  correctRecordDialogTitle: MessageDescriptor
+  correctRecordDialogDescription: MessageDescriptor
 }
 
 const messagesToDefine: ICorrectionMessages = {
@@ -399,6 +401,20 @@ const messagesToDefine: ICorrectionMessages = {
       'The description for the dialog when record correction sent by registration agent for approval',
     id: 'correction.correctionForApprovalDialog.description'
   },
+  correctRecordDialogTitle: {
+    id: 'correction.correctRecordDialog.title',
+    defaultMessage: 'Correct record ?',
+    description:
+      'The title for the dialog when record correction sent by a registrar'
+  },
+
+  correctRecordDialogDescription: {
+    defaultMessage:
+      'The informant will be notified of this correction and a record of this decision will be recorded',
+    description:
+      'The description for the dialog when record correction sent by a registrar',
+    id: 'correction.correctRecordDialog.description'
+  },
   correctionSummarySubmitter: {
     id: 'correction.summary.submitter',
     defaultMessage: 'Submitter',
diff --git a/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx b/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
index 8c4879042e1..83956e5da97 100644
--- a/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
+++ b/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
@@ -201,11 +201,7 @@ class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
       <SuccessButton
         id="make_correction"
         key="make_correction"
-        onClick={() => {
-          userRole === ROLE_REGISTRATION_AGENT
-            ? this.togglePrompt()
-            : this.makeCorrection(userRole)
-        }}
+        onClick={this.togglePrompt}
         disabled={
           sectionHasError(group, this.section, declaration) ||
           this.state.isFileUploading
@@ -383,7 +379,11 @@ class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
         <Dialog
           id="withoutCorrectionForApprovalPrompt"
           isOpen={showPrompt}
-          title={intl.formatMessage(messages.correctionForApprovalDialogTitle)}
+          title={intl.formatMessage(
+            this.props.userRole === ROLE_REGISTRATION_AGENT
+              ? messages.correctionForApprovalDialogTitle
+              : messages.correctRecordDialogTitle
+          )}
           onClose={this.togglePrompt}
           actions={[
             <Button
@@ -412,7 +412,9 @@ class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
           <p>
             <Text element="p" variant="reg16">
               {intl.formatMessage(
-                messages.correctionForApprovalDialogDescription
+                this.props.userRole === ROLE_REGISTRATION_AGENT
+                  ? messages.correctionForApprovalDialogDescription
+                  : messages.correctRecordDialogDescription
               )}
             </Text>
           </p>

From 1bf40ddc580341d4d68939f75a4c034d525c26c6 Mon Sep 17 00:00:00 2001
From: jamil314 <jamil31415926@gmail.com>
Date: Mon, 24 Jun 2024 20:30:55 +0600
Subject: [PATCH 080/108] fix: label for total payable fees

---
 packages/client/src/forms/correction/payment.ts       |  6 +-----
 packages/client/src/i18n/messages/views/correction.ts |  6 ++++++
 .../src/views/CorrectionForm/CorrectionSummary.tsx    | 11 -----------
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/packages/client/src/forms/correction/payment.ts b/packages/client/src/forms/correction/payment.ts
index 95b817cba07..a512d4ce140 100644
--- a/packages/client/src/forms/correction/payment.ts
+++ b/packages/client/src/forms/correction/payment.ts
@@ -44,11 +44,7 @@ export const correctionFeesPayment: IFormSectionGroup = {
           {
             name: 'totalFees',
             type: 'NUMBER',
-            label: {
-              defaultMessage: '',
-              id: 'form.field.label.empty',
-              description: ''
-            },
+            label: messages.correctionSummaryFeesAmount,
             required: true,
             initialValue: '',
             validator: [],
diff --git a/packages/client/src/i18n/messages/views/correction.ts b/packages/client/src/i18n/messages/views/correction.ts
index 3bacf96d0fd..4b18411c2d4 100644
--- a/packages/client/src/i18n/messages/views/correction.ts
+++ b/packages/client/src/i18n/messages/views/correction.ts
@@ -62,6 +62,7 @@ interface ICorrectionMessages
   correctionSummaryFeesRequired: MessageDescriptor
   correctionSummaryFeesRequiredPositive: MessageDescriptor
   correctionSummaryFeesRequiredNegative: MessageDescriptor
+  correctionSummaryFeesAmount: MessageDescriptor
   correctionSummaryProofOfPaymentRequired: MessageDescriptor
   correctionSummaryProofOfPayment: MessageDescriptor
   correctionSummaryTotalPaymentLabel: MessageDescriptor
@@ -355,6 +356,11 @@ const messagesToDefine: ICorrectionMessages = {
     description:
       'Negative label for Fees required for certificate correction summary'
   },
+  correctionSummaryFeesAmount: {
+    id: 'correction.summary.feesAmount',
+    defaultMessage: 'Total $',
+    description: 'Label for total amount of fees'
+  },
   correctionSummaryProofOfPaymentRequired: {
     id: 'correction.summary.proofOfPaymentRequired',
     defaultMessage: 'Proof of payment is required',
diff --git a/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx b/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
index 83956e5da97..3ea319be98b 100644
--- a/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
+++ b/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
@@ -84,7 +84,6 @@ import { CorrectorRelationship } from '@client/forms/correction/corrector'
 import { CorrectionReason } from '@client/forms/correction/reason'
 import { getUserDetails } from '@client/profile/profileSelectors'
 import { WORKQUEUE_TABS } from '@client/components/interface/Navigation'
-import { getCurrencySymbol } from '@client/views/SysAdmin/Config/Application/utils'
 import { ColumnContentAlignment } from '@opencrvs/components/lib/common-types'
 import { UserDetails } from '@client/utils/userUtils'
 import { ROLE_REGISTRATION_AGENT } from '@client/utils/constants'
@@ -167,16 +166,6 @@ class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
       )
     }
 
-    const currency = getCurrencySymbol(
-      this.props.offlineResources.config.CURRENCY
-    )
-
-    ;(group.fields[0].nestedFields as any).REQUIRED[0].label.defaultMessage =
-      this.props.intl.formatMessage(
-        messages.correctionSummaryTotalPaymentLabel,
-        { currency }
-      )
-
     const { showPrompt } = this.state
     const formSections = getViewableSection(registerForm[event], declaration)
     const relationShip = (

From 333e0a74ce21959ca6c8cf5e750603a1bd8dc6be Mon Sep 17 00:00:00 2001
From: jamil314 <jamil31415926@gmail.com>
Date: Tue, 25 Jun 2024 19:30:51 +0600
Subject: [PATCH 081/108] amend: add `labelParam` in `IFormFieldBase` to
 dynamically show currency

---
 .../client/src/forms/correction/payment.ts    | 105 +++++++++---------
 packages/client/src/forms/index.ts            |   1 +
 packages/client/src/forms/utils.ts            |   4 +-
 .../src/i18n/messages/views/correction.ts     |   6 -
 .../CorrectionForm/CorrectionSummary.tsx      |   8 +-
 5 files changed, 65 insertions(+), 59 deletions(-)

diff --git a/packages/client/src/forms/correction/payment.ts b/packages/client/src/forms/correction/payment.ts
index a512d4ce140..4a24c81406b 100644
--- a/packages/client/src/forms/correction/payment.ts
+++ b/packages/client/src/forms/correction/payment.ts
@@ -17,59 +17,64 @@ import {
 } from '@client/forms'
 import { messages } from '@client/i18n/messages/views/correction'
 
-export const correctionFeesPayment: IFormSectionGroup = {
-  id: 'correctionFeesPayment',
-  fields: [
-    {
-      name: 'correctionFees',
-      type: RADIO_GROUP_WITH_NESTED_FIELDS,
-      size: RadioSize.LARGE,
-      label: messages.correctionSummaryFeesRequired,
-      hideAsterisk: true,
-      required: true,
-      initialValue: '',
-      validator: [],
-      options: [
-        {
-          value: 'REQUIRED',
-          label: messages.correctionSummaryFeesRequiredPositive
-        },
-        {
-          value: 'NOT_REQUIRED',
-          label: messages.correctionSummaryFeesRequiredNegative
-        }
-      ],
-      nestedFields: {
-        REQUIRED: [
+export const correctionFeesPayment = (currencySymbol: any) =>
+  ({
+    id: 'correctionFeesPayment',
+    fields: [
+      {
+        name: 'correctionFees',
+        type: RADIO_GROUP_WITH_NESTED_FIELDS,
+        size: RadioSize.LARGE,
+        label: messages.correctionSummaryFeesRequired,
+        hideAsterisk: true,
+        required: true,
+        initialValue: '',
+        validator: [],
+        options: [
           {
-            name: 'totalFees',
-            type: 'NUMBER',
-            label: messages.correctionSummaryFeesAmount,
-            required: true,
-            initialValue: '',
-            validator: [],
-            mapping: {}
+            value: 'REQUIRED',
+            label: messages.correctionSummaryFeesRequiredPositive
           },
           {
-            name: 'proofOfPayment',
-            type: 'SIMPLE_DOCUMENT_UPLOADER',
-            label: messages.correctionSummaryProofOfPayment,
-            description: messages.correctionSummaryProofOfPayment,
-            required: true,
-            initialValue: '',
-            validator: [],
-            mapping: {}
+            value: 'NOT_REQUIRED',
+            label: messages.correctionSummaryFeesRequiredNegative
           }
-        ]
+        ],
+        nestedFields: {
+          REQUIRED: [
+            {
+              name: 'totalFees',
+              type: 'NUMBER',
+              label: messages.correctionSummaryTotalPaymentLabel,
+              labelParam: {
+                currency: '$'
+              },
+              required: true,
+              initialValue: '',
+              validator: [],
+              mapping: {}
+            },
+            {
+              name: 'proofOfPayment',
+              type: 'SIMPLE_DOCUMENT_UPLOADER',
+              label: messages.correctionSummaryProofOfPayment,
+              description: messages.correctionSummaryProofOfPayment,
+              required: true,
+              initialValue: '',
+              validator: [],
+              mapping: {}
+            }
+          ]
+        }
       }
-    }
-  ]
-}
+    ]
+  } as IFormSectionGroup)
 
-export const correctionFeesPaymentSection: IFormSection = {
-  id: CorrectionSection.CorrectionFeesPayment,
-  viewType: 'form',
-  name: messages.name,
-  title: messages.title,
-  groups: [correctionFeesPayment]
-}
+export const correctionFeesPaymentSection = (currencySymbol: any) =>
+  ({
+    id: CorrectionSection.CorrectionFeesPayment,
+    viewType: 'form',
+    name: messages.name,
+    title: messages.title,
+    groups: [correctionFeesPayment(currencySymbol)]
+  } as IFormSection)
diff --git a/packages/client/src/forms/index.ts b/packages/client/src/forms/index.ts
index a5cf744cce9..baf66f3a03d 100644
--- a/packages/client/src/forms/index.ts
+++ b/packages/client/src/forms/index.ts
@@ -466,6 +466,7 @@ export interface IFormFieldBase {
   name: string
   type: IFormField['type']
   label: MessageDescriptor
+  labelParam?: Record<string, string>
   helperText?: MessageDescriptor
   tooltip?: MessageDescriptor
   validator: validators.Validation[]
diff --git a/packages/client/src/forms/utils.ts b/packages/client/src/forms/utils.ts
index 493a15c466e..7c9df58681c 100644
--- a/packages/client/src/forms/utils.ts
+++ b/packages/client/src/forms/utils.ts
@@ -119,7 +119,9 @@ export const internationaliseFieldObject = (
   const base = {
     ...field,
     label:
-      field.type === PARAGRAPH ? field.label : intl.formatMessage(field.label),
+      field.type === PARAGRAPH
+        ? field.label
+        : intl.formatMessage(field.label, field.labelParam),
     helperText: field.helperText && intl.formatMessage(field.helperText),
     tooltip: field.tooltip && intl.formatMessage(field.tooltip),
     unit: field.unit && intl.formatMessage(field.unit),
diff --git a/packages/client/src/i18n/messages/views/correction.ts b/packages/client/src/i18n/messages/views/correction.ts
index 4b18411c2d4..3bacf96d0fd 100644
--- a/packages/client/src/i18n/messages/views/correction.ts
+++ b/packages/client/src/i18n/messages/views/correction.ts
@@ -62,7 +62,6 @@ interface ICorrectionMessages
   correctionSummaryFeesRequired: MessageDescriptor
   correctionSummaryFeesRequiredPositive: MessageDescriptor
   correctionSummaryFeesRequiredNegative: MessageDescriptor
-  correctionSummaryFeesAmount: MessageDescriptor
   correctionSummaryProofOfPaymentRequired: MessageDescriptor
   correctionSummaryProofOfPayment: MessageDescriptor
   correctionSummaryTotalPaymentLabel: MessageDescriptor
@@ -356,11 +355,6 @@ const messagesToDefine: ICorrectionMessages = {
     description:
       'Negative label for Fees required for certificate correction summary'
   },
-  correctionSummaryFeesAmount: {
-    id: 'correction.summary.feesAmount',
-    defaultMessage: 'Total $',
-    description: 'Label for total amount of fees'
-  },
   correctionSummaryProofOfPaymentRequired: {
     id: 'correction.summary.proofOfPaymentRequired',
     defaultMessage: 'Proof of payment is required',
diff --git a/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx b/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
index 3ea319be98b..6c8b94e198c 100644
--- a/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
+++ b/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
@@ -84,6 +84,7 @@ import { CorrectorRelationship } from '@client/forms/correction/corrector'
 import { CorrectionReason } from '@client/forms/correction/reason'
 import { getUserDetails } from '@client/profile/profileSelectors'
 import { WORKQUEUE_TABS } from '@client/components/interface/Navigation'
+import { getCurrencySymbol } from '@client/views/SysAdmin/Config/Application/utils'
 import { ColumnContentAlignment } from '@opencrvs/components/lib/common-types'
 import { UserDetails } from '@client/utils/userUtils'
 import { ROLE_REGISTRATION_AGENT } from '@client/utils/constants'
@@ -126,7 +127,10 @@ type IDispatchProps = {
 type IFullProps = IProps & IStateProps & IDispatchProps & IntlShapeProps
 
 class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
-  section = correctionFeesPaymentSection
+  currencySymbol = getCurrencySymbol(
+    this.props.offlineResources.config.CURRENCY
+  )
+  section = correctionFeesPaymentSection(this.currencySymbol)
   group = this.section.groups[0]
   constructor(props: IFullProps) {
     super(props)
@@ -353,7 +357,7 @@ class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
               onChange={(values) => {
                 this.modifyDeclaration(
                   values,
-                  correctionFeesPaymentSection,
+                  correctionFeesPaymentSection(this.currencySymbol),
                   declaration
                 )
               }}

From ccfb45c4418887c10436a527f82ffbf3b1074ac6 Mon Sep 17 00:00:00 2001
From: jamil314 <jamil31415926@gmail.com>
Date: Wed, 26 Jun 2024 12:20:30 +0600
Subject: [PATCH 082/108] amend: moved currencySymbol in render()

---
 .../client/src/forms/correction/payment.ts    |  6 +++---
 .../CorrectionForm/CorrectionSummary.tsx      | 20 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/client/src/forms/correction/payment.ts b/packages/client/src/forms/correction/payment.ts
index 4a24c81406b..0e9db33b2f4 100644
--- a/packages/client/src/forms/correction/payment.ts
+++ b/packages/client/src/forms/correction/payment.ts
@@ -47,7 +47,7 @@ export const correctionFeesPayment = (currencySymbol: any) =>
               type: 'NUMBER',
               label: messages.correctionSummaryTotalPaymentLabel,
               labelParam: {
-                currency: '$'
+                currency: currencySymbol
               },
               required: true,
               initialValue: '',
@@ -68,7 +68,7 @@ export const correctionFeesPayment = (currencySymbol: any) =>
         }
       }
     ]
-  } as IFormSectionGroup)
+  } satisfies IFormSectionGroup)
 
 export const correctionFeesPaymentSection = (currencySymbol: any) =>
   ({
@@ -77,4 +77,4 @@ export const correctionFeesPaymentSection = (currencySymbol: any) =>
     name: messages.name,
     title: messages.title,
     groups: [correctionFeesPayment(currencySymbol)]
-  } as IFormSection)
+  } satisfies IFormSection)
diff --git a/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx b/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
index 6c8b94e198c..6c88dcdd6d5 100644
--- a/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
+++ b/packages/client/src/views/CorrectionForm/CorrectionSummary.tsx
@@ -127,11 +127,6 @@ type IDispatchProps = {
 type IFullProps = IProps & IStateProps & IDispatchProps & IntlShapeProps
 
 class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
-  currencySymbol = getCurrencySymbol(
-    this.props.offlineResources.config.CURRENCY
-  )
-  section = correctionFeesPaymentSection(this.currencySymbol)
-  group = this.section.groups[0]
   constructor(props: IFullProps) {
     super(props)
     this.state = {
@@ -161,11 +156,16 @@ class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
       userRole
     } = this.props
 
+    const currencySymbol = getCurrencySymbol(
+      this.props.offlineResources.config.CURRENCY
+    )
+    const section = correctionFeesPaymentSection(currencySymbol)
+
     const group = {
-      ...this.group,
+      ...section.groups[0],
       fields: replaceInitialValues(
-        this.group.fields,
-        this.props.declaration.data[this.section.id] || {},
+        section.groups[0].fields,
+        this.props.declaration.data[section.id] || {},
         this.props.declaration.data
       )
     }
@@ -196,7 +196,7 @@ class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
         key="make_correction"
         onClick={this.togglePrompt}
         disabled={
-          sectionHasError(group, this.section, declaration) ||
+          sectionHasError(group, section, declaration) ||
           this.state.isFileUploading
         }
         icon={() => <Check />}
@@ -357,7 +357,7 @@ class CorrectionSummaryComponent extends React.Component<IFullProps, IState> {
               onChange={(values) => {
                 this.modifyDeclaration(
                   values,
-                  correctionFeesPaymentSection(this.currencySymbol),
+                  correctionFeesPaymentSection(currencySymbol),
                   declaration
                 )
               }}

From db8b8ded7b9dbf9caccbd493b76a8ce160b76dd0 Mon Sep 17 00:00:00 2001
From: jamil314 <jamil31415926@gmail.com>
Date: Thu, 27 Jun 2024 15:13:27 +0600
Subject: [PATCH 083/108] added type to `currencySymbol`

---
 packages/client/src/forms/correction/payment.ts               | 4 ++--
 .../client/src/views/SysAdmin/Config/Application/utils.ts     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/forms/correction/payment.ts b/packages/client/src/forms/correction/payment.ts
index 0e9db33b2f4..fe355dfd802 100644
--- a/packages/client/src/forms/correction/payment.ts
+++ b/packages/client/src/forms/correction/payment.ts
@@ -17,7 +17,7 @@ import {
 } from '@client/forms'
 import { messages } from '@client/i18n/messages/views/correction'
 
-export const correctionFeesPayment = (currencySymbol: any) =>
+export const correctionFeesPayment = (currencySymbol: string) =>
   ({
     id: 'correctionFeesPayment',
     fields: [
@@ -70,7 +70,7 @@ export const correctionFeesPayment = (currencySymbol: any) =>
     ]
   } satisfies IFormSectionGroup)
 
-export const correctionFeesPaymentSection = (currencySymbol: any) =>
+export const correctionFeesPaymentSection = (currencySymbol: string) =>
   ({
     id: CorrectionSection.CorrectionFeesPayment,
     viewType: 'form',
diff --git a/packages/client/src/views/SysAdmin/Config/Application/utils.ts b/packages/client/src/views/SysAdmin/Config/Application/utils.ts
index 464ffc60b5a..c66f54ec544 100644
--- a/packages/client/src/views/SysAdmin/Config/Application/utils.ts
+++ b/packages/client/src/views/SysAdmin/Config/Application/utils.ts
@@ -66,7 +66,7 @@ export const getAmountWithCurrencySymbol = (
   return amountWithSymbol.normalize('NFKD').replace(/[\u0300-\u036F]/g, '')
 }
 
-export const getCurrencySymbol = (currency: ICurrency) => {
+export const getCurrencySymbol = (currency: ICurrency): string => {
   const currencySymbol = lookup.currencies({
     code: currency.isoCode
   })[0].symbol

From 08ca0a93934a9fc11ec129df0ea2932ee0219a0d Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <32668488+Nil20@users.noreply.github.com>
Date: Tue, 11 Jun 2024 19:13:41 +0600
Subject: [PATCH 084/108] fix: handle unauthorized error in gateway for no
 users found (#7025)

* fix: handle unauthorized error in gateway for no users found

* fix: handle unknown error for contact info change

* chore: amend using apollo query in changing contact info

* fix: amend error handlers

* fix: update change view tests

* chore: remove unused functions

* fix: update duplicate error state

* docs: update changelog(#7003)
---
 CHANGELOG.md                                  |  1 +
 .../ChangeEmailModal.test.tsx                 | 34 ++++++---------
 .../ChangeEmailModal/ChangeEmailView.tsx      | 33 +++++++++++++--
 .../ChangePhoneModal/ChangeNumberView.tsx     | 36 +++++++++++++---
 .../ChangePhoneModal.test.tsx                 | 41 +++++++------------
 packages/client/src/views/Settings/queries.ts | 32 +--------------
 .../gateway/src/features/user/usersAPI.ts     | 30 ++++++++++----
 7 files changed, 114 insertions(+), 93 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51e6cec52c5..32b0f3593e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -61,6 +61,7 @@
 - Fix 'Place of Certification' is showing wrong in certificate [#7060] (https://github.com/opencrvs/opencrvs-core/issues/7060)
 - Fix dashboard cron jobs not working [#7016](https://github.com/opencrvs/opencrvs-core/issues/7016)
 - Fix Check for valid date to handle incomplete marriage declarations [#7017](https://github.com/opencrvs/opencrvs-core/issues/7017)
+- Fix session expiration when user tries to change phone number [#7003](https://github.com/opencrvs/opencrvs-core/pull/7025)
 - Fix French translation missing for relationship to informant when trying to correct record, print and issue record [#6341] (https://github.com/opencrvs/opencrvs-core/issues/6341)
 - Fix client modal glitches on integrations page [#7002](https://github.com/opencrvs/opencrvs-core/issues/7002)
 - Fix print record page for an unsaved declaration [#6893](https://github.com/opencrvs/opencrvs-core/issues/6893)
diff --git a/packages/client/src/views/Settings/ChangeEmailModal/ChangeEmailModal.test.tsx b/packages/client/src/views/Settings/ChangeEmailModal/ChangeEmailModal.test.tsx
index 0a35dc568ed..735195b2d42 100644
--- a/packages/client/src/views/Settings/ChangeEmailModal/ChangeEmailModal.test.tsx
+++ b/packages/client/src/views/Settings/ChangeEmailModal/ChangeEmailModal.test.tsx
@@ -18,10 +18,9 @@ import { createStore } from '@client/store'
 import { getStorageUserDetailsSuccess } from '@opencrvs/client/src/profile/profileActions'
 import { ReactWrapper } from 'enzyme'
 import { changeEmailMutation } from '@client/views/Settings/mutations'
-import { queriesForUser } from '@client/views/Settings/queries'
+import { GET_USER_BY_EMAIL } from '@client/views/Settings/queries'
 import { waitForElement } from '@client/tests/wait-for-element'
 import { vi } from 'vitest'
-import { NetworkStatus } from '@apollo/client'
 import { ChangeEmailModal } from './ChangeEmailModal'
 
 const graphqlMocks = [
@@ -38,6 +37,17 @@ const graphqlMocks = [
     result: {
       data: []
     }
+  },
+  {
+    request: {
+      query: GET_USER_BY_EMAIL,
+      variables: {
+        email: 'rabiul@gmail.com'
+      }
+    },
+    result: {
+      data: []
+    }
   }
 ]
 
@@ -81,17 +91,8 @@ describe('Change email modal tests', () => {
   })
 
   it('should render verify code view', async () => {
-    queriesForUser.fetchUserDetailsByEmail = vi.fn(() =>
-      Promise.resolve({
-        data: {
-          getUserByEmail: null
-        },
-        loading: false,
-        networkStatus: NetworkStatus.ready
-      })
-    )
     component.find('input').simulate('change', {
-      target: { name: 'emailAddress', value: 'test@test.org' }
+      target: { name: 'emailAddress', value: 'rabiul@gmail.com' }
     })
     component.update()
     component.find('#continue-button').hostNodes().simulate('click')
@@ -103,15 +104,6 @@ describe('Change email modal tests', () => {
   })
 
   it('should trigger onSuccess callback after change email address', async () => {
-    queriesForUser.fetchUserDetailsByEmail = vi.fn(() =>
-      Promise.resolve({
-        data: {
-          getUserByEmail: null
-        },
-        loading: false,
-        networkStatus: NetworkStatus.ready
-      })
-    )
     component
       .find('#EmailAddressTextInput')
       .hostNodes()
diff --git a/packages/client/src/views/Settings/ChangeEmailModal/ChangeEmailView.tsx b/packages/client/src/views/Settings/ChangeEmailModal/ChangeEmailView.tsx
index 625565cd4c4..a2428c8b3f2 100644
--- a/packages/client/src/views/Settings/ChangeEmailModal/ChangeEmailView.tsx
+++ b/packages/client/src/views/Settings/ChangeEmailModal/ChangeEmailView.tsx
@@ -17,7 +17,7 @@ import { InputField } from '@opencrvs/components/lib/InputField'
 import { TextInput } from '@opencrvs/components/lib/TextInput'
 import { useIntl } from 'react-intl'
 import { EMPTY_STRING } from '@client/utils/constants'
-import { queriesForUser } from '@client/views/Settings/queries'
+import { GET_USER_BY_EMAIL } from '@client/views/Settings/queries'
 import { useDispatch, useSelector } from 'react-redux'
 import { sendVerifyCode } from '@client/profile/profileActions'
 import { isAValidEmailAddressFormat } from '@client/utils/validate'
@@ -25,6 +25,9 @@ import { NotificationEvent } from '@client/profile/serviceApi'
 import { getLanguage } from '@client/i18n/selectors'
 import { convertToMSISDN } from '@client/forms/utils'
 import { getUserDetails } from '@client/profile/profileSelectors'
+import { errorMessages } from '@client/i18n/messages/errors'
+import { useLazyQuery } from '@apollo/client'
+import { GetUserByEmailQuery } from '@client/utils/gateway'
 
 interface IProps {
   show: boolean
@@ -33,8 +36,11 @@ interface IProps {
 }
 
 export function ChangeEmailView({ show, onSuccess, onClose }: IProps) {
+  const [fetchUserDetailsByEmail] =
+    useLazyQuery<GetUserByEmailQuery>(GET_USER_BY_EMAIL)
   const intl = useIntl()
   const [emailAddress, setEmailAddress] = React.useState(EMPTY_STRING)
+  const [unknownError, setUnknownError] = React.useState(false)
   const [isInvalidEmailAddress, setIsInvalidEmailAddress] =
     React.useState(false)
   const [
@@ -56,13 +62,24 @@ export function ChangeEmailView({ show, onSuccess, onClose }: IProps) {
   const restoreState = () => {
     setEmailAddress(EMPTY_STRING)
     setIsInvalidEmailAddress(false)
+    setUnknownError(false)
+    setShowDuplicateEmailErrorNotification(false)
   }
   const toggleDuplicateEmailErrorNotification = () => {
     setShowDuplicateEmailErrorNotification((prevValue) => !prevValue)
   }
+  const toggleUnknownErrorNotification = () => {
+    setUnknownError((prevValue) => !prevValue)
+  }
   const continueButtonHandler = async (emailAddress: string) => {
-    const userData = await queriesForUser.fetchUserDetailsByEmail(emailAddress)
-    const emailExists = userData.data.getUserByEmail
+    const { data: userData, error } = await fetchUserDetailsByEmail({
+      variables: { email: emailAddress }
+    })
+    if (error) {
+      setUnknownError(true)
+      return
+    }
+    const emailExists = userData?.getUserByEmail
 
     if (!emailExists) {
       const notificationEvent = NotificationEvent.CHANGE_EMAIL_ADDRESS
@@ -85,6 +102,7 @@ export function ChangeEmailView({ show, onSuccess, onClose }: IProps) {
       onSuccess(emailAddress)
     } else {
       toggleDuplicateEmailErrorNotification()
+      setUnknownError(false)
     }
   }
   React.useEffect(() => {
@@ -147,6 +165,15 @@ export function ChangeEmailView({ show, onSuccess, onClose }: IProps) {
           })}
         </Toast>
       )}
+      {unknownError && (
+        <Toast
+          id="unknown-error-notification"
+          type="warning"
+          onClose={() => toggleUnknownErrorNotification()}
+        >
+          {intl.formatMessage(errorMessages.unknownErrorTitle)}
+        </Toast>
+      )}
     </ResponsiveModal>
   )
 }
diff --git a/packages/client/src/views/Settings/ChangePhoneModal/ChangeNumberView.tsx b/packages/client/src/views/Settings/ChangePhoneModal/ChangeNumberView.tsx
index 2506b45e143..ee567252ad7 100644
--- a/packages/client/src/views/Settings/ChangePhoneModal/ChangeNumberView.tsx
+++ b/packages/client/src/views/Settings/ChangePhoneModal/ChangeNumberView.tsx
@@ -19,12 +19,15 @@ import { useIntl } from 'react-intl'
 import { EMPTY_STRING } from '@client/utils/constants'
 import { isAValidPhoneNumberFormat } from '@client/utils/validate'
 import { convertToMSISDN } from '@client/forms/utils'
-import { queriesForUser } from '@client/views/Settings/queries'
+import { GET_USER_BY_MOBILE } from '@client/views/Settings/queries'
 import { useDispatch, useSelector } from 'react-redux'
 import { sendVerifyCode } from '@client/profile/profileActions'
 import { NotificationEvent } from '@client/profile/serviceApi'
 import { getUserDetails } from '@client/profile/profileSelectors'
+import { errorMessages } from '@client/i18n/messages/errors'
 import { getLanguage } from '@client/i18n/selectors'
+import { useLazyQuery } from '@apollo/client'
+import { GetUserByMobileQuery } from '@client/utils/gateway'
 
 interface IProps {
   show: boolean
@@ -33,8 +36,11 @@ interface IProps {
 }
 
 export function ChangeNumberView({ show, onSuccess, onClose }: IProps) {
+  const [fetchUserDetailsByMobile] =
+    useLazyQuery<GetUserByMobileQuery>(GET_USER_BY_MOBILE)
   const intl = useIntl()
   const [phoneNumber, setPhoneNumber] = React.useState(EMPTY_STRING)
+  const [unknownError, setUnknownError] = React.useState(false)
   const [isInvalidPhoneNumber, setIsInvalidPhoneNumber] = React.useState(false)
   const userDetails = useSelector(getUserDetails)
   const language = useSelector(getLanguage)
@@ -54,15 +60,25 @@ export function ChangeNumberView({ show, onSuccess, onClose }: IProps) {
   const restoreState = () => {
     setPhoneNumber(EMPTY_STRING)
     setIsInvalidPhoneNumber(false)
+    setUnknownError(false)
+    setShowDuplicateMobileErrorNotification(false)
   }
   const toggleDuplicateMobileErrorNotification = () => {
     setShowDuplicateMobileErrorNotification((prevValue) => !prevValue)
   }
+  const toggleUnknownErrorNotification = () => {
+    setUnknownError((prevValue) => !prevValue)
+  }
   const continueButtonHandler = async (phoneNumber: string) => {
-    const userData = await queriesForUser.fetchUserDetailsByMobile(
-      convertToMSISDN(phoneNumber, window.config.COUNTRY)
-    )
-    const mobileNumberExist = userData.data.getUserByMobile
+    const formattedNumber = convertToMSISDN(phoneNumber, window.config.COUNTRY)
+    const { data: userData, error } = await fetchUserDetailsByMobile({
+      variables: { mobile: formattedNumber }
+    })
+    if (error) {
+      setUnknownError(true)
+      return
+    }
+    const mobileNumberExist = userData?.getUserByMobile
 
     if (!mobileNumberExist) {
       const notificationEvent = NotificationEvent.CHANGE_PHONE_NUMBER
@@ -84,6 +100,7 @@ export function ChangeNumberView({ show, onSuccess, onClose }: IProps) {
       onSuccess(phoneNumber)
     } else {
       toggleDuplicateMobileErrorNotification()
+      setUnknownError(false)
     }
   }
   React.useEffect(() => {
@@ -157,6 +174,15 @@ export function ChangeNumberView({ show, onSuccess, onClose }: IProps) {
           })}
         </Toast>
       )}
+      {unknownError && (
+        <Toast
+          id="unknown-error-notification"
+          type="warning"
+          onClose={() => toggleUnknownErrorNotification()}
+        >
+          {intl.formatMessage(errorMessages.unknownErrorTitle)}
+        </Toast>
+      )}
     </ResponsiveModal>
   )
 }
diff --git a/packages/client/src/views/Settings/ChangePhoneModal/ChangePhoneModal.test.tsx b/packages/client/src/views/Settings/ChangePhoneModal/ChangePhoneModal.test.tsx
index 584b275f68a..ddd8540a03c 100644
--- a/packages/client/src/views/Settings/ChangePhoneModal/ChangePhoneModal.test.tsx
+++ b/packages/client/src/views/Settings/ChangePhoneModal/ChangePhoneModal.test.tsx
@@ -19,10 +19,9 @@ import { getStorageUserDetailsSuccess } from '@opencrvs/client/src/profile/profi
 import { ReactWrapper } from 'enzyme'
 import { ChangePhoneModal } from '@client/views/Settings/ChangePhoneModal/ChangePhoneModal'
 import { changePhoneMutation } from '@client/views/Settings/mutations'
-import { queriesForUser } from '@client/views/Settings/queries'
+import { GET_USER_BY_MOBILE } from '@client/views/Settings/queries'
 import { waitForElement } from '@client/tests/wait-for-element'
 import { vi } from 'vitest'
-import { NetworkStatus } from '@apollo/client'
 
 const graphqlMocks = [
   {
@@ -38,6 +37,17 @@ const graphqlMocks = [
     result: {
       data: []
     }
+  },
+  {
+    request: {
+      query: GET_USER_BY_MOBILE,
+      variables: {
+        mobile: '+8801741234567'
+      }
+    },
+    result: {
+      data: []
+    }
   }
 ]
 
@@ -81,15 +91,6 @@ describe('Change phone modal tests', () => {
   })
 
   it('should render verify code view', async () => {
-    queriesForUser.fetchUserDetailsByMobile = vi.fn(() =>
-      Promise.resolve({
-        data: {
-          getUserByMobile: null
-        },
-        loading: false,
-        networkStatus: NetworkStatus.ready
-      })
-    )
     component.find('input').simulate('change', {
       target: { name: 'PhoneNumber', value: '01741234567' }
     })
@@ -103,21 +104,9 @@ describe('Change phone modal tests', () => {
   })
 
   it('should trigger onSuccess callback after change phone number', async () => {
-    queriesForUser.fetchUserDetailsByMobile = vi.fn(() =>
-      Promise.resolve({
-        data: {
-          getUserByMobile: null
-        },
-        loading: false,
-        networkStatus: NetworkStatus.ready
-      })
-    )
-    component
-      .find('#PhoneNumber')
-      .hostNodes()
-      .simulate('change', {
-        target: { value: '01741234567' }
-      })
+    component.find('input').simulate('change', {
+      target: { name: 'PhoneNumber', value: '01741234567' }
+    })
     component.update()
     component.find('#continue-button').hostNodes().simulate('click')
     await waitForElement(component, '#VerifyCode')
diff --git a/packages/client/src/views/Settings/queries.ts b/packages/client/src/views/Settings/queries.ts
index 8305b0df47b..366fcc22c7c 100644
--- a/packages/client/src/views/Settings/queries.ts
+++ b/packages/client/src/views/Settings/queries.ts
@@ -9,9 +9,8 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import { gql } from '@apollo/client'
-import { client } from '@client/utils/apolloClient'
 
-const GET_USER_BY_MOBILE = gql`
+export const GET_USER_BY_MOBILE = gql`
   query getUserByMobile($mobile: String) {
     getUserByMobile(mobile: $mobile) {
       id
@@ -27,7 +26,7 @@ const GET_USER_BY_MOBILE = gql`
   }
 `
 
-const GET_USER_BY_EMAIL = gql`
+export const GET_USER_BY_EMAIL = gql`
   query getUserByEmail($email: String) {
     getUserByEmail(email: $email) {
       id
@@ -42,30 +41,3 @@ const GET_USER_BY_EMAIL = gql`
     }
   }
 `
-
-async function fetchUserDetailsByMobile(mobile: string) {
-  return (
-    client &&
-    client.query({
-      query: GET_USER_BY_MOBILE,
-      fetchPolicy: 'no-cache',
-      variables: { mobile }
-    })
-  )
-}
-
-async function fetchUserDetailsByEmail(email: string) {
-  return (
-    client &&
-    client.query({
-      query: GET_USER_BY_EMAIL,
-      fetchPolicy: 'no-cache',
-      variables: { email }
-    })
-  )
-}
-
-export const queriesForUser = {
-  fetchUserDetailsByMobile,
-  fetchUserDetailsByEmail
-}
diff --git a/packages/gateway/src/features/user/usersAPI.ts b/packages/gateway/src/features/user/usersAPI.ts
index 5b002e871d6..da61311af5e 100644
--- a/packages/gateway/src/features/user/usersAPI.ts
+++ b/packages/gateway/src/features/user/usersAPI.ts
@@ -11,6 +11,8 @@
 
 import { USER_MANAGEMENT_URL } from '@gateway/constants'
 import { RESTDataSource, RequestOptions } from 'apollo-datasource-rest'
+import { AuthenticationError } from 'apollo-server-errors'
+import { IUserModelData } from './type-resolvers'
 
 type IAvatarResponse = {
   userName: string
@@ -36,7 +38,7 @@ export class UsersAPI extends RESTDataSource {
     return this.get(`users/${id}/avatar`)
   }
 
-  async getUserByEmail(email: string) {
+  async getUserByEmail(email: string): Promise<IUserModelData | null> {
     const cacheKey = `${this.baseURL}/getUser:email:${email}`
 
     const cachedResponse = this.memoizedResults.get(cacheKey)
@@ -45,14 +47,20 @@ export class UsersAPI extends RESTDataSource {
       return cachedResponse
     }
 
-    const response = this.post('getUser', { email })
+    try {
+      const response = this.post('getUser', { email })
 
-    this.memoizedResults.set(cacheKey, response)
+      this.memoizedResults.set(cacheKey, response)
 
-    return response
+      return await response
+    } catch (e) {
+      // Don't need to throw errors if unauthorized error is found for no user with this email
+      if (e instanceof AuthenticationError) return null
+      else throw e
+    }
   }
 
-  async getUserByMobile(mobile: string) {
+  async getUserByMobile(mobile: string): Promise<IUserModelData | null> {
     const cacheKey = `${this.baseURL}/getUser:mobile:${mobile}`
 
     const cachedResponse = this.memoizedResults.get(cacheKey)
@@ -61,11 +69,17 @@ export class UsersAPI extends RESTDataSource {
       return cachedResponse
     }
 
-    const response = this.post('getUser', { mobile })
+    try {
+      const response = this.post('getUser', { mobile })
 
-    this.memoizedResults.set(cacheKey, response)
+      this.memoizedResults.set(cacheKey, response)
 
-    return response
+      return await response
+    } catch (e) {
+      // Don't need to throw errors if unauthorized error is found for no user with this mobile
+      if (e instanceof AuthenticationError) return null
+      else throw e
+    }
   }
   async getUserById(id: string) {
     const cacheKey = `${this.baseURL}/getUser:user:${id}`

From f337157744fa8836856634b3b500535d43a4f28c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 2 Jul 2024 11:02:48 +0000
Subject: [PATCH 085/108] fix: render condition for review button in search
 result page (#7226) (#7297)

* fix: fix render condition for review button in search result page

* chore: clean up condition expression

* fix: fix registrar review button condition, add rejected status in review condition

---------

Co-authored-by: Tahmid Rahman <42269993+tahmidrahman-dsi@users.noreply.github.com>
Co-authored-by: Riku Rouvila <riku.rouvila@gmail.com>
---
 .../src/views/SearchResult/SearchResult.tsx   | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/views/SearchResult/SearchResult.tsx b/packages/client/src/views/SearchResult/SearchResult.tsx
index 9cc6eedac09..e2447b9f5ea 100644
--- a/packages/client/src/views/SearchResult/SearchResult.tsx
+++ b/packages/client/src/views/SearchResult/SearchResult.tsx
@@ -260,7 +260,6 @@ class SearchResultView extends React.Component<
         const downloadStatus =
           (foundDeclaration && foundDeclaration.downloadStatus) || undefined
 
-        const declarationIsArchived = reg.declarationStatus === 'ARCHIVED'
         const declarationIsRequestedCorrection =
           reg.declarationStatus === 'REQUESTED_CORRECTION'
         const declarationIsRegistered = reg.declarationStatus === 'REGISTERED'
@@ -269,6 +268,9 @@ class SearchResultView extends React.Component<
         const declarationIsValidated = reg.declarationStatus === 'VALIDATED'
         const declarationIsInProgress = reg.declarationStatus === 'IN_PROGRESS'
         const declarationIsIssued = reg.declarationStatus === 'ISSUED'
+        const isDeclared = reg.declarationStatus === 'DECLARED'
+        const declarationIsCorrectionRequested =
+          reg.declarationStatus === 'CORRECTION_REQUESTED'
         const isDuplicate =
           reg.duplicates &&
           reg.duplicates.length > 0 &&
@@ -281,6 +283,19 @@ class SearchResultView extends React.Component<
           params.get('searchText'),
           params.get('searchType')
         ]
+        const isDeclarationReviewableByRegistrar =
+          declarationIsRejected ||
+          declarationIsValidated ||
+          declarationIsCorrectionRequested ||
+          isDeclared ||
+          declarationIsInProgress
+
+        const isDeclarationReviewableByRegAgent =
+          isDeclared || declarationIsInProgress || declarationIsRejected
+
+        const shouldShowReviewButton =
+          (this.userHasRegisterScope() && isDeclarationReviewableByRegistrar) ||
+          (this.userHasValidateScope() && isDeclarationReviewableByRegAgent)
         if (this.state.width > this.props.theme.grid.breakpoints.lg) {
           if (
             (declarationIsRegistered || declarationIsIssued) &&
@@ -307,14 +322,7 @@ class SearchResultView extends React.Component<
               },
               disabled: downloadStatus !== DOWNLOAD_STATUS.DOWNLOADED
             })
-          } else if (
-            (declarationIsValidated && this.userHasRegisterScope()) ||
-            (!declarationIsValidated &&
-              !declarationIsRegistered &&
-              !declarationIsCertified &&
-              !declarationIsArchived &&
-              this.userHasValidateOrRegistrarScope())
-          ) {
+          } else if (shouldShowReviewButton) {
             actions.push({
               label:
                 declarationIsRejected || declarationIsInProgress

From f663cbdba37b227b5f1c9bacf9391f146ad221ac Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 10:20:49 +0300
Subject: [PATCH 086/108] fix(v1.5.0): advanced search refetch queries not
 matching the searched ones #7296 (#7310)

Co-authored-by: Pyry Rouvila <pyry@opencrvs.org>
---
 packages/client/src/declarations/index.ts     | 18 +++++--
 .../AdvancedSearch/AdvancedSearchResult.tsx   | 52 +++++--------------
 2 files changed, 25 insertions(+), 45 deletions(-)

diff --git a/packages/client/src/declarations/index.ts b/packages/client/src/declarations/index.ts
index 14d771535c3..ec38603288e 100644
--- a/packages/client/src/declarations/index.ts
+++ b/packages/client/src/declarations/index.ts
@@ -454,6 +454,7 @@ interface IUnassignDeclarationSuccess {
   payload: {
     id: string
     client: ApolloClient<{}>
+    refetchQueries: InternalRefetchQueriesInclude
   }
 }
 
@@ -1235,15 +1236,17 @@ export function unassignDeclaration(
   }
 }
 
-function unassignDeclarationSuccess([id, client]: [
+function unassignDeclarationSuccess([id, client, refetchQueries]: [
   string,
-  ApolloClient<{}>
+  ApolloClient<{}>,
+  InternalRefetchQueriesInclude
 ]): IUnassignDeclarationSuccess {
   return {
     type: UNASSIGN_DECLARATION_SUCCESS,
     payload: {
       id,
-      client
+      client,
+      refetchQueries
     }
   }
 }
@@ -1846,7 +1849,11 @@ export const declarationsReducer: LoopReducer<IDeclarationsState, Action> = (
               variables: { id: action.payload.id },
               refetchQueries: action.payload.refetchQueries
             })
-            return [action.payload.id, action.payload.client]
+            return [
+              action.payload.id,
+              action.payload.client,
+              action.payload.refetchQueries
+            ]
           },
           {
             successActionCreator: unassignDeclarationSuccess
@@ -1874,7 +1881,8 @@ export const declarationsReducer: LoopReducer<IDeclarationsState, Action> = (
               ? Cmd.action(
                   executeUnassignDeclaration(
                     declarationNextToUnassign.id,
-                    action.payload.client
+                    action.payload.client,
+                    action.payload.refetchQueries
                   )
                 )
               : Cmd.none
diff --git a/packages/client/src/views/AdvancedSearch/AdvancedSearchResult.tsx b/packages/client/src/views/AdvancedSearch/AdvancedSearchResult.tsx
index 812a96414cf..eea3c70070a 100644
--- a/packages/client/src/views/AdvancedSearch/AdvancedSearchResult.tsx
+++ b/packages/client/src/views/AdvancedSearch/AdvancedSearchResult.tsx
@@ -8,7 +8,7 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import React, { useEffect, useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import { Header } from '@client/components/Header/Header'
 import { Navigation } from '@client/components/interface/Navigation'
 import styled, { withTheme } from 'styled-components'
@@ -32,15 +32,7 @@ import {
 import { IStoreState } from '@client/store'
 import { getScope, getUserDetails } from '@client/profile/profileSelectors'
 import { Scope } from '@client/utils/authUtils'
-import {
-  BRN_DRN_TEXT,
-  EMPTY_STRING,
-  NAME_TEXT,
-  NATIONAL_ID_TEXT,
-  PHONE_TEXT,
-  SEARCH_RESULT_SORT,
-  TRACKING_ID_TEXT
-} from '@client/utils/constants'
+import { EMPTY_STRING } from '@client/utils/constants'
 import {
   buttonMessages,
   constantsMessages,
@@ -48,7 +40,6 @@ import {
   errorMessages
 } from '@client/i18n/messages'
 import { messages as advancedSearchResultMessages } from '@client/i18n/messages/views/advancedSearchResult'
-import { getUserLocation, UserDetails } from '@client/utils/userUtils'
 import { RegStatus, SearchEventsQuery } from '@client/utils/gateway'
 import { Frame } from '@opencrvs/components/lib/Frame'
 import { LoadingIndicator } from '@client/views/OfficeHome/LoadingIndicator'
@@ -73,7 +64,6 @@ import {
   NoNameContainer
 } from '@client/views/OfficeHome/components'
 import { DownloadButton } from '@client/components/interface/DownloadButton'
-import { convertToMSISDN } from '@client/forms/utils'
 import { DownloadAction } from '@client/forms'
 import { formattedDuration } from '@client/utils/date-formatting'
 import { ISearchInputProps } from '@client/views/SearchResult/SearchResult'
@@ -86,6 +76,7 @@ import {
 } from '@client/search/advancedSearch/utils'
 import { omitBy } from 'lodash'
 import { BookmarkAdvancedSearchResult } from '@client/views/AdvancedSearch/BookmarkAdvancedSearchResult'
+import { UserDetails } from '@client/utils/userUtils'
 
 const SearchParamContainer = styled.div`
   margin: 16px 0px;
@@ -136,10 +127,17 @@ const AdvancedSearchResultComp = (props: IFullProps) => {
     (properties: string | null) =>
       properties === null || properties === EMPTY_STRING
   )
+
   const offlineData = useSelector(getOfflineData)
   const DEFAULT_PAGE_SIZE = 10
   const [currentPageNumber, setCurrentPageNumber] = useState<number>(1)
 
+  const searchEventsQueryVariables = {
+    advancedSearchParameters: filteredAdvancedSearchParams,
+    count: DEFAULT_PAGE_SIZE,
+    skip: DEFAULT_PAGE_SIZE * (currentPageNumber - 1)
+  }
+
   useEffect(() => {
     const recordWindowWidth = () => {
       setWindowWidth(window.innerWidth)
@@ -253,8 +251,6 @@ const AdvancedSearchResultComp = (props: IFullProps) => {
           reg.duplicates.length > 0 &&
           reg.declarationStatus !== SUBMISSION_STATUS.CERTIFIED &&
           reg.declarationStatus !== SUBMISSION_STATUS.REGISTERED
-        const { match, userDetails } = props
-        const { searchText, searchType } = match.params
         if (windowWidth > props.theme.grid.breakpoints.lg) {
           if (
             (declarationIsRegistered || declarationIsIssued) &&
@@ -316,25 +312,7 @@ const AdvancedSearchResultComp = (props: IFullProps) => {
                 refetchQueries: [
                   {
                     query: SEARCH_EVENTS,
-                    variables: {
-                      advancedSearchParameters: {
-                        trackingId:
-                          searchType === TRACKING_ID_TEXT ? searchText : '',
-                        nationalId:
-                          searchType === NATIONAL_ID_TEXT ? searchText : '',
-                        registrationNumber:
-                          searchType === BRN_DRN_TEXT ? searchText : '',
-                        contactNumber:
-                          searchType === PHONE_TEXT
-                            ? convertToMSISDN(searchText, window.config.COUNTRY)
-                            : '',
-                        name: searchType === NAME_TEXT ? searchText : '',
-                        declarationLocationId: userDetails
-                          ? getUserLocation(userDetails).id
-                          : ''
-                      },
-                      sort: SEARCH_RESULT_SORT
-                    }
+                    variables: searchEventsQueryVariables
                   }
                 ],
                 action:
@@ -417,13 +395,7 @@ const AdvancedSearchResultComp = (props: IFullProps) => {
       {isEnoughParams() && (
         <Query<SearchEventsQuery>
           query={SEARCH_EVENTS}
-          variables={{
-            advancedSearchParameters: {
-              ...filteredAdvancedSearchParams
-            },
-            count: DEFAULT_PAGE_SIZE,
-            skip: DEFAULT_PAGE_SIZE * (currentPageNumber - 1)
-          }}
+          variables={searchEventsQueryVariables}
           fetchPolicy="cache-and-network"
         >
           {({ loading, error, data }) => {

From 4a6a37eb7161f9a8c74dcfa022761ce031577013 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 3 Jul 2024 10:27:28 +0300
Subject: [PATCH 087/108] fix(v1.5.0): allow fonts from country config #7307
 (#7309)

Co-authored-by: naftis <pyry.rouvila@gmail.com>
---
 infrastructure/nginx-default.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infrastructure/nginx-default.conf b/infrastructure/nginx-default.conf
index e8b6b5050d5..b03ffaf05fb 100644
--- a/infrastructure/nginx-default.conf
+++ b/infrastructure/nginx-default.conf
@@ -44,7 +44,7 @@ add_header X-Permitted-Cross-Domain-Policies master-only;
 # I need to change our application code so we can increase security by disabling 'unsafe-inline' 'unsafe-eval'
 # directives for css and js(if you have inline css or js, you will need to keep it too).
 # more: http://www.html5rocks.com/en/tutorials/security/content-security-policy/#inline-code-considered-harmful
-add_header Content-Security-Policy "default-src 'self' {{CONTENT_SECURITY_POLICY_WILDCARD}} *.sentry.io/ sentry.io/; font-src fonts.gstatic.com; object-src 'none'; script-src 'self' 'unsafe-eval' blob: https: http: storage.googleapis.com/workbox-cdn/ sentry.io/api/embed/error-page/; style-src 'self' fonts.googleapis.com 'unsafe-inline'; img-src 'self' data: http: https: ";
+add_header Content-Security-Policy "default-src 'self' {{CONTENT_SECURITY_POLICY_WILDCARD}} *.sentry.io/ sentry.io/; font-src fonts.gstatic.com {{CONTENT_SECURITY_POLICY_WILDCARD}}; object-src 'none'; script-src 'self' 'unsafe-eval' blob: https: http: storage.googleapis.com/workbox-cdn/ sentry.io/api/embed/error-page/; style-src 'self' fonts.googleapis.com 'unsafe-inline'; img-src 'self' data: http: https: ";
 
 server {
     listen       80;

From d363f7ab5b4ffb21bc76ce8736ec38f9ead05ab9 Mon Sep 17 00:00:00 2001
From: Jamil <jamil31415926@gmail.com>
Date: Wed, 3 Jul 2024 13:46:37 +0600
Subject: [PATCH 088/108] fix: Comment section not showing up (#7263)

* pushed correction comment to the comment array

* chore: add documentation

Co-authored-by: Tameem Bin Haider <tameem.haider@dsinnovators.com>

* fix: reading first comment for view page

* fix: pushing correction comment to second position

* fix: adding correction comment in 2nd position when correction requested

* fix: reading correction comment from 2nd position when in correction review

* Revert "fix: reading first comment for view page"

This reverts commit 1de93bddab5d8ce927069b4684643e77453a27a6.

* fix: separating `correctionComment` from other comments in `actionDetailsModal`

* chore: prettier

* fix: filtering out `waitingForValidation` from histories in `actionDetailsModal`

* amend: update test snapshot

---------

Co-authored-by: Tameem Bin Haider <tameem.haider@dsinnovators.com>
---
 .../views/RecordAudit/ActionDetailsModal.tsx  | 26 ++++++++++++++++---
 .../client/src/views/RecordAudit/History.tsx  |  3 +--
 .../ReviewCorrection/ReviewCorrection.tsx     |  2 +-
 .../state-transitions.test.ts.snap            |  3 +++
 packages/workflow/src/records/fhir.ts         |  3 +++
 .../handler/correction/make-correction.ts     | 21 +++++++++++++++
 6 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx b/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
index 07417d47ba7..215ff74b5c0 100644
--- a/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
+++ b/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
@@ -82,6 +82,16 @@ function retrieveUniqueComments(
   return comments
 }
 
+function retrieveCorrectionComment(actionDetailsData: History) {
+  if (!Array.isArray(actionDetailsData.comments)) {
+    return []
+  }
+
+  const comment = actionDetailsData.comments[1]?.comment
+
+  return comment ? [{ comment }] : []
+}
+
 function getHistories(draft: IDeclaration | null) {
   const histories: History[] =
     draft?.data.history && Array.isArray(draft.data.history)
@@ -113,9 +123,12 @@ function prepareComments(
   }
 
   const histories = getHistories(draft)
-  const currentHistoryItemIndex = histories.findIndex(
-    (item) => item.date === actionDetailsData.date
-  )
+  const currentHistoryItemIndex = histories
+    .filter(({ regStatus }: Partial<History>) => {
+      return regStatus !== RegStatus.WaitingValidation
+    })
+    .findIndex((item) => item.date === actionDetailsData.date)
+
   const previousHistoryItemIndex =
     currentHistoryItemIndex < 0
       ? currentHistoryItemIndex
@@ -131,6 +144,13 @@ function prepareComments(
       : []
   }
 
+  if (
+    [RegAction.RequestedCorrection, RegAction.Corrected].includes(
+      actionDetailsData.action as RegAction
+    )
+  )
+    return retrieveCorrectionComment(actionDetailsData)
+
   return retrieveUniqueComments(
     histories,
     actionDetailsData,
diff --git a/packages/client/src/views/RecordAudit/History.tsx b/packages/client/src/views/RecordAudit/History.tsx
index 27dc38a80c9..3f88ccad157 100644
--- a/packages/client/src/views/RecordAudit/History.tsx
+++ b/packages/client/src/views/RecordAudit/History.tsx
@@ -25,7 +25,7 @@ import {
 import { Pagination } from '@opencrvs/components/lib/Pagination'
 import { CMethodParams } from './ActionButtons'
 import type { GQLHumanName } from '@client/utils/gateway-deprecated-do-not-use'
-import { getIndividualNameObj } from '@client/utils/userUtils'
+import { getIndividualNameObj, getUserRole } from '@client/utils/userUtils'
 import { AvatarSmall } from '@client/components/Avatar'
 import { FIELD_AGENT_ROLES } from '@client/utils/constants'
 import { DOWNLOAD_STATUS, SUBMISSION_STATUS } from '@client/declarations'
@@ -35,7 +35,6 @@ import { v4 as uuid } from 'uuid'
 import { History, Avatar, RegStatus, SystemType } from '@client/utils/gateway'
 import { Link } from '@opencrvs/components'
 import { integrationMessages } from '@client/i18n/messages/views/integrations'
-import { getUserRole } from '@client/views/SysAdmin/Config/UserRoles/utils'
 import { getLanguage } from '@client/i18n/selectors'
 import { useSelector } from 'react-redux'
 import { formatLongDate } from '@client/utils/date-formatting'
diff --git a/packages/client/src/views/ReviewCorrection/ReviewCorrection.tsx b/packages/client/src/views/ReviewCorrection/ReviewCorrection.tsx
index ee6c586f751..49e660e37f1 100644
--- a/packages/client/src/views/ReviewCorrection/ReviewCorrection.tsx
+++ b/packages/client/src/views/ReviewCorrection/ReviewCorrection.tsx
@@ -227,7 +227,7 @@ const ReviewSummarySection = ({ declaration }: IPropsReviewSummarySection) => {
 
   const getComments = () => {
     const reason = correctionRequestTask
-    return reason?.comments && (reason.comments[0]?.comment as string)
+    return reason?.comments && (reason.comments[1]?.comment as string)
   }
 
   const getFieldValue = (
diff --git a/packages/workflow/src/records/__snapshots__/state-transitions.test.ts.snap b/packages/workflow/src/records/__snapshots__/state-transitions.test.ts.snap
index f7f25cf584a..96f9ca3449e 100644
--- a/packages/workflow/src/records/__snapshots__/state-transitions.test.ts.snap
+++ b/packages/workflow/src/records/__snapshots__/state-transitions.test.ts.snap
@@ -99,6 +99,9 @@ Array [
     "intent": "proposal",
     "lastModified": "STATIC",
     "note": Array [
+      Object {
+        "text": "Both mother and father were present",
+      },
       Object {
         "text": "Note",
       },
diff --git a/packages/workflow/src/records/fhir.ts b/packages/workflow/src/records/fhir.ts
index 0aa5103ac73..56668705f5e 100644
--- a/packages/workflow/src/records/fhir.ts
+++ b/packages/workflow/src/records/fhir.ts
@@ -1067,6 +1067,9 @@ export function createCorrectionRequestTask(
       ]
     },
     note: [
+      {
+        text: previousTask.note?.[0]?.text || ''
+      },
       {
         text: correctionDetails.note
       }
diff --git a/packages/workflow/src/records/handler/correction/make-correction.ts b/packages/workflow/src/records/handler/correction/make-correction.ts
index c70be728def..0d72ec05467 100644
--- a/packages/workflow/src/records/handler/correction/make-correction.ts
+++ b/packages/workflow/src/records/handler/correction/make-correction.ts
@@ -46,6 +46,27 @@ export const makeCorrectionRoute = createRoute({
       CorrectionRequestInput,
       recordInput.registration?.correction
     )
+    /* Fhir builders put the comment value provided in `registration.status.comments`
+     * inside `task.note`
+     */
+    if (
+      recordInput.registration?.correction?.note &&
+      recordInput.registration?.status?.[0]
+    ) {
+      if (
+        !recordInput.registration.status[0].comments ||
+        recordInput.registration.status[0].comments.length == 0
+      )
+        recordInput.registration.status[0].comments = [
+          {
+            comment: ''
+          }
+        ]
+      recordInput.registration.status[0].comments.push({
+        comment: recordInput.registration?.correction?.note
+      })
+    }
+
     const token = getToken(request)
 
     if (findActiveCorrectionRequest(record)) {

From b1e12a87e802481b77507f48c42c0bf870f4e653 Mon Sep 17 00:00:00 2001
From: jamil314 <jamil31415926@gmail.com>
Date: Wed, 3 Jul 2024 14:12:37 +0600
Subject: [PATCH 089/108] amend: get `userRole` from systemAdmin/../utils

---
 packages/client/src/views/RecordAudit/History.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/views/RecordAudit/History.tsx b/packages/client/src/views/RecordAudit/History.tsx
index 3f88ccad157..f0427713669 100644
--- a/packages/client/src/views/RecordAudit/History.tsx
+++ b/packages/client/src/views/RecordAudit/History.tsx
@@ -25,7 +25,7 @@ import {
 import { Pagination } from '@opencrvs/components/lib/Pagination'
 import { CMethodParams } from './ActionButtons'
 import type { GQLHumanName } from '@client/utils/gateway-deprecated-do-not-use'
-import { getIndividualNameObj, getUserRole } from '@client/utils/userUtils'
+import { getIndividualNameObj } from '@client/utils/userUtils'
 import { AvatarSmall } from '@client/components/Avatar'
 import { FIELD_AGENT_ROLES } from '@client/utils/constants'
 import { DOWNLOAD_STATUS, SUBMISSION_STATUS } from '@client/declarations'
@@ -40,6 +40,7 @@ import { useSelector } from 'react-redux'
 import { formatLongDate } from '@client/utils/date-formatting'
 import { getLocalizedLocationName } from '@client/utils/locationUtils'
 import { ILocation } from '@client/offline/reducer'
+import { getUserRole } from '@client/views/SysAdmin/Config/UserRoles/utils'
 
 const TableDiv = styled.div`
   overflow: auto;

From 43ba83d3196be2e56a4a9e3dbd3388f7bf1bedd0 Mon Sep 17 00:00:00 2001
From: Tameem Bin Haider <tameem.haider@dsinnovators.com>
Date: Wed, 3 Jul 2024 16:03:22 +0600
Subject: [PATCH 090/108] fix: remove extra param from adv search form state
 (#7298)

---
 packages/client/src/search/advancedSearch/utils.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/client/src/search/advancedSearch/utils.ts b/packages/client/src/search/advancedSearch/utils.ts
index a6d13c55ae8..4dfb5b6f591 100644
--- a/packages/client/src/search/advancedSearch/utils.ts
+++ b/packages/client/src/search/advancedSearch/utils.ts
@@ -59,7 +59,6 @@ const baseKeysSameAsStore = [
   'registrationStatuses',
   'registrationNumber',
   'trackingId',
-  'declarationLocationId',
   'eventCountry',
   'eventLocationId',
   'eventLocationLevel1',
@@ -93,7 +92,6 @@ export interface IAdvancedSearchFormState {
   dateOfRegistrationStart?: string
   dateOfRegistrationEnd?: string
   placeOfRegistration?: string
-  declarationLocationId?: string
   eventLocationType?: string
   eventCountry?: string
   eventLocationId?: string

From 255ce45cdb1c08d28881863ff28f8c14f719fa43 Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <ashikul.alam@dsinnovators.com>
Date: Wed, 3 Jul 2024 16:16:12 +0600
Subject: [PATCH 091/108] fix: delete reinstated declaration from store

---
 .../client/src/views/RecordAudit/RecordAudit.tsx     | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/views/RecordAudit/RecordAudit.tsx b/packages/client/src/views/RecordAudit/RecordAudit.tsx
index 46dbbb89f20..7705363351c 100644
--- a/packages/client/src/views/RecordAudit/RecordAudit.tsx
+++ b/packages/client/src/views/RecordAudit/RecordAudit.tsx
@@ -47,7 +47,7 @@ import {
   SUBMISSION_STATUS,
   DOWNLOAD_STATUS,
   modifyDeclaration,
-  writeDeclaration
+  deleteDeclaration
 } from '@client/declarations'
 import { IStoreState } from '@client/store'
 import type { GQLEventSearchSet } from '@client/utils/gateway-deprecated-do-not-use'
@@ -124,6 +124,7 @@ import { Button } from '@opencrvs/components/lib/Button'
 import { Icon } from '@opencrvs/components/lib/Icon'
 
 import { UserDetails } from '@client/utils/userUtils'
+import { client } from '@client/utils/apolloClient'
 
 const DesktopHeader = styled(Header)`
   @media (max-width: ${({ theme }) => theme.grid.breakpoints.lg}px) {
@@ -248,14 +249,7 @@ function ReinstateButton({
       // update the store and indexDb with the latest status of the declaration
       onCompleted={(data) => {
         refetchDeclarationInfo?.()
-        dispatch(
-          writeDeclaration({
-            ...declaration,
-            submissionStatus: '',
-            registrationStatus: data.markEventAsReinstated
-              ?.registrationStatus as string
-          })
-        )
+        dispatch(deleteDeclaration(declaration.id, client))
       }}
     >
       {(reinstateDeclaration) => (

From 47da939b1752053cb675245987303a5c8cc23b1b Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <32668488+Nil20@users.noreply.github.com>
Date: Wed, 3 Jul 2024 16:08:11 +0600
Subject: [PATCH 092/108] fix: disable search button for incomplete date field
 (#7206)

* fix: disable search button for incomplete date field

* chore: move date fields in util file

* fix: update date range picker validator function

* fix: handle touch field for date range picker field

* fix: update message for invalid date field

* chore: handle validator for date range field

* chore: add validators for death section

* chore: move search validators to separate folder

* fix: handle date range func in component

* fix: amend validator name

* fix: refactor functions

* fix: amend file structure

* fix: amend date fields

* fix: amend validation of date field

* fix: update review changes

* fix: amend date field validation
---
 .../components/form/FormFieldGenerator.tsx    | 33 ++++++++----
 .../advancedSearch/fieldDefinitions/Birth.ts  | 11 ++--
 .../advancedSearch/fieldDefinitions/Death.ts  |  7 +--
 .../advancedSearch/fieldDefinitions/utils.ts  | 28 ++++++++++
 .../client/src/i18n/messages/validations.ts   | 52 ++++++++++++++++++-
 .../client/src/search/advancedSearch/utils.ts | 29 +++++++----
 .../src/search/advancedSearch/validators.ts   | 35 +++++++++++++
 .../src/views/SearchResult/AdvancedSearch.tsx | 46 +++++++++-------
 8 files changed, 193 insertions(+), 48 deletions(-)
 create mode 100644 packages/client/src/forms/advancedSearch/fieldDefinitions/utils.ts
 create mode 100644 packages/client/src/search/advancedSearch/validators.ts

diff --git a/packages/client/src/components/form/FormFieldGenerator.tsx b/packages/client/src/components/form/FormFieldGenerator.tsx
index 0588937baf8..8e09c990ceb 100644
--- a/packages/client/src/components/form/FormFieldGenerator.tsx
+++ b/packages/client/src/components/form/FormFieldGenerator.tsx
@@ -904,16 +904,29 @@ class FormSectionComponent extends React.Component<Props> {
             (field.type === FIELD_WITH_DYNAMIC_DEFINITIONS &&
               getFieldType(field as IDynamicFormField, values) === DATE)
 
-          if (
-            isDateField &&
-            touched[`${field.name}-dd`] !== undefined &&
-            touched[`${field.name}-mm`] !== undefined &&
-            touched[`${field.name}-yyyy`] !== undefined
-          ) {
-            touched[field.name] =
-              touched[`${field.name}-dd`] &&
-              touched[`${field.name}-mm`] &&
-              touched[`${field.name}-yyyy`]
+          const isDateRangePickerField = field.type === DATE_RANGE_PICKER
+
+          const dateFields = [
+            `${field.name}-dd`,
+            `${field.name}-mm`,
+            `${field.name}-yyyy`
+          ]
+          // for date range picker fields
+          const dateRangeFields = [
+            `${field.name}exact-dd`,
+            `${field.name}exact-mm`,
+            `${field.name}exact-yyyy`
+          ]
+
+          const areFieldsTouched = (fields: string[]) =>
+            fields.every((field) => touched[field])
+
+          if (isDateField && areFieldsTouched(dateFields)) {
+            touched[field.name] = areFieldsTouched(dateFields)
+          }
+
+          if (isDateRangePickerField && areFieldsTouched(dateRangeFields)) {
+            touched[field.name] = areFieldsTouched(dateRangeFields)
           }
 
           const withDynamicallyGeneratedFields =
diff --git a/packages/client/src/forms/advancedSearch/fieldDefinitions/Birth.ts b/packages/client/src/forms/advancedSearch/fieldDefinitions/Birth.ts
index d7ecb69d184..8549965a5ca 100644
--- a/packages/client/src/forms/advancedSearch/fieldDefinitions/Birth.ts
+++ b/packages/client/src/forms/advancedSearch/fieldDefinitions/Birth.ts
@@ -12,6 +12,7 @@ import { countries } from '@client/utils/countries'
 import { IFormSectionGroup } from '@client/forms/index'
 import { formMessageDescriptors } from '@client/i18n/messages'
 import { messages as advancedSearchForm } from '@client/i18n/messages/views/advancedSearchForm'
+import { isValidDate } from '@client/search/advancedSearch/validators'
 
 export const advancedSearchBirthSectionRegistrationDetails: IFormSectionGroup =
   {
@@ -36,7 +37,7 @@ export const advancedSearchBirthSectionRegistrationDetails: IFormSectionGroup =
         label: advancedSearchForm.dateOfRegistration,
         required: false,
         initialValue: '',
-        validator: []
+        validator: [isValidDate]
       },
       {
         name: 'registrationStatuses',
@@ -94,7 +95,7 @@ export const advancedSearchBirthSectionChildDetails: IFormSectionGroup = {
       label: formMessageDescriptors.dateOfBirth,
       required: false,
       initialValue: '',
-      validator: []
+      validator: [isValidDate]
     },
     {
       name: 'childFirstNames',
@@ -296,7 +297,7 @@ export const advancedSearchBirthSectionMotherDetails: IFormSectionGroup = {
       label: formMessageDescriptors.dateOfBirth,
       required: false,
       initialValue: '',
-      validator: []
+      validator: [isValidDate]
     },
     {
       name: 'motherFirstNames',
@@ -331,7 +332,7 @@ export const advancedSearchBirthSectionFatherDetails: IFormSectionGroup = {
       label: formMessageDescriptors.dateOfBirth,
       required: false,
       initialValue: '',
-      validator: []
+      validator: [isValidDate]
     },
     {
       name: 'fatherFirstNames',
@@ -364,7 +365,7 @@ export const advancedSearchBirthSectionInformantDetails: IFormSectionGroup = {
       label: formMessageDescriptors.dateOfBirth,
       required: false,
       initialValue: '',
-      validator: []
+      validator: [isValidDate]
     },
     {
       name: 'informantFirstNames',
diff --git a/packages/client/src/forms/advancedSearch/fieldDefinitions/Death.ts b/packages/client/src/forms/advancedSearch/fieldDefinitions/Death.ts
index d2fca692f7d..752f2329b7c 100644
--- a/packages/client/src/forms/advancedSearch/fieldDefinitions/Death.ts
+++ b/packages/client/src/forms/advancedSearch/fieldDefinitions/Death.ts
@@ -12,6 +12,7 @@ import { countries } from '@client/utils/countries'
 import { IFormSectionGroup } from '@client/forms/index'
 import { formMessageDescriptors } from '@client/i18n/messages'
 import { messages as advancedSearchForm } from '@client/i18n/messages/views/advancedSearchForm'
+import { isValidDate } from '@client/search/advancedSearch/validators'
 
 export const advancedSearchDeathSectionRegistrationDetails: IFormSectionGroup =
   {
@@ -36,7 +37,7 @@ export const advancedSearchDeathSectionRegistrationDetails: IFormSectionGroup =
         label: advancedSearchForm.dateOfRegistration,
         required: false,
         initialValue: '',
-        validator: []
+        validator: [isValidDate]
       },
       {
         name: 'registrationStatuses',
@@ -94,7 +95,7 @@ export const advancedSearchDeathSectiondeceasedDetails: IFormSectionGroup = {
       label: formMessageDescriptors.dateOfBirth,
       required: false,
       initialValue: '',
-      validator: []
+      validator: [isValidDate]
     },
     {
       name: 'deceasedFirstNames',
@@ -294,7 +295,7 @@ export const advancedSearchDeathSectionInformantDetails: IFormSectionGroup = {
       label: formMessageDescriptors.dateOfBirth,
       required: false,
       initialValue: '',
-      validator: []
+      validator: [isValidDate]
     },
     {
       name: 'informantFirstNames',
diff --git a/packages/client/src/forms/advancedSearch/fieldDefinitions/utils.ts b/packages/client/src/forms/advancedSearch/fieldDefinitions/utils.ts
new file mode 100644
index 00000000000..05bded513d2
--- /dev/null
+++ b/packages/client/src/forms/advancedSearch/fieldDefinitions/utils.ts
@@ -0,0 +1,28 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * OpenCRVS is also distributed under the terms of the Civil Registration
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
+ *
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
+ */
+// eslint-disable-next-line no-restricted-imports
+import { isValid, parse } from 'date-fns'
+
+const validateDate = (dateString: string) => {
+  const formats = ['yyyy-M-d', 'yyyy-MM-dd']
+  return formats.some((format) =>
+    isValid(parse(dateString, format, new Date()))
+  )
+}
+
+export function isInvalidDate(date?: string) {
+  if (!date) return true
+  const regEx = /^\d{4}-\d{1,2}-\d{1,2}$/
+  if (!date.match(regEx)) {
+    return true
+  }
+  return !validateDate(date)
+}
diff --git a/packages/client/src/i18n/messages/validations.ts b/packages/client/src/i18n/messages/validations.ts
index ff4bd3ed3c8..340bf273ee9 100644
--- a/packages/client/src/i18n/messages/validations.ts
+++ b/packages/client/src/i18n/messages/validations.ts
@@ -8,9 +8,52 @@
  *
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
-import { defineMessages } from 'react-intl'
+import { defineMessages, MessageDescriptor } from 'react-intl'
 
-const messagesToDefine = {
+interface IValidationMessages
+  extends Record<string | number | symbol, MessageDescriptor> {
+  phoneNumberNotValid: MessageDescriptor
+  bengaliOnlyNameFormat: MessageDescriptor
+  blockAlphaNumericDot: MessageDescriptor
+  dateFormat: MessageDescriptor
+  dobEarlierThanDom: MessageDescriptor
+  domLaterThanDob: MessageDescriptor
+  emailAddressFormat: MessageDescriptor
+  englishOnlyNameFormat: MessageDescriptor
+  facilityMustBeSelected: MessageDescriptor
+  officeMustBeSelected: MessageDescriptor
+  greaterThanZero: MessageDescriptor
+  isValidBirthDate: MessageDescriptor
+  isValidDateOfDeath: MessageDescriptor
+  isDateNotBeforeBirth: MessageDescriptor
+  isDateNotAfterDeath: MessageDescriptor
+  isMoVisitBeforeBirth: MessageDescriptor
+  isMoVisitAfterDeath: MessageDescriptor
+  isInformantOfLegalAge: MessageDescriptor
+  illegalMarriageAge: MessageDescriptor
+  maxLength: MessageDescriptor
+  minLength: MessageDescriptor
+  notGreaterThan: MessageDescriptor
+  numberRequired: MessageDescriptor
+  phoneNumberFormat: MessageDescriptor
+  range: MessageDescriptor
+  requiredBasic: MessageDescriptor
+  required: MessageDescriptor
+  requiredForNewUser: MessageDescriptor
+  requiredReasonForCorrection: MessageDescriptor
+  requiredSymbol: MessageDescriptor
+  validBirthRegistrationNumber: MessageDescriptor
+  validDeathRegistrationNumber: MessageDescriptor
+  validNationalId: MessageDescriptor
+  validNationalIDLengths: MessageDescriptor
+  duplicateNationalID: MessageDescriptor
+  validPassportNumber: MessageDescriptor
+  validDrivingLicenseNumber: MessageDescriptor
+  nonDecimalPointNumber: MessageDescriptor
+  invalidDate: MessageDescriptor
+}
+
+const messagesToDefine: IValidationMessages = {
   phoneNumberNotValid: {
     id: 'register.SelectContactPoint.phoneNoError',
     defaultMessage: 'Not a valid mobile number',
@@ -239,6 +282,11 @@ const messagesToDefine = {
     defaultMessage: 'Can not have any decimal point number',
     description:
       'The error message that appeards when any decimal point number is used'
+  },
+  invalidDate: {
+    id: 'validations.invalidDate',
+    defaultMessage: 'Invalid date field',
+    description: 'The error message that appears when a date field is invalid'
   }
 }
 
diff --git a/packages/client/src/search/advancedSearch/utils.ts b/packages/client/src/search/advancedSearch/utils.ts
index a6d13c55ae8..e93fb60c5b7 100644
--- a/packages/client/src/search/advancedSearch/utils.ts
+++ b/packages/client/src/search/advancedSearch/utils.ts
@@ -29,6 +29,7 @@ import { isEqual } from 'lodash'
 import { messages as advancedSearchForm } from '@client/i18n/messages/views/advancedSearchForm'
 import { ISearchLocation } from '@opencrvs/components'
 import formatDate from '@client/utils/date-formatting'
+import { isInvalidDate } from '@client/forms/advancedSearch/fieldDefinitions/utils'
 
 export type advancedSearchPillKey = Exclude<
   keyof IAdvancedSearchResultMessages,
@@ -81,6 +82,16 @@ const baseKeysSameAsStore = [
   'informantFamilyName'
 ] as const
 
+export const dateFieldTypes = [
+  'dateOfRegistration',
+  'dateOfEvent',
+  'childDoB',
+  'motherDoB',
+  'fatherDoB',
+  'deceasedDoB',
+  'informantDoB'
+]
+
 export interface IAdvancedSearchFormState {
   event?: string
   registrationStatuses?: string
@@ -501,15 +512,15 @@ export const isValidDateRangePickerValue = (
   dateRangePickerValue: IDateRangePickerValue
 ): boolean => {
   let isValid = false
-  if (!dateRangePickerValue.isDateRangeActive) {
-    if (dateRangePickerValue.exact) {
-      isValid = true
-    }
-  } else {
-    if (dateRangePickerValue.rangeStart && dateRangePickerValue.rangeEnd) {
-      isValid = true
-    }
-  }
+  if (
+    !dateRangePickerValue.isDateRangeActive &&
+    dateRangePickerValue.exact &&
+    !isInvalidDate(dateRangePickerValue.exact)
+  )
+    isValid = true
+  else if (dateRangePickerValue.rangeStart && dateRangePickerValue.rangeEnd)
+    isValid = true
+
   return isValid
 }
 
diff --git a/packages/client/src/search/advancedSearch/validators.ts b/packages/client/src/search/advancedSearch/validators.ts
new file mode 100644
index 00000000000..dbcaffb5180
--- /dev/null
+++ b/packages/client/src/search/advancedSearch/validators.ts
@@ -0,0 +1,35 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * OpenCRVS is also distributed under the terms of the Civil Registration
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
+ *
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
+ */
+import { IDateRangePickerValue, IFormFieldValue } from '@client/forms'
+import { isInvalidDate } from '@client/forms/advancedSearch/fieldDefinitions/utils'
+import { validationMessages as messages } from '@client/i18n/messages'
+
+// Type guard to check if the value is IDateRangePickerValue
+function isIDateRangePickerValue(
+  value: IFormFieldValue
+): value is IDateRangePickerValue {
+  return (value as IDateRangePickerValue).exact !== undefined
+}
+
+export const isValidDate = (value: IFormFieldValue) => {
+  if (!isIDateRangePickerValue(value)) {
+    return undefined
+  }
+
+  // if date range is active date field is not needed to be validated
+  if (value.isDateRangeActive) return undefined
+
+  const dateString = value.exact
+
+  return isInvalidDate(dateString)
+    ? { message: messages.invalidDate }
+    : undefined
+}
diff --git a/packages/client/src/views/SearchResult/AdvancedSearch.tsx b/packages/client/src/views/SearchResult/AdvancedSearch.tsx
index 9b63ce6d388..0222a82c9b5 100644
--- a/packages/client/src/views/SearchResult/AdvancedSearch.tsx
+++ b/packages/client/src/views/SearchResult/AdvancedSearch.tsx
@@ -34,6 +34,7 @@ import { IDateRangePickerValue } from '@client/forms'
 import { getOfflineData } from '@client/offline/selectors'
 import { Accordion } from '@client/../../components/lib/Accordion'
 import {
+  dateFieldTypes,
   getAccordionActiveStateMap,
   IAdvancedSearchFormState,
   isValidDateRangePickerValue,
@@ -67,16 +68,6 @@ const {
   deathSearchInformantSection
 } = advancedSearchDeathSections
 
-const dateFieldTypes = [
-  'dateOfRegistration',
-  'dateOfEvent',
-  'childDoB',
-  'motherDoB',
-  'fatherDoB',
-  'deceasedDoB',
-  'informantDoB'
-]
-
 export const isAdvancedSearchFormValid = (value: IAdvancedSearchFormState) => {
   const validNonDateFields = Object.keys(value).filter(
     (key) =>
@@ -85,16 +76,33 @@ export const isAdvancedSearchFormValid = (value: IAdvancedSearchFormState) => {
       Boolean(value[key as keyof IAdvancedSearchFormState])
   )
   //handle date fields separately
-  const validDateFields = dateFieldTypes.filter(
-    (key) =>
-      value[key as keyof IAdvancedSearchFormState] &&
-      isValidDateRangePickerValue(
-        value[key as keyof IAdvancedSearchFormState] as IDateRangePickerValue
-      )
-  )
+  const validationResultsPerDateField: boolean[] = []
 
-  const validCount = validNonDateFields.length + validDateFields.length
-  return validCount >= 2
+  for (const key of dateFieldTypes) {
+    const dateObj = value[
+      key as keyof IAdvancedSearchFormState
+    ] as IDateRangePickerValue
+
+    if (!dateObj) continue
+
+    if (isValidDateRangePickerValue(dateObj)) {
+      validationResultsPerDateField.push(true)
+      continue
+    }
+    /*
+     * if isValidDateRangePickerValue couldn't validate dateObj
+     * the date field would have an invalid value
+     */
+    if (dateObj.exact) validationResultsPerDateField.push(false)
+  }
+
+  const validCount =
+    validNonDateFields.length +
+    validationResultsPerDateField.filter((valid) => valid).length
+
+  return (
+    validCount >= 2 && validationResultsPerDateField.every((isValid) => isValid)
+  )
 }
 
 const BirthSection = () => {

From 59be90658f863ede3920b0733457ac80a96c4167 Mon Sep 17 00:00:00 2001
From: Tameem Bin Haider <tameem.haider@dsinnovators.com>
Date: Wed, 3 Jul 2024 17:38:06 +0600
Subject: [PATCH 093/108] fix: pass auth token with certs req

---
 packages/data-seeder/src/certificates.ts | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/packages/data-seeder/src/certificates.ts b/packages/data-seeder/src/certificates.ts
index 93cb6720558..8c093ede91d 100644
--- a/packages/data-seeder/src/certificates.ts
+++ b/packages/data-seeder/src/certificates.ts
@@ -27,9 +27,15 @@ const CertificateSchema = z.array(
   })
 )
 
-async function getCertificate() {
+async function getCertificate(token: string) {
   const url = new URL('certificates', COUNTRY_CONFIG_HOST).toString()
-  const res = await fetch(url)
+  const res = await fetch(url, {
+    method: 'GET',
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${token}`
+    }
+  })
   if (!res.ok) {
     raise(`Expected to get the certificates from ${url}`)
   }
@@ -118,7 +124,7 @@ async function uploadCertificate(token: string, certificate: CertificateInput) {
 }
 
 export async function seedCertificate(token: string) {
-  const certificates = await getCertificate()
+  const certificates = await getCertificate(token)
   await Promise.all(
     certificates.map(async ({ fileName, ...certificate }) => {
       await uploadCertificate(token, {

From 4669ed9f2f749e52230796e888b48b2278ccaa9e Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <ashikul.alam@dsinnovators.com>
Date: Wed, 3 Jul 2024 18:21:37 +0600
Subject: [PATCH 094/108] fix: update assignment check for retrieve action

---
 .../workflow/src/records/handler/download.ts  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/workflow/src/records/handler/download.ts b/packages/workflow/src/records/handler/download.ts
index 90d41b78140..e876bb8d031 100644
--- a/packages/workflow/src/records/handler/download.ts
+++ b/packages/workflow/src/records/handler/download.ts
@@ -55,15 +55,6 @@ export async function downloadRecordHandler(
   const token = getToken(request)
   // Task history is fetched rather than the task only
   const record = await getValidRecordById(payload.id, token, true)
-  const assignment = findAssignment(record)
-
-  if (assignment) {
-    const userOrSystem = await getUserOrSystem(token)
-    const practitionerId = userOrSystem.practitionerId
-
-    if (assignment.practitioner.id !== practitionerId)
-      throw new Error('Record is assigned to a different user')
-  }
 
   const task = getTaskFromSavedBundle(record)
   const businessStatus = getStatusFromTask(task)
@@ -85,9 +76,18 @@ export async function downloadRecordHandler(
 
   const auditRecordEvent =
     extensionUrl === 'http://opencrvs.org/specs/extension/regDownloaded'
-      ? 'downloaded'
+      ? 'downloaded' // retrieve event
       : 'assigned'
 
+  const assignment = findAssignment(record)
+  if (assignment && auditRecordEvent === 'assigned') {
+    const userOrSystem = await getUserOrSystem(token)
+    const practitionerId = userOrSystem.practitionerId
+
+    if (assignment.practitioner.id !== practitionerId)
+      throw new Error('Record is assigned to a different user')
+  }
+
   /*
    * Storing the details of the downloaded record in the database(s) is slow.
    * So we return the requested record to the requesting users optimistically immediately.

From e3306f52f184417d8418dc4713f14b5f022e7e46 Mon Sep 17 00:00:00 2001
From: Tameem Bin Haider <tameem.haider@dsinnovators.com>
Date: Wed, 3 Jul 2024 17:57:02 +0600
Subject: [PATCH 095/108] fix: redis hostname

---
 docker-compose.yml                 | 2 +-
 packages/webhooks/src/constants.ts | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b57fd8f0120..dc599b9f4cf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -151,7 +151,7 @@ services:
       dockerfile: ./packages/webhooks/Dockerfile
     restart: unless-stopped
     environment:
-      - REDIS_HOST=redis://redis:6379
+      - REDIS_HOST=redis
       - MONGO_URL=mongodb://mongo1/webhooks
       - AUTH_URL=http://auth:4040
       - USER_MANAGEMENT_URL=http://user-mgnt:3030/
diff --git a/packages/webhooks/src/constants.ts b/packages/webhooks/src/constants.ts
index 2c31da5cdf1..e766117025d 100644
--- a/packages/webhooks/src/constants.ts
+++ b/packages/webhooks/src/constants.ts
@@ -29,7 +29,6 @@ export const FHIR_URL = process.env.FHIR_URL || 'http://localhost:3447/fhir'
 // This needs to be a string to make it easy to pass as an ENV var.
 export const CHECK_INVALID_TOKEN = process.env.CHECK_INVALID_TOKEN || 'false'
 export const REDIS_HOST = process.env.REDIS_HOST || 'localhost'
-export const REDIS_PORT = parseInt(process.env.REDIS_PORT || '6379', 10)
 export const QUEUE_NAME = 'NOTIFY_URL'
 export const OPENCRVS_SPECIFICATION_URL = 'http://opencrvs.org/specs/'
 export const DEFAULT_TIMEOUT = 600000

From 7ff23a8e3e16e240a9ee32bf4137e88b0d025ea0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 4 Jul 2024 10:55:01 +0300
Subject: [PATCH 096/108] chore(v1.5.0): changelog (#7330)

Co-authored-by: Pyry Rouvila <pyry@opencrvs.org>
---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32b0f3593e7..496a1d53c51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,12 @@
   - `compressImagesToSizeMB` : An optional prop of number type to define a compressed size. Compression is ignored when the input file is already smaller or equal of the given value or a falsy given value.
   - `maxSizeMB`: An optional validation prop to prevent input of a file bigger than a defined value.
 - Metabase default credentials now must be configured via countryconfig repository environment variables and secrets otherwise the dashboard service won't start [#6578](https://github.com/opencrvs/opencrvs-core/issues/6578)
+- Introduce rate limiting to routes that could potentially be bruteforced or extracted PII from [#6145](https://github.com/opencrvs/opencrvs-core/pull/6145)
+
+## Improvements
+
+- Development time logs are now much tidier and errors easier to point out. Production logging will still remain as is. [#7022](https://github.com/opencrvs/opencrvs-core/pull/7022)
+- Mask emails and phone numbers from notification logs [#7204](https://github.com/opencrvs/opencrvs-core/pull/7204)
 
 ## Bug fixes
 
@@ -43,6 +49,7 @@
 - Fix certificate verification QR code for a death declaration [#6230](https://github.com/opencrvs/opencrvs-core/issues/6230#issuecomment-1996766125)
 - Fix certificate verification QR code crashing when gender is unknown [#6422](https://github.com/opencrvs/opencrvs-core/issues/6422)
 - Fix certificate verification page missing registration center and the name of registrar [#6614](https://github.com/opencrvs/opencrvs-core/issues/6614)
+- Amend certificate verification showing the certifying date instead of records creation date [#7098](https://github.com/opencrvs/opencrvs-core/pull/7098)
 - Fix records not getting issued [#6216] (https://github.com/opencrvs/opencrvs-core/issues/6216)
 - Fix record correction e2e failing due to stale data getting saved on redux
 - Convert eventDates to LocalDate before formatting [#6719](https://github.com/opencrvs/opencrvs-core/issues/6719)
@@ -77,6 +84,9 @@
 - Fix search indexing BRN's in place of identifiers. Adds spouseIdentifier to search with [#7189](https://github.com/opencrvs/opencrvs-core/pull/7189)
 - Rename `farajaland-map.geojson` in dashboards to `map.geojson` to not tie opencrvs-core into a specific country implementation name [#7251](https://github.com/opencrvs/opencrvs-core/pull/7251)
 - Fix unassign action not appearing in audit history [#7035](https://github.com/opencrvs/opencrvs-core/pull/7072)
+- Update advanced search list properly when assignments change [#7307](https://github.com/opencrvs/opencrvs-core/pull/7307)
+- Update Content-Security-Policy to allow loading fonts from country configuration [#7296](https://github.com/opencrvs/opencrvs-core/pull/7296)
+- Fix frontend crashing on 'Registration by Status' under performance due to missing translations [#7129](https://github.com/opencrvs/opencrvs-core/pull/7129)
 
 ## Refactor
 

From 885f823dc4f74750e4c13a6a09542faa49aff1c4 Mon Sep 17 00:00:00 2001
From: Tareq <tareq.aziz@dsinnovators.com>
Date: Wed, 3 Jul 2024 20:29:12 +0600
Subject: [PATCH 097/108] Refactor client/transformer to improve document
 change tracking

---
 packages/client/src/transformer/index.ts | 25 ++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/transformer/index.ts b/packages/client/src/transformer/index.ts
index ba92cd15e88..d717cccdd3a 100644
--- a/packages/client/src/transformer/index.ts
+++ b/packages/client/src/transformer/index.ts
@@ -36,7 +36,7 @@ import {
 } from '@client/utils/gateway'
 import { UserDetails } from '@client/utils/userUtils'
 import { hasFieldChanged } from '@client/views/CorrectionForm/utils'
-import { get } from 'lodash'
+import { get, isEmpty } from 'lodash'
 
 const nestedFieldsMapping = (
   transformedData: TransformedData,
@@ -61,6 +61,24 @@ const nestedFieldsMapping = (
   }
 }
 
+const documentChangedValue = (
+  section: IFormSection,
+  fieldDef: IFormField,
+  draftData: IFormData,
+  originalDraftData: IFormData
+): CorrectionValueInput => {
+  const generateValue = (data: IFormData, prefix: string) =>
+    isEmpty(data[section.id][fieldDef.name])
+      ? ''
+      : `${prefix} ${fieldDef.label.defaultMessage}`
+
+  return {
+    section: section.id,
+    fieldName: fieldDef.name,
+    newValue: generateValue(draftData, 'New'),
+    oldValue: generateValue(originalDraftData, 'Old')
+  }
+}
 const toCorrectionValue = (
   section: IFormSection,
   fieldDef: IFormField,
@@ -124,6 +142,10 @@ const toCorrectionValue = (
         changedValues.push(...nestedChangedValues)
       }
     }
+  } else if (section.id === 'documents') {
+    changedValues.push(
+      documentChangedValue(section, fieldDef, draftData, originalDraftData)
+    )
   } else {
     changedValues.push({
       section: section.id,
@@ -176,7 +198,6 @@ export function getChangedValues(
         if (
           !conditionalActions.includes('hide') &&
           !conditionalActions.includes('disable') &&
-          !(section.id === 'documents') &&
           hasFieldChanged(
             fieldDef,
             draftData[section.id],

From 523d4482aa6c106a6279bf32035a73d1b11bd325 Mon Sep 17 00:00:00 2001
From: github-actions <github-actions@github.com>
Date: Thu, 4 Jul 2024 10:19:15 +0000
Subject: [PATCH 098/108] Placeholder commit for PR #7023


From 96b0c31b772f3f4d1840adc56aa27deb8946d333 Mon Sep 17 00:00:00 2001
From: Jamil <jamil31415926@gmail.com>
Date: Thu, 4 Jul 2024 16:34:56 +0600
Subject: [PATCH 099/108] fix: email of practitioner (#7315)

* fix: use `emailForNotification` in telecom email

* fix: added migration to correct practitioner email

* fix: createUser test for correct practitioner email

* amend: using iterator pattern to optimize memory usage

* chore: update changelog
---
 CHANGELOG.md                                  |  1 +
 .../20240703161352-fix-practitioner-email.ts  | 47 +++++++++++++++++++
 .../src/features/createUser/handler.test.ts   |  2 +-
 .../src/features/createUser/service.ts        |  4 +-
 4 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 packages/migration/src/migrations/hearth/20240703161352-fix-practitioner-email.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 496a1d53c51..f43d9bcae3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -87,6 +87,7 @@
 - Update advanced search list properly when assignments change [#7307](https://github.com/opencrvs/opencrvs-core/pull/7307)
 - Update Content-Security-Policy to allow loading fonts from country configuration [#7296](https://github.com/opencrvs/opencrvs-core/pull/7296)
 - Fix frontend crashing on 'Registration by Status' under performance due to missing translations [#7129](https://github.com/opencrvs/opencrvs-core/pull/7129)
+- Fix email of practitioner to be saved in hearth. A migration is added to correct the email of practitoiner in existing db. [7315](https://github.com/opencrvs/opencrvs-core/pull/7315)
 
 ## Refactor
 
diff --git a/packages/migration/src/migrations/hearth/20240703161352-fix-practitioner-email.ts b/packages/migration/src/migrations/hearth/20240703161352-fix-practitioner-email.ts
new file mode 100644
index 00000000000..f6791712da4
--- /dev/null
+++ b/packages/migration/src/migrations/hearth/20240703161352-fix-practitioner-email.ts
@@ -0,0 +1,47 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * OpenCRVS is also distributed under the terms of the Civil Registration
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
+ *
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
+ */
+
+import { Db, MongoClient } from 'mongodb'
+
+const USER_MGNT_MONGO_URL =
+  process.env.USER_MGNT_MONGO_URL || 'mongodb://localhost/user-mgnt'
+
+export const up = async (db: Db, client: MongoClient) => {
+  const userMgntDb = (await new MongoClient(USER_MGNT_MONGO_URL).connect()).db()
+
+  const practitioners = db.collection('Practitioner').find({})
+
+  for await (const practitioner of practitioners) {
+    const user = await userMgntDb
+      .collection('users')
+      .findOne({ practitionerId: practitioner.id })
+
+    if (user && user.emailForNotification) {
+      await db.collection('Practitioner').updateOne(
+        { _id: practitioner._id, 'telecom.system': 'email' },
+        {
+          $set: {
+            'telecom.$[elem].value': user.emailForNotification
+          }
+        },
+        {
+          arrayFilters: [{ 'elem.system': 'email' }]
+        }
+      )
+    }
+  }
+}
+
+export const down = async (db: Db, client: MongoClient) => {
+  // Add migration logic for reverting changes made by the up() function
+  // This code will be executed when rolling back the migration
+  // It should reverse the changes made in the up() function
+}
diff --git a/packages/user-mgnt/src/features/createUser/handler.test.ts b/packages/user-mgnt/src/features/createUser/handler.test.ts
index cfa2518fae0..0acb3ead9b9 100644
--- a/packages/user-mgnt/src/features/createUser/handler.test.ts
+++ b/packages/user-mgnt/src/features/createUser/handler.test.ts
@@ -130,7 +130,7 @@ describe('createUser handler', () => {
         ],
         username: 'j.doe1',
         identifiers: [{ system: 'NID', value: '1234' }],
-        email: 'j.doe@gmail.com',
+        emailForNotification: 'j.doe@gmail.com',
         mobile: '+880123445568',
         systemRole: 'FIELD_AGENT',
         role: new Types.ObjectId('6348acd2e1a47ca32e79f46f'),
diff --git a/packages/user-mgnt/src/features/createUser/service.ts b/packages/user-mgnt/src/features/createUser/service.ts
index 54a17b62213..0e7ac0e8732 100644
--- a/packages/user-mgnt/src/features/createUser/service.ts
+++ b/packages/user-mgnt/src/features/createUser/service.ts
@@ -23,7 +23,7 @@ export const createFhirPractitioner = (
       identifier: user.identifiers,
       telecom: [
         { system: 'phone', value: user.mobile },
-        { system: 'email', value: user.email }
+        { system: 'email', value: user.emailForNotification }
       ],
       name: [
         {
@@ -39,7 +39,7 @@ export const createFhirPractitioner = (
       identifier: user.identifiers,
       telecom: [
         { system: 'phone', value: user.mobile },
-        { system: 'email', value: user.email }
+        { system: 'email', value: user.emailForNotification }
       ],
       name: user.name,
       extension: user.signature && [

From 7f69ae19a17ee19f78562187482ea5d8626e7758 Mon Sep 17 00:00:00 2001
From: "Md. Ashikul Alam" <32668488+Nil20@users.noreply.github.com>
Date: Thu, 4 Jul 2024 16:18:31 +0600
Subject: [PATCH 100/108] fix: track custom field changes for correction
 (#7023)

* chore: rename constants related to fieldChange functions

* fix: track custom field value changes
---
 CHANGELOG.md                                  |  1 +
 .../client/src/views/CorrectionForm/utils.ts  | 24 ++++++++++-------
 .../RegisterForm/review/ReviewSection.tsx     | 27 +++++++++++++------
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 496a1d53c51..3549962c6e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@
 - Fix Registrar of any location should be able to review a correction request [#6247](https://github.com/opencrvs/opencrvs-core/issues/6247)
 - remove upload button when no supporting docs are configured [#5944](https://github.com/opencrvs/opencrvs-core/issues/5944)
 - Fix issues of invisible inputs when navigating from can't login link in login page [#6163](https://github.com/opencrvs/opencrvs-core/issues/6163)
+- Fix the "Continue" button being disabled when changes in correction form is made [#6780](https://github.com/opencrvs/opencrvs-core/issues/6780)
 - Remove leading slash from `resendAuthenticationCode` in login to fix resend email button [#6987](https://github.com/opencrvs/opencrvs-core/issues/6987) [#7037](https://github.com/opencrvs/opencrvs-core/issues/7037)
 - Fix 'Place of Certification' is showing wrong in certificate [#7060] (https://github.com/opencrvs/opencrvs-core/issues/7060)
 - Fix dashboard cron jobs not working [#7016](https://github.com/opencrvs/opencrvs-core/issues/7016)
diff --git a/packages/client/src/views/CorrectionForm/utils.ts b/packages/client/src/views/CorrectionForm/utils.ts
index 5800483d5a1..e4c1cb43242 100644
--- a/packages/client/src/views/CorrectionForm/utils.ts
+++ b/packages/client/src/views/CorrectionForm/utils.ts
@@ -564,28 +564,32 @@ export const renderValue = (
 
 export function hasFieldChanged(
   field: IFormField,
-  data: IFormSectionData,
-  originalData?: IFormSectionData
+  sectionData: IFormSectionData,
+  originalSectionData?: IFormSectionData
 ) {
-  if (!originalData) return false
-  if (data[field.name] && (data[field.name] as IFormData).value) {
+  if (!originalSectionData) {
+    const isCustomSection = sectionData && sectionData[field.name]
+    if (isCustomSection) return true
+    return false
+  }
+  if (sectionData[field.name] && (sectionData[field.name] as IFormData).value) {
     return hasNestedDataChanged(
-      data[field.name] as IFormData,
-      originalData[field.name] as IFormData
+      sectionData[field.name] as IFormData,
+      originalSectionData[field.name] as IFormData
     )
   }
   /*
    * data section might have some values as empty string
    * whereas original data section have them as undefined
    */
-  if (!originalData[field.name] && data[field.name] === '') {
+  if (!originalSectionData[field.name] && sectionData[field.name] === '') {
     return false
   }
 
-  if (Array.isArray(data[field.name])) {
-    return !isEqual(data[field.name], originalData[field.name])
+  if (Array.isArray(sectionData[field.name])) {
+    return !isEqual(sectionData[field.name], originalSectionData[field.name])
   }
-  return data[field.name] !== originalData[field.name]
+  return sectionData[field.name] !== originalSectionData[field.name]
 }
 
 function hasNestedDataChanged(
diff --git a/packages/client/src/views/RegisterForm/review/ReviewSection.tsx b/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
index 720a9c14da7..2406c5fe537 100644
--- a/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
+++ b/packages/client/src/views/RegisterForm/review/ReviewSection.tsx
@@ -1226,25 +1226,36 @@ class ReviewSectionComp extends React.Component<FullProps, State> {
 
   hasFieldChanged(
     field: IFormField,
-    data: IFormSectionData,
-    originalData?: IFormSectionData
+    sectionData: IFormSectionData,
+    originalSectionData?: IFormSectionData
   ) {
-    if (!originalData) return false
-    if (data[field.name] && (data[field.name] as IFormData).value) {
+    if (!originalSectionData) {
+      const isCustomSection = sectionData && sectionData[field.name]
+      if (isCustomSection) {
+        this.hasChangesBeenMade = true
+        return true
+      }
+      return false
+    }
+    if (
+      sectionData[field.name] &&
+      (sectionData[field.name] as IFormData).value
+    ) {
       return this.hasNestedDataChanged(
-        data[field.name] as IFormData,
-        originalData[field.name] as IFormData
+        sectionData[field.name] as IFormData,
+        originalSectionData[field.name] as IFormData
       )
     }
     /*
      * data section might have some values as empty string
      * whereas original data section have them as undefined
      */
-    if (!originalData[field.name] && data[field.name] === '') {
+    if (!originalSectionData[field.name] && sectionData[field.name] === '') {
       return false
     }
 
-    const hasChanged = data[field.name] !== originalData[field.name]
+    const hasChanged =
+      sectionData[field.name] !== originalSectionData[field.name]
     this.hasChangesBeenMade = this.hasChangesBeenMade || hasChanged
     return hasChanged
   }

From 24df57c1ebf5273b6939c4e5d329edf8db6e47a6 Mon Sep 17 00:00:00 2001
From: Tameem Bin Haider <tameem.haider@dsinnovators.com>
Date: Wed, 3 Jul 2024 15:58:24 +0600
Subject: [PATCH 101/108] fix: fetch Documents after resolving Encounters

---
 packages/search/src/features/records/service.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/search/src/features/records/service.ts b/packages/search/src/features/records/service.ts
index fbcc11238a7..d75381f53ce 100644
--- a/packages/search/src/features/records/service.ts
+++ b/packages/search/src/features/records/service.ts
@@ -506,13 +506,6 @@ export async function getRecordById<T extends Array<keyof StateIdenfitiers>>(
       'Observation'
     ),
 
-    // Get DocumentReferences by Encounter ids
-    // (Encounter.id -> DocumentReference.subject.reference)
-    ...joinFromResourcesIdToResourceIdentifier(
-      'Encounter',
-      'subject.reference',
-      'DocumentReference'
-    ),
     {
       $addFields: {
         /*
@@ -670,6 +663,13 @@ export async function getRecordById<T extends Array<keyof StateIdenfitiers>>(
         bundle: { $concatArrays: ['$bundle', '$joinResult'] }
       }
     },
+    // Get DocumentReferences by Encounter ids
+    // (Encounter.id -> DocumentReference.subject.reference)
+    ...joinFromResourcesIdToResourceIdentifier(
+      'Encounter',
+      'subject.reference',
+      'DocumentReference'
+    ),
     // Get Locations by Encounter location ids
     {
       $lookup: {

From 812513fb1349d7fa938a1388157cf00346f3a7d4 Mon Sep 17 00:00:00 2001
From: jamil314 <jamil31415926@gmail.com>
Date: Thu, 4 Jul 2024 19:27:08 +0600
Subject: [PATCH 102/108] fix: show comment section when there is no comment in
 record audit modal

---
 packages/client/src/views/RecordAudit/ActionDetailsModal.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx b/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
index 215ff74b5c0..14a3e594587 100644
--- a/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
+++ b/packages/client/src/views/RecordAudit/ActionDetailsModal.tsx
@@ -87,9 +87,9 @@ function retrieveCorrectionComment(actionDetailsData: History) {
     return []
   }
 
-  const comment = actionDetailsData.comments[1]?.comment
+  const comment = actionDetailsData.comments[1]?.comment || ''
 
-  return comment ? [{ comment }] : []
+  return [{ comment }]
 }
 
 function getHistories(draft: IDeclaration | null) {

From 8d7f71e1606d46f2482ae94e37add8c5001f4b3d Mon Sep 17 00:00:00 2001
From: Tameem Bin Haider <tameem.haider@dsinnovators.com>
Date: Fri, 5 Jul 2024 11:54:37 +0600
Subject: [PATCH 103/108] fix: sync review button logic in adv search result

---
 .../AdvancedSearch/AdvancedSearchResult.tsx   | 61 ++++++++++---------
 .../src/views/SearchResult/SearchResult.tsx   |  4 --
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/packages/client/src/views/AdvancedSearch/AdvancedSearchResult.tsx b/packages/client/src/views/AdvancedSearch/AdvancedSearchResult.tsx
index eea3c70070a..5b9438ef381 100644
--- a/packages/client/src/views/AdvancedSearch/AdvancedSearchResult.tsx
+++ b/packages/client/src/views/AdvancedSearch/AdvancedSearchResult.tsx
@@ -40,13 +40,17 @@ import {
   errorMessages
 } from '@client/i18n/messages'
 import { messages as advancedSearchResultMessages } from '@client/i18n/messages/views/advancedSearchResult'
-import { RegStatus, SearchEventsQuery } from '@client/utils/gateway'
+import { SearchEventsQuery } from '@client/utils/gateway'
 import { Frame } from '@opencrvs/components/lib/Frame'
 import { LoadingIndicator } from '@client/views/OfficeHome/LoadingIndicator'
 import { Redirect, RouteComponentProps } from 'react-router'
 import { ErrorText, Link, Pill } from '@client/../../components/lib'
 import { WQContentWrapper } from '@client/views/OfficeHome/WQContentWrapper'
-import { HOME, REVIEW_EVENT_PARENT_FORM_PAGE } from '@client/navigation/routes'
+import {
+  HOME,
+  REVIEW_CORRECTION,
+  REVIEW_EVENT_PARENT_FORM_PAGE
+} from '@client/navigation/routes'
 import {
   ColumnContentAlignment,
   COLUMNS,
@@ -207,9 +211,6 @@ const AdvancedSearchResultComp = (props: IFullProps) => {
   const userHasCertifyScope = () => {
     return props.scope && props.scope.includes('certify')
   }
-  const userHasValidateOrRegistrarScope = () => {
-    return userHasValidateScope() || userHasRegisterScope()
-  }
 
   const transformSearchContent = (data: QueryData) => {
     if (!data || !data.results) {
@@ -231,26 +232,35 @@ const AdvancedSearchResultComp = (props: IFullProps) => {
         const downloadStatus =
           (foundDeclaration && foundDeclaration.downloadStatus) || undefined
 
-        const declarationIsArchived =
-          reg.declarationStatus === RegStatus.Archived
         const declarationIsRequestedCorrection =
           reg.declarationStatus === 'REQUESTED_CORRECTION'
-        const declarationIsRegistered =
-          reg.declarationStatus === RegStatus.Registered
-        const declarationIsCertified =
-          reg.declarationStatus === RegStatus.Certified
-        const declarationIsRejected =
-          reg.declarationStatus === RegStatus.Rejected
-        const declarationIsValidated =
-          reg.declarationStatus === RegStatus.Validated
-        const declarationIsInProgress =
-          reg.declarationStatus === RegStatus.InProgress
-        const declarationIsIssued = reg.declarationStatus === RegStatus.Issued
+        const declarationIsRegistered = reg.declarationStatus === 'REGISTERED'
+        const declarationIsCertified = reg.declarationStatus === 'CERTIFIED'
+        const declarationIsRejected = reg.declarationStatus === 'REJECTED'
+        const declarationIsValidated = reg.declarationStatus === 'VALIDATED'
+        const declarationIsInProgress = reg.declarationStatus === 'IN_PROGRESS'
+        const declarationIsIssued = reg.declarationStatus === 'ISSUED'
+        const isDeclared = reg.declarationStatus === 'DECLARED'
+        const declarationIsCorrectionRequested =
+          reg.declarationStatus === 'CORRECTION_REQUESTED'
         const isDuplicate =
           reg.duplicates &&
           reg.duplicates.length > 0 &&
           reg.declarationStatus !== SUBMISSION_STATUS.CERTIFIED &&
           reg.declarationStatus !== SUBMISSION_STATUS.REGISTERED
+        const isDeclarationReviewableByRegistrar =
+          declarationIsRejected ||
+          declarationIsValidated ||
+          declarationIsCorrectionRequested ||
+          isDeclared ||
+          declarationIsInProgress
+
+        const isDeclarationReviewableByRegAgent =
+          isDeclared || declarationIsInProgress || declarationIsRejected
+
+        const shouldShowReviewButton =
+          (userHasRegisterScope() && isDeclarationReviewableByRegistrar) ||
+          (userHasValidateScope() && isDeclarationReviewableByRegAgent)
         if (windowWidth > props.theme.grid.breakpoints.lg) {
           if (
             (declarationIsRegistered || declarationIsIssued) &&
@@ -277,14 +287,7 @@ const AdvancedSearchResultComp = (props: IFullProps) => {
               },
               disabled: downloadStatus !== DOWNLOAD_STATUS.DOWNLOADED
             })
-          } else if (
-            (declarationIsValidated && userHasRegisterScope()) ||
-            (!declarationIsValidated &&
-              !declarationIsRegistered &&
-              !declarationIsCertified &&
-              !declarationIsArchived &&
-              userHasValidateOrRegistrarScope())
-          ) {
+          } else if (shouldShowReviewButton) {
             actions.push({
               label:
                 declarationIsRejected || declarationIsInProgress
@@ -292,7 +295,9 @@ const AdvancedSearchResultComp = (props: IFullProps) => {
                   : intl.formatMessage(constantsMessages.review),
               handler: () =>
                 props.goToPage(
-                  REVIEW_EVENT_PARENT_FORM_PAGE,
+                  reg.declarationStatus === 'CORRECTION_REQUESTED'
+                    ? REVIEW_CORRECTION
+                    : REVIEW_EVENT_PARENT_FORM_PAGE,
                   reg.id,
                   'review',
                   reg.event.toLowerCase()
@@ -468,7 +473,7 @@ const SearchModifierComponent = () => {
   return (
     <>
       <SearchParamContainer>
-        {Object.keys(formattedMapOfParams).map((pillKey, i) => {
+        {Object.keys(formattedMapOfParams).map((pillKey) => {
           return (
             <Pill
               key={pillKey}
diff --git a/packages/client/src/views/SearchResult/SearchResult.tsx b/packages/client/src/views/SearchResult/SearchResult.tsx
index e2447b9f5ea..1670241c5ec 100644
--- a/packages/client/src/views/SearchResult/SearchResult.tsx
+++ b/packages/client/src/views/SearchResult/SearchResult.tsx
@@ -235,10 +235,6 @@ class SearchResultView extends React.Component<
     return this.props.scope && this.props.scope.includes('certify')
   }
 
-  userHasValidateOrRegistrarScope() {
-    return this.userHasValidateScope() || this.userHasRegisterScope()
-  }
-
   transformSearchContent = (data: QueryData) => {
     if (!data || !data.results) {
       return []

From 0cf360d7ecfefb26601c706959506e928b38fa15 Mon Sep 17 00:00:00 2001
From: Tameem Bin Haider <tameem.haider@dsinnovators.com>
Date: Fri, 5 Jul 2024 16:34:37 +0600
Subject: [PATCH 104/108] feat: send notification for rejection event (#7345)

* feat: send notification for rejection event

* fix: use key for death inProgress notification

* chore: use util functions
---
 packages/notification/src/config/routes.ts    |  26 ++++
 .../src/features/inProgress/handler.ts        | 114 ++----------------
 .../src/features/sentForUpdates/handler.ts    |  73 +++++++++++
 packages/notification/src/features/utils.ts   |  24 +++-
 .../utilsForPartiallyCompletedRecord.ts       |  70 +++++++++++
 .../workflow/src/records/handler/reject.ts    |   2 +
 packages/workflow/src/records/notification.ts |  10 +-
 packages/workflow/test/handlers.ts            |   2 +-
 8 files changed, 211 insertions(+), 110 deletions(-)
 create mode 100644 packages/notification/src/features/sentForUpdates/handler.ts
 create mode 100644 packages/notification/src/features/utilsForPartiallyCompletedRecord.ts

diff --git a/packages/notification/src/config/routes.ts b/packages/notification/src/config/routes.ts
index 33ccb302f74..9bf78f9cae8 100644
--- a/packages/notification/src/config/routes.ts
+++ b/packages/notification/src/config/routes.ts
@@ -59,6 +59,10 @@ import {
   birthRegisterNotification,
   deathRegisterNotification
 } from '@notification/features/register/handler'
+import {
+  birthSentForUpdatesNotification,
+  deathSentForUpdatesNotification
+} from '@notification/features/sentForUpdates/handler'
 
 const enum RouteScope {
   DECLARE = 'declare',
@@ -191,6 +195,28 @@ export default function getRoutes(): ServerRoute<ReqRefDefaults>[] {
         validate: recordValidation
       }
     },
+    {
+      method: 'POST',
+      path: '/birth/sent-for-updates',
+      handler: birthSentForUpdatesNotification,
+      options: {
+        tags: ['api'],
+        description:
+          'Sends a notification to country config for rejected birth declaration',
+        validate: recordValidation
+      }
+    },
+    {
+      method: 'POST',
+      path: '/death/sent-for-updates',
+      handler: deathSentForUpdatesNotification,
+      options: {
+        tags: ['api'],
+        description:
+          'Sends a notification to country config for rejected death declaration',
+        validate: recordValidation
+      }
+    },
     {
       method: 'POST',
       path: '/birthInProgressSMS',
diff --git a/packages/notification/src/features/inProgress/handler.ts b/packages/notification/src/features/inProgress/handler.ts
index 2aa9c5d7bca..4d18522a1f5 100644
--- a/packages/notification/src/features/inProgress/handler.ts
+++ b/packages/notification/src/features/inProgress/handler.ts
@@ -9,108 +9,18 @@
  * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
  */
 import { Request, ResponseToolkit } from '@hapi/hapi'
-import { getDefaultLanguage } from '@notification/i18n/utils'
-import {
-  findCompositionSection,
-  findExtension,
-  findResourceFromBundleById,
-  getComposition,
-  getResourceFromBundleById,
-  getStatusFromTask,
-  getTaskFromSavedBundle,
-  getTrackingId,
-  InProgressRecord,
-  Location,
-  Patient,
-  RelatedPerson,
-  resourceIdentifierToUUID,
-  SavedRelatedPerson
-} from '@opencrvs/commons/types'
+import { getTrackingId, InProgressRecord } from '@opencrvs/commons/types'
 import { sendNotification } from '@notification/features/sms/utils'
 import { messageKeys } from '@notification/i18n/messages'
-import { badRequest as boomBadRequest } from '@hapi/boom'
-
-function badRequest(record: InProgressRecord, message: string): never {
-  const task = getTaskFromSavedBundle(record)
-  const taskStatus = getStatusFromTask(task)
-  throw boomBadRequest(`${message} in ${taskStatus} record`)
-}
-
-function getOfficeName(record: InProgressRecord) {
-  const task = getTaskFromSavedBundle(record)
-  const officeExtension = findExtension(
-    'http://opencrvs.org/specs/extension/regLastOffice',
-    task.extension
-  )
-  return officeExtension?.valueString
-}
-
-function getInformantName(record: InProgressRecord) {
-  const composition = getComposition(record)
-  const informantSection = findCompositionSection(
-    'informant-details',
-    composition
-  )
-  if (!informantSection) {
-    return null
-  }
-  const informantRelation: Partial<SavedRelatedPerson> =
-    getResourceFromBundleById<RelatedPerson>(
-      record,
-      resourceIdentifierToUUID(informantSection.entry[0].reference)
-    )
-  if (!informantRelation.patient?.reference) {
-    return null
-  }
-  const informant = findResourceFromBundleById<Patient>(
-    record,
-    resourceIdentifierToUUID(informantRelation.patient.reference)
-  )
-  const name = informant?.name?.find(({ use }) => use === 'en')
-  if (!name) {
-    return null
-  }
-  return [name.given?.join(' '), name.family.join(' ')].join(' ').trim()
-}
-
-function getRegistrationLocation(record: InProgressRecord) {
-  const task = getTaskFromSavedBundle(record)
-  const locationExtension = findExtension(
-    'http://opencrvs.org/specs/extension/regLastLocation',
-    task.extension
-  )
-  if (!locationExtension) {
-    badRequest(record, 'no last registration office found')
-  }
-  const location = getResourceFromBundleById<Location>(
-    record,
-    resourceIdentifierToUUID(locationExtension.valueReference.reference)
-  )
-  const language = getDefaultLanguage()
-  return (
-    (language === 'en'
-      ? location.name
-      : location.alias?.[0] ?? location.name) ?? ''
-  )
-}
-
-function getContactPhoneNo(record: InProgressRecord) {
-  const task = getTaskFromSavedBundle(record)
-  const phoneNumberExtension = findExtension(
-    'http://opencrvs.org/specs/extension/contact-person-phone-number',
-    task.extension
-  )
-  return phoneNumberExtension?.valueString
-}
-
-function getContactEmail(record: InProgressRecord) {
-  const task = getTaskFromSavedBundle(record)
-  const emailExtension = findExtension(
-    'http://opencrvs.org/specs/extension/contact-person-email',
-    task.extension
-  )
-  return emailExtension?.valueString
-}
+import {
+  getOfficeName,
+  getRegistrationLocation
+} from '@notification/features/utils'
+import {
+  getContactEmail,
+  getContactPhoneNo,
+  getInformantName
+} from '@notification/features/utilsForPartiallyCompletedRecord'
 
 export async function birthInProgressNotification(
   req: Request,
@@ -144,8 +54,8 @@ export async function deathInProgressNotification(
   const inProgressRecord = req.payload as InProgressRecord
   await sendNotification(
     {
-      sms: messageKeys.birthInProgressNotification,
-      email: messageKeys.birthInProgressNotification
+      sms: messageKeys.deathInProgressNotification,
+      email: messageKeys.deathInProgressNotification
     },
     {
       sms: getContactPhoneNo(inProgressRecord),
diff --git a/packages/notification/src/features/sentForUpdates/handler.ts b/packages/notification/src/features/sentForUpdates/handler.ts
new file mode 100644
index 00000000000..c188e57375c
--- /dev/null
+++ b/packages/notification/src/features/sentForUpdates/handler.ts
@@ -0,0 +1,73 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * OpenCRVS is also distributed under the terms of the Civil Registration
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
+ *
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
+ */
+import { Request, ResponseToolkit } from '@hapi/hapi'
+import { getTrackingId, RejectedRecord } from '@opencrvs/commons/types'
+import { sendNotification } from '@notification/features/sms/utils'
+import { messageKeys } from '@notification/i18n/messages'
+import {
+  getOfficeName,
+  getRegistrationLocation
+} from '@notification/features/utils'
+import {
+  getContactEmail,
+  getContactPhoneNo,
+  getInformantName
+} from '@notification/features/utilsForPartiallyCompletedRecord'
+
+export async function birthSentForUpdatesNotification(
+  req: Request,
+  h: ResponseToolkit
+) {
+  const rejectedRecord = req.payload as RejectedRecord
+  await sendNotification(
+    {
+      sms: messageKeys.birthRejectionNotification,
+      email: messageKeys.birthRejectionNotification
+    },
+    {
+      sms: getContactPhoneNo(rejectedRecord),
+      email: getContactEmail(rejectedRecord)
+    },
+    'informant',
+    {
+      trackingId: getTrackingId(rejectedRecord),
+      crvsOffice: getOfficeName(rejectedRecord),
+      registrationLocation: getRegistrationLocation(rejectedRecord),
+      informantName: getInformantName(rejectedRecord)
+    }
+  )
+  return h.response().code(200)
+}
+
+export async function deathSentForUpdatesNotification(
+  req: Request,
+  h: ResponseToolkit
+) {
+  const rejectedRecord = req.payload as RejectedRecord
+  await sendNotification(
+    {
+      sms: messageKeys.deathRejectionNotification,
+      email: messageKeys.deathRejectionNotification
+    },
+    {
+      sms: getContactPhoneNo(rejectedRecord),
+      email: getContactEmail(rejectedRecord)
+    },
+    'informant',
+    {
+      trackingId: getTrackingId(rejectedRecord),
+      crvsOffice: getOfficeName(rejectedRecord),
+      registrationLocation: getRegistrationLocation(rejectedRecord),
+      informantName: getInformantName(rejectedRecord)
+    }
+  )
+  return h.response().code(200)
+}
diff --git a/packages/notification/src/features/utils.ts b/packages/notification/src/features/utils.ts
index 14f1d3cdb1a..df36f5d61a1 100644
--- a/packages/notification/src/features/utils.ts
+++ b/packages/notification/src/features/utils.ts
@@ -20,10 +20,12 @@ import {
   getTaskFromSavedBundle,
   Location,
   Patient,
+  InProgressRecord,
   ReadyForReviewRecord,
   RegisteredRecord,
   RelatedPerson,
-  resourceIdentifierToUUID
+  resourceIdentifierToUUID,
+  RejectedRecord
 } from '@opencrvs/commons/types'
 import { badRequest as boomBadRequest } from '@hapi/boom'
 
@@ -50,7 +52,11 @@ export function getContactEmail(
 }
 
 function error(
-  record: ReadyForReviewRecord | RegisteredRecord,
+  record:
+    | ReadyForReviewRecord
+    | RegisteredRecord
+    | InProgressRecord
+    | RejectedRecord,
   message: string
 ): never {
   const task = getTaskFromSavedBundle(record)
@@ -58,7 +64,13 @@ function error(
   throw boomBadRequest(`${message} in ${taskStatus} record`)
 }
 
-export function getOfficeName(record: ReadyForReviewRecord | RegisteredRecord) {
+export function getOfficeName(
+  record:
+    | ReadyForReviewRecord
+    | RegisteredRecord
+    | InProgressRecord
+    | RejectedRecord
+) {
   const task = getTaskFromSavedBundle(record)
   const officeExtension = findExtension(
     'http://opencrvs.org/specs/extension/regLastOffice',
@@ -121,7 +133,11 @@ export function getPersonName(
 }
 
 export function getRegistrationLocation(
-  record: ReadyForReviewRecord | RegisteredRecord
+  record:
+    | ReadyForReviewRecord
+    | RegisteredRecord
+    | InProgressRecord
+    | RejectedRecord
 ) {
   const task = getTaskFromSavedBundle(record)
   const locationExtension = findExtension(
diff --git a/packages/notification/src/features/utilsForPartiallyCompletedRecord.ts b/packages/notification/src/features/utilsForPartiallyCompletedRecord.ts
new file mode 100644
index 00000000000..e8a4130ffd7
--- /dev/null
+++ b/packages/notification/src/features/utilsForPartiallyCompletedRecord.ts
@@ -0,0 +1,70 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * OpenCRVS is also distributed under the terms of the Civil Registration
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
+ *
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
+ */
+import {
+  findCompositionSection,
+  findExtension,
+  findResourceFromBundleById,
+  getComposition,
+  getResourceFromBundleById,
+  getTaskFromSavedBundle,
+  Patient,
+  InProgressRecord,
+  RejectedRecord,
+  RelatedPerson,
+  resourceIdentifierToUUID,
+  SavedRelatedPerson
+} from '@opencrvs/commons/types'
+
+export function getInformantName(record: InProgressRecord | RejectedRecord) {
+  const composition = getComposition(record)
+  const informantSection = findCompositionSection(
+    'informant-details',
+    composition
+  )
+  if (!informantSection) {
+    return
+  }
+  const informantRelation: Partial<SavedRelatedPerson> =
+    getResourceFromBundleById<RelatedPerson>(
+      record,
+      resourceIdentifierToUUID(informantSection.entry[0].reference)
+    )
+  if (!informantRelation.patient?.reference) {
+    return
+  }
+  const informant = findResourceFromBundleById<Patient>(
+    record,
+    resourceIdentifierToUUID(informantRelation.patient.reference)
+  )
+  const name = informant?.name?.find(({ use }) => use === 'en')
+  if (!name) {
+    return
+  }
+  return [name.given?.join(' '), name.family.join(' ')].join(' ').trim()
+}
+
+export function getContactPhoneNo(record: InProgressRecord | RejectedRecord) {
+  const task = getTaskFromSavedBundle(record)
+  const phoneNumberExtension = findExtension(
+    'http://opencrvs.org/specs/extension/contact-person-phone-number',
+    task.extension
+  )
+  return phoneNumberExtension?.valueString
+}
+
+export function getContactEmail(record: InProgressRecord | RejectedRecord) {
+  const task = getTaskFromSavedBundle(record)
+  const emailExtension = findExtension(
+    'http://opencrvs.org/specs/extension/contact-person-email',
+    task.extension
+  )
+  return emailExtension?.valueString
+}
diff --git a/packages/workflow/src/records/handler/reject.ts b/packages/workflow/src/records/handler/reject.ts
index c138cba3377..5b673a929a1 100644
--- a/packages/workflow/src/records/handler/reject.ts
+++ b/packages/workflow/src/records/handler/reject.ts
@@ -16,6 +16,7 @@ import { validateRequest } from '@workflow/utils/index'
 import { toRejected } from '@workflow/records/state-transitions'
 import { indexBundle } from '@workflow/records/search'
 import { auditEvent } from '@workflow/records/audit'
+import { sendNotification } from '@workflow/records/notification'
 
 const requestSchema = z.object({
   comment: z.string(),
@@ -44,6 +45,7 @@ export const rejectRoute = createRoute({
 
     await indexBundle(rejectedRecord, token)
     await auditEvent('sent-for-updates', rejectedRecord, token)
+    await sendNotification('sent-for-updates', rejectedRecord, token)
 
     return rejectedRecord
   }
diff --git a/packages/workflow/src/records/notification.ts b/packages/workflow/src/records/notification.ts
index a86ee77bb1f..c735c01ba2f 100644
--- a/packages/workflow/src/records/notification.ts
+++ b/packages/workflow/src/records/notification.ts
@@ -25,6 +25,7 @@ type NotificationEvent = Extract<
   | 'sent-notification-for-review'
   | 'registered'
   | 'sent-for-approval'
+  | 'sent-for-updates'
 >
 
 export async function sendNotification(
@@ -73,20 +74,23 @@ const MAPPING: Record<
     'sent-notification-for-review':
       InformantNotificationName.birthDeclarationSMS,
     'sent-for-approval': InformantNotificationName.birthDeclarationSMS,
-    registered: InformantNotificationName.birthRegistrationSMS
+    registered: InformantNotificationName.birthRegistrationSMS,
+    'sent-for-updates': InformantNotificationName.birthRejectionSMS
   },
   [EVENT_TYPE.DEATH]: {
     'sent-notification': InformantNotificationName.deathInProgressSMS,
     'sent-notification-for-review':
       InformantNotificationName.deathDeclarationSMS,
     'sent-for-approval': InformantNotificationName.deathDeclarationSMS,
-    registered: InformantNotificationName.deathRegistrationSMS
+    registered: InformantNotificationName.deathRegistrationSMS,
+    'sent-for-updates': InformantNotificationName.deathRejectionSMS
   },
   [EVENT_TYPE.MARRIAGE]: {
     'sent-notification': null,
     'sent-notification-for-review': null,
     'sent-for-approval': null,
-    registered: null
+    registered: null,
+    'sent-for-updates': null
   }
 }
 
diff --git a/packages/workflow/test/handlers.ts b/packages/workflow/test/handlers.ts
index 58f7585b290..8f3cb8654ad 100644
--- a/packages/workflow/test/handlers.ts
+++ b/packages/workflow/test/handlers.ts
@@ -91,7 +91,7 @@ const sendNotificationHandler = rest.post(
   'http://localhost:2020/birth/:event',
   (req, res, ctx) => {
     const { event } = req.params
-    const knownActions = ['ready-for-review']
+    const knownActions = ['ready-for-review', 'sent-for-updates']
     if (!knownActions.includes(event as string)) {
       throw new Error(`no mock set for "${event}" notification event`)
     }

From ea94ae97566c50dacd227a620b2a7d09a06aa4e1 Mon Sep 17 00:00:00 2001
From: Tameem Bin Haider <tameem.haider@dsinnovators.com>
Date: Fri, 12 Jul 2024 18:26:05 +0600
Subject: [PATCH 105/108] fix: bring back certificate & notification config

---
 CHANGELOG.md                                  |  2 +-
 packages/client/src/App.tsx                   | 20 +++++
 .../components/interface/Navigation.test.tsx  |  1 +
 .../src/components/interface/Navigation.tsx   | 81 ++++++++++++++-----
 .../Config/Certificates/Certificates.tsx      | 50 ------------
 5 files changed, 81 insertions(+), 73 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acd9986566c..4bcac71ac09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@
 
   We are dropping support for 'agentDefault' to be used as initial value for SELECT_WITH_DYNAMIC_OPTIONS type of fields. The country config package now must return the form with prepopulated initial values to show default addresses. [#6871](https://github.com/opencrvs/opencrvs-core/issues/6871)
 
-- #### Remove system admin UI items: Application, Certificates, User roles, Informant notifications
+- #### Remove system admin UI items: Application, User roles
 
   We have now moved to configuring these items directly from country configuration repository.
 
diff --git a/packages/client/src/App.tsx b/packages/client/src/App.tsx
index af613f7f7ae..ef02ad1cc8b 100644
--- a/packages/client/src/App.tsx
+++ b/packages/client/src/App.tsx
@@ -47,6 +47,7 @@ import { AppStore } from './store'
 import { CorrectionForm, CorrectionReviewForm } from './views/CorrectionForm'
 import { VerifyCorrector } from './views/CorrectionForm/VerifyCorrector'
 import { RecordAudit } from './views/RecordAudit/RecordAudit'
+import { CertificatesConfig } from './views/SysAdmin/Config/Certificates'
 import { UserList } from './views/SysAdmin/Team/user/UserList'
 import { SystemList } from './views/SysAdmin/Config/Systems/Systems'
 import VSExport from './views/SysAdmin/Vsexports/VSExport'
@@ -60,6 +61,7 @@ import { Leaderboards } from '@client/views/Performance/Leaderboards'
 import { PerformanceDashboard } from '@client/views/Performance/Dashboard'
 import { SystemRoleType } from '@client/utils/gateway'
 import { AdministrativeLevels } from '@client/views/Organisation/AdministrativeLevels'
+import InformantNotification from '@client/views/SysAdmin/Communications/InformantSMSNotification/InformantSMSNotification'
 import { VerifyCertificatePage } from '@client/views/VerifyCertificate/VerifyCertificatePage'
 import { IssueCertificate } from '@client/views/IssueCertificate/IssueCertificate'
 import { IssuePayment } from '@client/views/IssueCertificate/IssueCollectorForm/IssuePayment'
@@ -253,6 +255,24 @@ export function App(props: IAppProps) {
                                               }
                                               component={OfficeHome}
                                             />
+                                            <ProtectedRoute
+                                              exact
+                                              roles={[
+                                                SystemRoleType.NationalSystemAdmin
+                                              ]}
+                                              path={routes.CERTIFICATE_CONFIG}
+                                              component={CertificatesConfig}
+                                            />
+                                            <ProtectedRoute
+                                              exact
+                                              roles={[
+                                                SystemRoleType.NationalSystemAdmin
+                                              ]}
+                                              path={
+                                                routes.INFORMANT_NOTIFICATION
+                                              }
+                                              component={InformantNotification}
+                                            />
                                             <ProtectedRoute
                                               exact
                                               roles={[
diff --git a/packages/client/src/components/interface/Navigation.test.tsx b/packages/client/src/components/interface/Navigation.test.tsx
index 1a08cd527f7..8ac328f8739 100644
--- a/packages/client/src/components/interface/Navigation.test.tsx
+++ b/packages/client/src/components/interface/Navigation.test.tsx
@@ -109,6 +109,7 @@ describe('Navigation for national system admin related tests', () => {
     expect(testComponent.exists('#navigation_config_main')).toBeTruthy()
     testComponent.find('#navigation_config_main').hostNodes().simulate('click')
     testComponent.update()
+    expect(testComponent.exists('#navigation_certificate')).toBeTruthy()
   })
 
   it('No application related tabs', async () => {
diff --git a/packages/client/src/components/interface/Navigation.tsx b/packages/client/src/components/interface/Navigation.tsx
index 2a89c4bb893..682d8675b7e 100644
--- a/packages/client/src/components/interface/Navigation.tsx
+++ b/packages/client/src/components/interface/Navigation.tsx
@@ -19,8 +19,10 @@ import { navigationMessages } from '@client/i18n/messages/views/navigation'
 import {
   goToAdvancedSearchResult,
   goToAllUserEmail,
+  goToCertificateConfig,
   goToDashboardView,
   goToHomeTab,
+  goToInformantNotification,
   goToLeaderBoardsView,
   goToOrganisationView,
   goToPerformanceStatistics,
@@ -219,6 +221,7 @@ interface IProps {
 
 interface IDispatchProps {
   goToHomeTab: typeof goToHomeTab
+  goToCertificateConfigAction: typeof goToCertificateConfig
   goToVSExportsAction: typeof goToVSExport
   goToAdvancedSearchResultAction: typeof goToAdvancedSearchResult
   redirectToAuthentication: typeof redirectToAuthentication
@@ -232,6 +235,7 @@ interface IDispatchProps {
   goToPerformanceStatistics: typeof goToPerformanceStatistics
   updateRegistrarWorkqueue: typeof updateRegistrarWorkqueue
   setAdvancedSearchParam: typeof setAdvancedSearchParam
+  goToInformantNotification: typeof goToInformantNotification
   goToAllUserEmail: typeof goToAllUserEmail
 }
 
@@ -295,6 +299,7 @@ const NavigationView = (props: IFullProps) => {
     enableMenuSelection = true,
     loadWorkqueueStatuses = true,
     activeMenuItem,
+    goToCertificateConfigAction,
     goToVSExportsAction,
     goToSystemViewAction,
     goToAdvancedSearchResultAction,
@@ -310,6 +315,7 @@ const NavigationView = (props: IFullProps) => {
     goToPerformanceStatistics,
     goToDashboardView,
     goToLeaderBoardsView,
+    goToInformantNotification,
     goToAllUserEmail,
     className
   } = props
@@ -709,17 +715,30 @@ const NavigationView = (props: IFullProps) => {
                       />
                       {(isConfigExpanded ||
                         configTab.includes(activeMenuItem)) && (
-                        <NavigationSubItem
-                          id={`navigation_${WORKQUEUE_TABS.systems}`}
-                          label={intl.formatMessage(
-                            navigationMessages[WORKQUEUE_TABS.systems]
-                          )}
-                          onClick={goToSystemViewAction}
-                          isSelected={
-                            enableMenuSelection &&
-                            activeMenuItem === WORKQUEUE_TABS.systems
-                          }
-                        />
+                        <>
+                          <NavigationSubItem
+                            label={intl.formatMessage(
+                              navigationMessages[WORKQUEUE_TABS.certificate]
+                            )}
+                            id={`navigation_${WORKQUEUE_TABS.certificate}`}
+                            onClick={goToCertificateConfigAction}
+                            isSelected={
+                              enableMenuSelection &&
+                              activeMenuItem === WORKQUEUE_TABS.certificate
+                            }
+                          />
+                          <NavigationSubItem
+                            id={`navigation_${WORKQUEUE_TABS.systems}`}
+                            label={intl.formatMessage(
+                              navigationMessages[WORKQUEUE_TABS.systems]
+                            )}
+                            onClick={goToSystemViewAction}
+                            isSelected={
+                              enableMenuSelection &&
+                              activeMenuItem === WORKQUEUE_TABS.systems
+                            }
+                          />
+                        </>
                       )}
                     </>
                   )}
@@ -753,17 +772,33 @@ const NavigationView = (props: IFullProps) => {
                       />
                       {(isCommunationExpanded ||
                         conmmunicationTab.includes(activeMenuItem)) && (
-                        <NavigationSubItem
-                          label={intl.formatMessage(
-                            navigationMessages[WORKQUEUE_TABS.emailAllUsers]
-                          )}
-                          id={`navigation_${WORKQUEUE_TABS.emailAllUsers}`}
-                          onClick={goToAllUserEmail}
-                          isSelected={
-                            enableMenuSelection &&
-                            activeMenuItem === WORKQUEUE_TABS.emailAllUsers
-                          }
-                        />
+                        <>
+                          <NavigationSubItem
+                            label={intl.formatMessage(
+                              navigationMessages[
+                                WORKQUEUE_TABS.informantNotification
+                              ]
+                            )}
+                            id={`navigation_${WORKQUEUE_TABS.informantNotification}`}
+                            onClick={goToInformantNotification}
+                            isSelected={
+                              enableMenuSelection &&
+                              activeMenuItem ===
+                                WORKQUEUE_TABS.informantNotification
+                            }
+                          />
+                          <NavigationSubItem
+                            label={intl.formatMessage(
+                              navigationMessages[WORKQUEUE_TABS.emailAllUsers]
+                            )}
+                            id={`navigation_${WORKQUEUE_TABS.emailAllUsers}`}
+                            onClick={goToAllUserEmail}
+                            isSelected={
+                              enableMenuSelection &&
+                              activeMenuItem === WORKQUEUE_TABS.emailAllUsers
+                            }
+                          />
+                        </>
                       )}
                     </>
                   )}
@@ -962,6 +997,7 @@ export const Navigation = connect<
   IStoreState
 >(mapStateToProps, {
   goToHomeTab,
+  goToCertificateConfigAction: goToCertificateConfig,
   goToAdvancedSearchResultAction: goToAdvancedSearchResult,
   goToVSExportsAction: goToVSExport,
   goToPerformanceViewAction: goToPerformanceView,
@@ -975,6 +1011,7 @@ export const Navigation = connect<
   goToPerformanceStatistics,
   goToLeaderBoardsView,
   goToDashboardView,
+  goToInformantNotification,
   goToAllUserEmail
 })(injectIntl(withRouter(NavigationView)))
 
diff --git a/packages/client/src/views/SysAdmin/Config/Certificates/Certificates.tsx b/packages/client/src/views/SysAdmin/Config/Certificates/Certificates.tsx
index fcaa68db555..841c035991f 100644
--- a/packages/client/src/views/SysAdmin/Config/Certificates/Certificates.tsx
+++ b/packages/client/src/views/SysAdmin/Config/Certificates/Certificates.tsx
@@ -206,41 +206,6 @@ class CertificatesConfigComponent extends React.Component<Props, State> {
     svgFilename: string
   ) {
     const menuItems = [
-      {
-        label: intl.formatMessage(buttonMessages.preview),
-        handler: async () => {
-          const dummyTemplateData = getDummyCertificateTemplateData(
-            event,
-            this.props.registerForm
-          )
-
-          svgCode = executeHandlebarsTemplate(
-            svgCode,
-            dummyTemplateData,
-            this.props.state
-          )
-          const linkSource = `data:${SVGFile.type};base64,${window.btoa(
-            svgCode
-          )}`
-          this.setState({
-            eventName: event,
-            previewImage: { type: SVGFile.type, data: linkSource }
-          })
-        }
-      },
-      {
-        label: intl.formatMessage(buttonMessages.print),
-        handler: async () => {
-          await printDummyCertificate(
-            event,
-            this.props.registerForm,
-            intl,
-            this.props.userDetails as UserDetails,
-            this.props.offlineResources,
-            this.props.state
-          )
-        }
-      },
       {
         label: intl.formatMessage(messages.downloadTemplate),
         handler: () => {
@@ -621,21 +586,6 @@ class CertificatesConfigComponent extends React.Component<Props, State> {
                 />
               }
             >
-              <>
-                {intl.formatMessage(messages.listDetails)}
-                <Link
-                  id="certificate-instructions-link"
-                  onClick={() => {
-                    window.open(
-                      'https://documentation.opencrvs.org/setup/4.-functional-configuration/4.4-configure-a-certificate-template',
-                      '_blank',
-                      'noopener,noreferrer'
-                    )
-                  }}
-                >
-                  {intl.formatMessage(messages.listDetailsQsn)}
-                </Link>
-              </>
               <TabContent
                 item={
                   CertificateSection.items.find(

From bea5a75f87d063435633c06e563e36ea6d4ae5b6 Mon Sep 17 00:00:00 2001
From: Tameem Bin Haider <haidertameem@gmail.com>
Date: Fri, 12 Jul 2024 20:40:14 +0600
Subject: [PATCH 106/108] test: remove preview/print related tests

---
 .../Config/Certificates/Certificates.test.tsx | 33 -------------------
 1 file changed, 33 deletions(-)

diff --git a/packages/client/src/views/SysAdmin/Config/Certificates/Certificates.test.tsx b/packages/client/src/views/SysAdmin/Config/Certificates/Certificates.test.tsx
index fef1c704c99..ece937010ea 100644
--- a/packages/client/src/views/SysAdmin/Config/Certificates/Certificates.test.tsx
+++ b/packages/client/src/views/SysAdmin/Config/Certificates/Certificates.test.tsx
@@ -31,8 +31,6 @@ const fetch = createFetchMock(vi)
 fetch.enableMocks()
 
 enum MENU_ITEM {
-  PREVIEW,
-  PRINT,
   DOWNLOAD,
   UPLOAD
 }
@@ -231,37 +229,6 @@ describe('ConfigHome page when already has uploaded certificate template', async
       expect(updateCertificateMutationSpy).toBeCalledTimes(1)
     })
 
-    it('should render preview certificate template when clicked on preview', async () => {
-      await clickOnMenuItem(testComponent, 'birth', MENU_ITEM.PREVIEW)
-
-      await waitForElement(testComponent, '#preview_image_field')
-
-      expect(
-        testComponent.find('#preview_image_field').hostNodes()
-      ).toHaveLength(1)
-    })
-
-    it('should go back from preview page if click on back arrow', async () => {
-      await clickOnMenuItem(testComponent, 'birth', MENU_ITEM.PREVIEW)
-      await waitForElement(testComponent, '#preview_image_field')
-      testComponent.find('#preview_close').hostNodes().simulate('click')
-      testComponent.update()
-
-      expect(
-        testComponent.find('#preview_image_field').hostNodes()
-      ).toHaveLength(0)
-    })
-
-    it('should call print certificate after clicking print', async () => {
-      await clickOnMenuItem(testComponent, 'birth', MENU_ITEM.PRINT)
-      testComponent.update()
-      await new Promise((resolve) => {
-        setTimeout(resolve, 200)
-      })
-
-      expect(printCertificateSpy).toBeCalledTimes(1)
-    })
-
     it('should download preview certificate', async () => {
       await clickOnMenuItem(testComponent, 'birth', MENU_ITEM.DOWNLOAD)
       await new Promise((resolve) => {

From 4497dc74dd1e684b80432cc098fd61eec5f980f0 Mon Sep 17 00:00:00 2001
From: cleverclope <cleverarinda@gmail.com>
Date: Tue, 8 Oct 2024 14:57:56 +0300
Subject: [PATCH 107/108] added confirm dialog before delete

---
 .../DocumentUploaderWithOption.tsx            | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/packages/client/src/components/form/DocumentUploadfield/DocumentUploaderWithOption.tsx b/packages/client/src/components/form/DocumentUploadfield/DocumentUploaderWithOption.tsx
index 96ce3d6ec62..ab40e80d36d 100644
--- a/packages/client/src/components/form/DocumentUploadfield/DocumentUploaderWithOption.tsx
+++ b/packages/client/src/components/form/DocumentUploadfield/DocumentUploaderWithOption.tsx
@@ -23,6 +23,14 @@ import { formMessages } from '@client/i18n/messages'
 import { messages } from '@client/i18n/messages/views/imageUpload'
 import imageCompression from 'browser-image-compression'
 import { bytesToMB } from '@client/utils/imageUtils'
+import {
+  Button,
+  Dialog,
+  DialogActions,
+  DialogContent,
+  DialogContentText,
+  DialogTitle
+} from '@mui/material'
 
 const DEFAULT_MAX_SIZE_MB = 5
 
@@ -243,6 +251,18 @@ export const DocumentUploaderWithOption = (props: IFullProps) => {
     )
   }
 
+  const [open, setOpen] = useState(false)
+
+  const handleClickOpen = (image: IFileValue | IAttachmentValue) => {
+    setPreviewImage(previewImage)
+    setOpen(true)
+  }
+
+  const handleClose = () => {
+    setOpen(false)
+    setPreviewImage(null)
+  }
+
   const onDelete = (image: IFileValue | IAttachmentValue) => {
     const previewImage = image as IFileValue
     const addableOption = props.options.find(
@@ -340,6 +360,23 @@ export const DocumentUploaderWithOption = (props: IFullProps) => {
         ? null
         : renderDocumentUploaderWithDocumentTypeBlock()}
 
+      <Dialog open={open} onClose={handleClose}>
+        <DialogTitle>Confirm Deletion</DialogTitle>
+        <DialogContent>
+          <DialogContentText>
+            Are you sure you want to delete this Document?
+          </DialogContentText>
+        </DialogContent>
+        <DialogActions>
+          <Button onClick={handleClose} color="primary">
+            Cancel
+          </Button>
+          <Button onClick={() => onDelete} color="secondary" autoFocus>
+            Confirm
+          </Button>
+        </DialogActions>
+      </Dialog>
+
       {previewImage && (
         <DocumentPreview
           previewImage={previewImage}

From b09edd190019656199bed7052e937be2cc5f8deb Mon Sep 17 00:00:00 2001
From: cleverclope <cleverarinda@gmail.com>
Date: Tue, 8 Oct 2024 15:44:41 +0300
Subject: [PATCH 108/108] added confirm dialog before delete

---
 .../form/DocumentUploadfield/DocumentUploaderWithOption.tsx     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/form/DocumentUploadfield/DocumentUploaderWithOption.tsx b/packages/client/src/components/form/DocumentUploadfield/DocumentUploaderWithOption.tsx
index ab40e80d36d..00017cfeee9 100644
--- a/packages/client/src/components/form/DocumentUploadfield/DocumentUploaderWithOption.tsx
+++ b/packages/client/src/components/form/DocumentUploadfield/DocumentUploaderWithOption.tsx
@@ -354,7 +354,7 @@ export const DocumentUploaderWithOption = (props: IFullProps) => {
         documents={props.files}
         onSelect={selectForPreview}
         dropdownOptions={props.options}
-        onDelete={onDelete}
+        onDelete={handleClickOpen}
       />
       {props.hideOnEmptyOption && dropdownOptions.length === 0
         ? null