Omit loading message from project sidebar

Little more optimization of pinned list loading Last bit of optim
MuckRock · Feb 20, 2024 · 96baa0e · 96baa0e
1 parent 1c7ee2c
commit 96baa0e
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 38 deletions.
diff --git a/src/pages/app/sidebar/projects/ProjectList.svelte b/src/pages/app/sidebar/projects/ProjectList.svelte
@@ -11,8 +11,12 @@
   import Button from "../../../../common/Button.svelte";
   import ProjectListItem from "./ProjectListItem.svelte";
   import ListHeader from "../ListHeader.svelte";
-  import { pinned as pinStore } from "../../../../projects/ProjectPin.svelte";
+  import {
+    pinned as pinStore,
+    sortPins,
+  } from "../../../../projects/ProjectPin.svelte";
   import { ChevronRight16, ChevronDown16 } from "svelte-octicons";
+  import { onMount } from "svelte";
 
   export let user: User;
   export let editProject;
@@ -23,28 +27,22 @@
     expanded.update((val) => !val);
   }
 
-  function sort(projects: Project[]): Project[] {
-    if (projects === null) return [];
-    try {
-      projects.sort((a, b) => a.title.localeCompare(b.title));
-    } catch (e) {}
-    return projects;
-  }
-
   async function getPinnedList() {
     const pinned = (await getProjects(user.id)).filter(
       (project) => project.pinned,
     );
     // if they're equivalent, don't update the store value
     // this prevents an endless update loop
-    if (!equal($pinStore, pinned)) $pinStore = sort(pinned);
-    return sort(pinned);
+    if (!equal($pinStore, pinned)) $pinStore = sortPins(pinned);
   }
 
-  let promise = getPinnedList();
-
   // when the pinstore changes, refetch the list
-  $: $pinStore, (promise = getPinnedList());
+  $: $pinStore, getPinnedList();
+
+  // fetch the list on mount
+  onMount(async () => {
+    await getPinnedList();
+  });
 </script>
 
 <ListHeader>
@@ -61,28 +59,22 @@
   </Button>
 </ListHeader>
 {#if $expanded}
-  {#await promise}
-    <p>Loading…</p>
-  {:then projects}
-    <div class="projectcontainer">
-      {#if projects.length > 0}
-        {#each projects as project}
-          <Link toUrl={projectUrl(project)}>
-            <ProjectListItem
-              title={project.title}
-              onEditClick={project.edit_access
-                ? () => editProject(new ProjectStructure(project))
-                : undefined}
-            />
-          </Link>
-        {/each}
-      {:else}
-        <small>{$_("projects.pinsEmpty")}</small>
-      {/if}
-    </div>
-  {:catch}
-    <p>Error!</p>
-  {/await}
+  <div class="projectcontainer">
+    {#if $pinStore.length > 0}
+      {#each $pinStore as project}
+        <Link toUrl={projectUrl(project)}>
+          <ProjectListItem
+            title={project.title}
+            onEditClick={project.edit_access
+              ? () => editProject(new ProjectStructure(project))
+              : undefined}
+          />
+        </Link>
+      {/each}
+    {:else}
+      <small>{$_("projects.pinsEmpty")}</small>
+    {/if}
+  </div>
 {/if}
 
 <style>
@@ -108,9 +100,11 @@
     z-index: var(--sidebarStickyZ);
   }
 
-  small {
+  small,
+  .loading {
     font-size: 13px;
     color: var(--gray);
+    text-align: center;
     margin: 0 24px;
     display: block;
   }

diff --git a/src/projects/ProjectPin.svelte b/src/projects/ProjectPin.svelte
@@ -3,6 +3,14 @@
   import type { Project } from "../api/types/project";
 
   export const pinned: Writable<Project[]> = writable([]);
+
+  export function sortPins(projects: Project[]): Project[] {
+    if (projects === null) return [];
+    try {
+      projects.sort((a, b) => a.title.localeCompare(b.title));
+    } catch (e) {}
+    return projects;
+  }
 </script>
 
 <script lang="ts">
@@ -47,7 +55,7 @@
 
     // now that we've updated, set $pinned
     $pinned = project.pinned
-      ? [...$pinned, project]
+      ? sortPins([...$pinned, project])
       : $pinned.filter((a) => a.id !== project.id);
   }
 </script>