refactor: restore explicit storybook state stories

Author: coder13

.storybook/manager.tsx

@@ -41,9 +41,6 @@ const withAppChrome: Decorator = (Story, context) => {
 
 const preview: Preview = {
   decorators: [withAppChrome],
-  initialGlobals: {
-    fixtureVariant: '',
-  },
   globalTypes: {
     colorScheme: {
       name: 'Color scheme',

.storybook/preview.tsx

@@ -19,38 +19,32 @@ export default meta;
 
 type Story = StoryObj<typeof meta>;
 
-export const FixtureStates: Story = {
+export const MultiStageRound: Story = {
+  args: {
+    competitionId: 'SeattleSummerOpen2026',
+    roundId: '333-r1',
+    groupNumber: '1',
+  },
+};
+
+export const ParticipationCondition: Story = {
   parameters: {
-    fixtures: {
-      'Multi-stage round': {
-        args: {
-          competitionId: 'SeattleSummerOpen2026',
-          roundId: '333-r1',
-          groupNumber: '1',
-        },
-        competitionFixture: makeStorybookGroupCompetitionFixture({ roundId: '333-r1' }),
-      },
-      'Participation condition': {
-        args: {
-          competitionId: 'SeattleSummerOpen2026',
-          roundId: '333-r2',
-          groupNumber: '1',
-        },
-        competitionFixture: makeStorybookGroupCompetitionFixture({ roundId: '333-r2' }),
-      },
-      'Linked rounds': {
-        args: {
-          competitionId: 'SeattleSummerOpen2026',
-          roundId: '333-r3',
-          groupNumber: '1',
-        },
-        competitionFixture: makeStorybookGroupCompetitionFixture({ roundId: '333-r3' }),
-      },
-    },
+    competitionFixture: makeStorybookGroupCompetitionFixture({ roundId: '333-r2' }),
   },
   args: {
     competitionId: 'SeattleSummerOpen2026',
-    roundId: '333-r1',
+    roundId: '333-r2',
+    groupNumber: '1',
+  },
+};
+
+export const LinkedRounds: Story = {
+  parameters: {
+    competitionFixture: makeStorybookGroupCompetitionFixture({ roundId: '333-r3' }),
+  },
+  args: {
+    competitionId: 'SeattleSummerOpen2026',
+    roundId: '333-r3',
     groupNumber: '1',
   },
 };

src/pages/Competition/ByGroup/Group.stories.tsx

@@ -8,7 +8,6 @@ import { Route, Routes } from 'react-router-dom';
 import { AppContext } from '@/providers/AppProvider/AppContext';
 import { AuthContext } from '@/providers/AuthProvider/AuthContext';
 import { WCIFContext } from '@/providers/WCIFProvider';
-import { getSelectedFixture } from '@/storybook/fixtures';
 import {
   storybookCompetitionApiFixture,
   storybookCompetitionFixture,
@@ -42,7 +41,7 @@ interface CompetitionRouteDecoratorOptions extends CompetitionPageDecoratorOptio
   path: string;
 }
 
-interface CompetitionStorybookParameters extends CompetitionPageDecoratorOptions {
+export interface CompetitionStorybookParameters extends CompetitionPageDecoratorOptions {
   competitionFixture?: Competition;
 }
 
@@ -65,32 +64,20 @@ const createStorybookQueryClient = (competition: Competition, competitionData?:
 const resolveCompetitionOptions = (
   defaults: CompetitionPageDecoratorOptions,
   parameters?: CompetitionStorybookParameters,
-  fixture?: Record<string, unknown>,
 ): Required<CompetitionPageDecoratorOptions> => ({
   competition:
-    (fixture?.competitionFixture as Competition | undefined) ||
     parameters?.competitionFixture ||
     parameters?.competition ||
     defaults.competition ||
     storybookCompetitionFixture,
   competitionData:
-    (fixture?.competitionData as ApiCompetition | undefined) ||
-    parameters?.competitionData ||
-    defaults.competitionData ||
-    storybookCompetitionApiFixture,
-  currentUser:
-    (fixture?.currentUser as User | null | undefined) ??
-    parameters?.currentUser ??
-    defaults.currentUser ??
-    storybookCurrentUser,
+    parameters?.competitionData || defaults.competitionData || storybookCompetitionApiFixture,
+  currentUser: parameters?.currentUser ?? defaults.currentUser ?? storybookCurrentUser,
   ongoingActivities:
-    (fixture?.ongoingActivities as CompetitionPageDecoratorOptions['ongoingActivities']) ||
     parameters?.ongoingActivities ||
     defaults.ongoingActivities ||
     storybookOngoingActivitiesFixture,
-  pinnedPersons: (fixture?.pinnedPersons as number[] | undefined) ||
-    parameters?.pinnedPersons ||
-    defaults.pinnedPersons || [2, 3],
+  pinnedPersons: parameters?.pinnedPersons || defaults.pinnedPersons || [2, 3],
 });
 
 const StorybookCompetitionProviders = ({
@@ -167,11 +154,9 @@ export const makeCompetitionPageDecorator = ({
   pinnedPersons = [2, 3],
 }: CompetitionPageDecoratorOptions = {}) =>
   ((Story, context) => {
-    const [, fixture] = getSelectedFixture(context) || [];
     const options = resolveCompetitionOptions(
       { competition, competitionData, currentUser, ongoingActivities, pinnedPersons },
       context.parameters as CompetitionStorybookParameters,
-      fixture,
     );
 
     return (
@@ -182,10 +167,7 @@ export const makeCompetitionPageDecorator = ({
         ongoingActivities={options.ongoingActivities}
         pinnedPersons={options.pinnedPersons}>
         <Routes>
-          <Route
-            path="/competitions/:competitionId/*"
-            element={<Story args={{ ...context.args, ...(fixture?.args || {}) }} />}
-          />
+          <Route path="/competitions/:competitionId/*" element={<Story args={context.args} />} />
         </Routes>
       </StorybookCompetitionProviders>
     );
@@ -199,11 +181,9 @@ export const makeCompetitionContainerDecorator = ({
   pinnedPersons = [2, 3],
 }: CompetitionPageDecoratorOptions = {}) =>
   ((Story, context) => {
-    const [, fixture] = getSelectedFixture(context) || [];
     const options = resolveCompetitionOptions(
       { competition, competitionData, currentUser, ongoingActivities, pinnedPersons },
       context.parameters as CompetitionStorybookParameters,
-      fixture,
     );
 
     return (
@@ -213,7 +193,7 @@ export const makeCompetitionContainerDecorator = ({
         currentUser={options.currentUser}
         ongoingActivities={options.ongoingActivities}
         pinnedPersons={options.pinnedPersons}>
-        <Story args={{ ...context.args, ...(fixture?.args || {}) }} />
+        <Story args={context.args} />
       </StorybookCompetitionProviders>
     );
   }) satisfies Decorator;
@@ -223,7 +203,6 @@ export const makeCompetitionRouteDecorator = ({
   ...options
 }: CompetitionRouteDecoratorOptions) =>
   ((Story, context) => {
-    const [, fixture] = getSelectedFixture(context) || [];
     const resolvedOptions = resolveCompetitionOptions(
       {
         competition: options.competition,
@@ -233,7 +212,6 @@ export const makeCompetitionRouteDecorator = ({
         pinnedPersons: options.pinnedPersons,
       },
       context.parameters as CompetitionStorybookParameters,
-      fixture,
     );
 
     return (
@@ -248,10 +226,7 @@ export const makeCompetitionRouteDecorator = ({
             path="/competitions/:competitionId/*"
             element={
               <Routes>
-                <Route
-                  path={path}
-                  element={<Story args={{ ...context.args, ...(fixture?.args || {}) }} />}
-                />
+                <Route path={path} element={<Story args={context.args} />} />
               </Routes>
             }
           />