fix(webapp): remove project should remove the project from board

ocftw · Jul 18, 2024 · 12053b4 · 12053b4
1 parent 1619d60
commit 12053b4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/webapp/src/game/store/slice/projectBoard.ts b/packages/webapp/src/game/store/slice/projectBoard.ts
@@ -7,7 +7,8 @@ const initialState = (): ProjectSlot[] => [];
 
 const initialize = (state: ProjectSlot[], maxProjectSlots: number): void => {
   for (let i = 0; i < maxProjectSlots; i++) {
-    state.push(ProjectSlotSlice.initialState());
+    const slotId = `project-slot-${i}`;
+    state.push(ProjectSlotSlice.initialState(slotId));
   }
 }
 
@@ -21,11 +22,11 @@ const add = (state: ProjectSlot[], card: ProjectCard): void => {
 
 const remove = (state: ProjectSlot[], removedSlots: ProjectSlot[]): void => {
   removedSlots.forEach(removeSlot => {
-  let slotToBeRemoved = state.find(slot => slot.card?.id === removeSlot.card?.id && slot.owner === removeSlot.owner);
-    if (!slotToBeRemoved) {
+    const slotIndexToBeRemoved = state.findIndex(slot => slot.id === removeSlot.id);
+    if (slotIndexToBeRemoved === -1) {
       throw new Error('Project slot not found');
     }
-    slotToBeRemoved = ProjectSlotSlice.initialState();
+    state[slotIndexToBeRemoved] = ProjectSlotSlice.initialState(removeSlot.id);
   });
 }
 

diff --git a/packages/webapp/src/game/store/slice/projectSlot/projectSlot.ts b/packages/webapp/src/game/store/slice/projectSlot/projectSlot.ts
@@ -10,14 +10,16 @@ export interface ProjectContribution {
 }
 
 export interface ProjectSlot {
+  id: string;
   card?: ProjectCard;
   owner: PlayerID;
   ownerToken: number;
   contributions: ProjectContribution[];
   lastContributor: PlayerID;
 }
 
-const initialState = (): ProjectSlot => ({
+const initialState = (id: string): ProjectSlot => ({
+  id,
   owner: '',
   ownerToken: 0,
   contributions: [],