Change node param with seedingPolicies

radicle-dev · Jul 1, 2024 · 84d79ef · 84d79ef
1 parent da3e10e
commit 84d79ef
Show file tree

Hide file tree

Showing 12 changed files with 124 additions and 89 deletions.
diff --git a/src/components/ScopePolicyExplainer.svelte b/src/components/ScopePolicyExplainer.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
-  import type { DefaultSeedingPolicy } from "@http-client";
+  import type { DefaultSeedingPolicy, SeedingPolicy } from "@http-client";
 
   import { capitalize } from "lodash";
 
-  export let seedingPolicy: DefaultSeedingPolicy;
+  export let seedingPolicy: DefaultSeedingPolicy | SeedingPolicy;
+
+  $: [policy, scope] = Object.values(seedingPolicy);
 </script>
 
 <style>
@@ -15,28 +17,28 @@
   }
 </style>
 
-{#if seedingPolicy.default === "allow"}
+{#if policy === "allow"}
   <div class="section">
     Scope:
-    <span class="txt-bold">{capitalize(seedingPolicy.scope)}</span>
+    <span class="txt-bold">{capitalize(scope)}</span>
   </div>
   <div class="txt-missing">
-    {#if seedingPolicy.scope === "all"}
+    {#if scope === "all"}
       All changes in seeded repositories, made by any peer, will be synced.
-    {:else if seedingPolicy.scope === "followed"}
+    {:else if scope === "followed"}
       Only changes made by explicitly followed peers will be synced.
     {/if}
   </div>
 {/if}
 
 <div class="section">
   Policy:
-  <span class="txt-bold">{capitalize(seedingPolicy.default)}</span>
+  <span class="txt-bold">{capitalize(policy)}</span>
 </div>
 <div class="txt-missing">
-  {#if seedingPolicy.default === "allow"}
+  {#if policy === "allow"}
     All discovered repositories will get seeded.
-  {:else if seedingPolicy.default === "block"}
+  {:else if policy === "block"}
     Only repositories marked as such will get seeded.
   {/if}
 </div>
diff --git a/src/views/projects/Commit.svelte b/src/views/projects/Commit.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import type { BaseUrl, Commit, Node, Project } from "@http-client";
+  import type { BaseUrl, Commit, Project, SeedingPolicy } from "@http-client";
 
   import Button from "@app/components/Button.svelte";
   import Changeset from "@app/views/projects/Changeset.svelte";
@@ -12,7 +12,7 @@
   import Id from "@app/components/Id.svelte";
 
   export let baseUrl: BaseUrl;
-  export let node: Node;
+  export let seedingPolicy: SeedingPolicy;
   export let commit: Commit;
   export let project: Project;
 
@@ -45,7 +45,7 @@
   }
 </style>
 
-<Layout {node} {baseUrl} {project}>
+<Layout {seedingPolicy} {baseUrl} {project}>
   <div class="commit">
     <div class="header">
       <div style="display:flex; flex-direction: column; gap: 0.5rem;">

diff --git a/src/views/projects/History.svelte b/src/views/projects/History.svelte
@@ -4,8 +4,8 @@
     CommitHeader,
     Project,
     Remote,
-    Node,
     Tree,
+    SeedingPolicy,
   } from "@http-client";
   import type { ProjectRoute } from "./router";
 
@@ -24,7 +24,7 @@
   import ProjectNameHeader from "./Source/ProjectNameHeader.svelte";
 
   export let baseUrl: BaseUrl;
-  export let node: Node;
+  export let seedingPolicy: SeedingPolicy;
   export let commit: string;
   export let commitHeaders: CommitHeader[];
   export let peer: string | undefined;
@@ -90,7 +90,7 @@
   }
 </style>
 
-<Layout {node} {baseUrl} {project} activeTab="source">
+<Layout {seedingPolicy} {baseUrl} {project} activeTab="source">
   <ProjectNameHeader {project} {baseUrl} {seeding} slot="header" />
 
   <div style:margin="1rem" slot="subheader">

diff --git a/src/views/projects/Issue.svelte b/src/views/projects/Issue.svelte
@@ -7,7 +7,7 @@
     Issue,
     IssueState,
     Project,
-    Node,
+    SeedingPolicy,
   } from "@http-client";
   import type { Session } from "@app/lib/httpd";
 
@@ -49,7 +49,7 @@
   import ThreadComponent from "@app/components/Thread.svelte";
 
   export let baseUrl: BaseUrl;
-  export let node: Node;
+  export let seedingPolicy: SeedingPolicy;
   export let issue: Issue;
   export let project: Project;
   export let rawPath: (commit?: string) => string;
@@ -484,7 +484,12 @@
   }
 </style>
 
-<Layout {node} {baseUrl} {project} activeTab="issues" stylePaddingBottom="0">
+<Layout
+  {seedingPolicy}
+  {baseUrl}
+  {project}
+  activeTab="issues"
+  stylePaddingBottom="0">
   <div class="issue">
     <div class="main">
       <CobHeader>

diff --git a/src/views/projects/Issue/New.svelte b/src/views/projects/Issue/New.svelte
@@ -1,5 +1,11 @@
 <script lang="ts">
-  import type { BaseUrl, Embed, Node, Project, Reaction } from "@http-client";
+  import type {
+    BaseUrl,
+    Embed,
+    Project,
+    Reaction,
+    SeedingPolicy,
+  } from "@http-client";
 
   import * as modal from "@app/lib/modal";
   import * as router from "@app/lib/router";
@@ -17,7 +23,7 @@
   import TextInput from "@app/components/TextInput.svelte";
 
   export let baseUrl: BaseUrl;
-  export let node: Node;
+  export let seedingPolicy: SeedingPolicy;
   export let project: Project;
   export let rawPath: (commit?: string) => string;
 
@@ -100,7 +106,7 @@
   }
 </style>
 
