From 670d24bbd0573c76b1202ecdbebbcaaecfe7d988 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Tue, 27 Feb 2024 12:28:17 +0000
Subject: [PATCH] refactor: remove fIltered proposals components

and embed the now much simpiler code into the required pages
---
 .../components/proposals/ProposalsList.svelte |  2 +-
 src/lib/wrappers/OpenProposals.svelte         | 17 ----------------
 src/lib/wrappers/RecentProposals.svelte       | 20 -------------------
 src/routes/+page.svelte                       | 17 ++++++++++++++--
 src/routes/repo/[repo_id]/+page.svelte        | 14 +++++++++++--
 5 files changed, 28 insertions(+), 42 deletions(-)
 delete mode 100644 src/lib/wrappers/OpenProposals.svelte
 delete mode 100644 src/lib/wrappers/RecentProposals.svelte

diff --git a/src/lib/components/proposals/ProposalsList.svelte b/src/lib/components/proposals/ProposalsList.svelte
index 79a5cf2..a2d3b68 100644
--- a/src/lib/components/proposals/ProposalsList.svelte
+++ b/src/lib/components/proposals/ProposalsList.svelte
@@ -32,7 +32,7 @@
         <ProposalsListItem loading={true} />
         <ProposalsListItem loading={true} />
       {/if}
-    {:else if allow_more && proposals.length > current_limit}
+    {:else if allow_more && limit !== 0 && proposals.length > current_limit}
       <button
         on:click={() => {
           current_limit = current_limit + 5
diff --git a/src/lib/wrappers/OpenProposals.svelte b/src/lib/wrappers/OpenProposals.svelte
deleted file mode 100644
index 4e6860b..0000000
--- a/src/lib/wrappers/OpenProposals.svelte
+++ /dev/null
@@ -1,17 +0,0 @@
-<script lang="ts">
-  import ProposalsList from '$lib/components/proposals/ProposalsList.svelte'
-  import {
-    ensureProposalSummaries,
-    proposal_summaries,
-  } from '$lib/stores/Proposals'
-
-  export let repo_id: string = ''
-
-  ensureProposalSummaries(repo_id)
-</script>
-
-<ProposalsList
-  title="Open Proposals"
-  proposals={$proposal_summaries.summaries}
-  loading={$proposal_summaries.loading}
-/>
diff --git a/src/lib/wrappers/RecentProposals.svelte b/src/lib/wrappers/RecentProposals.svelte
deleted file mode 100644
index 9b6144f..0000000
--- a/src/lib/wrappers/RecentProposals.svelte
+++ /dev/null
@@ -1,20 +0,0 @@
-<script lang="ts">
-  import ProposalsList from '$lib/components/proposals/ProposalsList.svelte'
-  import {
-    ensureProposalSummaries,
-    proposal_summaries,
-  } from '$lib/stores/Proposals'
-
-  ensureProposalSummaries(undefined)
-  let limit = 6
-  let allow_more = true
-</script>
-
-<ProposalsList
-  title="Recent Proposals"
-  proposals={$proposal_summaries.summaries}
-  show_repo={true}
-  loading={$proposal_summaries.loading}
-  {limit}
-  {allow_more}
-/>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 79ba4b7..b615f51 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,7 +1,13 @@
 <script lang="ts">
   import Container from '$lib/components/Container.svelte'
-  import PatchesRecent from '$lib/wrappers/RecentProposals.svelte'
+  import ProposalsList from '$lib/components/proposals/ProposalsList.svelte'
+  import {
+    ensureProposalSummaries,
+    proposal_summaries,
+  } from '$lib/stores/Proposals'
   import ReposRecent from '$lib/wrappers/ReposRecent.svelte'
+
+  ensureProposalSummaries(undefined)
 </script>
 
 <div role="alert" class="alert">
@@ -68,7 +74,14 @@
     </div>
   </div>
   <div class="hero md:basis-1/2">
-    <PatchesRecent />
+    <ProposalsList
+      title="Recent Proposals"
+      proposals={$proposal_summaries.summaries}
+      show_repo={true}
+      loading={$proposal_summaries.loading}
+      limit={6}
+      allow_more={true}
+    />
   </div>
 </div>
 <Container>
diff --git a/src/routes/repo/[repo_id]/+page.svelte b/src/routes/repo/[repo_id]/+page.svelte
index b706efe..2a79b2b 100644
--- a/src/routes/repo/[repo_id]/+page.svelte
+++ b/src/routes/repo/[repo_id]/+page.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
   import RepoDetails from '$lib/wrappers/RepoDetails.svelte'
-  import OpenProposals from '$lib/wrappers/OpenProposals.svelte'
   import {
     ensureSelectedRepoCollection,
     selected_repo_collection,
@@ -8,13 +7,20 @@
   } from '$lib/stores/repo'
   import RepoHeader from '$lib/components/repo/RepoHeader.svelte'
   import Container from '$lib/components/Container.svelte'
+  import {
+    ensureProposalSummaries,
+    proposal_summaries,
+  } from '$lib/stores/Proposals'
+  import ProposalsList from '$lib/components/proposals/ProposalsList.svelte'
 
   export let data: { repo_id: string }
   let identifier = data.repo_id
 
   ensureSelectedRepoCollection(identifier)
+  ensureProposalSummaries(identifier)
 
   let repo_error = false
+
   $: {
     repo_error =
       !$selected_repo_collection.loading &&
@@ -46,7 +52,11 @@
   <Container>
     <div class="mt-2 md:flex">
       <div class="md:mr-2 md:w-2/3">
-        <OpenProposals repo_id={identifier} />
+        <ProposalsList
+          title="Open Proposals"
+          proposals={$proposal_summaries.summaries}
+          loading={$proposal_summaries.loading}
+        />
       </div>
       <div class="prose ml-2 hidden w-1/3 md:flex">
         <RepoDetails repo_id={identifier} />