From c5d5053f0cfb8b6e6da7b2f835ab715ba4d2892e Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Fri, 22 Jul 2022 12:03:49 +0200 Subject: [PATCH] Add patches Signed-off-by: Sebastian Martinez --- src/Address.svelte | 12 +- src/Async.svelte | 19 ++ ...sueAuthorship.svelte => Authorship.svelte} | 25 ++- .../IssueComment.svelte => Comment.svelte} | 27 ++- .../projects/Issue => }/Reactions.svelte | 0 src/Review.svelte | 44 +++++ src/base/projects/Commit.svelte | 49 ++--- src/base/projects/Header.svelte | 98 ++++++---- src/base/projects/History.svelte | 29 +-- src/base/projects/Issue.svelte | 112 ++++++----- src/base/projects/Issue/IssueTeaser.svelte | 14 +- src/base/projects/Issues.svelte | 24 +-- src/base/projects/Patch.svelte | 153 +++++++++++++++ src/base/projects/Patch/PatchFilter.svelte | 77 ++++++++ src/base/projects/Patch/PatchSideBar.svelte | 55 ++++++ src/base/projects/Patch/PatchTabBar.svelte | 95 +++++++++ src/base/projects/Patch/PatchTeaser.svelte | 125 ++++++++++++ src/base/projects/Patch/PatchTimeline.svelte | 78 ++++++++ src/base/projects/Patches.svelte | 57 ++++++ src/base/projects/Project.svelte | 30 ++- src/base/projects/ProjectRoute.svelte | 3 + .../projects/SourceBrowser/Changeset.svelte | 2 +- src/base/projects/View.svelte | 7 + src/cobs.ts | 31 +++ src/commit.ts | 13 +- src/patch.ts | 184 ++++++++++++++++++ src/project.ts | 21 +- 27 files changed, 1184 insertions(+), 200 deletions(-) create mode 100644 src/Async.svelte rename src/{base/projects/Issue/IssueAuthorship.svelte => Authorship.svelte} (62%) rename src/{base/projects/Issue/IssueComment.svelte => Comment.svelte} (73%) rename src/{base/projects/Issue => }/Reactions.svelte (100%) create mode 100644 src/Review.svelte create mode 100644 src/base/projects/Patch.svelte create mode 100644 src/base/projects/Patch/PatchFilter.svelte create mode 100644 src/base/projects/Patch/PatchSideBar.svelte create mode 100644 src/base/projects/Patch/PatchTabBar.svelte create mode 100644 src/base/projects/Patch/PatchTeaser.svelte create mode 100644 src/base/projects/Patch/PatchTimeline.svelte create mode 100644 src/base/projects/Patches.svelte create mode 100644 src/cobs.ts create mode 100644 src/patch.ts diff --git a/src/Address.svelte b/src/Address.svelte index 802f4834b..fd652bc3e 100644 --- a/src/Address.svelte +++ b/src/Address.svelte @@ -14,6 +14,8 @@ export let noAvatar = false; export let compact = false; export let small = false; + export let xsmall = false; + export let highlight = false; // This property allows components eg. Header.svelte to pass a resolved profile object. export let profile: Profile | null = null; @@ -54,9 +56,17 @@ .address a:hover { color: var(--color-foreground); } + .highlight { + color: var(--color-foreground-90); + font-weight: bold; + } -
+
{#if !noAvatar} {#if resolve && profile?.avatar} diff --git a/src/Async.svelte b/src/Async.svelte new file mode 100644 index 000000000..38856f5b1 --- /dev/null +++ b/src/Async.svelte @@ -0,0 +1,19 @@ + + +{#await fetch} + +{:then result} + +{:catch err} +
+
+
+ API request to {err.url} failed. +
+
+
+{/await} diff --git a/src/base/projects/Issue/IssueAuthorship.svelte b/src/Authorship.svelte similarity index 62% rename from src/base/projects/Issue/IssueAuthorship.svelte rename to src/Authorship.svelte index c0113de62..b0dadda59 100644 --- a/src/base/projects/Issue/IssueAuthorship.svelte +++ b/src/Authorship.svelte @@ -1,9 +1,10 @@ + +{#if review.comment.body} + +{:else} +
+ +
+{/if} diff --git a/src/base/projects/Commit.svelte b/src/base/projects/Commit.svelte index fd75d3f77..b17eacd4b 100644 --- a/src/base/projects/Commit.svelte +++ b/src/base/projects/Commit.svelte @@ -1,17 +1,18 @@ -{#await fetchCommits(commit)} - -{:then history}
{#each history.headers as group (group.time)}
@@ -81,14 +69,3 @@
{/each}
-{:catch err} -
- - {#if err.url} - API request to {err.url} failed. - {:else} - {err.message} - {/if} - -
-{/await} diff --git a/src/base/projects/Issue.svelte b/src/base/projects/Issue.svelte index db0bfefb8..dc750c8b9 100644 --- a/src/base/projects/Issue.svelte +++ b/src/base/projects/Issue.svelte @@ -1,13 +1,13 @@ + + + +
+
+
+
+ + {patch.title} + + {patch.id} + {formatObjectId(patch.id)} +
+
+ {capitalize(patch.state)} +
+
+ +
+ +
+ {#if activeTab === PatchTab.Timeline} +
+ + +
+ {:else if activeTab === PatchTab.Diff && revision.changeset} + onBrowse(e, revision.oid)} /> + {:else if activeTab === PatchTab.Diff} + + + No changeset found + + + We couldn't find a changeset related to this patch or revision + + + {/if} +
+
diff --git a/src/base/projects/Patch/PatchFilter.svelte b/src/base/projects/Patch/PatchFilter.svelte new file mode 100644 index 000000000..411a513b5 --- /dev/null +++ b/src/base/projects/Patch/PatchFilter.svelte @@ -0,0 +1,77 @@ + + + + +
+ + · + + · + +
+ +{#if filteredPatches.length} + +{:else} + +
{capitalize(state)} patches
+
No patches matched the current filter
+
+{/if} diff --git a/src/base/projects/Patch/PatchSideBar.svelte b/src/base/projects/Patch/PatchSideBar.svelte new file mode 100644 index 000000000..acfe63199 --- /dev/null +++ b/src/base/projects/Patch/PatchSideBar.svelte @@ -0,0 +1,55 @@ + + + + + diff --git a/src/base/projects/Patch/PatchTabBar.svelte b/src/base/projects/Patch/PatchTabBar.svelte new file mode 100644 index 000000000..ea7ff7b63 --- /dev/null +++ b/src/base/projects/Patch/PatchTabBar.svelte @@ -0,0 +1,95 @@ + + + + +
+
+
dispatch("switchTab", PatchTab.Timeline)}> + Patch +
+
|
+
dispatch("switchTab", PatchTab.Diff)}> + Changeset +
+
|
+
+ + +
+
+
diff --git a/src/base/projects/Patch/PatchTeaser.svelte b/src/base/projects/Patch/PatchTeaser.svelte new file mode 100644 index 000000000..620f06316 --- /dev/null +++ b/src/base/projects/Patch/PatchTeaser.svelte @@ -0,0 +1,125 @@ + + + + +
+
+
+
+
+
+ + {patch.title} + {formatObjectId(patch.id)} +
+ +
+ {#if commentCount > 0} +
+
+ 💬 + {commentCount} +
+
+ {/if} +
diff --git a/src/base/projects/Patch/PatchTimeline.svelte b/src/base/projects/Patch/PatchTimeline.svelte new file mode 100644 index 000000000..d6456abd5 --- /dev/null +++ b/src/base/projects/Patch/PatchTimeline.svelte @@ -0,0 +1,78 @@ + + + + +
+ {#each timeline as element} + {#if element.type === TimelineType.Merge && element.inner.peer.person} +
+ +
+ {:else if element.type === TimelineType.Review && element.inner.author.profile?.ens?.name} +
+ +
+ {:else if element.type === TimelineType.Comment} +
+ + {#key element.inner} + + {/key} +
+ {:else if element.type === TimelineType.Thread} +
+ +
+ {#each element.inner.replies as comment} + + {/each} +
+
+ {/if} + {/each} +
diff --git a/src/base/projects/Patches.svelte b/src/base/projects/Patches.svelte new file mode 100644 index 000000000..beef2ec6e --- /dev/null +++ b/src/base/projects/Patches.svelte @@ -0,0 +1,57 @@ + + + + +
+ +
+ {#each filteredPatches as patch} +
navigate(patch.id)}> + +
+ {/each} +
+
+
diff --git a/src/base/projects/Project.svelte b/src/base/projects/Project.svelte index 3952761d0..9968a440d 100644 --- a/src/base/projects/Project.svelte +++ b/src/base/projects/Project.svelte @@ -4,8 +4,12 @@ import Placeholder from '@app/Placeholder.svelte'; import { formatProfile, formatSeedId, setOpenGraphMetaTag } from '@app/utils'; import { browserStore } from '@app/project'; + import { fetchCommits } from '@app/commit'; + import * as patch from "@app/patch"; + import * as issue from "@app/issue"; import Header from '@app/base/projects/Header.svelte'; + import Async from '@app/Async.svelte'; import Browser from "./Browser.svelte"; import Commit from "./Commit.svelte"; @@ -13,6 +17,8 @@ import Issues from './Issues.svelte'; import Issue from './Issue.svelte'; import ProjectMeta from './ProjectMeta.svelte'; + import Patches from './Patches.svelte'; + import Patch from './Patch.svelte'; export let peer: string | null = null; export let config: Config; @@ -64,9 +70,13 @@ {#if content == proj.ProjectContent.Tree} {:else if content == proj.ProjectContent.History} - + + + {:else if content == proj.ProjectContent.Commit} - + + + {/if} {:catch err}
@@ -79,9 +89,21 @@ {/await} {#if content == proj.ProjectContent.Issues} - + + + {:else if content == proj.ProjectContent.Issue && $browserStore.issue} - + + + + {:else if content == proj.ProjectContent.Patches} + + + + {:else if content == proj.ProjectContent.Patch && $browserStore.patch} + + + {/if} {:else}
diff --git a/src/base/projects/ProjectRoute.svelte b/src/base/projects/ProjectRoute.svelte index 8e9808c20..f4a6bd10a 100644 --- a/src/base/projects/ProjectRoute.svelte +++ b/src/base/projects/ProjectRoute.svelte @@ -10,6 +10,7 @@ export let route: string | null = null; export let revision: string | null = null; export let issue: string | null = null; + export let patch: string | null = null; export let peer: string | null; export let content: proj.ProjectContent = proj.ProjectContent.Tree; export let project: proj.Project; @@ -32,6 +33,8 @@ browse.revision = revision; } else if (issue) { browse.issue = issue; + } else if (patch) { + browse.patch = patch; } else if (head) { browse.revision = head; } else { diff --git a/src/base/projects/SourceBrowser/Changeset.svelte b/src/base/projects/SourceBrowser/Changeset.svelte index 997b60162..ab0576656 100644 --- a/src/base/projects/SourceBrowser/Changeset.svelte +++ b/src/base/projects/SourceBrowser/Changeset.svelte @@ -8,7 +8,7 @@ const dispatch = createEventDispatcher(); export let diff: Diff; - export let stats: CommitStats; + export let stats: DiffStats;