@dcrackel/hematournamentui 1.0.712 → 1.0.714

package/src/stories/Organisms/Containers/Tableau/plannedAssignments.test.js

@@ -1,65 +1,101 @@
-import { describe, expect, it } from 'vitest';
-import {
-  addPlannedStrokesToConnectors,
-  createPlannedStationByBout,
-  isBoutSuggestedForViewer
-} from './plannedAssignments';
-
-const stations = [
-  { RingId: 1, Color: '#2563eb', Director: { PersonId: 10 } },
-  { RingId: 2, Color: '#dc2626', Director: { PersonId: 20 } }
-];
-
-describe('planned directing presentation helpers', () => {
-  it('joins planned bout data to its display station without mutating either input', () => {
-    const assignments = [{ DEBoutId: 101, RingId: 1 }];
-
-    const plannedStationByBout = createPlannedStationByBout({ assignments, stations });
-
-    expect(plannedStationByBout['101']).toBe(stations[0]);
-    expect(assignments).toEqual([{ DEBoutId: 101, RingId: 1 }]);
-    expect(stations[0]).toEqual({ RingId: 1, Color: '#2563eb', Director: { PersonId: 10 } });
-  });
-
-  it('identifies suggestions for the viewer without treating other suggestions as locks', () => {
-    const plannedStationByBout = createPlannedStationByBout({
-      assignments: [
-        { DEBoutId: 101, RingId: 1 },
-        { DEBoutId: 102, RingId: 2 }
-      ],
-      stations
-    });
-
-    expect(isBoutSuggestedForViewer({ bout: { DEBoutId: 101 }, plannedStationByBout, viewerPersonId: '10' })).toBe(
-      true
-    );
-    expect(isBoutSuggestedForViewer({ bout: { DEBoutId: 102 }, plannedStationByBout, viewerPersonId: '10' })).toBe(
-      false
-    );
-  });
-
-  it('colors source and parent segments while leaving mixed merge trunks neutral', () => {
-    const plannedStationByBout = createPlannedStationByBout({
-      assignments: [
-        { DEBoutId: 1, RingId: 1 },
-        { DEBoutId: 2, RingId: 2 },
-        { DEBoutId: 3, RingId: 1 }
-      ],
-      stations
-    });
-    const connectors = [
-      { key: 'child-1', segmentRole: 'child', sourceBoutId: 1 },
-      { key: 'child-2', segmentRole: 'child', sourceBoutId: 2 },
-      { key: 'merge', segmentRole: 'merge', sourceBoutIds: [1, 2] },
-      { key: 'parent', segmentRole: 'parent', targetBoutId: 3 }
-    ];
-
-    expect(addPlannedStrokesToConnectors(connectors, plannedStationByBout).map(path => path.stroke)).toEqual([
-      '#2563eb',
-      '#dc2626',
-      null,
-      '#2563eb'
-    ]);
-    expect(connectors.some(connector => Object.hasOwn(connector, 'stroke'))).toBe(false);
-  });
-});
+import { describe, expect, it } from 'vitest';
+import {
+  addPlannedStrokesToConnectors,
+  createPlannedStationByBout,
+  isBoutSuggestedForViewer
+} from './plannedAssignments';
+
+const stations = [
+  { RingId: 1, Color: '#2563eb', Director: { PersonId: 10 } },
+  { RingId: 2, Color: '#dc2626', Director: { PersonId: 20 } }
+];
+
+describe('planned directing presentation helpers', () => {
+  it('joins planned bout data to its display station without mutating either input', () => {
+    const assignments = [{ DEBoutId: 101, RingId: 1 }];
+
+    const plannedStationByBout = createPlannedStationByBout({ assignments, stations });
+
+    expect(plannedStationByBout['101']).toBe(stations[0]);
+    expect(assignments).toEqual([{ DEBoutId: 101, RingId: 1 }]);
+    expect(stations[0]).toEqual({ RingId: 1, Color: '#2563eb', Director: { PersonId: 10 } });
+  });
+
+  it('identifies suggestions for the viewer without treating other suggestions as locks', () => {
+    const plannedStationByBout = createPlannedStationByBout({
+      assignments: [
+        { DEBoutId: 101, RingId: 1 },
+        { DEBoutId: 102, RingId: 2 }
+      ],
+      stations
+    });
+
+    expect(isBoutSuggestedForViewer({ bout: { DEBoutId: 101 }, plannedStationByBout, viewerPersonId: '10' })).toBe(
+      true
+    );
+    expect(isBoutSuggestedForViewer({ bout: { DEBoutId: 102 }, plannedStationByBout, viewerPersonId: '10' })).toBe(
+      false
+    );
+  });
+
+  it('colors every connector segment for the receiving bout even when source directors differ', () => {
+    const plannedStationByBout = createPlannedStationByBout({
+      assignments: [
+        { DEBoutId: 1, RingId: 1 },
+        { DEBoutId: 2, RingId: 2 },
+        { DEBoutId: 3, RingId: 1 }
+      ],
+      stations
+    });
+    const connectors = [
+      { key: 'child-1', segmentRole: 'child', sourceBoutId: 1, targetBoutId: 3 },
+      { key: 'child-2', segmentRole: 'child', sourceBoutId: 2, targetBoutId: 3 },
+      { key: 'merge', segmentRole: 'merge', sourceBoutIds: [1, 2], targetBoutId: 3 },
+      { key: 'parent', segmentRole: 'parent', targetBoutId: 3 }
+    ];
+
+    expect(addPlannedStrokesToConnectors(connectors, plannedStationByBout).map(path => path.stroke)).toEqual([
+      '#2563eb',
+      '#2563eb',
+      '#2563eb',
+      '#2563eb'
+    ]);
+    expect(connectors.some(connector => Object.hasOwn(connector, 'stroke'))).toBe(false);
+  });
+
+  it('colors a single feeder for the receiving director', () => {
+    const plannedStationByBout = createPlannedStationByBout({
+      assignments: [
+        { DEBoutId: 1, RingId: 1 },
+        { DEBoutId: 2, RingId: 2 }
+      ],
+      stations
+    });
+    const connectors = [{ key: 'single', segmentRole: 'single', sourceBoutId: 1, targetBoutId: 2 }];
+    expect(addPlannedStrokesToConnectors(connectors, plannedStationByBout)[0].stroke).toBe('#dc2626');
+  });
+
+  it('keeps the entire connector neutral when the receiving bout is unassigned', () => {
+    const plannedStationByBout = createPlannedStationByBout({
+      assignments: [
+        { DEBoutId: 1, RingId: 1 },
+        { DEBoutId: 2, RingId: 1 }
+      ],
+      stations
+    });
+    const connectors = [
+      { segmentRole: 'child', sourceBoutId: 1, targetBoutId: 3 },
+      { segmentRole: 'child', sourceBoutId: 2, targetBoutId: 3 },
+      { segmentRole: 'merge', sourceBoutIds: [1, 2], targetBoutId: 3 },
+      { segmentRole: 'parent', targetBoutId: 3 },
+      { segmentRole: 'single', sourceBoutId: 1, targetBoutId: 4 }
+    ];
+    expect(addPlannedStrokesToConnectors(connectors, plannedStationByBout).map(path => path.stroke)).toEqual([
+      null,
+      null,
+      null,
+      null,
+      null
+    ]);
+  });
+});

