Perform release

.github/workflows/load-testing.yml

@@ -33,6 +33,7 @@ jobs:
       TF_VAR_cpd_search_index_name: ${{secrets.TF_VAR_CPD_SEARCH_INDEX_NAME}}
       TF_VAR_cpd_search_recreate_index_on_rebuild: ${{secrets.TF_VAR_CPD_SEARCH_RECREATE_INDEX_ON_REBUILD}}
       TF_VAR_cpd_gf_password: ${{secrets.TF_CPD_GF_PASSWORD}}
+      TF_VAR_cpd_gf_plugins: ${{secrets.TF_VAR_CPD_GF_PLUGINS}}
       TF_VAR_vcs_tag: ${{github.event.release.tag_name}}
       TF_WORKSPACE: Load-Test
       SITE_URL: https://20.107.65.156/

.github/workflows/terraform-destroy.yml

@@ -44,6 +44,7 @@ jobs:
       TF_VAR_cpd_search_index_name: ${{secrets.TF_VAR_CPD_SEARCH_INDEX_NAME}}
       TF_VAR_cpd_search_recreate_index_on_rebuild: ${{secrets.TF_VAR_CPD_SEARCH_RECREATE_INDEX_ON_REBUILD}}
       TF_VAR_cpd_gf_password: ${{secrets.TF_CPD_GF_PASSWORD}}
+      TF_VAR_cpd_gf_plugins: ${{secrets.TF_VAR_CPD_GF_PLUGINS}}
       TF_VAR_vcs_tag: ${{github.event.release.tag_name}}
       TF_WORKSPACE: ${{inputs.workspace}}
 

.github/workflows/terraform-plan.yml

@@ -47,6 +47,7 @@ jobs:
       TF_VAR_cpd_search_index_name: ${{secrets.TF_VAR_CPD_SEARCH_INDEX_NAME}}
       TF_VAR_cpd_search_recreate_index_on_rebuild: ${{secrets.TF_VAR_CPD_SEARCH_RECREATE_INDEX_ON_REBUILD}}
       TF_VAR_cpd_gf_password: ${{secrets.TF_CPD_GF_PASSWORD}}
+      TF_VAR_cpd_gf_plugins: ${{secrets.TF_VAR_CPD_GF_PLUGINS}}
       TF_VAR_vcs_tag: ${{github.event.release.tag_name}}
       TF_WORKSPACE: ${{inputs.workspace}}
 

.github/workflows/terraform.yml

@@ -47,6 +47,7 @@ jobs:
       TF_VAR_cpd_search_index_name: ${{secrets.TF_VAR_CPD_SEARCH_INDEX_NAME}}
       TF_VAR_cpd_search_recreate_index_on_rebuild: ${{secrets.TF_VAR_CPD_SEARCH_RECREATE_INDEX_ON_REBUILD}}
       TF_VAR_cpd_gf_password: ${{secrets.TF_CPD_GF_PASSWORD}}
+      TF_VAR_cpd_gf_plugins: ${{secrets.TF_VAR_CPD_GF_PLUGINS}}
       TF_VAR_vcs_tag: ${{github.event.release.tag_name}}
       TF_WORKSPACE: ${{inputs.workspace}}
 

Childrens-Social-Care-CPD-Tests/Controllers/SearchResourcesControllerTests.cs

@@ -24,7 +24,7 @@ public Task<ResourceSearchResultsViewModel> GetSearchModel(SearchRequestModel qu
                 null,
                 string.Empty,
                 string.Empty,
-                SortOrder.MostRelevant));
+                SortOrder.Relevance));
         }
     }
 

Childrens-Social-Care-CPD-Tests/Search/SearchResultsVMFactoryTests.cs

@@ -42,7 +42,7 @@ private static SearchResourcesResult GenerateSearchResults(int count, IDictionar
         return new SearchResourcesResult(count, count, 1, 1, 1, searchResults);
     }
 
