Skip to content

Commit 961daa6

Browse files
committed
revert: version in k8s resource detail & list
1 parent 47e0976 commit 961daa6

File tree

8 files changed

+3
-16
lines changed

8 files changed

+3
-16
lines changed

src/components/ClusterNodes/ClusterOverview.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import React, { useEffect, useRef, useState } from 'react'
1818
import { generatePath, useHistory, useParams } from 'react-router-dom'
1919

2020
import {
21-
DUMMY_RESOURCE_GVK_VERSION,
2221
EditableTextArea,
2322
ErrorScreenManager,
2423
getRandomColor,
@@ -216,7 +215,6 @@ function ClusterOverview({ selectedCluster, addTab }: ClusterOverviewProps) {
216215
clusterId,
217216
kind: 'node',
218217
group: K8S_EMPTY_GROUP,
219-
version: DUMMY_RESOURCE_GVK_VERSION,
220218
})}?${queryParam}=${encodeURIComponent(filterText)}`
221219
history.push(newUrl)
222220
}

src/components/ResourceBrowser/Constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ export const AI_BUTTON_CONFIG_MAP: Record<string, ShowAIButtonConfig> = Object.f
397397
export const ResourceBrowserRouteToTabIdMap: Partial<
398398
Record<(typeof RESOURCE_BROWSER_ROUTES)[keyof typeof RESOURCE_BROWSER_ROUTES], ResourceBrowserTabsId | string>
399399
> = {
400-
'/resource-browser/:clusterId/:kind/:group/:version': ResourceBrowserTabsId.k8s_Resources,
400+
'/resource-browser/:clusterId/:kind/:group': ResourceBrowserTabsId.k8s_Resources,
401401
'/resource-browser/:clusterId/overview': ResourceBrowserTabsId.cluster_overview,
402402
'/resource-browser/:clusterId/monitoring-dashboard': MONITORING_DASHBOARD_TAB_ID,
403403
'/resource-browser/:clusterId/terminal': ResourceBrowserTabsId.terminal,

src/components/ResourceBrowser/ResourceList/ClusterUpgradeCompatibilityInfoTableCellComponent.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import DOMPurify from 'dompurify'
55
import {
66
ALL_NAMESPACE_OPTION,
77
ClipboardButton,
8-
DUMMY_RESOURCE_GVK_VERSION,
98
GVKType,
109
highlightSearchText,
1110
K8sResourceDetailDataType,
@@ -49,7 +48,6 @@ const ClusterUpgradeCompatibilityInfoTableCellComponent = ({
4948
name,
5049
kind: kind.toLowerCase(),
5150
group,
52-
version: DUMMY_RESOURCE_GVK_VERSION,
5351
})
5452

5553
push(`${url}/${tab}`)

src/components/ResourceBrowser/ResourceList/K8sResourceListTableCellComponent.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import {
88
ButtonVariantType,
99
ClipboardButton,
1010
ConditionalWrap,
11-
DUMMY_RESOURCE_GVK_VERSION,
1211
getAIAnalyticsEvents,
1312
highlightSearchText,
1413
Icon,
@@ -90,7 +89,6 @@ const K8sResourceListTableCellComponent = ({
9089
name,
9190
kind: kind.toLowerCase(),
9291
group: _group || K8S_EMPTY_GROUP,
93-
version: DUMMY_RESOURCE_GVK_VERSION,
9492
})
9593

9694
push(`${url}/${tab}`)
@@ -154,7 +152,6 @@ const K8sResourceListTableCellComponent = ({
154152
name,
155153
group,
156154
kind,
157-
version: DUMMY_RESOURCE_GVK_VERSION,
158155
}),
159156
)
160157
}

src/components/ResourceBrowser/ResourceList/Sidebar.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import DOMPurify from 'dompurify'
2222

2323
import {
2424
ApiResourceGroupType,
25-
DUMMY_RESOURCE_GVK_VERSION,
2625
highlightSearchText,
2726
K8S_EMPTY_GROUP,
2827
Nodes,
@@ -122,7 +121,6 @@ const Sidebar = ({ apiResources, selectedResource, updateK8sResourceTab, updateT
122121
clusterId,
123122
kind: _selectedKind,
124123
group: _selectedGroup || K8S_EMPTY_GROUP,
125-
version: DUMMY_RESOURCE_GVK_VERSION,
126124
})
127125

128126
if (path === location.pathname) {

src/components/ResourceBrowser/Utils.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import queryString from 'query-string'
2222
import {
2323
ApiResourceGroupType,
2424
DATE_TIME_FORMAT_STRING,
25-
DUMMY_RESOURCE_GVK_VERSION,
2625
FeatureTitleWithInfo,
2726
getUrlWithSearchParams,
2827
GVK_FILTER_API_VERSION_QUERY_PARAM_KEY,
@@ -305,7 +304,6 @@ export const getTabsBasedOnRole = ({
305304
clusterId,
306305
kind: 'node',
307306
group: K8S_EMPTY_GROUP,
308-
version: DUMMY_RESOURCE_GVK_VERSION,
309307
}),
310308
isSelected: true,
311309
type: 'fixed',
@@ -454,7 +452,6 @@ export const getClusterChangeRedirectionUrl = (shouldRedirectToInstallationStatu
454452
clusterId: id,
455453
group: K8S_EMPTY_GROUP,
456454
kind: 'node',
457-
version: DUMMY_RESOURCE_GVK_VERSION,
458455
})
459456

460457
const renderAppGroupDescriptionContent = () =>

src/components/common/ClusterMetaDataBar/ClusterMetaDataBar.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { generatePath, useHistory } from 'react-router-dom'
1818

1919
import {
2020
AppThemeType,
21-
DUMMY_RESOURCE_GVK_VERSION,
2221
getComponentSpecificThemeClass,
2322
K8S_EMPTY_GROUP,
2423
RESOURCE_BROWSER_ROUTES,
@@ -56,7 +55,7 @@ export const ClusterMetaDataBar = ({
5655
<a
5756
className={`${darkTheme ? 'icon-stroke__white resource-link__dark-theme text__white' : 'scn-9 cn-9 resource-link__white-theme'} fw-6 flex left dc__gap-6 cursor`}
5857
target="_blank"
59-
href={`${window.__BASE_URL__}${generatePath(RESOURCE_BROWSER_ROUTES.K8S_RESOURCE_LIST, { clusterId, group: K8S_EMPTY_GROUP, kind: 'pod', version: DUMMY_RESOURCE_GVK_VERSION })}?namespace=${namespace}`}
58+
href={`${window.__BASE_URL__}${generatePath(RESOURCE_BROWSER_ROUTES.K8S_RESOURCE_LIST, { clusterId, group: K8S_EMPTY_GROUP, kind: 'pod' })}?namespace=${namespace}`}
6059
rel="noreferrer"
6160
>
6261
<AllResourcesIcon />

src/components/common/navigation/constants.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const COMMON_ENV_FALLBACK: Omit<EnvironmentDataValuesDTO, 'isAirGapEnvironment'>
3030
featureGitOpsFlags: structuredClone(DEFAULT_GIT_OPS_FEATURE_FLAGS),
3131
canFetchHelmAppStatus: false,
3232
devtronManagedLicensingEnabled: false,
33-
isResourceRecommendationEnabled: false,
33+
isResourceRecommendationEnabled: true,
3434
}
3535

3636
export const ENVIRONMENT_DATA_FALLBACK: EnvironmentDataValuesDTO = {

0 commit comments

Comments
 (0)