package/src/stories/Organisms/Containers/TableauColumn/TableauColumn.vue

@@ -12,6 +12,10 @@
           :roundName="roundName"
           :bracketSize="bracketSize"
           :isCountingBackwardsMaxScore="isCountingBackwardsMaxScore"
+          :showBoutDirectorAssignment="showBoutDirectorAssignment"
+          :plannedDirectorName="getPlannedDirectorName(bout)"
+          :plannedDirectorColor="getPlannedDirectorColor(bout)"
+          @request:bout-director="$emit('request:bout-director', $event)"
           @register-node-anchor="registerNodeAnchor"
           @action:editBout="handleEditBout"
           @action:directingBout="handleDirectorBout"
@@ -24,12 +28,15 @@
 <script>
 import TableauBoutCard from '../../Cards/TableauBoutCard/TableauBoutCard.vue';
 import BaseText from '../../../Atoms/Text/BaseText.vue';
+import { getPlannedStationForBout } from '../Tableau/plannedAssignments.js';
 
 export default {
   name: 'TableauColumn',
-  emits: ['action:directingBout', 'action:editBout', 'register-node-anchor'],
+  emits: ['action:directingBout', 'action:editBout', 'register-node-anchor', 'request:bout-director'],
   components: { BaseText, TableauBoutCard },
   props: {
+    showBoutDirectorAssignment: { type: Boolean, default: true },
+    plannedStationByBout: { type: Object, default: () => ({}) },
     bouts: {
       type: Array,
       required: true
@@ -61,6 +68,12 @@ export default {
     }
   },
   methods: {
+    getPlannedDirectorName(bout) {
+      return getPlannedStationForBout(this.plannedStationByBout, bout)?.Director?.DisplayName || '';
+    },
+    getPlannedDirectorColor(bout) {
+      return getPlannedStationForBout(this.plannedStationByBout, bout)?.Color || '';
+    },
     getBoutStyle(index) {
       return { marginBottom: index < this.bouts.length - 1 ? `${this.layout.gapPx}px` : '0' };
     },

package/src/stories/Organisms/Wizards/EditEventWizard/BasicEventInfo/BasicEventInfo.stories.js

@@ -1,52 +1,52 @@
-import BasicEventInfo from './BasicEventInfo.vue';
-import singleEventMock from '../../../../../mocks/singleEventMock.js';
-import getAllWeapons from '../../../../../mocks/getAllWeapons.js';
-
-const eventConfig = { ...singleEventMock, EventPrice: 25.5 };
-const validation = {
-  EventName: { invalid: false, message: '' },
-  EventPrice: { invalid: false, message: '' }
-};
-const steps = [
-  { name: 'Basic Info', icon: 'fa-circle-info' },
-  { name: 'Customization', icon: 'fa-star' },
-  { name: 'Pool Setup', icon: 'fa-table-columns' },
-  { name: 'DE Promotion', icon: 'fa-list' },
-  { name: 'Direct Elimination', icon: 'fa-diagram-sankey' }
-];
-
-export default {
-  title: 'Organisms/Wizards/EditEventWizard/BasicEventInfo/BasicEventInfo',
-  component: BasicEventInfo,
-  args: { eventConfig, validation, currentStep: 0, steps, weapons: getAllWeapons },
-  argTypes: {
-    eventConfig: { control: 'object' },
-    validation: { control: 'object' },
-    weapons: { control: 'object' },
-    steps: { control: 'object' },
-    currentStep: { control: 'number' }
-  }
-};
-
-export const Default = {
-  args: { eventConfig, validation, currentStep: 0, steps, weapons: getAllWeapons }
-};
-
-export const FreeEvent = {
-  args: { ...Default.args, eventConfig: { ...eventConfig, EventPrice: 0 } }
-};
-
-export const InvalidPrice = {
-  args: {
-    ...Default.args,
-    eventConfig: { ...eventConfig, EventPrice: -5 },
-    validation: {
-      ...validation,
-      EventPrice: { invalid: true, message: 'Price must be a non-negative number.' }
-    }
-  }
-};
-
-export const WaitlistDisabled = {
-  args: { ...Default.args, eventConfig: { ...eventConfig, CutOffNumber: 32, WaitlistEnabled: false } }
-};
+import BasicEventInfo from './BasicEventInfo.vue';
+import singleEventMock from '../../../../../mocks/singleEventMock.js';
+import getAllWeapons from '../../../../../mocks/getAllWeapons.js';
+
+const eventConfig = { ...singleEventMock, EventPrice: 25.5 };
+const validation = {
+  EventName: { invalid: false, message: '' },
+  EventPrice: { invalid: false, message: '' }
+};
+const steps = [
+  { name: 'Basic Info', icon: 'fa-circle-info' },
+  { name: 'Customization', icon: 'fa-star' },
+  { name: 'Pool Setup', icon: 'fa-table-columns' },
+  { name: 'DE Promotion', icon: 'fa-list' },
+  { name: 'Direct Elimination', icon: 'fa-diagram-sankey' }
+];
+
+export default {
+  title: 'Organisms/Wizards/EditEventWizard/BasicEventInfo/BasicEventInfo',
+  component: BasicEventInfo,
+  args: { eventConfig, validation, currentStep: 0, steps, weapons: getAllWeapons },
+  argTypes: {
+    eventConfig: { control: 'object' },
+    validation: { control: 'object' },
+    weapons: { control: 'object' },
+    steps: { control: 'object' },
+    currentStep: { control: 'number' }
+  }
+};
+
+export const Default = {
+  args: { eventConfig, validation, currentStep: 0, steps, weapons: getAllWeapons }
+};
+
+export const FreeEvent = {
+  args: { ...Default.args, eventConfig: { ...eventConfig, EventPrice: 0 } }
+};
+
+export const InvalidPrice = {
+  args: {
+    ...Default.args,
+    eventConfig: { ...eventConfig, EventPrice: -5 },
+    validation: {
+      ...validation,
+      EventPrice: { invalid: true, message: 'Price must be a non-negative number.' }
+    }
+  }
+};
+
+export const WaitlistDisabled = {
+  args: { ...Default.args, eventConfig: { ...eventConfig, CutOffNumber: 32, WaitlistEnabled: false } }
+};

package/src/stories/Organisms/Wizards/EditEventWizard/BasicEventInfo/BasicEventInfo.vue

@@ -83,7 +83,7 @@
       />
       <DropDownMenu
         :label="''"
-        :items="weapons"
+        :items="weaponOptions"
         :selected-item="selectedWeapon"
         :alignEnd="false"
         width="w-full"
@@ -208,9 +208,16 @@ export default {
       if (!this.priceValidation.invalid) return 'Event Price';
       return `Event Price - ${this.priceValidation.message}`;
     },
+    weaponOptions() {
+      return this.weapons.map(weapon => ({
+        ...weapon,
+        text: weapon.text ?? weapon.Name,
+        link: weapon.link ?? weapon.Id
+      }));
+    },
     selectedWeapon() {
-      const weapon = this.weapons.find(w => w.Id === this.eventConfig.WeaponId);
-      return weapon ? weapon.Name : { text: 'Longsword', link: 1 };
+      const weapon = this.weaponOptions.find(option => String(option.link) === String(this.eventConfig.WeaponId));
+      return weapon ?? { text: 'Select a weapon', link: null };
     }
   },
   methods: {