Skip to content
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

Merge Dev into Master #5478

Merged
merged 29 commits into from
Dec 19, 2024
Merged

Merge Dev into Master #5478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
fe2cf60
EES-5543: Correct BoundaryLevel property in ChartDataSetConfig.
Dec 11, 2024
6d53130
EES-5732 prevent ui test failures after data replacement
amyb-hiveit Dec 12, 2024
7e51403
EES-5632 Distinguishing release redirects across different publicatio…
jack-hive Dec 12, 2024
910df94
EES-5587 refactor reordering filters and indicators
amyb-hiveit Nov 21, 2024
3f5ec9d
Merge pull request #5460 from dfe-analytical-services/EES-5732
bennettstuart Dec 13, 2024
5686e50
Merge pull request #5452 from dfe-analytical-services/EES-5543
tomjonesdev Dec 13, 2024
dbd38b3
chore(deps): update dependency dotenv to v3.1.5
renovate[bot] Dec 12, 2024
79bb35b
EES-5735: Add frontend error mapping for API data set replacement.
Dec 13, 2024
7c3dd22
Merge pull request #5467 from dfe-analytical-services/EES-5735
tomjonesdev Dec 13, 2024
01af766
chore(deps): update dependency dotenv to v3.1.6
renovate[bot] Dec 13, 2024
391f66e
EES-5543 fixed dataSetConfig BoundaryLevels, no longer defaulted to 0…
bennettstuart Dec 16, 2024
20b557b
Merge pull request #5469 from dfe-analytical-services/EES-5543-bugfix
bennettstuart Dec 16, 2024
c67d08f
EES-5632 Updating ContentDbContextModelSnapshot after collections add…
benoutram Dec 16, 2024
449fea2
Merge pull request #5470 from dfe-analytical-services/bugfix/EES-5632
benoutram Dec 16, 2024
dee7e0c
EES 5633 - FE - Redirect the user to the latest version of a page if …
jack-hive Dec 16, 2024
5f52222
EES-4336 temporarily remove DataBlockQuerySizeController which produc…
benoutram Dec 17, 2024
0d78433
EES-XXXX - adding capture of specific Public API errors to Grafana da…
duncan-at-hiveit Dec 17, 2024
6ea0c01
Merge pull request #5471 from dfe-analytical-services/EES-4336_Remove…
benoutram Dec 17, 2024
5c58c51
chore(tests): update test snapshots
dfe-sdt Dec 18, 2024
ad4dcb3
Merge pull request #5472 from dfe-analytical-services/chore/update-te…
N-moh Dec 18, 2024
f16a2c0
chore(deps): update dependency dotenv to v3.1.7
renovate[bot] Dec 18, 2024
bfc2fc7
EES-5047: Add character limit validation to various title and summary…
Dec 11, 2024
6dd4b38
EES-5047: Move input/textarea useWatch usage to parent components and…
Dec 11, 2024
2c3c986
EES-5047: Move string length and message definitions into constants, …
Dec 13, 2024
dd4f0b8
EES-5047: Remove shared backend validation messaging.
Dec 18, 2024
f7d94d1
Merge pull request #5450 from dfe-analytical-services/EES-4122
tomjonesdev Dec 18, 2024
00c9dd0
chore(tests): update test snapshots
dfe-sdt Dec 19, 2024
bb42748
Merge pull request #5462 from dfe-analytical-services/EES-5587
amyb-hiveit Dec 19, 2024
f467ba9
Merge pull request #5475 from dfe-analytical-services/chore/update-te…
N-moh Dec 19, 2024
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
12 changes: 6 additions & 6 deletions ...tion.ExploreEducationStatistics.Admin.Tests/Services/DataArchiveValidationServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,8 @@ public async Task ValidateBulkDataArchiveFiles_IndexFileMissing_ReturnsValidatio
.AssertBadRequestWithValidationErrors([
new ErrorViewModel
{
Code = ValidationMessages.BulkDataZipMustContainDatasetNamesCsv.Code,
Message = ValidationMessages.BulkDataZipMustContainDatasetNamesCsv.Message,
Code = ValidationMessages.BulkDataZipMustContainDataSetNamesCsv.Code,
Message = ValidationMessages.BulkDataZipMustContainDataSetNamesCsv.Message,
}
]);
}
Expand Down Expand Up @@ -267,8 +267,8 @@ public async Task ValidateBulkDataArchiveFiles_IndexFileHasIncorrectHeaders_Retu
.AssertBadRequestWithValidationErrors([
new ErrorViewModel
{
Code = ValidationMessages.DatasetNamesCsvIncorrectHeaders.Code,
Message = ValidationMessages.DatasetNamesCsvIncorrectHeaders.Message,
Code = ValidationMessages.DataSetNamesCsvIncorrectHeaders.Code,
Message = ValidationMessages.DataSetNamesCsvIncorrectHeaders.Message,
},
]);
}
Expand Down Expand Up @@ -319,7 +319,7 @@ public async Task ValidateBulkDataArchiveFiles_DuplicateDataSetTitlesAndFileName
.AssertLeft()
.AssertBadRequestWithValidationErrors([
ValidationMessages.GenerateErrorDataSetTitleShouldBeUnique("Duplicate title"),
ValidationMessages.GenerateErrorDatasetNamesCsvFilenamesShouldBeUnique("one"),
ValidationMessages.GenerateErrorDataSetNamesCsvFilenamesShouldBeUnique("one"),
]);
}
}
Expand All @@ -342,7 +342,7 @@ public async Task ValidateBulkDataArchiveFiles_Fail_DataSetNamesCsvFilesnamesSho
result
.AssertLeft()
.AssertBadRequestWithValidationErrors([
ValidationMessages.GenerateErrorDatasetNamesCsvFilenamesShouldNotEndDotCsv("one.csv")
ValidationMessages.GenerateErrorDataSetNamesCsvFilenamesShouldNotEndDotCsv("one.csv")
]);
}
}
Expand Down
6 changes: 3 additions & 3 deletions ...EducationStatistics.Admin.Tests/Services/Methodologies/MethodologyApprovalServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,9 +681,9 @@ public async Task UpdateApprovalStatus_ApprovingUsingImmediateStrategy()

