Skip to content

Merge Dev into Master #5783

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

Merged
merged 143 commits into from
Apr 15, 2025
Merged

Merge Dev into Master #5783

merged 143 commits into from
Apr 15, 2025

Conversation

N-moh
Copy link
Collaborator

@N-moh N-moh commented Apr 11, 2025

This PR merges all the code from the Dev branch into the Master branch for upcoming deploys to Pre-production and Production

Guy-HiveIT and others added 30 commits March 31, 2025 14:57
Don't set aria-disabled to true during 'double click prevention' phase
Unit tests for release service - event raised

Cleaned up the test. Ensured the mock Admin Event Raiser works in the integration tests.
…ease-slug-changed

EES-5962 On Release Slug changed event
…tructure-changes-for-Search-Function-App

EES-5974 infrastructure changes for search function app related to EES-5875
…t.json 7.0.0 to 8.0.5. Vulnerability was fixed in 8.0.4. See GHSA-hh2w-p6rv-4g7w
…-chart-modal-focus-fix

EES-5985 Return focus to trigger btn on chart builder delete modal close
…st-snapshots

chore(tests): Update test snapshots 03-04-2025
…-json-vulnerability

Fix vulnerability in System.Text.Json
…eueName, and ThemeUpdatedQueueName app settings
…lls into the properties whether you like it or not)

Added On Release Slug changed event handler function.
Also made all properties for the dtos nullable since the serialiser will not respect the "required" keyword.
Added event handler OnReleaseSlugChanged.
Added Tests for all of the functions.
…tructure-changes-for-Search-Function-App-2

EES-5974 infrastructure changes for search function app related to EES-5953 and EES-5962
…ease-slug-changed-functions

EES-5962 On Release Slug changed - Event Handler Function
benoutram and others added 21 commits April 14, 2025 12:25
…-latest-published-release-changed queue subscription to publication-latest-published-release-reordered.
…lease-version-changed-queue to publication-latest-published-release-reordered-queue and change app setting PublicationLatestPublishedReleaseVersionChangedQueueName to PublicationLatestPublishedReleaseReorderedQueueName following queue rename
…-Automate-creation-of-event-grid-subscriptions

EES-5952 Rename subscriptions, event type filters and a queue
…EventRaiser and PublicationEventRaiser.

All events handled generically.
…it the `Label` for any Release (#5721)

* EES-5640 Changing the `ListLatestReleaseVersions` endpoint to accept an enum `versionsType`

The `versionsType` query parameter can be supplied with the following values:
- `Latest` - Returns all the latest release versions
- `LatestPublished` - Returns the latest PUBLISHED release versions (excludes DRAFTS)
- `OnlyDraft` - Returns the DRAFT release versions (excludes PUBLISHED)

* EES-5640 Removing `View existing version` button from the DRAFT releases table + renaming `Edit` -> `Edit Draft`

* EES-5640 Adding the `Edit Details` button to the PUBLISHED releases table - CAN ONLY BE USED IF USER HAS PERMISSION `CanUpdateRelease`

* EES-5640 Fixing TypeScript errors introduced during rebase

* EES-5640 Renaming some buttons

* EES-5640 - [POC] - Adding a 'Edit details' modal to edit the `Label` for any `Release`

* EES-5640 Refactoring the release label edit modal to use a reusable `FormModal` component

* EES-5640 Creating a reusable `FormModal` with an optional Warning component, and using it in the Edit Release Label modal

* EES-5640 Fixing unintended `FormModal` form submission + hiding the fields when the warning is displayed

* EES-5640 Adding backend error handling and improving the Modal UX when errors occur

* EES-5640 Making the Draft and Published Releases table column widths consistent and aligned

* EES-5640 Fixing the warning message when the new `Label` includes extra whitespace, capital letters, or is empty/undefined

* EES-5640 Adding some extra checks for the new properties on the `ReleaseVersionSummaryViewModel` to a test

* EES-5640 Refactoring `publicationQueries` `listUnpublishedReleaseVersionsWithPermissions` & `listPublishedReleaseVersionsWithPermissions` to have an optional `includePermissions` parameter

* EES-5640 Fixing/Adding FE tests for the Published Releases table, and the Draft Releases table

* EES-5640 Adding tests for the new `isUndefinedOrWhitespace` utility function

* EES-5640 Adding FE tests for the new `FormModal` component

* EES-5640 Adding FE tests for the new `ReleaseLabelEditModal` component

* EES-5640 - FE - Fixing tests

* EES-5640 FE changes as per PR review

* EES-5640 Adding flexbox to actions column in Draft Releases and Published Releases tables

* EES-5640 BE changes as per PR review

* EES-5640 Fixing bug where the `formValues` in `FormModal.tsx` were not being changed when editing the form

* EES-5640 Fixing bug where FE edit label modal warning is formatting the slug differently to the BE

Lodash's `_kebabCase` doesn't quite follow the same rules as we have for creating Release slugs on the BE. For example, it will put dashes between numbers and letters. Whereas, we don't actually do that. It is valid, for example, to have a slug `word1-anotherword2`. `_kebabCase` would have resulted in `word-1-anotherword-2`.

It's better to keep the confirmation warning on this modal using the same logic to display the new slug as the BE.

* EES-5640 Adding some more FE tests to cover the cases where the `Label` is alphanumeric

* EES-5640 Addressing PR comments
…ock-section-button-focus-behaviour

EES-5939 'add block/section' button focus behaviour
…or the built-in Azure roles as a comment in builtInRoles.bicep
…75_Admin_and_Publisher_role_assignments

EES-5973 EES-5975 Infrastructure for Admin and Publisher Event Grid role assignments
…-Event-Grid-Events-in-dev-environment

EES-5952 Enable Event Grid events in the dev environment
…or-a11y-modal-scroll

EES-5948 ckeditor a11y modal scroll
mmyoungman
mmyoungman previously approved these changes Apr 15, 2025
@mmyoungman mmyoungman self-requested a review April 15, 2025 11:33
…tructure-bicep-deployments-are-failing-due-to-bug-in-Azure-CLI

EES-6044 infrastructure bicep deployments are failing due to bug in azure cli
@N-moh N-moh merged commit b6ce39e into master Apr 15, 2025
25 of 27 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.