Merge pull request #176 from devtron-labs/feat/bitbucket-dc

feat: add ssh and password type

Author: AbhishekA1509

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.0.86-beta-3",
+    "version": "0.0.86-beta-16",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -121,7 +121,9 @@ export const getWebhookEventIcon = (eventName: WebhookEventNameType) => {
 export const isNullOrUndefined = (value: unknown): boolean => value === null || value === undefined
 
 export const handleDisableSubmitOnEnter = (event: React.KeyboardEvent<HTMLFormElement>) => {
-    if (event.key === 'Enter') {
+    const isTextArea = event.target instanceof HTMLTextAreaElement
+
+    if (event.key === 'Enter' && !isTextArea) {
         event.preventDefault()
     }
 }

src/Shared/Helpers.tsx

@@ -312,13 +312,15 @@ export type AggregationKeysType = keyof typeof AggregationKeys
 export enum GitOpsAuthModeType {
     SSH = 'SSH',
     PASSWORD = 'PASSWORD',
+    SSH_AND_PASSWORD = 'PAT_AND_SSH',
 }
 
 export interface BaseGitOpsType {
     authMode: GitOpsAuthModeType
     sshKey: string
     sshHost: string
     username: string
+    token: string
 }
 
 export type GitOpsFieldKeyType =

src/Shared/types.ts

@@ -69,7 +69,6 @@ export interface customEnv {
     ENABLE_RESOURCE_SCAN?: boolean
     FEATURE_USER_DEFINED_GITOPS_REPO_ENABLE: boolean
     ENABLE_RESOURCE_SCAN_V2?: boolean
-    ENABLE_GITOPS_BITBUCKET_SOURCE: boolean
     HIDE_RESOURCE_WATCHER?: boolean
 }
 declare global {