Merge branch '329935-devops-adoption-add-codeowners-to-the-adoption-table-fe' into 'master'

Resolve "[DevOps Adoption] Add Codeowners to the adoption table (FE)"

See merge request gitlab-org/gitlab!62072

doc/user/admin_area/analytics/dev_ops_report.md

@@ -40,13 +40,14 @@ collected before this feature is available.
 
 The DevOps Adoption tab shows you which groups within your organization are using the most essential features of GitLab:
 
+- Approvals
+- Code owners
+- Deployments
 - Issues
 - Merge Requests
-- Approvals
-- Runners
 - Pipelines
-- Deploys
-- Scanning
+- Runners
+- Scans
 
 Buttons to manage your groups appear in the DevOps Adoption section of the page.
 

doc/user/group/devops_adoption/index.md

@@ -25,6 +25,7 @@ To access Group DevOps Adoption, go to your group and select **Analytics > DevOp
 Group DevOps Adoption shows you how individual groups and sub-groups within your organization use the following features:
 
 - Approvals
+- Code owners
 - Deployments
 - Issues
 - Merge Requests

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

@@ -188,7 +188,7 @@ export default {
           v-if="item.latestSnapshot"
           :key="col.key"
           :data-testid="col.testId"
-          :enabled="item.latestSnapshot[col.key]"
+          :enabled="Boolean(item.latestSnapshot[col.key])"
         />
       </template>
 

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

@@ -108,21 +108,27 @@ export const DEVOPS_ADOPTION_TABLE_CONFIGURATION = [
       {
         key: 'issueOpened',
         label: s__('DevopsAdoption|Issues'),
-        tooltip: s__('DevopsAdoption|At least 1 issue opened'),
+        tooltip: s__('DevopsAdoption|At least one issue opened'),
         testId: 'issuesCol',
       },
       {
         key: 'mergeRequestOpened',
         label: s__('DevopsAdoption|MRs'),
-        tooltip: s__('DevopsAdoption|At least 1 MR opened'),
+        tooltip: s__('DevopsAdoption|At least one MR opened'),
         testId: 'mrsCol',
       },
       {
         key: 'mergeRequestApproved',
         label: s__('DevopsAdoption|Approvals'),
-        tooltip: s__('DevopsAdoption|At least 1 approval on an MR'),
+        tooltip: s__('DevopsAdoption|At least one approval on an MR'),
         testId: 'approvalsCol',
       },
+      {
+        key: 'codeOwnersUsedCount',
+        label: s__('DevopsAdoption|Code owners'),
+        tooltip: s__('DevopsAdoption|Code owners enabled for at least one project'),
+        testId: 'codeownersCol',
+      },
     ],
   },
   {
@@ -132,7 +138,7 @@ export const DEVOPS_ADOPTION_TABLE_CONFIGURATION = [
       {
         key: 'securityScanSucceeded',
         label: s__('DevopsAdoption|Scanning'),
-        tooltip: s__('DevopsAdoption|At least 1 security scan of any type run in pipeline'),
+        tooltip: s__('DevopsAdoption|At least one security scan of any type run in pipeline'),
         testId: 'scanningCol',
       },
     ],
@@ -150,13 +156,13 @@ export const DEVOPS_ADOPTION_TABLE_CONFIGURATION = [
       {
         key: 'pipelineSucceeded',
         label: s__('DevopsAdoption|Pipelines'),
-        tooltip: s__('DevopsAdoption|At least 1 pipeline successfully run'),
+        tooltip: s__('DevopsAdoption|At least one pipeline successfully run'),
         testId: 'pipelinesCol',
       },
       {
         key: 'deploySucceeded',
         label: s__('DevopsAdoption|Deploys'),
-        tooltip: s__('DevopsAdoption|At least 1 deploy'),
+        tooltip: s__('DevopsAdoption|At least one deploy'),
         testId: 'deploysCol',
       },
     ],

ee/app/assets/javascripts/analytics/devops_report/devops_adoption/graphql/queries/devops_adoption_segments.query.graphql

@@ -14,6 +14,7 @@ query devopsAdoptionSegments($parentNamespaceId: NamespaceID, $directDescendants
         deploySucceeded
         securityScanSucceeded
         recordedAt
+        codeOwnersUsedCount
       }
       namespace {
         fullName

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

@@ -55,6 +55,7 @@ export const devopsAdoptionSegmentsData = {
         pipelineSucceeded: false,
         deploySucceeded: false,
         securityScanSucceeded: false,
+        codeOwnersUsedCount: 0,
         recordedAt: '2020-10-31T23:59:59Z',
         __typename: 'latestSnapshot',
       },
@@ -87,20 +88,25 @@ export const devopsAdoptionTableHeaders = [
   {
     index: 1,
     label: 'Issues',
-    tooltip: 'At least 1 issue opened',
+    tooltip: 'At least one issue opened',
   },
   {
     index: 2,
     label: 'MRs',
-    tooltip: 'At least 1 MR opened',
+    tooltip: 'At least one MR opened',
   },
   {
     index: 3,
     label: 'Approvals',
-    tooltip: 'At least 1 approval on an MR',
+    tooltip: 'At least one approval on an MR',
   },
   {
     index: 4,
+    label: 'Code owners',
+    tooltip: 'Code owners enabled for at least one project',
+  },
+  {
+    index: 5,
     label: '',
     tooltip: null,
   },

locale/gitlab.pot

@@ -11366,22 +11366,28 @@ msgstr ""
 msgid "DevopsAdoption|Are you sure that you would like to remove %{name} from the table?"
 msgstr ""
 
-msgid "DevopsAdoption|At least 1 MR opened"
+msgid "DevopsAdoption|At least one MR opened"
 msgstr ""
 
-msgid "DevopsAdoption|At least 1 approval on an MR"
+msgid "DevopsAdoption|At least one approval on an MR"
 msgstr ""
 
-msgid "DevopsAdoption|At least 1 deploy"
+msgid "DevopsAdoption|At least one deploy"
 msgstr ""
 
-msgid "DevopsAdoption|At least 1 issue opened"
+msgid "DevopsAdoption|At least one issue opened"
 msgstr ""
 
-msgid "DevopsAdoption|At least 1 pipeline successfully run"
+msgid "DevopsAdoption|At least one pipeline successfully run"
 msgstr ""
 
-msgid "DevopsAdoption|At least 1 security scan of any type run in pipeline"
+msgid "DevopsAdoption|At least one security scan of any type run in pipeline"
+msgstr ""
+
+msgid "DevopsAdoption|Code owners"
+msgstr ""
+
+msgid "DevopsAdoption|Code owners enabled for at least one project"
 msgstr ""
 
 msgid "DevopsAdoption|Confirm remove Group"