Skip to content

chore: fix global config routes #2037

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

Merged
merged 2 commits into from
Sep 10, 2024
Merged

chore: fix global config routes #2037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d26c976
chore: fix default routing in global config
Sep 10, 2024
bf9e4c8
chore: version bump
Sep 10, 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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"private": true,
"homepage": "/dashboard",
"dependencies": {
"@devtron-labs/devtron-fe-common-lib": "0.2.17-beta-4",
"@devtron-labs/devtron-fe-common-lib": "0.2.17-patch-3",
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
"@rjsf/core": "^5.13.3",
"@rjsf/utils": "^5.13.3",
Expand Down
123 changes: 58 additions & 65 deletions src/components/globalConfigurations/GlobalConfiguration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
*/

import { lazy, useState, useEffect, Suspense, isValidElement } from 'react'
import { Route, NavLink, Router, Switch, Redirect } from 'react-router-dom'
import { useHistory, useLocation } from 'react-router'
import { Route, NavLink, Router, Switch, Redirect, useHistory, useLocation } from 'react-router-dom'
import {
showError,
Progressing,
Expand Down Expand Up @@ -331,12 +330,11 @@ const NavItem = ({ serverMode }) => {
to={`${route.href}`}
activeClassName="active-route"
data-testid={route.dataTestId}
className={`${
route.name === 'API tokens' &&
className={`${route.name === 'API tokens' &&
location.pathname.startsWith(`${URLS.GLOBAL_CONFIG_AUTH}/${Routes.API_TOKEN}`)
? 'active-route'
: ''
}`}
? 'active-route'
: ''
}`}
onClick={(e) => {
if (!preventOnClickOp) {
handleGroupCollapsedState(e, route)
Expand Down Expand Up @@ -421,9 +419,8 @@ const NavItem = ({ serverMode }) => {
key={`nav_item_${index}`}
to={route.href}
data-testid="user-authorization-link"
className={`cursor ${
collapsedState[route.name] ? '' : 'fw-6'
} flex dc__content-space`}
className={`cursor ${collapsedState[route.name] ? '' : 'fw-6'
} flex dc__content-space`}
onClick={(e) => {
handleGroupCollapsedState(e, route)
}}
Expand Down Expand Up @@ -574,7 +571,7 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
}

return (
<Switch location={location}>
<Switch>
<Route
path={URLS.GLOBAL_CONFIG_CLUSTER}
render={(props) => {
Expand All @@ -588,7 +585,7 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
}}
/>
{!window._env_.K8S_CLIENT && [
serverMode !== SERVER_MODE.EA_ONLY && (
...serverMode !== SERVER_MODE.EA_ONLY ? [(
<Route
key={URLS.GLOBAL_CONFIG_HOST_URL}
path={URLS.GLOBAL_CONFIG_HOST_URL}
Expand All @@ -603,7 +600,7 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
)
}}
/>
),
)] : [],
<Route
key={URLS.GLOBAL_CONFIG_GITOPS}
path={URLS.GLOBAL_CONFIG_GITOPS}
Expand All @@ -618,15 +615,15 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
return <Project {...props} isSuperAdmin={isSuperAdmin} />
}}
/>,
serverMode !== SERVER_MODE.EA_ONLY && (
...serverMode !== SERVER_MODE.EA_ONLY ? [(
<Route
key={URLS.GLOBAL_CONFIG_GIT}
path={URLS.GLOBAL_CONFIG_GIT}
render={(props) => {
return <GitProvider {...props} isSuperAdmin={isSuperAdmin} />
}}
/>
),
)] : [],
<Route
key={URLS.GLOBAL_CONFIG_DOCKER}
path={`${URLS.GLOBAL_CONFIG_DOCKER}/:id?`}
Expand All @@ -648,14 +645,14 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
return <ChartRepo {...props} isSuperAdmin={isSuperAdmin} />
}}
/>,
serverMode !== SERVER_MODE.EA_ONLY && (
...serverMode !== SERVER_MODE.EA_ONLY ? [(
<Route
key={CommonURLS.GLOBAL_CONFIG_DEPLOYMENT_CHARTS_LIST}
path={CommonURLS.GLOBAL_CONFIG_DEPLOYMENT_CHARTS_LIST}
>
<DeploymentChartsRouter />
</Route>
),
)] : [],
<Route key={URLS.GLOBAL_CONFIG_AUTH} path={URLS.GLOBAL_CONFIG_AUTH} component={Authorization} />,
<Route
key={URLS.GLOBAL_CONFIG_NOTIFIER}
Expand All @@ -676,10 +673,10 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
</Route>,
...(serverMode !== SERVER_MODE.EA_ONLY
? [
<Route key={URLS.GLOBAL_CONFIG_BUILD_INFRA} path={URLS.GLOBAL_CONFIG_BUILD_INFRA}>
<BuildInfra isSuperAdmin={isSuperAdmin} />
</Route>,
]
<Route key={URLS.GLOBAL_CONFIG_BUILD_INFRA} path={URLS.GLOBAL_CONFIG_BUILD_INFRA}>
<BuildInfra isSuperAdmin={isSuperAdmin} />
</Route>,
]
: []),
]}
{window._env_.ENABLE_SCOPED_VARIABLES && (
Expand All @@ -695,47 +692,43 @@ const Body = ({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
<CatalogFramework isSuperAdmin={isSuperAdmin} />
</Route>
)}
{serverMode !== SERVER_MODE.EA_ONLY && (
<>
{DeploymentWindow && (
<Route key={URLS.GLOBAL_CONFIG_DEPLOYMENT_WINDOW} path={URLS.GLOBAL_CONFIG_DEPLOYMENT_WINDOW}>
<DeploymentWindow isSuperAdmin={isSuperAdmin} />
</Route>
)}
,
{ImagePromotion && (
<Route key={URLS.GLOBAL_CONFIG_IMAGE_PROMOTION} path={URLS.GLOBAL_CONFIG_IMAGE_PROMOTION}>
<ImagePromotion isSuperAdmin={isSuperAdmin} />
</Route>
)}
,
{PluginsPolicy && (
<Route path={URLS.GLOBAL_CONFIG_PLUGINS}>
<PluginsPolicy />
</Route>
)}
{PullImageDigest && (
<Route path={URLS.GLOBAL_CONFIG_PULL_IMAGE_DIGEST}>
<PullImageDigest isSuperAdmin={isSuperAdmin} />
</Route>
)}
{TagListContainer && (
<Route path={URLS.GLOBAL_CONFIG_TAGS}>
<TagListContainer />
</Route>
)}
{FilterConditions && (
<Route path={URLS.GLOBAL_CONFIG_FILTER_CONDITION}>
<FilterConditions isSuperAdmin={isSuperAdmin} />
</Route>
)}
{LockDeploymentConfiguration && (
<Route path={URLS.GLOBAL_CONFIG_LOCK_DEPLOYMENT_CONFIGURATION}>
<LockDeploymentConfiguration />
</Route>
)}
</>
)}
{serverMode !== SERVER_MODE.EA_ONLY && [
DeploymentWindow && (
<Route key={URLS.GLOBAL_CONFIG_DEPLOYMENT_WINDOW} path={URLS.GLOBAL_CONFIG_DEPLOYMENT_WINDOW}>
<DeploymentWindow isSuperAdmin={isSuperAdmin} />
</Route>
),
ImagePromotion && (
<Route key={URLS.GLOBAL_CONFIG_IMAGE_PROMOTION} path={URLS.GLOBAL_CONFIG_IMAGE_PROMOTION}>
<ImagePromotion isSuperAdmin={isSuperAdmin} />
</Route>
),
PluginsPolicy && (
<Route path={URLS.GLOBAL_CONFIG_PLUGINS}>
<PluginsPolicy />
</Route>
),
PullImageDigest && (
<Route path={URLS.GLOBAL_CONFIG_PULL_IMAGE_DIGEST}>
<PullImageDigest isSuperAdmin={isSuperAdmin} />
</Route>
),
TagListContainer && (
<Route path={URLS.GLOBAL_CONFIG_TAGS}>
<TagListContainer />
</Route>
),
FilterConditions && (
<Route path={URLS.GLOBAL_CONFIG_FILTER_CONDITION}>
<FilterConditions isSuperAdmin={isSuperAdmin} />
</Route>
),
LockDeploymentConfiguration && (
<Route path={URLS.GLOBAL_CONFIG_LOCK_DEPLOYMENT_CONFIGURATION}>
<LockDeploymentConfiguration />
</Route>
)
]}
<Redirect to={defaultRoute()} />
</Switch>
)
Expand Down Expand Up @@ -826,7 +819,7 @@ export const ProtectedInput = ({
labelClassName = '',
placeholder = '',
dataTestid = '',
onBlur = (e) => {},
onBlur = (e) => { },
isRequiredField = false,
}: ProtectedInputType) => {
const [shown, toggleShown] = useState(false)
Expand Down Expand Up @@ -889,7 +882,7 @@ export const ShowHide = ({
height="24"
className={className}
viewBox="0 0 24 24"
onClick={disabled ? () => {} : onClick || defaultOnClick}
onClick={disabled ? () => { } : onClick || defaultOnClick}
>
<g fill="none" fillRule="evenodd">
<path d="M0 0h24v24H0V0zm0 0h24v24H0V0zm0 0h24v24H0V0zm0 0h24v24H0V0z" />
Expand All @@ -906,7 +899,7 @@ export const ShowHide = ({
height="24"
className={className}
viewBox="0 0 24 24"
onClick={disabled ? () => {} : onClick || defaultOnClick}
onClick={disabled ? () => { } : onClick || defaultOnClick}
>
<g fill="none" fillRule="evenodd">
<path d="M0 0h24v24H0z" />
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,10 +993,10 @@
dependencies:
"@jridgewell/trace-mapping" "0.3.9"

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