diff --git a/.gitlab/insights.yml b/.gitlab/insights.yml index 11c5d1627ea6471e2e5f1fa8e1f6195d7f44b7ff..429284ad0795e37a5882ab1e34544e48ccce20ab 100644 --- a/.gitlab/insights.yml +++ b/.gitlab/insights.yml @@ -6,7 +6,7 @@ issues: query: issuable_type: issue filter_labels: - - bug + - "type::bug" collection_labels: - P1 - P2 @@ -19,7 +19,7 @@ issues: query: issuable_type: issue filter_labels: - - bug + - "type::bug" collection_labels: - S1 - S2 diff --git a/app/assets/javascripts/application/query_strings.coffee b/app/assets/javascripts/application/query_strings.coffee index 465c2dc06f7d3d38f5332d84522909c112c7b352..1123132ac2ca5278d6fe82026b355fa5d2e3d3d9 100644 --- a/app/assets/javascripts/application/query_strings.coffee +++ b/app/assets/javascripts/application/query_strings.coffee @@ -1,17 +1,17 @@ @query_strings = IssuesScope: 'Issues', MergeRequestsScope: 'MergeRequests', - Teams: '["Manage", "Plan", "Create", "Package", "Serverless", "Fulfillment", "Release", "Verify", "Configure", "Monitor", "Secure", "Distribution", "Gitaly", "Geo", "Quality", "security", "gitter", "frontend"]', + Teams: '["Manage", "Plan", "Create", "Package", "Serverless", "Fulfillment", "Release", "Verify", "Configure", "Monitor", "Secure", "Distribution", "Gitaly", "Geo", "Quality", "type::security", "gitter", "frontend"]', Severities: '["S4", "S3", "S2", "S1"]', Priorities: '["P4", "P3", "P2", "P1"]', - Bugs: '["bug"]', - BugsPastSlo: '["bug", "missed-SLO"]', - CustomerBugsPastSlo: '["bug", "customer", "missed-SLO"]', - FeatureProposals: '["feature"]', + Bugs: '["type::bug"]', + BugsPastSlo: '["type::bug", "missed-SLO"]', + CustomerBugsPastSlo: '["type::bug", "customer", "missed-SLO"]', + FeatureProposals: '["type::feature"]', Regression: '["regression"]', RegressionMilestones: '["regression:11.0","regression:11.1","regression:11.2","regression:11.3","regression:11.4","regression:11.5", "regression:11.6", "regression:11.7", "regression:11.8", "regression:11.9", "regression:11.10", "regression:11.11", "regression:12.0"]', MissedDeliverable: '["missed-deliverable"]', MissedDeliverableMilestones: '["missed:11.0","missed:11.1","missed:11.2","missed:11.3","missed:11.4","missed:11.5", "missed:11.6", "missed:11.7", "missed:11.8", "missed:11.9", "missed:11.10", "missed:11.11", "missed:12.0"]' - MergeRequestCategories: '["Community contribution","security","bug","feature","backstage"]' + MergeRequestCategories: '["Community contribution","type::security","type::bug","type::feature","type::backstage"]' TeamMRWeeks: 12 TeamMRMonths: 24 diff --git a/app/assets/javascripts/application/time_to_close_bugs.coffee b/app/assets/javascripts/application/time_to_close_bugs.coffee index b367f0411249ed58ad8cf421c126ae4967e982fc..8258993f90e8db02fce38792b6e1ce78adc419a5 100644 --- a/app/assets/javascripts/application/time_to_close_bugs.coffee +++ b/app/assets/javascripts/application/time_to_close_bugs.coffee @@ -1,7 +1,7 @@ TimeToCloseBugsChart = (element) -> query = @queries.ScopedQuery(@queries.TimeToCloseIssues( 'Closed', - '["bug"]', + '["type::bug"]', @query_strings.TeamMRMonths )) @charts.ComboBarLineChart(element, query.query_string, query.view_string) @@ -9,7 +9,7 @@ TimeToCloseBugsChart = (element) -> TimeToCloseS1BugsChart = (element) -> query = @queries.ScopedQuery(@queries.TimeToCloseIssues( 'Closed', - '["bug", "S1"]', + '["type::bug", "S1"]', @query_strings.TeamMRMonths )) @charts.ComboBarLineChart(element, query.query_string, query.view_string) @@ -17,7 +17,7 @@ TimeToCloseS1BugsChart = (element) -> TimeToCloseS2BugsChart = (element) -> query = @queries.ScopedQuery(@queries.TimeToCloseIssues( 'Closed', - '["bug", "S2"]', + '["type::bug", "S2"]', @query_strings.TeamMRMonths )) @charts.ComboBarLineChart(element, query.query_string, query.view_string) @@ -25,7 +25,7 @@ TimeToCloseS2BugsChart = (element) -> TimeToCloseS1CustomerBugsChart = (element) -> query = @queries.ScopedQuery(@queries.TimeToCloseIssues( 'Closed', - '["bug", "S1", "customer"]', + '["type::bug", "S1", "customer"]', @query_strings.TeamMRMonths )) @charts.ComboBarLineChart(element, query.query_string, query.view_string) @@ -33,7 +33,7 @@ TimeToCloseS1CustomerBugsChart = (element) -> TimeToCloseS2CustomerBugsChart = (element) -> query = @queries.ScopedQuery(@queries.TimeToCloseIssues( 'Closed', - '["bug", "S2", "customer"]', + '["type::bug", "S2", "customer"]', @query_strings.TeamMRMonths )) @charts.ComboBarLineChart(element, query.query_string, query.view_string) diff --git a/lib/gitlab_insights.rb b/lib/gitlab_insights.rb index 70593b50858c3551c32346edbed8c01b81a3e274..adcbbdb83a9a8bd02466ca86be00c58552a58bce 100644 --- a/lib/gitlab_insights.rb +++ b/lib/gitlab_insights.rb @@ -49,11 +49,11 @@ module GitlabInsights "P2" => HIGH_COLOR, "P3" => MEDIUM_COLOR, "P4" => LOW_COLOR, - "feature" => PROPOSAL_COLOR, - "bug" => BUG_COLOR, - "security" => SECURITY_COLOR, + "type::feature" => PROPOSAL_COLOR, + "type::bug" => BUG_COLOR, + "type::security" => SECURITY_COLOR, "Community contribution" => COMMUNITY_CONTRIBUTION_COLOR, - "backstage" => DEFAULT_COLOR, + "type::backstage" => DEFAULT_COLOR, "Manage" => COLOR_SCHEME[:orange], "Plan" => COLOR_SCHEME[:green], "Create" => COLOR_SCHEME[:yellow], diff --git a/lib/gitlab_insights/resource_categorizer.rb b/lib/gitlab_insights/resource_categorizer.rb index c6044c8ec830dcb01c8781693368b12f298141f9..dff445f8469b6cae987b7fcd0d93975e37514dd9 100644 --- a/lib/gitlab_insights/resource_categorizer.rb +++ b/lib/gitlab_insights/resource_categorizer.rb @@ -14,7 +14,7 @@ module GitlabInsights return unless project.dev? return unless resource_type == :merge_requests - resource[:labels] << 'security' unless resource[:labels].include?('security') + resource[:labels] << 'type::security' unless resource[:labels].include?('type::security') end end end diff --git a/spec/lib/gitlab_insights/finders/time_to_close_issues_finder_spec.rb b/spec/lib/gitlab_insights/finders/time_to_close_issues_finder_spec.rb index 7d8a266542e5c724ef743684ae6d006f60a4f378..73f5d751fbf6a12191a1626f5f12d39349330dd4 100644 --- a/spec/lib/gitlab_insights/finders/time_to_close_issues_finder_spec.rb +++ b/spec/lib/gitlab_insights/finders/time_to_close_issues_finder_spec.rb @@ -12,25 +12,25 @@ RSpec.describe GitlabInsights::Finders::TimeToCloseIssuesFinder do let(:group) { create(:group) } let(:project) { create(:project, group: group) } let!(:issue1) { create(single_scope, - labels: ['bug','s1', 'customer'], + labels: ['type::bug','s1', 'customer'], state: 'closed', created_at: Date.new(2018,6,1), closed_at: Date.new(2018,6,10), project: project) } let!(:issue2) { create(single_scope, - labels: ['bug','s1', 'customer'], + labels: ['type::bug','s1', 'customer'], state: 'closed', created_at: Date.new(2018,6,1), closed_at: Date.new(2018,6,20), project: project) } let!(:issue3) { create(single_scope, - labels: ['bug','s1'], + labels: ['type::bug','s1'], state: 'closed', created_at: Date.new(2018,6,1), closed_at: Date.new(2018,6,30), project: project) } let!(:issue4) { create(single_scope, - labels: ['bug','s2'], + labels: ['type::bug','s2'], state: 'closed', created_at: Date.new(2018,6,1), closed_at: Date.new(2018,6,10), @@ -56,7 +56,7 @@ RSpec.describe GitlabInsights::Finders::TimeToCloseIssuesFinder do }.with_indifferent_access, ] - actual = subject.find({ filter_labels: ['bug']}) + actual = subject.find({ filter_labels: ['type::bug']}) expect(actual).to be_a(Array) @@ -83,7 +83,7 @@ RSpec.describe GitlabInsights::Finders::TimeToCloseIssuesFinder do }.with_indifferent_access, ] - actual = subject.find({ filter_labels: ['bug', 's1']}) + actual = subject.find({ filter_labels: ['type::bug', 's1']}) expect(actual).to be_a(Array) @@ -110,7 +110,7 @@ RSpec.describe GitlabInsights::Finders::TimeToCloseIssuesFinder do }.with_indifferent_access, ] - actual = subject.find({ filter_labels: ['bug', 's1', 'customer']}) + actual = subject.find({ filter_labels: ['type::bug', 's1', 'customer']}) expect(actual).to be_a(Array) diff --git a/spec/lib/gitlab_insights/resource_categorizer_spec.rb b/spec/lib/gitlab_insights/resource_categorizer_spec.rb index 5c5e40c3b82c7326ef14f61065712952ed4b755f..d0e8b5be1dca8dc2120a371bb934e67842f80bed 100644 --- a/spec/lib/gitlab_insights/resource_categorizer_spec.rb +++ b/spec/lib/gitlab_insights/resource_categorizer_spec.rb @@ -27,9 +27,9 @@ RSpec.describe GitlabInsights::ResourceCategorizer do let(:project) { create(:project, :dev, group: group) } it 'adds the security label' do - expect(resource[:labels]).not_to include('security') + expect(resource[:labels]).not_to include('type::security') - expect(subject[:labels]).to include('security') + expect(subject[:labels]).to include('type::security') end end end