Add track button to project header

This replaces the "Nodes <counter>" tab in the project view.

Signed-off-by: Rūdolfs Ošiņš <rudolfs@osins.org>
This commit is contained in:
Rūdolfs Ošiņš
2023-10-24 12:16:12 +02:00
parent 94c15a2719
commit cdf62f2883
13 changed files with 172 additions and 36 deletions
+2 -1
View File
@@ -12,6 +12,7 @@
export let baseUrl: BaseUrl;
export let commit: Commit;
export let project: Project;
export let tracking: boolean;
$: header = commit.commit;
</script>
@@ -41,7 +42,7 @@
}
</style>
<Layout {baseUrl} {project}>
<Layout {baseUrl} {project} {tracking}>
<div class="header">
<div class="summary">
<div class="txt-medium txt-bold">
-16
View File
@@ -71,21 +71,5 @@
</div>
</Button>
</Link>
<div class="layout-desktop">
<Button
disabled
variant="background"
title="Tracked by {project.trackings} {pluralize(
'node',
project.trackings,
)}">
<IconSmall name="network" />
<div>
{project.trackings}
{pluralize("node", project.trackings)}
</div>
</Button>
</div>
</Radio>
</div>
@@ -0,0 +1,67 @@
<script lang="ts">
import { pluralize } from "@app/lib/pluralize";
import Button from "@app/components/Button.svelte";
import Command from "@app/components/Command.svelte";
import IconSmall from "@app/components/IconSmall.svelte";
import Popover from "@app/components/Popover.svelte";
export let projectId: string;
export let trackings: number;
export let tracking: boolean;
$: buttonTitle = tracking ? "Tracking" : "Track";
$: command = tracking ? "untrack" : "track";
</script>
<style>
.track-label {
display: block;
font-size: var(--font-size-small);
font-weight: var(--font-weight-regular);
margin-bottom: 0.75rem;
}
</style>
<Popover
popoverPositionTop="3rem"
popoverPositionRight="0"
popoverWidth="26rem">
<Button
slot="toggle"
size="large"
variant="outline"
title="Tracked by {trackings} {pluralize('node', trackings)}">
{#if tracking}
<IconSmall name="tracking-on" />
{:else}
<IconSmall name="tracking-off" />
{/if}
<span>
{buttonTitle}
<span
style:color="var(--color-foreground-dim)"
style:font-weight="var(--font-weight-regular)">
{trackings}
</span>
</span>
</Button>
<svelte:fragment slot="popover">
<div class="track-label">
Use the <a
target="_blank"
rel="noreferrer"
href="https://radicle.xyz/#try"
class="txt-link txt-bold">
Radicle CLI
</a>
to {command} this project.
<br />
<br />
Tracking means subscribing to updates from this repository. It also helps with
increasing its availability over the Radicle network.
</div>
<Command command={`rad ${command} ${projectId}`} />
</svelte:fragment>
</Popover>
+2 -1
View File
@@ -29,6 +29,7 @@
export let revision: string | undefined;
export let totalCommitCount: number;
export let tree: Tree;
export let tracking: boolean;
const api = new HttpdClient(baseUrl);
@@ -114,7 +115,7 @@
}
</style>
<Layout {baseUrl} {project} activeTab="source">
<Layout {baseUrl} {project} {tracking} activeTab="source">
<svelte:fragment slot="subheader">
<div style:margin-top="1rem">
<Header
+2 -1
View File
@@ -32,6 +32,7 @@
export let baseUrl: BaseUrl;
export let issue: Issue;
export let project: Project;
export let tracking: boolean;
const rawPath = utils.getRawBasePath(project.id, baseUrl, project.head);
const api = new HttpdClient(baseUrl);
@@ -371,7 +372,7 @@
}
</style>
<Layout {baseUrl} {project} activeTab="issues">
<Layout {baseUrl} {project} {tracking} activeTab="issues">
<div class="issue">
<div style="display: flex; flex-direction: column; gap: 1.5rem;">
<CobHeader
+2 -1
View File
@@ -23,6 +23,7 @@
export let baseUrl: BaseUrl;
export let project: Project;
export let tracking: boolean;
let newEmbeds: Embed[] = [];
let selectionStart = 0;
@@ -148,7 +149,7 @@
}
</style>
<Layout {baseUrl} {project} activeTab="issues">
<Layout {baseUrl} {project} {tracking} activeTab="issues">
<main>
{#if $httpdStore.state === "authenticated"}
{@const session = $httpdStore.session}
+2 -1
View File
@@ -25,6 +25,7 @@
export let issues: Issue[];
export let project: Project;
export let state: IssueState["status"];
export let tracking: boolean;
let loading = false;
let page = 0;
@@ -78,7 +79,7 @@
}
</style>
<Layout {baseUrl} {project} activeTab="issues">
<Layout {baseUrl} {project} {tracking} activeTab="issues">
<div class="issues">
<List items={allIssues}>
<div slot="header" style="display: flex;">
+7 -2
View File
@@ -7,16 +7,18 @@
import markdown from "@app/lib/markdown";
import { twemoji, isLocal } from "@app/lib/utils";
import Button from "@app/components/Button.svelte";
import Clipboard from "@app/components/Clipboard.svelte";
import CloneButton from "@app/views/projects/Header/CloneButton.svelte";
import Link from "@app/components/Link.svelte";
import Button from "@app/components/Button.svelte";
import Header from "./Header.svelte";
import TrackButton from "./Header/TrackButton.svelte";
export let activeTab: ActiveTab = undefined;
export let baseUrl: BaseUrl;
export let project: Project;
export let tracking: boolean;
const render = (content: string): string =>
dompurify.sanitize(markdown.parse(content) as string);
@@ -117,7 +119,10 @@
{isLocal(baseUrl.hostname) ? "radicle.local" : baseUrl.hostname}
</Button>
</Link>
<TrackButton
{tracking}
trackings={project.trackings}
projectId={project.id} />
<CloneButton {baseUrl} id={project.id} name={project.name} />
</div>
</div>
+2 -1
View File
@@ -74,6 +74,7 @@
export let patch: Patch;
export let project: Project;
export let view: PatchView;
export let tracking: boolean;
$: api = new HttpdClient(baseUrl);
@@ -440,7 +441,7 @@
}
</style>
<Layout {baseUrl} {project} activeTab="patches">
<Layout {baseUrl} {project} {tracking} activeTab="patches">
<div class="patch">
<div>
<CobHeader id={patch.id} title={patch.title}>
+2 -1
View File
@@ -22,6 +22,7 @@
export let patches: Patch[];
export let project: Project;
export let state: PatchState["status"];
export let tracking: boolean;
let loading = false;
let page = 0;
@@ -83,7 +84,7 @@
}
</style>
<Layout {baseUrl} {project} activeTab="patches">
<Layout {baseUrl} {project} {tracking} activeTab="patches">
<div class="patches">
<List items={allPatches}>
<div slot="header" style="display: flex;">
+2 -1
View File
@@ -25,6 +25,7 @@
export let project: Project;
export let revision: string | undefined;
export let tree: Tree;
export let tracking: boolean;
// Whether the mobile file tree is visible.
let mobileFileTree = false;
@@ -125,7 +126,7 @@
}
</style>
<Layout {baseUrl} {project} activeTab="source">
<Layout {baseUrl} {project} {tracking} activeTab="source">
<svelte:fragment slot="subheader">
<div style:margin-top="1rem">
<Header
+56 -10
View File
@@ -21,8 +21,9 @@ import type {
import { HttpdClient } from "@httpd-client";
import * as Syntax from "@app/lib/syntax";
import { unreachable } from "@app/lib/utils";
import { isLocal, unreachable } from "@app/lib/utils";
import { nodePath } from "@app/views/nodes/router";
import * as httpd from "@app/lib/httpd";
export const COMMITS_PER_PAGE = 30;
export const PATCHES_PER_PAGE = 10;
@@ -113,6 +114,7 @@ export type ProjectLoadedRoute =
tree: Tree;
path: string;
blobResult: BlobResult;
tracking: boolean;
};
}
| {
@@ -127,6 +129,7 @@ export type ProjectLoadedRoute =
tree: Tree;
commitHeaders: CommitHeader[];
totalCommitCount: number;
tracking: boolean;
};
}
| {
@@ -135,6 +138,7 @@ export type ProjectLoadedRoute =
baseUrl: BaseUrl;
project: Project;
commit: Commit;
tracking: boolean;
};
}
| {
@@ -142,8 +146,8 @@ export type ProjectLoadedRoute =
params: {
baseUrl: BaseUrl;
project: Project;
issue: Issue;
tracking: boolean;
};
}
| {
@@ -153,6 +157,7 @@ export type ProjectLoadedRoute =
project: Project;
issues: Issue[];
state: IssueState["status"];
tracking: boolean;
};
}
| {
@@ -160,6 +165,7 @@ export type ProjectLoadedRoute =
params: {
baseUrl: BaseUrl;
project: Project;
tracking: boolean;
};
}
| {
@@ -169,6 +175,7 @@ export type ProjectLoadedRoute =
project: Project;
patches: Patch[];
state: PatchState["status"];
tracking: boolean;
};
}
| {
@@ -178,6 +185,7 @@ export type ProjectLoadedRoute =
project: Project;
patch: Patch;
view: PatchView;
tracking: boolean;
};
};
@@ -232,19 +240,40 @@ function parseRevisionToOid(
}
}
async function isLocalNodeTracking(route: ProjectRoute): Promise<boolean> {
if (isLocal(route.node.hostname)) {
return true;
} else {
try {
await httpd.api.project.getById(route.project);
return true;
} catch (error: any) {
if (error.status === 404) {
return false;
} else {
// Either `radicle-httpd` isn't running or there was some other
// error.
return false;
}
}
}
}
export async function loadProjectRoute(
route: ProjectRoute,
): Promise<ProjectLoadedRoute | LoadErrorRoute | NotFoundRoute> {
const api = new HttpdClient(route.node);
try {
if (route.resource === "project.source") {
return await loadTreeView(route);
} else if (route.resource === "project.history") {
return await loadHistoryView(route);
} else if (route.resource === "project.commit") {
const [project, commit] = await Promise.all([
const [project, commit, tracking] = await Promise.all([
api.project.getById(route.project),
api.project.getCommitBySha(route.project, route.commit),
isLocalNodeTracking(route),
]);
return {
@@ -253,12 +282,14 @@ export async function loadProjectRoute(
baseUrl: route.node,
project,
commit,
tracking,
},
};
} else if (route.resource === "project.issue") {
const [project, issue] = await Promise.all([
const [project, issue, tracking] = await Promise.all([
api.project.getById(route.project),
api.project.getIssueById(route.project, route.issue),
isLocalNodeTracking(route),
]);
return {
resource: "project.issue",
@@ -266,6 +297,7 @@ export async function loadProjectRoute(
baseUrl: route.node,
project,
issue,
tracking,
},
};
} else if (route.resource === "project.patch") {
@@ -273,12 +305,16 @@ export async function loadProjectRoute(
} else if (route.resource === "project.issues") {
return await loadIssuesView(route);
} else if (route.resource === "project.newIssue") {
const project = await api.project.getById(route.project);
const [project, tracking] = await Promise.all([
api.project.getById(route.project),
isLocalNodeTracking(route),
]);
return {
resource: "project.newIssue",
params: {
baseUrl: route.node,
project,
tracking,
},
};
} else if (route.resource === "project.patches") {
@@ -326,13 +362,14 @@ async function loadPatchesView(
const searchParams = new URLSearchParams(route.search || "");
const state = (searchParams.get("state") as PatchState["status"]) || "open";
const [project, patches] = await Promise.all([
const [project, patches, tracking] = await Promise.all([
api.project.getById(route.project),
api.project.getAllPatches(route.project, {
state,
page: 0,
perPage: PATCHES_PER_PAGE,
}),
isLocalNodeTracking(route),
]);
return {
@@ -342,6 +379,7 @@ async function loadPatchesView(
patches,
state,
project,
tracking,
},
};
}
@@ -352,13 +390,14 @@ async function loadIssuesView(
const api = new HttpdClient(route.node);
const state = route.state || "open";
const [project, issues] = await Promise.all([
const [project, issues, tracking] = await Promise.all([
api.project.getById(route.project),
api.project.getAllIssues(route.project, {
state,
page: 0,
perPage: ISSUES_PER_PAGE,
}),
isLocalNodeTracking(route),
]);
return {
@@ -368,6 +407,7 @@ async function loadIssuesView(
issues,
state,
project,
tracking,
},
};
}
@@ -377,10 +417,11 @@ async function loadTreeView(
): Promise<ProjectLoadedRoute> {
const api = new HttpdClient(route.node);
const [project, peers, branchMap] = await Promise.all([
const [project, peers, branchMap, tracking] = await Promise.all([
api.project.getById(route.project),
api.project.getAllRemotes(route.project),
getPeerBranches(api, route.project, route.peer),
isLocalNodeTracking(route),
]);
if (route.route) {
@@ -416,6 +457,7 @@ async function loadTreeView(
tree,
path,
blobResult,
tracking,
},
};
}
@@ -486,13 +528,14 @@ async function loadHistoryView(
);
}
const [tree, commitsResponse] = await Promise.all([
const [tree, commitsResponse, tracking] = await Promise.all([
api.project.getTree(route.project, commitId),
await api.project.getAllCommits(project.id, {
parent: commitId,
page: 0,
perPage: COMMITS_PER_PAGE,
}),
isLocalNodeTracking(route),
]);
return {
@@ -507,6 +550,7 @@ async function loadHistoryView(
tree,
commitHeaders: commitsResponse.commits.map(c => c.commit),
totalCommitCount: commitsResponse.stats.commits,
tracking,
},
};
}
@@ -515,9 +559,10 @@ async function loadPatchView(
route: ProjectPatchRoute,
): Promise<ProjectLoadedRoute> {
const api = new HttpdClient(route.node);
const [project, patch] = await Promise.all([
const [project, patch, tracking] = await Promise.all([
api.project.getById(route.project),
api.project.getPatchById(route.project, route.patch),
isLocalNodeTracking(route),
]);
const latestRevision = patch.revisions[patch.revisions.length - 1];
@@ -572,6 +617,7 @@ async function loadPatchView(
project,
patch,
view,
tracking,
},
};
}