Merge pull request #154 from WildCodeSchool/feature/131/order-article…

…s-in-admin-dashboard order articles by product in dashboard admin
WildCodeSchool · Dec 13, 2024 · 51734ac · 51734ac
2 parents 9e9a31b + af23883
commit 51734ac
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/backend/src/resolvers/ArticleResolver.ts b/backend/src/resolvers/ArticleResolver.ts
@@ -24,7 +24,8 @@ class NewArticleInput {
 class ArticleResolver {
   @Query(() => [Article])
   async getAllArticles() {
-    const article = await Article.find({ relations: { product: true, reservations: true } })
+    const article = await Article.find({ relations: { product: true, reservations: true }, order: { product: {name: "ASC" }} 
+    })
     return article
   }
 

diff --git a/frontend/src/components/ArticleReservationCard.tsx b/frontend/src/components/ArticleReservationCard.tsx
@@ -14,7 +14,7 @@ export const ArticleReservationCard = ({
   return (
     <>
       {reservationData.reservation.status === "pending" ? (
-        <Card title={`Détails de votre réservation`} style={{ width: 500 }}>
+        <Card title={"Détails de votre réservation"} style={{ width: 500 }}>
           {articles.map((article) => (
             <Card style={{ margin: 20 }} key={article.product?.id}>
               <div

diff --git a/frontend/src/components/CancelReservationButton.tsx b/frontend/src/components/CancelReservationButton.tsx
@@ -1,13 +1,13 @@
 import { useMutation } from "@apollo/client";
 import { Button, message, Popconfirm } from "antd";
 import { CANCEL_RESERVATION } from "../graphql/mutations";
-import { Reservation } from "../interface/types";
+import { ReservationData } from "../interface/types";
 import {
   GetCurrentReservationByUserIdDocument,
   GetReservationsByUserIdDocument,
 } from "../generated/graphql-types";
 
-function CancelReservationButton({ reservation }: Reservation) {
+function CancelReservationButton({ reservation }: ReservationData) {
   const [cancelReservation] = useMutation(CANCEL_RESERVATION, {
     onCompleted: () => {
       message.success("La réservation a bien été annulée.");