From f38c4d0d6b6c20dc394f16b3465d8089465c4200 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Fri, 25 Oct 2024 19:19:07 +0530 Subject: [PATCH 1/3] chore: migrate getResourceList --- src/Common/Constants.ts | 1 + .../ResourceBrowser/ResourceBrowser.Types.ts | 26 +++++++++++++++++++ src/Pages/ResourceBrowser/index.ts | 1 + src/Pages/ResourceBrowser/service.ts | 12 +++++++++ 4 files changed, 40 insertions(+) create mode 100644 src/Pages/ResourceBrowser/service.ts diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index 237afd4da..e63b67895 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -114,6 +114,7 @@ export const ROUTES = { DEPLOYMENT_CHARTS_LIST: 'deployment/template/fetch', USER_LIST_MIN: 'user/list/min', CONFIG_DATA: 'config/data', + K8S_RESOURCE_LIST: 'k8s/resource/list', } export enum KEY_VALUE { diff --git a/src/Pages/ResourceBrowser/ResourceBrowser.Types.ts b/src/Pages/ResourceBrowser/ResourceBrowser.Types.ts index 5e8a9218f..9e8a780fc 100644 --- a/src/Pages/ResourceBrowser/ResourceBrowser.Types.ts +++ b/src/Pages/ResourceBrowser/ResourceBrowser.Types.ts @@ -38,3 +38,29 @@ export interface K8SObjectBaseType { name: string isExpanded: boolean } + +interface K8sRequestResourceIdentifierType { + groupVersionKind: GVKType + namespace?: string + name?: string +} + +interface ResourceListPayloadK8sRequestType { + resourceIdentifier: K8sRequestResourceIdentifierType + patch?: string + forceDelete?: boolean +} + +export interface K8sResourceListPayloadType { + clusterId: number + k8sRequest: ResourceListPayloadK8sRequestType +} + +export type K8sResourceDetailDataType = { + [key: string]: string | number | object +} + +export interface K8sResourceDetailType { + headers: string[] + data: K8sResourceDetailDataType[] +} diff --git a/src/Pages/ResourceBrowser/index.ts b/src/Pages/ResourceBrowser/index.ts index 9e25b7854..1c2e934ce 100644 --- a/src/Pages/ResourceBrowser/index.ts +++ b/src/Pages/ResourceBrowser/index.ts @@ -16,3 +16,4 @@ export * from './ResourceBrowser.Types' export * from './Helper' +export * from './service' diff --git a/src/Pages/ResourceBrowser/service.ts b/src/Pages/ResourceBrowser/service.ts new file mode 100644 index 000000000..c4c0dbe7f --- /dev/null +++ b/src/Pages/ResourceBrowser/service.ts @@ -0,0 +1,12 @@ +import { post } from '@Common/Api' +import { ROUTES } from '@Common/Constants' +import { ResponseType } from '@Common/Types' +import { K8sResourceDetailType, K8sResourceListPayloadType } from './ResourceBrowser.Types' + +export const getK8sResourceList = ( + resourceListPayload: K8sResourceListPayloadType, + signal?: AbortSignal, +): Promise> => + post(ROUTES.K8S_RESOURCE_LIST, resourceListPayload, { + signal, + }) From f0fd3ad1a308cd28c3a90b8503d0d101f5c3e9dc Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 28 Oct 2024 15:14:36 +0530 Subject: [PATCH 2/3] chore: remove unused classes --- src/Common/CodeEditor/codeEditor.scss | 22 ------------------- .../ResourceBrowser/ResourceBrowser.Types.ts | 1 + 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/Common/CodeEditor/codeEditor.scss b/src/Common/CodeEditor/codeEditor.scss index 0baf971f5..0a344f541 100644 --- a/src/Common/CodeEditor/codeEditor.scss +++ b/src/Common/CodeEditor/codeEditor.scss @@ -105,18 +105,6 @@ min-height: 300px; } -.code-editor__information { - font-size: 12px; - font-weight: 400; - line-height: 1.33; - letter-spacing: normal; - color: var(--N900); - height: auto; - padding: 8px 16px; - border-bottom: 1px solid #d6dbdf; - background-color: var(--B100); -} - .code-editor__information-info-icon { width: 16px; height: 16px; @@ -140,16 +128,6 @@ background: url('../../Assets/Icon/ic-compare.svg'); } -.code-editor__error { - background-color: #fde7e7; - color: #862020; - font-size: 12px; - font-weight: 400; - line-height: 1.33; - padding: 8px 16px; - border-bottom: 1px solid #d6dbdf; -} - .monaco-editor-hover { margin-left: 40px; } diff --git a/src/Pages/ResourceBrowser/ResourceBrowser.Types.ts b/src/Pages/ResourceBrowser/ResourceBrowser.Types.ts index 9e8a780fc..5c68f7b53 100644 --- a/src/Pages/ResourceBrowser/ResourceBrowser.Types.ts +++ b/src/Pages/ResourceBrowser/ResourceBrowser.Types.ts @@ -53,6 +53,7 @@ interface ResourceListPayloadK8sRequestType { export interface K8sResourceListPayloadType { clusterId: number + filter?: string k8sRequest: ResourceListPayloadK8sRequestType } From 782cd43b4a6a4e9b917d125a00e536797d5c3410 Mon Sep 17 00:00:00 2001 From: AbhishekA1509 Date: Mon, 28 Oct 2024 15:17:10 +0530 Subject: [PATCH 3/3] chore: Update package version to 0.6.1-beta-2 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index ffce84fa2..39b3b448f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.6.1", + "version": "0.6.1-beta-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.6.1", + "version": "0.6.1-beta-2", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index 540626213..ffd0f950a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "0.6.1", + "version": "0.6.1-beta-2", "description": "Supporting common component library", "type": "module", "main": "dist/index.js",