-<Layout {node} {baseUrl} {project} activeTab="issues">
+<Layout {seedingPolicy} {baseUrl} {project} activeTab="issues">
   {#if session}
     {@const session_ = session}
     <div class="form">

diff --git a/src/views/projects/Issues.svelte b/src/views/projects/Issues.svelte
@@ -1,5 +1,11 @@
 <script lang="ts">
-  import type { BaseUrl, Issue, IssueState, Node, Project } from "@http-client";
+  import type {
+    BaseUrl,
+    Issue,
+    IssueState,
+    Project,
+    SeedingPolicy,
+  } from "@http-client";
 
   import capitalize from "lodash/capitalize";
   import { HttpdClient } from "@http-client";
@@ -24,7 +30,7 @@
   import Share from "./Share.svelte";
 
   export let baseUrl: BaseUrl;
-  export let node: Node;
+  export let seedingPolicy: SeedingPolicy;
   export let issues: Issue[];
   export let project: Project;
   export let state: IssueState["status"];
@@ -106,7 +112,7 @@
   }
 </style>
 
-<Layout {node} {baseUrl} {project} activeTab="issues">
+<Layout {seedingPolicy} {baseUrl} {project} activeTab="issues">
   <div slot="header" style:display="flex" style:padding="1rem">
     <Popover
       popoverPadding="0"

diff --git a/src/views/projects/Layout.svelte b/src/views/projects/Layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { ActiveTab } from "./Header.svelte";
-  import type { BaseUrl, Node, Project } from "@http-client";
+  import type { BaseUrl, Project, SeedingPolicy } from "@http-client";
 
   import AppHeader from "@app/App/Header.svelte";
 
@@ -11,7 +11,7 @@
   import Sidebar from "@app/views/projects/Sidebar.svelte";
 
   export let activeTab: ActiveTab | undefined = undefined;
-  export let node: Node;
+  export let seedingPolicy: SeedingPolicy;
   export let baseUrl: BaseUrl;
   export let project: Project;
   export let stylePaddingBottom: string = "2.5rem";
@@ -66,11 +66,11 @@
   </div>
 
   <div class="sidebar global-hide-on-medium-desktop-down">
-    <Sidebar {node} {activeTab} {baseUrl} {project} />
+    <Sidebar {seedingPolicy} {activeTab} {baseUrl} {project} />
   </div>
 
   <div class="sidebar global-hide-on-mobile-down global-hide-on-desktop-up">
-    <Sidebar {node} {activeTab} {baseUrl} {project} collapsedOnly />
+    <Sidebar {seedingPolicy} {activeTab} {baseUrl} {project} collapsedOnly />
   </div>
 
   <div class="content" style:padding-bottom={stylePaddingBottom}>

diff --git a/src/views/projects/Patch.svelte b/src/views/projects/Patch.svelte
@@ -8,7 +8,7 @@
     PatchState,
     Revision,
     Diff,
