@dcrackel/hematournamentui 1.0.706 → 1.0.707

package/src/stories/Templates/EventManagement/PoolLive/PoolLive.stories.js

@@ -1,127 +1,96 @@
 import PoolLive from './PoolLive.vue';
-import getPoolsWithBoutsByPoolId from "../../../../mocks/getPoolsWithBoutsByPoolId.js";
-import getDirectors from "../../../../mocks/getDirectors.js";
+import getPoolsWithBoutsByPoolId from '../../../../mocks/getPoolsWithBoutsByPoolId.js';
 
 const baseBouts = getPoolsWithBoutsByPoolId.pools[0].Bouts;
 
 // Ensure we have predictable statuses for the stories
-const makeUpcomingScheduled = (bouts) =>
-    bouts.map((b, i) => {
-        // keep one active if your UI expects it, otherwise everything scheduled is fine
-        if (i === 0) return { ...b, Status: 'Scheduled', OrderIndex: 0 };
-        if (i === 1) return { ...b, Status: 'Scheduled', OrderIndex: 1 };
-        if (i === 2) return { ...b, Status: 'Scheduled', OrderIndex: 2 };
-        return { ...b, Status: (b.Status || 'Scheduled'), OrderIndex: b.OrderIndex ?? i };
-    });
+const makeUpcomingScheduled = bouts =>
+  bouts.map((b, i) => {
+    // keep one active if your UI expects it, otherwise everything scheduled is fine
+    if (i === 0) return { ...b, Status: 'Scheduled', OrderIndex: 0 };
+    if (i === 1) return { ...b, Status: 'Scheduled', OrderIndex: 1 };
+    if (i === 2) return { ...b, Status: 'Scheduled', OrderIndex: 2 };
+    return { ...b, Status: b.Status || 'Scheduled', OrderIndex: b.OrderIndex ?? i };
+  });
 
-const makeAllCompleted = (bouts) =>
-    bouts.map((b) => ({ ...b, Status: 'Completed' }));
+const makeAllCompleted = bouts => bouts.map(b => ({ ...b, Status: 'Completed' }));
 
