Skip to content

Commit f57d77d

Browse files
committed
Merge branch 'main' into feat/doc-utm-source
2 parents 42f8695 + 68b78b5 commit f57d77d

File tree

10 files changed

+265
-266
lines changed

10 files changed

+265
-266
lines changed

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,3 +69,4 @@ FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false
6969
GATEKEEPER_URL=https://license.devtron.ai/dashboard
7070
FEATURE_AI_INTEGRATION_ENABLE=false
7171
LOGIN_PAGE_IMAGE=
72+
FEATURE_REDFISH_NODE_ENABLE=false

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": "1.13.0-pre-9",
7+
"@devtron-labs/devtron-fe-common-lib": "1.14.0-pre-0",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

src/assets/icons/ic-terminal-line.svg

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/components/ApplicationGroup/AppGroup.utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ export const getAppGroupDeploymentHistoryLink = (
326326
) => {
327327
if (status?.toLowerCase() === DEPLOYMENT_STATUS.PROGRESSING) {
328328
//If deployment is in progress then it will redirect to app details page
329-
return `${URLS.APP}/${appId}/${URLS.APP_DETAILS}/${envId}`
329+
return `${URLS.APPLICATION_GROUP}/${envId}/${URLS.APP_DETAILS}/${appId}`
330330
}
331331
if (redirectToAppGroup) {
332332
// It will redirect to application group deployment history in case of same environment

src/components/ClusterNodes/ClusterOverview.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {
3131
StatusComponent,
3232
StatusType,
3333
useAsync,
34+
useMainContext,
3435
} from '@devtron-labs/devtron-fe-common-lib'
3536

3637
import { getUpgradeCompatibilityTippyConfig } from '@Components/ResourceBrowser/ResourceList/utils'
@@ -119,6 +120,8 @@ function ClusterOverview({ selectedCluster, addTab }: ClusterOverviewProps) {
119120
namespace: string
120121
}>()
121122

123+
const { isSuperAdmin } = useMainContext()
124+
122125
const history = useHistory()
123126
const { path } = useRouteMatch()
124127
const [clusterConfig, setClusterConfig] = useState<InstallationClusterConfigType | null>(null)
@@ -128,7 +131,7 @@ function ClusterOverview({ selectedCluster, addTab }: ClusterOverviewProps) {
128131
const getClusterConfigAbortControllerRef = useRef(new AbortController())
129132

130133
const fetchClusterConfig = async (clusterName: string) => {
131-
if (!getInstallationClusterConfig) {
134+
if (!getInstallationClusterConfig || !isSuperAdmin) {
132135
return
133136
}
134137

0 commit comments

Comments
 (0)