Commit 727520d2 authored by Brandon Labuschagne's avatar Brandon Labuschagne Committed by Miguel Rincon

DevOps Adoption - Add Dependency Scanning to the adoption table

parent 10e2c372
...@@ -47,6 +47,7 @@ feature is available. ...@@ -47,6 +47,7 @@ feature is available.
> - The Overview tab [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/330401) in GitLab 14.1. > - The Overview tab [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/330401) in GitLab 14.1.
> - DAST and SAST metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/328033) in GitLab 14.1. > - DAST and SAST metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/328033) in GitLab 14.1.
> - Fuzz Testing metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/330398) in GitLab 14.2. > - Fuzz Testing metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/330398) in GitLab 14.2.
> - Dependency Scanning metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/328034) in GitLab 14.2.
DevOps Adoption shows you which groups in your organization are using the most essential features of GitLab: DevOps Adoption shows you which groups in your organization are using the most essential features of GitLab:
...@@ -57,8 +58,9 @@ DevOps Adoption shows you which groups in your organization are using the most e ...@@ -57,8 +58,9 @@ DevOps Adoption shows you which groups in your organization are using the most e
- Merge requests - Merge requests
- Sec - Sec
- DAST - DAST
- SAST - Dependency Scanning
- Fuzz Testing - Fuzz Testing
- SAST
- Ops - Ops
- Deployments - Deployments
- Pipelines - Pipelines
......
...@@ -11,6 +11,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w ...@@ -11,6 +11,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
> - The Overview tab [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/330401) in GitLab 14.1. > - The Overview tab [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/330401) in GitLab 14.1.
> - DAST and SAST metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/328033) in GitLab 14.1. > - DAST and SAST metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/328033) in GitLab 14.1.
> - Fuzz Testing metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/330398) in GitLab 14.2. > - Fuzz Testing metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/330398) in GitLab 14.2.
> - Dependency Scanning metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/328034) in GitLab 14.2.
Prerequisites: Prerequisites:
...@@ -27,8 +28,9 @@ Group DevOps Adoption shows you how individual groups and sub-groups within your ...@@ -27,8 +28,9 @@ Group DevOps Adoption shows you how individual groups and sub-groups within your
- Merge requests - Merge requests
- Sec - Sec
- DAST - DAST
- SAST - Dependency Scanning
- Fuzz Testing - Fuzz Testing
- SAST
- Ops - Ops
- Deployments - Deployments
- Pipelines - Pipelines
......
...@@ -40,8 +40,10 @@ const formatter = (value, key, item) => { ...@@ -40,8 +40,10 @@ const formatter = (value, key, item) => {
return 0; return 0;
}; };
const thClass = ['gl-bg-white!', 'gl-text-gray-400'];
const fieldOptions = { const fieldOptions = {
thClass: 'gl-bg-white! gl-text-gray-400', thClass,
thAttr: { 'data-testid': TABLE_TEST_IDS_HEADERS }, thAttr: { 'data-testid': TABLE_TEST_IDS_HEADERS },
formatter, formatter,
sortable: true, sortable: true,
...@@ -105,6 +107,7 @@ export default { ...@@ -105,6 +107,7 @@ export default {
key: 'name', key: 'name',
label: I18N_GROUP_COL_LABEL, label: I18N_GROUP_COL_LABEL,
...fieldOptions, ...fieldOptions,
thClass: ['gl-w-grid-size-30', ...thClass],
}, },
...this.cols.map((item) => ({ ...this.cols.map((item) => ({
...item, ...item,
......
...@@ -122,15 +122,20 @@ export const DEVOPS_ADOPTION_TABLE_CONFIGURATION = [ ...@@ -122,15 +122,20 @@ export const DEVOPS_ADOPTION_TABLE_CONFIGURATION = [
tooltip: s__('DevopsAdoption|DAST enabled for at least one project'), tooltip: s__('DevopsAdoption|DAST enabled for at least one project'),
}, },
{ {
key: 'sastEnabledCount', key: 'dependencyScanningEnabledCount',
label: s__('DevopsAdoption|SAST'), label: s__('DevopsAdoption|Dependency Scanning'),
tooltip: s__('DevopsAdoption|SAST enabled for at least one project'), tooltip: s__('DevopsAdoption|Dependency Scanning enabled for at least one project'),
}, },
{ {
key: 'coverageFuzzingEnabledCount', key: 'coverageFuzzingEnabledCount',
label: s__('DevopsAdoption|Fuzz Testing'), label: s__('DevopsAdoption|Fuzz Testing'),
tooltip: s__('DevopsAdoption|Fuzz Testing enabled for at least one project'), tooltip: s__('DevopsAdoption|Fuzz Testing enabled for at least one project'),
}, },
{
key: 'sastEnabledCount',
label: s__('DevopsAdoption|SAST'),
tooltip: s__('DevopsAdoption|SAST enabled for at least one project'),
},
], ],
}, },
{ {
......
...@@ -10,4 +10,5 @@ fragment LatestSnapshot on DevopsAdoptionSnapshot { ...@@ -10,4 +10,5 @@ fragment LatestSnapshot on DevopsAdoptionSnapshot {
sastEnabledCount sastEnabledCount
dastEnabledCount dastEnabledCount
coverageFuzzingEnabledCount coverageFuzzingEnabledCount
dependencyScanningEnabledCount
} }
...@@ -44,6 +44,7 @@ export const devopsAdoptionNamespaceData = { ...@@ -44,6 +44,7 @@ export const devopsAdoptionNamespaceData = {
sastEnabledCount: 0, sastEnabledCount: 0,
dastEnabledCount: 0, dastEnabledCount: 0,
coverageFuzzingEnabledCount: 0, coverageFuzzingEnabledCount: 0,
dependencyScanningEnabledCount: 0,
recordedAt: '2020-10-31T23:59:59Z', recordedAt: '2020-10-31T23:59:59Z',
__typename: 'latestSnapshot', __typename: 'latestSnapshot',
}, },
...@@ -127,12 +128,16 @@ export const overallAdoptionData = { ...@@ -127,12 +128,16 @@ export const overallAdoptionData = {
}, },
{ {
adopted: false, adopted: false,
title: 'SAST', title: 'Dependency Scanning',
}, },
{ {
adopted: false, adopted: false,
title: 'Fuzz Testing', title: 'Fuzz Testing',
}, },
{
adopted: false,
title: 'SAST',
},
{ {
adopted: false, adopted: false,
title: 'Deploys', title: 'Deploys',
......
...@@ -11267,6 +11267,12 @@ msgstr "" ...@@ -11267,6 +11267,12 @@ msgstr ""
msgid "DevopsAdoption|DAST enabled for at least one project" msgid "DevopsAdoption|DAST enabled for at least one project"
msgstr "" msgstr ""
msgid "DevopsAdoption|Dependency Scanning"
msgstr ""
msgid "DevopsAdoption|Dependency Scanning enabled for at least one project"
msgstr ""
msgid "DevopsAdoption|Deploys" msgid "DevopsAdoption|Deploys"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment