Fix sort by date in open dialog

Author: gomander

src/lib/components/OpenCloudDialog.svelte

@@ -20,9 +20,9 @@
   $: sortedWheels = apiWheels.sort((a, b) => {
     switch (sort) {
       case 'updated-desc':
-        return Number(b.updated || b.created) - Number(a.updated || a.created)
+        return (b.updated || b.created) - (a.updated || a.created)
       case 'updated-asc':
-        return Number(a.updated || a.created) - Number(b.updated || b.created)
+        return (a.updated || a.created) - (b.updated || b.created)
       case 'title-asc':
         return a.title.localeCompare(b.title)
       case 'title-desc':
@@ -179,7 +179,7 @@
               name="wheel"
               value={wheel.path}
             >
-              <div class="min-h-12 flex flex-col justify-center">
+              <div class="min-h-14 flex flex-col justify-center">
                 <div class="flex gap-2 justify-center items-center">
                   <span class="text-lg font-semibold">{wheel.title}</span>
                   {#if wheel.visibility === 'private'}
@@ -199,6 +199,8 @@
             <div class="flex justify-center items-center min-h-14">
               No wheels found
             </div>
+          {:else if filteredWheels.length > wheelsPerPage}
+            <div style="height: {4 * (wheelsPerPage - pageWheels.length)}rem" />
           {/if}
         </RadioGroup>
       {:else if loading}

src/lib/server/FirebaseAdmin.ts

@@ -1,9 +1,9 @@
 import { initializeApp } from 'firebase-admin/app'
 import { getFirestore } from 'firebase-admin/firestore'
 import { FirebaseError } from 'firebase/app'
-import { firebaseConfig } from '$lib/utils/Firebase'
+import { firebaseConfig, type DbWheelMeta } from '$lib/utils/Firebase'
 import type {
-  ApiUser, ApiWheel, ApiWheelMeta, WheelVisibility
+  ApiUser, ApiWheel, CreateWheelMeta, WheelVisibility
 } from '$lib/utils/Api'
 
 try {
@@ -21,7 +21,7 @@ export const getWheel = async (path: string, uid?: string | null) => {
   if (!metaSnap.exists) {
     return null
   }
-  const meta = metaSnap.data() as ApiWheelMeta
+  const meta = metaSnap.data() as DbWheelMeta
   if (meta.visibility === 'private' && meta.uid !== uid) {
     return null
   }
@@ -36,7 +36,7 @@ export const getWheels = async (uid: string) => {
   const metaSnap = await db.collection('wheel-meta').where(
     'uid', '==', uid
   ).get()
-  const paths = metaSnap.docs.map(doc => (doc.data() as ApiWheelMeta).path)
+  const paths = metaSnap.docs.map(doc => (doc.data() as DbWheelMeta).path)
   const wheelSnaps = await db.getAll(
     ...paths.map(path => db.doc(`wheels/${path}`))
   )
@@ -59,7 +59,13 @@ export const getWheelMetaForPaths = async (paths: string[]) => {
   const metaSnaps = await db.getAll(
     ...paths.map(path => db.doc(`wheel-meta/${path}`))
   )
-  return metaSnaps.map(snap => snap.data() as ApiWheelMeta)
+  return metaSnaps.map(
+    snap => snap.data() as DbWheelMeta
+  ).map(meta => ({
+    ...meta,
+    created: meta.created._seconds * 1000,
+    updated: meta.updated ? meta.updated._seconds * 1000 : null
+  }))
 }
 
 export const saveWheel = async (
@@ -74,7 +80,7 @@ export const saveWheel = async (
     updated: null,
     title: wheel.config.title,
     views: 0
-  } satisfies ApiWheelMeta)
+  } satisfies CreateWheelMeta)
   await db.collection('wheels').doc(path).create(
     { path, ...wheel } satisfies ApiWheel
   )
@@ -97,11 +103,11 @@ export const updateWheel = async (
   if (!metaSnap.exists) {
     return null
   }
-  const meta = metaSnap.data() as ApiWheelMeta
+  const meta = metaSnap.data() as DbWheelMeta
   if (meta.uid !== uid) {
     return null
   }
-  const newMeta: Partial<ApiWheelMeta> = { updated: new Date() }
+  const newMeta: Partial<CreateWheelMeta> = { updated: new Date() }
   if (wheel.config && wheel.config.title !== meta.title) {
     newMeta.title = wheel.config.title
   }

src/lib/utils/Api.ts

@@ -111,12 +111,17 @@ export interface ApiWheelMeta {
   path: string
   uid: string
   visibility: WheelVisibility
-  created: Date
-  updated: Date | null
+  created: number
+  updated: number | null
   title: string
   views: number
 }
 
+export interface CreateWheelMeta extends Omit<ApiWheelMeta, 'created' | 'updated'> {
+  created: Date
+  updated: Date | null
+}
+
 export interface CreateWheelData {
   wheel: Omit<ApiWheel, 'path'>
   visibility: WheelVisibility

src/lib/utils/Firebase.ts

@@ -13,6 +13,17 @@ import {
   PUBLIC_FIREBASE_MESSAGING_SENDER_ID, PUBLIC_FIREBASE_APP_ID,
   PUBLIC_FIREBASE_MEASUREMENT_ID
 } from '$env/static/public'
+import type { ApiWheelMeta } from '$lib/utils/Api'
+
+interface DbDate {
+  _seconds: number
+  _nanoseconds: number
+}
+
+export interface DbWheelMeta extends Omit<ApiWheelMeta, 'created' | 'updated'> {
+  created: DbDate,
+  updated: DbDate | null
+}
 
 interface DbUser {
   createdAt: Date