mirror of
https://seed.radicle.dev/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git
synced 2026-11-21 14:20:42 +08:00
Rename tracking to seeding
Following the heartwood release 6ca7da2 we also rename tracking to seeding, and update our `radicle-httpd` endpoints and configs. Also updates test suites to handle new CLI commands.
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
export let baseUrl: BaseUrl;
|
||||
export let commit: Commit;
|
||||
export let project: Project;
|
||||
export let tracking: boolean;
|
||||
export let seeding: boolean;
|
||||
|
||||
$: header = commit.commit;
|
||||
</script>
|
||||
@@ -42,7 +42,7 @@
|
||||
}
|
||||
</style>
|
||||
|
||||
<Layout {baseUrl} {project} {tracking}>
|
||||
<Layout {baseUrl} {project} {seeding}>
|
||||
<div class="header">
|
||||
<div class="summary">
|
||||
<div class="txt-medium txt-bold">
|
||||
|
||||
+12
-16
@@ -1,6 +1,4 @@
|
||||
<script lang="ts">
|
||||
import { pluralize } from "@app/lib/pluralize";
|
||||
|
||||
import Button from "@app/components/Button.svelte";
|
||||
import Command from "@app/components/Command.svelte";
|
||||
import ExternalLink from "@app/components/ExternalLink.svelte";
|
||||
@@ -8,15 +6,14 @@
|
||||
import Popover from "@app/components/Popover.svelte";
|
||||
|
||||
export let projectId: string;
|
||||
export let trackings: number;
|
||||
export let tracking: boolean;
|
||||
export let seedCount: number;
|
||||
export let seeding: boolean;
|
||||
|
||||
$: buttonTitle = tracking ? "Tracking" : "Track";
|
||||
$: command = tracking ? "untrack" : "track";
|
||||
$: buttonTitle = seeding ? "Seeding" : "Seed";
|
||||
</script>
|
||||
|
||||
<style>
|
||||
.track-label {
|
||||
.seed-label {
|
||||
display: block;
|
||||
font-size: var(--font-size-small);
|
||||
font-weight: var(--font-weight-regular);
|
||||
@@ -37,28 +34,27 @@
|
||||
let:toggle
|
||||
on:click={toggle}
|
||||
size="large"
|
||||
variant={tracking ? "secondary-toggle-on" : "secondary-toggle-off"}
|
||||
title="Tracked by {trackings} {pluralize('node', trackings)}">
|
||||
variant={seeding ? "secondary-toggle-on" : "secondary-toggle-off"}>
|
||||
<IconSmall name="network" />
|
||||
<span>
|
||||
{buttonTitle}
|
||||
<span style:font-weight="var(--font-weight-regular)">
|
||||
{trackings}
|
||||
{seedCount}
|
||||
</span>
|
||||
</span>
|
||||
</Button>
|
||||
|
||||
<div slot="popover" style:width={tracking ? "19.5rem" : "30.5rem"}>
|
||||
<div class="track-label">
|
||||
<div slot="popover" style:width={seeding ? "19.5rem" : "30.5rem"}>
|
||||
<div class="seed-label">
|
||||
Use the <ExternalLink href="https://radicle.xyz/#try">
|
||||
Radicle CLI
|
||||
</ExternalLink>
|
||||
to {command} this project.
|
||||
{#if command === "track"}
|
||||
to {seeding ? "stop seeding" : "seed"} this project.
|
||||
{#if !seeding}
|
||||
<br />
|
||||
<br />
|
||||
The
|
||||
<code>track</code>
|
||||
<code>seed</code>
|
||||
command serves a dual purpose:
|
||||
<ul style:padding="0 1rem" style:margin-top="0.5rem">
|
||||
<li>
|
||||
@@ -71,6 +67,6 @@
|
||||
</ul>
|
||||
{/if}
|
||||
</div>
|
||||
<Command command={`rad ${command} ${projectId}`} />
|
||||
<Command command={`rad seed ${projectId} ${seeding ? "--delete" : ""}`} />
|
||||
</div>
|
||||
</Popover>
|
||||
@@ -29,7 +29,7 @@
|
||||
export let revision: string | undefined;
|
||||
export let totalCommitCount: number;
|
||||
export let tree: Tree;
|
||||
export let tracking: boolean;
|
||||
export let seeding: boolean;
|
||||
|
||||
const api = new HttpdClient(baseUrl);
|
||||
|
||||
@@ -115,7 +115,7 @@
|
||||
}
|
||||
</style>
|
||||
|
||||
<Layout {baseUrl} {project} {tracking} activeTab="source">
|
||||
<Layout {baseUrl} {project} {seeding} activeTab="source">
|
||||
<svelte:fragment slot="subheader">
|
||||
<div style:margin-top="1rem">
|
||||
<Header
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
export let issue: Issue;
|
||||
export let project: Project;
|
||||
export let rawPath: (commit?: string) => string;
|
||||
export let tracking: boolean;
|
||||
export let seeding: boolean;
|
||||
|
||||
const api = new HttpdClient(baseUrl);
|
||||
|
||||
@@ -460,7 +460,7 @@
|
||||
}
|
||||
</style>
|
||||
|
||||
<Layout {baseUrl} {project} {tracking} activeTab="issues">
|
||||
<Layout {baseUrl} {project} {seeding} activeTab="issues">
|
||||
<div class="issue">
|
||||
<div style="display: flex; flex-direction: column; gap: 1.5rem;">
|
||||
<CobHeader id={issue.id}>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
export let baseUrl: BaseUrl;
|
||||
export let project: Project;
|
||||
export let rawPath: (commit?: string) => string;
|
||||
export let tracking: boolean;
|
||||
export let seeding: boolean;
|
||||
|
||||
let preview: boolean = false;
|
||||
let selectionStart = 0;
|
||||
@@ -144,7 +144,7 @@
|
||||
}
|
||||
</style>
|
||||
|
||||
<Layout {baseUrl} {project} {tracking} activeTab="issues">
|
||||
<Layout {baseUrl} {project} {seeding} activeTab="issues">
|
||||
<main>
|
||||
{#if session}
|
||||
<div class="form">
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
export let issues: Issue[];
|
||||
export let project: Project;
|
||||
export let state: IssueState["status"];
|
||||
export let tracking: boolean;
|
||||
export let seeding: boolean;
|
||||
|
||||
let loading = false;
|
||||
let page = 0;
|
||||
@@ -79,7 +79,7 @@
|
||||
}
|
||||
</style>
|
||||
|
||||
<Layout {baseUrl} {project} {tracking} activeTab="issues">
|
||||
<Layout {baseUrl} {project} {seeding} activeTab="issues">
|
||||
<div class="issues">
|
||||
<List items={allIssues}>
|
||||
<div slot="header" style="display: flex;">
|
||||
|
||||
@@ -13,12 +13,12 @@
|
||||
import CopyableId from "@app/components/CopyableId.svelte";
|
||||
import Header from "@app/views/projects/Header.svelte";
|
||||
import Link from "@app/components/Link.svelte";
|
||||
import TrackButton from "@app/views/projects/Header/TrackButton.svelte";
|
||||
import SeedButton from "@app/views/projects/Header/SeedButton.svelte";
|
||||
|
||||
export let activeTab: ActiveTab = undefined;
|
||||
export let baseUrl: BaseUrl;
|
||||
export let project: Project;
|
||||
export let tracking: boolean;
|
||||
export let seeding: boolean;
|
||||
|
||||
const render = (content: string): string =>
|
||||
dompurify.sanitize(markdown.parse(content) as string);
|
||||
@@ -99,9 +99,9 @@
|
||||
<div
|
||||
class="layout-desktop-flex"
|
||||
style="margin-left: auto; display: flex; gap: 0.5rem;">
|
||||
<TrackButton
|
||||
{tracking}
|
||||
trackings={project.trackings}
|
||||
<SeedButton
|
||||
{seeding}
|
||||
seedCount={project.seeding}
|
||||
projectId={project.id} />
|
||||
<CloneButton {baseUrl} id={project.id} name={project.name} />
|
||||
</div>
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
export let rawPath: (commit?: string) => string;
|
||||
export let project: Project;
|
||||
export let view: PatchView;
|
||||
export let tracking: boolean;
|
||||
export let seeding: boolean;
|
||||
|
||||
$: api = new HttpdClient(baseUrl);
|
||||
|
||||
@@ -638,7 +638,7 @@
|
||||
}
|
||||
</style>
|
||||
|
||||
<Layout {baseUrl} {project} {tracking} activeTab="patches">
|
||||
<Layout {baseUrl} {project} {seeding} activeTab="patches">
|
||||
<div class="patch">
|
||||
<div>
|
||||
<CobHeader id={patch.id}>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
export let patches: Patch[];
|
||||
export let project: Project;
|
||||
export let state: PatchState["status"];
|
||||
export let tracking: boolean;
|
||||
export let seeding: boolean;
|
||||
|
||||
let loading = false;
|
||||
let page = 0;
|
||||
@@ -84,7 +84,7 @@
|
||||
}
|
||||
</style>
|
||||
|
||||
<Layout {baseUrl} {project} {tracking} activeTab="patches">
|
||||
<Layout {baseUrl} {project} {seeding} activeTab="patches">
|
||||
<div class="patches">
|
||||
<List items={allPatches}>
|
||||
<div slot="header" style="display: flex;">
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
export let project: Project;
|
||||
export let revision: string | undefined;
|
||||
export let tree: Tree;
|
||||
export let tracking: boolean;
|
||||
export let seeding: boolean;
|
||||
|
||||
// Whether the mobile file tree is visible.
|
||||
let mobileFileTree = false;
|
||||
@@ -136,7 +136,7 @@
|
||||
}
|
||||
</style>
|
||||
|
||||
<Layout {baseUrl} {project} {tracking} activeTab="source">
|
||||
<Layout {baseUrl} {project} {seeding} activeTab="source">
|
||||
<svelte:fragment slot="subheader">
|
||||
<div style:margin-top="1rem">
|
||||
<Header
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
const nodeId = formatNodeId(p.id);
|
||||
return p.delegate
|
||||
? `${nodeId} is a delegate of this project`
|
||||
: `${nodeId} is a peer tracked by this node`;
|
||||
: `${nodeId} is a peer followed by this node`;
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@@ -115,7 +115,7 @@ export type ProjectLoadedRoute =
|
||||
path: string;
|
||||
rawPath: (commit?: string) => string;
|
||||
blobResult: BlobResult;
|
||||
tracking: boolean;
|
||||
seeding: boolean;
|
||||
};
|
||||
}
|
||||
| {
|
||||
@@ -130,7 +130,7 @@ export type ProjectLoadedRoute =
|
||||
tree: Tree;
|
||||
commitHeaders: CommitHeader[];
|
||||
totalCommitCount: number;
|
||||
tracking: boolean;
|
||||
seeding: boolean;
|
||||
};
|
||||
}
|
||||
| {
|
||||
@@ -139,7 +139,7 @@ export type ProjectLoadedRoute =
|
||||
baseUrl: BaseUrl;
|
||||
project: Project;
|
||||
commit: Commit;
|
||||
tracking: boolean;
|
||||
seeding: boolean;
|
||||
};
|
||||
}
|
||||
| {
|
||||
@@ -149,7 +149,7 @@ export type ProjectLoadedRoute =
|
||||
project: Project;
|
||||
rawPath: (commit?: string) => string;
|
||||
issue: Issue;
|
||||
tracking: boolean;
|
||||
seeding: boolean;
|
||||
};
|
||||
}
|
||||
| {
|
||||
@@ -159,7 +159,7 @@ export type ProjectLoadedRoute =
|
||||
project: Project;
|
||||
issues: Issue[];
|
||||
state: IssueState["status"];
|
||||
tracking: boolean;
|
||||
seeding: boolean;
|
||||
};
|
||||
}
|
||||
| {
|
||||
@@ -168,7 +168,7 @@ export type ProjectLoadedRoute =
|
||||
baseUrl: BaseUrl;
|
||||
project: Project;
|
||||
rawPath: (commit?: string) => string;
|
||||
tracking: boolean;
|
||||
seeding: boolean;
|
||||
};
|
||||
}
|
||||
| {
|
||||
@@ -178,7 +178,7 @@ export type ProjectLoadedRoute =
|
||||
project: Project;
|
||||
patches: Patch[];
|
||||
state: PatchState["status"];
|
||||
tracking: boolean;
|
||||
seeding: boolean;
|
||||
};
|
||||
}
|
||||
| {
|
||||
@@ -189,7 +189,7 @@ export type ProjectLoadedRoute =
|
||||
rawPath: (commit?: string) => string;
|
||||
patch: Patch;
|
||||
view: PatchView;
|
||||
tracking: boolean;
|
||||
seeding: boolean;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -244,7 +244,7 @@ function parseRevisionToOid(
|
||||
}
|
||||
}
|
||||
|
||||
async function isLocalNodeTracking(route: ProjectRoute): Promise<boolean> {
|
||||
async function isLocalNodeSeeding(route: ProjectRoute): Promise<boolean> {
|
||||
if (isLocal(route.node.hostname)) {
|
||||
return true;
|
||||
} else {
|
||||
@@ -278,10 +278,10 @@ export async function loadProjectRoute(
|
||||
} else if (route.resource === "project.history") {
|
||||
return await loadHistoryView(route);
|
||||
} else if (route.resource === "project.commit") {
|
||||
const [project, commit, tracking] = await Promise.all([
|
||||
const [project, commit, seeding] = await Promise.all([
|
||||
api.project.getById(route.project),
|
||||
api.project.getCommitBySha(route.project, route.commit),
|
||||
isLocalNodeTracking(route),
|
||||
isLocalNodeSeeding(route),
|
||||
]);
|
||||
|
||||
return {
|
||||
@@ -290,14 +290,14 @@ export async function loadProjectRoute(
|
||||
baseUrl: route.node,
|
||||
project,
|
||||
commit,
|
||||
tracking,
|
||||
seeding,
|
||||
},
|
||||
};
|
||||
} else if (route.resource === "project.issue") {
|
||||
const [project, issue, tracking] = await Promise.all([
|
||||
const [project, issue, seeding] = await Promise.all([
|
||||
api.project.getById(route.project),
|
||||
api.project.getIssueById(route.project, route.issue),
|
||||
isLocalNodeTracking(route),
|
||||
isLocalNodeSeeding(route),
|
||||
]);
|
||||
return {
|
||||
resource: "project.issue",
|
||||
@@ -306,7 +306,7 @@ export async function loadProjectRoute(
|
||||
project,
|
||||
rawPath,
|
||||
issue,
|
||||
tracking,
|
||||
seeding,
|
||||
},
|
||||
};
|
||||
} else if (route.resource === "project.patch") {
|
||||
@@ -314,9 +314,9 @@ export async function loadProjectRoute(
|
||||
} else if (route.resource === "project.issues") {
|
||||
return await loadIssuesView(route);
|
||||
} else if (route.resource === "project.newIssue") {
|
||||
const [project, tracking] = await Promise.all([
|
||||
const [project, seeding] = await Promise.all([
|
||||
api.project.getById(route.project),
|
||||
isLocalNodeTracking(route),
|
||||
isLocalNodeSeeding(route),
|
||||
]);
|
||||
return {
|
||||
resource: "project.newIssue",
|
||||
@@ -324,7 +324,7 @@ export async function loadProjectRoute(
|
||||
baseUrl: route.node,
|
||||
project,
|
||||
rawPath,
|
||||
tracking,
|
||||
seeding,
|
||||
},
|
||||
};
|
||||
} else if (route.resource === "project.patches") {
|
||||
@@ -372,14 +372,14 @@ async function loadPatchesView(
|
||||
const searchParams = new URLSearchParams(route.search || "");
|
||||
const state = (searchParams.get("state") as PatchState["status"]) || "open";
|
||||
|
||||
const [project, patches, tracking] = await Promise.all([
|
||||
const [project, patches, seeding] = await Promise.all([
|
||||
api.project.getById(route.project),
|
||||
api.project.getAllPatches(route.project, {
|
||||
state,
|
||||
page: 0,
|
||||
perPage: PATCHES_PER_PAGE,
|
||||
}),
|
||||
isLocalNodeTracking(route),
|
||||
isLocalNodeSeeding(route),
|
||||
]);
|
||||
|
||||
return {
|
||||
@@ -389,7 +389,7 @@ async function loadPatchesView(
|
||||
patches,
|
||||
state,
|
||||
project,
|
||||
tracking,
|
||||
seeding,
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -400,14 +400,14 @@ async function loadIssuesView(
|
||||
const api = new HttpdClient(route.node);
|
||||
const state = route.state || "open";
|
||||
|
||||
const [project, issues, tracking] = await Promise.all([
|
||||
const [project, issues, seeding] = await Promise.all([
|
||||
api.project.getById(route.project),
|
||||
api.project.getAllIssues(route.project, {
|
||||
state,
|
||||
page: 0,
|
||||
perPage: ISSUES_PER_PAGE,
|
||||
}),
|
||||
isLocalNodeTracking(route),
|
||||
isLocalNodeSeeding(route),
|
||||
]);
|
||||
|
||||
return {
|
||||
@@ -417,7 +417,7 @@ async function loadIssuesView(
|
||||
issues,
|
||||
state,
|
||||
project,
|
||||
tracking,
|
||||
seeding,
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -431,11 +431,11 @@ async function loadTreeView(
|
||||
route.project
|
||||
}${commit ? `/${commit}` : ""}`;
|
||||
|
||||
const [project, peers, branchMap, tracking] = await Promise.all([
|
||||
const [project, peers, branchMap, seeding] = await Promise.all([
|
||||
api.project.getById(route.project),
|
||||
api.project.getAllRemotes(route.project),
|
||||
getPeerBranches(api, route.project, route.peer),
|
||||
isLocalNodeTracking(route),
|
||||
isLocalNodeSeeding(route),
|
||||
]);
|
||||
|
||||
if (route.route) {
|
||||
@@ -472,7 +472,7 @@ async function loadTreeView(
|
||||
tree,
|
||||
path,
|
||||
blobResult,
|
||||
tracking,
|
||||
seeding,
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -543,14 +543,14 @@ async function loadHistoryView(
|
||||
);
|
||||
}
|
||||
|
||||
const [tree, commitsResponse, tracking] = await Promise.all([
|
||||
const [tree, commitsResponse, seeding] = 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),
|
||||
isLocalNodeSeeding(route),
|
||||
]);
|
||||
|
||||
return {
|
||||
@@ -565,7 +565,7 @@ async function loadHistoryView(
|
||||
tree,
|
||||
commitHeaders: commitsResponse.commits.map(c => c.commit),
|
||||
totalCommitCount: commitsResponse.stats.commits,
|
||||
tracking,
|
||||
seeding,
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -578,10 +578,10 @@ async function loadPatchView(
|
||||
`${route.node.scheme}://${route.node.hostname}:${route.node.port}/raw/${
|
||||
route.project
|
||||
}${commit ? `/${commit}` : ""}`;
|
||||
const [project, patch, tracking] = await Promise.all([
|
||||
const [project, patch, seeding] = await Promise.all([
|
||||
api.project.getById(route.project),
|
||||
api.project.getPatchById(route.project, route.patch),
|
||||
isLocalNodeTracking(route),
|
||||
isLocalNodeSeeding(route),
|
||||
]);
|
||||
const latestRevision = patch.revisions[patch.revisions.length - 1];
|
||||
|
||||
@@ -637,7 +637,7 @@ async function loadPatchView(
|
||||
rawPath,
|
||||
patch,
|
||||
view,
|
||||
tracking,
|
||||
seeding,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user