From 85d4ac1503730520a776d983ebdc7ea3153952ee Mon Sep 17 00:00:00 2001 From: Asika TK Date: Fri, 12 Sep 2025 14:46:14 +0530 Subject: [PATCH 01/24] feat: notifications page ui new icons added --- src/Assets/Icon/ic-bulb.svg | 7 +++++++ src/Assets/Icon/ic-coins.svg | 3 +++ src/Assets/Icon/ic-piggybank.svg | 3 +++ src/Assets/Icon/ic-priority-high-fill.svg | 3 +++ src/Assets/Icon/ic-priority-low-fill.svg | 4 ++++ src/Assets/Icon/ic-priority-medium-fill.svg | 4 ++++ src/Assets/Icon/ic-priority-urgent-fill.svg | 10 ++++++++++ src/Assets/Icon/ic-spider.svg | 3 +++ src/Assets/Icon/ic-vector.svg | 3 +++ src/Shared/Components/Icon/Icon.tsx | 14 ++++++++++++++ 10 files changed, 54 insertions(+) create mode 100644 src/Assets/Icon/ic-bulb.svg create mode 100644 src/Assets/Icon/ic-coins.svg create mode 100644 src/Assets/Icon/ic-piggybank.svg create mode 100644 src/Assets/Icon/ic-priority-high-fill.svg create mode 100644 src/Assets/Icon/ic-priority-low-fill.svg create mode 100644 src/Assets/Icon/ic-priority-medium-fill.svg create mode 100644 src/Assets/Icon/ic-priority-urgent-fill.svg create mode 100644 src/Assets/Icon/ic-spider.svg create mode 100644 src/Assets/Icon/ic-vector.svg diff --git a/src/Assets/Icon/ic-bulb.svg b/src/Assets/Icon/ic-bulb.svg new file mode 100644 index 000000000..a167e3b3a --- /dev/null +++ b/src/Assets/Icon/ic-bulb.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/Assets/Icon/ic-coins.svg b/src/Assets/Icon/ic-coins.svg new file mode 100644 index 000000000..16072f183 --- /dev/null +++ b/src/Assets/Icon/ic-coins.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/Icon/ic-piggybank.svg b/src/Assets/Icon/ic-piggybank.svg new file mode 100644 index 000000000..44619eebe --- /dev/null +++ b/src/Assets/Icon/ic-piggybank.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/Icon/ic-priority-high-fill.svg b/src/Assets/Icon/ic-priority-high-fill.svg new file mode 100644 index 000000000..9e084e5ee --- /dev/null +++ b/src/Assets/Icon/ic-priority-high-fill.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/Icon/ic-priority-low-fill.svg b/src/Assets/Icon/ic-priority-low-fill.svg new file mode 100644 index 000000000..0b7c7a735 --- /dev/null +++ b/src/Assets/Icon/ic-priority-low-fill.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/Assets/Icon/ic-priority-medium-fill.svg b/src/Assets/Icon/ic-priority-medium-fill.svg new file mode 100644 index 000000000..121997606 --- /dev/null +++ b/src/Assets/Icon/ic-priority-medium-fill.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/Assets/Icon/ic-priority-urgent-fill.svg b/src/Assets/Icon/ic-priority-urgent-fill.svg new file mode 100644 index 000000000..ec8140320 --- /dev/null +++ b/src/Assets/Icon/ic-priority-urgent-fill.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/Assets/Icon/ic-spider.svg b/src/Assets/Icon/ic-spider.svg new file mode 100644 index 000000000..472dd9a10 --- /dev/null +++ b/src/Assets/Icon/ic-spider.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/Icon/ic-vector.svg b/src/Assets/Icon/ic-vector.svg new file mode 100644 index 000000000..5ea230dca --- /dev/null +++ b/src/Assets/Icon/ic-vector.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index 892e418dd..997cd0619 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -1,5 +1,12 @@ // NOTE: This file is auto-generated. Do not edit directly. Run the script `npm run generate-icon` to update. +import { ReactComponent as ICBulb } from '@Icons/ic-bulb.svg' +import { ReactComponent as ICPiggybank } from '@Icons/ic-piggybank.svg' +import { ReactComponent as ICPriorityHighFill } from '@Icons/ic-priority-high-fill.svg' +import { ReactComponent as ICPriorityLowFill } from '@Icons/ic-priority-low-fill.svg' +import { ReactComponent as ICPriorityMediumFill } from '@Icons/ic-priority-medium-fill.svg' +import { ReactComponent as ICPriorityUrgentFill } from '@Icons/ic-priority-urgent-fill.svg' +import { ReactComponent as ICSpider } from '@Icons/ic-spider.svg' import { ReactComponent as IC73strings } from '@IconsV2/ic-73strings.svg' import { ReactComponent as ICAborted } from '@IconsV2/ic-aborted.svg' import { ReactComponent as ICActivity } from '@IconsV2/ic-activity.svg' @@ -556,6 +563,13 @@ export const iconMap = { 'ic-webhook': ICWebhook, 'ic-wifi-slash': ICWifiSlash, 'ic-world-globe': ICWorldGlobe, + 'ic-bulb': ICBulb, + 'ic-piggybank': ICPiggybank, + 'ic-priority-high-fill': ICPriorityHighFill, + 'ic-priority-low-fill': ICPriorityLowFill, + 'ic-priority-medium-fill': ICPriorityMediumFill, + 'ic-priority-urgent-fill': ICPriorityUrgentFill, + 'ic-spider': ICSpider, } export type IconName = keyof typeof iconMap From 05ac4b8a05548aa3c9b1b78500ba6c562d77b752 Mon Sep 17 00:00:00 2001 From: Asika TK Date: Fri, 12 Sep 2025 15:56:12 +0530 Subject: [PATCH 02/24] feat: recommendation ui added new icon --- src/Shared/Components/Icon/Icon.tsx | 2 ++ src/Shared/Components/Icon/types.ts | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index 997cd0619..b35723abd 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -7,6 +7,7 @@ import { ReactComponent as ICPriorityLowFill } from '@Icons/ic-priority-low-fill import { ReactComponent as ICPriorityMediumFill } from '@Icons/ic-priority-medium-fill.svg' import { ReactComponent as ICPriorityUrgentFill } from '@Icons/ic-priority-urgent-fill.svg' import { ReactComponent as ICSpider } from '@Icons/ic-spider.svg' +import { ReactComponent as ICVector } from '@Icons/ic-vector.svg' import { ReactComponent as IC73strings } from '@IconsV2/ic-73strings.svg' import { ReactComponent as ICAborted } from '@IconsV2/ic-aborted.svg' import { ReactComponent as ICActivity } from '@IconsV2/ic-activity.svg' @@ -570,6 +571,7 @@ export const iconMap = { 'ic-priority-medium-fill': ICPriorityMediumFill, 'ic-priority-urgent-fill': ICPriorityUrgentFill, 'ic-spider': ICSpider, + 'ic-vector': ICVector, } export type IconName = keyof typeof iconMap diff --git a/src/Shared/Components/Icon/types.ts b/src/Shared/Components/Icon/types.ts index f939a8e14..c352169b6 100644 --- a/src/Shared/Components/Icon/types.ts +++ b/src/Shared/Components/Icon/types.ts @@ -46,7 +46,7 @@ export interface IconBaseProps { * * @example 'B500', 'N200', 'G50', 'R700' */ - color: IconBaseColorType + color?: IconBaseColorType /** * A unique identifier for testing purposes, typically used in test automation. */ From b09293ce8c74eff61f068516df9ceb0779802ef9 Mon Sep 17 00:00:00 2001 From: Asika TK Date: Mon, 15 Sep 2025 09:25:22 +0530 Subject: [PATCH 03/24] feat: notification ui added new icon --- src/Assets/Icon/ic-red-bulb.svg | 9 +++++++++ src/Shared/Components/Icon/Icon.tsx | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 src/Assets/Icon/ic-red-bulb.svg diff --git a/src/Assets/Icon/ic-red-bulb.svg b/src/Assets/Icon/ic-red-bulb.svg new file mode 100644 index 000000000..f6d6482af --- /dev/null +++ b/src/Assets/Icon/ic-red-bulb.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index b35723abd..e8b943b3e 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -1,11 +1,13 @@ // NOTE: This file is auto-generated. Do not edit directly. Run the script `npm run generate-icon` to update. import { ReactComponent as ICBulb } from '@Icons/ic-bulb.svg' +import { ReactComponent as ICClose } from '@Icons/ic-close.svg' import { ReactComponent as ICPiggybank } from '@Icons/ic-piggybank.svg' import { ReactComponent as ICPriorityHighFill } from '@Icons/ic-priority-high-fill.svg' import { ReactComponent as ICPriorityLowFill } from '@Icons/ic-priority-low-fill.svg' import { ReactComponent as ICPriorityMediumFill } from '@Icons/ic-priority-medium-fill.svg' import { ReactComponent as ICPriorityUrgentFill } from '@Icons/ic-priority-urgent-fill.svg' +import { ReactComponent as ICRedBulb } from '@Icons/ic-red-bulb.svg' import { ReactComponent as ICSpider } from '@Icons/ic-spider.svg' import { ReactComponent as ICVector } from '@Icons/ic-vector.svg' import { ReactComponent as IC73strings } from '@IconsV2/ic-73strings.svg' @@ -350,6 +352,7 @@ export const iconMap = { 'ic-clipboard': ICClipboard, 'ic-clock-counterclockwise': ICClockCounterclockwise, 'ic-clock': ICClock, + 'ic-close': ICClose, 'ic-close-large': ICCloseLarge, 'ic-close-small': ICCloseSmall, 'ic-cloud-vms': ICCloudVms, @@ -564,7 +567,8 @@ export const iconMap = { 'ic-webhook': ICWebhook, 'ic-wifi-slash': ICWifiSlash, 'ic-world-globe': ICWorldGlobe, - 'ic-bulb': ICBulb, + 'ic-bulb': ICRedBulb, + 'ic-red-bulb': ICBulb, 'ic-piggybank': ICPiggybank, 'ic-priority-high-fill': ICPriorityHighFill, 'ic-priority-low-fill': ICPriorityLowFill, From 8abc0a38a98c61f8406a8584ed87b380e986b016 Mon Sep 17 00:00:00 2001 From: Asika TK Date: Mon, 15 Sep 2025 11:47:11 +0530 Subject: [PATCH 04/24] feat: notifications page ui new icons --- .../SelectPicker/GroupedFilterSelectPicker-Usage-Guide.md | 0 .../Components/SelectPicker/GroupedFilterSelectPicker.example.tsx | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/Shared/Components/SelectPicker/GroupedFilterSelectPicker-Usage-Guide.md create mode 100644 src/Shared/Components/SelectPicker/GroupedFilterSelectPicker.example.tsx diff --git a/src/Shared/Components/SelectPicker/GroupedFilterSelectPicker-Usage-Guide.md b/src/Shared/Components/SelectPicker/GroupedFilterSelectPicker-Usage-Guide.md new file mode 100644 index 000000000..e69de29bb diff --git a/src/Shared/Components/SelectPicker/GroupedFilterSelectPicker.example.tsx b/src/Shared/Components/SelectPicker/GroupedFilterSelectPicker.example.tsx new file mode 100644 index 000000000..e69de29bb From 17c3045ca33935e7559768e7321fe99c6db3d9dc Mon Sep 17 00:00:00 2001 From: chithra Date: Mon, 15 Sep 2025 14:20:14 +0530 Subject: [PATCH 05/24] feat: Icons for Recommendation status --- src/Assets/Icon/ic-circle-progress.svg | 6 ++++++ src/Assets/Icon/ic-dot-circle.svg | 3 +++ src/Assets/Icon/ic-failure-color.svg | 4 ++++ src/Shared/Components/Icon/Icon.tsx | 6 ++++++ 4 files changed, 19 insertions(+) create mode 100644 src/Assets/Icon/ic-circle-progress.svg create mode 100644 src/Assets/Icon/ic-dot-circle.svg create mode 100644 src/Assets/Icon/ic-failure-color.svg diff --git a/src/Assets/Icon/ic-circle-progress.svg b/src/Assets/Icon/ic-circle-progress.svg new file mode 100644 index 000000000..d4ec9d326 --- /dev/null +++ b/src/Assets/Icon/ic-circle-progress.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/Assets/Icon/ic-dot-circle.svg b/src/Assets/Icon/ic-dot-circle.svg new file mode 100644 index 000000000..149c94bab --- /dev/null +++ b/src/Assets/Icon/ic-dot-circle.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/Icon/ic-failure-color.svg b/src/Assets/Icon/ic-failure-color.svg new file mode 100644 index 000000000..73d792eb5 --- /dev/null +++ b/src/Assets/Icon/ic-failure-color.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index e8b943b3e..a7db96f03 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -1,7 +1,10 @@ // NOTE: This file is auto-generated. Do not edit directly. Run the script `npm run generate-icon` to update. import { ReactComponent as ICBulb } from '@Icons/ic-bulb.svg' +import { ReactComponent as ICStatusProgress } from '@Icons/ic-circle-progress.svg' import { ReactComponent as ICClose } from '@Icons/ic-close.svg' +import { ReactComponent as ICStatusPending } from '@Icons/ic-dot-circle.svg' +import { ReactComponent as ICStatusFailed } from '@Icons/ic-failure-color.svg' import { ReactComponent as ICPiggybank } from '@Icons/ic-piggybank.svg' import { ReactComponent as ICPriorityHighFill } from '@Icons/ic-priority-high-fill.svg' import { ReactComponent as ICPriorityLowFill } from '@Icons/ic-priority-low-fill.svg' @@ -569,6 +572,9 @@ export const iconMap = { 'ic-world-globe': ICWorldGlobe, 'ic-bulb': ICRedBulb, 'ic-red-bulb': ICBulb, + 'ic-failure-color': ICStatusFailed, + 'ic-dot-circle.svg': ICStatusPending, + 'ic-circle-progress': ICStatusProgress, 'ic-piggybank': ICPiggybank, 'ic-priority-high-fill': ICPriorityHighFill, 'ic-priority-low-fill': ICPriorityLowFill, From 7f695836bc17b111fbadb684f5a02d435d514ffb Mon Sep 17 00:00:00 2001 From: chithra Date: Mon, 15 Sep 2025 14:25:23 +0530 Subject: [PATCH 06/24] feat: Icon name change --- src/Shared/Components/Icon/Icon.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index a7db96f03..7acc1fe55 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -573,7 +573,7 @@ export const iconMap = { 'ic-bulb': ICRedBulb, 'ic-red-bulb': ICBulb, 'ic-failure-color': ICStatusFailed, - 'ic-dot-circle.svg': ICStatusPending, + 'ic-dot-circle': ICStatusPending, 'ic-circle-progress': ICStatusProgress, 'ic-piggybank': ICPiggybank, 'ic-priority-high-fill': ICPriorityHighFill, From 1217379f7d1ed233e7885f3367ffffde7d664c52 Mon Sep 17 00:00:00 2001 From: chithra Date: Tue, 23 Sep 2025 10:34:33 +0530 Subject: [PATCH 07/24] feat:new root for connecting athena apis --- src/Assets/IconV2/ic-arrow-white.svg | 3 +++ src/Assets/IconV2/ic-line.svg | 3 +++ src/Common/API/CoreAPI.ts | 38 +++++++++++++++++++--------- src/Common/Constants.ts | 7 +++++ src/Shared/Components/Icon/Icon.tsx | 30 +++------------------- src/index.ts | 1 + 6 files changed, 44 insertions(+), 38 deletions(-) create mode 100644 src/Assets/IconV2/ic-arrow-white.svg create mode 100644 src/Assets/IconV2/ic-line.svg diff --git a/src/Assets/IconV2/ic-arrow-white.svg b/src/Assets/IconV2/ic-arrow-white.svg new file mode 100644 index 000000000..38d2caf06 --- /dev/null +++ b/src/Assets/IconV2/ic-arrow-white.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-line.svg b/src/Assets/IconV2/ic-line.svg new file mode 100644 index 000000000..caacdc6a9 --- /dev/null +++ b/src/Assets/IconV2/ic-line.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Common/API/CoreAPI.ts b/src/Common/API/CoreAPI.ts index c5056e8d9..2bf7a2a86 100644 --- a/src/Common/API/CoreAPI.ts +++ b/src/Common/API/CoreAPI.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { API_STATUS_CODES, FALLBACK_REQUEST_TIMEOUT, Host } from '@Common/Constants' +import { API_STATUS_CODES, FALLBACK_REQUEST_TIMEOUT, Host, SERVICE_PATHS } from '@Common/Constants' import { noop } from '@Common/Helper' import { ServerErrors } from '@Common/ServerError' import { APIOptions, ResponseType } from '@Common/Types' @@ -55,11 +55,23 @@ class CoreAPI { method: type, signal, body: data ? JSON.stringify(data) : undefined, + headers: { + 'Content-Type': 'application/json', + }, } // eslint-disable-next-line dot-notation options['credentials'] = 'include' as RequestCredentials + let currentUrl: string + if (isProxyHost) { + // Remove leading slash from url if it exists to avoid double slash after /proxy + const proxyUrl = url.startsWith('/') ? url.slice(1) : url + currentUrl = `/proxy/${proxyUrl}` + } else { + currentUrl = `${this.host}/${url}` + } + return fetch( - `${isProxyHost ? '/proxy' : this.host}/${url}`, + currentUrl, !isMultipartRequest ? options : ({ @@ -197,7 +209,8 @@ class CoreAPI { data, options, isMultipartRequest, - }: FetchInTimeParamsType): Promise => { + isProxyHost = false, + }: FetchInTimeParamsType & { isProxyHost?: boolean }): Promise => { const controller = options?.abortControllerRef?.current ?? new AbortController() const timeoutSignal = controller.signal @@ -267,19 +280,20 @@ class CoreAPI { data: K, options?: APIOptions, isMultipartRequest?: boolean, - ): Promise> => this.fetchInTime({ url, type: 'POST', data, options, isMultipartRequest }) + isProxyHost?: boolean, + ): Promise> => this.fetchInTime({ url, type: 'POST', data, options, isMultipartRequest, isProxyHost }) - put = (url: string, data: K, options?: APIOptions): Promise> => - this.fetchInTime({ url, type: 'PUT', data, options }) + put = (url: string, data: K, options?: APIOptions, isProxyHost?: boolean): Promise> => + this.fetchInTime({ url, type: 'PUT', data, options, isProxyHost }) - patch = (url: string, data: K, options?: APIOptions): Promise> => - this.fetchInTime({ url, type: 'PATCH', data, options }) + patch = (url: string, data: K, options?: APIOptions, isProxyHost?: boolean): Promise> => + this.fetchInTime({ url, type: 'PATCH', data, options, isProxyHost }) - get = (url: string, options?: APIOptions): Promise> => - this.fetchInTime({ url, type: 'GET', data: null, options }) + get = (url: string, options?: APIOptions, isProxyHost?: boolean): Promise> => + this.fetchInTime({ url, type: 'GET', data: null, options, isProxyHost }) - trash = (url: string, data?: K, options?: APIOptions): Promise> => - this.fetchInTime({ url, type: 'DELETE', data, options }) + trash = (url: string, data?: K, options?: APIOptions, isProxyHost?: boolean): Promise> => + this.fetchInTime({ url, type: 'DELETE', data, options, isProxyHost }) setGlobalAPITimeout = (timeout: number) => { this.timeout = timeout || FALLBACK_REQUEST_TIMEOUT diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index da240e67b..bc833c89d 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -21,6 +21,13 @@ import { BackupAndScheduleListViewEnum, BackupLocationsTypes } from '@PagesDevtr export const FALLBACK_REQUEST_TIMEOUT = 60000 export const Host = window?.__ORCHESTRATOR_ROOT__ ?? '/orchestrator' +// Service path constants for API routing +export const SERVICE_PATHS = { + ATHENA: 'athena', + ORCHESTRATOR: 'orchestrator', + // Add other service paths as needed in the future +} as const + export const DOCUMENTATION_HOME_PAGE = 'https://docs.devtron.ai' export const DEVTRON_HOME_PAGE = 'https://devtron.ai/' export const DOCUMENTATION_VERSION = '/devtron/v1.7' diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index 7acc1fe55..7f033b794 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -1,18 +1,5 @@ // NOTE: This file is auto-generated. Do not edit directly. Run the script `npm run generate-icon` to update. -import { ReactComponent as ICBulb } from '@Icons/ic-bulb.svg' -import { ReactComponent as ICStatusProgress } from '@Icons/ic-circle-progress.svg' -import { ReactComponent as ICClose } from '@Icons/ic-close.svg' -import { ReactComponent as ICStatusPending } from '@Icons/ic-dot-circle.svg' -import { ReactComponent as ICStatusFailed } from '@Icons/ic-failure-color.svg' -import { ReactComponent as ICPiggybank } from '@Icons/ic-piggybank.svg' -import { ReactComponent as ICPriorityHighFill } from '@Icons/ic-priority-high-fill.svg' -import { ReactComponent as ICPriorityLowFill } from '@Icons/ic-priority-low-fill.svg' -import { ReactComponent as ICPriorityMediumFill } from '@Icons/ic-priority-medium-fill.svg' -import { ReactComponent as ICPriorityUrgentFill } from '@Icons/ic-priority-urgent-fill.svg' -import { ReactComponent as ICRedBulb } from '@Icons/ic-red-bulb.svg' -import { ReactComponent as ICSpider } from '@Icons/ic-spider.svg' -import { ReactComponent as ICVector } from '@Icons/ic-vector.svg' import { ReactComponent as IC73strings } from '@IconsV2/ic-73strings.svg' import { ReactComponent as ICAborted } from '@IconsV2/ic-aborted.svg' import { ReactComponent as ICActivity } from '@IconsV2/ic-activity.svg' @@ -26,6 +13,7 @@ import { ReactComponent as ICArrowClockwise } from '@IconsV2/ic-arrow-clockwise. import { ReactComponent as ICArrowLineDown } from '@IconsV2/ic-arrow-line-down.svg' import { ReactComponent as ICArrowRight } from '@IconsV2/ic-arrow-right.svg' import { ReactComponent as ICArrowSquareOut } from '@IconsV2/ic-arrow-square-out.svg' +import { ReactComponent as ICArrowWhite } from '@IconsV2/ic-arrow-white.svg' import { ReactComponent as ICArrowsClockwise } from '@IconsV2/ic-arrows-clockwise.svg' import { ReactComponent as ICArrowsLeftRight } from '@IconsV2/ic-arrows-left-right.svg' import { ReactComponent as ICAsterisk } from '@IconsV2/ic-asterisk.svg' @@ -184,6 +172,7 @@ import { ReactComponent as ICLdap } from '@IconsV2/ic-ldap.svg' import { ReactComponent as ICLego } from '@IconsV2/ic-lego.svg' import { ReactComponent as ICLightning } from '@IconsV2/ic-lightning.svg' import { ReactComponent as ICLightningFill } from '@IconsV2/ic-lightning-fill.svg' +import { ReactComponent as ICLine } from '@IconsV2/ic-line.svg' import { ReactComponent as ICLink } from '@IconsV2/ic-link.svg' import { ReactComponent as ICLinkedBuildColor } from '@IconsV2/ic-linked-build-color.svg' import { ReactComponent as ICListBullets } from '@IconsV2/ic-list-bullets.svg' @@ -307,6 +296,7 @@ export const iconMap = { 'ic-arrow-line-down': ICArrowLineDown, 'ic-arrow-right': ICArrowRight, 'ic-arrow-square-out': ICArrowSquareOut, + 'ic-arrow-white': ICArrowWhite, 'ic-arrows-clockwise': ICArrowsClockwise, 'ic-arrows-left-right': ICArrowsLeftRight, 'ic-asterisk': ICAsterisk, @@ -355,7 +345,6 @@ export const iconMap = { 'ic-clipboard': ICClipboard, 'ic-clock-counterclockwise': ICClockCounterclockwise, 'ic-clock': ICClock, - 'ic-close': ICClose, 'ic-close-large': ICCloseLarge, 'ic-close-small': ICCloseSmall, 'ic-cloud-vms': ICCloudVms, @@ -466,6 +455,7 @@ export const iconMap = { 'ic-lego': ICLego, 'ic-lightning-fill': ICLightningFill, 'ic-lightning': ICLightning, + 'ic-line': ICLine, 'ic-link': ICLink, 'ic-linked-build-color': ICLinkedBuildColor, 'ic-list-bullets': ICListBullets, @@ -570,18 +560,6 @@ export const iconMap = { 'ic-webhook': ICWebhook, 'ic-wifi-slash': ICWifiSlash, 'ic-world-globe': ICWorldGlobe, - 'ic-bulb': ICRedBulb, - 'ic-red-bulb': ICBulb, - 'ic-failure-color': ICStatusFailed, - 'ic-dot-circle': ICStatusPending, - 'ic-circle-progress': ICStatusProgress, - 'ic-piggybank': ICPiggybank, - 'ic-priority-high-fill': ICPriorityHighFill, - 'ic-priority-low-fill': ICPriorityLowFill, - 'ic-priority-medium-fill': ICPriorityMediumFill, - 'ic-priority-urgent-fill': ICPriorityUrgentFill, - 'ic-spider': ICSpider, - 'ic-vector': ICVector, } export type IconName = keyof typeof iconMap diff --git a/src/index.ts b/src/index.ts index 3ffecebf1..627c7329f 100644 --- a/src/index.ts +++ b/src/index.ts @@ -194,6 +194,7 @@ declare global { interface Window { __BASE_URL__: string __ORCHESTRATOR_ROOT__: string + __ATHENA_ROOT__: string _env_: customEnv } } From f0df8603c4944443f2d8f0528389961f1b44cfb5 Mon Sep 17 00:00:00 2001 From: Asika TK Date: Tue, 30 Sep 2025 19:53:17 +0530 Subject: [PATCH 08/24] feat: chatbot changes --- src/Assets/IconV2/ic-new-chat.svg | 5 +++ src/Common/Markdown/MarkDown.tsx | 4 +++ src/Common/Markdown/markdown.scss | 55 +++++++++++++++++++++++++++++ src/Shared/Components/Icon/Icon.tsx | 2 ++ 4 files changed, 66 insertions(+) create mode 100644 src/Assets/IconV2/ic-new-chat.svg diff --git a/src/Assets/IconV2/ic-new-chat.svg b/src/Assets/IconV2/ic-new-chat.svg new file mode 100644 index 000000000..a5d366419 --- /dev/null +++ b/src/Assets/IconV2/ic-new-chat.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/Common/Markdown/MarkDown.tsx b/src/Common/Markdown/MarkDown.tsx index 8194b262a..a56f54d4f 100644 --- a/src/Common/Markdown/MarkDown.tsx +++ b/src/Common/Markdown/MarkDown.tsx @@ -80,6 +80,10 @@ const MarkDown = ({ ` renderer.heading = ({ text, depth }: Tokens.Heading) => { + // Alternative debugging - add to window object + if (typeof window !== 'undefined') { + ;(window as any).debugHeadingText = text + } const escapedText = disableEscapedText ? '' : text.toLowerCase().replace(/[^\w]+/g, '-') return ` diff --git a/src/Common/Markdown/markdown.scss b/src/Common/Markdown/markdown.scss index cf8a7af2d..4526d4c91 100644 --- a/src/Common/Markdown/markdown.scss +++ b/src/Common/Markdown/markdown.scss @@ -77,4 +77,59 @@ a.anchor { color: var(--N900); } + h1, h2, h3, h4, h5, h6 .header-link { + color: #000a14 !important; + font-size: 15px !important; + font-family: Open Sans !important; + font-weight: 600 !important; + line-height: 20px !important; + word-wrap: break-word !important; + } +} + +// custom styles +.markdown { + // Title styles + h1, h2, h3, h4, h5, h6 { + &.header-link { + color: #000a14 !important; + font-size: 15px !important; + font-family: Open Sans !important; + font-weight: 600 !important; + line-height: 20px !important; + word-wrap: break-word !important; + } + } + + // Description styles + .md-description { + font-size: 14px; + line-height: 1.6; + color: var(--N700); + margin-bottom: 20px; + } + + // List styles + ul.md-list { + margin: 12px 0; + padding-left: 24px; + + li { + color: var(--neutral-N900, #F8F8F9); + font-size: 13px; + font-family: Open Sans; + font-weight: 400; + line-height: 20px; + word-wrap: break-word; + + &::marker { + color: var(--N400); + } + } + } + + // Nested list styles + ul.md-list ul { + margin: 8px 0; + } } diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index 7f033b794..4e84cd451 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -196,6 +196,7 @@ import { ReactComponent as ICMonitoring } from '@IconsV2/ic-monitoring.svg' import { ReactComponent as ICMoreVertical } from '@IconsV2/ic-more-vertical.svg' import { ReactComponent as ICNamespace } from '@IconsV2/ic-namespace.svg' import { ReactComponent as ICNew } from '@IconsV2/ic-new.svg' +import { ReactComponent as ICNewChat } from '@IconsV2/ic-new-chat.svg' import { ReactComponent as ICNodeScript } from '@IconsV2/ic-node-script.svg' import { ReactComponent as ICOidc } from '@IconsV2/ic-oidc.svg' import { ReactComponent as ICOpenBox } from '@IconsV2/ic-open-box.svg' @@ -478,6 +479,7 @@ export const iconMap = { 'ic-monitoring': ICMonitoring, 'ic-more-vertical': ICMoreVertical, 'ic-namespace': ICNamespace, + 'ic-new-chat': ICNewChat, 'ic-new': ICNew, 'ic-node-script': ICNodeScript, 'ic-oidc': ICOidc, From ae360e9532f8738b6b41b9d4b79b1025ad9e7830 Mon Sep 17 00:00:00 2001 From: chithra Date: Tue, 30 Sep 2025 21:22:32 +0530 Subject: [PATCH 09/24] adding new icons --- src/Assets/IconV2/ic-arrow-white.svg | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Assets/IconV2/ic-arrow-white.svg b/src/Assets/IconV2/ic-arrow-white.svg index 38d2caf06..27b058713 100644 --- a/src/Assets/IconV2/ic-arrow-white.svg +++ b/src/Assets/IconV2/ic-arrow-white.svg @@ -1,3 +1,8 @@ +<<<<<<< HEAD +======= + + +>>>>>>> aa18c13c (adding new icons) From 209c4369b333a0db342e45852000dd0b7d26e443 Mon Sep 17 00:00:00 2001 From: Asika TK Date: Wed, 1 Oct 2025 14:29:15 +0530 Subject: [PATCH 10/24] feat: chatbot makdown styles updated --- src/Common/Markdown/MarkDown.tsx | 3 --- src/Common/Markdown/markdown.scss | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Common/Markdown/MarkDown.tsx b/src/Common/Markdown/MarkDown.tsx index a56f54d4f..3a0076444 100644 --- a/src/Common/Markdown/MarkDown.tsx +++ b/src/Common/Markdown/MarkDown.tsx @@ -81,9 +81,6 @@ const MarkDown = ({ renderer.heading = ({ text, depth }: Tokens.Heading) => { // Alternative debugging - add to window object - if (typeof window !== 'undefined') { - ;(window as any).debugHeadingText = text - } const escapedText = disableEscapedText ? '' : text.toLowerCase().replace(/[^\w]+/g, '-') return ` diff --git a/src/Common/Markdown/markdown.scss b/src/Common/Markdown/markdown.scss index 4526d4c91..67401da32 100644 --- a/src/Common/Markdown/markdown.scss +++ b/src/Common/Markdown/markdown.scss @@ -132,4 +132,7 @@ ul.md-list ul { margin: 8px 0; } + ol { + padding-left: 15px; + } } From 6d57568cca0135b8219fc9dd031d8bc72fb313b5 Mon Sep 17 00:00:00 2001 From: chithra Date: Wed, 1 Oct 2025 16:17:24 +0530 Subject: [PATCH 11/24] Icons added --- src/Shared/Components/Icon/Icon.tsx | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index 4e84cd451..f1645fd41 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -1,5 +1,17 @@ // NOTE: This file is auto-generated. Do not edit directly. Run the script `npm run generate-icon` to update. - +import { ReactComponent as ICBulb } from '@Icons/ic-bulb.svg' +import { ReactComponent as ICStatusProgress } from '@Icons/ic-circle-progress.svg' +import { ReactComponent as ICClose } from '@Icons/ic-close.svg' +import { ReactComponent as ICStatusPending } from '@Icons/ic-dot-circle.svg' +import { ReactComponent as ICStatusFailed } from '@Icons/ic-failure-color.svg' +import { ReactComponent as ICPiggybank } from '@Icons/ic-piggybank.svg' +import { ReactComponent as ICPriorityHighFill } from '@Icons/ic-priority-high-fill.svg' +import { ReactComponent as ICPriorityLowFill } from '@Icons/ic-priority-low-fill.svg' +import { ReactComponent as ICPriorityMediumFill } from '@Icons/ic-priority-medium-fill.svg' +import { ReactComponent as ICPriorityUrgentFill } from '@Icons/ic-priority-urgent-fill.svg' +import { ReactComponent as ICRedBulb } from '@Icons/ic-red-bulb.svg' +import { ReactComponent as ICSpider } from '@Icons/ic-spider.svg' +import { ReactComponent as ICVector } from '@Icons/ic-vector.svg' import { ReactComponent as IC73strings } from '@IconsV2/ic-73strings.svg' import { ReactComponent as ICAborted } from '@IconsV2/ic-aborted.svg' import { ReactComponent as ICActivity } from '@IconsV2/ic-activity.svg' @@ -562,6 +574,19 @@ export const iconMap = { 'ic-webhook': ICWebhook, 'ic-wifi-slash': ICWifiSlash, 'ic-world-globe': ICWorldGlobe, + 'ic-bulb': ICRedBulb, + 'ic-red-bulb': ICBulb, + 'ic-failure-color': ICStatusFailed, + 'ic-dot-circle': ICStatusPending, + 'ic-circle-progress': ICStatusProgress, + 'ic-piggybank': ICPiggybank, + 'ic-priority-high-fill': ICPriorityHighFill, + 'ic-priority-low-fill': ICPriorityLowFill, + 'ic-priority-medium-fill': ICPriorityMediumFill, + 'ic-priority-urgent-fill': ICPriorityUrgentFill, + 'ic-spider': ICSpider, + 'ic-vector': ICVector, + 'ic-close': ICClose, } export type IconName = keyof typeof iconMap From 49756765913b40de60e741a13fa3c47bf5479e1f Mon Sep 17 00:00:00 2001 From: chithra Date: Mon, 6 Oct 2025 15:42:33 +0530 Subject: [PATCH 12/24] icons changing to IconsV2 --- src/Assets/Icon/ic-coins.svg | 3 -- src/Assets/Icon/ic-priority-medium-fill.svg | 4 -- src/Assets/{Icon => IconV2}/ic-bulb.svg | 0 .../{Icon => IconV2}/ic-circle-progress.svg | 0 src/Assets/IconV2/ic-coins.svg | 4 +- src/Assets/{Icon => IconV2}/ic-dot-circle.svg | 0 .../{Icon => IconV2}/ic-failure-color.svg | 0 src/Assets/{Icon => IconV2}/ic-piggybank.svg | 0 .../ic-priority-high-fill.svg | 0 .../{Icon => IconV2}/ic-priority-low-fill.svg | 0 src/Assets/IconV2/ic-priority-medium-fill.svg | 6 +++ .../ic-priority-urgent-fill.svg | 0 src/Assets/{Icon => IconV2}/ic-red-bulb.svg | 0 src/Assets/{Icon => IconV2}/ic-spider.svg | 0 src/Assets/{Icon => IconV2}/ic-vector.svg | 0 src/Shared/Components/Icon/Icon.tsx | 51 +++++++++---------- 16 files changed, 33 insertions(+), 35 deletions(-) delete mode 100644 src/Assets/Icon/ic-coins.svg delete mode 100644 src/Assets/Icon/ic-priority-medium-fill.svg rename src/Assets/{Icon => IconV2}/ic-bulb.svg (100%) rename src/Assets/{Icon => IconV2}/ic-circle-progress.svg (100%) rename src/Assets/{Icon => IconV2}/ic-dot-circle.svg (100%) rename src/Assets/{Icon => IconV2}/ic-failure-color.svg (100%) rename src/Assets/{Icon => IconV2}/ic-piggybank.svg (100%) rename src/Assets/{Icon => IconV2}/ic-priority-high-fill.svg (100%) rename src/Assets/{Icon => IconV2}/ic-priority-low-fill.svg (100%) rename src/Assets/{Icon => IconV2}/ic-priority-urgent-fill.svg (100%) rename src/Assets/{Icon => IconV2}/ic-red-bulb.svg (100%) rename src/Assets/{Icon => IconV2}/ic-spider.svg (100%) rename src/Assets/{Icon => IconV2}/ic-vector.svg (100%) diff --git a/src/Assets/Icon/ic-coins.svg b/src/Assets/Icon/ic-coins.svg deleted file mode 100644 index 16072f183..000000000 --- a/src/Assets/Icon/ic-coins.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Assets/Icon/ic-priority-medium-fill.svg b/src/Assets/Icon/ic-priority-medium-fill.svg deleted file mode 100644 index 121997606..000000000 --- a/src/Assets/Icon/ic-priority-medium-fill.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/Assets/Icon/ic-bulb.svg b/src/Assets/IconV2/ic-bulb.svg similarity index 100% rename from src/Assets/Icon/ic-bulb.svg rename to src/Assets/IconV2/ic-bulb.svg diff --git a/src/Assets/Icon/ic-circle-progress.svg b/src/Assets/IconV2/ic-circle-progress.svg similarity index 100% rename from src/Assets/Icon/ic-circle-progress.svg rename to src/Assets/IconV2/ic-circle-progress.svg diff --git a/src/Assets/IconV2/ic-coins.svg b/src/Assets/IconV2/ic-coins.svg index 848b4b283..16072f183 100644 --- a/src/Assets/IconV2/ic-coins.svg +++ b/src/Assets/IconV2/ic-coins.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/Assets/Icon/ic-dot-circle.svg b/src/Assets/IconV2/ic-dot-circle.svg similarity index 100% rename from src/Assets/Icon/ic-dot-circle.svg rename to src/Assets/IconV2/ic-dot-circle.svg diff --git a/src/Assets/Icon/ic-failure-color.svg b/src/Assets/IconV2/ic-failure-color.svg similarity index 100% rename from src/Assets/Icon/ic-failure-color.svg rename to src/Assets/IconV2/ic-failure-color.svg diff --git a/src/Assets/Icon/ic-piggybank.svg b/src/Assets/IconV2/ic-piggybank.svg similarity index 100% rename from src/Assets/Icon/ic-piggybank.svg rename to src/Assets/IconV2/ic-piggybank.svg diff --git a/src/Assets/Icon/ic-priority-high-fill.svg b/src/Assets/IconV2/ic-priority-high-fill.svg similarity index 100% rename from src/Assets/Icon/ic-priority-high-fill.svg rename to src/Assets/IconV2/ic-priority-high-fill.svg diff --git a/src/Assets/Icon/ic-priority-low-fill.svg b/src/Assets/IconV2/ic-priority-low-fill.svg similarity index 100% rename from src/Assets/Icon/ic-priority-low-fill.svg rename to src/Assets/IconV2/ic-priority-low-fill.svg diff --git a/src/Assets/IconV2/ic-priority-medium-fill.svg b/src/Assets/IconV2/ic-priority-medium-fill.svg index 07f524fb4..7d54b4868 100644 --- a/src/Assets/IconV2/ic-priority-medium-fill.svg +++ b/src/Assets/IconV2/ic-priority-medium-fill.svg @@ -1,4 +1,10 @@ +<<<<<<< HEAD +======= + + + +>>>>>>> 324044cd (icons changing to IconsV2) diff --git a/src/Assets/Icon/ic-priority-urgent-fill.svg b/src/Assets/IconV2/ic-priority-urgent-fill.svg similarity index 100% rename from src/Assets/Icon/ic-priority-urgent-fill.svg rename to src/Assets/IconV2/ic-priority-urgent-fill.svg diff --git a/src/Assets/Icon/ic-red-bulb.svg b/src/Assets/IconV2/ic-red-bulb.svg similarity index 100% rename from src/Assets/Icon/ic-red-bulb.svg rename to src/Assets/IconV2/ic-red-bulb.svg diff --git a/src/Assets/Icon/ic-spider.svg b/src/Assets/IconV2/ic-spider.svg similarity index 100% rename from src/Assets/Icon/ic-spider.svg rename to src/Assets/IconV2/ic-spider.svg diff --git a/src/Assets/Icon/ic-vector.svg b/src/Assets/IconV2/ic-vector.svg similarity index 100% rename from src/Assets/Icon/ic-vector.svg rename to src/Assets/IconV2/ic-vector.svg diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index f1645fd41..c0348867a 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -1,17 +1,5 @@ // NOTE: This file is auto-generated. Do not edit directly. Run the script `npm run generate-icon` to update. -import { ReactComponent as ICBulb } from '@Icons/ic-bulb.svg' -import { ReactComponent as ICStatusProgress } from '@Icons/ic-circle-progress.svg' -import { ReactComponent as ICClose } from '@Icons/ic-close.svg' -import { ReactComponent as ICStatusPending } from '@Icons/ic-dot-circle.svg' -import { ReactComponent as ICStatusFailed } from '@Icons/ic-failure-color.svg' -import { ReactComponent as ICPiggybank } from '@Icons/ic-piggybank.svg' -import { ReactComponent as ICPriorityHighFill } from '@Icons/ic-priority-high-fill.svg' -import { ReactComponent as ICPriorityLowFill } from '@Icons/ic-priority-low-fill.svg' -import { ReactComponent as ICPriorityMediumFill } from '@Icons/ic-priority-medium-fill.svg' -import { ReactComponent as ICPriorityUrgentFill } from '@Icons/ic-priority-urgent-fill.svg' -import { ReactComponent as ICRedBulb } from '@Icons/ic-red-bulb.svg' -import { ReactComponent as ICSpider } from '@Icons/ic-spider.svg' -import { ReactComponent as ICVector } from '@Icons/ic-vector.svg' + import { ReactComponent as IC73strings } from '@IconsV2/ic-73strings.svg' import { ReactComponent as ICAborted } from '@IconsV2/ic-aborted.svg' import { ReactComponent as ICActivity } from '@IconsV2/ic-activity.svg' @@ -53,6 +41,7 @@ import { ReactComponent as ICBrowser } from '@IconsV2/ic-browser.svg' import { ReactComponent as ICBug } from '@IconsV2/ic-bug.svg' import { ReactComponent as ICBuildColor } from '@IconsV2/ic-build-color.svg' import { ReactComponent as ICBuilding } from '@IconsV2/ic-building.svg' +import { ReactComponent as ICBulb } from '@IconsV2/ic-bulb.svg' import { ReactComponent as ICCalendar } from '@IconsV2/ic-calendar.svg' import { ReactComponent as ICCancelled } from '@IconsV2/ic-cancelled.svg' import { ReactComponent as ICCardStack } from '@IconsV2/ic-card-stack.svg' @@ -70,6 +59,7 @@ import { ReactComponent as ICChecks } from '@IconsV2/ic-checks.svg' import { ReactComponent as ICCiLinked } from '@IconsV2/ic-ci-linked.svg' import { ReactComponent as ICCircleLoader } from '@IconsV2/ic-circle-loader.svg' import { ReactComponent as ICCircleSmall } from '@IconsV2/ic-circle-small.svg' +import { ReactComponent as ICCircleProgress } from '@IconsV2/ic-circle-progress.svg' import { ReactComponent as ICCleanBrush } from '@IconsV2/ic-clean-brush.svg' import { ReactComponent as ICClipboard } from '@IconsV2/ic-clipboard.svg' import { ReactComponent as ICClock } from '@IconsV2/ic-clock.svg' @@ -109,6 +99,7 @@ import { ReactComponent as ICDiffUpdated } from '@IconsV2/ic-diff-updated.svg' import { ReactComponent as ICDisconnect } from '@IconsV2/ic-disconnect.svg' import { ReactComponent as ICDiscordFill } from '@IconsV2/ic-discord-fill.svg' import { ReactComponent as ICDockerhub } from '@IconsV2/ic-dockerhub.svg' +import { ReactComponent as ICDotCircle } from '@IconsV2/ic-dot-circle.svg' import { ReactComponent as ICDownload } from '@IconsV2/ic-download.svg' import { ReactComponent as ICEcr } from '@IconsV2/ic-ecr.svg' import { ReactComponent as ICEdit } from '@IconsV2/ic-edit.svg' @@ -123,6 +114,7 @@ import { ReactComponent as ICError } from '@IconsV2/ic-error.svg' import { ReactComponent as ICExpandRightSm } from '@IconsV2/ic-expand-right-sm.svg' import { ReactComponent as ICExpandSm } from '@IconsV2/ic-expand-sm.svg' import { ReactComponent as ICFailure } from '@IconsV2/ic-failure.svg' +import { ReactComponent as ICFailureColor } from '@IconsV2/ic-failure-color.svg' import { ReactComponent as ICFastForward } from '@IconsV2/ic-fast-forward.svg' import { ReactComponent as ICFile } from '@IconsV2/ic-file.svg' import { ReactComponent as ICFileCode } from '@IconsV2/ic-file-code.svg' @@ -224,10 +216,16 @@ import { ReactComponent as ICParty } from '@IconsV2/ic-party.svg' import { ReactComponent as ICPath } from '@IconsV2/ic-path.svg' import { ReactComponent as ICPauseCircle } from '@IconsV2/ic-pause-circle.svg' import { ReactComponent as ICPencil } from '@IconsV2/ic-pencil.svg' +import { ReactComponent as ICPiggybank } from '@IconsV2/ic-piggybank.svg' import { ReactComponent as ICPlayOutline } from '@IconsV2/ic-play-outline.svg' +import { ReactComponent as ICPriorityHighFill } from '@IconsV2/ic-priority-high-fill.svg' +import { ReactComponent as ICPriorityLowFill } from '@IconsV2/ic-priority-low-fill.svg' +import { ReactComponent as ICPriorityMediumFill } from '@IconsV2/ic-priority-medium-fill.svg' +import { ReactComponent as ICPriorityUrgentFill } from '@IconsV2/ic-priority-urgent-fill.svg' import { ReactComponent as ICPriorityMediumFill } from '@IconsV2/ic-priority-medium-fill.svg' import { ReactComponent as ICQuay } from '@IconsV2/ic-quay.svg' import { ReactComponent as ICQuote } from '@IconsV2/ic-quote.svg' +import { ReactComponent as ICRedBulb } from '@IconsV2/ic-red-bulb.svg' import { ReactComponent as ICRatings } from '@IconsV2/ic-ratings.svg' import { ReactComponent as ICResizeHandle } from '@IconsV2/ic-resize-handle.svg' import { ReactComponent as ICRightPanelCollapse } from '@IconsV2/ic-right-panel-collapse.svg' @@ -243,6 +241,7 @@ import { ReactComponent as ICSortable } from '@IconsV2/ic-sortable.svg' import { ReactComponent as ICSparkleAiColor } from '@IconsV2/ic-sparkle-ai-color.svg' import { ReactComponent as ICSparkleColor } from '@IconsV2/ic-sparkle-color.svg' import { ReactComponent as ICSpeedometer } from '@IconsV2/ic-speedometer.svg' +import { ReactComponent as ICSpider } from '@IconsV2/ic-spider.svg' import { ReactComponent as ICSpinny } from '@IconsV2/ic-spinny.svg' import { ReactComponent as ICSprayCan } from '@IconsV2/ic-spray-can.svg' import { ReactComponent as ICStack } from '@IconsV2/ic-stack.svg' @@ -281,6 +280,7 @@ import { ReactComponent as ICUpgradeEnterprise } from '@IconsV2/ic-upgrade-enter import { ReactComponent as ICUserCircle } from '@IconsV2/ic-user-circle.svg' import { ReactComponent as ICUserKey } from '@IconsV2/ic-user-key.svg' import { ReactComponent as ICUsers } from '@IconsV2/ic-users.svg' +import { ReactComponent as ICVector } from '@IconsV2/ic-vector.svg' import { ReactComponent as ICViewVariableToggle } from '@IconsV2/ic-view-variable-toggle.svg' import { ReactComponent as ICVisibilityOff } from '@IconsV2/ic-visibility-off.svg' import { ReactComponent as ICVisibilityOn } from '@IconsV2/ic-visibility-on.svg' @@ -337,6 +337,7 @@ export const iconMap = { 'ic-bug': ICBug, 'ic-build-color': ICBuildColor, 'ic-building': ICBuilding, + 'ic-bulb': ICBulb, 'ic-calendar': ICCalendar, 'ic-cancelled': ICCancelled, 'ic-card-stack': ICCardStack, @@ -354,6 +355,7 @@ export const iconMap = { 'ic-ci-linked': ICCiLinked, 'ic-circle-loader': ICCircleLoader, 'ic-circle-small': ICCircleSmall, + 'ic-circle-progress': ICCircleProgress, 'ic-clean-brush': ICCleanBrush, 'ic-clipboard': ICClipboard, 'ic-clock-counterclockwise': ICClockCounterclockwise, @@ -393,6 +395,7 @@ export const iconMap = { 'ic-disconnect': ICDisconnect, 'ic-discord-fill': ICDiscordFill, 'ic-dockerhub': ICDockerhub, + 'ic-dot-circle': ICDotCircle, 'ic-download': ICDownload, 'ic-ecr': ICEcr, 'ic-edit-lines': ICEditLines, @@ -406,6 +409,7 @@ export const iconMap = { 'ic-error': ICError, 'ic-expand-right-sm': ICExpandRightSm, 'ic-expand-sm': ICExpandSm, + 'ic-failure-color': ICFailureColor, 'ic-failure': ICFailure, 'ic-fast-forward': ICFastForward, 'ic-file-code': ICFileCode, @@ -508,10 +512,16 @@ export const iconMap = { 'ic-path': ICPath, 'ic-pause-circle': ICPauseCircle, 'ic-pencil': ICPencil, + 'ic-piggybank': ICPiggybank, 'ic-play-outline': ICPlayOutline, + 'ic-priority-high-fill': ICPriorityHighFill, + 'ic-priority-low-fill': ICPriorityLowFill, + 'ic-priority-medium-fill': ICPriorityMediumFill, + 'ic-priority-urgent-fill': ICPriorityUrgentFill, 'ic-priority-medium-fill': ICPriorityMediumFill, 'ic-quay': ICQuay, 'ic-quote': ICQuote, + 'ic-red-bulb': ICRedBulb, 'ic-ratings': ICRatings, 'ic-resize-handle': ICResizeHandle, 'ic-right-panel-collapse': ICRightPanelCollapse, @@ -527,6 +537,7 @@ export const iconMap = { 'ic-sparkle-ai-color': ICSparkleAiColor, 'ic-sparkle-color': ICSparkleColor, 'ic-speedometer': ICSpeedometer, + 'ic-spider': ICSpider, 'ic-spinny': ICSpinny, 'ic-spray-can': ICSprayCan, 'ic-stack': ICStack, @@ -565,6 +576,7 @@ export const iconMap = { 'ic-user-circle': ICUserCircle, 'ic-user-key': ICUserKey, 'ic-users': ICUsers, + 'ic-vector': ICVector, 'ic-view-variable-toggle': ICViewVariableToggle, 'ic-visibility-off': ICVisibilityOff, 'ic-visibility-on': ICVisibilityOn, @@ -574,19 +586,6 @@ export const iconMap = { 'ic-webhook': ICWebhook, 'ic-wifi-slash': ICWifiSlash, 'ic-world-globe': ICWorldGlobe, - 'ic-bulb': ICRedBulb, - 'ic-red-bulb': ICBulb, - 'ic-failure-color': ICStatusFailed, - 'ic-dot-circle': ICStatusPending, - 'ic-circle-progress': ICStatusProgress, - 'ic-piggybank': ICPiggybank, - 'ic-priority-high-fill': ICPriorityHighFill, - 'ic-priority-low-fill': ICPriorityLowFill, - 'ic-priority-medium-fill': ICPriorityMediumFill, - 'ic-priority-urgent-fill': ICPriorityUrgentFill, - 'ic-spider': ICSpider, - 'ic-vector': ICVector, - 'ic-close': ICClose, } export type IconName = keyof typeof iconMap From d4e6110e45cfd8f65832b85fb894dbe77249ff71 Mon Sep 17 00:00:00 2001 From: chithra Date: Mon, 6 Oct 2025 18:30:42 +0530 Subject: [PATCH 13/24] Removing unwanted changes --- src/Common/Markdown/MarkDown.tsx | 1 - src/Common/Markdown/markdown.scss | 58 ----------------------------- src/Shared/Components/Icon/Icon.tsx | 6 +-- 3 files changed, 2 insertions(+), 63 deletions(-) diff --git a/src/Common/Markdown/MarkDown.tsx b/src/Common/Markdown/MarkDown.tsx index 3a0076444..8194b262a 100644 --- a/src/Common/Markdown/MarkDown.tsx +++ b/src/Common/Markdown/MarkDown.tsx @@ -80,7 +80,6 @@ const MarkDown = ({ ` renderer.heading = ({ text, depth }: Tokens.Heading) => { - // Alternative debugging - add to window object const escapedText = disableEscapedText ? '' : text.toLowerCase().replace(/[^\w]+/g, '-') return ` diff --git a/src/Common/Markdown/markdown.scss b/src/Common/Markdown/markdown.scss index 67401da32..cf8a7af2d 100644 --- a/src/Common/Markdown/markdown.scss +++ b/src/Common/Markdown/markdown.scss @@ -77,62 +77,4 @@ a.anchor { color: var(--N900); } - h1, h2, h3, h4, h5, h6 .header-link { - color: #000a14 !important; - font-size: 15px !important; - font-family: Open Sans !important; - font-weight: 600 !important; - line-height: 20px !important; - word-wrap: break-word !important; - } -} - -// custom styles -.markdown { - // Title styles - h1, h2, h3, h4, h5, h6 { - &.header-link { - color: #000a14 !important; - font-size: 15px !important; - font-family: Open Sans !important; - font-weight: 600 !important; - line-height: 20px !important; - word-wrap: break-word !important; - } - } - - // Description styles - .md-description { - font-size: 14px; - line-height: 1.6; - color: var(--N700); - margin-bottom: 20px; - } - - // List styles - ul.md-list { - margin: 12px 0; - padding-left: 24px; - - li { - color: var(--neutral-N900, #F8F8F9); - font-size: 13px; - font-family: Open Sans; - font-weight: 400; - line-height: 20px; - word-wrap: break-word; - - &::marker { - color: var(--N400); - } - } - } - - // Nested list styles - ul.md-list ul { - margin: 8px 0; - } - ol { - padding-left: 15px; - } } diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index c0348867a..d6ab1f6c2 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -222,11 +222,10 @@ import { ReactComponent as ICPriorityHighFill } from '@IconsV2/ic-priority-high- import { ReactComponent as ICPriorityLowFill } from '@IconsV2/ic-priority-low-fill.svg' import { ReactComponent as ICPriorityMediumFill } from '@IconsV2/ic-priority-medium-fill.svg' import { ReactComponent as ICPriorityUrgentFill } from '@IconsV2/ic-priority-urgent-fill.svg' -import { ReactComponent as ICPriorityMediumFill } from '@IconsV2/ic-priority-medium-fill.svg' import { ReactComponent as ICQuay } from '@IconsV2/ic-quay.svg' import { ReactComponent as ICQuote } from '@IconsV2/ic-quote.svg' -import { ReactComponent as ICRedBulb } from '@IconsV2/ic-red-bulb.svg' import { ReactComponent as ICRatings } from '@IconsV2/ic-ratings.svg' +import { ReactComponent as ICRedBulb } from '@IconsV2/ic-red-bulb.svg' import { ReactComponent as ICResizeHandle } from '@IconsV2/ic-resize-handle.svg' import { ReactComponent as ICRightPanelCollapse } from '@IconsV2/ic-right-panel-collapse.svg' import { ReactComponent as ICRocketGear } from '@IconsV2/ic-rocket-gear.svg' @@ -518,11 +517,10 @@ export const iconMap = { 'ic-priority-low-fill': ICPriorityLowFill, 'ic-priority-medium-fill': ICPriorityMediumFill, 'ic-priority-urgent-fill': ICPriorityUrgentFill, - 'ic-priority-medium-fill': ICPriorityMediumFill, 'ic-quay': ICQuay, 'ic-quote': ICQuote, - 'ic-red-bulb': ICRedBulb, 'ic-ratings': ICRatings, + 'ic-red-bulb': ICRedBulb, 'ic-resize-handle': ICResizeHandle, 'ic-right-panel-collapse': ICRightPanelCollapse, 'ic-rocket-gear': ICRocketGear, From 07338b3088fb44bd871b78dcff662dc401693205 Mon Sep 17 00:00:00 2001 From: chithra Date: Mon, 6 Oct 2025 18:44:43 +0530 Subject: [PATCH 14/24] Icons adding --- src/Assets/IconV2/ic-arrow-white.svg | 5 ----- src/Assets/IconV2/ic-coin.svg | 3 +++ src/Assets/IconV2/ic-coins.svg | 4 ++-- src/Shared/Components/Icon/Icon.tsx | 2 ++ 4 files changed, 7 insertions(+), 7 deletions(-) create mode 100644 src/Assets/IconV2/ic-coin.svg diff --git a/src/Assets/IconV2/ic-arrow-white.svg b/src/Assets/IconV2/ic-arrow-white.svg index 27b058713..38d2caf06 100644 --- a/src/Assets/IconV2/ic-arrow-white.svg +++ b/src/Assets/IconV2/ic-arrow-white.svg @@ -1,8 +1,3 @@ -<<<<<<< HEAD -======= - - ->>>>>>> aa18c13c (adding new icons) diff --git a/src/Assets/IconV2/ic-coin.svg b/src/Assets/IconV2/ic-coin.svg new file mode 100644 index 000000000..16072f183 --- /dev/null +++ b/src/Assets/IconV2/ic-coin.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/Assets/IconV2/ic-coins.svg b/src/Assets/IconV2/ic-coins.svg index 16072f183..848b4b283 100644 --- a/src/Assets/IconV2/ic-coins.svg +++ b/src/Assets/IconV2/ic-coins.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index d6ab1f6c2..2a7b3365b 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -71,6 +71,7 @@ import { ReactComponent as ICCloudVms } from '@IconsV2/ic-cloud-vms.svg' import { ReactComponent as ICCluster } from '@IconsV2/ic-cluster.svg' import { ReactComponent as ICClusterIsolated } from '@IconsV2/ic-cluster-isolated.svg' import { ReactComponent as ICCode } from '@IconsV2/ic-code.svg' +import { ReactComponent as ICCoin } from '@IconsV2/ic-coin.svg' import { ReactComponent as ICCoins } from '@IconsV2/ic-coins.svg' import { ReactComponent as ICContainer } from '@IconsV2/ic-container.svg' import { ReactComponent as ICContainerRegistry } from '@IconsV2/ic-container-registry.svg' @@ -366,6 +367,7 @@ export const iconMap = { 'ic-cluster-isolated': ICClusterIsolated, 'ic-cluster': ICCluster, 'ic-code': ICCode, + 'ic-coin': ICCoin, 'ic-coins': ICCoins, 'ic-container-registry': ICContainerRegistry, 'ic-container': ICContainer, From 353f4906c5c90e01baa4ee867222b9611ea3dd75 Mon Sep 17 00:00:00 2001 From: chithra Date: Mon, 6 Oct 2025 18:47:11 +0530 Subject: [PATCH 15/24] Adding medium icon --- src/Assets/IconV2/ic-priority-medium-fill.svg | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Assets/IconV2/ic-priority-medium-fill.svg b/src/Assets/IconV2/ic-priority-medium-fill.svg index 7d54b4868..edc1d84e0 100644 --- a/src/Assets/IconV2/ic-priority-medium-fill.svg +++ b/src/Assets/IconV2/ic-priority-medium-fill.svg @@ -1,10 +1,5 @@ -<<<<<<< HEAD - - - -======= - - - ->>>>>>> 324044cd (icons changing to IconsV2) + + + + From d08b6af584285fea09810ed867b92c5d3d1bbad6 Mon Sep 17 00:00:00 2001 From: chithra Date: Mon, 6 Oct 2025 18:51:17 +0530 Subject: [PATCH 16/24] Correct icon replaced --- src/Assets/IconV2/ic-priority-medium-fill.svg | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Assets/IconV2/ic-priority-medium-fill.svg b/src/Assets/IconV2/ic-priority-medium-fill.svg index edc1d84e0..07f524fb4 100644 --- a/src/Assets/IconV2/ic-priority-medium-fill.svg +++ b/src/Assets/IconV2/ic-priority-medium-fill.svg @@ -1,5 +1,4 @@ - - - - + + + From 1f39f0d21cb99e038f69a3c3ef01bed43f2cec7b Mon Sep 17 00:00:00 2001 From: chithra Date: Mon, 6 Oct 2025 18:53:38 +0530 Subject: [PATCH 17/24] code formatting --- src/Shared/Components/Icon/types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Shared/Components/Icon/types.ts b/src/Shared/Components/Icon/types.ts index c352169b6..f939a8e14 100644 --- a/src/Shared/Components/Icon/types.ts +++ b/src/Shared/Components/Icon/types.ts @@ -46,7 +46,7 @@ export interface IconBaseProps { * * @example 'B500', 'N200', 'G50', 'R700' */ - color?: IconBaseColorType + color: IconBaseColorType /** * A unique identifier for testing purposes, typically used in test automation. */ From 05779bc9624cc27fb98ab68e1a34cccd421c86ae Mon Sep 17 00:00:00 2001 From: chithra Date: Mon, 6 Oct 2025 18:59:04 +0530 Subject: [PATCH 18/24] Removing service paths --- src/Common/API/CoreAPI.ts | 31 ++++++++++++++++++++++--------- src/Common/Constants.ts | 7 ------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/src/Common/API/CoreAPI.ts b/src/Common/API/CoreAPI.ts index 2bf7a2a86..859212a62 100644 --- a/src/Common/API/CoreAPI.ts +++ b/src/Common/API/CoreAPI.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { API_STATUS_CODES, FALLBACK_REQUEST_TIMEOUT, Host, SERVICE_PATHS } from '@Common/Constants' +import { API_STATUS_CODES, FALLBACK_REQUEST_TIMEOUT, Host } from '@Common/Constants' import { noop } from '@Common/Helper' import { ServerErrors } from '@Common/ServerError' import { APIOptions, ResponseType } from '@Common/Types' @@ -69,7 +69,7 @@ class CoreAPI { } else { currentUrl = `${this.host}/${url}` } - + return fetch( currentUrl, !isMultipartRequest @@ -281,19 +281,32 @@ class CoreAPI { options?: APIOptions, isMultipartRequest?: boolean, isProxyHost?: boolean, - ): Promise> => this.fetchInTime({ url, type: 'POST', data, options, isMultipartRequest, isProxyHost }) + ): Promise> => + this.fetchInTime({ url, type: 'POST', data, options, isMultipartRequest, isProxyHost }) - put = (url: string, data: K, options?: APIOptions, isProxyHost?: boolean): Promise> => - this.fetchInTime({ url, type: 'PUT', data, options, isProxyHost }) + put = ( + url: string, + data: K, + options?: APIOptions, + isProxyHost?: boolean, + ): Promise> => this.fetchInTime({ url, type: 'PUT', data, options, isProxyHost }) - patch = (url: string, data: K, options?: APIOptions, isProxyHost?: boolean): Promise> => - this.fetchInTime({ url, type: 'PATCH', data, options, isProxyHost }) + patch = ( + url: string, + data: K, + options?: APIOptions, + isProxyHost?: boolean, + ): Promise> => this.fetchInTime({ url, type: 'PATCH', data, options, isProxyHost }) get = (url: string, options?: APIOptions, isProxyHost?: boolean): Promise> => this.fetchInTime({ url, type: 'GET', data: null, options, isProxyHost }) - trash = (url: string, data?: K, options?: APIOptions, isProxyHost?: boolean): Promise> => - this.fetchInTime({ url, type: 'DELETE', data, options, isProxyHost }) + trash = ( + url: string, + data?: K, + options?: APIOptions, + isProxyHost?: boolean, + ): Promise> => this.fetchInTime({ url, type: 'DELETE', data, options, isProxyHost }) setGlobalAPITimeout = (timeout: number) => { this.timeout = timeout || FALLBACK_REQUEST_TIMEOUT diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index bc833c89d..da240e67b 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -21,13 +21,6 @@ import { BackupAndScheduleListViewEnum, BackupLocationsTypes } from '@PagesDevtr export const FALLBACK_REQUEST_TIMEOUT = 60000 export const Host = window?.__ORCHESTRATOR_ROOT__ ?? '/orchestrator' -// Service path constants for API routing -export const SERVICE_PATHS = { - ATHENA: 'athena', - ORCHESTRATOR: 'orchestrator', - // Add other service paths as needed in the future -} as const - export const DOCUMENTATION_HOME_PAGE = 'https://docs.devtron.ai' export const DEVTRON_HOME_PAGE = 'https://devtron.ai/' export const DOCUMENTATION_VERSION = '/devtron/v1.7' From 9b40ae0a7ab028711487c8d2febc1b265f0a8556 Mon Sep 17 00:00:00 2001 From: chithra Date: Tue, 7 Oct 2025 17:52:23 +0530 Subject: [PATCH 19/24] API changes added --- src/Common/API/CoreAPI.ts | 46 ++++++++++----------------------------- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/src/Common/API/CoreAPI.ts b/src/Common/API/CoreAPI.ts index 859212a62..368649cbe 100644 --- a/src/Common/API/CoreAPI.ts +++ b/src/Common/API/CoreAPI.ts @@ -61,17 +61,8 @@ class CoreAPI { } // eslint-disable-next-line dot-notation options['credentials'] = 'include' as RequestCredentials - let currentUrl: string - if (isProxyHost) { - // Remove leading slash from url if it exists to avoid double slash after /proxy - const proxyUrl = url.startsWith('/') ? url.slice(1) : url - currentUrl = `/proxy/${proxyUrl}` - } else { - currentUrl = `${this.host}/${url}` - } - return fetch( - currentUrl, + `${isProxyHost ? '/proxy' : this.host}/${url}`, !isMultipartRequest ? options : ({ @@ -209,8 +200,7 @@ class CoreAPI { data, options, isMultipartRequest, - isProxyHost = false, - }: FetchInTimeParamsType & { isProxyHost?: boolean }): Promise => { + }: FetchInTimeParamsType): Promise => { const controller = options?.abortControllerRef?.current ?? new AbortController() const timeoutSignal = controller.signal @@ -280,33 +270,19 @@ class CoreAPI { data: K, options?: APIOptions, isMultipartRequest?: boolean, - isProxyHost?: boolean, - ): Promise> => - this.fetchInTime({ url, type: 'POST', data, options, isMultipartRequest, isProxyHost }) + ): Promise> => this.fetchInTime({ url, type: 'POST', data, options, isMultipartRequest }) - put = ( - url: string, - data: K, - options?: APIOptions, - isProxyHost?: boolean, - ): Promise> => this.fetchInTime({ url, type: 'PUT', data, options, isProxyHost }) + put = (url: string, data: K, options?: APIOptions): Promise> => + this.fetchInTime({ url, type: 'PUT', data, options }) - patch = ( - url: string, - data: K, - options?: APIOptions, - isProxyHost?: boolean, - ): Promise> => this.fetchInTime({ url, type: 'PATCH', data, options, isProxyHost }) + patch = (url: string, data: K, options?: APIOptions): Promise> => + this.fetchInTime({ url, type: 'PATCH', data, options }) - get = (url: string, options?: APIOptions, isProxyHost?: boolean): Promise> => - this.fetchInTime({ url, type: 'GET', data: null, options, isProxyHost }) + get = (url: string, options?: APIOptions): Promise> => + this.fetchInTime({ url, type: 'GET', data: null, options }) - trash = ( - url: string, - data?: K, - options?: APIOptions, - isProxyHost?: boolean, - ): Promise> => this.fetchInTime({ url, type: 'DELETE', data, options, isProxyHost }) + trash = (url: string, data?: K, options?: APIOptions): Promise> => + this.fetchInTime({ url, type: 'DELETE', data, options }) setGlobalAPITimeout = (timeout: number) => { this.timeout = timeout || FALLBACK_REQUEST_TIMEOUT From 571ec00ff87d7d0de9700dbb28e6ddcc6865acd5 Mon Sep 17 00:00:00 2001 From: chithra Date: Wed, 15 Oct 2025 16:33:27 +0530 Subject: [PATCH 20/24] Changing the path --- src/Common/Constants.ts | 2 ++ .../SelectPicker/GroupedFilterSelectPicker-Usage-Guide.md | 0 .../SelectPicker/GroupedFilterSelectPicker.example.tsx | 0 src/Shared/Hooks/useUserPreferences/types.ts | 2 +- 4 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 src/Shared/Components/SelectPicker/GroupedFilterSelectPicker-Usage-Guide.md delete mode 100644 src/Shared/Components/SelectPicker/GroupedFilterSelectPicker.example.tsx diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index da240e67b..6ded61ee2 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -142,7 +142,9 @@ export const URLS = { // AI RECOMMENDATIONS AI_RECOMMENDATIONS: AI_RECOMMENDATIONS_ROOT, AI_RECOMMENDATIONS_OVERVIEW: `${AI_RECOMMENDATIONS_ROOT}/overview`, + AI_RECOMMENDATIONS_NOTIFICATIONS: `${AI_RECOMMENDATIONS_ROOT}/notifications`, EXTERNAL_APPS: 'ea', + } as const export const ROUTES = { diff --git a/src/Shared/Components/SelectPicker/GroupedFilterSelectPicker-Usage-Guide.md b/src/Shared/Components/SelectPicker/GroupedFilterSelectPicker-Usage-Guide.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/Shared/Components/SelectPicker/GroupedFilterSelectPicker.example.tsx b/src/Shared/Components/SelectPicker/GroupedFilterSelectPicker.example.tsx deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/Shared/Hooks/useUserPreferences/types.ts b/src/Shared/Hooks/useUserPreferences/types.ts index 9227f147b..e0b280ad0 100644 --- a/src/Shared/Hooks/useUserPreferences/types.ts +++ b/src/Shared/Hooks/useUserPreferences/types.ts @@ -57,7 +57,7 @@ export type NavigationItemID = | 'data-protection-backup-repositories' | 'data-protection-backup-locations' | 'data-protection-history-and-logs' - | 'ai-recommendations-overview' + | 'ai-recommendations-notifications' export type NavigationSubMenuItemID = | 'application-management-configurations-gitops' From 2eba4907a98ffd709ad37b0a462d07ae12f1d9f6 Mon Sep 17 00:00:00 2001 From: chithra Date: Wed, 22 Oct 2025 11:49:59 +0530 Subject: [PATCH 21/24] duplicates icons removed --- src/Assets/IconV2/ic-coin.svg | 3 --- src/Assets/IconV2/ic-vector.svg | 3 --- src/Common/Constants.ts | 3 +-- src/Shared/Components/Icon/Icon.tsx | 4 ---- 4 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 src/Assets/IconV2/ic-coin.svg delete mode 100644 src/Assets/IconV2/ic-vector.svg diff --git a/src/Assets/IconV2/ic-coin.svg b/src/Assets/IconV2/ic-coin.svg deleted file mode 100644 index 16072f183..000000000 --- a/src/Assets/IconV2/ic-coin.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Assets/IconV2/ic-vector.svg b/src/Assets/IconV2/ic-vector.svg deleted file mode 100644 index 5ea230dca..000000000 --- a/src/Assets/IconV2/ic-vector.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index 6ded61ee2..f695527af 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -139,12 +139,11 @@ export const URLS = { GLOBAL_CONFIG_DOCKER: `${GLOBAL_CONFIG_ROOT}/docker`, GLOBAL_CONFIG_EDIT_CLUSTER: `${GLOBAL_CONFIG_ROOT}/cluster-env/edit/:clusterId`, PERMISSION_GROUPS: `${GLOBAL_CONFIG_ROOT}/auth/groups`, + // AI RECOMMENDATIONS AI_RECOMMENDATIONS: AI_RECOMMENDATIONS_ROOT, - AI_RECOMMENDATIONS_OVERVIEW: `${AI_RECOMMENDATIONS_ROOT}/overview`, AI_RECOMMENDATIONS_NOTIFICATIONS: `${AI_RECOMMENDATIONS_ROOT}/notifications`, EXTERNAL_APPS: 'ea', - } as const export const ROUTES = { diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index 2a7b3365b..c6d790773 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -71,7 +71,6 @@ import { ReactComponent as ICCloudVms } from '@IconsV2/ic-cloud-vms.svg' import { ReactComponent as ICCluster } from '@IconsV2/ic-cluster.svg' import { ReactComponent as ICClusterIsolated } from '@IconsV2/ic-cluster-isolated.svg' import { ReactComponent as ICCode } from '@IconsV2/ic-code.svg' -import { ReactComponent as ICCoin } from '@IconsV2/ic-coin.svg' import { ReactComponent as ICCoins } from '@IconsV2/ic-coins.svg' import { ReactComponent as ICContainer } from '@IconsV2/ic-container.svg' import { ReactComponent as ICContainerRegistry } from '@IconsV2/ic-container-registry.svg' @@ -280,7 +279,6 @@ import { ReactComponent as ICUpgradeEnterprise } from '@IconsV2/ic-upgrade-enter import { ReactComponent as ICUserCircle } from '@IconsV2/ic-user-circle.svg' import { ReactComponent as ICUserKey } from '@IconsV2/ic-user-key.svg' import { ReactComponent as ICUsers } from '@IconsV2/ic-users.svg' -import { ReactComponent as ICVector } from '@IconsV2/ic-vector.svg' import { ReactComponent as ICViewVariableToggle } from '@IconsV2/ic-view-variable-toggle.svg' import { ReactComponent as ICVisibilityOff } from '@IconsV2/ic-visibility-off.svg' import { ReactComponent as ICVisibilityOn } from '@IconsV2/ic-visibility-on.svg' @@ -367,7 +365,6 @@ export const iconMap = { 'ic-cluster-isolated': ICClusterIsolated, 'ic-cluster': ICCluster, 'ic-code': ICCode, - 'ic-coin': ICCoin, 'ic-coins': ICCoins, 'ic-container-registry': ICContainerRegistry, 'ic-container': ICContainer, @@ -576,7 +573,6 @@ export const iconMap = { 'ic-user-circle': ICUserCircle, 'ic-user-key': ICUserKey, 'ic-users': ICUsers, - 'ic-vector': ICVector, 'ic-view-variable-toggle': ICViewVariableToggle, 'ic-visibility-off': ICVisibilityOff, 'ic-visibility-on': ICVisibilityOn, From afdcf83c887d763dd3ea163e3b139d092a3e79aa Mon Sep 17 00:00:00 2001 From: chithra Date: Fri, 24 Oct 2025 19:04:00 +0530 Subject: [PATCH 22/24] version bump --- 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 ba28c4d9e..4f0a647d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.20.6-pre-20", + "version": "1.20.6-pre-27", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.20.6-pre-20", + "version": "1.20.6-pre-27", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 0ec5e10c5..c3d8d9361 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.20.6-pre-20", + "version": "1.20.6-pre-27", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From c900a3ccf888923798d1cf0eab03d2dc6904007a Mon Sep 17 00:00:00 2001 From: chithra Date: Mon, 27 Oct 2025 18:33:41 +0530 Subject: [PATCH 23/24] iIcon Removed --- src/Assets/IconV2/ic-circle-progress.svg | 6 ------ src/Shared/Components/Icon/Icon.tsx | 2 -- 2 files changed, 8 deletions(-) delete mode 100644 src/Assets/IconV2/ic-circle-progress.svg diff --git a/src/Assets/IconV2/ic-circle-progress.svg b/src/Assets/IconV2/ic-circle-progress.svg deleted file mode 100644 index d4ec9d326..000000000 --- a/src/Assets/IconV2/ic-circle-progress.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index c6d790773..5755ee631 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -59,7 +59,6 @@ import { ReactComponent as ICChecks } from '@IconsV2/ic-checks.svg' import { ReactComponent as ICCiLinked } from '@IconsV2/ic-ci-linked.svg' import { ReactComponent as ICCircleLoader } from '@IconsV2/ic-circle-loader.svg' import { ReactComponent as ICCircleSmall } from '@IconsV2/ic-circle-small.svg' -import { ReactComponent as ICCircleProgress } from '@IconsV2/ic-circle-progress.svg' import { ReactComponent as ICCleanBrush } from '@IconsV2/ic-clean-brush.svg' import { ReactComponent as ICClipboard } from '@IconsV2/ic-clipboard.svg' import { ReactComponent as ICClock } from '@IconsV2/ic-clock.svg' @@ -353,7 +352,6 @@ export const iconMap = { 'ic-ci-linked': ICCiLinked, 'ic-circle-loader': ICCircleLoader, 'ic-circle-small': ICCircleSmall, - 'ic-circle-progress': ICCircleProgress, 'ic-clean-brush': ICCleanBrush, 'ic-clipboard': ICClipboard, 'ic-clock-counterclockwise': ICClockCounterclockwise, From a031c4564f10230702dc21c88b2f41027aa25fc3 Mon Sep 17 00:00:00 2001 From: chithra Date: Mon, 27 Oct 2025 18:44:12 +0530 Subject: [PATCH 24/24] Icon removing --- src/Assets/IconV2/ic-arrow-white.svg | 3 --- src/Shared/Components/Icon/Icon.tsx | 2 -- 2 files changed, 5 deletions(-) delete mode 100644 src/Assets/IconV2/ic-arrow-white.svg diff --git a/src/Assets/IconV2/ic-arrow-white.svg b/src/Assets/IconV2/ic-arrow-white.svg deleted file mode 100644 index 38d2caf06..000000000 --- a/src/Assets/IconV2/ic-arrow-white.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/src/Shared/Components/Icon/Icon.tsx b/src/Shared/Components/Icon/Icon.tsx index 5755ee631..1d56c178a 100644 --- a/src/Shared/Components/Icon/Icon.tsx +++ b/src/Shared/Components/Icon/Icon.tsx @@ -13,7 +13,6 @@ import { ReactComponent as ICArrowClockwise } from '@IconsV2/ic-arrow-clockwise. import { ReactComponent as ICArrowLineDown } from '@IconsV2/ic-arrow-line-down.svg' import { ReactComponent as ICArrowRight } from '@IconsV2/ic-arrow-right.svg' import { ReactComponent as ICArrowSquareOut } from '@IconsV2/ic-arrow-square-out.svg' -import { ReactComponent as ICArrowWhite } from '@IconsV2/ic-arrow-white.svg' import { ReactComponent as ICArrowsClockwise } from '@IconsV2/ic-arrows-clockwise.svg' import { ReactComponent as ICArrowsLeftRight } from '@IconsV2/ic-arrows-left-right.svg' import { ReactComponent as ICAsterisk } from '@IconsV2/ic-asterisk.svg' @@ -306,7 +305,6 @@ export const iconMap = { 'ic-arrow-line-down': ICArrowLineDown, 'ic-arrow-right': ICArrowRight, 'ic-arrow-square-out': ICArrowSquareOut, - 'ic-arrow-white': ICArrowWhite, 'ic-arrows-clockwise': ICArrowsClockwise, 'ic-arrows-left-right': ICArrowsLeftRight, 'ic-asterisk': ICAsterisk,