Merge pull request #77 from TiE23/ISSUE-075

Issue 075
This commit is contained in:
Kyle Geib authored and GitHub committed 2022-03-17 12:01:44 -05:00
commit 3f1e3b0c54
7 files changed
+60 -61

No files matched your search

@@ -7,13 +7,14 @@ import { FaCheck, FaStepForward, FaTimes } from "react-icons/fa";
import { broadcastGraphicsSelector } from "../../../../features/broadcast/graphics/broadcastGraphicsSelector";
import { broadcastDirectorSelector } from "../../../../features/broadcast/director/broadcastDirectorSelector";
import { eventSelector } from "../../../../features/event/eventSelector";
import {
incrementChyronsOpenState,
setChyrons,
setChyronsOpenState,
} from "../../../../features/broadcast/graphics/broadcastGraphicsSlice";
import { flagModeList, getChyronModesList, getChyronSubModesList } from "../../../../domain/data/broadcastGraphics";
import { BGChyronDriver, BGChyronMode, BGChyrons, BGChyronSubMode, Car, FlagMode } from "../../../../types/state";
import { BGChyronDriver, BGChyronMode, BGChyrons, BGChyronSubMode, Car, FlagMode, GridSpot } from "../../../../types/state";
import { SlotSelector } from "../../../Common/Inputs/SlotSelector";
import { Button, CloseButton, OpenButton, Title } from "./styles";
@@ -36,6 +37,7 @@ export function ChyronsDirectorControls() {
const dispatch = useDispatch();
const { chyrons } = useSelector(broadcastGraphicsSelector);
const { selectedCars } = useSelector(broadcastDirectorSelector);
const { grid } = useSelector(eventSelector);
// Handle changes to the chyron mode so submodes can be changed accordingly.
useEffect(() => {
@@ -60,29 +62,31 @@ export function ChyronsDirectorControls() {
const buildDriver = () => {
if (selectedCars.length === 0) return;
let primaryCar = selectedCars[0];
let secondaryCar = selectedCars.length > 1 ? selectedCars[1] : null;
let primaryCarGridSpot = selectedCars[0];
let secondaryCarGridSpot = selectedCars[1] ?? -1;
// Auto-sort drivers by position so trailing car always appears second.
if (chyronSubMode === "medium" && secondaryCar != null
&& secondaryCar.position < primaryCar.position) {
secondaryCar = selectedCars[0];
primaryCar = selectedCars[1];
// Auto-sort drivers by position so trailing car appears second on mounting.
if (chyronSubMode === "medium" && secondaryCarGridSpot != -1
&& grid[secondaryCarGridSpot].position < grid[primaryCarGridSpot].position) {
secondaryCarGridSpot = selectedCars[0];
primaryCarGridSpot = selectedCars[1];
}
const newChyrons: BGChyrons = {
openState: 0,
mode: chyronMode,
subMode: chyronSubMode,
driver: {
primary: buildDriverChyron(primaryCar),
secondary: secondaryCar != null ? buildDriverChyron(secondaryCar) : null,
primary: buildDriverChyron(primaryCarGridSpot),
secondary: secondaryCarGridSpot !== -1
? buildDriverChyron(secondaryCarGridSpot) : null,
},
};
dispatch(setChyrons(newChyrons));
};
const buildDriverChyron = (car: Car): BGChyronDriver => ({
car,
const buildDriverChyron = (carGridSpot: GridSpot): BGChyronDriver => ({
carGridSpot,
flagMode,
showPosFlag: posFlag,
showDriverNumber: driverNum,
@@ -1,11 +1,12 @@
import { useSpring } from "@react-spring/web";
import { useDispatch } from "react-redux";
import { useDispatch, useSelector } from "react-redux";
import { BGChyronDriver, BGChyronSubMode, CarStatus, OpenState } from "../../../../types/state";
import { DebugDurationProps } from "../../../../types/style";
import { clearChyrons } from "../../../../features/broadcast/graphics/broadcastGraphicsSlice";
import { theme } from "../../../../shared/theme";
import { outlineClipPath } from "../../../../utils/styling";
import { eventSelector } from "../../../../features/event/eventSelector";
import { DriverNumber } from "../../Common/DriverNumber";
import { AngledFlag } from "../../Common/AngledFlag";
@@ -45,7 +46,9 @@ export function ChyronDriver({
: subMode === "large" ? [638, 98]
: [0, 0];
const { car, flagMode, showPosFlag, showDriverNumber, showPortrait } = chyronData;
const { carGridSpot, flagMode, showPosFlag, showDriverNumber, showPortrait } = chyronData;
const { grid } = useSelector(eventSelector);
const car = grid[carGridSpot];
const flagProps = flagMode === "country"
? { flagMode, flag: car.driver.nationality }
@@ -1,12 +1,10 @@
import { InlineCluster } from "@bedrock-layout/inline-cluster";
import { findIndex } from "lodash";
import { useDispatch, useSelector } from "react-redux";
import { broadcastDirectorSelector } from "../../../../features/broadcast/director/broadcastDirectorSelector";
import { pushSelectedCars, clearSelectedCars, removeSelectedCars } from "../../../../features/broadcast/director/broadcastDirectorSlice";
import { eventSelector } from "../../../../features/event/eventSelector";
import { Car } from "../../../../types/state";
import { carMatch } from "../../../../utils/comparators";
import { GridSpot } from "../../../../types/state";
import { DriverLabel, GridItem, SelectionLabel } from "./styles";
@@ -19,24 +17,24 @@ export function GridSelection() {
selectedCars,
} = useSelector(broadcastDirectorSelector);
const carClick = (car: Car, selected: boolean) => () => {
const carClick = (gridSpot: GridSpot, selected: boolean) => () => {
if (selected) {
dispatch(removeSelectedCars(car));
dispatch(removeSelectedCars(gridSpot));
} else {
dispatch(pushSelectedCars(car));
dispatch(pushSelectedCars(gridSpot));
}
};
const carDoubleClick = (car: Car) => () => {
dispatch(clearSelectedCars(car));
const carDoubleClick = (gridSpot: GridSpot) => () => {
dispatch(clearSelectedCars(gridSpot));
};
return (
<InlineCluster gutter="xs">
{grid.map(car => {
const selectedIndex = findIndex(selectedCars, carMatch(car));
{grid.map((car, gridSpot) => {
const selectedIndex = selectedCars.findIndex(g => g === gridSpot);
const selected = selectedIndex !== -1;
const onClick = carClick(car, selected);
const onDoubleClick = carDoubleClick(car);
const onClick = carClick(gridSpot, selected);
const onDoubleClick = carDoubleClick(gridSpot);
return (
<GridItem
key={car.driver.id}
@@ -32,7 +32,7 @@ export function TimingTowerPrototypeControls() {
<ClickSpan
onClick={() => {
dispatch(increaseDistance({
cars: selectedCars,
gridSpots: selectedCars,
distance: 200,
randomness: 0,
usePerformance: false,
@@ -45,7 +45,7 @@ export function TimingTowerPrototypeControls() {
<ClickSpan
onClick={() => {
dispatch(increaseDistance({
cars: grid,
gridSpots: Array.from(Array(grid.length).keys()),
distance: 100,
randomness: 0.05,
usePerformance: true,
@@ -58,7 +58,7 @@ export function TimingTowerPrototypeControls() {
<ClickSpan
onClick={() => {
dispatch(increaseDistance({
cars: grid,
gridSpots: Array.from(Array(grid.length).keys()),
distance: 1000,
randomness: 0.05,
usePerformance: true,
@@ -71,7 +71,7 @@ export function TimingTowerPrototypeControls() {
<ClickSpan
onClick={() => {
dispatch(setCarStatus({
cars: selectedCars,
gridSpots: selectedCars,
status: CarStatus.Retired,
}));
dispatch(refreshRunningOrder());
@@ -82,7 +82,7 @@ export function TimingTowerPrototypeControls() {
<ClickSpan
onClick={() => {
dispatch(setCarStatus({
cars: selectedCars,
gridSpots: selectedCars,
status: CarStatus.Normal,
}));
dispatch(refreshRunningOrder());
@@ -1,9 +1,7 @@
import { createSlice, PayloadAction } from "@reduxjs/toolkit";
import { findIndex } from "lodash";
import { RootState, Car } from "../../../types/state";
import { RootState, GridSpot } from "../../../types/state";
import { Optional } from "../../../types/util";
import { carMatch } from "../../../utils/comparators";
const initialState: RootState["broadcastDirector"] = {
selectedCars: [],
@@ -13,22 +11,16 @@ export const broadcastDirectorSlice = createSlice({
name: "broadcastDirector",
initialState,
reducers: {
pushSelectedCars: (state, action: PayloadAction<Car>) => {
const index = findIndex(state.selectedCars, carMatch(action.payload));
if (index === -1) {
state.selectedCars = state.selectedCars.concat(action.payload);
pushSelectedCars: (state, action: PayloadAction<GridSpot>) => {
if (!state.selectedCars.includes(action.payload)) {
state.selectedCars.push(action.payload);
}
},
setSelectedCars: (state, action: PayloadAction<Car>) => { // Might be removed.
setSelectedCars: (state, action: PayloadAction<GridSpot>) => { // Might be removed.
state.selectedCars = [action.payload];
},
removeSelectedCars: (state, action: PayloadAction<Car | number>) => {
const index = typeof action.payload === "number"
? action.payload
: findIndex(state.selectedCars, carMatch(action.payload));
state.selectedCars = state.selectedCars.slice(0, index).concat(
state.selectedCars.slice(index + 1),
);
removeSelectedCars: (state, action: PayloadAction<GridSpot>) => {
state.selectedCars = state.selectedCars.filter(grid => grid !== action.payload);
},
/**
* Shortcut to clear out selected cars. There is also a trick - if you
@@ -36,7 +28,7 @@ export const broadcastDirectorSlice = createSlice({
* car.
* @param action Car (optional)
*/
clearSelectedCars: (state, action: PayloadAction<Optional<Car>>) => {
clearSelectedCars: (state, action: PayloadAction<Optional<GridSpot>>) => {
if (action.payload == null) {
state.selectedCars = [];
} else {
+12 -9
View File
@@ -12,7 +12,7 @@ import {
SectorFlag,
SafetyCarStatus,
VirtualSafetyCarStatus,
Car,
GridSpot,
} from "../../types/state";
import { Meters } from "../../types/util";
import { orMatch } from "../../utils/common";
@@ -211,14 +211,14 @@ const initialState: RootState["event"] = {
};
interface IncreaseDistanceAction {
cars: Car[];
gridSpots: GridSpot[];
distance: Meters;
randomness: number;
usePerformance: boolean;
}
interface SetCarStatusAction {
cars: Car[];
gridSpots: GridSpot[];
status: CarStatus;
}
@@ -267,9 +267,11 @@ export const eventSlice = createSlice({
increaseDistance: (state, action: PayloadAction<IncreaseDistanceAction>) => {
const gridMap = driverToGridMap(state.grid);
const { cars, distance, randomness, usePerformance } = action.payload;
const { gridSpots, distance, randomness, usePerformance } = action.payload;
gridSpots.forEach(gridSpot => {
const car = state.grid[gridSpot];
cars.forEach(car => {
// Do not update cars that are DNS, retired, or finished.
// This does remind me that Finished cars must be treated and reported
// differently...
@@ -289,13 +291,13 @@ export const eventSlice = createSlice({
});
state.lastUpdate = Date.now();
},
awardFastestLap: (state, action: PayloadAction<Car>) => {
awardFastestLap: (state, action: PayloadAction<GridSpot>) => {
// Awards fastest lap to provided car. Removes fastest lap from anyone else.
state.grid.forEach((car, index) => {
const fastestLapNoticeIndex = car.notices.findIndex(
notice => notice === CarNotice.FastestLap,
);
if (car.driver.id === action.payload.driver.id) {
if (car.driver.id === state.grid[action.payload].driver.id) {
if (fastestLapNoticeIndex === -1) {
state.grid[index].notices.push(CarNotice.FastestLap);
}
@@ -307,8 +309,9 @@ export const eventSlice = createSlice({
},
setCarStatus: (state, action: PayloadAction<SetCarStatusAction>) => {
const gridMap = driverToGridMap(state.grid);
const { cars, status } = action.payload;
cars.forEach(car => {
const { gridSpots, status } = action.payload;
gridSpots.forEach(gridSpot => {
const car = state.grid[gridSpot];
state.grid[gridMap[car.driver.id]].status = status;
});
state.lastUpdate = Date.now();
+4 -5
View File
@@ -1,5 +1,5 @@
import { Meters, Milliseconds, Optional } from "./util";
import { Corner, Fraction, Placement } from "./style";
import { Corner, Fraction } from "./style";
export interface RootState {
pageDimensions: PageDimensions;
@@ -76,7 +76,6 @@ export interface Event {
progress: EventProgress;
leaderGridSpot: GridSpot; // Might be removed.
grid: Grid;
// gridPositions: GridSpot[];
lastUpdate: number;
}
export interface EventProgress {
@@ -120,7 +119,7 @@ export enum SectorFlag {
export enum SafetyCarStatus { Clear, Starting, Out, Ending }
export enum VirtualSafetyCarStatus { Clear, Active, Ending }
export type Grid = Car[]; // Grid order does not change.
export type GridSpot = number;
export type GridSpot = number; // GridSpot doesn't change. Starts at 0.
export interface Car {
position: number; // Position is DERIVED from distance and status.
driver: Driver;
@@ -249,7 +248,7 @@ export type TeamFullName =
// Broadcast Director
export interface BroadcastDirector {
selectedCars: Car[];
selectedCars: GridSpot[];
}
// Broadcast Graphics
@@ -322,7 +321,7 @@ export interface BGChyrons extends BGBaseState {
}
export interface BGChyronDriver {
car: Car;
carGridSpot: GridSpot;
flagMode: FlagMode;
showPosFlag: boolean;
showDriverNumber: boolean;