From 20f7c8962e74e8adb95a0d5df74f5a196b0cfd3e Mon Sep 17 00:00:00 2001
From: kevwhitt-hee <kevin.whittaker@hee.nhs.uk>
Date: Mon, 5 Sep 2022 14:38:40 +0100
Subject: [PATCH 1/3] DLSV2-651 Fixes SelectList view-component selected value
 problems

---
 .../PublishProfiles/FTPPublishToProduction.pubxml      |  2 +-
 .../Views/Shared/Components/SelectList/Default.cshtml  | 10 ++++------
 .../appsettings.Production.json                        |  5 ++++-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Properties/PublishProfiles/FTPPublishToProduction.pubxml b/DigitalLearningSolutions.Web/Properties/PublishProfiles/FTPPublishToProduction.pubxml
index fe8ffc48cc..6b1131e7f9 100644
--- a/DigitalLearningSolutions.Web/Properties/PublishProfiles/FTPPublishToProduction.pubxml
+++ b/DigitalLearningSolutions.Web/Properties/PublishProfiles/FTPPublishToProduction.pubxml
@@ -13,7 +13,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <ExcludeApp_Data>false</ExcludeApp_Data>
     <ProjectGuid>de1be25a-b979-47be-9d88-203f02fe2001</ProjectGuid>
     <publishUrl>ftp://10.0.1.82/</publishUrl>
-    <DeleteExistingFiles>false</DeleteExistingFiles>
+    <DeleteExistingFiles>true</DeleteExistingFiles>
     <FtpPassiveMode>true</FtpPassiveMode>
     <FtpSitePath>/dlsweb-v2</FtpSitePath>
     <UserName>nhsd-itspdb-nsg</UserName>
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
index fd7366dd70..c37cbf1502 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
@@ -31,14 +31,12 @@
 
     <select asp-for="@Model.Name" asp-items="@Model.SelectListOptions" class="nhsuk-select @Model.Class @(Model.HasError ? "nhsuk-input--error" : "")"
             aria-describedby="@(describedBy!= "" ? @describedBy : null)"
-            value="@(Model.Value != null ? @Model.Value : null)"
+            value="@(Model.Value != null ? Model.Value : null)"
             aria-invalid="@(Model.HasError ? "true" : null)"
             id="@Model.Id"
             name="@Model.Name">
-            @if (Model.DefaultOption != null)
-            {
-                <option value="" disabled="@(!Model.Deselectable)" selected=@(Model.Value != null ? "" : "selected")>@Model.DefaultOption</option>
-            }
-        </select>
+            @if (Model.DefaultOption != null) {
+      <option value="" disabled="@(!Model.Deselectable)" selected=@(Model.Value == null ? "selected" : null)>@Model.DefaultOption</option>
     }
+        </select>
 </div>
diff --git a/DigitalLearningSolutions.Web/appsettings.Production.json b/DigitalLearningSolutions.Web/appsettings.Production.json
index f637f7531f..7d9598af53 100644
--- a/DigitalLearningSolutions.Web/appsettings.Production.json
+++ b/DigitalLearningSolutions.Web/appsettings.Production.json
@@ -19,5 +19,8 @@
     "PricingPage": false,
     "RefactoredFindYourCentrePage": true
   },
-  "LearningHubOpenAPIBaseUrl": "https://learninghubnhsuk-openapi-prod.azurewebsites.net"
+  "LearningHubOpenAPIBaseUrl": "https://learninghubnhsuk-openapi-prod.azurewebsites.net",
+  "LearningHubSSO": {
+    "BaseUrl": "https://auth.learninghub.nhs.uk/sso"
+  }
 }

From 7d02638bbae061e39fdad0ef45b29179328f6fba Mon Sep 17 00:00:00 2001
From: kevwhitt-hee <kevin.whittaker@hee.nhs.uk>
Date: Mon, 5 Sep 2022 14:39:17 +0100
Subject: [PATCH 2/3] Revert "DLSV2-651 Fixes SelectList view-component
 selected value problems"

This reverts commit 20f7c8962e74e8adb95a0d5df74f5a196b0cfd3e.
---
 .../PublishProfiles/FTPPublishToProduction.pubxml      |  2 +-
 .../Views/Shared/Components/SelectList/Default.cshtml  | 10 ++++++----
 .../appsettings.Production.json                        |  5 +----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Properties/PublishProfiles/FTPPublishToProduction.pubxml b/DigitalLearningSolutions.Web/Properties/PublishProfiles/FTPPublishToProduction.pubxml
