Skip to content

Commit

Permalink
change serving country certificates (#7521)
Browse files Browse the repository at this point in the history
* chore: add a proxy route to serve country certificates

* chore!: serve certificates from country-config while loading and remove ceritificate components from ui

* fix: amend client unit tests

* Revert "chore: add a proxy route to serve country certificates"

This reverts commit d07e047.

* chore: get event certificates with token

* chore: remove seeding certificates

* fix: keep integrations in config workqueue

* fix: reduce number of redux actions

* fix: amend error handler message for certificate endpoint in config

* fix: amend offline reducers

* fix: update offline data properties to proper offline data

* chore: revert navigation unit test for config tab

* chore: revert offline template data for field agents

* chore: refactor certificate fetching handler
  • Loading branch information
Nil20 authored Aug 28, 2024
1 parent 6eb0c32 commit bd26a13
Show file tree
Hide file tree
Showing 16 changed files with 84 additions and 3,388 deletions.
9 changes: 0 additions & 9 deletions packages/client/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
import { ReloadModal } from './views/Modals/ReloadModal'

interface IAppProps {
Expand Down Expand Up @@ -257,14 +256,6 @@ export function App(props: IAppProps) {
}
component={OfficeHome}
/>
<ProtectedRoute
exact
roles={[
SystemRoleType.NationalSystemAdmin
]}
path={routes.CERTIFICATE_CONFIG}
component={CertificatesConfig}
/>
<ProtectedRoute
exact
roles={[
Expand Down
24 changes: 2 additions & 22 deletions packages/client/src/components/interface/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import { navigationMessages } from '@client/i18n/messages/views/navigation'
import {
goToAdvancedSearchResult,
goToAllUserEmail,
goToCertificateConfig,
goToDashboardView,
goToHomeTab,
goToInformantNotification,
Expand Down Expand Up @@ -221,7 +220,6 @@ interface IProps {

interface IDispatchProps {
goToHomeTab: typeof goToHomeTab
goToCertificateConfigAction: typeof goToCertificateConfig
goToVSExportsAction: typeof goToVSExport
goToAdvancedSearchResultAction: typeof goToAdvancedSearchResult
redirectToAuthentication: typeof redirectToAuthentication
Expand Down Expand Up @@ -299,7 +297,6 @@ const NavigationView = (props: IFullProps) => {
enableMenuSelection = true,
loadWorkqueueStatuses = true,
activeMenuItem,
goToCertificateConfigAction,
goToVSExportsAction,
goToSystemViewAction,
goToAdvancedSearchResultAction,
Expand All @@ -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
Expand Down Expand Up @@ -715,18 +708,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(
Expand Down Expand Up @@ -997,7 +978,6 @@ export const Navigation = connect<
IStoreState
>(mapStateToProps, {
goToHomeTab,
goToCertificateConfigAction: goToCertificateConfig,
goToAdvancedSearchResultAction: goToAdvancedSearchResult,
goToVSExportsAction: goToVSExport,
goToPerformanceViewAction: goToPerformanceView,
Expand Down
5 changes: 0 additions & 5 deletions packages/client/src/navigation/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import {
WORKFLOW_STATUS,
TEAM_USER_LIST,
USER_PROFILE,
CERTIFICATE_CONFIG,
CERTIFICATE_CORRECTION,
VERIFY_CORRECTOR,
DECLARATION_RECORD_AUDIT,
Expand Down Expand Up @@ -158,10 +157,6 @@ export function goToHome() {
return push(HOME)
}

export function goToCertificateConfig() {
return push(CERTIFICATE_CONFIG)
}

export function goToInformantNotification() {
return push(INFORMANT_NOTIFICATION)
}
Expand Down
1 change: 0 additions & 1 deletion packages/client/src/navigation/routes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
55 changes: 0 additions & 55 deletions packages/client/src/offline/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
*/
import {
AdminStructure,
CertificatePayload,
CRVSOffice,
Facility,
ILocation,
Expand All @@ -23,7 +22,6 @@ import {
IContentResponse,
IApplicationConfigResponse,
IApplicationConfig,
ICertificateTemplateData,
IApplicationConfigAnonymous,
LoadFormsResponse,
LoadValidatorsResponse,
Expand Down Expand Up @@ -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 = {
Expand Down Expand Up @@ -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 => ({
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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>
Expand Down
Loading

0 comments on commit bd26a13

Please sign in to comment.