Merge pull request #7543 from opencrvs/auto-pr-release-v1.6.0-7521-31886

(For 1.6) 🍒 Merge changes from PR #7521 to release-v1.6.0
opencrvs · Sep 2, 2024 · cc2d8d4 · cc2d8d4
2 parents 94853bc + 40542a3
commit cc2d8d4
Show file tree

Hide file tree

Showing 16 changed files with 84 additions and 3,388 deletions.
diff --git a/packages/client/src/App.tsx b/packages/client/src/App.tsx
@@ -71,7 +71,6 @@ import { ReviewCorrection } from './views/ReviewCorrection/ReviewCorrection'
 import { ReviewCertificate } from './views/PrintCertificate/ReviewCertificateAction'
 import AllUserEmail from './views/SysAdmin/Communications/AllUserEmail/AllUserEmail'
 import InformantNotification from './views/SysAdmin/Communications/InformantSMSNotification/InformantSMSNotification'
-import { CertificatesConfig } from './views/SysAdmin/Config/Certificates'
 
 interface IAppProps {
   client?: ApolloClient<NormalizedCacheObject>
@@ -255,14 +254,6 @@ export function App(props: IAppProps) {
                                               }
                                               component={OfficeHome}
                                             />
-                                            <ProtectedRoute
-                                              exact
-                                              roles={[
-                                                SystemRoleType.NationalSystemAdmin
-                                              ]}
-                                              path={routes.CERTIFICATE_CONFIG}
-                                              component={CertificatesConfig}
-                                            />
                                             <ProtectedRoute
                                               exact
                                               roles={[

diff --git a/packages/client/src/components/interface/Navigation.tsx b/packages/client/src/components/interface/Navigation.tsx
@@ -19,7 +19,6 @@ import { navigationMessages } from '@client/i18n/messages/views/navigation'
 import {
   goToAdvancedSearchResult,
   goToAllUserEmail,
-  goToCertificateConfig,
   goToDashboardView,
   goToHomeTab,
   goToInformantNotification,
@@ -221,7 +220,6 @@ interface IProps {
 
 interface IDispatchProps {
   goToHomeTab: typeof goToHomeTab
-  goToCertificateConfigAction: typeof goToCertificateConfig
   goToVSExportsAction: typeof goToVSExport
   goToAdvancedSearchResultAction: typeof goToAdvancedSearchResult
   redirectToAuthentication: typeof redirectToAuthentication
@@ -299,7 +297,6 @@ const NavigationView = (props: IFullProps) => {
     enableMenuSelection = true,
     loadWorkqueueStatuses = true,
     activeMenuItem,
-    goToCertificateConfigAction,
     goToVSExportsAction,
     goToSystemViewAction,
     goToAdvancedSearchResultAction,
@@ -326,12 +323,8 @@ const NavigationView = (props: IFullProps) => {
     : activeMenuItem
     ? activeMenuItem
     : 'review'
-  const configTab: string[] = [
-    WORKQUEUE_TABS.application,
-    WORKQUEUE_TABS.certificate,
-    WORKQUEUE_TABS.systems,
-    WORKQUEUE_TABS.userRoles
-  ]
+
+  const configTab: string[] = [WORKQUEUE_TABS.systems]
   const conmmunicationTab: string[] = [
     WORKQUEUE_TABS.informantNotification,
     WORKQUEUE_TABS.emailAllUsers
@@ -716,18 +709,6 @@ const NavigationView = (props: IFullProps) => {
                       {(isConfigExpanded ||
                         configTab.includes(activeMenuItem)) && (
                         <>
-                          <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(
@@ -998,7 +979,6 @@ export const Navigation = connect<
   IStoreState
 >(mapStateToProps, {
   goToHomeTab,
-  goToCertificateConfigAction: goToCertificateConfig,
   goToAdvancedSearchResultAction: goToAdvancedSearchResult,
   goToVSExportsAction: goToVSExport,
   goToPerformanceViewAction: goToPerformanceView,

diff --git a/packages/client/src/navigation/index.ts b/packages/client/src/navigation/index.ts
@@ -36,7 +36,6 @@ import {
   WORKFLOW_STATUS,
   TEAM_USER_LIST,
   USER_PROFILE,
-  CERTIFICATE_CONFIG,
   CERTIFICATE_CORRECTION,
   VERIFY_CORRECTOR,
   DECLARATION_RECORD_AUDIT,
@@ -158,10 +157,6 @@ export function goToHome() {
   return push(HOME)
 }
 
-export function goToCertificateConfig() {
-  return push(CERTIFICATE_CONFIG)
-}
-
 export function goToInformantNotification() {
   return push(INFORMANT_NOTIFICATION)
 }

diff --git a/packages/client/src/navigation/routes.ts b/packages/client/src/navigation/routes.ts
@@ -62,7 +62,6 @@ export const REGISTRAR_HOME_TAB_PAGE =
   '/registration-home/:tabId/:selectorId/:pageId'
 
 export const SETTINGS = '/settings'
-export const CERTIFICATE_CONFIG = '/config/certificate'
 export const SYSTEM_LIST = '/config/integration'
 
 export const INFORMANT_NOTIFICATION = '/communications/informantnotification'

diff --git a/packages/client/src/offline/actions.ts b/packages/client/src/offline/actions.ts
@@ -10,7 +10,6 @@
  */
 import {
   AdminStructure,
-  CertificatePayload,
   CRVSOffice,
   Facility,
   ILocation,
@@ -23,7 +22,6 @@ import {
   IContentResponse,
   IApplicationConfigResponse,
   IApplicationConfig,
-  ICertificateTemplateData,
   IApplicationConfigAnonymous,
   LoadFormsResponse,
   LoadValidatorsResponse,
@@ -106,30 +104,12 @@ type ApplicationConfigLoadedAction = {
   payload: IApplicationConfigResponse
 }
 
-export const CERTIFICATE_LOADED = 'OFFLINE/CERTIFICATE_LOADED'
-type CertificateLoadedAction = {
-  type: typeof CERTIFICATE_LOADED
-  payload: CertificatePayload
-}
-
 const CERTIFICATE_LOAD_FAILED = 'OFFLINE/CERTIFICATE_LOAD_FAILED'
 type CertificateLoadFailedAction = {
   type: typeof CERTIFICATE_LOAD_FAILED
   payload: Error
 }
 
-export const CERTIFICATES_LOADED = 'OFFLINE/CERTIFICATES_LOADED'
-type CertificatesLoadedAction = {
-  type: typeof CERTIFICATES_LOADED
-  payload: CertificatePayload[]
-}
-
-export const CERTIFICATES_LOAD_FAILED = 'OFFLINE/CERTIFICATES_LOAD_FAILED'
-type CertificatesLoadFailedAction = {
-  type: typeof CERTIFICATES_LOAD_FAILED
-  payload: Error
-}
-
 export const CERTIFICATE_CONFIGURATION_LOADED =
   'OFFLINE/CERTIFICATE_CONFIGURATION_LOADED'
 type CertificateConfigurationLoadedAction = {
@@ -273,27 +253,13 @@ export const configLoaded = (
   payload: payload
 })
 
-export const certificateLoaded = (
-  payload: CertificatePayload
-): CertificateLoadedAction => ({
-  type: CERTIFICATE_LOADED,
-  payload
-})
-
 export const certificateLoadFailed = (
   payload: CertificateLoadFailedAction['payload']
 ): CertificateLoadFailedAction => ({
   type: CERTIFICATE_LOAD_FAILED,
   payload
 })
 
-export const certificatesLoaded = (
-  payload: CertificatePayload[]
-): CertificatesLoadedAction => ({
-  type: CERTIFICATES_LOADED,
-  payload
-})
-
 export const certificateConfigurationLoaded = (
   payload: CertificateConfiguration
 ): CertificateConfigurationLoadedAction => ({
@@ -331,23 +297,6 @@ export const refreshOfflineData = () => ({
   type: REFRESH_OFFLINE_DATA
 })
 
-export const UPDATE_OFFLINE_CERTIFICATE = 'OFFLINE/UPDATE_CERTIFICATE'
-type UpdateOfflineCertificateAction = {
-  type: typeof UPDATE_OFFLINE_CERTIFICATE
-  payload: {
-    certificate: ICertificateTemplateData
-  }
-}
-
-export const updateOfflineCertificate = (
-  certificate: ICertificateTemplateData
-): UpdateOfflineCertificateAction => ({
-  type: UPDATE_OFFLINE_CERTIFICATE,
-  payload: {
-    certificate
-  }
-})
-
 export const validatorsLoaded = (payload: LoadValidatorsResponse) => ({
   type: 'OFFLINE/VALIDATORS_LOADED' as const,
   payload: payload
@@ -397,14 +346,10 @@ export type Action =
   | ApplicationConfigAnonymousUserAction
   | ApplicationConfigFailedAction
   | ApplicationConfigUpdatedAction
-  | CertificateLoadedAction
   | CertificateLoadFailedAction
-  | CertificatesLoadedAction
-  | CertificatesLoadFailedAction
   | CertificateConfigurationLoadedAction
   | CertificateConfigurationLoadFailedAction
   | UpdateOfflineSystemsAction
-  | UpdateOfflineCertificateAction
   | IFilterLocationsAction
   | ReturnType<typeof offlineDataReady>
   | ReturnType<typeof offlineDataUpdated>