Skip to content

Commit b511695

Browse files
committed
Merge branch 'develop' into feat/app-clone-flow
2 parents d1e0f4e + a97bf2b commit b511695

31 files changed

Lines changed: 324 additions & 161 deletions

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-2",
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/Constants.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ export const URLS = {
6565
CREATE_JOB: 'create-job',
6666
GETTING_STARTED: 'getting-started',
6767
STACK_MANAGER_ABOUT: '/stack-manager/about',
68-
APP_LIST_HELM: 'h',
6968
APP_CI_DETAILS: 'ci-details',
7069
LOGS: 'Logs',
7170
CREATE: '/create',

0 commit comments

Comments
 (0)