Merge branch 'main' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/fluxCD

Author: arunjaindev

.eslintrc.cjs

@@ -108,6 +108,7 @@ module.exports = {
         'import/no-cycle': 'off',
         'import/prefer-default-export': 'off',
         'no-restricted-exports': 'off',
+        'import/named': 'off'
     },
     overrides: [
         {

package-lock.json

@@ -64,7 +64,6 @@
         "prettier": "^3.1.1",
         "react-ga4": "^1.4.1",
         "react-mde": "^11.5.0",
-        "react-select": "5.2.2",
         "react-toastify": "^8.2.0",
         "typescript": "^4.9.4",
         "vite": "^4.5.3",
@@ -74,6 +73,7 @@
         "vite-tsconfig-paths": "^4.3.2"
     },
     "peerDependencies": {
+        "react-select": "5.8.0",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
         "@rjsf/validator-ajv8": "^5.13.3",

package.json

@@ -59,6 +59,7 @@ export const URLS = {
     APP_TRIGGER: 'trigger',
     GLOBAL_CONFIG_DOCKER: '/global-config/docker',
     DEPLOYMENT_HISTORY_CONFIGURATIONS: '/configuration',
+    GLOBAL_CONFIG_SCOPED_VARIABLES: '/global-config/scoped-variables',
 }
 
 export const ROUTES = {

src/Common/Constants.ts

@@ -32,6 +32,8 @@ export const ResizableTagTextArea = ({
     dependentRef,
     dataTestId,
     handleKeyDown,
+    disabled,
+    disableOnBlurResizeToMinHeight,
 }: ResizableTagTextAreaProps) => {
     const [text, setText] = useState('')
 
@@ -41,7 +43,7 @@ export const ResizableTagTextArea = ({
 
     const handleChange = (event) => {
         setText(event.target.value)
-        onChange(event)
+        onChange?.(event)
     }
 
     const reInitHeight = () => {
@@ -69,9 +71,11 @@ export const ResizableTagTextArea = ({
     useThrottledEffect(reInitHeight, 500, [text])
 
     const handleOnBlur = (event) => {
-        refVar.current.style.height = `${minHeight}px`
-        if (dependentRef) {
-            dependentRef.current.style.height = `${minHeight}px`
+        if (!disableOnBlurResizeToMinHeight) {
+            refVar.current.style.height = `${minHeight}px`
+            if (dependentRef) {
+                dependentRef.current.style.height = `${minHeight}px`
+            }
         }
         onBlur && onBlur(event)
     }
@@ -95,6 +99,7 @@ export const ResizableTagTextArea = ({
             tabIndex={tabIndex}
             data-testid={dataTestId}
             onKeyDown={handleKeyDown}
+            disabled={disabled}
         />
     )
 }

src/Common/CustomTagSelector/ResizableTagTextArea.tsx

@@ -85,4 +85,6 @@ export interface ResizableTagTextAreaProps {
     dependentRef?: React.MutableRefObject<HTMLTextAreaElement>
     dataTestId?: string
     handleKeyDown?: any
+    disabled?: boolean
+    disableOnBlurResizeToMinHeight?: boolean
 }

src/Common/CustomTagSelector/Types.ts

@@ -235,6 +235,9 @@ export interface RadioInterface {
     showTippy?: boolean
     tippyContent?: any
     tippyPlacement?: string
+    /**
+     * If false would make radio group controlled
+     */
     canSelect?: boolean
     isDisabled?: boolean
     tippyClass?: string

src/Common/Types.ts

@@ -0,0 +1 @@
+export * from './types'

src/Pages/GlobalConfigurations/ScopedVariables/index.ts

@@ -0,0 +1,18 @@
+export enum ScopedVariablesFileViewType {
+    /**
+     * Used to show yaml editor for editing/creating variables
+     */
+    YAML = 'yaml',
+    /**
+     * Shows the variable list view
+     */
+    SAVED = 'variables',
+    /**
+     * Shows the variables in environment list view
+     */
+    ENVIRONMENT_LIST = 'environments',
+}
+
+export interface SavedVariablesViewParamsType {
+    currentView: ScopedVariablesFileViewType
+}

src/Pages/GlobalConfigurations/ScopedVariables/types.ts

@@ -16,3 +16,4 @@
 
 export * from './BuildInfra'
 export * from './Authorization'
+export * from './ScopedVariables'