Add Pull request status (#23)

AxaFrance · May 29, 2020 · a1d07db · a1d07db
1 parent 1e4a462
commit a1d07db
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 29 deletions.
diff --git a/src/components/Pullrequest/Pullrequest.scss b/src/components/Pullrequest/Pullrequest.scss
@@ -152,6 +152,11 @@
     border-color: red;
     color: red;
   }
+
+  &--auto-complete {
+    border-color: green;
+    color: green;
+  }
 }
 
 @media (prefers-color-scheme: dark) {

diff --git a/src/components/Pullrequest/Pullrequest.svelte b/src/components/Pullrequest/Pullrequest.svelte
@@ -30,32 +30,6 @@
 
   const openUrl = () => shell.openExternal(makeUrl(pullRequest));
 
-  const hasStatusLabel = pullrequest => (pullrequest.mergeStatus && pullrequest.mergeStatus === "conflicts") || pullrequest.isDraft;
-
-  const getStatusLabel = pullrequest => {
-    if (pullrequest.mergeStatus && pullrequest.mergeStatus === "conflicts") {
-      return 'Conflicts';
-    } 
-
-    if (pullrequest.isDraft) {
-      return 'Draft';
-    }
-
-    return '';
-  }
-
-  const getStatusStyle = pullrequest => {
-    if (pullrequest.mergeStatus && pullrequest.mergeStatus === "conflicts") {
-      return '--conflicts';
-    } 
-
-    if (pullrequest.isDraft) {
-      return '--draft';
-    }
-
-    return '';
-  }
-
   const getAvatarUrl = pr => getAvatar(pr.createdBy.id, pr.organizationName, pr.createdBy.descriptor);
 
   const getTime = pullrequest => {
@@ -100,9 +74,19 @@
       <span>{pullRequest.repository.project.name}</span>
     </h2>
     <h3 class="skz-pullrequest__title">
-      {#if hasStatusLabel(pullRequest)}
-        <span class="skz-pullrequest__status skz-pullrequest__status{getStatusStyle(pullRequest)}">
-          {getStatusLabel(pullRequest)}
+      {#if pullRequest.autoCompleteSetBy}
+        <span class="skz-pullrequest__status skz-pullrequest__status--auto-complete">
+          Auto complete
+        </span>
+      {/if}
+      {#if pullRequest.isDraft}
+        <span class="skz-pullrequest__status skz-pullrequest__status--draft">
+          Draft
+        </span>
+      {/if}
+      {#if pullRequest.mergeStatus && pullRequest.mergeStatus === 'conflicts'}
+        <span class="skz-pullrequest__status skz-pullrequest__status--conflicts">
+          Conflicts
         </span>
       {/if}
       {pullRequest.title}