-    Node,
+    SeedingPolicy,
   } from "@http-client";
 
   interface Thread {
@@ -92,7 +92,7 @@
   import TextInput from "@app/components/TextInput.svelte";
 
   export let baseUrl: BaseUrl;
-  export let node: Node;
+  export let seedingPolicy: SeedingPolicy;
   export let patch: Patch;
   export let stats: Diff["stats"];
   export let rawPath: (commit?: string) => string;
@@ -708,7 +708,12 @@
   }
 </style>
 
-<Layout {node} {baseUrl} {project} activeTab="patches" stylePaddingBottom="0">
+<Layout
+  {seedingPolicy}
+  {baseUrl}
+  {project}
+  activeTab="patches"
+  stylePaddingBottom="0">
   <div class="patch">
     <div class="main">
       <CobHeader>

diff --git a/src/views/projects/Patches.svelte b/src/views/projects/Patches.svelte
@@ -1,5 +1,11 @@
 <script lang="ts">
-  import type { BaseUrl, Node, Patch, PatchState, Project } from "@http-client";
+  import type {
+    BaseUrl,
+    Patch,
+    PatchState,
+    Project,
+    SeedingPolicy,
+  } from "@http-client";
 
   import { HttpdClient } from "@http-client";
   import capitalize from "lodash/capitalize";
@@ -25,7 +31,7 @@
   import Command from "@app/components/Command.svelte";
 
   export let baseUrl: BaseUrl;
-  export let node: Node;
+  export let seedingPolicy: SeedingPolicy;
   export let patches: Patch[];
   export let project: Project;
   export let state: PatchState["status"];
@@ -121,7 +127,7 @@
   }
 </style>
 
-<Layout {node} {baseUrl} {project} activeTab="patches">
+<Layout {seedingPolicy} {baseUrl} {project} activeTab="patches">
   <div slot="header" style:display="flex" style:padding="1rem">
     <Popover
       popoverPadding="0"

diff --git a/src/views/projects/Sidebar.svelte b/src/views/projects/Sidebar.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type { ActiveTab } from "./Header.svelte";
-  import type { BaseUrl, Node, Project } from "@http-client";
+  import type { BaseUrl, Project, SeedingPolicy } from "@http-client";
 
   import Button from "@app/components/Button.svelte";
   import ContextRepo from "@app/views/projects/Sidebar/ContextRepo.svelte";
@@ -13,7 +13,7 @@
   const SIDEBAR_STATE_KEY = "sidebarState";
 
   export let activeTab: ActiveTab | undefined = undefined;
-  export let node: Node;
+  export let seedingPolicy: SeedingPolicy;
   export let baseUrl: BaseUrl;
   export let project: Project;
   export let collapsedOnly = false;
@@ -41,8 +41,6 @@
     expanded = !expanded;
     storeSidebarState(expanded);
   }
-
-  $: seedingPolicy = formatShortSeedingPolicy(node.config?.seedingPolicy);
 </script>
 
 <style>

diff --git a/src/views/projects/Source.svelte b/src/views/projects/Source.svelte
@@ -1,5 +1,11 @@
 <script lang="ts">
-  import type { BaseUrl, Node, Project, Remote, Tree } from "@http-client";
+  import type {
+    BaseUrl,
+    Project,
+    Remote,
+    SeedingPolicy,
+    Tree,
+  } from "@http-client";
   import type { BlobResult, ProjectRoute } from "./router";
 
   import { HttpdClient } from "@http-client";
@@ -16,11 +22,11 @@
   export let baseUrl: BaseUrl;
   export let blobResult: BlobResult;
   export let commit: string;
-  export let node: Node;
   export let path: string;
   export let peer: string | undefined;
   export let peers: Remote[];
   export let project: Project;
+  export let seedingPolicy: SeedingPolicy;
   export let rawPath: (commit?: string) => string;
   export let revision: string | undefined;
   export let seeding: boolean;
@@ -111,7 +117,12 @@
   }
 </style>
 
-<Layout {node} {baseUrl} {project} activeTab="source" stylePaddingBottom="0">
+<Layout
+  {seedingPolicy}
+  {baseUrl}
+  {project}
+  activeTab="source"
+  stylePaddingBottom="0">
   <ProjectNameHeader {project} {baseUrl} {seeding} slot="header" />
 
   <div style:margin="1rem" slot="subheader">