Skip to content

Commit 68a26f4

Browse files
Elessar1802Elessar1802
committed
fix: review comments
1 parent e3f9691 commit 68a26f4

16 files changed

+43
-99
lines changed

‎src/components/ClusterNodes/ClusterList/ClusterListRow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import {
1212
ConditionalWrap,
1313
Icon,
1414
InstallationClusterStatus,
15+
RESOURCE_BROWSER_ROUTES,
1516
Tooltip,
1617
useBulkSelection,
1718
} from '@devtron-labs/devtron-fe-common-lib'
1819

1920
import { ReactComponent as Error } from '@Icons/ic-error-exclamation.svg'
2021
import { importComponentFromFELibrary } from '@Components/common'
21-
import { RESOURCE_BROWSER_ROUTES } from '@Components/ResourceBrowser/Constants'
2222
import { getClusterChangeRedirectionUrl } from '@Components/ResourceBrowser/Utils'
2323

2424
import { ClusterMapInitialStatus } from '../ClusterMapInitialStatus'

‎src/components/ClusterNodes/ClusterOverview.tsx

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

2020
import {
21+
DUMMY_RESOURCE_GVK_VERSION,
2122
EditableTextArea,
2223
ErrorScreenManager,
2324
getRandomColor,
@@ -26,6 +27,7 @@ import {
2627
InfoIconTippy,
2728
InstallationClusterConfigType,
2829
noop,
30+
RESOURCE_BROWSER_ROUTES,
2931
ResourceKindType,
3032
showError,
3133
StatusComponent,
@@ -43,9 +45,7 @@ import { MAX_LENGTH_350 } from '../../config/constantMessaging'
4345
import { importComponentFromFELibrary } from '../common'
4446
import GenericDescription from '../common/Description/GenericDescription'
4547
import {
46-
DUMMY_RESOURCE_GVK_VERSION,
4748
K8S_EMPTY_GROUP,
48-
RESOURCE_BROWSER_ROUTES,
4949
SIDEBAR_KEYS,
5050
TARGET_K8S_VERSION_SEARCH_KEY,
5151
UPGRADE_CLUSTER_CONSTANTS,

‎src/components/ResourceBrowser/Constants.ts

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { NO_MATCHING_RESULT, Nodes, URLS } from '@devtron-labs/devtron-fe-common-lib'
17+
import { NO_MATCHING_RESULT, Nodes, RESOURCE_BROWSER_ROUTES } from '@devtron-labs/devtron-fe-common-lib'
1818

1919
import ICArrowUpCircle from '@Icons/ic-arrow-up-circle.svg'
2020

@@ -110,6 +110,9 @@ export const RESOURCE_ACTION_MENU = {
110110
delete: 'delete',
111111
}
112112

113+
/**
114+
* @deprecated Use from common-lib instead
115+
*/
113116
export const K8S_EMPTY_GROUP = 'k8sEmptyGroup'
114117
export const NAMESPACE_NOT_APPLICABLE_OPTION = {
115118
label: 'Namespace: Not applicable',
@@ -386,19 +389,6 @@ export const AI_BUTTON_CONFIG_MAP: Record<string, ShowAIButtonConfig> = Object.f
386389
},
387390
})
388391

389-
export const RESOURCE_BROWSER_ROUTES = {
390-
OVERVIEW: `${URLS.RESOURCE_BROWSER}/:clusterId/overview`,
391-
MONITORING_DASHBOARD: `${URLS.RESOURCE_BROWSER}/:clusterId/monitoring-dashboard`,
392-
TERMINAL: `${URLS.RESOURCE_BROWSER}/:clusterId/terminal`,
393-
CLUSTER_UPGRADE: `${URLS.RESOURCE_BROWSER}/:clusterId/cluster-upgrade`,
394-
NODE_DETAIL: `${URLS.RESOURCE_BROWSER}/:clusterId/node/:name`,
395-
K8S_RESOURCE_DETAIL: `${URLS.RESOURCE_BROWSER}/:clusterId/:namespace/:kind/:group/:version/:name`,
396-
K8S_RESOURCE_LIST: `${URLS.RESOURCE_BROWSER}/:clusterId/:kind/:group/:version`,
397-
RESOURCE_RECOMMENDER: `${URLS.RESOURCE_BROWSER}/:clusterId/resource-recommender`,
398-
} as const
399-
400-
export const DUMMY_RESOURCE_GVK_VERSION = 'v1'
401-
402392
export const ResourceBrowserRouteToTabIdMap: Partial<
403393
Record<(typeof RESOURCE_BROWSER_ROUTES)[keyof typeof RESOURCE_BROWSER_ROUTES], ResourceBrowserTabsId | string>
404394
> = {

‎src/components/ResourceBrowser/ResourceList/ClusterUpgradeCompatibilityInfoTableCellComponent.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,18 @@ import DOMPurify from 'dompurify'
55
import {
66
ALL_NAMESPACE_OPTION,
77
ClipboardButton,
8+
DUMMY_RESOURCE_GVK_VERSION,
89
GVKType,
910
highlightSearchText,
1011
K8sResourceDetailDataType,
1112
Nodes,
1213
noop,
14+
RESOURCE_BROWSER_ROUTES,
1315
TableSignalEnum,
1416
Tooltip,
1517
} from '@devtron-labs/devtron-fe-common-lib'
1618

17-
import {
18-
DUMMY_RESOURCE_GVK_VERSION,
19-
K8S_EMPTY_GROUP,
20-
RESOURCE_ACTION_MENU,
21-
RESOURCE_BROWSER_ROUTES,
22-
} from '../Constants'
19+
import { K8S_EMPTY_GROUP, RESOURCE_ACTION_MENU } from '../Constants'
2320
import { ClusterDetailBaseParams } from '../Types'
2421
import { renderResourceValue } from '../Utils'
2522
import ResourceBrowserActionMenu from './ResourceBrowserActionMenu'

‎src/components/ResourceBrowser/ResourceList/DynamicTabComponentWrapper.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { cloneElement, ReactElement, useEffect } from 'react'
22
import { useLocation, useParams, useRouteMatch } from 'react-router-dom'
33

4-
import { logExceptionToSentry, noop } from '@devtron-labs/devtron-fe-common-lib'
4+
import { logExceptionToSentry, noop, RESOURCE_BROWSER_ROUTES } from '@devtron-labs/devtron-fe-common-lib'
55

6-
import { RESOURCE_BROWSER_ROUTES, UPGRADE_CLUSTER_CONSTANTS } from '../Constants'
6+
import { UPGRADE_CLUSTER_CONSTANTS } from '../Constants'
77
import { DynamicTabComponentWrapperProps } from './types'
88
import { getTabIdForTab, getTabIdParamsForPath, getUpgradeCompatibilityTippyConfig } from './utils'
99

‎src/components/ResourceBrowser/ResourceList/K8SResourceList.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ import { useLocation, useParams } from 'react-router-dom'
1919

2020
import {
2121
abortPreviousRequests,
22+
ErrorScreenManager,
2223
FiltersTypeEnum,
2324
getAIAnalyticsEvents,
2425
getIsRequestAborted,
2526
LARGE_PAGE_SIZE_OPTIONS,
2627
Nodes,
2728
PaginationEnum,
2829
SelectAllDialogStatus,
30+
ServerErrors,
2931
Table,
3032
TableColumnType,
3133
TableProps,
@@ -234,10 +236,13 @@ export const K8SResourceList = ({
234236
return columns.some(({ field }) => field === 'namespace') ? 'namespace' : 'name'
235237
}
236238

239+
if (resourceListError) {
240+
return <ErrorScreenManager code={(resourceListError as ServerErrors).code} />
241+
}
242+
237243
return (
238244
<>
239245
<Table
240-
// key={JSON.stringify(selectedResource)}
241246
loading={isResourceListLoading}
242247
columns={columns}
243248
rows={rows}

‎src/components/ResourceBrowser/ResourceList/K8sResourceListTableCellComponent.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@ import {
88
ButtonVariantType,
99
ClipboardButton,
1010
ConditionalWrap,
11+
DUMMY_RESOURCE_GVK_VERSION,
1112
getAIAnalyticsEvents,
1213
highlightSearchText,
1314
Icon,
1415
IconName,
1516
K8sResourceDetailDataType,
1617
Nodes,
1718
noop,
19+
RESOURCE_BROWSER_ROUTES,
20+
ResourceBrowserActionMenuEnum,
1821
TableSignalEnum,
1922
Tooltip,
2023
} from '@devtron-labs/devtron-fe-common-lib'
@@ -25,17 +28,12 @@ import { AddEnvironmentFormPrefilledInfoType } from '@Pages/GlobalConfigurations
2528
import { ClusterEnvironmentDrawer } from '@Pages/GlobalConfigurations/ClustersAndEnvironments/ClusterEnvironmentDrawer'
2629
import { ADD_ENVIRONMENT_FORM_LOCAL_STORAGE_KEY } from '@Pages/GlobalConfigurations/ClustersAndEnvironments/constants'
2730

28-
import {
29-
AI_BUTTON_CONFIG_MAP,
30-
DUMMY_RESOURCE_GVK_VERSION,
31-
K8S_EMPTY_GROUP,
32-
RESOURCE_BROWSER_ROUTES,
33-
} from '../Constants'
31+
import { AI_BUTTON_CONFIG_MAP, K8S_EMPTY_GROUP } from '../Constants'
3432
import { ClusterDetailBaseParams } from '../Types'
3533
import { getRenderInvolvedObjectButton, getRenderNodeButton, renderResourceValue } from '../Utils'
3634
import NodeActionsMenu from './NodeActionsMenu'
3735
import ResourceBrowserActionMenu from './ResourceBrowserActionMenu'
38-
import { K8sResourceListTableCellComponentProps, ResourceBrowserActionMenuEnum } from './types'
36+
import { K8sResourceListTableCellComponentProps } from './types'
3937
import { getClassNameForColumn, getFirstResourceFromKindResourceMap, getShowAIButton, getStatusClass } from './utils'
4038

4139
const ExplainWithAIButton = importComponentFromFELibrary('ExplainWithAIButton', null, 'function')

‎src/components/ResourceBrowser/ResourceList/NodeActionsMenu.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ import {
2323
ButtonStyleType,
2424
ButtonVariantType,
2525
ComponentSizeType,
26+
NodeActionMenuOptionIdEnum,
2627
noop,
28+
RESOURCE_BROWSER_ROUTES,
2729
} from '@devtron-labs/devtron-fe-common-lib'
2830

2931
import { ReactComponent as MenuDots } from '@Icons/ic-more-vertical.svg'
@@ -33,10 +35,10 @@ import CordonNodeModal from '../../ClusterNodes/NodeActions/CordonNodeModal'
3335
import DeleteNodeModal from '../../ClusterNodes/NodeActions/DeleteNodeModal'
3436
import DrainNodeModal from '../../ClusterNodes/NodeActions/DrainNodeModal'
3537
import EditTaintsModal from '../../ClusterNodes/NodeActions/EditTaintsModal'
36-
import { K8S_EMPTY_GROUP, RESOURCE_BROWSER_ROUTES } from '../Constants'
38+
import { K8S_EMPTY_GROUP } from '../Constants'
3739
import { NodeActionsMenuProps } from '../Types'
3840
import { getNodeActions } from './constants'
39-
import { K8sResourceListURLParams, NodeActionMenuOptionIdEnum } from './types'
41+
import { K8sResourceListURLParams } from './types'
4042

4143
// TODO: This should be commoned out with ResourceBrowserActionMenu to have consistent styling
4244
const NodeActionsMenu = forwardRef<HTMLButtonElement, NodeActionsMenuProps>(

‎src/components/ResourceBrowser/ResourceList/ResourceBrowserActionMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import {
2626
GetResourceScanDetailsPayloadType,
2727
ModuleNameMap,
2828
Nodes,
29+
ResourceBrowserActionMenuEnum,
2930
ResponseType,
3031
ScanResultDTO,
3132
SecurityModal,
@@ -39,7 +40,6 @@ import { getShowResourceScanModal, importComponentFromFELibrary } from '../../co
3940
import { NodeType } from '../../v2/appDetails/appDetails.type'
4041
import { ResourceBrowserActionMenuType } from '../Types'
4142
import DeleteResourcePopup from './DeleteResourcePopup'
42-
import { ResourceBrowserActionMenuEnum } from './types'
4343

4444
const getResourceScanDetails: ({
4545
name,

‎src/components/ResourceBrowser/ResourceList/ResourceList.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import {
2323
getResourceGroupListRaw,
2424
handleAnalyticsEvent,
2525
Icon,
26+
RESOURCE_BROWSER_ROUTES,
2627
useAsync,
2728
useBreadcrumb,
2829
useEffectAfterMount,
@@ -44,7 +45,6 @@ import { importComponentFromFELibrary } from '../../common'
4445
import { DynamicTabs, useTabs } from '../../common/DynamicTabs'
4546
import {
4647
MONITORING_DASHBOARD_TAB_ID,
47-
RESOURCE_BROWSER_ROUTES,
4848
RESOURCE_RECOMMENDER_TAB_ID,
4949
ResourceBrowserTabsId,
5050
SIDEBAR_KEYS,
@@ -65,7 +65,7 @@ import NodeDetailWrapper from './NodeDetailWrapper'
6565
import { renderRefreshBar } from './ResourceList.component'
6666
import ResourcePageHeader from './ResourcePageHeader'
6767
import { ResourceRecommenderTableViewWrapper } from './ResourceRecommenderTableViewWrapper'
68-
import { dynamicSort, getClusterOptions, getResourceRecommenderResourceDetailURL } from './utils'
68+
import { dynamicSort, getClusterOptions } from './utils'
6969

7070
const MonitoringDashboard = importComponentFromFELibrary('MonitoringDashboard', null, 'function')
7171
const ResourceRecommender = importComponentFromFELibrary('ResourceRecommender', null, 'function')
@@ -370,7 +370,6 @@ const ResourceList = () => {
370370
<ResourceRecommender
371371
selectedCluster={selectedCluster}
372372
ResourceRecommenderTableViewWrapper={ResourceRecommenderTableViewWrapper}
373-
getResourceRecommenderResourceDetailURL={getResourceRecommenderResourceDetailURL}
374373
dynamicSort={dynamicSort}
375374
/>
376375
</DynamicTabComponentWrapper>

0 commit comments

Comments
 (0)