Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/static_src/react/issue-wizard/IssueWizardUtils.tsx b/static_src/react/issue-wizard/IssueWizardUtils.tsx
index e709115..f94ab3a 100644
--- a/static_src/react/issue-wizard/IssueWizardUtils.tsx
+++ b/static_src/react/issue-wizard/IssueWizardUtils.tsx
@@ -1,4 +1,4 @@
-// Copyright 2022 The Chromium Authors. All rights reserved.
+// Copyright 2022 The Chromium Authors
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -126,18 +126,20 @@
export function buildIssueLabels(category: string, osName: string, chromeVersion: string, configLabels: Array<string> | null | undefined): Array<any> {
const labels = [
- {label:'via-wizard-'+category},
+ {label:'Via-Wizard'},
{label:'Pri-2'},
];
const os = osName.split(' ')[0];
- if (os !== 'Unknown/Other') {
+ if (os !== 'Unknown/Other' && category !== 'Security') {
labels.push({
label: 'OS-'+os
})
}
const mainChromeVersion = chromeVersion.split('.').length > 0 ? chromeVersion.split('.')[0] : null;
- if (mainChromeVersion !== null) {
+ // Label creation is frozen for Chromium in Monorail, and Needs-Triage-M121 and up don't exist.
+ // So, don't add it in that case.
+ if (mainChromeVersion !== null && parseInt(mainChromeVersion) < 121) {
labels.push({
label:'Needs-Triage-M'+mainChromeVersion
});