Fix: [code-1731] add vulnerabilityScanning behind ff for code and gitness (#1191)

This commit is contained in:
Ritik Kapoor 2024-04-17 13:41:35 +00:00 committed by Harness
parent 3c0a494b16
commit b55fce19cd
2 changed files with 77 additions and 73 deletions

View File

@ -37,8 +37,7 @@ import css from './RepositorySettings.module.scss'
export default function RepositorySettings() {
const { repoMetadata, error, loading, refetch, settingSection, gitRef, resourcePath } = useGetRepositoryMetadata()
const history = useHistory()
const { routes, hooks, standalone } = useAppContext()
const { SEMANTIC_SEARCH_ENABLED } = hooks?.useFeatureFlags()
const { routes } = useAppContext()
const [activeTab, setActiveTab] = React.useState<string>(settingSection || SettingsTab.general)
const { getString } = useStrings()
const { isRepositoryEmpty } = useGetResourceContent({
@ -67,6 +66,11 @@ export default function RepositorySettings() {
id: SettingsTab.branchProtection,
title: getString('branchProtection.title'),
panel: <BranchProtectionListing activeTab={activeTab} />
},
{
id: SettingsTab.security,
title: getString('security'),
panel: <SecurityScanSettings repoMetadata={repoMetadata} activeTab={activeTab} />
}
// {
// id: SettingsTab.webhooks,
@ -78,13 +82,6 @@ export default function RepositorySettings() {
// )
// }
]
if (SEMANTIC_SEARCH_ENABLED && !standalone) {
tabListArray.push({
id: SettingsTab.security,
title: getString('security'),
panel: <SecurityScanSettings repoMetadata={repoMetadata} activeTab={activeTab} />
})
}
return (
<Container className={css.main}>
<RepositoryPageHeader

View File

@ -28,6 +28,7 @@ import {
} from '@harnessio/uicore'
import cx from 'classnames'
import { useGet, useMutate } from 'restful-react'
import { Render } from 'react-jsx-match'
import type { FormikState } from 'formik'
import { Color, FontVariation } from '@harnessio/design-system'
import type { TypesRepository } from 'services/code'
@ -53,6 +54,7 @@ interface FormData {
const SecurityScanSettings = (props: SecurityScanProps) => {
const { repoMetadata, activeTab } = props
const { hooks, standalone, routingId } = useAppContext()
const { CODE_SECURITY_SCANNING_ON_PUSH } = hooks?.useFeatureFlags()
const { getString } = useStrings()
const { showError, showSuccess } = useToaster()
const space = useGetSpaceParam()
@ -142,6 +144,7 @@ const SecurityScanSettings = (props: SecurityScanProps) => {
<Text className={css.text}>{getString('securitySettings.scanningSecretDesc')}</Text>
</Layout.Horizontal>
</Container>
<Render when={!standalone && CODE_SECURITY_SCANNING_ON_PUSH}>
<Container padding="medium" margin="medium" className={css.generalContainer}>
<Layout.Horizontal
spacing={'medium'}
@ -158,9 +161,12 @@ const SecurityScanSettings = (props: SecurityScanProps) => {
<Container className={cx(formik.values.vulnerabilityScanEnable && css.toggle)}>
<Layout.Horizontal spacing={'medium'} flex={{ alignItems: 'center' }}>
<Text className={css.title}>{getString('securitySettings.vulnerabilityScanning')}</Text>
<Text className={css.text}>{getString('securitySettings.vulnerabilityScanningDesc')}</Text>
<Text className={css.text}>
{getString('securitySettings.vulnerabilityScanningDesc')}
</Text>
</Layout.Horizontal>
</Container>
{formik.values.vulnerabilityScanEnable && (
<Container margin={{ top: 'medium' }}>
<FormInput.RadioGroup
@ -207,6 +213,7 @@ const SecurityScanSettings = (props: SecurityScanProps) => {
</Layout.Vertical>
</Layout.Horizontal>
</Container>
</Render>
</Layout.Vertical>
<Layout.Horizontal margin={'medium'} spacing={'medium'}>
<Button