Skip to content

Commit a97bf2b

Browse files
authored
Merge pull request #685 from devtron-labs/feature/create-cluster
feature: add EKS create cluster
2 parents 8bdc2a6 + 3fc451b commit a97bf2b

File tree

28 files changed

+243
-99
lines changed

28 files changed

+243
-99
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.13.0-pre-3",
3+
"version": "1.13.0-pre-4",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Assets/Icon/ic-medal.svg

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/Assets/IconV2/ic-cluster.svg

Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 62 additions & 0 deletions
Loading
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 43 additions & 0 deletions
Loading

src/Assets/IconV2/ic-login-devtron-logo.svg

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/Common/Common.service.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import {
4545
GlobalVariableDTO,
4646
GlobalVariableOptionType,
4747
UserRole,
48+
APIOptions,
4849
EnvAppsMetaDTO,
4950
GetAppsInfoForEnvProps,
5051
AppMeta,
@@ -452,9 +453,9 @@ export function getClusterListMin() {
452453
export const getResourceGroupListRaw = (clusterId: string): Promise<ResponseType<ApiResourceType>> =>
453454
get(`${ROUTES.API_RESOURCE}/${ROUTES.GVK}/${clusterId}`)
454455

455-
export function getNamespaceListMin(clusterIdsCsv: string): Promise<EnvironmentListHelmResponse> {
456+
export function getNamespaceListMin(clusterIdsCsv: string, abortControllerRef?: APIOptions['abortControllerRef']): Promise<EnvironmentListHelmResponse> {
456457
const URL = `${ROUTES.NAMESPACE}/autocomplete?ids=${clusterIdsCsv}`
457-
return get(URL)
458+
return get(URL, { abortControllerRef })
458459
}
459460
export function getWebhookEventsForEventId(eventId: string | number) {
460461
const URL = `${ROUTES.GIT_HOST_EVENT}/${eventId}`

src/Common/RJSF/templates/ObjectFieldTemplate.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@ const Field = ({
7676
return true
7777
}
7878
})
79-
// NOTE: we probably should use uiSchema instead?
80-
.sort((prop) => (schema.properties?.[prop.name]?.type === 'boolean' ? -1 : 1))
8179
.map((prop) => prop.content)
8280

8381
if (hasAdditionalProperties) {

0 commit comments

Comments
 (0)