-    [TestCase(SortOrder.MostRelevant, SortCategory.Relevancy, SortDirection.Descending)]
+    [TestCase(SortOrder.Relevance, SortCategory.Relevancy, SortDirection.Descending)]
     [TestCase(SortOrder.UpdatedLatest, SortCategory.Updated, SortDirection.Descending)]
     [TestCase(SortOrder.UpdatedOldest, SortCategory.Updated, SortDirection.Ascending)]
     public async Task GetSearchModel_Converts_SortOrder(SortOrder sortOrder, SortCategory sortCategory, SortDirection sortDirection)
@@ -83,7 +83,7 @@ public async Task GetSearchModel_Passes_Term()
             Term = "foo",
             Tags = Array.Empty<string>(),
             Page = 1,
-            SortOrder = SortOrder.MostRelevant
+            SortOrder = SortOrder.Relevance
         };
 
         // act
@@ -107,7 +107,7 @@ public async Task GetSearchModel_Model_Should_Receive_SearchResults()
             Term = string.Empty,
             Tags = Array.Empty<string>(),
             Page = 1,
-            SortOrder = SortOrder.MostRelevant
+            SortOrder = SortOrder.Relevance
         };
 
         // act
@@ -136,7 +136,7 @@ public async Task GetSearchModel_Model_Should_Receive_PageContent()
             Term = string.Empty,
             Tags = Array.Empty<string>(),
             Page = 1,
-            SortOrder = SortOrder.MostRelevant
+            SortOrder = SortOrder.Relevance
         };
 
         // act
@@ -160,7 +160,7 @@ public async Task GetSearchModel_Model_Should_Receive_SearchTerm()
             Term = term,
             Tags = Array.Empty<string>(),
             Page = 1,
-            SortOrder = SortOrder.MostRelevant
+            SortOrder = SortOrder.Relevance
         };
 
         // act
@@ -196,7 +196,7 @@ public async Task GetSearchModel_Model_Should_Receive_SortOrder()
 
     [TestCase(SortOrder.UpdatedLatest, "/foo?q=foo")]
     [TestCase(SortOrder.UpdatedOldest, "/foo?q=foo&so=1")]
-    [TestCase(SortOrder.MostRelevant, "/foo?q=foo&so=2")]
+    [TestCase(SortOrder.Relevance, "/foo?q=foo&so=2")]
     public async Task GetSearchModel_Model_Should_Receive_ClearFiltersUri(SortOrder sortOrder, string expected)
     {
         // arrange
@@ -248,7 +248,7 @@ public async Task GetSearchModel_Model_Should_Receive_ClearFiltersUri_That_Has_B
 
     [TestCase(SortOrder.UpdatedLatest, "/foo?p={0}&q=foo")]
     [TestCase(SortOrder.UpdatedOldest, "/foo?p={0}&so=1&q=foo")]
-    [TestCase(SortOrder.MostRelevant, "/foo?p={0}&so=2&q=foo")]
+    [TestCase(SortOrder.Relevance, "/foo?p={0}&so=2&q=foo")]
     public async Task GetSearchModel_Model_Should_Receive_PagingFormatString(SortOrder sortOrder, string expected)
     {
         // arrange
@@ -358,7 +358,7 @@ public async Task GetSearchModel_Truncates_Search_Term()
             Term = new string('x', 300),
             Tags = Array.Empty<string>(),
             Page = 1,
-            SortOrder = SortOrder.MostRelevant
+            SortOrder = SortOrder.Relevance
         };
 
         // act
@@ -382,7 +382,7 @@ public async Task GetSearchModel_Handles_Null_Term()
             Term = null,
             Tags = Array.Empty<string>(),
             Page = 1,
-            SortOrder = SortOrder.MostRelevant
+            SortOrder = SortOrder.Relevance
         };
 
         // act

Childrens-Social-Care-CPD-Tests/Services/SearchServiceTests.cs

