Skip to content

Commit ae06fe3

Browse files
committed
refactor: update getDataSourceDetailsFromEnvironment to return DataSourceDetailsType and adjust query parameters
1 parent ed9267f commit ae06fe3

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

src/components/app/details/appDetails/appDetails.service.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,24 @@ import { fetchWithFullRoute } from '../../../../services/fetchWithFullRoute'
2020
import {
2121
ClusterConnectionResponse,
2222
DataSourceDetailsDTO,
23+
DataSourceDetailsQueryParams,
24+
DataSourceDetailsType,
2325
DeploymentStatusDetailsResponse,
2426
ModuleConfigResponse,
2527
} from './appDetails.type'
2628
import { AppType } from '../../../v2/appDetails/appDetails.type'
2729

28-
export const getDataSourceDetailsFromEnvironment = async (envName: string): Promise<DataSourceDetailsDTO> => {
30+
export const getDataSourceDetailsFromEnvironment = async (envName: string): Promise<DataSourceDetailsType> => {
2931
try {
3032
const {
31-
result: { dataSourceName, dataSourceId },
32-
} = await get<DataSourceDetailsDTO>(getUrlWithSearchParams('/health', { envName }))
33+
result: { name, id },
34+
} = await get<DataSourceDetailsDTO>(
35+
getUrlWithSearchParams(Routes.ENV_DATA_SOURCE_NAME, {
36+
environment: envName,
37+
} satisfies DataSourceDetailsQueryParams),
38+
)
3339

34-
return { dataSourceName, dataSourceId }
40+
return { dataSourceName: name, dataSourceId: id }
3541
} catch {
3642
return {
3743
dataSourceName: '',

src/components/app/details/appDetails/appDetails.type.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,15 @@ export interface ModuleConfigResponse extends ResponseType {
133133
}
134134

135135
export interface DataSourceDetailsDTO {
136+
id: number
137+
name: string
138+
}
139+
140+
export interface DataSourceDetailsQueryParams {
141+
environment: string
142+
}
143+
144+
export interface DataSourceDetailsType {
136145
dataSourceName: string
137146
dataSourceId: number
138147
}

src/config/constants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ export const Routes = {
265265
CONFIG_MANIFEST: 'config/manifest',
266266
USER_RESOURCE_OPTIONS: 'user/resource/options',
267267
HEALTH: 'health',
268+
ENV_DATA_SOURCE_NAME: 'env/data-source-name',
268269
}
269270

270271
export enum ViewType {

0 commit comments

Comments
 (0)