-const makeAssignedToUser = (bouts, userId, userName) =>
-    bouts.map((b, i) =>
-        i === 0
-            ? { ...b, RefereeId: userId, RefName: userName, Status: 'Scheduled', OrderIndex: 0 }
-            : { ...b }
-    );
-
-const makeActiveBoutRunByDifferentDirector = (bouts) =>
-    bouts.map((b, i) => {
-        if (i === 0) {
-            return {
-                ...b,
-                Status: 'Active',
-                TimerStatus: 'running',
-                TimeLeft: 137,
-                Score1: 2,
-                Score2: 4,
-                RefereeId: 1,
-                RefName: 'Dwain Crackel',
-                Started: '2025-09-08T19:30:00.000Z',
-                OrderIndex: 0,
-            };
-        }
-
-        return {
-            ...b,
-            Status: b.Status === 'Completed' ? 'Completed' : 'Scheduled',
-            TimerStatus: b.TimerStatus || 'stopped',
-            OrderIndex: b.OrderIndex ?? i,
-        };
-    });
-
-export default {
-    title: 'Templates/EventManagement/PoolLive',
-    component: PoolLive,
-    tags: ['PoolLive'],
-    args: {
-        bouts: makeUpcomingScheduled(baseBouts),
-        event: getPoolsWithBoutsByPoolId.event,
-        hostingClubColors: getPoolsWithBoutsByPoolId.hostingClubColors,
-        connectedToServer: true,
-        editMode: true,
-        role: 'admin',
-        currentUserId: 79,        // Tom Testerlou
-        directors: getDirectors,
-    },
-    argTypes: {
-        bouts: { control: 'object' },
-        event: { control: 'object' },
-        hostingClubColors: { control: 'object' },
-        connectedToServer: { control: 'boolean' },
-        editMode: { control: 'boolean' },
-        role: { control: 'text' },
-        currentUserId: { control: 'number' },
-        directors: { control: 'object' },
-    },
+const makeActiveBoutRunByDifferentDirector = bouts =>
+  bouts.map((b, i) => {
+    if (i === 0) {
+      return {
+        ...b,
+        Status: 'Active',
+        TimerStatus: 'running',
+        TimeLeft: 137,
+        Score1: 2,
+        Score2: 4,
+        RefereeId: 1,
+        RefName: 'Dwain Crackel',
+        Started: '2025-09-08T19:30:00.000Z',
+        OrderIndex: 0
+      };
+    }
+
+    return {
+      ...b,
+      Status: b.Status === 'Completed' ? 'Completed' : 'Scheduled',
+      TimerStatus: b.TimerStatus || 'stopped',
+      OrderIndex: b.OrderIndex ?? i
+    };
+  });
+
+export default {
+  title: 'Templates/EventManagement/PoolLive',
+  component: PoolLive,
+  tags: ['PoolLive'],
+  args: {
+    bouts: makeUpcomingScheduled(baseBouts),
+    event: getPoolsWithBoutsByPoolId.event,
+    hostingClubColors: getPoolsWithBoutsByPoolId.hostingClubColors,
+    connectedToServer: true,
+    editMode: true,
+    role: 'admin'
+  },
+  argTypes: {
+    bouts: { control: 'object' },
+    event: { control: 'object' },
+    hostingClubColors: { control: 'object' },
+    connectedToServer: { control: 'boolean' },
+    editMode: { control: 'boolean' },
+    role: { control: 'text' }
+  }
 };
 
 export const Admin = {
-    args: {
-        role: 'admin',
-        editMode: true,
-        bouts: makeUpcomingScheduled(baseBouts), // scheduled => assign chevrons render
-        currentUserId: 79,
-        directors: getDirectors,
-    },
+  args: {
+    role: 'admin',
+    editMode: true,
+    bouts: makeUpcomingScheduled(baseBouts)
+  }
 };
 
 export const NonAdminDirector = {
-    args: {
-        role: 'director',
-        editMode: true,
-        bouts: makeUpcomingScheduled(baseBouts),
-        currentUserId: 79,
-        directors: getDirectors,
-    },
+  args: {
+    role: 'director',
+    editMode: true,
+    bouts: makeUpcomingScheduled(baseBouts)
+  }
+};
+
+export const ActiveBoutRunningDifferentDirector = {
+  args: {
+    role: 'director',
+    editMode: true,
+    bouts: makeActiveBoutRunByDifferentDirector(baseBouts)
+  }
 };
 
-export const AssignedBoutBanner = {
-    args: {
-        role: 'director',
-        editMode: true,
-        bouts: makeAssignedToUser(baseBouts, 79, 'Tom Testerlou'),
-        currentUserId: 79,
-        directors: getDirectors,
-    },
-};
-
-export const ActiveBoutRunningDifferentDirector = {
-    args: {
-        role: 'director',
-        editMode: true,
-        bouts: makeActiveBoutRunByDifferentDirector(baseBouts),
-        currentUserId: 79,
-        directors: getDirectors,
-    },
-};
-
-export const AllBoutsComplete = {
-    args: {
-        bouts: makeAllCompleted(baseBouts),
-        connectedToServer: false,
-        editMode: false,
-        role: 'admin',
-        currentUserId: 79,
-        directors: getDirectors,
-    },
+export const AllBoutsComplete = {
+  args: {
+    bouts: makeAllCompleted(baseBouts),
+    connectedToServer: false,
+    editMode: false,
+    role: 'admin'
+  }
 };

package/src/stories/Templates/EventManagement/PoolLive/PoolLive.test.js

@@ -0,0 +1,121 @@
+import { shallowMount } from '@vue/test-utils';
+import { describe, expect, it } from 'vitest';
+import DirectorModal from '../../../Molecules/Modals/DirectorModal/DirectorModal.vue';
+import EditBoutModal from '../../../Molecules/Modals/EditBoutModal/EditBoutModal.vue';
+import PoolLive from './PoolLive.vue';
+
+const createBout = (overrides = {}) => ({
+  BoutId: 42,
+  DEBoutId: null,
+  EventId: 8,
+  PoolId: 3,
+  OrderIndex: 0,
+  Status: 'Scheduled',
+  Score1: 4,
+  Score2: 3,
+  Person1: { PersonId: 1, DisplayName: 'Fencer One' },
+  Person2: { PersonId: 2, DisplayName: 'Fencer Two' },
+  ...overrides
+});
+
+const mountPoolLive = bouts =>
+  shallowMount(PoolLive, {
+    props: {
+      bouts,
+      event: { EventRules: [] },
+      hostingClubColors: {},
+      connectedToServer: true,
+      editMode: true
+    }
+  });
+
+describe('PoolLive bout ownership', () => {
+  it('emits directing intent and waits for authoritative Active props', async () => {
+    const bout = createBout();
+    const wrapper = mountPoolLive([bout]);
+
+    wrapper.vm.directBout(bout);
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.emitted('update:directing-bout')).toEqual([[bout]]);
+    expect(wrapper.vm.localBouts[0].Status).toBe('Scheduled');
+    expect(wrapper.findComponent(DirectorModal).props('show')).toBe(false);
+
+    await wrapper.setProps({ bouts: [{ ...bout, Status: 'Active' }] });
+
+    expect(wrapper.findComponent(DirectorModal).props('show')).toBe(true);
+    expect(wrapper.findComponent(DirectorModal).props('bout').Status).toBe('Active');
+  });
+
+  it('resumes an active bout through directing intent', async () => {
+    const bout = createBout({ Status: 'Active' });
+    const wrapper = mountPoolLive([bout]);
+
+    wrapper.vm.directBout(bout);
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.emitted('update:directing-bout')).toEqual([[bout]]);
+    expect(wrapper.findComponent(DirectorModal).props('show')).toBe(true);
+  });
+
+  it('closes scoring without resetting status or scores', async () => {
+    const bout = createBout({ Status: 'Active', Score1: 6, Score2: 5 });
+    const wrapper = mountPoolLive([bout]);
+
+    wrapper.vm.directBout(bout);
+    await wrapper.vm.$nextTick();
+    wrapper.findComponent(DirectorModal).vm.$emit('update:closeModal', bout);
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.vm.localBouts[0]).toMatchObject({ Status: 'Active', Score1: 6, Score2: 5 });
+    expect(wrapper.emitted('update:bout')).toBeUndefined();
+    expect(wrapper.findComponent(DirectorModal).props('show')).toBe(false);
+  });
+
+  it('submits the draft without assigning Completed or Ended', async () => {
+    const bout = createBout({ Status: 'Active' });
+    const submittedBout = { ...bout, Score1: 7 };
+    const wrapper = mountPoolLive([bout]);
+
+    wrapper.findComponent(DirectorModal).vm.$emit('submit:bout', submittedBout);
+    await wrapper.vm.$nextTick();
+
+    const emittedBout = wrapper.emitted('submit:bout')[0][0];
+    expect(emittedBout).toEqual(submittedBout);
+    expect(emittedBout.Status).toBe('Active');
+    expect(emittedBout.Ended).toBeUndefined();
+  });
+
+  it('opens completed bouts for editing', async () => {
+    const bout = createBout({ Status: 'Completed' });
+    const wrapper = mountPoolLive([bout]);
+
+    wrapper.vm.editBout(bout);
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.findComponent(EditBoutModal).props('show')).toBe(true);
+    expect(wrapper.findComponent(DirectorModal).props('show')).toBe(false);
+  });
+
+  it('forwards make-active intent without changing the draft status', async () => {
+    const bout = createBout({ Status: 'Completed' });
+    const wrapper = mountPoolLive([bout]);
+
+    wrapper.findComponent(EditBoutModal).vm.$emit('request:bout-active', bout);
+    await wrapper.vm.$nextTick();
+
+    expect(wrapper.emitted('request:bout-active')).toEqual([[bout]]);
+    expect(wrapper.vm.localBouts[0].Status).toBe('Completed');
+  });
+
+  it('swaps scheduled bout order without mutating incoming bouts', () => {
+    const firstBout = createBout({ BoutId: 1, OrderIndex: 0 });
+    const secondBout = createBout({ BoutId: 2, OrderIndex: 1 });
+    const wrapper = mountPoolLive([firstBout, secondBout]);
+
+    wrapper.vm._swapOrderBetweenIds(firstBout.BoutId, secondBout.BoutId);
+
+    expect(wrapper.vm.localBouts.map(bout => bout.OrderIndex)).toEqual([1, 0]);
+    expect([firstBout.OrderIndex, secondBout.OrderIndex]).toEqual([0, 1]);
+  });
+});