Merge pull request #730 from Drulikar/antilabeling

Do not test merge labeling

Author: Cyberboss

src/components/utils/TestMergeRow.tsx

@@ -157,11 +157,16 @@ export default function TestMergeRow({
                         style={{ backgroundColor: colorMap[pr.state] }}>
                         {pr.state}
                     </Badge>
-                    {pr.testmergelabel ? (
+                    {pr.testmergelabel && !pr.antitestmergelabel ? (
                         <Badge pill className="text-white text-capitalize mr-2" variant="primary">
                             <FormattedMessage id="view.instance.repo.testmergelabel" />
                         </Badge>
                     ) : null}
+                    {pr.antitestmergelabel ? (
+                        <Badge pill className="text-white text-capitalize mr-2" variant="danger">
+                            <FormattedMessage id="view.instance.repo.antitestmergelabel" />
+                        </Badge>
+                    ) : null}
                     {pr.mergeable === false ? (
                         <Badge pill className="text-white text-capitalize mr-2" variant="danger">
                             <FormattedMessage id="view.instance.repo.conflictlabel" />

src/components/views/Instance/Edit/Repository.tsx

@@ -960,6 +960,9 @@ class Repository extends React.Component<IProps, IState> {
                 if (a.testmergelabel !== b.testmergelabel) {
                     return a.testmergelabel ? -1 : 1;
                 }
+                if (a.antitestmergelabel !== b.antitestmergelabel) {
+                    return a.antitestmergelabel ? -1 : 1;
+                }
                 if (a.mergeable !== b.mergeable) {
                     return a.mergeable ? -1 : 1;
                 }

src/translations/locales/en.json

@@ -424,6 +424,7 @@
     "view.instance.repo.manual.desc": "Use this box to manually test merge a pull/merge request by entering its number and clicking \"Add Test Merge\"",
     "view.instance.repo.addmanual": "Add Test Merge",
     "view.instance.repo.testmergelabel": "Labelled",
+    "view.instance.repo.antitestmergelabel": "Block Labelled",
     "view.instance.repo.conflictlabel": "Merge Conflict",
     "view.instance.repo.norepoinfo": "You lack the permission to display information about the repository",
     "view.instance.repo.delete.title": "Delete Repository",

src/utils/GithubClient.ts

@@ -35,6 +35,7 @@ export interface PullRequest {
     head: string;
     tail: string;
     testmergelabel: boolean;
+    antitestmergelabel: boolean;
     mergeable: boolean | null;
 }
 
@@ -230,6 +231,11 @@ const e = new (class GithubClient extends TypedEmitter<IEvents> {
                     label.name?.toLowerCase().includes("testmerge") ||
                     label.name?.toLowerCase().includes("test merge")
             ),
+            antitestmergelabel: pr.labels.some(
+                label =>
+                    label.name?.toLowerCase().includes("do not testmerge") ||
+                    label.name?.toLowerCase().includes("do not test merge")
+            ),
             mergeable: pr.mergeable
         };
     }
@@ -254,6 +260,11 @@ const e = new (class GithubClient extends TypedEmitter<IEvents> {
                     label.name?.toLowerCase().includes("testmerge") ||
                     label.name?.toLowerCase().includes("test merge")
             ),
+            antitestmergelabel: pr.labels.some(
+                label =>
+                    label.name?.toLowerCase().includes("do not testmerge") ||
+                    label.name?.toLowerCase().includes("do not test merge")
+            ),
             mergeable: null
         };
     }