From ee863e9b18db3e7d045d6d039ab8a9fb90754c2b Mon Sep 17 00:00:00 2001 From: chithra Date: Mon, 15 Sep 2025 14:32:55 +0530 Subject: [PATCH 01/14] feat: REnaming navigation menu --- src/components/Navigation/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Navigation/constants.ts b/src/components/Navigation/constants.ts index 60f27350de..3c56c2f90a 100644 --- a/src/components/Navigation/constants.ts +++ b/src/components/Navigation/constants.ts @@ -459,7 +459,7 @@ export const NAVIGATION_LIST: NavigationGroupType[] = [ disabled: true, items: [ { - title: 'Overview', + title: 'Notifications', dataTestId: 'ai-recommendations-overview', id: 'ai-recommendations-overview', icon: 'ic-speedometer', From 8bdde59c3c5a4eb601098b02c143e3c9c1c594d5 Mon Sep 17 00:00:00 2001 From: chithra Date: Thu, 18 Sep 2025 13:34:23 +0530 Subject: [PATCH 02/14] New root adding for athena --- .env.development | 1 + .env.production | 1 + .../app/details/appDetails/appDetails.service.ts | 1 + src/components/app/service.ts | 8 +++++++- src/index.tsx | 4 +++- vite.config.mts | 8 ++++++-- 6 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.env.development b/.env.development index 777dda988c..9df5666b84 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,5 @@ VITE_ORCHESTRATOR_ROOT="/orchestrator" +VITE_ATHENA_ROOT="/athena" VITE_GRAFANA_ORG_ID=2 VITE_K8S_CLIENT=false VITE_NODE_ENV="development" diff --git a/.env.production b/.env.production index 54a362b28f..9b59aa5dde 100644 --- a/.env.production +++ b/.env.production @@ -1,4 +1,5 @@ VITE_ORCHESTRATOR_ROOT="/orchestrator" +VITE_ATHENA_ROOT="/athena" VITE_GRAFANA_ORG_ID=2 VITE_NODE_ENV="production" BASE_URL="/dashboard" \ No newline at end of file diff --git a/src/components/app/details/appDetails/appDetails.service.ts b/src/components/app/details/appDetails/appDetails.service.ts index fbc7dc1de4..676194c1e9 100644 --- a/src/components/app/details/appDetails/appDetails.service.ts +++ b/src/components/app/details/appDetails/appDetails.service.ts @@ -54,6 +54,7 @@ export const getDataSourceDetailsFromEnvironment = async (envName: string): Prom export function isDatasourceHealthy(datasourceId: number | string) { const timestamp = new Date() + // const root = window.__ORCHESTRATOR_ROOT__.replace('/orchestrator', '') const root = window.__ORCHESTRATOR_ROOT__.replace('/orchestrator', '') const URL = `${root}/grafana/api/datasources/proxy/${datasourceId}/api/v1/query?query=1&time=${timestamp.getTime()}` return fetchWithFullRoute(URL, 'GET') diff --git a/src/components/app/service.ts b/src/components/app/service.ts index fbb80f0ad1..cb34c49e47 100644 --- a/src/components/app/service.ts +++ b/src/components/app/service.ts @@ -37,7 +37,13 @@ import { Routes, Moment12HourFormat, NO_COMMIT_SELECTED } from '../../config' import { AppDetails, ArtifactsCiJob, EditAppRequest, AppMetaInfo } from './types' import { BulkResponseStatus, BULK_VIRTUAL_RESPONSE_STATUS } from '../ApplicationGroup/Constants' -export const getAppList = (request, options?: APIOptions) => post(Routes.APP_LIST, request, options) + + +export const getAppList = (request, options?: APIOptions) => { + // Use ATHENA_ROOT instead of ORCHESTRATOR_ROOT for app list API + const athenaUrl = `${window.__ATHENA_ROOT__}/${Routes.APP_LIST}` + return post(athenaUrl, request, options) +} export function deleteResource({ appName, env, name, kind, group, namespace, version, appId, envId }) { if (!group) { diff --git a/src/index.tsx b/src/index.tsx index 5699c02c69..ab2c6981d9 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -41,13 +41,15 @@ declare global { Worker: any __BASE_URL__: string __ORCHESTRATOR_ROOT__: string + __ATHENA_ROOT__: string __GRAFANA_ORG_ID__: number } } -if (!window.__BASE_URL__ || !window.__ORCHESTRATOR_ROOT__) { +if (!window.__BASE_URL__ || !window.__ORCHESTRATOR_ROOT__ || !window.__ATHENA_ROOT__) { window.__BASE_URL__ = import.meta.env.BASE_URL || '/dashboard' window.__ORCHESTRATOR_ROOT__ = import.meta.env.VITE_ORCHESTRATOR_ROOT || 'orchestrator' + window.__ATHENA_ROOT__ = import.meta.env.VITE_ATHENA_ROOT || 'athena' window.__GRAFANA_ORG_ID__ = import.meta.env.VITE_GRAFANA_ORG_ID || 2 } diff --git a/vite.config.mts b/vite.config.mts index dcb785595b..61ccb80fd5 100644 --- a/vite.config.mts +++ b/vite.config.mts @@ -31,7 +31,7 @@ import tsconfigPaths from 'vite-tsconfig-paths' import { compression, defineAlgorithm } from 'vite-plugin-compression2' const WRONG_CODE = `import { bpfrpt_proptype_WindowScroller } from "../WindowScroller.js";` -const TARGET_URL = 'https://preview.devtron.ai/' +const TARGET_URL = 'https://gadgeon-dashboard.devtron.info/'; function reactVirtualized(): PluginOption { return { @@ -96,7 +96,7 @@ const jsToBottomNoModule = () => { export default defineConfig(({ mode }) => { const secretsEnv = loadEnv('secrets', process.cwd(), '') const targetUrl = secretsEnv.VITE_TARGET_URL ?? TARGET_URL - + const targetUrl1 = secretsEnv.VITE_TARGET_URL ?? TARGET_URL process.env = { ...process.env, ...loadEnv(mode, process.cwd(), ''), ...secretsEnv } const baseConfig: UserConfig = { @@ -275,6 +275,10 @@ export default defineConfig(({ mode }) => { target: targetUrl, changeOrigin: true, }, + '/athena': { + target: targetUrl, + changeOrigin: true, + }, '/grafana': targetUrl, }, }, From 600064a7920028400ebf6c2cfddd5c43aeab75ab Mon Sep 17 00:00:00 2001 From: chithra Date: Tue, 23 Sep 2025 10:41:26 +0530 Subject: [PATCH 03/14] feat:changing targetUrl --- vite.config.mts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vite.config.mts b/vite.config.mts index 61ccb80fd5..0a776fbf4a 100644 --- a/vite.config.mts +++ b/vite.config.mts @@ -31,7 +31,7 @@ import tsconfigPaths from 'vite-tsconfig-paths' import { compression, defineAlgorithm } from 'vite-plugin-compression2' const WRONG_CODE = `import { bpfrpt_proptype_WindowScroller } from "../WindowScroller.js";` -const TARGET_URL = 'https://gadgeon-dashboard.devtron.info/'; +const TARGET_URL = 'https://preview.devtron.ai/'; function reactVirtualized(): PluginOption { return { From b8336ff8b06f0a9ec42948e45d4dc5057d84942a Mon Sep 17 00:00:00 2001 From: chithra Date: Thu, 25 Sep 2025 16:28:40 +0530 Subject: [PATCH 04/14] changing the root --- src/components/app/service.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/components/app/service.ts b/src/components/app/service.ts index cb34c49e47..9fa0df0525 100644 --- a/src/components/app/service.ts +++ b/src/components/app/service.ts @@ -39,11 +39,7 @@ import { BulkResponseStatus, BULK_VIRTUAL_RESPONSE_STATUS } from '../Application -export const getAppList = (request, options?: APIOptions) => { - // Use ATHENA_ROOT instead of ORCHESTRATOR_ROOT for app list API - const athenaUrl = `${window.__ATHENA_ROOT__}/${Routes.APP_LIST}` - return post(athenaUrl, request, options) -} +export const getAppList = (request, options?: APIOptions) => post(Routes.APP_LIST, request, options) export function deleteResource({ appName, env, name, kind, group, namespace, version, appId, envId }) { if (!group) { From dee43e91e8c0d12f5e513ec8cd4b569eaf3b9186 Mon Sep 17 00:00:00 2001 From: Asika TK Date: Tue, 30 Sep 2025 20:28:20 +0530 Subject: [PATCH 05/14] feat: ai chatbot --- .env | 2 +- src/index.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 12a76d0eab..4f9c7e1c54 100644 --- a/.env +++ b/.env @@ -68,7 +68,7 @@ FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false GATEKEEPER_URL=https://license.devtron.ai/dashboard FEATURE_AI_INTEGRATION_ENABLE=false LOGIN_PAGE_IMAGE= -FEATURE_ASK_DEVTRON_EXPERT=false +FEATURE_ASK_DEVTRON_EXPERT=true FEATURE_MANAGE_TRAFFIC_ENABLE=false FEATURE_REDFISH_NODE_ENABLE=false FEATURE_INFRA_PROVISION_INFO_BLOCK_HIDE=false diff --git a/src/index.tsx b/src/index.tsx index ab2c6981d9..ba07e992a6 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -175,7 +175,7 @@ if (!window || !window._env_) { GATEKEEPER_URL: 'https://license.devtron.ai/dashboard', FEATURE_AI_INTEGRATION_ENABLE: true, LOGIN_PAGE_IMAGE: '', - FEATURE_ASK_DEVTRON_EXPERT: false, + FEATURE_ASK_DEVTRON_EXPERT: true, FEATURE_MANAGE_TRAFFIC_ENABLE: true, FEATURE_REDFISH_NODE_ENABLE: false, FEATURE_INFRA_PROVISION_INFO_BLOCK_HIDE: false, From c21eeb75ad9b639020c1f72f0300007216bd1e42 Mon Sep 17 00:00:00 2001 From: chithra Date: Mon, 6 Oct 2025 19:02:07 +0530 Subject: [PATCH 06/14] Enabling notification menu --- src/components/Navigation/constants.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Navigation/constants.ts b/src/components/Navigation/constants.ts index 3c56c2f90a..066db1bc55 100644 --- a/src/components/Navigation/constants.ts +++ b/src/components/Navigation/constants.ts @@ -456,14 +456,14 @@ export const NAVIGATION_LIST: NavigationGroupType[] = [ id: 'ai-recommendations', title: 'AI Recommendations', icon: 'ic-openai', - disabled: true, + disabled: false, items: [ { title: 'Notifications', dataTestId: 'ai-recommendations-overview', id: 'ai-recommendations-overview', icon: 'ic-speedometer', - disabled: true, + disabled: false, href: COMMON_URLS.AI_RECOMMENDATIONS_OVERVIEW, }, ], From 701c168713941750eb0443fc7864378f879317bb Mon Sep 17 00:00:00 2001 From: chithra Date: Mon, 6 Oct 2025 19:11:01 +0530 Subject: [PATCH 07/14] Code formatting --- src/components/app/details/appDetails/appDetails.service.ts | 1 - src/components/app/service.ts | 2 -- vite.config.mts | 1 - 3 files changed, 4 deletions(-) diff --git a/src/components/app/details/appDetails/appDetails.service.ts b/src/components/app/details/appDetails/appDetails.service.ts index 676194c1e9..fbc7dc1de4 100644 --- a/src/components/app/details/appDetails/appDetails.service.ts +++ b/src/components/app/details/appDetails/appDetails.service.ts @@ -54,7 +54,6 @@ export const getDataSourceDetailsFromEnvironment = async (envName: string): Prom export function isDatasourceHealthy(datasourceId: number | string) { const timestamp = new Date() - // const root = window.__ORCHESTRATOR_ROOT__.replace('/orchestrator', '') const root = window.__ORCHESTRATOR_ROOT__.replace('/orchestrator', '') const URL = `${root}/grafana/api/datasources/proxy/${datasourceId}/api/v1/query?query=1&time=${timestamp.getTime()}` return fetchWithFullRoute(URL, 'GET') diff --git a/src/components/app/service.ts b/src/components/app/service.ts index 9fa0df0525..fbb80f0ad1 100644 --- a/src/components/app/service.ts +++ b/src/components/app/service.ts @@ -37,8 +37,6 @@ import { Routes, Moment12HourFormat, NO_COMMIT_SELECTED } from '../../config' import { AppDetails, ArtifactsCiJob, EditAppRequest, AppMetaInfo } from './types' import { BulkResponseStatus, BULK_VIRTUAL_RESPONSE_STATUS } from '../ApplicationGroup/Constants' - - export const getAppList = (request, options?: APIOptions) => post(Routes.APP_LIST, request, options) export function deleteResource({ appName, env, name, kind, group, namespace, version, appId, envId }) { diff --git a/vite.config.mts b/vite.config.mts index 0a776fbf4a..7f3a9d0f91 100644 --- a/vite.config.mts +++ b/vite.config.mts @@ -96,7 +96,6 @@ const jsToBottomNoModule = () => { export default defineConfig(({ mode }) => { const secretsEnv = loadEnv('secrets', process.cwd(), '') const targetUrl = secretsEnv.VITE_TARGET_URL ?? TARGET_URL - const targetUrl1 = secretsEnv.VITE_TARGET_URL ?? TARGET_URL process.env = { ...process.env, ...loadEnv(mode, process.cwd(), ''), ...secretsEnv } const baseConfig: UserConfig = { From 3057a383bf481f8b1c92dbc406688f18dfe5cf6a Mon Sep 17 00:00:00 2001 From: chithra Date: Tue, 7 Oct 2025 16:46:07 +0530 Subject: [PATCH 08/14] Adding proxy --- vite.config.mts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vite.config.mts b/vite.config.mts index 7f3a9d0f91..90256ff73e 100644 --- a/vite.config.mts +++ b/vite.config.mts @@ -274,7 +274,7 @@ export default defineConfig(({ mode }) => { target: targetUrl, changeOrigin: true, }, - '/athena': { + '/proxy': { target: targetUrl, changeOrigin: true, }, From 3d1bb0c82efab9a97526f9d6474cf1767e7b8bff Mon Sep 17 00:00:00 2001 From: chithra Date: Tue, 7 Oct 2025 17:48:54 +0530 Subject: [PATCH 09/14] changing the athena root --- .env.development | 2 +- .env.production | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 9df5666b84..6b59579ed4 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ VITE_ORCHESTRATOR_ROOT="/orchestrator" -VITE_ATHENA_ROOT="/athena" +VITE_ATHENA_ROOT="athena" VITE_GRAFANA_ORG_ID=2 VITE_K8S_CLIENT=false VITE_NODE_ENV="development" diff --git a/.env.production b/.env.production index 9b59aa5dde..d50c70b9b8 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ VITE_ORCHESTRATOR_ROOT="/orchestrator" -VITE_ATHENA_ROOT="/athena" +VITE_ATHENA_ROOT="athena" VITE_GRAFANA_ORG_ID=2 VITE_NODE_ENV="production" BASE_URL="/dashboard" \ No newline at end of file From 15e788548b0b1e882257d22c6b8d2e2736482d4e Mon Sep 17 00:00:00 2001 From: chithra Date: Wed, 8 Oct 2025 17:32:46 +0530 Subject: [PATCH 10/14] setting the FEATURE_ASK_DEVTRON_EXPERT= false --- .env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env b/.env index 4f9c7e1c54..12a76d0eab 100644 --- a/.env +++ b/.env @@ -68,7 +68,7 @@ FEATURE_DEFAULT_AUTHENTICATED_VIEW_ENABLE=false GATEKEEPER_URL=https://license.devtron.ai/dashboard FEATURE_AI_INTEGRATION_ENABLE=false LOGIN_PAGE_IMAGE= -FEATURE_ASK_DEVTRON_EXPERT=true +FEATURE_ASK_DEVTRON_EXPERT=false FEATURE_MANAGE_TRAFFIC_ENABLE=false FEATURE_REDFISH_NODE_ENABLE=false FEATURE_INFRA_PROVISION_INFO_BLOCK_HIDE=false From 76d7457ef80f889e38a9fe3ec5d48e0a7f7f27e2 Mon Sep 17 00:00:00 2001 From: chithra Date: Wed, 8 Oct 2025 17:33:54 +0530 Subject: [PATCH 11/14] FEATURE_ASK_DEVTRON_EXPERT setting to false --- src/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.tsx b/src/index.tsx index ba07e992a6..ab2c6981d9 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -175,7 +175,7 @@ if (!window || !window._env_) { GATEKEEPER_URL: 'https://license.devtron.ai/dashboard', FEATURE_AI_INTEGRATION_ENABLE: true, LOGIN_PAGE_IMAGE: '', - FEATURE_ASK_DEVTRON_EXPERT: true, + FEATURE_ASK_DEVTRON_EXPERT: false, FEATURE_MANAGE_TRAFFIC_ENABLE: true, FEATURE_REDFISH_NODE_ENABLE: false, FEATURE_INFRA_PROVISION_INFO_BLOCK_HIDE: false, From 995aada5a017e25c4fafdc9f625acaed84982dd4 Mon Sep 17 00:00:00 2001 From: chithra Date: Wed, 15 Oct 2025 17:55:32 +0530 Subject: [PATCH 12/14] changing dataTestId --- src/components/Navigation/constants.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Navigation/constants.ts b/src/components/Navigation/constants.ts index 066db1bc55..5e824b9cb7 100644 --- a/src/components/Navigation/constants.ts +++ b/src/components/Navigation/constants.ts @@ -460,8 +460,8 @@ export const NAVIGATION_LIST: NavigationGroupType[] = [ items: [ { title: 'Notifications', - dataTestId: 'ai-recommendations-overview', - id: 'ai-recommendations-overview', + dataTestId: 'ai-recommendations-notifications', + id: 'ai-recommendations-notifications', icon: 'ic-speedometer', disabled: false, href: COMMON_URLS.AI_RECOMMENDATIONS_OVERVIEW, From 15cc4145c0f21c5edb3c914a1390a62ceeb4b4d1 Mon Sep 17 00:00:00 2001 From: chithra Date: Fri, 24 Oct 2025 19:29:26 +0530 Subject: [PATCH 13/14] version bump --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index abca34b217..620801318f 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": "/dashboard", "dependencies": { - "@devtron-labs/devtron-fe-common-lib": "1.20.6-pre-20", + "@devtron-labs/devtron-fe-common-lib": "1.20.6-pre-27", "@esbuild-plugins/node-globals-polyfill": "0.2.3", "@rjsf/core": "^5.13.3", "@rjsf/utils": "^5.13.3", diff --git a/yarn.lock b/yarn.lock index f67f258c77..7b327713da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1722,9 +1722,9 @@ __metadata: languageName: node linkType: hard -"@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-20": - version: 1.20.6-pre-20 - resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-20" +"@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-27": + version: 1.20.6-pre-27 + resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.6-pre-27" dependencies: "@codemirror/autocomplete": "npm:6.18.6" "@codemirror/lang-json": "npm:6.0.1" @@ -1776,7 +1776,7 @@ __metadata: react-select: 5.8.0 rxjs: ^7.8.1 yaml: ^2.4.1 - checksum: 10c0/2516f1ac5da3ac0ae5afaa9772a3f7eb17f7ba5403088d3192dbb0c0c221bb190106525a3e208932c106ba3abffcbe7e3559a58c7b1393e9f162e1227347a025 + checksum: 10c0/849647c4187e1a880dbfb9e3cfd84971f80c00e9072778e0f215cf49b33f301e4f766ad40972d5b4a7ddf0ab166d051e46a7e39209cb9c7593ae1620c2449715 languageName: node linkType: hard @@ -5581,7 +5581,7 @@ __metadata: version: 0.0.0-use.local resolution: "dashboard@workspace:." dependencies: - "@devtron-labs/devtron-fe-common-lib": "npm:1.20.6-pre-20" + "@devtron-labs/devtron-fe-common-lib": "npm:1.20.6-pre-27" "@esbuild-plugins/node-globals-polyfill": "npm:0.2.3" "@playwright/test": "npm:^1.32.1" "@rjsf/core": "npm:^5.13.3" From a515d7b077559d1066910ad8df3e69db804a4a17 Mon Sep 17 00:00:00 2001 From: chithra Date: Fri, 24 Oct 2025 20:18:59 +0530 Subject: [PATCH 14/14] Route change --- src/components/Navigation/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Navigation/constants.ts b/src/components/Navigation/constants.ts index 5e824b9cb7..6a9b9893e2 100644 --- a/src/components/Navigation/constants.ts +++ b/src/components/Navigation/constants.ts @@ -464,7 +464,7 @@ export const NAVIGATION_LIST: NavigationGroupType[] = [ id: 'ai-recommendations-notifications', icon: 'ic-speedometer', disabled: false, - href: COMMON_URLS.AI_RECOMMENDATIONS_OVERVIEW, + href: COMMON_URLS.AI_RECOMMENDATIONS_NOTIFICATIONS, }, ], },