Skip to content

Commit 38b9a56

Browse files
committed
refactor: move ResourceRecommenderTableCellComponent to fe-lib
1 parent 9789204 commit 38b9a56

File tree

6 files changed

+41
-212
lines changed

6 files changed

+41
-212
lines changed

src/components/ResourceBrowser/ResourceList/ResourceBrowserActionMenu.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ import { getShowResourceScanModal, importComponentFromFELibrary } from '../../co
4040
import { NodeType } from '../../v2/appDetails/appDetails.type'
4141
import { ResourceBrowserActionMenuType } from '../Types'
4242
import DeleteResourcePopup from './DeleteResourcePopup'
43+
import { ResourceBrowserActionMenuEnum } from './types'
4344

4445
const getResourceScanDetails: ({
4546
name,
@@ -58,15 +59,6 @@ const getResourceScanDetails: ({
5859
'function',
5960
)
6061

61-
enum ResourceBrowserActionMenuEnum {
62-
manifest = 'manifest',
63-
events = 'events',
64-
logs = 'logs',
65-
terminal = 'terminal',
66-
delete = 'delete',
67-
vulnerability = 'vulnerability',
68-
}
69-
7062
const ResourceBrowserActionMenu = forwardRef(
7163
(
7264
{

src/components/ResourceBrowser/ResourceList/ResourceFilterOptions.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ const ResourceFilterOptions = ({
170170
const handleInputFocus = () => setIsInputFocused(true)
171171

172172
const handleOnEventTypeChange: SegmentedControlProps['onChange'] = ({ value }) => {
173-
updateSearchParams({ eventType: value })
173+
updateSearchParams({ eventType: value === 'normal' ? value : null })
174174
}
175175

176176
const handleToggleShowAbsoluteValues = () => {

src/components/ResourceBrowser/ResourceList/ResourceList.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@ import NodeDetailComponentWrapper from './NodeDetailComponentWrapper'
6464
import NodeDetailWrapper from './NodeDetailWrapper'
6565
import { renderRefreshBar } from './ResourceList.component'
6666
import ResourcePageHeader from './ResourcePageHeader'
67-
import ResourceRecommenderTableCellComponent from './ResourceRecommenderTableCellComponent'
6867
import { ResourceRecommenderTableViewWrapper } from './ResourceRecommenderTableViewWrapper'
69-
import { dynamicSort, getClusterOptions } from './utils'
68+
import { dynamicSort, getClusterOptions, getResourceRecommenderResourceDetailURL } from './utils'
7069

7170
const MonitoringDashboard = importComponentFromFELibrary('MonitoringDashboard', null, 'function')
7271
const ResourceRecommender = importComponentFromFELibrary('ResourceRecommender', null, 'function')
@@ -370,8 +369,8 @@ const ResourceList = () => {
370369
<DynamicTabComponentWrapper type="fixed" {...DynamicTabComponentWrapperBaseProps}>
371370
<ResourceRecommender
372371
selectedCluster={selectedCluster}
373-
ResourceRecommenderTableCellComponent={ResourceRecommenderTableCellComponent}
374372
ResourceRecommenderTableViewWrapper={ResourceRecommenderTableViewWrapper}
373+
getResourceRecommenderResourceDetailURL={getResourceRecommenderResourceDetailURL}
375374
dynamicSort={dynamicSort}
376375
/>
377376
</DynamicTabComponentWrapper>

src/components/ResourceBrowser/ResourceList/ResourceRecommenderTableCellComponent.tsx

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

src/components/ResourceBrowser/ResourceList/types.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,12 @@ export enum NodeActionMenuOptionIdEnum {
114114
editYaml = 'edit-yaml',
115115
delete = 'delete',
116116
}
117+
118+
export enum ResourceBrowserActionMenuEnum {
119+
manifest = 'manifest',
120+
events = 'events',
121+
logs = 'logs',
122+
terminal = 'terminal',
123+
delete = 'delete',
124+
vulnerability = 'vulnerability',
125+
}

src/components/ResourceBrowser/ResourceList/utils.tsx

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

17+
import { MouseEvent } from 'react'
18+
import { generatePath } from 'react-router-dom'
19+
1720
import {
21+
ALL_NAMESPACE_OPTION,
1822
ClusterDetail,
1923
logExceptionToSentry,
2024
numberComparatorBySortOrder,
2125
stringComparatorBySortOrder,
2226
versionComparatorBySortOrder,
2327
} from '@devtron-labs/devtron-fe-common-lib'
2428

29+
import { clusterId } from '@Components/ClusterNodes/__mocks__/clusterAbout.mock'
2530
import { importComponentFromFELibrary, k8sStyledAgeToSeconds, sortObjectArrayAlphabetically } from '@Components/common'
2631
import { UseTabsReturnType } from '@Components/common/DynamicTabs/types'
2732

2833
import {
34+
DUMMY_RESOURCE_GVK_VERSION,
2935
K8S_EMPTY_GROUP,
3036
NODE_K8S_VERSION_FILTER_KEY,
3137
NODE_SEARCH_KEYS_TO_OBJECT_KEYS,
38+
RESOURCE_ACTION_MENU,
3239
RESOURCE_BROWSER_ROUTES,
3340
ResourceBrowserRouteToTabIdMap,
3441
SIDEBAR_KEYS,
@@ -323,3 +330,24 @@ export const getTabIdForTab = (
323330
const functionParams = getTabIdParamsForPath(path, params)
324331
return functionParams ? getTabId(...functionParams) : null
325332
}
333+
334+
export const getResourceRecommenderResourceDetailURL = (e: MouseEvent<HTMLButtonElement>) => {
335+
const {
336+
name,
337+
namespace = ALL_NAMESPACE_OPTION.value,
338+
kind,
339+
group: _group,
340+
tab = RESOURCE_ACTION_MENU.manifest,
341+
} = e.currentTarget.dataset
342+
343+
const url = generatePath(RESOURCE_BROWSER_ROUTES.K8S_RESOURCE_DETAIL, {
344+
clusterId,
345+
namespace,
346+
name,
347+
kind: kind.toLowerCase(),
348+
group: _group || K8S_EMPTY_GROUP,
349+
version: DUMMY_RESOURCE_GVK_VERSION,
350+
})
351+
352+
return `${url}/${tab}`
353+
}

0 commit comments

Comments
 (0)