feat: update order by

Author: luannguyenQV

apps/web/@/constants/upload.ts

@@ -0,0 +1,6 @@
+export const OrderByField = {
+  newest: "newest",
+  oldest: "oldest",
+  nameAsc: "name_asc",
+  nameDesc: "name_desc",
+}

apps/web/@/hooks/useGetImages.ts

@@ -25,7 +25,6 @@ export function useGetImages(filter: IImageFilter) {
 
       if (filter.search) queryParams.append("search", filter.search)
       if (filter.order) queryParams.append("order", filter.order)
-      if (filter.orderBy) queryParams.append("orderBy", filter.orderBy)
       queryParams.append("page", (index + 1).toString())
 
       return `/api/protected/images?${queryParams.toString()}`

apps/web/@/molecules/upload/AssetsManagement.tsx

@@ -13,6 +13,7 @@ const AssetManagement = () => {
   const filterParams = useMemo(() => {
     return {
       search,
+      // order,
     }
   }, [search])
 

apps/web/@/molecules/upload/FileManagerContainer.tsx

@@ -2,12 +2,7 @@ import React, { createContext, useCallback, useContext, useReducer } from "react
 
 import { Image, OrderBy } from "database"
 
-export const OrderByField = {
-  newest: "newest",
-  oldest: "oldest",
-  nameAsc: "name_asc",
-  nameDesc: "name_desc",
-}
+import { OrderByField } from "@/constants/upload"
 
 export type FileManagerState = {
   selectedFiles: Image[]

apps/web/@/molecules/upload/ImageSearchBar.tsx

@@ -12,14 +12,11 @@ import {
   DropdownMenuSeparator,
   DropdownMenuTrigger,
   Input,
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
 } from "ui"
 
-import { OrderByField, useFileManager } from "./FileManagerContainer"
+import { OrderByField } from "@/constants/upload"
+
+import { useFileManager } from "./FileManagerContainer"
 
 export default function ImageSearchBar() {
   const t = useTranslations()

apps/web/app/api/protected/images/route.ts

@@ -6,22 +6,41 @@ import { createImage, getImage, getImages, IImageFilter, ImageOrderBys, OrderBy
 import sharp from "sharp"
 import { v4 as uuidv4 } from "uuid"
 
+import { OrderByField } from "@/constants/upload"
 import { getServerSession } from "@/utils/auth"
 
+const OrderMap = {
+  [OrderByField.nameAsc]: {
+    order: "asc",
+    orderBy: "name",
+  },
+  [OrderByField.nameDesc]: {
+    order: "desc",
+    orderBy: "name",
+  },
+  [OrderByField.newest]: {
+    order: "asc",
+    orderBy: "createdAt",
+  },
+  [OrderByField.oldest]: {
+    order: "desc",
+    orderBy: "createdAt",
+  },
+}
+
 export async function GET(request: NextRequest) {
   const searchParams = request.nextUrl.searchParams
   const page = searchParams.get("page") ? parseInt(searchParams.get("page")!) : 1
   const limit = searchParams.get("limit") ? parseInt(searchParams.get("limit")!) : 10
   const search = searchParams.get("search") || undefined
-  const orderBy = searchParams.get("orderBy") || undefined
-  const order = searchParams.get("order") || undefined
+  const order = searchParams.get("order") || OrderByField.newest
 
   const params: IImageFilter = {
     page,
     limit,
     search,
-    orderBy: orderBy as ImageOrderBys,
-    order: order as OrderBy,
+    orderBy: OrderMap[order].orderBy as ImageOrderBys,
+    order: OrderMap[order].order as OrderBy,
   }
 
   try {

packages/database/src/images/queries.ts

@@ -15,6 +15,8 @@ export const getImages = async (options: IImageFilter): Promise<IListImageRespon
     search,
   } = options
 
+  console.log(">>>options", options)
+
   try {
     let where = {}
     if (userId) {