Merge branch 'sort_antennas_and_lists' into production

aliceif · Nov 21, 2024 · b7de71c · b7de71c
2 parents 92057e4 + e7408ae
commit b7de71c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/packages/frontend/src/pages/my-antennas/index.vue b/packages/frontend/src/pages/my-antennas/index.vue
@@ -35,7 +35,7 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 import { antennasCache } from '@/cache.js';
 import { infoImageUrl } from '@/instance.js';
 
-const antennas = computed(() => antennasCache.value.value ?? []);
+const antennas = computed(() => (antennasCache.value.value ?? []).sort((x, y) => x.name.localeCompare(y.name)));
 
 function fetch() {
 	antennasCache.fetch();

diff --git a/packages/frontend/src/pages/my-lists/index.vue b/packages/frontend/src/pages/my-lists/index.vue
@@ -41,7 +41,7 @@ import { signinRequired } from '@/account.js';
 
 const $i = signinRequired();
 
-const items = computed(() => userListsCache.value.value ?? []);
+const items = computed(() => (userListsCache.value.value ?? []).sort((x, y) => x.name.localeCompare(y.name)));
 
 function fetch() {
 	userListsCache.fetch();

diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
@@ -131,7 +131,7 @@ function top(): void {
 }
 
 async function chooseList(ev: MouseEvent): Promise<void> {
-	const lists = await userListsCache.fetch();
+	const lists = (await userListsCache.fetch()).sort((x, y) => x.name.localeCompare(y.name));
 	const items: MenuItem[] = [
 		...lists.map(list => ({
 			type: 'link' as const,
@@ -150,7 +150,7 @@ async function chooseList(ev: MouseEvent): Promise<void> {
 }
 
 async function chooseAntenna(ev: MouseEvent): Promise<void> {
-	const antennas = await antennasCache.fetch();
+	const antennas = (await antennasCache.fetch()).sort((x, y) => x.name.localeCompare(y.name));
 	const items: MenuItem[] = [
 		...antennas.map(antenna => ({
 			type: 'link' as const,