Skip to content

Commit 0019643

Browse files
committed
Merge branch 'develop' into feat/replace-select-v4
2 parents e0b5cfa + 9a4474d commit 0019643

File tree

6 files changed

+1572
-519
lines changed

6 files changed

+1572
-519
lines changed

src/components/ApplicationGroup/AppGroup.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ export const getEnvAppList = (
197197
signal?: AbortSignal,
198198
): Promise<EnvAppType> => {
199199
const options = signal ? { signal } : null
200-
const { searchKey = '', cluster = [], offset = 0, pageSize = 20 } = filterConfig ?? {}
200+
const { searchKey = '', cluster = [], offset, pageSize } = filterConfig ?? {}
201201
const params: GetEnvAppListParamsType = {
202202
envName: searchKey,
203203
clusterIds: cluster?.join(),

src/components/app/list-new/AppListService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const getDevtronInstalledHelmApps = (
4141
): Promise<HelmAppListResponse> => {
4242
const baseUrl = Routes.CHART_INSTALLED
4343
const params: GetDevtronHelmAppListParamsType = {
44-
clusterIdsCsv,
44+
clusterIds: clusterIdsCsv,
4545
appStatuses,
4646
}
4747
const url = getUrlWithSearchParams(baseUrl, params)

src/components/app/list-new/AppListType.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ export interface useFilterOptionsProps
194194
| 'isExternalFlux'
195195
> {}
196196

197-
export interface GetDevtronHelmAppListParamsType extends Pick<HelmAppListProps, 'clusterIdsCsv'> {
197+
export interface GetDevtronHelmAppListParamsType {
198198
appStatuses: string
199+
clusterIds: string
199200
}

src/components/ciConfig/CIConfigForm.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,6 @@ export default function CIConfigForm({
145145
),
146146
)
147147

148-
console.log(sourceConfig,' selectedMaterial', selectedMaterial)
149148
useEffect(() => {
150149
initBuildArgs()
151150
}, [])

vite.config.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { VitePWA } from 'vite-plugin-pwa'
2929
import tsconfigPaths from 'vite-tsconfig-paths'
3030

3131
const WRONG_CODE = `import { bpfrpt_proptype_WindowScroller } from "../WindowScroller.js";`
32-
const TARGET_URL = 'https://devtron-ent-7.devtron.info/'
32+
const TARGET_URL = 'https://preview.devtron.ai/'
3333

3434
function reactVirtualized(): PluginOption {
3535
return {

0 commit comments

Comments
 (0)