Merge branch...

Merge branch '328034-devops-adoption-add-dependency-scanning-to-the-adoption-table-fe' into 'master'

DevOps Adoption - Add Dependency Scanning to the adoption table

See merge request gitlab-org/gitlab!66602

doc/user/admin_area/analytics/dev_ops_report.md

@@ -47,6 +47,7 @@ feature is available.
 > - 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.
 > - 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:
 
@@ -57,8 +58,9 @@ DevOps Adoption shows you which groups in your organization are using the most e
   - Merge requests
 - Sec
   - DAST
-  - SAST
+  - Dependency Scanning
   - Fuzz Testing
+  - SAST
 - Ops
   - Deployments
   - Pipelines

doc/user/group/devops_adoption/index.md

@@ -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.
 > - 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.
+> - Dependency Scanning metrics [added](https://gitlab.com/gitlab-org/gitlab/-/issues/328034) in GitLab 14.2.
 
 Prerequisites:
 
@@ -27,8 +28,9 @@ Group DevOps Adoption shows you how individual groups and sub-groups within your
   - Merge requests
 - Sec
   - DAST
-  - SAST
+  - Dependency Scanning
   - Fuzz Testing
+  - SAST
 - Ops
   - Deployments
   - Pipelines

ee/app/assets/javascripts/analytics/devops_report/devops_adoption/components/devops_adoption_table.vue

@@ -40,8 +40,10 @@ const formatter = (value, key, item) => {
   return 0;
 };
 
+const thClass = ['gl-bg-white!', 'gl-text-gray-400'];
+
 const fieldOptions = {
-  thClass: 'gl-bg-white! gl-text-gray-400',
+  thClass,
   thAttr: { 'data-testid': TABLE_TEST_IDS_HEADERS },
   formatter,
   sortable: true,
@@ -105,6 +107,7 @@ export default {
           key: 'name',
           label: I18N_GROUP_COL_LABEL,
           ...fieldOptions,
+          thClass: ['gl-w-grid-size-30', ...thClass],
         },
         ...this.cols.map((item) => ({
           ...item,

ee/app/assets/javascripts/analytics/devops_report/devops_adoption/constants.js

@@ -122,15 +122,20 @@ export const DEVOPS_ADOPTION_TABLE_CONFIGURATION = [
         tooltip: s__('DevopsAdoption|DAST enabled for at least one project'),
       },
       {
-        key: 'sastEnabledCount',
-        label: s__('DevopsAdoption|SAST'),
-        tooltip: s__('DevopsAdoption|SAST enabled for at least one project'),
+        key: 'dependencyScanningEnabledCount',
+        label: s__('DevopsAdoption|Dependency Scanning'),
+        tooltip: s__('DevopsAdoption|Dependency Scanning enabled for at least one project'),
       },
       {
         key: 'coverageFuzzingEnabledCount',
         label: s__('DevopsAdoption|Fuzz Testing'),
         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'),
+      },
     ],
   },
   {

ee/app/assets/javascripts/analytics/devops_report/devops_adoption/graphql/fragments/latest_snapshot.fragment.graphql

@@ -10,4 +10,5 @@ fragment LatestSnapshot on DevopsAdoptionSnapshot {
   sastEnabledCount
   dastEnabledCount
   coverageFuzzingEnabledCount
+  dependencyScanningEnabledCount
 }

ee/spec/frontend/analytics/devops_report/devops_adoption/mock_data.js

@@ -44,6 +44,7 @@ export const devopsAdoptionNamespaceData = {
         sastEnabledCount: 0,
         dastEnabledCount: 0,
         coverageFuzzingEnabledCount: 0,
+        dependencyScanningEnabledCount: 0,
         recordedAt: '2020-10-31T23:59:59Z',
         __typename: 'latestSnapshot',
       },
@@ -127,12 +128,16 @@ export const overallAdoptionData = {
     },
     {
       adopted: false,
-      title: 'SAST',
+      title: 'Dependency Scanning',
     },
     {
       adopted: false,
       title: 'Fuzz Testing',
     },
+    {
+      adopted: false,
+      title: 'SAST',
+    },
     {
       adopted: false,
       title: 'Deploys',

locale/gitlab.pot

@@ -11267,6 +11267,12 @@ msgstr ""
 msgid "DevopsAdoption|DAST enabled for at least one project"
 msgstr ""
 
+msgid "DevopsAdoption|Dependency Scanning"
+msgstr ""
+
+msgid "DevopsAdoption|Dependency Scanning enabled for at least one project"
+msgstr ""
+
 msgid "DevopsAdoption|Deploys"
 msgstr ""