Merge pull request #14 from Parrit/qa_fixes

Handle null people in pairing history

.github/workflows/playwright.yml

@@ -90,6 +90,13 @@ jobs:
               exit 0
             fi
           done
+      - name: Trigger Pages Workflow
+        run: |
+          curl -X POST \
+            -H "Accept: application/vnd.github.v3+json" \
+            -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+            https://api.github.com/repos/${{ github.repository }}/actions/workflows/pages.yml/dispatches \
+            -d '{"ref":"gh-pages"}'
       - name: Output Report URL as Workflow Annotation
         run: |
           FULL_HTML_REPORT_URL=https://parrit.github.io/parrit-remix-netlify/$HTML_REPORT_URL_PATH

app/routes/project.$projectId.history/load_history.server.ts

@@ -113,7 +113,7 @@ export default async (
       peopleSet.add(localPeople[r.person_id])
     );
 
-    instance.people = Array.from(peopleSet);
+    instance.people = Array.from(peopleSet).filter((p) => p !== null);
     snapshot.pairingInstances[idx] = instance;
     snapshots[pairingTime] = snapshot;
   });

app/routes/project.$projectId/components/history/PairingHistoryRecord.tsx

@@ -1,13 +1,23 @@
 import { DateTime } from "luxon";
 import React, { useContext } from "react";
-import { ProjectPairingSnapshot } from "~/api/common/interfaces/parrit.interfaces";
+import {
+  Person,
+  ProjectPairingSnapshot,
+} from "~/api/common/interfaces/parrit.interfaces";
 import { ProjectContext } from "../../contexts/ProjectContext";
 import { TrashIcon } from "~/ui/TrashIcon";
 
 interface Props {
   pairingArrangement: ProjectPairingSnapshot;
 }
 
+const snip = (person?: Person): string => {
+  if (!person) {
+    return "null";
+  }
+  return person.name.slice(0, 3);
+};
+
 const PairingHistoryRecord: React.FC<Props> = (props) => {
   const { pairingArrangement } = props;
   const formattedDate = DateTime.fromISO(
@@ -20,7 +30,7 @@ const PairingHistoryRecord: React.FC<Props> = (props) => {
     .map((instance) => {
       const pbName = instance.pairingBoardName ?? "null";
       // get the first 3 letters of each person's name
-      const names = instance.people.map((person) => person.name.slice(0, 3));
+      const names = instance.people.map(snip);
       names.push(pbName.slice(0, 3));
       // alphabetize the names
       names.sort();

app/routes/project.$projectId/contexts/ProjectContext.tsx

@@ -325,6 +325,8 @@ export const ProjectProvider: React.FC<Props> = (props) => {
     );
   };
 
+  console.log("Project", project);
+
   const value = {
     findPairingBoardByRole,
     findPairingBoardByPerson,

app/routes/project.$projectId/hydrateProject.server.ts

@@ -141,8 +141,8 @@ export default async ({ request }: LoaderFunctionArgs): Promise<Project> => {
       name: "Floating",
       exempt: false,
     },
-    people: Array.from(peopleMap.values()),
-    roles: Array.from(roleMap.values()),
+    people: Array.from(peopleMap.values()).filter((v) => v !== null),
+    roles: Array.from(roleMap.values()).filter((v) => v !== null),
   };
 
   return project;

e2e_tests/fixtures/index.ts

@@ -3,7 +3,7 @@
 import { ProjectPage } from "./ProjectPage";
 import { test as base, expect as baseExpect, Page } from "@playwright/test";
 
-const UI_DELAY = 2000;
+const UI_DELAY = 2500;
 
 export interface LoginInfo {
   projectName: string;
@@ -44,7 +44,7 @@ export const test = base.extend<ParritFixtures>({
     await freshPage.getByTestId("projectName").press("Tab");
     await freshPage.getByTestId("password").fill(password);
     await freshPage.getByTestId("submit").click();
-    await freshPage.waitForTimeout(UI_DELAY);
+    await freshPage.waitForURL(/project/, { timeout: 30000 });
     await freshPage.getByTestId("banner-action").click();
     // get the project id from the url
     const url = freshPage.url();

playwright.config.ts

@@ -19,8 +19,8 @@ export default defineConfig({
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
   /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  workers: undefined,
+  retries: process.env.CI ? 2 : 1,
+  workers: 2,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
   reporter: [
     ["html", { open: "never" }],