Skip to content

Commit 73c1053

Browse files
committed
Merge branch 'develop' of github.com:devtron-labs/devtron-fe-common-lib into feat/new-layout
2 parents 4f4c4b8 + c4fdc4e commit 73c1053

File tree

4 files changed

+62
-23
lines changed

4 files changed

+62
-23
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.7.6",
3+
"version": "1.7.8",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Shared/Components/CustomInput/CustomInput.tsx

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { InputHTMLAttributes, useEffect, useRef } from 'react'
17+
import { useEffect, useRef } from 'react'
1818
import { FormFieldWrapper, getFormFieldAriaAttributes } from '@Shared/Components/FormFieldWrapper'
1919
import {
2020
COMPONENT_SIZE_TYPE_TO_FONT_AND_BLOCK_PADDING_MAP,
@@ -75,14 +75,6 @@ const CustomInput = ({
7575
onBlur?.(event)
7676
}
7777

78-
const handleKeyDown: InputHTMLAttributes<HTMLInputElement>['onKeyDown'] = (event) => {
79-
if (event.key === 'Enter' || event.key === 'Escape') {
80-
event.stopPropagation()
81-
}
82-
83-
props.onKeyDown?.(event)
84-
}
85-
8678
const handleEndIconButtonClick: CustomInputProps['endIconButtonConfig']['onClick'] = (event) => {
8779
event.stopPropagation()
8880
inputRef.current.focus()
@@ -123,7 +115,6 @@ const CustomInput = ({
123115
data-testid={name}
124116
required={required}
125117
onBlur={handleBlur}
126-
onKeyDown={handleKeyDown}
127118
type={type}
128119
ref={inputRef}
129120
className={`${COMPONENT_SIZE_TYPE_TO_FONT_AND_BLOCK_PADDING_MAP[size]} ${COMPONENT_SIZE_TYPE_TO_INLINE_PADDING_MAP[size]} ${deriveBorderRadiusAndBorderClassFromConfig({ borderConfig, borderRadiusConfig })} ${endIconButtonConfig ? `custom-input__with-icon-button--${size}` : ''} w-100 dc__overflow-auto`}

src/index.ts

Lines changed: 58 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,39 +71,87 @@ export interface customEnv {
7171
ENABLE_EXTERNAL_ARGO_CD: boolean
7272
API_BATCH_SIZE: number
7373
SERVICE_WORKER_TIMEOUT?: string
74-
HIDE_RELEASES?: boolean
7574
FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: boolean
76-
HIDE_RESOURCE_WATCHER?: boolean
7775
ORGANIZATION_NAME: string
7876
FEATURE_EXTERNAL_FLUX_CD_ENABLE: boolean
79-
FEATURE_SCOPED_VARIABLE_ENVIRONMENT_LIST_ENABLE?: boolean
80-
HIDE_NETWORK_STATUS_INTERFACE?: boolean
81-
SYSTEM_CONTROLLER_LISTING_TIMEOUT?: number
82-
FEATURE_IMAGE_PROMOTION_ENABLE?: boolean
83-
FEATURE_CD_MANDATORY_PLUGINS_ENABLE?: boolean
8477
/**
8578
* If true, the direct permissions are hidden for non-super admins in user permissions
8679
*
8780
* @default false
8881
*/
8982
FEATURE_HIDE_USER_DIRECT_PERMISSIONS_FOR_NON_SUPER_ADMINS?: boolean
90-
FEATURE_CONFIG_DRIFT_ENABLE: boolean
9183
FEATURE_PROMO_EMBEDDED_BUTTON_TEXT?: string
9284
FEATURE_PROMO_EMBEDDED_MODAL_TITLE?: string
9385
FEATURE_PROMO_EMBEDDED_IFRAME_URL?: string
94-
FEATURE_SWAP_TRAFFIC_ENABLE?: boolean
9586
FEATURE_BULK_RESTART_WORKLOADS_FROM_RB: string
9687
FEATURE_RB_SYNC_CLUSTER_ENABLE?: boolean
9788
FEATURE_DEFAULT_MERGE_STRATEGY?: OverrideMergeStrategyType
9889
FEATURE_DEFAULT_LANDING_RB_ENABLE?: boolean
99-
FEATURE_CLUSTER_MAP_ENABLE?: boolean
10090
FEATURE_ACTION_AUDIOS_ENABLE?: boolean
10191
/**
10292
* If true, the experimental theming feature is enabled
10393
*
10494
* @default false
10595
*/
10696
FEATURE_EXPERIMENTAL_THEMING_ENABLE?: boolean
97+
98+
// ================== Feature flags for the enterprise release ==================
99+
/**
100+
* Enable Image promotion feature
101+
*
102+
* @default false
103+
*/
104+
FEATURE_IMAGE_PROMOTION_ENABLE?: boolean
105+
/**
106+
* Enable environment list for scoped variables
107+
*
108+
* @default false
109+
*/
110+
FEATURE_SCOPED_VARIABLE_ENVIRONMENT_LIST_ENABLE?: boolean
111+
/**
112+
* If false, Enable release feature
113+
*
114+
* @default true
115+
*/
116+
HIDE_RELEASES?: boolean
117+
/**
118+
* Enable resource watcher
119+
*
120+
* @default true
121+
*/
122+
HIDE_RESOURCE_WATCHER?: boolean
123+
/**
124+
* Enable config drift
125+
*
126+
* @default false
127+
*/
128+
FEATURE_CONFIG_DRIFT_ENABLE: boolean
129+
/**
130+
* Enable swap traffic (blue green deployment)
131+
*
132+
* @default false
133+
*/
134+
FEATURE_SWAP_TRAFFIC_ENABLE?: boolean
135+
/**
136+
* Enable mandatory plugins for cd
137+
*
138+
* @default true
139+
*/
140+
FEATURE_CD_MANDATORY_PLUGINS_ENABLE?: boolean
141+
/**
142+
* Enable cluster map
143+
*
144+
* @default true
145+
*/
146+
FEATURE_CLUSTER_MAP_ENABLE?: boolean
147+
/**
148+
* @default true
149+
*/
150+
HIDE_NETWORK_STATUS_INTERFACE?: boolean
151+
/**
152+
* @default 300000
153+
*/
154+
SYSTEM_CONTROLLER_LISTING_TIMEOUT?: number
107155
}
108156
declare global {
109157
interface Window {

0 commit comments

Comments
 (0)