diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e4aa795e7c..6ed024e0ebc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,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} /> - - - - { 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)) && ( - <> - - - - - - - + )} )} @@ -802,33 +753,17 @@ const NavigationView = (props: IFullProps) => { /> {(isCommunationExpanded || conmmunicationTab.includes(activeMenuItem)) && ( - <> - - - + )} )} @@ -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)))