From 663fc3893cc342fb8d8a458fdb128754e85219c8 Mon Sep 17 00:00:00 2001 From: Dalin Akrasi Date: Mon, 29 Jul 2024 17:47:06 +0100 Subject: [PATCH 01/19] Set login page primary language --- .../Views/Shared/LearningHub/_Layout.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Auth/LearningHub.Nhs.Auth/Views/Shared/LearningHub/_Layout.cshtml b/Auth/LearningHub.Nhs.Auth/Views/Shared/LearningHub/_Layout.cshtml index 6c57885..880d880 100644 --- a/Auth/LearningHub.Nhs.Auth/Views/Shared/LearningHub/_Layout.cshtml +++ b/Auth/LearningHub.Nhs.Auth/Views/Shared/LearningHub/_Layout.cshtml @@ -8,7 +8,7 @@ } } - + From b78fe044373ea4311853465e69748c894c3ae322 Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Mon, 25 Nov 2024 11:51:02 +0000 Subject: [PATCH 02/19] Update continuous-integration-workflow.yml --- .github/workflows/continuous-integration-workflow.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index c0e0da4..c950e90 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -26,7 +26,8 @@ jobs: - name: Use Node 12.19 uses: actions/setup-node@v4 with: - node-version: '12.19' + node-version: '18' + npm: '6.14.8' - name: Install dependencies run: | From 6275be9fa16b8120f3f01099c24531a2032e1eef Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Mon, 25 Nov 2024 11:54:25 +0000 Subject: [PATCH 03/19] Update continuous-integration-workflow.yml --- .github/workflows/continuous-integration-workflow.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index c950e90..381f9ff 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -27,8 +27,7 @@ jobs: uses: actions/setup-node@v4 with: node-version: '18' - npm: '6.14.8' - + - name: Install dependencies run: | cd ./Auth/LearningHub.Nhs.Auth From ef7d9aaac6e369dcd2c4fde0f082314cd944d175 Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Mon, 25 Nov 2024 12:21:49 +0000 Subject: [PATCH 04/19] Update package.json --- Auth/LearningHub.Nhs.Auth/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Auth/LearningHub.Nhs.Auth/package.json b/Auth/LearningHub.Nhs.Auth/package.json index 0508a0b..c44b87d 100644 --- a/Auth/LearningHub.Nhs.Auth/package.json +++ b/Auth/LearningHub.Nhs.Auth/package.json @@ -35,7 +35,7 @@ "cross-env": "^7.0.3", "css-loader": "^5.2.4", "file-loader": "^6.2.0", - "sass": "^1.51.0", + "sass": "^1.54.0", "sass-loader": "^11.0.1", "style-loader": "^2.0.0", "ts-loader": "^9.1.1", From d0e41480b93725d1a0b0d31b66b7a4c8954d3c15 Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Mon, 25 Nov 2024 12:24:35 +0000 Subject: [PATCH 05/19] Update package.json --- Auth/LearningHub.Nhs.Auth/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Auth/LearningHub.Nhs.Auth/package.json b/Auth/LearningHub.Nhs.Auth/package.json index c44b87d..0508a0b 100644 --- a/Auth/LearningHub.Nhs.Auth/package.json +++ b/Auth/LearningHub.Nhs.Auth/package.json @@ -35,7 +35,7 @@ "cross-env": "^7.0.3", "css-loader": "^5.2.4", "file-loader": "^6.2.0", - "sass": "^1.54.0", + "sass": "^1.51.0", "sass-loader": "^11.0.1", "style-loader": "^2.0.0", "ts-loader": "^9.1.1", From 564ba988aeaa6269c8618e5e51802e45901bb7b7 Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:18:19 +0000 Subject: [PATCH 06/19] Update continuous-integration-workflow.yml --- .github/workflows/continuous-integration-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml index 381f9ff..e2a5e18 100644 --- a/.github/workflows/continuous-integration-workflow.yml +++ b/.github/workflows/continuous-integration-workflow.yml @@ -31,12 +31,12 @@ jobs: - name: Install dependencies run: | cd ./Auth/LearningHub.Nhs.Auth - npm install -f + yarn install - name: Run Webpack build run: | cd ./Auth/LearningHub.Nhs.Auth - npm run build + yarn build:webpack - name: Setup MSBuild uses: microsoft/setup-msbuild@v1.0.3 From 613aed379a1dee9fcb12b810c87a48c0c12e6eba Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:28:21 +0000 Subject: [PATCH 07/19] Update IQueryableExtensions.cs --- .../Extentions/IQueryableExtensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LearningHub.Nhs.UserApi.Repository/Extentions/IQueryableExtensions.cs b/LearningHub.Nhs.UserApi.Repository/Extentions/IQueryableExtensions.cs index fd5925b..10c62b1 100644 --- a/LearningHub.Nhs.UserApi.Repository/Extentions/IQueryableExtensions.cs +++ b/LearningHub.Nhs.UserApi.Repository/Extentions/IQueryableExtensions.cs @@ -121,7 +121,7 @@ public static async Task FirstOrDefaultWithNoLockAsync(this IQueryable } /// - /// ToListWithNoLock. + /// ToListWithNoLock.. /// /// Type. /// Query. From 19915f37cd6050176fabb7aefd673b1446bfecf3 Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:38:52 +0000 Subject: [PATCH 08/19] Update azure-pipelines-ci.yml --- .github/azure-pipelines-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/azure-pipelines-ci.yml b/.github/azure-pipelines-ci.yml index ef18a34..be059cf 100644 --- a/.github/azure-pipelines-ci.yml +++ b/.github/azure-pipelines-ci.yml @@ -24,7 +24,7 @@ jobs: - task: NodeTool@0 displayName: Use Node 12.19 inputs: - versionSpec: 12.19 + versionSpec: 18 - task: Npm@1 displayName: npm custom inputs: From decf813aaeaf135ebbd5e9c3eab7cd95c7cf6f9a Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Mon, 25 Nov 2024 14:42:20 +0000 Subject: [PATCH 09/19] Update azure-pipelines-ci.yml --- .github/azure-pipelines-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/azure-pipelines-ci.yml b/.github/azure-pipelines-ci.yml index be059cf..ef18a34 100644 --- a/.github/azure-pipelines-ci.yml +++ b/.github/azure-pipelines-ci.yml @@ -24,7 +24,7 @@ jobs: - task: NodeTool@0 displayName: Use Node 12.19 inputs: - versionSpec: 18 + versionSpec: 12.19 - task: Npm@1 displayName: npm custom inputs: From 8f1acb2b7bbaa8ad5fddf812e92f271f8181b933 Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:32:41 +0000 Subject: [PATCH 10/19] Update azure-pipelines-ci.yml --- .github/azure-pipelines-ci.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/azure-pipelines-ci.yml b/.github/azure-pipelines-ci.yml index ef18a34..5cc04e4 100644 --- a/.github/azure-pipelines-ci.yml +++ b/.github/azure-pipelines-ci.yml @@ -39,6 +39,20 @@ jobs: workingDir: Auth/LearningHub.Nhs.Auth verbose: false customCommand: run build + - task: Checkout@1 + displayName: yarn custom + inputs: + command: custom + workingDir: Auth/LearningHub.Nhs.Auth + verbose: false + customCommand: yarn install + - task: Checkout@1 + displayName: yarn run webpack build + inputs: + command: custom + workingDir: Auth/LearningHub.Nhs.Auth + verbose: false + customCommand: yarn build - task: NuGetToolInstaller@1 displayName: Use NuGet 5.8 inputs: From 4ad7de5766edfadd756e1cffcd0a6118df4fc715 Mon Sep 17 00:00:00 2001 From: AnjuJose011 <154979799+AnjuJose011@users.noreply.github.com> Date: Tue, 26 Nov 2024 11:36:08 +0000 Subject: [PATCH 11/19] Update azure-pipelines-ci.yml --- .github/azure-pipelines-ci.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/azure-pipelines-ci.yml b/.github/azure-pipelines-ci.yml index 5cc04e4..ef18a34 100644 --- a/.github/azure-pipelines-ci.yml +++ b/.github/azure-pipelines-ci.yml @@ -39,20 +39,6 @@ jobs: workingDir: Auth/LearningHub.Nhs.Auth verbose: false customCommand: run build - - task: Checkout@1 - displayName: yarn custom - inputs: - command: custom - workingDir: Auth/LearningHub.Nhs.Auth - verbose: false - customCommand: yarn install - - task: Checkout@1 - displayName: yarn run webpack build - inputs: - command: custom - workingDir: Auth/LearningHub.Nhs.Auth - verbose: false - customCommand: yarn build - task: NuGetToolInstaller@1 displayName: Use NuGet 5.8 inputs: From 92fbe8ca6a41618198f048de172beae228cf1308 Mon Sep 17 00:00:00 2001 From: binon Date: Tue, 26 Nov 2024 13:21:56 +0000 Subject: [PATCH 12/19] Upgrade node version in package.json --- Auth/LearningHub.Nhs.Auth/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Auth/LearningHub.Nhs.Auth/package.json b/Auth/LearningHub.Nhs.Auth/package.json index 0508a0b..e05058a 100644 --- a/Auth/LearningHub.Nhs.Auth/package.json +++ b/Auth/LearningHub.Nhs.Auth/package.json @@ -23,7 +23,7 @@ "concurrently": "^7.2.0", "core-js": "^3.6.5", "nhsuk-frontend": "^7.0.0", - "node": "^12.19.1" + "node": "^18" }, "devDependencies": { "@babel/core": "^7.14.0", From b261802f81601294defa4691d19213ee089823fc Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Fri, 29 Nov 2024 16:46:42 +0000 Subject: [PATCH 13/19] TD-4184: DIG414: Focus doesn't move to field or error on submit --- .../Shared/_ValidationScriptsPartial.cshtml | 55 ++++++++++++------- 1 file changed, 35 insertions(+), 20 deletions(-) diff --git a/Auth/LearningHub.Nhs.Auth/Views/Shared/_ValidationScriptsPartial.cshtml b/Auth/LearningHub.Nhs.Auth/Views/Shared/_ValidationScriptsPartial.cshtml index aa6f898..444c35a 100644 --- a/Auth/LearningHub.Nhs.Auth/Views/Shared/_ValidationScriptsPartial.cshtml +++ b/Auth/LearningHub.Nhs.Auth/Views/Shared/_ValidationScriptsPartial.cshtml @@ -18,29 +18,44 @@ \ No newline at end of file From 9836bb4fe7f178c53c3869adb133cb0abd46d430 Mon Sep 17 00:00:00 2001 From: Swapnamol Abraham Date: Thu, 5 Dec 2024 14:15:15 +0000 Subject: [PATCH 14/19] TD-4184:https://hee-tis.atlassian.net/browse/TD-4184 --- .../Views/Shared/_ValidationScriptsPartial.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Auth/LearningHub.Nhs.Auth/Views/Shared/_ValidationScriptsPartial.cshtml b/Auth/LearningHub.Nhs.Auth/Views/Shared/_ValidationScriptsPartial.cshtml index 444c35a..b371ca5 100644 --- a/Auth/LearningHub.Nhs.Auth/Views/Shared/_ValidationScriptsPartial.cshtml +++ b/Auth/LearningHub.Nhs.Auth/Views/Shared/_ValidationScriptsPartial.cshtml @@ -21,7 +21,7 @@ let errorElements = []; let submitAttempted = false; - document.querySelector('form').onsubmit = () => { submitAttempted = true; } + document.querySelector('form').onsubmit = () => { submitAttempted = true; errorElements = []; } $(function () { $('form').each(function () { From 25a86752c3a408225790569ac9e8aa7fa48406df Mon Sep 17 00:00:00 2001 From: Arunima George Date: Tue, 17 Dec 2024 16:28:47 +0000 Subject: [PATCH 15/19] TD-4180: Moved client side validations to server side. --- .../Views/Account/LHLogin.cshtml | 1 + .../Views/Shared/_ValidationScriptsPartial.cshtml | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Auth/LearningHub.Nhs.Auth/Views/Account/LHLogin.cshtml b/Auth/LearningHub.Nhs.Auth/Views/Account/LHLogin.cshtml index 3aae2e5..3d8a453 100644 --- a/Auth/LearningHub.Nhs.Auth/Views/Account/LHLogin.cshtml +++ b/Auth/LearningHub.Nhs.Auth/Views/Account/LHLogin.cshtml @@ -2,6 +2,7 @@ @{ ViewData["Title"] = "Login"; ViewData["Layout"] = "learninghub/_Layout"; + ViewData["DisableValidation"] = true; // OpenAthens url needs to makes sure that the return to WebUI first hits the authorisationrequired endpoint, // which contains it's own redirect to within the UI. // If a return url is specified we want to use it for the authorisationrequired original url diff --git a/Auth/LearningHub.Nhs.Auth/Views/Shared/_ValidationScriptsPartial.cshtml b/Auth/LearningHub.Nhs.Auth/Views/Shared/_ValidationScriptsPartial.cshtml index b371ca5..d5f33c5 100644 --- a/Auth/LearningHub.Nhs.Auth/Views/Shared/_ValidationScriptsPartial.cshtml +++ b/Auth/LearningHub.Nhs.Auth/Views/Shared/_ValidationScriptsPartial.cshtml @@ -1,8 +1,10 @@ - - - - - +@if (!ViewData["DisableValidation"]?.Equals(true) ?? true) +{ + + + + + - + +} } else { diff --git a/Auth/LearningHub.Nhs.Auth/Views/Shared/Components/RadioList/Default.cshtml b/Auth/LearningHub.Nhs.Auth/Views/Shared/Components/RadioList/Default.cshtml index 05eb266..eddfb33 100644 --- a/Auth/LearningHub.Nhs.Auth/Views/Shared/Components/RadioList/Default.cshtml +++ b/Auth/LearningHub.Nhs.Auth/Views/Shared/Components/RadioList/Default.cshtml @@ -9,7 +9,7 @@
-
+
@if (Model.IsPageHeading.GetValueOrDefault() == true) { @@ -44,7 +44,7 @@ @if (Model.Required && !Model.HasError) { -
+ } @@ -131,5 +131,4 @@
-
\ No newline at end of file diff --git a/Auth/LearningHub.Nhs.Auth/Views/Shared/Components/TextInput/Default.cshtml b/Auth/LearningHub.Nhs.Auth/Views/Shared/Components/TextInput/Default.cshtml index de13d0c..4cbdda0 100644 --- a/Auth/LearningHub.Nhs.Auth/Views/Shared/Components/TextInput/Default.cshtml +++ b/Auth/LearningHub.Nhs.Auth/Views/Shared/Components/TextInput/Default.cshtml @@ -2,8 +2,8 @@ @using NHSUKViewComponents.Web.Helpers @model TextInputViewModel
-