commit debe6295050b075bf1ea987747e5d9e22c0df7cf
author Milutin Kristofic <milutin@google.com> Thu Oct 21 20:59:34 2021 +0200
committer Milutin Kristofic <milutin@google.com> Mon Oct 25 09:47:12 2021 +0200
tree 0db692188f859d9feef9e4ce6265e14a9433099b
parent 7e4d3ff70430a8582b3dabe605f387f5168029fe

Submit Requirements - associated override labels with requirement

Change-Id: I42b1a7f4e6824ca1878ee968c5fc3b1d1f863736

polygerrit-ui/app/utils/label-util.ts

diff --git a/polygerrit-ui/app/utils/label-util.ts b/polygerrit-ui/app/utils/label-util.ts
index c50bbe2..b95fa4d 100644
--- a/polygerrit-ui/app/utils/label-util.ts
+++ b/polygerrit-ui/app/utils/label-util.ts
@@ -204,19 +204,27 @@
   return;
 }
 
-export function extractAssociatedLabels(
-  requirement: SubmitRequirementResultInfo
-): string[] {
+function extractLabelsFrom(expression: string) {
   const pattern = new RegExp('label[0-9]*:([\\w-]+)', 'g');
   const labels = [];
   let match;
-  while (
-    (match = pattern.exec(
-      requirement.submittability_expression_result.expression
-    )) !== null
-  ) {
+  while ((match = pattern.exec(expression)) !== null) {
     labels.push(match[1]);
   }
+  return labels;
+}
+
+export function extractAssociatedLabels(
+  requirement: SubmitRequirementResultInfo
+): string[] {
+  let labels = extractLabelsFrom(
+    requirement.submittability_expression_result.expression
+  );
+  if (requirement.override_expression_result) {
+    labels = labels.concat(
+      extractLabelsFrom(requirement.override_expression_result.expression)
+    );
+  }
   return labels.filter(unique);
 }
 

polygerrit-ui/app/utils/label-util_test.ts

diff --git a/polygerrit-ui/app/utils/label-util_test.ts b/polygerrit-ui/app/utils/label-util_test.ts
index 9360688..2d59294 100644
--- a/polygerrit-ui/app/utils/label-util_test.ts
+++ b/polygerrit-ui/app/utils/label-util_test.ts
@@ -256,5 +256,18 @@
       const labels = extractAssociatedLabels(submitRequirement);
       assert.deepEqual(labels, ['Verified', 'Code-Review']);
     });
+    test('overridden label', () => {
+      const submitRequirement = {
+        ...createSubmitRequirementExpressionInfoWith(
+          'label:Verified=MAX -label:Verified=MIN'
+        ),
+        override_expression_result: {
+          ...createSubmitRequirementExpressionInfo(),
+          expression: 'label:Build-cop-override',
+        },
+      };
+      const labels = extractAssociatedLabels(submitRequirement);
+      assert.deepEqual(labels, ['Verified', 'Build-cop-override']);
+    });
   });
 });