Merge pull request #394 from DFE-Digital/main

Merge main into manage back button release
DFE-Digital · Jan 23, 2025 · 741df7d · 741df7d
2 parents 95e83ec + 3593aa8
commit 741df7d
Show file tree

Hide file tree

Showing 175 changed files with 5,261 additions and 23,206 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -28,7 +28,6 @@ jobs:
             service/report-api,
             service/mock-hsda-api,
             function/open-referral-function,
-            ui/connect-dashboard-ui,
             ui/connect-ui,
             ui/find-ui,
             ui/idam-maintenance-ui,
@@ -53,8 +52,6 @@ jobs:
             job_name: "Mock HSDA API"
           - working_directory: function/open-referral-function
             job_name: "Open Referral Function"
-          - working_directory: ui/connect-dashboard-ui
-            job_name: "Connect Dashboard UI"
           - working_directory: ui/connect-ui
             job_name: "Connect UI"
           - working_directory: ui/find-ui
@@ -75,4 +72,4 @@ jobs:
     with:
       working_directory: ${{ matrix.working_directory }}
       dotnet_version: ${{ vars.DOTNET_VERSION_V8 }}
-      job_name: ${{ matrix.job_name }}
+      job_name: ${{ matrix.job_name }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -36,7 +36,6 @@ jobs:
                    src/service/service-directory-api/,
                    src/service/mock-hsda-api/,
                    src/function/open-referral-function/,
-                   src/ui/connect-dashboard-ui/,
                    src/ui/connect-ui/,
                    src/ui/find-ui/,
                    src/ui/idam-maintenance-ui/,
@@ -66,9 +65,6 @@ jobs:
             publish_project: FamilyHubs.OpenReferral.Function
             job_name: Open Referral Function
             dotnet_version_override: "8.0.x"
-          - project: src/ui/connect-dashboard-ui/
-            publish_project: FamilyHubs.RequestForSupport.Web
-            job_name: Connect Dashboard UI
           - project: src/ui/connect-ui/
             publish_project: FamilyHubs.Referral.Web
             job_name: Connect UI
@@ -87,7 +83,7 @@ jobs:
       publish_project: ${{ matrix.publish_project }}
       dotnet_version: ${{ matrix.dotnet_version_override || vars.DOTNET_VERSION }}
       job_name: ${{ matrix.job_name }}
-    
+
   deploy-api-services:
     name: ${{ matrix.job_name }}
     needs: [ build-projects-upload-artifacts ]
@@ -161,25 +157,18 @@ jobs:
       project_type: service
       azure_app_name: ${{ matrix.azure_app_name }}
     secrets: inherit
-    
+
   deploy-ui-services:
     name: ${{ matrix.job_name }}
     needs: [ deploy-api-services ]
     strategy:
       matrix:
-        artifact_name: [ connect-dashboard-ui,
-                         connect-ui,
+        artifact_name: [ connect-ui,
                          find-ui,
                          idam-maintenance-ui,
                          manage-ui
         ]
         include:
-          - artifact_name: connect-dashboard-ui
-            job_name: Deploy - Connect Dashboard UI
-            keyvault_app_prefix: CONNECT-DASHBOARD-UI
-            project_name: FamilyHubs.RequestForSupport.Web
-            azure_app_name: as-fh-ref-dash-ui
-
           - artifact_name: connect-ui
             job_name: Deploy - Connect UI
             keyvault_app_prefix: CONNECT-UI
@@ -271,7 +260,7 @@ jobs:
       test_project_name: ${{ matrix.test_project_name }}
       project_type: service
     secrets: inherit
-    
+
   run-ui-e2e-tests:
     if: ${{ startsWith(inputs.environment, 'Test') || inputs.environment == 'Pre-production' }}
     name: Run E2E Test Suite

diff --git a/docs/hld.md b/docs/hld.md
@@ -37,13 +37,11 @@ graph LR
 
     PublicUsers[Public Users] -->|Use| Find[Find UI]
     ProfessionalUsers[Professional Users] -->|Authenticate using| GovOneLogin[Gov One Login] -->|Use| Connect[Connect UI]
-    ProfessionalUsers[Professional Users] -->|Authenticate using| GovOneLogin -->|Use| ConnectDashboard[Connect Dashboard UI]
     AdministrativeUsers[Administrative Users] -->|Authenticate using| GovOneLogin -->|Use| Manage[Manage UI]    
     FamilyHubsDev[Family Hubs Developers] -->|Use| IdAMMaintenanceUI[IdAM Maintenance UI]
 
     style Find fill:#F0EFEB,stroke:#333
     style Connect fill:#F0EFEB,stroke:#333
-    style ConnectDashboard fill:#F0EFEB,stroke:#333
     style Manage fill:#F0EFEB,stroke:#333
     style IdAMMaintenanceUI fill:#F0EFEB,stroke:#333
 
@@ -64,11 +62,6 @@ graph LR
             Connect -->|Connects to| ReferralAPI[Referral API]
             Connect -->|Connects to| NotificationAPI[Notification API]
 
-            ConnectDashboard -->|Connects to| ServiceDirectoryAPI
-            ConnectDashboard -->|Connects to| IdAMAPI[IdAM API]
-            ConnectDashboard -->|Connects to| ReferralAPI[Referral API]
-            ConnectDashboard -->|Connects to| NotificationAPI[Notification API]
-
             Manage -->|Connects to| ServiceDirectoryAPI
             Manage -->|Connects to| IdAMAPI
             Manage -->|Connects to| ReportAPI[Report API]
@@ -138,7 +131,6 @@ Family Hubs consists of the following services:
 
 - **Find:** lets users find services in their area through a postcode search
 - **Connect:** allows LAs to connect families with services through connection requests
-- **Connect Dashboard:** allows LA and VS users to send/receive connection requests. Is built to be visually indistinguishable from the main Connect side, appearing as just another section of Connect.
 - **Manage:** allows LA and VCS users to manage their data, view metrics, and other administrative tasks
 - **IdAM Maintenance:** allows members of the Family Hubs team to add new DfE Admin, LA and VCS users
 

diff --git a/src/SuperSolution.sln b/src/SuperSolution.sln
@@ -63,20 +63,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FamilyHubs.SharedKernel.Raz
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ui", "ui", "{A86AEC01-37C2-4183-ACBF-3AD4881E622D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "connect-dashboard-ui", "connect-dashboard-ui", "{FDB386DF-EE73-49D5-974E-FECAD67EEC84}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{89AB1D98-033D-4936-B061-EB16C10460B3}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FamilyHubs.RequestForSupport.Core", "ui\connect-dashboard-ui\src\FamilyHubs.RequestForSupport.Core\FamilyHubs.RequestForSupport.Core.csproj", "{8F751571-F6FF-4B76-A047-29937A7042BF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FamilyHubs.RequestForSupport.Infrastructure", "ui\connect-dashboard-ui\src\FamilyHubs.RequestForSupport.Infrastructure\FamilyHubs.RequestForSupport.Infrastructure.csproj", "{35CA88F4-9259-4D32-BA78-FA9F4A184D7C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FamilyHubs.RequestForSupport.Web", "ui\connect-dashboard-ui\src\FamilyHubs.RequestForSupport.Web\FamilyHubs.RequestForSupport.Web.csproj", "{33D1E8EF-ED41-4C16-A251-6E68C0B0013E}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{B19BEAED-19DE-43D1-AA42-0DA617AEE091}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FamilyHubs.RequestForSupport.UnitTests", "ui\connect-dashboard-ui\tests\FamilyHubs.RequestForSupport.UnitTests\FamilyHubs.RequestForSupport.UnitTests.csproj", "{AFEBCCB8-D540-4572-A75F-AB4BC502DFCB}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "connect-ui", "connect-ui", "{1A6B73C7-8C55-4386-A81C-2A8E8C28E1C6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F9BEB7D1-6C12-43E3-AAC0-A20464F1EA83}"
@@ -324,22 +310,12 @@ Global
 		{49048D81-5E89-48C7-A6DA-7E54FEB93DD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{49048D81-5E89-48C7-A6DA-7E54FEB93DD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{49048D81-5E89-48C7-A6DA-7E54FEB93DD2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F751571-F6FF-4B76-A047-29937A7042BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F751571-F6FF-4B76-A047-29937A7042BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F751571-F6FF-4B76-A047-29937A7042BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F751571-F6FF-4B76-A047-29937A7042BF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{35CA88F4-9259-4D32-BA78-FA9F4A184D7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{35CA88F4-9259-4D32-BA78-FA9F4A184D7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{35CA88F4-9259-4D32-BA78-FA9F4A184D7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{35CA88F4-9259-4D32-BA78-FA9F4A184D7C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{33D1E8EF-ED41-4C16-A251-6E68C0B0013E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{33D1E8EF-ED41-4C16-A251-6E68C0B0013E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{33D1E8EF-ED41-4C16-A251-6E68C0B0013E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{33D1E8EF-ED41-4C16-A251-6E68C0B0013E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AFEBCCB8-D540-4572-A75F-AB4BC502DFCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AFEBCCB8-D540-4572-A75F-AB4BC502DFCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AFEBCCB8-D540-4572-A75F-AB4BC502DFCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AFEBCCB8-D540-4572-A75F-AB4BC502DFCB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8C94BEFF-CF26-48B9-A626-3DDB3233D2F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{8C94BEFF-CF26-48B9-A626-3DDB3233D2F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8C94BEFF-CF26-48B9-A626-3DDB3233D2F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -590,13 +566,6 @@ Global
 		{AE508BD6-9984-45A9-815A-1DEB7A5441EB} = {B8671DDC-35E0-41DC-8AFC-8AD3F9B94F03}
 		{EFB970DC-F2A1-4C41-8C4E-F80197E8E390} = {E6221275-6F63-444A-AAF6-2B483B581B79}
 		{49048D81-5E89-48C7-A6DA-7E54FEB93DD2} = {EFB970DC-F2A1-4C41-8C4E-F80197E8E390}
-		{FDB386DF-EE73-49D5-974E-FECAD67EEC84} = {A86AEC01-37C2-4183-ACBF-3AD4881E622D}
-		{89AB1D98-033D-4936-B061-EB16C10460B3} = {FDB386DF-EE73-49D5-974E-FECAD67EEC84}
-		{8F751571-F6FF-4B76-A047-29937A7042BF} = {89AB1D98-033D-4936-B061-EB16C10460B3}
-		{35CA88F4-9259-4D32-BA78-FA9F4A184D7C} = {89AB1D98-033D-4936-B061-EB16C10460B3}
-		{33D1E8EF-ED41-4C16-A251-6E68C0B0013E} = {89AB1D98-033D-4936-B061-EB16C10460B3}
-		{B19BEAED-19DE-43D1-AA42-0DA617AEE091} = {FDB386DF-EE73-49D5-974E-FECAD67EEC84}
-		{AFEBCCB8-D540-4572-A75F-AB4BC502DFCB} = {B19BEAED-19DE-43D1-AA42-0DA617AEE091}
 		{1A6B73C7-8C55-4386-A81C-2A8E8C28E1C6} = {A86AEC01-37C2-4183-ACBF-3AD4881E622D}
 		{F9BEB7D1-6C12-43E3-AAC0-A20464F1EA83} = {1A6B73C7-8C55-4386-A81C-2A8E8C28E1C6}
 		{8C94BEFF-CF26-48B9-A626-3DDB3233D2F7} = {F9BEB7D1-6C12-43E3-AAC0-A20464F1EA83}

diff --git a/src/shared/web-components/src/FamilyHubs.SharedKernel.Razor/Dashboard/ColumnHeader.cs b/src/shared/web-components/src/FamilyHubs.SharedKernel.Razor/Dashboard/ColumnHeader.cs
@@ -5,13 +5,13 @@ namespace FamilyHubs.SharedKernel.Razor.Dashboard;
 internal class ColumnHeader : IColumnHeader
 {
     private readonly ColumnImmutable _columnImmutable;
-    private readonly string _pagePath;
+    private readonly string? _pagePath;
     private readonly string? _extraQueryParams;
 
     public ColumnHeader(
         ColumnImmutable columnImmutable,
         SortOrder? sort,
-        string pagePath,
+        string? pagePath,
         string? extraQueryParams = null)
     {
         Sort = sort;

diff --git a/src/shared/web-components/src/FamilyHubs.SharedKernel.Razor/Dashboard/ColumnHeaderFactory.cs b/src/shared/web-components/src/FamilyHubs.SharedKernel.Razor/Dashboard/ColumnHeaderFactory.cs
@@ -8,11 +8,11 @@ public class ColumnHeaderFactory
     private readonly string _sortedColumnName;
     private readonly SortOrder _sort;
     private readonly string? _extraQueryParams;
-    private readonly string _pagePath;
+    private readonly string? _pagePath;
 
     public ColumnHeaderFactory(
         IEnumerable<ColumnImmutable> columnsImmutable,
-        string pagePath,
+        string? pagePath,
         string sortedColumnName,
         SortOrder sort,
         IReadOnlyDictionary<string, string> extraQueryParams)
@@ -23,7 +23,7 @@ public ColumnHeaderFactory(
 
     public ColumnHeaderFactory(
         IEnumerable<ColumnImmutable> columnsImmutable,
-        string pagePath,
+        string? pagePath,
         string sortedColumnName,
         SortOrder sort,
         string? extraQueryParams = null)

diff --git a/...ared/web-components/src/FamilyHubs.SharedKernel.Razor/Dashboard/LargeSetLinkPagination.cs b/...ared/web-components/src/FamilyHubs.SharedKernel.Razor/Dashboard/LargeSetLinkPagination.cs
@@ -13,7 +13,7 @@ namespace FamilyHubs.SharedKernel.Razor.Dashboard;
 public class LargeSetLinkPagination<TColumn> : LargeSetPagination, ILinkPagination
     where TColumn : struct, Enum
 {
-    private readonly string _dashboardPath;
+    private readonly string? _dashboardPath;
     private readonly TColumn _column;
     private readonly SortOrder _sort;
     private readonly string? _extraQueryParams;
@@ -30,7 +30,7 @@ public LargeSetLinkPagination(
     }
 
     public LargeSetLinkPagination(
-        string dashboardPath,
+        string? dashboardPath,
         int totalPages,
         int currentPage,
         TColumn column,

diff --git a/src/shared/web-components/src/familyhubs-frontend/private/gulpfile.js b/src/shared/web-components/src/familyhubs-frontend/private/gulpfile.js
@@ -27,9 +27,9 @@ let sassPaths = [
 gulp.task('sass-to-min-css', async function () {
     return gulp.src('../styles/all.scss')
         .pipe(sourcemaps.init())
-          .pipe(sass({
-              includePaths: sassPaths
-          }).on('error', sass.logError))
+        .pipe(sass({
+            includePaths: sassPaths
+        }).on('error', sass.logError))
         .pipe(csso())
         .pipe(sourcemaps.write('.'))
         .pipe(gulp.dest('./wwwroot/css'));