feat(vil-610): can edit draft

parlemonde · Oct 16, 2024 · 2c024ec · 2c024ec
1 parent ec2cec5
commit 2c024ec
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 16 deletions.
diff --git a/server/controllers/game.ts b/server/controllers/game.ts
@@ -302,7 +302,7 @@ gameController.post({ path: '/standardGame', userType: UserType.TEACHER }, async
   }
 
   const data = req.body;
-  const { game1, game2, game3, userId, villageId, type, subType, selectedPhase, status, activityId } = data;
+  const { game1, game2, game3, userId, villageId, type, subType, selectedPhase, status, activityId, draftUrl } = data;
 
   //save draft game each step
   if (status && status === ActivityStatus.DRAFT) {
@@ -311,23 +311,23 @@ gameController.post({ path: '/standardGame', userType: UserType.TEACHER }, async
         updateGameDraftIfExists(activityId, game1.data, game1.content);
         return;
       }
-      createGame(game1, userId, villageId, type, subType, selectedPhase, status);
+      createGame(game1, userId, villageId, type, subType, selectedPhase, status, draftUrl);
       res.sendStatus(200);
       return;
     } else if (game2) {
       if (activityId) {
         updateGameDraftIfExists(activityId, game1.data, game1.content);
         return;
       }
-      createGame(game2, userId, villageId, type, subType, selectedPhase, status);
+      createGame(game2, userId, villageId, type, subType, selectedPhase, status, draftUrl);
       res.sendStatus(200);
       return;
     } else if (game3) {
       if (activityId) {
         updateGameDraftIfExists(activityId, game1.data, game1.content);
         return;
       }
-      createGame(game3, userId, villageId, type, subType, selectedPhase, status);
+      createGame(game3, userId, villageId, type, subType, selectedPhase, status, draftUrl);
       res.sendStatus(200);
       return;
     }
@@ -346,13 +346,15 @@ async function createGame(
   subType: number,
   selectedPhase: number,
   status: number,
+  draftUrl: string,
 ) {
   const activity = new Activity();
   activity.type = type;
   activity.subType = subType;
   activity.status = status;
   // TODO: Travailler sur le type de data
   activity.data = data as unknown as AnyData;
+  activity.data.draftUrl = draftUrl;
   activity.phase = selectedPhase;
   activity.content = data;
   activity.userId = userId;

diff --git a/src/components/activities/ActivityCard/GameCard.tsx b/src/components/activities/ActivityCard/GameCard.tsx
@@ -1,11 +1,10 @@
+import { Button } from '@mui/material';
 import Image from 'next/image';
 import Link from 'next/link';
 import router from 'next/router';
 import React, { useState, useEffect } from 'react';
 import ReactPlayer from 'react-player';
 
-import { Button } from '@mui/material';
-
 import { CommentIcon } from './CommentIcon';
 import type { ActivityCardProps } from './activity-card.types';
 import { useCountAllStandardGame } from 'src/api/game/game.getAllGames';
@@ -169,17 +168,17 @@ export const GameCard = ({ activity, isSelf, noButtons, isDraft, showEditButtons
                     <Link
                       href={
                         isDraft && activity.data.draftUrl
-                          ? `${activity.data.draftUrl}?activity-id=${activity.id}`
-                          : `/creer-un-jeu/mimique/4?activity-id=${activity.id}`
+                          ? `${activity.data.draftUrl}?activity_id=${activity.id}`
+                          : `/creer-un-jeu/mimique/4?activity_id=${activity.id}`
                       }
                       passHref
                     >
                       <Button
                         component="a"
                         href={
                           isDraft && activity.data.draftUrl
-                            ? `${activity.data.draftUrl}?activity-id=${activity.id}`
-                            : `/creer-un-jeu/mimique/4?activity-id=${activity.id}`
+                            ? `${activity.data.draftUrl}?activity_id=${activity.id}`
+                            : `/creer-un-jeu/mimique/4?activity_id=${activity.id}`
                         }
                         color="secondary"
                         variant="contained"

diff --git a/src/contexts/activityContext.tsx b/src/contexts/activityContext.tsx
@@ -1,9 +1,8 @@
+import { Card, CircularProgress } from '@mui/material';
 import { useRouter } from 'next/router';
 import React from 'react';
 import { useQueryClient } from 'react-query';
 
-import { Card, CircularProgress } from '@mui/material';
-
 import { UserContext } from './userContext';
 import { VillageContext } from './villageContext';
 import { Modal } from 'src/components/Modal';

diff --git a/src/contexts/gameContext.tsx b/src/contexts/gameContext.tsx
@@ -1,11 +1,10 @@
+import { Card } from '@mui/material';
 import type { ReactNode } from 'react';
 import React, { createContext, useContext, useState } from 'react';
-import { Card } from '@mui/material';
 
 import { postGameDataMonneyOrExpression } from 'src/api/game/game.post';
 import { GAME_FIELDS_CONFIG } from 'src/config/games/game';
 import { primaryColor } from 'src/styles/variables.const';
-
 import type { inputType, StepsTypes, GameDataMonneyOrExpression } from 'types/game.type';
 import { GameType } from 'types/game.type';
 

diff --git a/src/pages/creer-un-jeu/mimique/1.tsx b/src/pages/creer-un-jeu/mimique/1.tsx
@@ -35,6 +35,7 @@ const MimiqueStep1 = () => {
       },
       selectedPhase: selectedPhase,
       status: ActivityStatus.DRAFT,
+      draftUrl: window.location.pathname,
     };
     saveDraftGrame(data);
     router.push('/creer-un-jeu/mimique/2');

diff --git a/src/pages/creer-un-jeu/mimique/2.tsx b/src/pages/creer-un-jeu/mimique/2.tsx
@@ -33,6 +33,7 @@ const MimiqueStep2 = () => {
       },
       selectedPhase: selectedPhase,
       status: ActivityStatus.DRAFT,
+      draftUrl: window.location.pathname,
     };
     saveDraftGrame(data);
     router.push('/creer-un-jeu/mimique/3');

diff --git a/src/pages/creer-un-jeu/mimique/3.tsx b/src/pages/creer-un-jeu/mimique/3.tsx
@@ -33,6 +33,7 @@ const MimiqueStep3 = () => {
       },
       selectedPhase: selectedPhase,
       status: ActivityStatus.DRAFT,
+      draftUrl: window.location.pathname,
     };
     saveDraftGrame(data);
     router.push('/creer-un-jeu/mimique/4');

diff --git a/src/pages/creer-un-jeu/mimique/4.tsx b/src/pages/creer-un-jeu/mimique/4.tsx
@@ -1,8 +1,7 @@
+import { Button, Tooltip, Backdrop, CircularProgress } from '@mui/material';
 import { useRouter } from 'next/router';
 import React, { useContext } from 'react';
 
-import { Button, Tooltip, Backdrop, CircularProgress } from '@mui/material';
-
 import { postGameDataMonneyOrExpression } from 'src/api/game/game.post';
 import { Base } from 'src/components/Base';
 import { PageLayout } from 'src/components/PageLayout';

diff --git a/types/game.type.ts b/types/game.type.ts
@@ -161,6 +161,7 @@ export type GameDataMonneyOrExpression = {
   game3?: GameDataStep;
   selectedPhase: number;
   status?: number;
+  draftUrl?: string;
 };
 export type DataForPlayed = {
   game: StepsTypes;