@@ -127,6 +127,23 @@ public async Task SearchResourcesAsync_Uses_Simple_Query_Parser()
         options.QueryType.Should().Be(SearchQueryType.Simple);
     }
 
+    [TestCase("Title")]
+    [TestCase("Body")]
+    public async Task SearchResourcesAsync_Searches_Field(string fieldName)
+    {
+        // arrange
+        SearchOptions options = null;
+        var query = new KeywordSearchQuery("foo");
+        var response = GenerateResponse();
+        _searchClient.SearchAsync<CpdDocument>(Arg.Any<string>(), Arg.Do<SearchOptions>(x => options = x)).Returns(response);
+
+        // act
+        await _sut.SearchResourcesAsync(query);
+
+        // assert
+        options.SearchFields.Should().Contain(fieldName);
+    }
+
     [TestCase("foo*", "foo")]
     [TestCase("foo* foo*", "foo foo")]
     [TestCase("!£$foo%^&*()_+#'~@|\\-=", "foo")]

Childrens-Social-Care-CPD/Models/SearchRequestModel.cs

@@ -7,7 +7,7 @@ public enum SortOrder
 {
     UpdatedLatest,
     UpdatedOldest,
-    MostRelevant,
+    Relevance,
 }
 
 public static class SearchRequestPropertyNames

Childrens-Social-Care-CPD/Search/SearchResultsVMFactory.cs

