Skip to content

Commit

Permalink
fix: change app adminBoard and adminBoardDetail route
Browse files Browse the repository at this point in the history
  • Loading branch information
shahmargi12 committed Aug 28, 2024
1 parent 7fbb5f5 commit da81c29
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/assets/locales/de/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"deactivate": "Deactivate",
"appReleaseProcess": "App Release Process",
"appSubscription": "App Subscription MGT",
"adminboard": "Admin Board",
"appAdminBoard": "Admin Board",
"appUserManagement": "App Benutzer Verwaltung",
"userdetails": "Benutzer Details",
"technicalUserManagement": "Technische Benutzer Verwaltung",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/locales/de/notification.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"servicemanagementboard": "Service Management Board öffnen",
"appOverview": "Get there",
"appsubscription": "Get there",
"adminboard": "Get there",
"appAdminBoard": "Get there",
"technicaluser": "Get there",
"companyRolesServiceProvider": "Get there",
"usermanagement": "Get there",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/locales/en/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"deactivate": "Deactivate",
"appReleaseProcess": "App Release Process",
"appSubscription": "App Subscription MGT",
"adminboard": "Admin Board",
"appAdminBoard": "Admin Board",
"appUserManagement": "App User Management",
"userdetails": "User Details",
"technicalUserManagement": "Technical User Management",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/locales/en/notification.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"servicemanagementboard": "Get there",
"appOverview": "Get there",
"appsubscription": "Get there",
"adminboard": "Get there",
"appAdminBoard": "Get there",
"technicaluser": "Get there",
"companyRolesServiceProvider": "Get there",
"usermanagement": "Get there",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export default function BoardContentDetails({ item }: { item: AppDetails }) {
color="secondary"
size="small"
onClick={() => {
navigate(`/${PAGES.ADMINBOARD}`)
navigate(`/${PAGES.APP_ADMIN_BOARD}`)
}}
>
{t('content.adminboardDetail.backToBoard')}
Expand Down
2 changes: 1 addition & 1 deletion src/components/pages/AdminBoardDetail/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default function AdminBoardDetail() {
backButtonLabel={t('global.actions.back')}
backButtonVariant="text"
onBackButtonClick={() => {
navigate(`/${PAGES.ADMINBOARD}`)
navigate(`/${PAGES.APP_ADMIN_BOARD}`)
}}
/>
</Box>
Expand Down
4 changes: 3 additions & 1 deletion src/components/pages/NotificationCenter/NotificationItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,9 @@ const NotificationConfig = ({ item }: { item: CXNotificationContent }) => {
<NotificationContent item={item} navlinks={[PAGES.APP_SUBSCRIPTION]} />
)
case NotificationType.APP_RELEASE_REQUEST:
return <NotificationContent item={item} navlinks={[PAGES.ADMINBOARD]} />
return (
<NotificationContent item={item} navlinks={[PAGES.APP_ADMIN_BOARD]} />
)
case NotificationType.APP_RELEASE_APPROVAL:
return (
<NotificationContent item={item} navlinks={[PAGES.USER_MANAGEMENT]} />
Expand Down
3 changes: 2 additions & 1 deletion src/components/shared/templates/AdminBoard/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import type {
import type { AppRequestBody } from 'features/adminBoard/adminBoardApiSlice'
import { useNavigate } from 'react-router-dom'
import SortImage from 'components/shared/frame/SortImage'
import { PAGES } from 'types/Constants'

export interface TabButtonsType {
buttonText: string
Expand Down Expand Up @@ -235,7 +236,7 @@ export default function CommonAdminBoard({
fetchQuery,
loadMoreButtonText = 'Load More',
isDynamicSearchEnabled = false,
type = 'adminboarddetail',
type = PAGES.APP_ADMIN_BOARD_DETAIL,
successApproveMsg,
errorApproveMsg,
successDeclineMsg,
Expand Down
10 changes: 5 additions & 5 deletions src/types/Config.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ export const ALL_PAGES: IPage[] = [
element: <ServiceSubscription />,
},
{
name: PAGES.ADMINBOARD,
name: PAGES.APP_ADMIN_BOARD,
role: ROLES.APPROVE_APP_RELEASE || ROLES.DECLINE_APP_RELEASE,
element: <AdminBoard />,
},
Expand All @@ -259,13 +259,13 @@ export const ALL_PAGES: IPage[] = [
element: <ServiceAdminBoard />,
},
{
name: PAGES.ADMINBOARD_DETAIL,
name: PAGES.APP_ADMIN_BOARD_DETAIL,
role: ROLES.APPROVE_APP_RELEASE || ROLES.DECLINE_APP_RELEASE,
isRoute: true,
element: (
<Route
key={PAGES.ADMINBOARD_DETAIL}
path={PAGES.ADMINBOARD_DETAIL}
key={PAGES.APP_ADMIN_BOARD_DETAIL}
path={PAGES.APP_ADMIN_BOARD_DETAIL}
element={<AdminBoardDetail />}
>
<Route index element={null} />
Expand Down Expand Up @@ -772,7 +772,7 @@ export const mainMenuFullTree = [
{ name: PAGES.APP_OVERVIEW, hint: HINTS.NEW },
{ name: PAGES.APP_RELEASE_PROCESS },
{ name: PAGES.APP_SUBSCRIPTION, hint: HINTS.NEW },
{ name: PAGES.ADMINBOARD, hint: HINTS.NEW },
{ name: PAGES.APP_ADMIN_BOARD, hint: HINTS.NEW },
],
},
{
Expand Down
4 changes: 2 additions & 2 deletions src/types/Constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ export enum PAGES {
SWAGGER = 'swagger',
STORYBOOK = 'storybook',
APP_SUBSCRIPTION = 'appSubscription',
ADMINBOARD = 'adminboard',
ADMINBOARD_DETAIL = 'adminboardDetail',
APP_ADMIN_BOARD = 'appAdminBoard',
APP_ADMIN_BOARD_DETAIL = 'appAdminBoardDetail',
MARKETPLACE = 'marketplace',
APP_MARKETPLACE = 'appMarketplace',
SERVICE_MARKETPLACE = 'serviceMarketplace',
Expand Down

0 comments on commit da81c29

Please sign in to comment.