Merge branch 'main' into feat/segregate-logs

AbhishekA1509 · AbhishekA1509 · commit 074fc5f8042a · 2024-08-08T18:34:13.000+05:30
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.1.14-beta-2",
+    "version": "0.1.16",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
diff --git a/src/Pages/ResourceBrowser/ResourceBrowser.Types.ts b/src/Pages/ResourceBrowser/ResourceBrowser.Types.ts
@@ -26,6 +26,7 @@ export interface ApiResourceGroupType {
     gvk: GVKType
     namespaced: boolean
     isGrouped?: boolean
+    shortNames?: string[] | null
 }
 
 export interface ApiResourceType {
diff --git a/src/index.ts b/src/index.ts
@@ -73,6 +73,7 @@ export interface customEnv {
     ORGANIZATION_NAME?: string
     FEATURE_SCOPED_VARIABLE_ENVIRONMENT_LIST_ENABLE?: boolean
     FEATURE_STEP_WISE_LOGS_ENABLE?: boolean
+    FEATURE_IMAGE_PROMOTION_ENABLE?: boolean
 }
 declare global {
     interface Window {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@devtron-labs/devtron-fe-common-lib",`
`3`		`- "version": "0.1.14-beta-2",`
	`3`	`+ "version": "0.1.16",`
`4`	`4`	`"description": "Supporting common component library",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"main": "dist/index.js",`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ export interface ApiResourceGroupType {`
`26`	`26`	`gvk: GVKType`
`27`	`27`	`namespaced: boolean`
`28`	`28`	`isGrouped?: boolean`
	`29`	`+ shortNames?: string[] \| null`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`export interface ApiResourceType {`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ export interface customEnv {`
`73`	`73`	`ORGANIZATION_NAME?: string`
`74`	`74`	`FEATURE_SCOPED_VARIABLE_ENVIRONMENT_LIST_ENABLE?: boolean`
`75`	`75`	`FEATURE_STEP_WISE_LOGS_ENABLE?: boolean`
	`76`	`+ FEATURE_IMAGE_PROMOTION_ENABLE?: boolean`
`76`	`77`	`}`
`77`	`78`	`declare global {`
`78`	`79`	`interface Window {`