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.

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

merged 29 commits into from
Dec 19, 2024

Conversation

N-moh
Copy link
Collaborator

@N-moh N-moh commented Dec 19, 2024

This PR merges Dev branch into Master for upcoming deploys to Pre-Production and Production.

Tom Jones and others added 29 commits December 11, 2024 17:04
…ns (#5446)

* EES-5632 [WIP] Refactoring BE to return release redirects grouped by publication

* EES-5632 [WIP] Integration tests

* EES-5632 Enabling a different Azurite TestContainer instance to be used across each test so that the stored data doesn't interfere with other tests

* EES-5632 FE - Changing the view-model field names to match the new BE field names

* EES-5632 Some requested changes as per PR review

* EES-5632 removing some duplicated tests

* EES-5632 Reformatting tests

* EES-5632 remove unused import
EES-5732 prevent ui test failures after data replacement
EES-5543: Correct BoundaryLevel property in ChartDataSetConfig.
EES-5735: Add frontend error mapping for API data set replacement.
EES-5543 bugfix: dataSetConfig BoundaryLevels, no longer defaulted to 0
…ed to MethodologyVersion, Publication and Release.
EES-5632 Updating `ContentDbContextModelSnapshot`
…using an old Release slug in the URL (#5419)

* EES-5633 Refactoring the redirect logic to capture release redirects, and to allow us to define more accurately which routes we expect redirects for

* EES-5633 Fixing URLPattern Regex + Adding Jest tests + Fixing bug where we weren't isolating a module between test runs

The module state (cache) of the `redirectPages` module was interfering with subsequent runs of the tests. So we have used Jest's built-in `isolateModulesAsync` method to ensure that the module state is not carried over between test runs.

* EES-5633 Adding tests for child-routes that aren't accounted for in the redirect patterns + organising tests into groups

* EES-5633 Removing comments

* EES-5633 Refactoring to allow releases to have the same slugs across different publications

* EES-5633 Simplifying business logic

* EES-5633 Fixing FE test

* EES-5633 Removing invalid fast-track and permalink routes

* EES-5633 Removing the `/data-tables/{publication-slug}` path from the list of matched redirect URL Patterns

* EES-5633 Adding the `/data-tables/{publication-slug}` path back into the list of matched redirect URL Patterns

* EES-5633 Removing Lodash usage in middleware to fix build error

Was previously getting this error when running `pnpm run build` in the frontend project:

```
Failed to compile.

./..\..\node_modules\.pnpm\[email protected]\node_modules\lodash\lodash.js
Dynamic Code Evaluation (e. g. 'eval', 'new Function', 'WebAssembly.compile') not allowed in Edge Runtime
Learn More: https://nextjs.org/docs/messages/edge-dynamic-code-evaluation

Import trace for requested module:
  ./..\..\node_modules\.pnpm\[email protected]\node_modules\lodash\lodash.js
  ./src\middleware\pages\redirectPages.ts
  ./src\middleware.ts
```

* EES-5633 Removing unnecessary null check
…ed the data block size report until we need to use it.
…_DataBlockQuerySizeController

EES-4336 Remove `DataBlockQuerySizeController`
…st-snapshots

chore(tests): Update test snapshots 18-12-2024
…update naming convention for "DataSet" in validation messaging.
EES-5587 refactor reordering filters and indicators
…st-snapshots

chore(tests): Update test snapshots 19-12-2024
@N-moh N-moh requested a review from benoutram December 19, 2024 14:27
@N-moh N-moh merged commit df9513a into master Dec 19, 2024
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants