From 5585cd225f3f446785937919d2fd9a23ce04de78 Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Fri, 19 Sep 2025 11:59:39 +0100 Subject: [PATCH 01/35] TD-6277 Yarn commands remove nhse-tel-frontend --- DigitalLearningSolutions.Web/package.json | 1 - DigitalLearningSolutions.Web/yarn.lock | 5 ----- 2 files changed, 6 deletions(-) diff --git a/DigitalLearningSolutions.Web/package.json b/DigitalLearningSolutions.Web/package.json index 77447fa236..b147104e5d 100644 --- a/DigitalLearningSolutions.Web/package.json +++ b/DigitalLearningSolutions.Web/package.json @@ -31,7 +31,6 @@ "js-cookie": "^3.0.5", "js-search": "^2.0.1", "lodash": "^4.17.20", - "nhse-tel-frontend": "^0.0.2", "regenerator-runtime": "^0.14.1" }, "devDependencies": { diff --git a/DigitalLearningSolutions.Web/yarn.lock b/DigitalLearningSolutions.Web/yarn.lock index 6aed671f98..a4d9c49cf2 100644 --- a/DigitalLearningSolutions.Web/yarn.lock +++ b/DigitalLearningSolutions.Web/yarn.lock @@ -4762,11 +4762,6 @@ neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -nhse-tel-frontend@^0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/nhse-tel-frontend/-/nhse-tel-frontend-0.0.2.tgz#a2788912435fabe5013f6440bee8d1816a2e299b" - integrity sha512-9crniTaODs3uQcRNvmBcAgpS9cwW+34scR3ezGIdCOJ2ikOa+va1t37ZH/QUXgAxk6JIWxoX+Edq+N0PcXgrgA== - nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" From 2eff9570e7b70051962c4ad2e2c665771ba6b00e Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Fri, 19 Sep 2025 12:10:43 +0100 Subject: [PATCH 02/35] TD-6277 Change jest.config.ts --- DigitalLearningSolutions.Web/jest.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DigitalLearningSolutions.Web/jest.config.js b/DigitalLearningSolutions.Web/jest.config.js index 6b71079ca8..ef8f2f3f59 100644 --- a/DigitalLearningSolutions.Web/jest.config.js +++ b/DigitalLearningSolutions.Web/jest.config.js @@ -174,7 +174,7 @@ module.exports = { // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation transformIgnorePatterns: [ - '/node_modules/(?!nhse-tel-frontend/.*)', + '/node_modules/(?!nhsuk-frontend/.*)', '\\.pnp\\.[^\\/]+$', ], From bdc267ec07fe113ad6410d397cdf40cab2650540 Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Fri, 19 Sep 2025 12:29:55 +0100 Subject: [PATCH 03/35] TD-6277 Find replace nhse-tel-fronted to nhsuk-frontend for imports. Alternative: Did not delete and regenerate files. --- .../Scripts/index.d.ts | 12 +-- DigitalLearningSolutions.Web/Scripts/nhsuk.ts | 12 +-- .../searchSortFilterAndPaginate.ts | 2 +- .../addNewCentreCourseSelectCourse.ts | 2 +- .../Styles/frameworks/comments.scss | 2 +- .../Styles/frameworks/frameworksShared.scss | 2 +- .../Styles/home/Policies.scss | 2 +- .../Styles/home/brands.scss | 2 +- .../Styles/home/learningContent.scss | 2 +- .../Styles/home/products.scss | 2 +- .../Styles/home/welcome.scss | 2 +- .../Styles/index.scss | 2 +- .../Styles/layout.scss | 2 +- .../Styles/learningMenu/index.scss | 4 +- .../Styles/learningMenu/section.scss | 2 +- .../Styles/learningMenu/tutorial.scss | 2 +- .../Styles/learningPortal/_inputrange.scss | 2 +- .../Styles/learningPortal/courses.scss | 2 +- .../Styles/learningPortal/current.scss | 2 +- .../Styles/learningPortal/selfAssessment.scss | 2 +- .../Styles/login/chooseACentre.scss | 2 +- .../myAccount/notificationPreferences.scss | 2 +- .../updateNotificationPreferences.scss | 2 +- .../Styles/nhsuk.scss | 2 +- .../Styles/shared/cardWithButtons.scss | 2 +- .../Styles/shared/cardWithThreeButtons.scss | 2 +- .../Styles/shared/headingButtons.scss | 2 +- .../Styles/shared/reports.scss | 2 +- .../shared/searchableElements/common.scss | 2 +- .../shared/searchableElements/filter.scss | 2 +- .../searchableElements/itemsPerPage.scss | 2 +- .../shared/searchableElements/pagination.scss | 2 +- .../shared/searchableElements/search.scss | 2 +- .../shared/searchableElements/sort.scss | 2 +- .../shared/searchableElements/tags.scss | 2 +- .../Styles/signposting/loginWarning.scss | 2 +- .../Styles/superAdmin/centres.scss | 2 +- .../Styles/superAdmin/platformreports.scss | 2 +- .../Styles/superAdmin/users.scss | 2 +- .../Styles/supervisor/staffMemberCard.scss | 2 +- .../Styles/support/support.scss | 2 +- .../trackingSystem/centreAdministrators.scss | 2 +- .../trackingSystem/centreConfiguration.scss | 2 +- .../trackingSystem/centreDashboard.scss | 2 +- .../Styles/trackingSystem/centreRanking.scss | 2 +- .../trackingSystem/contractDetails.scss | 2 +- .../Styles/trackingSystem/courseContent.scss | 2 +- .../Styles/trackingSystem/courseSetup.scss | 2 +- .../delegates/courseDelegates.scss | 2 +- .../delegates/emailDelegates.scss | 2 +- .../numberOfAdministratorsViewComponent.scss | 2 +- .../Styles/trackingSystem/selectCourse.scss | 2 +- .../Styles/trackingSystem/viewDelegate.scss | 2 +- .../Styles/userFeedback/userFeedback.scss | 2 +- DigitalLearningSolutions.Web/package.json | 1 + DigitalLearningSolutions.Web/yarn.lock | 88 +++++++++---------- 56 files changed, 108 insertions(+), 111 deletions(-) diff --git a/DigitalLearningSolutions.Web/Scripts/index.d.ts b/DigitalLearningSolutions.Web/Scripts/index.d.ts index dba2afa53a..02c8508a4e 100644 --- a/DigitalLearningSolutions.Web/Scripts/index.d.ts +++ b/DigitalLearningSolutions.Web/Scripts/index.d.ts @@ -1,23 +1,23 @@ -declare module 'nhse-tel-frontend/packages/components/header/header' { +declare module 'nhsuk-frontend/packages/components/header/header' { export default function Header(): void; } -declare module 'nhse-tel-frontend/packages/components/skip-link/skip-link' { +declare module 'nhsuk-frontend/packages/components/skip-link/skip-link' { export default function SkipLink(): void; } -declare module 'nhse-tel-frontend/packages/components/details/details' { +declare module 'nhsuk-frontend/packages/components/details/details' { export default function Details(): void; } -declare module 'nhse-tel-frontend/packages/components/radios/radios' { +declare module 'nhsuk-frontend/packages/components/radios/radios' { export default function Radios(): void; } -declare module 'nhse-tel-frontend/packages/components/checkboxes/checkboxes' { +declare module 'nhsuk-frontend/packages/components/checkboxes/checkboxes' { export default function Checkboxes(): void; } -declare module 'nhse-tel-frontend/packages/components/card/card' { +declare module 'nhsuk-frontend/packages/components/card/card' { export default function Card(): void; } diff --git a/DigitalLearningSolutions.Web/Scripts/nhsuk.ts b/DigitalLearningSolutions.Web/Scripts/nhsuk.ts index 7ce2b613aa..5114afd99e 100644 --- a/DigitalLearningSolutions.Web/Scripts/nhsuk.ts +++ b/DigitalLearningSolutions.Web/Scripts/nhsuk.ts @@ -1,12 +1,12 @@ // Components -import Header from 'nhse-tel-frontend/packages/components/header/header'; -import SkipLink from 'nhse-tel-frontend/packages/components/skip-link/skip-link'; -import Details from 'nhse-tel-frontend/packages/components/details/details'; -import Radios from 'nhse-tel-frontend/packages/components/radios/radios'; -import Checkboxes from 'nhse-tel-frontend/packages/components/checkboxes/checkboxes'; +import Header from 'nhsuk-frontend/packages/components/header/header'; +import SkipLink from 'nhsuk-frontend/packages/components/skip-link/skip-link'; +import Details from 'nhsuk-frontend/packages/components/details/details'; +import Radios from 'nhsuk-frontend/packages/components/radios/radios'; +import Checkboxes from 'nhsuk-frontend/packages/components/checkboxes/checkboxes'; // Polyfills -import 'nhse-tel-frontend/packages/polyfills'; +import 'nhsuk-frontend/packages/polyfills'; import 'core-js/stable'; import 'regenerator-runtime/runtime'; diff --git a/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts b/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts index a754f69348..3e9eb5ce67 100644 --- a/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts +++ b/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts @@ -1,4 +1,4 @@ -import Details from 'nhse-tel-frontend/packages/components/details/details'; +import Details from 'nhsuk-frontend/packages/components/details/details'; import _ from 'lodash'; import { setUpFilter, filterSearchableElements, IAppliedFilterTag, diff --git a/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts b/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts index 5510674c40..8ef418f1ab 100644 --- a/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts +++ b/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts @@ -1,5 +1,5 @@ import * as _ from 'lodash'; -import Details from 'nhse-tel-frontend/packages/components/details/details'; +import Details from 'nhsuk-frontend/packages/components/details/details'; import { ISearchableData, ISearchableElement, diff --git a/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss b/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss index fb855d2611..9bb0b2337c 100644 --- a/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss +++ b/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .nhsuk-card.comment { border-width: medium; diff --git a/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss b/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss index 9b9cac6d75..b452ab9178 100644 --- a/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss +++ b/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "../shared/headingButtons" as *; @use "../shared/searchableElements/searchableElements" as *; $nhs-dark-grey: #425563; diff --git a/DigitalLearningSolutions.Web/Styles/home/Policies.scss b/DigitalLearningSolutions.Web/Styles/home/Policies.scss index 77caf6c344..f9693e16c3 100644 --- a/DigitalLearningSolutions.Web/Styles/home/Policies.scss +++ b/DigitalLearningSolutions.Web/Styles/home/Policies.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .custom-ordered-list { list-style: none; diff --git a/DigitalLearningSolutions.Web/Styles/home/brands.scss b/DigitalLearningSolutions.Web/Styles/home/brands.scss index 87bdd1bdcc..d0fe3aca55 100644 --- a/DigitalLearningSolutions.Web/Styles/home/brands.scss +++ b/DigitalLearningSolutions.Web/Styles/home/brands.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "../shared/cardWithButtons"; @use "../shared/searchableElements/searchableElements"; diff --git a/DigitalLearningSolutions.Web/Styles/home/learningContent.scss b/DigitalLearningSolutions.Web/Styles/home/learningContent.scss index 5334a5f8dd..ba1d801448 100644 --- a/DigitalLearningSolutions.Web/Styles/home/learningContent.scss +++ b/DigitalLearningSolutions.Web/Styles/home/learningContent.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .learning-content-item { margin-bottom: 72px; diff --git a/DigitalLearningSolutions.Web/Styles/home/products.scss b/DigitalLearningSolutions.Web/Styles/home/products.scss index f372734819..998efb2b89 100644 --- a/DigitalLearningSolutions.Web/Styles/home/products.scss +++ b/DigitalLearningSolutions.Web/Styles/home/products.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .product { margin-bottom: 72px; diff --git a/DigitalLearningSolutions.Web/Styles/home/welcome.scss b/DigitalLearningSolutions.Web/Styles/home/welcome.scss index 51c14ac8c8..31579d6d15 100644 --- a/DigitalLearningSolutions.Web/Styles/home/welcome.scss +++ b/DigitalLearningSolutions.Web/Styles/home/welcome.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .welcome-page-button-container { margin-bottom: 32px; diff --git a/DigitalLearningSolutions.Web/Styles/index.scss b/DigitalLearningSolutions.Web/Styles/index.scss index c61029a83f..028b1d0e15 100644 --- a/DigitalLearningSolutions.Web/Styles/index.scss +++ b/DigitalLearningSolutions.Web/Styles/index.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; $iframe-padding-bottom: nhsuk-spacing(8) * 2; diff --git a/DigitalLearningSolutions.Web/Styles/layout.scss b/DigitalLearningSolutions.Web/Styles/layout.scss index 62fe159b39..35c70c4a3b 100644 --- a/DigitalLearningSolutions.Web/Styles/layout.scss +++ b/DigitalLearningSolutions.Web/Styles/layout.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "shared/breakpoints" as *; html { diff --git a/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss b/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss index ef089148f7..0fe2bbebac 100644 --- a/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss +++ b/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss @@ -1,5 +1,5 @@ -@use "nhse-tel-frontend/packages/core/all" as *; -@import "nhse-tel-frontend/packages/components/tag/_tag"; +@use "nhsuk-frontend/packages/core/all" as *; +@import "nhsuk-frontend/packages/components/tag/_tag"; .learning-menu-card { border: none; diff --git a/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss b/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss index 415d8c11fb..e4e0609a51 100644 --- a/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss +++ b/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .float-right-additional-information { @include mq($until: desktop) { diff --git a/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss b/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss index 7fe9a1f15f..4c8704e83b 100644 --- a/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss +++ b/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .objectives-card { @include nhsuk-typography-responsive(19); diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss index 6bdede8d2c..16de6115f9 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss @@ -4,7 +4,7 @@ // Author: Darlan Rod https://github.com/darlanrod // Version 1.5.2 // MIT License -@use "nhse-tel-frontend/packages/core/settings/colours" as *; +@use "nhsuk-frontend/packages/core/settings/colours" as *; $track-color: $color_nhsuk-grey-3 !default; $thumb-color: $color_nhsuk-grey-2 !default; diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss index 0752002412..24f7f84c81 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "../shared/searchableElements/searchableElements"; .searchable-element { diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/current.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/current.scss index 517a0ad04d..f863e0704b 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/current.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/current.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "courses"; .searchable-element { diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss index 053c1834c6..b6ae38acdb 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss @@ -1,5 +1,5 @@ @use "inputrange" as *; -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "courses" as *; @use "../shared/breakpoints" as *; @use "../shared/searchableElements/searchableElements" as *; diff --git a/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss b/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss index c13339e4a9..dfc1dd0653 100644 --- a/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss +++ b/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .centre-role-tags { display: flex; diff --git a/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss b/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss index 4d3b2a5381..6f5e328562 100644 --- a/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss +++ b/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .top-spaced-goback { margin-top: 32px; diff --git a/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss b/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss index ab6bd89c42..e5fc52d701 100644 --- a/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss +++ b/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .update-notification-hint { margin-bottom: 24px; diff --git a/DigitalLearningSolutions.Web/Styles/nhsuk.scss b/DigitalLearningSolutions.Web/Styles/nhsuk.scss index 51b728e407..8c37284f1b 100644 --- a/DigitalLearningSolutions.Web/Styles/nhsuk.scss +++ b/DigitalLearningSolutions.Web/Styles/nhsuk.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/nhsuk" as *; +@use "nhsuk-frontend/packages/nhsuk" as *; .nhsuk-u-margin-right-auto { margin-right: auto; diff --git a/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss b/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss index ef2745ce14..8fea2fee90 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .card-with-buttons { background-color: #fff; diff --git a/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss b/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss index 255c6594fd..85223ddca7 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .nhsuk-button.expander-card__button { margin-right: nhsuk-spacing(2); diff --git a/DigitalLearningSolutions.Web/Styles/shared/headingButtons.scss b/DigitalLearningSolutions.Web/Styles/shared/headingButtons.scss index 450c89de63..9765e1a925 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/headingButtons.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/headingButtons.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "breakpoints" as *; .heading-button-group { diff --git a/DigitalLearningSolutions.Web/Styles/shared/reports.scss b/DigitalLearningSolutions.Web/Styles/shared/reports.scss index 4efbdc04c3..ac51923da8 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/reports.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/reports.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "chartist/dist/scss/chartist"; $dark-blue: #005EB8; diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss index b19b0a1714..a00f280936 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "../breakpoints"; $nhs-dark-grey: #425563; diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss index 172711ce20..2dc8f57458 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use '../../shared/searchableElements/common' as *; .filter-container { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss index 81759368ca..858ac80988 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "common" as *; .items-per-page-box-container { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss index 8f16fb41bf..5e68080302 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "common" as *; .pagination-hidden { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss index c2f9e07982..6efa24de25 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "common" as *; .search-box-container { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss index 54f2998317..ed9cffb715 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "common" as *; .sort-box-container { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/tags.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/tags.scss index 1a8f147f28..2a7833b16b 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/tags.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/tags.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "common" as *; .tags { diff --git a/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss b/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss index 6e26b6c05d..894923386b 100644 --- a/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss +++ b/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .launch-resource-button { text-decoration: none; diff --git a/DigitalLearningSolutions.Web/Styles/superAdmin/centres.scss b/DigitalLearningSolutions.Web/Styles/superAdmin/centres.scss index ae4735b585..883fe85c1e 100644 --- a/DigitalLearningSolutions.Web/Styles/superAdmin/centres.scss +++ b/DigitalLearningSolutions.Web/Styles/superAdmin/centres.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "../shared/searchableElements/searchableElements" as *; @use "../shared/breakpoints" as *; diff --git a/DigitalLearningSolutions.Web/Styles/superAdmin/platformreports.scss b/DigitalLearningSolutions.Web/Styles/superAdmin/platformreports.scss index 4193d0c53b..1ffb788996 100644 --- a/DigitalLearningSolutions.Web/Styles/superAdmin/platformreports.scss +++ b/DigitalLearningSolutions.Web/Styles/superAdmin/platformreports.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @media (min-width: 48.0625em) { .reports-summary-row__key { diff --git a/DigitalLearningSolutions.Web/Styles/superAdmin/users.scss b/DigitalLearningSolutions.Web/Styles/superAdmin/users.scss index 61d2e738c7..75ea6c4a4e 100644 --- a/DigitalLearningSolutions.Web/Styles/superAdmin/users.scss +++ b/DigitalLearningSolutions.Web/Styles/superAdmin/users.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "../shared/searchableElements/searchableElements" as *; @use "../shared/breakpoints" as *; diff --git a/DigitalLearningSolutions.Web/Styles/supervisor/staffMemberCard.scss b/DigitalLearningSolutions.Web/Styles/supervisor/staffMemberCard.scss index 5f2a05026c..0517a8a154 100644 --- a/DigitalLearningSolutions.Web/Styles/supervisor/staffMemberCard.scss +++ b/DigitalLearningSolutions.Web/Styles/supervisor/staffMemberCard.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .loggedinuser .card-background { color: $nhsuk-text-color; diff --git a/DigitalLearningSolutions.Web/Styles/support/support.scss b/DigitalLearningSolutions.Web/Styles/support/support.scss index 4b96c6f5a9..ae363e9c68 100644 --- a/DigitalLearningSolutions.Web/Styles/support/support.scss +++ b/DigitalLearningSolutions.Web/Styles/support/support.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; ol > li { margin-bottom: nhsuk-spacing(6) diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreAdministrators.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreAdministrators.scss index ae5a4c5005..39efcb6d26 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreAdministrators.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreAdministrators.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "../shared/searchableElements/searchableElements" as *; @use "../shared/breakpoints" as *; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreConfiguration.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreConfiguration.scss index e9c4889712..c940f4aef0 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreConfiguration.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreConfiguration.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .centre-detail-image__downsize { display: block; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreDashboard.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreDashboard.scss index 976182b861..fca8919028 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreDashboard.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreDashboard.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .dashboard-4-1-card { @include mq($until: large-desktop) { diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreRanking.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreRanking.scss index ea1e5481d0..f34f8e1a8f 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreRanking.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreRanking.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "../shared/searchableElements/searchableElements"; $current-centre-highlight: $color_nhsuk-pale-yellow; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss index 0e76a46820..1701c79b41 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; // The colours here are tied to the colour conversion from percentages // defined in DisplayColourHelper diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss index fd09a260a6..6479cc34f0 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "../shared/searchableElements/common" as *; .summary-list-right-align-tags { diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseSetup.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseSetup.scss index 286d0df9a1..52f8f508ef 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseSetup.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseSetup.scss @@ -1,5 +1,5 @@ @use "../shared/cardWithButtons"; -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "../shared/searchableElements/searchableElements"; @use "../shared/headingButtons.scss"; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss index 47fb8f20d5..f5720d0ae4 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/courseDelegates.scss @@ -1,4 +1,4 @@ -@use 'nhse-tel-frontend/packages/core/all' as *; +@use 'nhsuk-frontend/packages/core/all' as *; @use '../../shared/searchableElements/searchableElements' as *; @use '../../shared/headingButtons' as *; @use '../../shared/cardWithThreeButtons' as *; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/emailDelegates.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/emailDelegates.scss index cdf0f48f02..2f75e4afdf 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/emailDelegates.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/emailDelegates.scss @@ -1,2 +1,2 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "../../shared/searchableElements/searchableElements"; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss index 5e6484507f..7f5df92a47 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; dd.nhsuk-summary-list__value { text-align: right; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/selectCourse.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/selectCourse.scss index ccab1d9964..2646784c26 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/selectCourse.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/selectCourse.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "../shared/searchableElements/filter" as *; .filter-dropdown { diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/viewDelegate.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/viewDelegate.scss index cc0aaa6381..f66b4c3cdb 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/viewDelegate.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/viewDelegate.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; @use "../shared/searchableElements/searchableElements"; .view-delegate-top-button-group { diff --git a/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss b/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss index b297b18151..bfc1e652a7 100644 --- a/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss +++ b/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss @@ -1,4 +1,4 @@ -@use "nhse-tel-frontend/packages/core/all" as *; +@use "nhsuk-frontend/packages/core/all" as *; .feedback-chevron { padding: 0 !important; diff --git a/DigitalLearningSolutions.Web/package.json b/DigitalLearningSolutions.Web/package.json index b147104e5d..997fe5f33c 100644 --- a/DigitalLearningSolutions.Web/package.json +++ b/DigitalLearningSolutions.Web/package.json @@ -31,6 +31,7 @@ "js-cookie": "^3.0.5", "js-search": "^2.0.1", "lodash": "^4.17.20", + "nhsuk-frontend": "^10.0.0", "regenerator-runtime": "^0.14.1" }, "devDependencies": { diff --git a/DigitalLearningSolutions.Web/yarn.lock b/DigitalLearningSolutions.Web/yarn.lock index a4d9c49cf2..48bab4fd0b 100644 --- a/DigitalLearningSolutions.Web/yarn.lock +++ b/DigitalLearningSolutions.Web/yarn.lock @@ -61,16 +61,12 @@ "@jridgewell/trace-mapping" "^0.3.25" jsesc "^3.0.2" -"@babel/generator@^7.27.0": - version "7.27.0" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.27.0.tgz#764382b5392e5b9aff93cadb190d0745866cbc2c" - integrity sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw== +"@babel/helper-annotate-as-pure@^7.18.6": + version "7.27.3" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz#f31fd86b915fc4daf1f3ac6976c59be7084ed9c5" + integrity sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg== dependencies: - "@babel/parser" "^7.27.0" - "@babel/types" "^7.27.0" - "@jridgewell/gen-mapping" "^0.3.5" - "@jridgewell/trace-mapping" "^0.3.25" - jsesc "^3.0.2" + "@babel/types" "^7.27.3" "@babel/helper-annotate-as-pure@^7.25.9": version "7.25.9" @@ -123,19 +119,6 @@ "@babel/traverse" "^7.27.1" semver "^6.3.1" -"@babel/helper-create-class-features-plugin@^7.27.0": - version "7.27.0" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.27.0.tgz#518fad6a307c6a96f44af14912b2c20abe9bfc30" - integrity sha512-vSGCvMecvFCd/BdpGlhpXYNhhC4ccxyvQWpbGL4CWbvfEoLFWUZuSuf7s9Aw70flgQF+6vptvgK2IfOnKlRmBg== - dependencies: - "@babel/helper-annotate-as-pure" "^7.25.9" - "@babel/helper-member-expression-to-functions" "^7.25.9" - "@babel/helper-optimise-call-expression" "^7.25.9" - "@babel/helper-replace-supers" "^7.26.5" - "@babel/helper-skip-transparent-expression-wrappers" "^7.25.9" - "@babel/traverse" "^7.27.0" - semver "^6.3.1" - "@babel/helper-create-regexp-features-plugin@^7.18.6": version "7.21.8" resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.8.tgz#a7886f61c2e29e21fd4aaeaf1e473deba6b571dc" @@ -260,12 +243,12 @@ "@babel/traverse" "^7.27.1" "@babel/types" "^7.27.1" -"@babel/helper-string-parser@^7.27.1": +"@babel/helper-string-parser@^7.25.9", "@babel/helper-string-parser@^7.27.1": version "7.27.1" resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687" integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA== -"@babel/helper-validator-identifier@^7.27.1": +"@babel/helper-validator-identifier@^7.25.9", "@babel/helper-validator-identifier@^7.27.1": version "7.27.1" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz#a7054dcc145a967dd4dc8fee845a57c1316c9df8" integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow== @@ -299,6 +282,13 @@ dependencies: "@babel/types" "^7.27.3" +"@babel/parser@^7.20.7": + version "7.28.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.4.tgz#da25d4643532890932cc03f7705fe19637e03fa8" + integrity sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg== + dependencies: + "@babel/types" "^7.28.4" + "@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.27.1": version "7.27.1" resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.27.1.tgz#61dd8a8e61f7eb568268d1b5f129da3eee364bf9" @@ -364,6 +354,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" +"@babel/plugin-syntax-class-static-block@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" + integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-import-assertions@^7.27.1": version "7.27.1" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.27.1.tgz#88894aefd2b03b5ee6ad1562a7c8e1587496aecd" @@ -371,7 +368,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.27.1" -"@babel/plugin-syntax-import-attributes@^7.27.1": +"@babel/plugin-syntax-import-attributes@^7.24.7", "@babel/plugin-syntax-import-attributes@^7.27.1": version "7.27.1" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz#34c017d54496f9b11b61474e7ea3dfd5563ffe07" integrity sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww== @@ -1003,16 +1000,15 @@ debug "^4.3.1" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.25.9", "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": +"@babel/types@^7.0.0", "@babel/types@^7.25.9", "@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.3.3", "@babel/types@^7.4.4": version "7.27.3" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.3.tgz#c0257bedf33aad6aad1f406d35c44758321eb3ec" integrity sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw== - dependencies: "@babel/helper-string-parser" "^7.27.1" "@babel/helper-validator-identifier" "^7.27.1" -"@babel/types@^7.20.7", "@babel/types@^7.26.7", "@babel/types@^7.27.0": +"@babel/types@^7.20.7": version "7.27.0" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.27.0.tgz#ef9acb6b06c3173f6632d993ecb6d4ae470b4559" integrity sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg== @@ -1020,6 +1016,14 @@ "@babel/helper-string-parser" "^7.25.9" "@babel/helper-validator-identifier" "^7.25.9" +"@babel/types@^7.28.4": + version "7.28.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.4.tgz#0a4e618f4c60a7cd6c11cb2d48060e4dbe38ac3a" + integrity sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q== + dependencies: + "@babel/helper-string-parser" "^7.27.1" + "@babel/helper-validator-identifier" "^7.27.1" + "@bcoe/v8-coverage@^0.2.3": version "0.2.3" resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" @@ -4481,6 +4485,11 @@ jsesc@^3.0.2: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d" integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA== +jsesc@~0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" + integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== + jsesc@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e" @@ -4762,6 +4771,11 @@ neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== +nhsuk-frontend@^10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/nhsuk-frontend/-/nhsuk-frontend-10.0.0.tgz#dad45e4b52561257c3f69898a5ccfc2b120acac8" + integrity sha512-WrvUfYi+FAqcDjQIvtvhx4V6+5nL/K7PvFXp/IwuAQl6F9q+RwxStsr4BBufhSVSfp9vYs7ldegLsO0UtzdJAQ== + nice-try@^1.0.4: version "1.0.5" resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" @@ -5227,24 +5241,6 @@ regenerator-runtime@^0.14.0, regenerator-runtime@^0.14.1: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz#356ade10263f685dda125100cd862c1db895327f" integrity sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw== -regexp.prototype.flags@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz#87cab30f80f66660181a3bb7bf5981a872b367ac" - integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - functions-have-names "^1.2.2" - -regexp.prototype.flags@^1.5.1: - version "1.5.1" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz#90ce989138db209f81492edd734183ce99f9677e" - integrity sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg== - dependencies: - call-bind "^1.0.2" - define-properties "^1.2.0" - set-function-name "^2.0.0" - regexp.prototype.flags@^1.5.3: version "1.5.4" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz#1ad6c62d44a259007e55b3970e00f746efbcaa19" From c256836192d737a2b437e15aeb3e56156e0099d4 Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Fri, 19 Sep 2025 13:24:11 +0100 Subject: [PATCH 04/35] TD-6277 Issue could be due the version itself revert to 9.1.0 runs clean rebuild runs --- DigitalLearningSolutions.Web/appsettings.Development.json | 4 ++-- DigitalLearningSolutions.Web/package.json | 2 +- DigitalLearningSolutions.Web/yarn.lock | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DigitalLearningSolutions.Web/appsettings.Development.json b/DigitalLearningSolutions.Web/appsettings.Development.json index 9b2d9762c8..5979f03586 100644 --- a/DigitalLearningSolutions.Web/appsettings.Development.json +++ b/DigitalLearningSolutions.Web/appsettings.Development.json @@ -1,9 +1,9 @@ { "ConnectionStrings": { - "DefaultConnection": "Data Source=localhost;Initial Catalog=mbdbx101_uar;Integrated Security=True;TrustServerCertificate=true;", + "DefaultConnection": "Data Source=X24D-1424721257;Initial Catalog=Dls;Integrated Security=True;TrustServerCertificate=true;", "UnitTestConnection": "Data Source=localhost;Initial Catalog=mbdbx101_uar_test;Integrated Security=True;TrustServerCertificate=true;" }, - "CurrentSystemBaseUrl": "https://localhost:5001", + "CurrentSystemBaseUrl": "https://localhost:5001", "AppRootPath": "https://localhost:44363", "LegacyLearningMenu": false, "MapsAPIKey": "", diff --git a/DigitalLearningSolutions.Web/package.json b/DigitalLearningSolutions.Web/package.json index 997fe5f33c..7c34896d6f 100644 --- a/DigitalLearningSolutions.Web/package.json +++ b/DigitalLearningSolutions.Web/package.json @@ -31,7 +31,7 @@ "js-cookie": "^3.0.5", "js-search": "^2.0.1", "lodash": "^4.17.20", - "nhsuk-frontend": "^10.0.0", + "nhsuk-frontend": "9.1.0", "regenerator-runtime": "^0.14.1" }, "devDependencies": { diff --git a/DigitalLearningSolutions.Web/yarn.lock b/DigitalLearningSolutions.Web/yarn.lock index 48bab4fd0b..7bbf7b93d0 100644 --- a/DigitalLearningSolutions.Web/yarn.lock +++ b/DigitalLearningSolutions.Web/yarn.lock @@ -4771,10 +4771,10 @@ neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -nhsuk-frontend@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/nhsuk-frontend/-/nhsuk-frontend-10.0.0.tgz#dad45e4b52561257c3f69898a5ccfc2b120acac8" - integrity sha512-WrvUfYi+FAqcDjQIvtvhx4V6+5nL/K7PvFXp/IwuAQl6F9q+RwxStsr4BBufhSVSfp9vYs7ldegLsO0UtzdJAQ== +nhsuk-frontend@9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/nhsuk-frontend/-/nhsuk-frontend-9.1.0.tgz#f5e4f083aaf3cafd7a19731f6a49f1caf9723cab" + integrity sha512-z2hcZDUDz12hjBTWLasq5lfX+sv2jwZFkUdip8qL9fBQ6qykyQFQ8PjWuBBgQN03IU0wMkV3BBLbwBjFiSxREQ== nice-try@^1.0.4: version "1.0.5" From 9f497f8f4b3d700ec015954f7aef213f0770d71e Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Mon, 22 Sep 2025 09:46:45 +0100 Subject: [PATCH 05/35] TD-6277 NHSUK increase to 10.0.0 packages route change to dist as per docs Sass https://service-manual.nhs.uk/design-system/guides/updating-to-v10 --- .../Styles/frameworks/comments.scss | 2 +- .../Styles/frameworks/frameworksShared.scss | 2 +- DigitalLearningSolutions.Web/Styles/home/Policies.scss | 2 +- DigitalLearningSolutions.Web/Styles/home/brands.scss | 2 +- .../Styles/home/learningContent.scss | 2 +- DigitalLearningSolutions.Web/Styles/home/products.scss | 2 +- DigitalLearningSolutions.Web/Styles/home/welcome.scss | 2 +- DigitalLearningSolutions.Web/Styles/index.scss | 2 +- DigitalLearningSolutions.Web/Styles/layout.scss | 2 +- .../Styles/learningMenu/index.scss | 4 ++-- .../Styles/learningMenu/section.scss | 2 +- .../Styles/learningMenu/tutorial.scss | 2 +- .../Styles/learningPortal/_inputrange.scss | 2 +- .../Styles/learningPortal/courses.scss | 2 +- .../Styles/learningPortal/current.scss | 2 +- .../Styles/learningPortal/selfAssessment.scss | 2 +- .../Styles/login/chooseACentre.scss | 2 +- .../Styles/myAccount/notificationPreferences.scss | 2 +- .../Styles/myAccount/updateNotificationPreferences.scss | 2 +- DigitalLearningSolutions.Web/Styles/nhsuk.scss | 2 +- .../Styles/shared/cardWithButtons.scss | 2 +- .../Styles/shared/cardWithThreeButtons.scss | 2 +- .../Styles/shared/headingButtons.scss | 2 +- DigitalLearningSolutions.Web/Styles/shared/reports.scss | 2 +- .../Styles/shared/searchableElements/common.scss | 2 +- .../Styles/shared/searchableElements/filter.scss | 2 +- .../Styles/shared/searchableElements/itemsPerPage.scss | 2 +- .../Styles/shared/searchableElements/pagination.scss | 2 +- .../Styles/shared/searchableElements/search.scss | 2 +- .../Styles/shared/searchableElements/sort.scss | 2 +- .../Styles/shared/searchableElements/tags.scss | 2 +- .../Styles/signposting/loginWarning.scss | 2 +- .../Styles/superAdmin/centres.scss | 2 +- .../Styles/superAdmin/platformreports.scss | 2 +- DigitalLearningSolutions.Web/Styles/superAdmin/users.scss | 2 +- .../Styles/supervisor/staffMemberCard.scss | 2 +- DigitalLearningSolutions.Web/Styles/support/support.scss | 2 +- .../Styles/trackingSystem/centreAdministrators.scss | 2 +- .../Styles/trackingSystem/centreConfiguration.scss | 2 +- .../Styles/trackingSystem/centreDashboard.scss | 2 +- .../Styles/trackingSystem/centreRanking.scss | 2 +- .../Styles/trackingSystem/contractDetails.scss | 2 +- .../Styles/trackingSystem/courseContent.scss | 2 +- .../Styles/trackingSystem/courseSetup.scss | 2 +- .../Styles/trackingSystem/delegates/emailDelegates.scss | 2 +- .../numberOfAdministratorsViewComponent.scss | 2 +- .../Styles/trackingSystem/selectCourse.scss | 2 +- .../Styles/trackingSystem/viewDelegate.scss | 2 +- .../Styles/userFeedback/userFeedback.scss | 2 +- DigitalLearningSolutions.Web/package.json | 2 +- DigitalLearningSolutions.Web/yarn.lock | 8 ++++---- 51 files changed, 55 insertions(+), 55 deletions(-) diff --git a/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss b/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss index 9bb0b2337c..8a09b59603 100644 --- a/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss +++ b/DigitalLearningSolutions.Web/Styles/frameworks/comments.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .nhsuk-card.comment { border-width: medium; diff --git a/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss b/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss index b452ab9178..cc67e7411f 100644 --- a/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss +++ b/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "../shared/headingButtons" as *; @use "../shared/searchableElements/searchableElements" as *; $nhs-dark-grey: #425563; diff --git a/DigitalLearningSolutions.Web/Styles/home/Policies.scss b/DigitalLearningSolutions.Web/Styles/home/Policies.scss index f9693e16c3..68451dda57 100644 --- a/DigitalLearningSolutions.Web/Styles/home/Policies.scss +++ b/DigitalLearningSolutions.Web/Styles/home/Policies.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .custom-ordered-list { list-style: none; diff --git a/DigitalLearningSolutions.Web/Styles/home/brands.scss b/DigitalLearningSolutions.Web/Styles/home/brands.scss index d0fe3aca55..c6cfc08ff4 100644 --- a/DigitalLearningSolutions.Web/Styles/home/brands.scss +++ b/DigitalLearningSolutions.Web/Styles/home/brands.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "../shared/cardWithButtons"; @use "../shared/searchableElements/searchableElements"; diff --git a/DigitalLearningSolutions.Web/Styles/home/learningContent.scss b/DigitalLearningSolutions.Web/Styles/home/learningContent.scss index ba1d801448..2025166468 100644 --- a/DigitalLearningSolutions.Web/Styles/home/learningContent.scss +++ b/DigitalLearningSolutions.Web/Styles/home/learningContent.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .learning-content-item { margin-bottom: 72px; diff --git a/DigitalLearningSolutions.Web/Styles/home/products.scss b/DigitalLearningSolutions.Web/Styles/home/products.scss index 998efb2b89..538411dc6b 100644 --- a/DigitalLearningSolutions.Web/Styles/home/products.scss +++ b/DigitalLearningSolutions.Web/Styles/home/products.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .product { margin-bottom: 72px; diff --git a/DigitalLearningSolutions.Web/Styles/home/welcome.scss b/DigitalLearningSolutions.Web/Styles/home/welcome.scss index 31579d6d15..d1dbf6be25 100644 --- a/DigitalLearningSolutions.Web/Styles/home/welcome.scss +++ b/DigitalLearningSolutions.Web/Styles/home/welcome.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .welcome-page-button-container { margin-bottom: 32px; diff --git a/DigitalLearningSolutions.Web/Styles/index.scss b/DigitalLearningSolutions.Web/Styles/index.scss index 028b1d0e15..d007f61d73 100644 --- a/DigitalLearningSolutions.Web/Styles/index.scss +++ b/DigitalLearningSolutions.Web/Styles/index.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; $iframe-padding-bottom: nhsuk-spacing(8) * 2; diff --git a/DigitalLearningSolutions.Web/Styles/layout.scss b/DigitalLearningSolutions.Web/Styles/layout.scss index 35c70c4a3b..0d8ef97e83 100644 --- a/DigitalLearningSolutions.Web/Styles/layout.scss +++ b/DigitalLearningSolutions.Web/Styles/layout.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "shared/breakpoints" as *; html { diff --git a/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss b/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss index 0fe2bbebac..e059d4e444 100644 --- a/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss +++ b/DigitalLearningSolutions.Web/Styles/learningMenu/index.scss @@ -1,5 +1,5 @@ -@use "nhsuk-frontend/packages/core/all" as *; -@import "nhsuk-frontend/packages/components/tag/_tag"; +@use "nhsuk-frontend/dist/core/all" as *; +@import "nhsuk-frontend/dist/components/tag/_tag"; .learning-menu-card { border: none; diff --git a/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss b/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss index e4e0609a51..6cb9650820 100644 --- a/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss +++ b/DigitalLearningSolutions.Web/Styles/learningMenu/section.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .float-right-additional-information { @include mq($until: desktop) { diff --git a/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss b/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss index 4c8704e83b..519540ac76 100644 --- a/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss +++ b/DigitalLearningSolutions.Web/Styles/learningMenu/tutorial.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .objectives-card { @include nhsuk-typography-responsive(19); diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss index 16de6115f9..326dc07e80 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/_inputrange.scss @@ -4,7 +4,7 @@ // Author: Darlan Rod https://github.com/darlanrod // Version 1.5.2 // MIT License -@use "nhsuk-frontend/packages/core/settings/colours" as *; +@use "nhsuk-frontend/dist/core/settings/colours" as *; $track-color: $color_nhsuk-grey-3 !default; $thumb-color: $color_nhsuk-grey-2 !default; diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss index 24f7f84c81..4bc421219e 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/courses.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "../shared/searchableElements/searchableElements"; .searchable-element { diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/current.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/current.scss index f863e0704b..04965cf952 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/current.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/current.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "courses"; .searchable-element { diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss index b6ae38acdb..3b50328850 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss @@ -1,5 +1,5 @@ @use "inputrange" as *; -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "courses" as *; @use "../shared/breakpoints" as *; @use "../shared/searchableElements/searchableElements" as *; diff --git a/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss b/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss index dfc1dd0653..e7f4035b05 100644 --- a/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss +++ b/DigitalLearningSolutions.Web/Styles/login/chooseACentre.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .centre-role-tags { display: flex; diff --git a/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss b/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss index 6f5e328562..48b0798d7a 100644 --- a/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss +++ b/DigitalLearningSolutions.Web/Styles/myAccount/notificationPreferences.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .top-spaced-goback { margin-top: 32px; diff --git a/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss b/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss index e5fc52d701..200d2ab3ac 100644 --- a/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss +++ b/DigitalLearningSolutions.Web/Styles/myAccount/updateNotificationPreferences.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .update-notification-hint { margin-bottom: 24px; diff --git a/DigitalLearningSolutions.Web/Styles/nhsuk.scss b/DigitalLearningSolutions.Web/Styles/nhsuk.scss index 8c37284f1b..004f7cdc33 100644 --- a/DigitalLearningSolutions.Web/Styles/nhsuk.scss +++ b/DigitalLearningSolutions.Web/Styles/nhsuk.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/nhsuk" as *; +@use "nhsuk-frontend/dist/nhsuk" as *; .nhsuk-u-margin-right-auto { margin-right: auto; diff --git a/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss b/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss index 8fea2fee90..8c24c7c3c5 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/cardWithButtons.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .card-with-buttons { background-color: #fff; diff --git a/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss b/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss index 85223ddca7..a036372d7e 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/cardWithThreeButtons.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .nhsuk-button.expander-card__button { margin-right: nhsuk-spacing(2); diff --git a/DigitalLearningSolutions.Web/Styles/shared/headingButtons.scss b/DigitalLearningSolutions.Web/Styles/shared/headingButtons.scss index 9765e1a925..ad53fc872d 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/headingButtons.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/headingButtons.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "breakpoints" as *; .heading-button-group { diff --git a/DigitalLearningSolutions.Web/Styles/shared/reports.scss b/DigitalLearningSolutions.Web/Styles/shared/reports.scss index ac51923da8..32354a83a7 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/reports.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/reports.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "chartist/dist/scss/chartist"; $dark-blue: #005EB8; diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss index a00f280936..cccc79249a 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/common.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "../breakpoints"; $nhs-dark-grey: #425563; diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss index 2dc8f57458..9227bb9aa0 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/filter.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use '../../shared/searchableElements/common' as *; .filter-container { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss index 858ac80988..c3e47fbd65 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/itemsPerPage.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "common" as *; .items-per-page-box-container { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss index 5e68080302..ab7b67740f 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/pagination.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "common" as *; .pagination-hidden { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss index 6efa24de25..234d1ec82a 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/search.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "common" as *; .search-box-container { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss index ed9cffb715..95c716e973 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/sort.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "common" as *; .sort-box-container { diff --git a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/tags.scss b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/tags.scss index 2a7833b16b..8fb8e65f99 100644 --- a/DigitalLearningSolutions.Web/Styles/shared/searchableElements/tags.scss +++ b/DigitalLearningSolutions.Web/Styles/shared/searchableElements/tags.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "common" as *; .tags { diff --git a/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss b/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss index 894923386b..b998a7f557 100644 --- a/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss +++ b/DigitalLearningSolutions.Web/Styles/signposting/loginWarning.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .launch-resource-button { text-decoration: none; diff --git a/DigitalLearningSolutions.Web/Styles/superAdmin/centres.scss b/DigitalLearningSolutions.Web/Styles/superAdmin/centres.scss index 883fe85c1e..2c429b739b 100644 --- a/DigitalLearningSolutions.Web/Styles/superAdmin/centres.scss +++ b/DigitalLearningSolutions.Web/Styles/superAdmin/centres.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "../shared/searchableElements/searchableElements" as *; @use "../shared/breakpoints" as *; diff --git a/DigitalLearningSolutions.Web/Styles/superAdmin/platformreports.scss b/DigitalLearningSolutions.Web/Styles/superAdmin/platformreports.scss index 1ffb788996..2f61fd14b5 100644 --- a/DigitalLearningSolutions.Web/Styles/superAdmin/platformreports.scss +++ b/DigitalLearningSolutions.Web/Styles/superAdmin/platformreports.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @media (min-width: 48.0625em) { .reports-summary-row__key { diff --git a/DigitalLearningSolutions.Web/Styles/superAdmin/users.scss b/DigitalLearningSolutions.Web/Styles/superAdmin/users.scss index 75ea6c4a4e..6e1555966a 100644 --- a/DigitalLearningSolutions.Web/Styles/superAdmin/users.scss +++ b/DigitalLearningSolutions.Web/Styles/superAdmin/users.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "../shared/searchableElements/searchableElements" as *; @use "../shared/breakpoints" as *; diff --git a/DigitalLearningSolutions.Web/Styles/supervisor/staffMemberCard.scss b/DigitalLearningSolutions.Web/Styles/supervisor/staffMemberCard.scss index 0517a8a154..73a33a1dfc 100644 --- a/DigitalLearningSolutions.Web/Styles/supervisor/staffMemberCard.scss +++ b/DigitalLearningSolutions.Web/Styles/supervisor/staffMemberCard.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .loggedinuser .card-background { color: $nhsuk-text-color; diff --git a/DigitalLearningSolutions.Web/Styles/support/support.scss b/DigitalLearningSolutions.Web/Styles/support/support.scss index ae363e9c68..80213c2f64 100644 --- a/DigitalLearningSolutions.Web/Styles/support/support.scss +++ b/DigitalLearningSolutions.Web/Styles/support/support.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; ol > li { margin-bottom: nhsuk-spacing(6) diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreAdministrators.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreAdministrators.scss index 39efcb6d26..08f46f4c00 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreAdministrators.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreAdministrators.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "../shared/searchableElements/searchableElements" as *; @use "../shared/breakpoints" as *; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreConfiguration.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreConfiguration.scss index c940f4aef0..072b728d62 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreConfiguration.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreConfiguration.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .centre-detail-image__downsize { display: block; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreDashboard.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreDashboard.scss index fca8919028..57a5ef70ea 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreDashboard.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreDashboard.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .dashboard-4-1-card { @include mq($until: large-desktop) { diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreRanking.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreRanking.scss index f34f8e1a8f..19132dfa65 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/centreRanking.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/centreRanking.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "../shared/searchableElements/searchableElements"; $current-centre-highlight: $color_nhsuk-pale-yellow; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss index 1701c79b41..5672c7b6c1 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/contractDetails.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; // The colours here are tied to the colour conversion from percentages // defined in DisplayColourHelper diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss index 6479cc34f0..e2be417014 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseContent.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "../shared/searchableElements/common" as *; .summary-list-right-align-tags { diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseSetup.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseSetup.scss index 52f8f508ef..c88e7c2854 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/courseSetup.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/courseSetup.scss @@ -1,5 +1,5 @@ @use "../shared/cardWithButtons"; -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "../shared/searchableElements/searchableElements"; @use "../shared/headingButtons.scss"; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/emailDelegates.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/emailDelegates.scss index 2f75e4afdf..1b34e8741f 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/emailDelegates.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/delegates/emailDelegates.scss @@ -1,2 +1,2 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "../../shared/searchableElements/searchableElements"; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss index 7f5df92a47..1e1bb4e012 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/numberOfAdministratorsViewComponent.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; dd.nhsuk-summary-list__value { text-align: right; diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/selectCourse.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/selectCourse.scss index 2646784c26..240e030e8d 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/selectCourse.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/selectCourse.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "../shared/searchableElements/filter" as *; .filter-dropdown { diff --git a/DigitalLearningSolutions.Web/Styles/trackingSystem/viewDelegate.scss b/DigitalLearningSolutions.Web/Styles/trackingSystem/viewDelegate.scss index f66b4c3cdb..cb5fc295d8 100644 --- a/DigitalLearningSolutions.Web/Styles/trackingSystem/viewDelegate.scss +++ b/DigitalLearningSolutions.Web/Styles/trackingSystem/viewDelegate.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; @use "../shared/searchableElements/searchableElements"; .view-delegate-top-button-group { diff --git a/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss b/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss index bfc1e652a7..0f5d3a93e1 100644 --- a/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss +++ b/DigitalLearningSolutions.Web/Styles/userFeedback/userFeedback.scss @@ -1,4 +1,4 @@ -@use "nhsuk-frontend/packages/core/all" as *; +@use "nhsuk-frontend/dist/core/all" as *; .feedback-chevron { padding: 0 !important; diff --git a/DigitalLearningSolutions.Web/package.json b/DigitalLearningSolutions.Web/package.json index 7c34896d6f..9a598292fc 100644 --- a/DigitalLearningSolutions.Web/package.json +++ b/DigitalLearningSolutions.Web/package.json @@ -31,7 +31,7 @@ "js-cookie": "^3.0.5", "js-search": "^2.0.1", "lodash": "^4.17.20", - "nhsuk-frontend": "9.1.0", + "nhsuk-frontend": "10.0.0", "regenerator-runtime": "^0.14.1" }, "devDependencies": { diff --git a/DigitalLearningSolutions.Web/yarn.lock b/DigitalLearningSolutions.Web/yarn.lock index 7bbf7b93d0..706c36dc82 100644 --- a/DigitalLearningSolutions.Web/yarn.lock +++ b/DigitalLearningSolutions.Web/yarn.lock @@ -4771,10 +4771,10 @@ neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -nhsuk-frontend@9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/nhsuk-frontend/-/nhsuk-frontend-9.1.0.tgz#f5e4f083aaf3cafd7a19731f6a49f1caf9723cab" - integrity sha512-z2hcZDUDz12hjBTWLasq5lfX+sv2jwZFkUdip8qL9fBQ6qykyQFQ8PjWuBBgQN03IU0wMkV3BBLbwBjFiSxREQ== +nhsuk-frontend@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/nhsuk-frontend/-/nhsuk-frontend-10.0.0.tgz#dad45e4b52561257c3f69898a5ccfc2b120acac8" + integrity sha512-WrvUfYi+FAqcDjQIvtvhx4V6+5nL/K7PvFXp/IwuAQl6F9q+RwxStsr4BBufhSVSfp9vYs7ldegLsO0UtzdJAQ== nice-try@^1.0.4: version "1.0.5" From 625df6e8099fec6db2e2d25b79d655a89d198bb2 Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Mon, 22 Sep 2025 11:14:15 +0100 Subject: [PATCH 06/35] TD-6277 Following docs for nhsuk bundler but Details not detected https://service-manual.nhs.uk/design-system/guides/updating-to-v10 --- DigitalLearningSolutions.Web/Scripts/nhsuk.ts | 21 +++++-------------- .../searchSortFilterAndPaginate.ts | 4 ++-- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/DigitalLearningSolutions.Web/Scripts/nhsuk.ts b/DigitalLearningSolutions.Web/Scripts/nhsuk.ts index 5114afd99e..67ba3c4fb9 100644 --- a/DigitalLearningSolutions.Web/Scripts/nhsuk.ts +++ b/DigitalLearningSolutions.Web/Scripts/nhsuk.ts @@ -1,23 +1,12 @@ // Components -import Header from 'nhsuk-frontend/packages/components/header/header'; -import SkipLink from 'nhsuk-frontend/packages/components/skip-link/skip-link'; -import Details from 'nhsuk-frontend/packages/components/details/details'; -import Radios from 'nhsuk-frontend/packages/components/radios/radios'; -import Checkboxes from 'nhsuk-frontend/packages/components/checkboxes/checkboxes'; +import { initAll } from 'nhsuk-frontend'; // Polyfills -import 'nhsuk-frontend/packages/polyfills'; +import 'nhsuk-frontend/packages/polyfills';// qqqq come back to this import 'core-js/stable'; import 'regenerator-runtime/runtime'; // Initialize components -document.addEventListener( - 'DOMContentLoaded', - () => { - Details(); - Header(); - SkipLink(); - Radios(); - Checkboxes(); - }, -); +document.addEventListener('DOMContentLoaded', () => { + initAll(); +}); diff --git a/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts b/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts index 3e9eb5ce67..ba890433e6 100644 --- a/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts +++ b/DigitalLearningSolutions.Web/Scripts/searchSortFilterAndPaginate/searchSortFilterAndPaginate.ts @@ -1,4 +1,4 @@ -import Details from 'nhsuk-frontend/packages/components/details/details'; +import { Details } from 'nhsuk-frontend'; // no export qqqq or initDetails import _ from 'lodash'; import { setUpFilter, filterSearchableElements, IAppliedFilterTag, @@ -236,7 +236,7 @@ export class SearchSortFilterAndPaginate { (searchableElement) => searchableElementsContainer.appendChild(searchableElement.element), ); // This is required to polyfill the new elements in IE - Details(); + Details(); // qqqq come back to this may need something else } updateResultCountAndPageNumber(count: number): void { From 638edc8b19bbac9c1048e322e7b652df5164cbe5 Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Mon, 22 Sep 2025 11:21:41 +0100 Subject: [PATCH 07/35] TD-6277 Remoivng tracking files of node nhsuk files because we are bundling --- .../DigitalLearningSolutions.Web.csproj | 222 +----------------- 1 file changed, 1 insertion(+), 221 deletions(-) diff --git a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj index 0057f8da8d..14e9b195f7 100644 --- a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj +++ b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj @@ -88,224 +88,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -370,9 +152,7 @@ - - - + From a91e8693dc7bcf897326bc386ea7b11ff43ad16c Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Mon, 22 Sep 2025 13:25:34 +0100 Subject: [PATCH 08/35] TD-6277 JSenabled and static assets https://service-manual.nhs.uk/design-system/guides/updating-to-v10 --- .../DigitalLearningSolutions.Web.csproj | 24 +++++++++---------- .../Scripts/index.d.ts | 2 +- .../addNewCentreCourseSelectCourse.ts | 2 +- .../SelfAssessments/_Layout.cshtml | 2 +- .../Views/Shared/_Layout.cshtml | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj index 14e9b195f7..1919a5a10d 100644 --- a/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj +++ b/DigitalLearningSolutions.Web/DigitalLearningSolutions.Web.csproj @@ -153,18 +153,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/DigitalLearningSolutions.Web/Scripts/index.d.ts b/DigitalLearningSolutions.Web/Scripts/index.d.ts index 02c8508a4e..2ed9bf10ab 100644 --- a/DigitalLearningSolutions.Web/Scripts/index.d.ts +++ b/DigitalLearningSolutions.Web/Scripts/index.d.ts @@ -1,4 +1,4 @@ -declare module 'nhsuk-frontend/packages/components/header/header' { +declare module 'nhsuk-frontend/packages/components/header/header' { // qqqq still packages! not node_modules/nhsuk-frontend/dist/nhsuk/components export default function Header(): void; } diff --git a/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts b/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts index 8ef418f1ab..f430fe6e8f 100644 --- a/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts +++ b/DigitalLearningSolutions.Web/Scripts/trackingSystem/addNewCentreCourseSelectCourse.ts @@ -1,5 +1,5 @@ import * as _ from 'lodash'; -import Details from 'nhsuk-frontend/packages/components/details/details'; +import Details from 'nhsuk-frontend/packages/components/details/details'; //qqqq still packages! not node_modules/nhsuk-frontend/dist/nhsuk/components import { ISearchableData, ISearchableElement, diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml index da2b85dc86..43610a3e20 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_Layout.cshtml @@ -51,7 +51,7 @@ { @await Html.PartialAsync("~/Views/Shared/_GoogleTagManagerBodyTagJs.cshtml") } - + Skip to main content
diff --git a/DigitalLearningSolutions.Web/Views/LearningMenu/_SectionCard.cshtml b/DigitalLearningSolutions.Web/Views/LearningMenu/_SectionCard.cshtml index 5bbe262ffc..803788f9a8 100644 --- a/DigitalLearningSolutions.Web/Views/LearningMenu/_SectionCard.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningMenu/_SectionCard.cshtml @@ -17,7 +17,7 @@
-

+

@Model.PercentComplete

@if (Model.PostLearningAssessmentPassed) diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentCompetency.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentCompetency.cshtml index daed52dd70..f71e6c03ba 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentCompetency.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentCompetency.cshtml @@ -37,7 +37,7 @@ {
-

+

@Model.Competency.Name @@ -50,7 +50,7 @@ } else { -

+

@Model.Competency.Name

@if (Model.Competency.Description != null) diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_SupervisorsCard.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_SupervisorsCard.cshtml index 540136e58f..d3fd633319 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_SupervisorsCard.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_SupervisorsCard.cshtml @@ -2,7 +2,7 @@ @model IEnumerable
-

+

Activity Supervisors

diff --git a/DigitalLearningSolutions.Web/Views/Register/PersonalInformation.cshtml b/DigitalLearningSolutions.Web/Views/Register/PersonalInformation.cshtml index d62b151da2..450c2707cc 100644 --- a/DigitalLearningSolutions.Web/Views/Register/PersonalInformation.cshtml +++ b/DigitalLearningSolutions.Web/Views/Register/PersonalInformation.cshtml @@ -97,7 +97,7 @@ -

+

Alternatively, if you already have an account and would like to register at a new centre, log in and register through the My Account page:

diff --git a/DigitalLearningSolutions.Web/Views/RegisterAdmin/PersonalInformation.cshtml b/DigitalLearningSolutions.Web/Views/RegisterAdmin/PersonalInformation.cshtml index 3cc604c009..c92859985d 100644 --- a/DigitalLearningSolutions.Web/Views/RegisterAdmin/PersonalInformation.cshtml +++ b/DigitalLearningSolutions.Web/Views/RegisterAdmin/PersonalInformation.cshtml @@ -68,7 +68,7 @@ -

+

Alternatively, if you already have an account but would like to register at this centre as well, please log in.

Need help? -
+

Need help?

+
  • Centre contact information: @Model.BannerText diff --git a/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml b/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml index a5c93ec91c..38bba07632 100644 --- a/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/Supervisor/Index.cshtml @@ -70,7 +70,7 @@ else

    @Model.DashboardData.StaffCount Staff @if (Model.DashboardData.StaffUnregisteredCount > 0) { - + (@Model.DashboardData.StaffUnregisteredCount not registered) } diff --git a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Dashboard/_DashboardTopCardGroup.cshtml b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Dashboard/_DashboardTopCardGroup.cshtml index fb948141db..2a859606e7 100644 --- a/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Dashboard/_DashboardTopCardGroup.cshtml +++ b/DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Dashboard/_DashboardTopCardGroup.cshtml @@ -8,7 +8,7 @@

  • -

    +

    @Model.NumberOfDelegates Delegates

    -

    +

    @Model.NumberOfCourses Courses

    -

    +

    @Model.NumberOfAdmins Admins

    @if (User.HasCentreManagerPermissions()) @@ -60,7 +60,7 @@
  • -

    +

    @Model.NumberOfSupportTickets Support tickets

    -

    +

    @Model.ActivityName

    @@ -113,7 +113,7 @@ else
    -

    +

    @Model.ActivityName

    From f6cdf66c1dca58a172838603127625bc47538ca5 Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Tue, 23 Sep 2025 16:14:00 +0100 Subject: [PATCH 15/35] TD-6277 Breadcrumb changes --- .../AddCompetencies.cshtml | 10 ++++---- .../AddCompetenciesSelectFramework.cshtml | 8 +++---- .../CompetencyAssessmentFeatures.cshtml | 6 ++--- .../CompetencyAssessmentSummary.cshtml | 6 ++--- .../CompetencyAssessments/EditBranding.cshtml | 8 +++---- .../EditDescription.cshtml | 8 +++---- .../EditRoleProfileLinks.cshtml | 8 +++---- .../EditVocabulary.cshtml | 8 +++---- .../Views/CompetencyAssessments/Index.cshtml | 2 +- .../ManageCompetencyAssessment.cshtml | 6 ++--- .../Views/CompetencyAssessments/Name.cshtml | 14 +++++------ .../SelectFrameworkSources.cshtml | 8 +++---- .../ViewSelectedCompetencies.cshtml | 8 +++---- .../CookieConsent/CookieConfirmation.cshtml | 4 ++-- ...ddCompetencyLearningResourceSummary.cshtml | 12 +++++----- .../AddCompetencyLearningResources.cshtml | 12 ++++------ .../AddSignpostingParametersSummary.cshtml | 10 ++++---- .../Developer/AssessmentQuestion.cshtml | 14 +++++------ .../AssessmentQuestionConfirm.cshtml | 14 +++++------ .../AssessmentQuestionLevelDescriptor.cshtml | 14 +++++------ .../AssessmentQuestionOptions.cshtml | 14 +++++------ .../AssessmentQuestionScoring.cshtml | 14 +++++------ .../Frameworks/Developer/Branding.cshtml | 14 +++++------ .../Frameworks/Developer/Collaborators.cshtml | 24 +++++++++---------- .../Frameworks/Developer/CommentThread.cshtml | 8 +++---- .../CompareSelfAssessmentResult.cshtml | 10 ++++---- .../Frameworks/Developer/Competency.cshtml | 8 +++---- .../CompetencyAssessmentQuestions.cshtml | 8 +++---- .../Developer/CompetencyGroup.cshtml | 8 +++---- .../CompetencyGroupRemoveConfirm.cshtml | 8 +++---- .../Developer/CompetencyPreview.cshtml | 8 +++---- .../Frameworks/Developer/CustomFlags.cshtml | 8 +++---- .../Developer/DefaultQuestions.cshtml | 8 +++---- .../Frameworks/Developer/Description.cshtml | 14 +++++------ .../EditCompetencyLearningResources.cshtml | 8 +++---- .../Developer/EditCustomFlag.cshtml | 8 +++---- .../EditSignpostingParameters.cshtml | 10 ++++---- .../Frameworks/Developer/Framework.cshtml | 6 ++--- .../Developer/FrameworkPrintLayout.cshtml | 8 +++---- .../Frameworks/Developer/Frameworks.cshtml | 2 +- .../Import/AddAssessmentQuestions.cshtml | 8 +++---- .../AddQuestionsToWhichCompetencies.cshtml | 8 +++---- .../Import/ApplyCompetencyOrdering.cshtml | 8 +++---- .../Developer/Import/ImportCompleted.cshtml | 8 +++---- .../Developer/Import/ImportFailed.cshtml | 8 +++---- .../Developer/Import/ImportSummary.cshtml | 8 +++---- .../Frameworks/Developer/Import/Index.cshtml | 8 +++---- .../Developer/Import/UploadResults.cshtml | 8 +++---- .../Views/Frameworks/Developer/Name.cshtml | 14 +++++------ .../Views/Frameworks/Developer/Publish.cshtml | 8 +++---- .../Developer/RemoveDefaultQuestion.cshtml | 10 ++++---- .../Views/Frameworks/Developer/Review.cshtml | 8 +++---- ...gnpostingParametersSetTriggerValues.cshtml | 10 ++++---- .../Developer/SignpostingSetStatus.cshtml | 10 ++++---- .../Views/Frameworks/Developer/Similar.cshtml | 6 ++--- .../Frameworks/Developer/SubmitReview.cshtml | 8 +++---- .../Views/Frameworks/Developer/Type.cshtml | 14 +++++------ .../Views/Frameworks/Index.cshtml | 2 +- .../Views/LearningContent/Index.cshtml | 4 ++-- .../LearningMenu/Completion/Completion.cshtml | 6 ++--- .../Views/LearningMenu/CoursePassword.cshtml | 4 ++-- .../LearningMenu/Diagnostic/Diagnostic.cshtml | 14 +++++------ .../Diagnostic/DiagnosticContent.cshtml | 12 +++++----- .../Views/LearningMenu/Index.cshtml | 4 ++-- .../PostLearning/PostLearning.cshtml | 14 +++++------ .../PostLearning/PostLearningContent.cshtml | 12 +++++----- .../Views/LearningMenu/Section/Section.cshtml | 10 ++++---- .../Tutorial/ContentViewer.cshtml | 10 ++++---- .../LearningMenu/Tutorial/Tutorial.cshtml | 14 +++++------ .../Tutorial/TutorialVideo.cshtml | 10 ++++---- .../RecommendedLearning.cshtml | 6 ++--- .../ResourceRemovedErrorPage.cshtml | 4 ++-- .../AddOptionalCompetencies.cshtml | 8 +++---- .../SelfAssessments/AddSupervisor.cshtml | 24 +++++++++---------- .../AddSupervisorSummary.cshtml | 16 ++++++------- ...CompetencySelfAssessmentCertificate.cshtml | 4 ++-- .../ConfirmOverwriteSelfAssessment.cshtml | 2 +- .../SelfAssessments/FilteredMgp/Asset.cshtml | 6 ++--- .../FilteredMgp/AssetComplete.cshtml | 8 +++---- .../FilteredMgp/FilteredResults.cshtml | 4 ++-- .../FilteredMgp/PlayList.cshtml | 6 ++--- .../ManageOptionalCompetencies.cshtml | 12 +++++----- .../SelfAssessments/ManageSupervisors.cshtml | 6 ++--- .../SelfAssessments/RequestSignOff.cshtml | 8 +++---- ...dSupervisorSignoffEmailConfirmation.cshtml | 6 ++--- .../ReviewConfirmationRequests.cshtml | 8 +++---- .../SelectSupervisorCentre.cshtml | 8 +++---- .../SelfAssessmentCompetency.cshtml | 8 +++---- .../SelfAssessmentDescription.cshtml | 2 +- .../SelfAssessmentOverview.cshtml | 6 ++--- .../SelfAssessments/SetSupervisorRole.cshtml | 10 ++++---- .../SelfAssessments/SignOffHistory.cshtml | 8 +++---- .../SelfAssessments/SupervisorComments.cshtml | 8 +++---- .../VerificationPickResults.cshtml | 10 ++++---- .../VerificationPickSupervisor.cshtml | 10 ++++---- .../VerificationSummary.cshtml | 10 ++++---- .../SelfAssessments/_Layout.cshtml | 2 +- .../NotificationPreferences/Index.cshtml | 4 ++-- .../AdminAccounts/EditCentre.cshtml | 2 +- .../AdminAccounts/ManageRoles.cshtml | 2 +- .../Centres/CentreRoleLimits.cshtml | 6 ++--- .../Views/SuperAdmin/Centres/CourseAdd.cshtml | 6 ++--- .../Centres/CourseAddChooseFlow.cshtml | 6 ++--- .../Views/SuperAdmin/Centres/Courses.cshtml | 4 ++-- .../SuperAdmin/Centres/ManageCentre.cshtml | 6 ++--- .../Centres/SelfAssessmentAdd.cshtml | 6 ++--- .../SuperAdmin/Centres/SelfAssessments.cshtml | 4 ++-- .../InactivateDelegateConfirmation.cshtml | 2 +- .../RemoveCentreEmailConfirmation.cshtml | 2 +- .../SuperAdmin/Users/EditUserDetails.cshtml | 2 +- .../Users/InactivateUserConfirmation.cshtml | 2 +- .../Users/SuperAdminUserSetPassword.cshtml | 2 +- .../Users/UserCentreAccounts.cshtml | 2 +- .../AddMultipleSupervisorDelegates.cshtml | 10 ++++---- .../DelegateProfileAssessments.cshtml | 8 +++---- .../EnrolDelegateOnProfileAssessment.cshtml | 10 ++++---- .../EnrolDelegateSetCompleteBy.cshtml | 10 ++++---- .../Supervisor/EnrolDelegateSummary.cshtml | 12 +++++----- .../EnrolDelegateSupervisorRole.cshtml | 10 ++++---- .../Views/Supervisor/Index.cshtml | 2 +- .../Views/Supervisor/MyStaffList.cshtml | 6 ++--- .../ReviewCompetencySelfAsessment.cshtml | 12 +++++----- .../Supervisor/ReviewSelfAssessment.cshtml | 12 +++++----- .../SelectDelegateSupervisorRole.cshtml | 10 ++++---- ...SelectDelegateSupervisorRoleSummary.cshtml | 10 ++++---- .../Views/Supervisor/SignOffHistory.cshtml | 10 ++++---- .../SignOffProfileAssessment.cshtml | 12 +++++----- .../Supervisor/VerifyMultipleResults.cshtml | 10 ++++---- .../Views/Support/Faqs/ViewFaq.cshtml | 2 +- .../RegistrationPrompts/Index.cshtml | 4 ++-- .../_BreadcrumbsToManageCoursePage.cshtml | 4 ++-- .../Shared/_AllDelegatesBreadcrumbs.cshtml | 4 ++-- .../Shared/_CourseDelegatesBreadcrumbs.cshtml | 6 ++--- ..._CourseDelegatesProgressBreadcrumbs.cshtml | 8 +++---- .../Shared/_DelegateCoursesBreadcrumbs.cshtml | 4 ++-- .../Shared/_DelegateGroupBreadcrumbs.cshtml | 4 ++-- .../Shared/_ViewDelegateBreadcrumbs.cshtml | 4 ++-- .../_ViewDelegateProgressBreadcrumbs.cshtml | 8 +++---- .../_BreadcrumbsToViewDelegatePage.cshtml | 4 ++-- .../_CentreCourseSetupBreadcrumbs.cshtml | 4 ++-- .../Shared/_CentreDashboardBreadcrumbs.cshtml | 4 ++-- 141 files changed, 553 insertions(+), 563 deletions(-) diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml index 8616052934..f270acd2c7 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetencies.cshtml @@ -13,11 +13,11 @@ } diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml index 1bb44950b3..0b9b7ab45b 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/AddCompetenciesSelectFramework.cshtml @@ -13,11 +13,11 @@ } diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentFeatures.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentFeatures.cshtml index 1e5ef6a629..017ece5f0a 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentFeatures.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentFeatures.cshtml @@ -13,9 +13,9 @@ diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentSummary.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentSummary.cshtml index be9f1d0e0d..acc9576e18 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentSummary.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/CompetencyAssessmentSummary.cshtml @@ -13,9 +13,9 @@ diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml index f69c53f94e..d8c48013d5 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditBranding.cshtml @@ -13,11 +13,11 @@ } diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml index 6cab75b552..3beee64f8b 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditDescription.cshtml @@ -14,11 +14,11 @@ } diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml index 96e78ce8d9..a7c5964c3a 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditRoleProfileLinks.cshtml @@ -13,11 +13,11 @@ } diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml index 3b32db2a58..59492e9024 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/EditVocabulary.cshtml @@ -13,11 +13,11 @@ } diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Index.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Index.cshtml index 0c6f91d80a..3818df6ceb 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Index.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/Index.cshtml @@ -13,7 +13,7 @@ diff --git a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml index f13c584c33..c9255a2fb2 100644 --- a/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml +++ b/DigitalLearningSolutions.Web/Views/CompetencyAssessments/ManageCompetencyAssessment.cshtml @@ -12,11 +12,11 @@