Adds merge conflict label badge

src/components/utils/TestMergeRow.tsx

@@ -161,6 +161,11 @@ export default function TestMergeRow({
                             <FormattedMessage id="view.instance.repo.testmergelabel" />
                         </Badge>
                     ) : null}
+                    {pr.conflictlabel ? (
+                        <Badge pill className="text-white text-capitalize mr-2" variant="danger">
+                            <FormattedMessage id="view.instance.repo.conflictlabel" />
+                        </Badge>
+                    ) : null}
                 </td>
                 <td>
                     <a href={pr.link} target="_blank" rel="noreferrer">

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

@@ -958,6 +958,9 @@ class Repository extends React.Component<IProps, IState> {
                 if (a.testmergelabel !== b.testmergelabel) {
                     return a.testmergelabel ? -1 : 1;
                 }
+                if (a.conflictlabel !== b.conflictlabel) {
+                    return a.conflictlabel ? 1 : -1;
+                }
                 return a.number - b.number;
             }) ?? [];
         const filteredPendingActions = sortedPRs

src/translations/locales/en.json

@@ -416,6 +416,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.conflictlabel": "Merge Conflict",
     "view.instance.repo.norepoinfo": "You lack the permission to display information about the repository",
     "view.instance.repo.delete.title": "Delete Repository",
     "view.instance.repo.delete.desc": "This will delete the local copy of the repository. Instance settings, code modifications, event scripts and static files will be preserved.",

src/utils/GithubClient.ts

@@ -34,6 +34,7 @@ export interface PullRequest {
     head: string;
     tail: string;
     testmergelabel: boolean;
+    conflictlabel: boolean;
 }
 
 type ExtractArrayType<A> = A extends Array<infer ArrayType> ? ArrayType : never;
@@ -221,7 +222,8 @@ const e = new (class GithubClient extends TypedEmitter<IEvents> {
                 label =>
                     label.name?.toLowerCase().includes("testmerge") ||
                     label.name?.toLowerCase().includes("test merge")
-            )
+            ),
+            conflictlabel: pr.labels.some(label => label.name?.toLowerCase().includes("conflict"))
         };
     }