New root adding for athena

Author: chith-git

.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"

.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"

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')

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) {

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
 }
 

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,
             },
         },