Radish alpha
r
radicle-explorer
Radicle web interface
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
Patch icon in revision timeline reflects patch state color
Sebastian Martinez committed 2 years ago
commit a3a7f09181e1554f62381b63d3410093ffbc0eaf
parent 79b1e9c9f8fa6f52c8c9f976c5077e682d6ee5a1
2 files changed +23 -2
modified src/views/projects/Cob/Revision.svelte
@@ -1,5 +1,10 @@
<script lang="ts">
- 
  import type { BaseUrl, DiffResponse, Verdict } from "@httpd-client";
+ 
  import type {
+ 
    BaseUrl,
+ 
    DiffResponse,
+ 
    PatchState,
+ 
    Verdict,
+ 
  } from "@httpd-client";

  import type { Timeline } from "@app/views/projects/Patch.svelte";



  import * as utils from "@app/lib/utils";
@@ -25,6 +30,7 @@
  export let baseUrl: BaseUrl;

  export let expanded: boolean = false;

  export let patchId: string;
+ 
  export let patchState: PatchState;

  export let projectHead: string;

  export let projectDefaultBranch: string;

  export let projectId: string;
@@ -63,6 +69,20 @@
    }

  }
+ 
  function badgeColor({ status }: PatchState): string | undefined {
+ 
    if (status === "draft") {
+ 
      return "var(--color-foreground-gray)";
+ 
    } else if (status === "open") {
+ 
      return "var(--color-foreground-success)";
+ 
    } else if (status === "archived") {
+ 
      return "var(--color-foreground-yellow)";
+ 
    } else if (status === "merged") {
+ 
      return "var(--color-fill-primary)";
+ 
    } else {
+ 
      return "var(--color-foreground-success)";
+ 
    }
+ 
  }
+ 


  let response: DiffResponse | undefined = undefined;

  let error: any | undefined = undefined;

  let loading: boolean = false;
@@ -304,7 +324,7 @@
          <div

            class="authorship-header"

            style:border-top="1px solid var(--color-fill-separator)">
- 
            <div style:color="var(--color-fill-success)">
+ 
            <div style:color={badgeColor(patchState)}>

              <IconSmall name="patch" />

            </div>
modified src/views/projects/Patch.svelte
@@ -776,6 +776,7 @@
            on:react={event => handleReaction(revisionId, event)}

            on:reply={createReply}

            patchId={patch.id}
+ 
            patchState={patch.state}

            expanded={index === patch.revisions.length - 1}

            previousRevId={previousRevision?.id}

            previousRevOid={previousRevision?.oid}>