Merge branch 'main' into commenting-for-report

cearps · Oct 20, 2024 · def94c6 · def94c6
2 parents b9249af + 8c356bf
commit def94c6
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 21 deletions.
diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -13,7 +13,7 @@ RUN npm install
 COPY . .
 
 # Build the React app using Vite
-ENV REACT_APP_API_URL=http://localhost:8080
+ENV REACT_APP_API_PORT=8080
 RUN npm run build
 
 # Serve stage

diff --git a/frontend/Dockerfile.frontendTesting b/frontend/Dockerfile.frontendTesting
@@ -9,5 +9,5 @@ RUN npm install
 
 COPY . .
 
-ENV REACT_APP_API_URL=http://localhost:8080
+ENV REACT_APP_API_PORT=8080
 CMD ["npm", "run", "dev"]
diff --git a/frontend/src/api/apiConfig.tsx b/frontend/src/api/apiConfig.tsx
@@ -1 +1,3 @@
-export const API_URL = process.env.REACT_APP_API_URL || "http://localhost:3001";
+export const API_URL =
+  `http://${window.location.hostname}:${process.env.REACT_APP_API_PORT}` ||
+  `http://${window.location.hostname}:3001`;
diff --git a/frontend/src/components/kanbans/kanban-list-view.tsx b/frontend/src/components/kanbans/kanban-list-view.tsx
@@ -61,8 +61,7 @@ export default function KanbanListView() {
         name,
         dueDate,
       }).subscribe({
-        next: (board) => {
-          setKanbanBoards((prevBoards) => [...prevBoards, board]);
+        next: () => {
           setIsModalOpen(false);
           setFormErrors("");
         },
@@ -85,9 +84,6 @@ export default function KanbanListView() {
     if (boardToDelete !== null) {
       KanbanAPI.deleteKanbanBoardObservable(boardToDelete).subscribe({
         next: () => {
-          setKanbanBoards((prevBoards) =>
-            prevBoards.filter((board) => board.id !== boardToDelete)
-          );
           setBoardToDelete(null);
           setIsConfirmModalOpen(false);
         },
@@ -165,17 +161,24 @@ export default function KanbanListView() {
         </svg>
       </div>
       <div className="flex flex-wrap flex-col lg:flex-row">
-        {kanbanBoards.map((board: KanbanBoard) => (
-          <BoardCard
-            key={board.id}
-            id={board.id}
-            title={board.name}
-            dueDate={board.dueDate}
-            onDelete={handleDeleteBoard}
-            onEdit={() => handleEditBoard(board)}
-            onAddUser={() => handleAddUser(board)}
-          />
-        ))}
+        {kanbanBoards
+          .filter(
+            (board) =>
+              board.name !== undefined &&
+              board.name !== "" &&
+              board.name !== null
+          )
+          .map((board: KanbanBoard) => (
+            <BoardCard
+              key={board.id}
+              id={board.id}
+              title={board.name}
+              dueDate={board.dueDate}
+              onDelete={handleDeleteBoard}
+              onEdit={() => handleEditBoard(board)}
+              onAddUser={() => handleAddUser(board)}
+            />
+          ))}
       </div>
 
       {/* AddBoardForm Modal */}

diff --git a/frontend/test/components/kanbans/kanban-list-view.test.tsx b/frontend/test/components/kanbans/kanban-list-view.test.tsx
@@ -81,7 +81,6 @@ describe("KanbanListView", () => {
     });
     fireEvent.click(screen.getByRole("button", { name: /create board/i }));
     // Wait for the new board to be rendered
-    expect(await screen.findByText("New Board")).toBeInTheDocument();
   });
 
   test("handles board update", async () => {
@@ -155,6 +154,5 @@ describe("KanbanListView", () => {
     fireEvent.click(screen.getByRole("button", { name: /confirm/i }));
 
     // Ensure the board is no longer rendered
-    expect(await screen.queryByText("Test Board")).not.toBeInTheDocument();
   });
 });