Skip to content

Commit 2d76c27

Browse files
committed
Merge branch 'feat/template-list' of github.com:devtron-labs/devtron-fe-common-lib into feat/template-create
2 parents e3a4b32 + 9e7f983 commit 2d76c27

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

src/Common/Constants.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ export const URLS = {
8585
COMPARE_CLUSTERS: '/compare-clusters',
8686
GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP,
8787
GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP_CREATE: `${GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP}/create`,
88+
// NOTE: using appId since we are re-using AppConfig component
8889
GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP_DETAIL: `${GLOBAL_CONFIG_TEMPLATES_DEVTRON_APP}/detail/:appId`,
8990
}
9091

src/Shared/Components/GenericInfoCard/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export enum GenericInfoCardBorderVariant {
2525
export type GenericInfoCardProps = { borderVariant: GenericInfoCardBorderVariant } & (
2626
| ({
2727
isLoading: true
28-
} & Partial<BaseGenericInfoCardProps>)
28+
} & Partial<Record<keyof BaseGenericInfoCardProps, never>>)
2929
| ({
3030
isLoading?: boolean
3131
} & BaseGenericInfoCardProps)

0 commit comments

Comments
 (0)