Added recipe to generate 1 group finals

Author: coder13

package.json

@@ -46,7 +46,7 @@
     "redux-thunk": "^2.4.1",
     "reselect": "^4.1.6",
     "typescript": "^4.8.4",
-    "wca-group-generators": "^0.1.0",
+    "wca-group-generators": "^0.1.1",
     "web-vitals": "^2.1.4"
   },
   "scripts": {

src/components/RecipeEditor/EditRecipeDialog.tsx

@@ -15,7 +15,7 @@ import {
   ListItemIcon,
   ListItemText,
 } from '@mui/material';
-import { RecipeConfig, Step, StepLibrary } from '../../lib/recipes';
+import { AssignmentStep, RecipeConfig, Step, StepLibrary } from '../../lib/recipes';
 import { EditStepDialog } from './EditStepDialog';
 
 interface EditRecipeDialogProps {
@@ -68,7 +68,7 @@ export const EditRecipeDialog = ({ open, onClose, recipeConfig, round }: EditRec
         </DialogContent>
       </Dialog>
       <EditStepDialog
-        step={selectedStep}
+        step={selectedStep as AssignmentStep}
         onClose={() => setSelectedStep(undefined)}
         round={round}
       />

src/components/RecipeEditor/EditStepDialog.tsx

@@ -55,7 +55,7 @@ import {
   GridRowModesModel,
 } from '@mui/x-data-grid';
 import Assignments from '../../config/assignments';
-import { ConstraintProps, Filters, Step, StepLibrary } from '../../lib/recipes';
+import { AssignmentStep, ConstraintProps, Filters, StepLibrary } from '../../lib/recipes';
 import { useAppSelector } from '../../store';
 import { updateStep } from '../../store/actions';
 
@@ -93,7 +93,7 @@ const AccordionDetails = styled(MuiAccordionDetails)(() => ({
 
 interface EditStepDialogProps {
   onClose: () => void;
-  step?: Step;
+  step?: AssignmentStep;
   round: Round;
 }
 
@@ -102,30 +102,30 @@ export const EditStepDialog = ({ onClose, step, round }: EditStepDialogProps) =>
   const dataGridRef = useRef(null);
   const [rowModesModel, setRowModesModel] = useState<GridRowModesModel>({});
 
-  const [assignmentCode, setAssignmentCode] = useState<Step['props']['assignmentCode'] | undefined>(
-    step?.props?.assignmentCode
-  );
-  const [selectedGenerator, setSelectedGenerator] = useState<Step['generator'] | undefined>(
-    step?.generator
-  );
-  const [generatorOptions, setGeneratorOptions] = useState<Step['props']['options']>(
+  const [assignmentCode, setAssignmentCode] = useState<
+    AssignmentStep['props']['assignmentCode'] | undefined
+  >(step?.props?.assignmentCode);
+  const [selectedGenerator, setSelectedGenerator] = useState<
+    AssignmentStep['props']['generator'] | undefined
+  >(step?.props?.generator);
+  const [generatorOptions, setGeneratorOptions] = useState<AssignmentStep['props']['options']>(
     step?.props?.options ?? {}
   );
-  const [editingCluster, setEditingCluster] = useState<Step['props']['cluster']>(
+  const [editingCluster, setEditingCluster] = useState<AssignmentStep['props']['cluster']>(
     step?.props?.cluster || {
       base: 'personsInRound',
       filters: [],
     }
   );
 
-  const [constraints, setConstraints] = useState<Step['props']['constraints']>(
+  const [constraints, setConstraints] = useState<AssignmentStep['props']['constraints']>(
     step?.props?.constraints ?? []
   );
 
   const dirty = useMemo(() => {
     return (
       step?.props?.assignmentCode !== assignmentCode ||
-      step?.generator !== selectedGenerator ||
+      step?.props?.generator !== selectedGenerator ||
       JSON.stringify(step?.props?.options) !== JSON.stringify(generatorOptions) ||
       step?.props?.cluster.base !== editingCluster.base ||
       step?.props?.cluster.filters.some(
@@ -140,7 +140,7 @@ export const EditStepDialog = ({ onClose, step, round }: EditStepDialogProps) =>
     editingCluster.filters,
     generatorOptions,
     selectedGenerator,
-    step?.generator,
+    step?.props?.generator,
     step?.props?.assignmentCode,
     step?.props?.cluster.base,
     step?.props?.cluster.filters,
@@ -150,7 +150,7 @@ export const EditStepDialog = ({ onClose, step, round }: EditStepDialogProps) =>
   const wcif = useAppSelector((state) => state.wcif);
 
   useEffect(() => {
-    setSelectedGenerator(step?.generator);
+    setSelectedGenerator(step?.props?.generator);
     setAssignmentCode(step?.props?.assignmentCode);
     setEditingCluster(step?.props?.cluster ?? { base: 'personsInRound', filters: [] });
     setGeneratorOptions(step?.props?.options ?? {});
@@ -393,7 +393,7 @@ export const EditStepDialog = ({ onClose, step, round }: EditStepDialogProps) =>
                     onChange={(e) => {
                       setEditingCluster((prev) => ({
                         ...prev,
-                        base: e.target.value as Step['props']['cluster']['base'],
+                        base: e.target.value as AssignmentStep['props']['cluster']['base'],
                       }));
                     }}
                     value={editingCluster?.base}>

src/lib/recipes/activities.ts

@@ -1,11 +1,11 @@
 import { Competition, parseActivityCode } from '@wca/helpers';
 import { findAllActivities } from 'wca-group-generators';
 import { activityCodeIsChild } from '../activities';
-import { Step } from './types';
+import { AssignmentStep } from './types';
 
 const getBaseActivities = (
   wcif: Competition,
-  base: Step['props']['activities']['base'],
+  base: AssignmentStep['props']['activities']['base'],
   roundId: string
 ) => {
   const allActivities = findAllActivities(wcif);
@@ -34,7 +34,7 @@ const getBaseActivities = (
 
 export const getActivities = (
   wcif: Competition,
-  { base, options = {} }: Step['props']['activities'],
+  { base, options = {} }: AssignmentStep['props']['activities'],
   roundId: string
 ) => {
   const baseActivities = getBaseActivities(wcif, base, roundId);

src/lib/recipes/clusters.ts

@@ -2,7 +2,7 @@ import { Competition, Person, Round } from '@wca/helpers';
 import { Assignments } from '../../config/assignments';
 import { findGroupActivitiesByRound } from '../activities';
 import { acceptedRegistrations, personsShouldBeInRound } from '../persons';
-import { Step } from './types';
+import { ClusterDefinition } from './types';
 
 export const Filters = [
   {
@@ -89,7 +89,7 @@ export const Filters = [
 
 export const getBaseCluster = (
   wcif: Competition,
-  base: Step['props']['cluster']['base'],
+  base: ClusterDefinition['base'],
   roundId: string
 ) => {
   switch (base) {
@@ -101,11 +101,7 @@ export const getBaseCluster = (
   }
 };
 
-export const getCluster = (
-  wcif: Competition,
-  cluster: Step['props']['cluster'],
-  roundId: string
-) => {
+export const getCluster = (wcif: Competition, cluster: ClusterDefinition, roundId: string) => {
   const activityIds = findGroupActivitiesByRound(wcif, roundId).map((a) => a.id);
 
   const baseCluster = getBaseCluster(wcif, cluster.base, roundId);

src/lib/recipes/recipes.ts

@@ -1,5 +1,5 @@
 import { StepLibrary, fromDefaults } from './steps';
-import { RecipeConfig, RecipeDefinition } from './types';
+import { RecipeConfig, RecipeDefinition, Step } from './types';
 
 export const Recipes: RecipeDefinition[] = [
   {
@@ -13,11 +13,17 @@ export const Recipes: RecipeDefinition[] = [
       StepLibrary.GenerateJudgeAssignmentsForCompetitors,
     ],
   },
+  {
+    id: 'pnw-1-group-finals',
+    name: 'PNW 1 group final',
+    description: 'Makes a single group of competitors for finals',
+    defaultSteps: [StepLibrary.GenerateSingleGroup, StepLibrary.GenerateCompetitorAssignments],
+  },
 ];
 
 export const fromRecipeDefinition = (recipe: RecipeDefinition): RecipeConfig => ({
   id: recipe.id,
   name: recipe.name,
   description: recipe.description,
-  steps: recipe.defaultSteps.map(fromDefaults),
+  steps: recipe.defaultSteps.map(fromDefaults) as Step[],
 });

src/lib/recipes/steps.ts

@@ -1,7 +1,7 @@
 import { Competition } from '@wca/helpers';
 import { getActivities } from './activities';
 import { getCluster } from './clusters';
-import { Step, StepDefinition } from './types';
+import { AssignmentStep, StepDefinition } from './types';
 
 export const StepLibrary: Record<string, StepDefinition> = {
   GenerateCompetitorAssignmentsForStaff: {
@@ -10,8 +10,9 @@ export const StepLibrary: Record<string, StepDefinition> = {
     description:
       'Generates competitor assignments for staff members based on their staff assignments',
     defaults: {
-      generator: 'assignEveryone',
+      type: 'assignments',
       props: {
+        generator: 'assignEveryone',
         cluster: {
           base: 'personsInRound',
           filters: [
@@ -60,8 +61,9 @@ export const StepLibrary: Record<string, StepDefinition> = {
     name: 'Generate Competitor Assignments For First Timers',
     description: 'Generates competitor assignments for first timers',
     defaults: {
-      generator: 'assignEveryone',
+      type: 'assignments',
       props: {
+        generator: 'assignEveryone',
         cluster: {
           base: 'personsInRound',
           filters: [
@@ -102,8 +104,9 @@ export const StepLibrary: Record<string, StepDefinition> = {
     name: 'Generate Competitor Assignments',
     description: 'Generates competitor assignments for everyone else',
     defaults: {
-      generator: 'assignEveryone',
+      type: 'assignments',
       props: {
+        generator: 'assignEveryone',
         cluster: {
           base: 'personsInRound',
           filters: [
@@ -149,8 +152,9 @@ export const StepLibrary: Record<string, StepDefinition> = {
     description:
       'Creates judge assignments for competitors based on their competitor assignments. Judge assignments are generally assigned for the group directly following the competitor assignment.',
     defaults: {
-      generator: 'assignEveryone',
+      type: 'assignments',
       props: {
+        generator: 'assignEveryone',
         assignmentCode: 'staff-judge',
         cluster: {
           base: 'personsInRound',
@@ -194,6 +198,17 @@ export const StepLibrary: Record<string, StepDefinition> = {
       },
     },
   },
+  GenerateSingleGroup: {
+    id: 'GenerateSingleGroup',
+    name: 'Generate Single Group',
+    description: 'Generates a single group of competitors',
+    defaults: {
+      type: 'groups',
+      props: {
+        count: 1,
+      },
+    },
+  },
 };
 
 export const Steps = Object.keys(StepLibrary).reduce((acc, key) => {
@@ -205,7 +220,7 @@ export const fromDefaults = (step: StepDefinition) => ({
   ...step.defaults,
 });
 
-export const hydrateStep = (wcif: Competition, roundId: string, step: Step) => {
+export const hydrateStep = (wcif: Competition, roundId: string, step: AssignmentStep) => {
   return {
     ...step,
     props: {

src/lib/recipes/types.ts

@@ -1,10 +1,3 @@
-export interface StepDefinition {
-  id: string;
-  name: string;
-  description: string;
-  defaults: Omit<Step, 'id'>;
-}
-
 export interface ClusterFilter {
   key: string;
   value: string | string[] | number | boolean;
@@ -21,10 +14,11 @@ export interface ConstraintProps {
   options?: any;
 }
 
-export interface Step {
+export interface AssignmentStep {
   id: string;
-  generator: string;
+  type: 'assignments';
   props: {
+    generator: string;
     assignmentCode: string;
     cluster: ClusterDefinition;
     activities: {
@@ -37,6 +31,23 @@ export interface Step {
   };
 }
 
+export interface GroupStep {
+  id: string;
+  type: 'groups';
+  props: {
+    count: number;
+  };
+}
+
+export type Step = GroupStep | AssignmentStep;
+
+export interface StepDefinition {
+  id: string;
+  name: string;
+  description: string;
+  defaults: Omit<Step, 'id'>;
+}
+
 export interface RecipeDefinition {
   id: string;
   name: string;

src/pages/Competition/Round/ConfigureGroupCountsDialog.js

@@ -56,7 +56,7 @@ const ConfigureGroupCountsDialog = ({ open, onClose, activityCode, round, roundA
       return;
     }
 
-    dispatch(updateRoundExtensionData(round.id, groupsData));
+    dispatch(updateRoundExtensionData(round.id, 'groups', groupsData));
 
     const newRoundActivities = createGroupsAcrossStages(wcif, roundActivities, groupsData);
     console.log(newRoundActivities);

src/pages/Competition/Round/index.js

@@ -11,11 +11,15 @@ import {
   CardActions,
   CardHeader,
   Divider,
+  FormControl,
   IconButton,
+  InputLabel,
   List,
   ListItemButton,
   ListSubheader,
+  MenuItem,
   Paper,
+  Select,
   Table,
   TableBody,
   TableCell,
@@ -48,6 +52,7 @@ import {
   bulkRemovePersonAssignments,
   generateAssignments,
   updateRoundChildActivities,
+  updateRoundExtensionData,
 } from '../../../store/actions';
 import {
   selectPersonsAssignedForRound,
@@ -169,6 +174,10 @@ const RoundPage = () => {
     dispatch(generateAssignments(round.id, recipeConfig));
   };
 
+  const onSwitchRecipes = (id) => {
+    dispatch(updateRoundExtensionData(round.id, 'recipe', { id }));
+  };
+
   const onResetGroupActitivites = () => {
     confirm({
       description: 'Do you really want to reset all group activities in this round?',
@@ -401,8 +410,27 @@ const RoundPage = () => {
 
       <Grid item>
         <AppBar position="sticky" color="secondary" sx={{ top: '480px' }}>
-          <Toolbar component={Paper}>
-            <Typography>Recipe: {recipeConfig.name}</Typography>
+          <Toolbar component={Paper} sx={{ p: 1 }}>
+            <FormControl>
+              <InputLabel id="recipe-select-label">Recipe</InputLabel>
+              <Select
+                label="Recipe"
+                labelId="recipe-select-label"
+                variant="outlined"
+                value={recipeConfig.id}
+                onChange={(e) => onSwitchRecipes(e.target.value)}
+                autoWidth
+                sx={{
+                  minWidth: 200,
+                }}
+                renderValue={(value) => recipeConfig.name}>
+                {Recipes.map((recipe) => (
+                  <MenuItem key={recipe.id} value={recipe.id}>
+                    {recipe.name}
+                  </MenuItem>
+                ))}
+              </Select>
+            </FormControl>
             <div style={{ display: 'flex', flex: 1 }} />
             <Button onClick={onGenerateGroupActitivites}>Run Recipe</Button>
             <IconButton edge="end" onClick={() => setConfigureRecipeDialog(true)}>