redirectsCacheService.Setup(mock => mock.UpdateRedirects())
.ReturnsAsync(new RedirectsViewModel(
Publications: [],
Methodologies: [],
Releases: []));
PublicationRedirects: [],
MethodologyRedirects: [],
ReleaseRedirectsByPublicationSlug: []));

await using (var context = InMemoryApplicationDbContext(contentDbContextId))
{
Expand Down
42 changes: 21 additions & 21 deletions ....ExploreEducationStatistics.Admin.Tests/Services/Methodologies/MethodologyServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3600,9 +3600,9 @@ public async Task PublicationTitleOrSlugChanged()
var redirectsCacheService = new Mock<IRedirectsCacheService>(MockBehavior.Strict);
redirectsCacheService.Setup(mock => mock.UpdateRedirects())
.ReturnsAsync(new RedirectsViewModel(
Publications: [],
Methodologies: [],
Releases: []));
PublicationRedirects: [],
MethodologyRedirects: [],
ReleaseRedirectsByPublicationSlug: []));

var service = SetupMethodologyService(contentDbContext,
redirectsCacheService: redirectsCacheService.Object);
Expand Down Expand Up @@ -3662,9 +3662,9 @@ public async Task PublicationTitleOrSlugChanged_NoMethodologyRedirectAsMethodolo
var redirectsCacheService = new Mock<IRedirectsCacheService>(MockBehavior.Strict);
redirectsCacheService.Setup(mock => mock.UpdateRedirects())
.ReturnsAsync(new RedirectsViewModel(
Publications: [],
Methodologies: [],
Releases: []));
PublicationRedirects: [],
MethodologyRedirects: [],
ReleaseRedirectsByPublicationSlug: []));

var service = SetupMethodologyService(contentDbContext,
redirectsCacheService: redirectsCacheService.Object);
Expand Down Expand Up @@ -3745,9 +3745,9 @@ await contentDbContext.PublicationMethodologies.AddRangeAsync(
var redirectsCacheService = new Mock<IRedirectsCacheService>(MockBehavior.Strict);
redirectsCacheService.Setup(mock => mock.UpdateRedirects())
.ReturnsAsync(new RedirectsViewModel(
Publications: [],
Methodologies: [],
Releases: []));
PublicationRedirects: [],
MethodologyRedirects: [],
ReleaseRedirectsByPublicationSlug: []));

var service = SetupMethodologyService(contentDbContext,
redirectsCacheService: redirectsCacheService.Object);
Expand Down Expand Up @@ -3847,9 +3847,9 @@ public async Task PublicationTitleOrSlugChanged_MethodologySlugIsAlternativeSlug
var redirectsCacheService = new Mock<IRedirectsCacheService>(MockBehavior.Strict);
redirectsCacheService.Setup(mock => mock.UpdateRedirects())
.ReturnsAsync(new RedirectsViewModel(
Publications: [],
Methodologies: [],
Releases: []));
PublicationRedirects: [],
MethodologyRedirects: [],
ReleaseRedirectsByPublicationSlug: []));

var service = SetupMethodologyService(contentDbContext,
redirectsCacheService: redirectsCacheService.Object);
Expand Down Expand Up @@ -3917,9 +3917,9 @@ public async Task PublicationTitleOrSlugChanged_MethodologyIsLive()
var redirectsCacheService = new Mock<IRedirectsCacheService>(MockBehavior.Strict);
redirectsCacheService.Setup(mock => mock.UpdateRedirects())
.ReturnsAsync(new RedirectsViewModel(
Publications: [],
Methodologies: [],
Releases: []));
PublicationRedirects: [],
MethodologyRedirects: [],
ReleaseRedirectsByPublicationSlug: []));

