Merge Dev into Master #5010
Merged
Merge Dev into Master #5010
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…lacement checklist errors
…ta guidance & added text block to content page
This refactors the 'Delete draft version' button in a separate `DeleteDraftVersionButton` component.
Calling this function endpoint and getting a 404 should result in a 500 in the admin as the `CreateDataSet` endpoint is a static URL, and should not be possible to return 404 (unless there was a mistake in the code). Signed-off-by: Nicholas Tsim <nicholastsim@gmail.com>
This changes the ordering to something more intuitive for screen readers and general left-to-right reading.
… in data guidance
… use 'Wait Until Page Contains Element'
…oNone if the service detects no likely candidates, and switched logic of completed mappings to indicate that AutoNone mappings are incomplete until the user confirms them.
EES-4781 remove data catalogue feature flag
EES-5252 Remove listener on `SIGINT` for Windows in `start.ts`
… use 'Wait Until keyword succeeds'
EES-4716 Fix various issues with data set query endpoint
… bring PublicDataDbContextModelSnapshot up-to-date
…ext-data-set-version-metadata Ees 4944 read next data set version metadata
… versions (#4947) * EES-5194 Adding an endpoint to bulk delete API data set versions linked to a release version * EES-5194 Adding integration tests * EES-5194 Adjusting the `Success` test to check that data has NOT been deleted for non-target release versions * EES-5194 Fixing bugs This commit fixes multiple bugs, and adds some test cases to cover them: - We are no longer accidentally unlinking ALL the Release Version's `Files` from their API data set versions. We only unlink the Release Version's `ReleaseFiles` themselves. Before, this would have caused published Release Versions to have their `Files` unlinked too. - We are no longer deleting the parent `DataSet` parquet folder in the File Share when the `DataSetVersions` being deleted are NOT version 1. We only delete the `DataSet` folder if there are no remaining `DataSetVersions` attached to it other than the ones being deleted. - We are no longer deleting the `DataSet` entity from the DB when the `DataSetVersions` being deleted are NOT version 1. We only delete the `DataSet` if there are no remaining `DataSetVersions` attached to it other than the ones being deleted. * EES-5194 Fixing bulk delete endpoint transaction usage + removing unused method
…ft API data sets (#4957) * EES-5173 Changing the Release Version DELETION plan to include deleting draft API data sets * EES-5173 Changing the DELETE release endpoint to not convert `NotFoundResult` into `NoContentResult` * EES-5173 Adding tests * EES-5173 Fixing bug whereby we already deleted the `ReleaseFiles` and `Files` before attempting to delete the API data sets attached to those + Adding a check to block deleting if the plan is not valid Prior to these changes, we could, under certain circumstances, proceed with deleting a release version even if the deletion plan was not valid. There was also a bug whereby we would delete all the `Files` and `ReleaseFiles` for the `ReleaseVersion` first, and then make a call to the Processor to delete the API Data Sets. When this happened, the Processor could not find the `DataSetVersions` linked to the `ReleaseVersion` to delete them, because the `ReleaseFiles` had already been deleted. * EES-5173 Addressing PR comments * EES-5173 Deserialising `Status` enum as a string * EES-5173 Removing changes to the deletion plan We discussed and decided that we do not need to check which API data sets are linked to the release version when deleting it. Prior to these changes, we just allowed the deletion to go through without checking the plan. The plan did not validate anything. So, we've made the decision to simplify it and continue to not check against the plan when deleting the release version. * EES-5173 Some cleanup * EES-5173 Fixing tests * EES-5173 Removing unused method
…ed API data sets exist (#4958) * EES-5192 Changing the Data File DELETION endpoint to be blocked if any linked API data sets exist The deletion will be blocked regardless of the status of the API data set. * EES-5192 Adding tests * EES-5192 Fixing missed merge issues caused by rebase * EES-5192 Changing the deletion plan to include a `valid` flag for the API data set version itself This way, we can indicate to the user that the API data set version can be deleted - and can prompt them to delete that first, before coming back to delete the original data file * EES-5192 Addressing PR comments * EES-5192 Refactoring to use new `ReleaseFile.PublicApiDataSetId` and `ReleaseFile.PublicApiDataSetVersion` fields * EES-5192 Addressing PR comments * EES-5192 Removing unused imports * EES-5192 Fixing rebase issues
…keys rather than Lists that also contained elements with unique keys, to more easily work with JSON paths and JSON partial updates
…inked API data sets exist (#4972) * EES-5193 Changing the Data File REPLACEMENT endpoint to be blocked if any linked API data sets exist * EES-5193 Adding tests * EES-5193 Refactor - hardcoding the `Valid` flag to `false` for the linked API data set version deletion plan * EES-5193 Fixing rebase issues * EES-5193 Some renaming + throwing an `ApplicationException` when a data set version cannot be found that should exist
…le elements, as currently these mostly only contain a single Label field. Updated PublicDataDbContextModelSnapshot to reflect JSON field mapping simplifications.
…tial mapping type for LocationOptions. Various simplifications and tidy-ups.
…-mappings-3' into EES-5113-investigate-partial-json-updates
…ay purposes in the front end during mapping process. Swapping Filter Key from being its Label to its column name (PublicId), again for the purposes of the displaying in the front end
…igate-partial-json-updates Ees 5113 investigate partial json updates
…-data-set-version-mappings-3 Ees 4945 create data set version mappings 3
…st-snapshots chore(tests): Update test snapshots 27-06-2024
mmyoungman
approved these changes
Jun 27, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges dev branch into Master for upcoming deploys to Pre-production and Production environments.