Skip to content

Commit 7935169

Browse files
arunjaindevarunjaindev
authored
Merge pull request #2037 from devtron-labs/fix/global-config-routes
chore: fix global config routes
2 parents 049567e + bf9e4c8 commit 7935169

File tree

3 files changed

+63
-70
lines changed

3 files changed

+63
-70
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "0.2.17-beta-4",
7+
"@devtron-labs/devtron-fe-common-lib": "0.2.17-patch-3",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

‎src/components/globalConfigurations/GlobalConfiguration.tsx‎

Lines changed: 58 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
*/
1616

1717
import { lazy, useState, useEffect, Suspense, isValidElement } from 'react'
18-
import { Route, NavLink, Router, Switch, Redirect } from 'react-router-dom'
19-
import { useHistory, useLocation } from 'react-router'
18+
import { Route, NavLink, Router, Switch, Redirect, useHistory, useLocation } from 'react-router-dom'
2019
import {
2120
showError,
2221
Progressing,
@@ -331,12 +330,11 @@ const NavItem = ({ serverMode }) => {
331330
to={`${route.href}`}
332331
activeClassName="active-route"
333332
data-testid={route.dataTestId}
334-
className={`${
335-
route.name === 'API tokens' &&
333+
className={`${route.name === 'API tokens' &&
336334
location.pathname.startsWith(`${URLS.GLOBAL_CONFIG_AUTH}/${Routes.API_TOKEN}`)
337-
? 'active-route'
338-
: ''
339-
}`}
335+
? 'active-route'
336+
: ''
337+
}`}
340338
onClick={(e) => {
341339
if (!preventOnClickOp) {
342340
handleGroupCollapsedState(e, route)
@@ -421,9 +419,8 @@ const NavItem = ({ serverMode }) => {
421419
key={`nav_item_${index}`}
422420
to={route.href}
423421
data-testid="user-authorization-link"
424-
className={`cursor ${
425-
collapsedState[route.name] ? '' : 'fw-6'
426-
} flex dc__content-space`}
422+
className={`cursor ${collapsedState[route.name] ? '' : 'fw-6'
423+
} flex dc__content-space`}
427424
onClick={(e) => {
428425
handleGroupCollapsedState(e, route)
429426
}}
@@ -574,7 +571,7 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
574571
}
575572

576573
return (
577-
<Switch location={location}>
574+
<Switch>
578575
<Route
579576
path={URLS.GLOBAL_CONFIG_CLUSTER}
580577
render={(props) => {
@@ -588,7 +585,7 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
588585
}}
589586
/>
590587
{!window._env_.K8S_CLIENT && [
591-
serverMode !== SERVER_MODE.EA_ONLY && (
588+
...serverMode !== SERVER_MODE.EA_ONLY ? [(
592589
<Route
593590
key={URLS.GLOBAL_CONFIG_HOST_URL}
594591
path={URLS.GLOBAL_CONFIG_HOST_URL}
@@ -603,7 +600,7 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
603600
)
604601
}}
605602
/>
606-
),
603+
)] : [],
607604
<Route
608605
key={URLS.GLOBAL_CONFIG_GITOPS}
609606
path={URLS.GLOBAL_CONFIG_GITOPS}
@@ -618,15 +615,15 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
618615
return <Project {...props} isSuperAdmin={isSuperAdmin} />
619616
}}
620617
/>,
621-
serverMode !== SERVER_MODE.EA_ONLY && (
618+
...serverMode !== SERVER_MODE.EA_ONLY ? [(
622619
<Route
623620
key={URLS.GLOBAL_CONFIG_GIT}
624621
path={URLS.GLOBAL_CONFIG_GIT}
625622
render={(props) => {
626623
return <GitProvider {...props} isSuperAdmin={isSuperAdmin} />
627624
}}
628625
/>
629-
),
626+
)] : [],
630627
<Route
631628
key={URLS.GLOBAL_CONFIG_DOCKER}
632629
path={`${URLS.GLOBAL_CONFIG_DOCKER}/:id?`}
@@ -648,14 +645,14 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
648645
return <ChartRepo {...props} isSuperAdmin={isSuperAdmin} />
649646
}}
650647
/>,
651-
serverMode !== SERVER_MODE.EA_ONLY && (
648+
...serverMode !== SERVER_MODE.EA_ONLY ? [(
652649
<Route
653650
key={CommonURLS.GLOBAL_CONFIG_DEPLOYMENT_CHARTS_LIST}
654651
path={CommonURLS.GLOBAL_CONFIG_DEPLOYMENT_CHARTS_LIST}
655652
>
656653
<DeploymentChartsRouter />
657654
</Route>
658-
),
655+
)] : [],
659656
<Route key={URLS.GLOBAL_CONFIG_AUTH} path={URLS.GLOBAL_CONFIG_AUTH} component={Authorization} />,
660657
<Route
661658
key={URLS.GLOBAL_CONFIG_NOTIFIER}
@@ -676,10 +673,10 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
676673
</Route>,
677674
...(serverMode !== SERVER_MODE.EA_ONLY
678675
? [
679-
<Route key={URLS.GLOBAL_CONFIG_BUILD_INFRA} path={URLS.GLOBAL_CONFIG_BUILD_INFRA}>
680-
<BuildInfra isSuperAdmin={isSuperAdmin} />
681-
</Route>,
682-
]
676+
<Route key={URLS.GLOBAL_CONFIG_BUILD_INFRA} path={URLS.GLOBAL_CONFIG_BUILD_INFRA}>
677+
<BuildInfra isSuperAdmin={isSuperAdmin} />
678+
</Route>,
679+
]
683680
: []),
684681
]}
685682
{window._env_.ENABLE_SCOPED_VARIABLES && (
@@ -695,47 +692,43 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
695692
<CatalogFramework isSuperAdmin={isSuperAdmin} />
696693
</Route>
697694
)}
698-
{serverMode !== SERVER_MODE.EA_ONLY && (
699-
<>
700-
{DeploymentWindow && (
701-
<Route key={URLS.GLOBAL_CONFIG_DEPLOYMENT_WINDOW} path={URLS.GLOBAL_CONFIG_DEPLOYMENT_WINDOW}>
702-
<DeploymentWindow isSuperAdmin={isSuperAdmin} />
703-
</Route>
704-
)}
705-
,
706-
{ImagePromotion && (
707-
<Route key={URLS.GLOBAL_CONFIG_IMAGE_PROMOTION} path={URLS.GLOBAL_CONFIG_IMAGE_PROMOTION}>
708-
<ImagePromotion isSuperAdmin={isSuperAdmin} />
709-
</Route>
710-
)}
711-
,
712-
{PluginsPolicy && (
713-
<Route path={URLS.GLOBAL_CONFIG_PLUGINS}>
714-
<PluginsPolicy />
715-
</Route>
716-
)}
717-
{PullImageDigest && (
718-
<Route path={URLS.GLOBAL_CONFIG_PULL_IMAGE_DIGEST}>
719-
<PullImageDigest isSuperAdmin={isSuperAdmin} />
720-
</Route>
721-
)}
722-
{TagListContainer && (
723-
<Route path={URLS.GLOBAL_CONFIG_TAGS}>
724-
<TagListContainer />
725-
</Route>
726-
)}
727-
{FilterConditions && (
728-
<Route path={URLS.GLOBAL_CONFIG_FILTER_CONDITION}>
729-
<FilterConditions isSuperAdmin={isSuperAdmin} />
730-
</Route>
731-
)}
732-
{LockDeploymentConfiguration && (
733-
<Route path={URLS.GLOBAL_CONFIG_LOCK_DEPLOYMENT_CONFIGURATION}>
734-
<LockDeploymentConfiguration />
735-
</Route>
736-
)}
737-
</>
738-
)}
695+
{serverMode !== SERVER_MODE.EA_ONLY && [
696+
DeploymentWindow && (
697+
<Route key={URLS.GLOBAL_CONFIG_DEPLOYMENT_WINDOW} path={URLS.GLOBAL_CONFIG_DEPLOYMENT_WINDOW}>
698+
<DeploymentWindow isSuperAdmin={isSuperAdmin} />
699+
</Route>
700+
),
701+
ImagePromotion && (
702+
<Route key={URLS.GLOBAL_CONFIG_IMAGE_PROMOTION} path={URLS.GLOBAL_CONFIG_IMAGE_PROMOTION}>
703+
<ImagePromotion isSuperAdmin={isSuperAdmin} />
704+
</Route>
705+
),
706+
PluginsPolicy && (
707+
<Route path={URLS.GLOBAL_CONFIG_PLUGINS}>
708+
<PluginsPolicy />
709+
</Route>
710+
),
711+
PullImageDigest && (
712+
<Route path={URLS.GLOBAL_CONFIG_PULL_IMAGE_DIGEST}>
713+
<PullImageDigest isSuperAdmin={isSuperAdmin} />
714+
</Route>
715+
),
716+
TagListContainer && (
717+
<Route path={URLS.GLOBAL_CONFIG_TAGS}>
718+
<TagListContainer />
719+
</Route>
720+
),
721+
FilterConditions && (
722+
<Route path={URLS.GLOBAL_CONFIG_FILTER_CONDITION}>
723+
<FilterConditions isSuperAdmin={isSuperAdmin} />
724+
</Route>
725+
),
726+
LockDeploymentConfiguration && (
727+
<Route path={URLS.GLOBAL_CONFIG_LOCK_DEPLOYMENT_CONFIGURATION}>
728+
<LockDeploymentConfiguration />
729+
</Route>
730+
)
731+
]}
739732
<Redirect to={defaultRoute()} />
740733
</Switch>
741734
)
@@ -826,7 +819,7 @@ export const ProtectedInput = ({
826819
labelClassName = '',
827820
placeholder = '',
828821
dataTestid = '',
829-
onBlur = (e) => {},
822+
onBlur = (e) => { },
830823
isRequiredField = false,
831824
}: ProtectedInputType) => {
832825
const [shown, toggleShown] = useState(false)
@@ -889,7 +882,7 @@ export const ShowHide = ({
889882
height="24"
890883
className={className}
891884
viewBox="0 0 24 24"
892-
onClick={disabled ? () => {} : onClick || defaultOnClick}
885+
onClick={disabled ? () => { } : onClick || defaultOnClick}
893886
>
894887
<g fill="none" fillRule="evenodd">
895888
<path d="M0 0h24v24H0V0zm0 0h24v24H0V0zm0 0h24v24H0V0zm0 0h24v24H0V0z" />
@@ -906,7 +899,7 @@ export const ShowHide = ({
906899
height="24"
907900
className={className}
908901
viewBox="0 0 24 24"
909-
onClick={disabled ? () => {} : onClick || defaultOnClick}
902+
onClick={disabled ? () => { } : onClick || defaultOnClick}
910903
>
911904
<g fill="none" fillRule="evenodd">
912905
<path d="M0 0h24v24H0z" />

‎yarn.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -993,10 +993,10 @@
993993
dependencies:
994994
"@jridgewell/trace-mapping" "0.3.9"
995995

996-
"@devtron-labs/[email protected]beta-4":
997-
version "0.2.17-beta-4"
998-
resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.2.17-beta-4.tgz#cd4ee5d98e8bae8047218aadbd3398d0ccdd7636"
999-
integrity sha512-bPXxJwnoYsdBzIwzvvqkVHCscB7TMMkDtGi6gnUwVABXLWilKfpMCoGiw4HUGhrQcYCm9EgPpv4af4FdDZwotA==
996+
"@devtron-labs/[email protected]patch-3":
997+
version "0.2.17-patch-3"
998+
resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-0.2.17-patch-3.tgz#ae39b05ba6ad740094534318adf2e1cc18098cef"
999+
integrity sha512-ihTCmAqVDrhfCVHO95R/KUxAZhksjt2dZq4t70irAYO3K5vE7oAsMrNR1d3NtZLEPhERz7aNbKAgbdm5409Vaw==
10001000
dependencies:
10011001
"@types/react-dates" "^21.8.6"
10021002
ansi_up "^5.2.1"

0 commit comments

Comments
 (0)