var service = SetupMethodologyService(contentDbContext,
redirectsCacheService: redirectsCacheService.Object);
Expand Down Expand Up @@ -4004,9 +4004,9 @@ public async Task
var redirectsCacheService = new Mock<IRedirectsCacheService>(MockBehavior.Strict);
redirectsCacheService.Setup(mock => mock.UpdateRedirects())
.ReturnsAsync(new RedirectsViewModel(
Publications: [],
Methodologies: [],
Releases: []));
PublicationRedirects: [],
MethodologyRedirects: [],
ReleaseRedirectsByPublicationSlug: []));

var service = SetupMethodologyService(contentDbContext,
redirectsCacheService: redirectsCacheService.Object);
Expand Down Expand Up @@ -4110,9 +4110,9 @@ public async Task
var redirectsCacheService = new Mock<IRedirectsCacheService>(MockBehavior.Strict);
redirectsCacheService.Setup(mock => mock.UpdateRedirects())
.ReturnsAsync(new RedirectsViewModel(
Publications: [],
Methodologies: [],
Releases: []));
PublicationRedirects: [],
MethodologyRedirects: [],
ReleaseRedirectsByPublicationSlug: []));

var service = SetupMethodologyService(contentDbContext,
redirectsCacheService: redirectsCacheService.Object);
Expand Down
24 changes: 12 additions & 12 deletions ...ovUk.Education.ExploreEducationStatistics.Admin.Tests/Services/PublicationServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1127,9 +1127,9 @@ public async Task UpdatePublication_AlreadyPublished()

redirectsCacheService.Setup(mock => mock.UpdateRedirects())
.ReturnsAsync(new RedirectsViewModel(
Publications: [],
Methodologies: [],
Releases: []));
PublicationRedirects: [],
MethodologyRedirects: [],
ReleaseRedirectsByPublicationSlug: []));

var publicationService = BuildPublicationService(context,
methodologyService: methodologyService.Object,
Expand Down Expand Up @@ -1272,9 +1272,9 @@ public async Task UpdatePublication_TitleChangesPublicationAndMethodologySlug()

redirectsCacheService.Setup(mock => mock.UpdateRedirects())
.ReturnsAsync(new RedirectsViewModel(
Publications: [],
Methodologies: [],
Releases: []));
PublicationRedirects: [],
MethodologyRedirects: [],
ReleaseRedirectsByPublicationSlug: []));

var publicationService = BuildPublicationService(context,
methodologyService: methodologyService.Object,
Expand Down Expand Up @@ -1579,9 +1579,9 @@ public async Task UpdatePublication_CreateRedirectIfLiveSlugChanged()
var redirectsCacheService = new Mock<IRedirectsCacheService>(Strict);
redirectsCacheService.Setup(mock => mock.UpdateRedirects())
.ReturnsAsync(new RedirectsViewModel(
Publications: [],
Methodologies: [],
Releases: []));
PublicationRedirects: [],
MethodologyRedirects: [],
ReleaseRedirectsByPublicationSlug: []));

var publicationService = BuildPublicationService(context,
methodologyService: methodologyService.Object,
Expand Down Expand Up @@ -1678,9 +1678,9 @@ public async Task UpdatePublication_ChangeBackToPreviousLiveSlug()
var redirectsCacheService = new Mock<IRedirectsCacheService>(Strict);
redirectsCacheService.Setup(mock => mock.UpdateRedirects())
.ReturnsAsync(new RedirectsViewModel(
Publications: [],
Methodologies: [],
Releases: []));
PublicationRedirects: [],
MethodologyRedirects: [],
ReleaseRedirectsByPublicationSlug: []));

var publicationService = BuildPublicationService(context,
methodologyService: methodologyService.Object,
Expand Down
116 changes: 0 additions & 116 deletions ...ducation.ExploreEducationStatistics.Admin/Controllers/Api/DataBlockQuerySizeController.cs
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions src/GovUk.Education.ExploreEducationStatistics.Admin/Controllers/Api/ReleasesController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ public async Task<ActionResult<List<DataFileInfo>>> ReorderDataFiles(Guid releas
[RequestFormLimits(ValueLengthLimit = int.MaxValue, MultipartBodyLengthLimit = int.MaxValue)]
public async Task<ActionResult<DataFileInfo>> UploadDataSet(Guid releaseVersionId,
[FromQuery(Name = "replacingFileId")] Guid? replacingFileId,
[FromQuery(Name = "title")] string title,
[FromQuery(Name = "title")]
[MaxLength(120)]
string title,
IFormFile file,
IFormFile metaFile)
{
Expand All @@ -125,7 +127,9 @@ public async Task<ActionResult<DataFileInfo>> UploadDataSet(Guid releaseVersionI
[RequestFormLimits(ValueLengthLimit = int.MaxValue, MultipartBodyLengthLimit = int.MaxValue)]
public async Task<ActionResult<DataFileInfo>> UploadDataSetAsZip(Guid releaseVersionId,
[FromQuery(Name = "replacingFileId")] Guid? replacingFileId,
[FromQuery(Name = "title")] string title,
[FromQuery(Name = "title")]
[MaxLength(120)]
string title,
IFormFile zipFile)
{
return await _releaseDataFileService
Expand Down
Loading
Loading