Skip to content

#2200 prevent restrictive season date changes #2203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laingsimon merged 3 commits into from
May 23, 2026
Merged

#2200 prevent restrictive season date changes #2203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d65d0e0
#2200: Wrap division container component around season and division e…
laingsimon May 22, 2026
863dcf3
#2200: Prevent season date changes that would exclude fixtures
laingsimon May 22, 2026
592f555
#2200: Update tests
laingsimon May 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions CourageScores/ClientApp/src/components/league/Division.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,15 +349,16 @@ export function Division() {

try {
return (
<div>
<DivisionDataContainer
{...divisionDataToUse}
onReloadDivision={reloadDivisionData}
favouritesEnabled={favouritesEnabled}
setDivisionData={asyncCallback(setOverrideDivisionData)}>
{controls || !divisionDataToUse.season ? (
<DivisionControls
originalSeasonData={divisionDataToUse.season}
originalDivisionData={{
name: divisionDataToUse.name,
id: divisionDataToUse.id,
updated: divisionDataToUse.updated,
superleague: divisionDataToUse.superleague,
...divisionDataToUse,
}}
onDivisionOrSeasonChanged={reloadDivisionData}
overrideMode={requestedMode}
Expand Down Expand Up @@ -474,13 +475,7 @@ export function Division() {
{(!dataErrors || !account) &&
any(requestedDivisions) &&
requestedSeason?.id !== INVALID.id ? (
<DivisionDataContainer
{...divisionDataToUse}
onReloadDivision={reloadDivisionData}
favouritesEnabled={favouritesEnabled}
setDivisionData={asyncCallback(
setOverrideDivisionData,
)}>
<>
{effectiveTab === 'teams' &&
divisionDataToUse.season ? (
<DivisionTeams />
Expand Down Expand Up @@ -533,9 +528,9 @@ export function Division() {
)}
/>
) : null}
</DivisionDataContainer>
</>
) : null}
</div>
</DivisionDataContainer>
);
} catch (e) {
/* istanbul ignore next */
Expand Down
155 changes: 75 additions & 80 deletions CourageScores/ClientApp/src/components/league/EditSeason.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
cleanUp,
ErrorState,
iocProps,
noop,
renderApp,
TestContext,
} from '../../helpers/tests';
Expand All @@ -16,6 +17,9 @@ import { DivisionDto } from '../../interfaces/models/dtos/DivisionDto';
import { divisionBuilder } from '../../helpers/builders/divisions';
import { seasonBuilder } from '../../helpers/builders/seasons';
import { ISeasonApi } from '../../interfaces/apis/ISeasonApi';
import { renderDate } from '../../helpers/rendering';
import { DivisionDataContainer } from './DivisionDataContainer';
import { DivisionFixtureDateDto } from '../../interfaces/models/dtos/Division/DivisionFixtureDateDto';

const mockedUsedNavigate = jest.fn();

Expand All @@ -32,16 +36,13 @@ describe('EditSeason', () => {
let updatedSeason: EditSeasonDto | null;
let apiResponse: IClientActionResultDto<SeasonDto>;
let deletedId: string | null;
let updatedData: EditSeasonDto | null;
const seasonApi = api<ISeasonApi>({
update: async (
data: EditSeasonDto,
): Promise<IClientActionResultDto<SeasonDto>> => {
update: async (data: EditSeasonDto) => {
updatedSeason = data;
return apiResponse;
},
delete: async (
id: string,
): Promise<IClientActionResultDto<SeasonDto>> => {
delete: async (id: string) => {
deletedId = id;
return apiResponse;
},
Expand All @@ -57,7 +58,9 @@ describe('EditSeason', () => {
saveError = err;
}

async function onUpdateData(_: EditSeasonDto) {}
async function onUpdateData(data: EditSeasonDto) {
updatedData = data;
}

afterEach(async () => {
await cleanUp(context);
Expand All @@ -69,16 +72,25 @@ describe('EditSeason', () => {
saveError = null;
updatedSeason = null;
deletedId = null;
updatedData = null;
apiResponse = {
success: true,
};
});

async function renderComponent(
props: IEditSeasonProps,
p: Partial<IEditSeasonProps>,
seasons: SeasonDto[],
divisions: DivisionDto[],
fixtures?: DivisionFixtureDateDto[],
) {
const props = {
setSaveError,
onClose,
onSave,
onUpdateData,
...p,
} as IEditSeasonProps;
context = await renderApp(
iocProps({ seasonApi }),
brandingProps(),
Expand All @@ -89,7 +101,12 @@ describe('EditSeason', () => {
},
reportedError,
),
<EditSeason {...props} />,
<DivisionDataContainer
onReloadDivision={noop}
name="division"
fixtures={fixtures}>
<EditSeason {...props} />
</DivisionDataContainer>,
);
}

Expand All @@ -105,16 +122,9 @@ describe('EditSeason', () => {
const divisions = [division1, division2];

it('updates season name', async () => {
let updatedData: EditSeasonDto;
await renderComponent(
{
data: season,
onUpdateData: async (update: EditSeasonDto) => {
updatedData = update;
},
setSaveError,
onClose,
onSave,
},
[season],
divisions,
Expand All @@ -129,16 +139,9 @@ describe('EditSeason', () => {
});

it('updates season dates', async () => {
let updatedData: EditSeasonDto;
await renderComponent(
{
data: season,
onUpdateData: async (update: EditSeasonDto) => {
updatedData = update;
},
setSaveError,
onClose,
onSave,
},
[season],
divisions,
Expand All @@ -157,16 +160,9 @@ describe('EditSeason', () => {
});

it('updates season fixture timings', async () => {
let updatedData: EditSeasonDto;
await renderComponent(
{
data: season,
onUpdateData: async (update: EditSeasonDto) => {
updatedData = update;
},
setSaveError,
onClose,
onSave,
},
[season],
divisions,
Expand All @@ -185,16 +181,9 @@ describe('EditSeason', () => {
});

it('can select a division', async () => {
let updatedData: EditSeasonDto;
await renderComponent(
{
data: season,
onUpdateData: async (update: EditSeasonDto) => {
updatedData = update;
},
setSaveError,
onClose,
onSave,
},
[season],
divisions,
Expand All @@ -214,16 +203,9 @@ describe('EditSeason', () => {
});

it('can unselect a division', async () => {
let updatedData: EditSeasonDto;
await renderComponent(
{
data: season,
onUpdateData: async (update: EditSeasonDto) => {
updatedData = update;
},
setSaveError,
onClose,
onSave,
},
[season],
divisions,
Expand All @@ -246,16 +228,9 @@ describe('EditSeason', () => {
const seasonWithoutId: EditSeasonDto = Object.assign({}, season);
seasonWithoutId.id = undefined;
const otherSeason = seasonBuilder('OTHER SEASON').build();
let updatedData: EditSeasonDto;
await renderComponent(
{
data: seasonWithoutId as EditSeasonDto & SeasonDto,
onUpdateData: async (update: EditSeasonDto) => {
updatedData = update;
},
setSaveError,
onClose,
onSave,
},
[otherSeason],
divisions,
Expand All @@ -274,10 +249,6 @@ describe('EditSeason', () => {
await renderComponent(
{
data: seasonWithoutName,
setSaveError,
onClose,
onSave,
onUpdateData,
},
[seasonWithoutName],
divisions,
Expand All @@ -289,14 +260,58 @@ describe('EditSeason', () => {
expect(saved).toEqual(false);
});

it('prevents save when start date is after first fixture', async () => {
const earliestFixtureDate = '2026-02-01';
const startsAfterFirstFixture = { ...season, startDate: '2026-02-02' };
const fixture = {
date: earliestFixtureDate,
} as DivisionFixtureDateDto;
await renderComponent(
{
data: startsAfterFirstFixture,
},
[startsAfterFirstFixture],
divisions,
[fixture],
);

await context.button('Update season').click();

context.prompts
.alertWasShown(`Start date is after some fixtures in the season, this would prevent them from appearing on the fixture list.

Alter the date to ${renderDate(earliestFixtureDate)} so they are included`);
expect(saved).toEqual(false);
});

it('prevents save when end date is before last fixture', async () => {
const latestFixtureDate = '2026-02-02';
const endsBeforeLastFixture = { ...season, endDate: '2026-02-01' };
const fixture = {
date: latestFixtureDate,
} as DivisionFixtureDateDto;
await renderComponent(
{
data: endsBeforeLastFixture,
},
[endsBeforeLastFixture],
divisions,
[fixture],
);

await context.button('Update season').click();

context.prompts
.alertWasShown(`End date is before some fixtures in the season, this would prevent them from appearing on the fixture list.

Alter the date to ${renderDate(latestFixtureDate)} so they are included`);
expect(saved).toEqual(false);
});

it('saves season updates', async () => {
await renderComponent(
{
data: season,
setSaveError,
onClose,
onSave,
onUpdateData,
},
[season],
divisions,
Expand All @@ -316,10 +331,6 @@ describe('EditSeason', () => {
await renderComponent(
{
data: season,
setSaveError,
onClose,
onSave,
onUpdateData,
},
[season],
divisions,
Expand All @@ -339,18 +350,14 @@ describe('EditSeason', () => {
await renderComponent(
{
data: season,
setSaveError,
onClose,
onSave,
onUpdateData,
},
[season],
divisions,
);
reportedError.verifyNoError();
context.prompts.respondToConfirm(
'Are you sure you want to delete the SEASON season?',
true,
false,
);

await context.button('Delete season').click();
Expand All @@ -365,10 +372,6 @@ describe('EditSeason', () => {
await renderComponent(
{
data: season,
setSaveError,
onClose,
onSave,
onUpdateData,
},
[season],
divisions,
Expand All @@ -389,10 +392,6 @@ describe('EditSeason', () => {
await renderComponent(
{
data: season,
setSaveError,
onClose,
onSave,
onUpdateData,
},
[season],
divisions,
Expand All @@ -417,10 +416,6 @@ describe('EditSeason', () => {
await renderComponent(
{
data: season,
setSaveError,
onClose,
onSave,
onUpdateData,
},
[season],
divisions,
Expand Down
Loading
Loading