index 6b1131e7f9..fe8ffc48cc 100644
--- a/DigitalLearningSolutions.Web/Properties/PublishProfiles/FTPPublishToProduction.pubxml
+++ b/DigitalLearningSolutions.Web/Properties/PublishProfiles/FTPPublishToProduction.pubxml
@@ -13,7 +13,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <ExcludeApp_Data>false</ExcludeApp_Data>
     <ProjectGuid>de1be25a-b979-47be-9d88-203f02fe2001</ProjectGuid>
     <publishUrl>ftp://10.0.1.82/</publishUrl>
-    <DeleteExistingFiles>true</DeleteExistingFiles>
+    <DeleteExistingFiles>false</DeleteExistingFiles>
     <FtpPassiveMode>true</FtpPassiveMode>
     <FtpSitePath>/dlsweb-v2</FtpSitePath>
     <UserName>nhsd-itspdb-nsg</UserName>
diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
index c37cbf1502..fd7366dd70 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
@@ -31,12 +31,14 @@
 
     <select asp-for="@Model.Name" asp-items="@Model.SelectListOptions" class="nhsuk-select @Model.Class @(Model.HasError ? "nhsuk-input--error" : "")"
             aria-describedby="@(describedBy!= "" ? @describedBy : null)"
-            value="@(Model.Value != null ? Model.Value : null)"
+            value="@(Model.Value != null ? @Model.Value : null)"
             aria-invalid="@(Model.HasError ? "true" : null)"
             id="@Model.Id"
             name="@Model.Name">
-            @if (Model.DefaultOption != null) {
-      <option value="" disabled="@(!Model.Deselectable)" selected=@(Model.Value == null ? "selected" : null)>@Model.DefaultOption</option>
-    }
+            @if (Model.DefaultOption != null)
+            {
+                <option value="" disabled="@(!Model.Deselectable)" selected=@(Model.Value != null ? "" : "selected")>@Model.DefaultOption</option>
+            }
         </select>
+    }
 </div>
diff --git a/DigitalLearningSolutions.Web/appsettings.Production.json b/DigitalLearningSolutions.Web/appsettings.Production.json
index 7d9598af53..f637f7531f 100644
--- a/DigitalLearningSolutions.Web/appsettings.Production.json
+++ b/DigitalLearningSolutions.Web/appsettings.Production.json
@@ -19,8 +19,5 @@
     "PricingPage": false,
     "RefactoredFindYourCentrePage": true
   },
-  "LearningHubOpenAPIBaseUrl": "https://learninghubnhsuk-openapi-prod.azurewebsites.net",
-  "LearningHubSSO": {
-    "BaseUrl": "https://auth.learninghub.nhs.uk/sso"
-  }
+  "LearningHubOpenAPIBaseUrl": "https://learninghubnhsuk-openapi-prod.azurewebsites.net"
 }

From 7ceee894c21e58c113c25f7520464424862c3df5 Mon Sep 17 00:00:00 2001
From: kevwhitt-hee <kevin.whittaker@hee.nhs.uk>
Date: Mon, 5 Sep 2022 14:45:41 +0100
Subject: [PATCH 3/3] DLSV2-651 Fixes selected item bug with select list view
 components

---
 .../Views/Shared/Components/SelectList/Default.cshtml        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml b/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
index fd7366dd70..507daba721 100644
--- a/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Shared/Components/SelectList/Default.cshtml
@@ -31,14 +31,13 @@
 
     <select asp-for="@Model.Name" asp-items="@Model.SelectListOptions" class="nhsuk-select @Model.Class @(Model.HasError ? "nhsuk-input--error" : "")"
             aria-describedby="@(describedBy!= "" ? @describedBy : null)"
-            value="@(Model.Value != null ? @Model.Value : null)"
+            value="@(Model.Value != null ? Model.Value : null)"
             aria-invalid="@(Model.HasError ? "true" : null)"
             id="@Model.Id"
             name="@Model.Name">
             @if (Model.DefaultOption != null)
             {
-                <option value="" disabled="@(!Model.Deselectable)" selected=@(Model.Value != null ? "" : "selected")>@Model.DefaultOption</option>
+                <option value="" disabled="@(!Model.Deselectable)" selected=@(Model.Value == null ? "" : null)>@Model.DefaultOption</option>
             }
         </select>
-    }
 </div>