Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: deprecate admin UI menu items #7155

Merged
merged 4 commits into from
Jun 19, 2024
Merged

chore: deprecate admin UI menu items #7155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fdf3310
chore: deprecate admin ui menu items
naftis Jun 14, 2024
7d793c8
chore(changelog)
naftis Jun 14, 2024
f27165e
fix: remove tests for application and certificate
naftis Jun 14, 2024
e46eb94
chore(changelog): update wording
naftis Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
38 changes: 0 additions & 38 deletions packages/client/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -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={[
Expand Down Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions packages/client/src/components/interface/Navigation.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
113 changes: 22 additions & 91 deletions packages/client/src/components/interface/Navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,15 @@ import { navigationMessages } from '@client/i18n/messages/views/navigation'
import {
goToAdvancedSearchResult,
goToAllUserEmail,
goToApplicationConfig,
goToCertificateConfig,
goToDashboardView,
goToHomeTab,
goToInformantNotification,
goToLeaderBoardsView,
goToOrganisationView,
goToPerformanceStatistics,
goToPerformanceView,
goToSettings,
goToSystemList,
goToTeamView,
goToUserRolesConfig,
goToVSExport
} from '@client/navigation'
import { ADVANCED_SEARCH_RESULT } from '@client/navigation/routes'
Expand Down Expand Up @@ -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
Expand All @@ -239,7 +232,6 @@ interface IDispatchProps {
goToPerformanceStatistics: typeof goToPerformanceStatistics
updateRegistrarWorkqueue: typeof updateRegistrarWorkqueue
setAdvancedSearchParam: typeof setAdvancedSearchParam
goToInformantNotification: typeof goToInformantNotification
goToAllUserEmail: typeof goToAllUserEmail
}

Expand Down Expand Up @@ -303,11 +295,8 @@ const NavigationView = (props: IFullProps) => {
enableMenuSelection = true,
loadWorkqueueStatuses = true,
activeMenuItem,
goToCertificateConfigAction,
goToUserRolesConfigAction,
goToVSExportsAction,
goToSystemViewAction,
goToApplicationConfigAction,
goToAdvancedSearchResultAction,
navigationWidth,
workqueue,
Expand All @@ -321,7 +310,6 @@ const NavigationView = (props: IFullProps) => {
goToPerformanceStatistics,
goToDashboardView,
goToLeaderBoardsView,
goToInformantNotification,
goToAllUserEmail,
className
} = props
Expand Down Expand Up @@ -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
}
/>
)}
</>
)}
Expand Down Expand Up @@ -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
}
/>
)}
</>
)}
Expand Down Expand Up @@ -1027,9 +962,6 @@ export const Navigation = connect<
IStoreState
>(mapStateToProps, {
goToHomeTab,
goToCertificateConfigAction: goToCertificateConfig,
goToUserRolesConfigAction: goToUserRolesConfig,
goToApplicationConfigAction: goToApplicationConfig,
goToAdvancedSearchResultAction: goToAdvancedSearchResult,
goToVSExportsAction: goToVSExport,
goToPerformanceViewAction: goToPerformanceView,
Expand All @@ -1043,7 +975,6 @@ export const Navigation = connect<
goToPerformanceStatistics,
goToLeaderBoardsView,
goToDashboardView,
goToInformantNotification,
goToAllUserEmail
})(injectIntl(withRouter(NavigationView)))

Expand Down
Loading