@@ -83,7 +83,7 @@ private static KeywordSearchQuery GetQuery(SearchRequestModel request, IEnumerab
 
         var sortCategory = sortOrder switch
         {
-            SortOrder.MostRelevant => SortCategory.Relevancy,
+            SortOrder.Relevance => SortCategory.Relevancy,
             _ => SortCategory.Updated,
         };
 

Childrens-Social-Care-CPD/Services/SearchService.cs

@@ -52,6 +52,7 @@ public Task<SearchResourcesResult> SearchResourcesAsync(KeywordSearchQuery query
             QueryType = SearchQueryType.Simple,
             SearchMode = SearchMode.Any,
             IncludeTotalCount = true,
+            SearchFields = { "Title", "Body" },
             HighlightFields = { "Body" },
             Facets = { "Tags,count:100" },
             Filter = string.IsNullOrEmpty(filter) ? null : filter,

Childrens-Social-Care-CPD/Views/SearchResources/_SearchResults.cshtml

@@ -24,7 +24,7 @@
                     <select asp-for="SortOrder" class="js-order-results govuk-select sort-options__select" name="@SearchRequestPropertyNames.SortOrder" id="sortOrder" onchange="document.getElementById('searchForm').submit()">
                         <option value="0">Updated (newest)</option>
                         <option value="1">Updated (oldest)</option>
-                        <option value="2">Most relevant</option>
+                        <option value="2">Relevance</option>
                     </select>
                 </div>
             </div>

Childrens-Social-Care-CPD/Views/Shared/_ColumnLayout.cshtml

@@ -10,10 +10,10 @@
 
     @foreach (var group in Model.Items.Select((e, i) => new { ContentItem = e, Grouping = (i / Model.ColumnCount) }).GroupBy(e => e.Grouping))
     {
-        <div class="govuk-grid-row">
+        <div class="govuk-grid-row columns-layout">
             @foreach (var item in group)
             {
-                <div class="@gridClass govuk-!-margin-bottom-4" style="display: flex">
+                <div class="@gridClass govuk-!-margin-bottom-4  columns-layout-col">
                     @{ await Html.RenderContentfulPartialAsync(item.ContentItem); }
                 </div>
             }

Childrens-Social-Care-CPD/WebApplicationBuilderExtensions.cs

@@ -93,6 +93,7 @@ private static void AddSearch(this IServiceCollection services)
     public static void AddFeatures(this WebApplicationBuilder builder)
     {
         ArgumentNullException.ThrowIfNull(builder);
+        builder.Configuration.AddUserSecrets<Program>();
 
         var applicationConfiguration = new ApplicationConfiguration(builder.Configuration);
 

Childrens-Social-Care-CPD/styles/scss/overrides/_site.scss

@@ -252,4 +252,13 @@
     background-color: #ffdd00;
     font-weight: bold;
     font-style: normal;
+}
+
+.columns-layout {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.columns-layout-col {
+    display: flex;
 }

Terraform/README.md

@@ -88,6 +88,7 @@ No modules.
 | <a name="input_cpd_delivery_key"></a> [cpd\_delivery\_key](#input\_cpd\_delivery\_key) | Contentful Delivery Key | `string` | n/a | yes |
 | <a name="input_cpd_feature_polling_interval"></a> [cpd\_feature\_polling\_interval](#input\_cpd\_feature\_polling\_interval) | Feature polling interval | `number` | n/a | yes |
 | <a name="input_cpd_gf_password"></a> [cpd\_gf\_password](#input\_cpd\_gf\_password) | Grafana password | `string` | n/a | yes |
+| <a name="input_cpd_gf_plugins"></a> [cpd\_gf\_plugins](#input\_cpd\_gf\_plugins) | List of Grafana plugins to install | `string` | n/a | yes |
 | <a name="input_cpd_googleanalyticstag"></a> [cpd\_googleanalyticstag](#input\_cpd\_googleanalyticstag) | Google Analytics Tag | `string` | n/a | yes |
 | <a name="input_cpd_image_tag"></a> [cpd\_image\_tag](#input\_cpd\_image\_tag) | Docker image tag of application | `string` | n/a | yes |
 | <a name="input_cpd_instrumentation_connectionstring"></a> [cpd\_instrumentation\_connectionstring](#input\_cpd\_instrumentation\_connectionstring) | The Azure ApplicationInsights connection string | `string` | n/a | yes |

Terraform/grafana.tf

@@ -47,6 +47,7 @@ resource "azurerm_linux_web_app" "grafana-web-app" {
     GF_SECURITY_CSRF_ADDITIONAL_HEADERS = "X-Forwarded-Host"
     GF_SECURITY_CSRF_TRUSTED_ORIGINS    = var.origins[terraform.workspace]
     GF_SECURITY_ADMIN_PASSWORD          = var.cpd_gf_password
+    GF_INSTALL_PLUGINS                  = var.cpd_gf_plugins
   }
 
   site_config {

Terraform/variables.tf

@@ -836,6 +836,11 @@ variable "cpd_search_index_name" {
   type        = string
 }
 
+variable "cpd_gf_plugins" {
+  type        = string
+  description = "List of Grafana plugins to install"
+}
+
 variable "cpd_search_recreate_index_on_rebuild" {
   description = "Whether to delete the index and recreate before populating"
   type        = bool
@@ -892,11 +897,11 @@ variable "hostname" {
 variable "origins" {
   type = map(string)
   default = {
-    Dev       = "www.dev.develop-child-family-social-work-career.education.gov.uk,dev.develop-child-family-social-work-career.education.gov.uk"
-    Test      = "www.test.develop-child-family-social-work-career.education.gov.uk,test.develop-child-family-social-work-career.education.gov.uk"
+    Dev       = "www.dev.develop-child-family-social-work-career.education.gov.uk"
+    Test      = "www.test.develop-child-family-social-work-career.education.gov.uk"
     Load-Test = "20.107.65.156.nip.io"
-    Pre-Prod  = "www.pre-proddevelop-child-family-social-work-career.education.gov.uk,pre-proddevelop-child-family-social-work-career.education.gov.uk"
-    Prod      = "www.develop-child-family-social-work-career.education.gov.uk,develop-child-family-social-work-career.education.gov.uk"
+    Pre-Prod  = "www.pre-prod.develop-child-family-social-work-career.education.gov.uk"
+    Prod      = "www.develop-child-family-social-work-career.education.gov.uk"
   }
   description = "Origins for Grafana"
 }