Skip to content

Commit 68592e7

Browse files
WolfyUKWolfyUK
committed
feat: Added SchoolSpendingPrioritiesSsrCharts feature flag and enabled in feature environment only
1 parent 851529d commit 68592e7

File tree

9 files changed

+42
-28
lines changed

9 files changed

+42
-28
lines changed

‎web/.markdownlint-cli2.jsonc

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,17 @@
22
* See example config at https://github.com/DavidAnson/markdownlint-cli2/blob/main/test/markdownlint-cli2-jsonc-example/.markdownlint-cli2.jsonc
33
*/
44
{
5-
// Disable some built-in rules
6-
"config": {
7-
"line-length": {
8-
"line_length": 140
9-
},
10-
"no-blanks-blockquote": false
5+
// Disable some built-in rules
6+
"config": {
7+
"line-length": {
8+
"line_length": 140,
9+
"tables": false
1110
},
12-
// Define glob expressions to ignore
13-
"ignores": [
14-
"terraform",
15-
"src/Web.App/node_modules"
16-
]
11+
"no-blanks-blockquote": false
12+
},
13+
// Define glob expressions to ignore
14+
"ignores": [
15+
"terraform",
16+
"src/Web.App/node_modules"
17+
]
1718
}

‎web/README.md

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,19 +81,20 @@ following section to `secrets.json`, with URLs and keys obtained from Key Vault.
8181

8282
Feature flags may also be defined in the `FeatureManagement` section:
8383

84-
| Name | Purpose |
85-
|----------------------------------------|-----------------------------------------------------------------------------------------------|
86-
| `CurriculumFinancialPlanning` | Toggles the Curriculum and Financial Planning feature |
87-
| `CustomData` | Toggles the Custom Data feature |
88-
| `DisableOrganisationClaimCheck` | Skips the Organisation Claim check in `SchoolAuthorizationAttribute` |
89-
| `LocalAuthorities` | Toggles the Local Authorities feature |
90-
| `Trusts` | Toggles the Trust feature |
91-
| `UserDefinedComparators` | Toggles the User Defined comparators feature |
92-
| `DisableOrganisationClaimCheck` | Disables organisation and school level claims checks against the authenticated user |
93-
| `FinancialBenchmarkingInsightsSummary` | Toggles the Financial Benchmarking Insights Summary feature |
94-
| `HistoricalTrends` | Toggles the Benchmarking Historical trends feature, which affects the Financial History pages |
95-
| `HighNeeds` | Toggles the High Needs feature, which affects the Local Authority pages |
96-
| `FilteredSearch` | Replaces the single page autocomplete version of organisation search with accessible version |
84+
| Name | Purpose |
85+
|----------------------------------------|------------------------------------------------------------------------------------------------------------------------------------|
86+
| `CurriculumFinancialPlanning` | Toggles the Curriculum and Financial Planning feature |
87+
| `CustomData` | Toggles the Custom Data feature |
88+
| `DisableOrganisationClaimCheck` | Skips the Organisation Claim check in `SchoolAuthorizationAttribute` |
89+
| `LocalAuthorities` | Toggles the Local Authorities feature |
90+
| `Trusts` | Toggles the Trust feature |
91+
| `UserDefinedComparators` | Toggles the User Defined comparators feature |
92+
| `DisableOrganisationClaimCheck` | Disables organisation and school level claims checks against the authenticated user |
93+
| `FinancialBenchmarkingInsightsSummary` | Toggles the Financial Benchmarking Insights Summary feature |
94+
| `HistoricalTrends` | Toggles the Benchmarking Historical trends feature, which affects the Financial History pages |
95+
| `HighNeeds` | Toggles the High Needs feature, which affects the Local Authority pages |
96+
| `FilteredSearch` | Replaces the single page autocomplete version of organisation search with accessible version |
97+
| `SchoolSpendingPrioritiesSsrCharts` | Replaces the client rendered React/Recharts-derived charts on the School Spending Priorities page with server side rendered charts |
9798

9899
#### CacheOptions
99100

‎web/Web.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "common", "common", "{561EA6
4141
Directory.Packages.props = Directory.Packages.props
4242
nuget.config = nuget.config
4343
README.md = README.md
44+
.markdownlint-cli2.jsonc = .markdownlint-cli2.jsonc
4445
EndProjectSection
4546
EndProject
4647
Global

‎web/src/Web.App/Constants/FeatureFlags.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,5 @@ public static class FeatureFlags
1414
public const string HistoricalTrends = nameof(HistoricalTrends);
1515
public const string HighNeeds = nameof(HighNeeds);
1616
public const string FilteredSearch = nameof(FilteredSearch);
17+
public const string SchoolSpendingPrioritiesSsrCharts = nameof(SchoolSpendingPrioritiesSsrCharts);
1718
}

‎web/src/Web.App/appsettings.Development.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"FinancialBenchmarkingInsightsSummary": true,
1212
"HistoricalTrends": true,
1313
"HighNeeds": true,
14-
"FilteredSearch": true
14+
"FilteredSearch": true,
15+
"SchoolSpendingPrioritiesSsrCharts": true
1516
},
1617
"Apis": {
1718
"Insight": {

‎web/terraform/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
| Name | Version |
1212
|------|---------|
13-
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.27.0 |
13+
| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | 4.26.0 |
1414
| <a name="provider_random"></a> [random](#provider\_random) | 3.7.2 |
1515

1616
## Modules
@@ -70,7 +70,7 @@ No modules.
7070
| Name | Description | Type | Default | Required |
7171
|------|-------------|------|---------|:--------:|
7272
| <a name="input_cip-environment"></a> [cip-environment](#input\_cip-environment) | n/a | `any` | n/a | yes |
73-
| <a name="input_configuration"></a> [configuration](#input\_configuration) | n/a | <pre>map(object({<br/> sku_name = string<br/> zone_balancing_enabled = bool<br/> worker_count = number<br/> front_door_sku_name = string<br/> waf_mode = string<br/> features = object({<br/> CurriculumFinancialPlanning = bool<br/> CustomData = bool<br/> Trusts = bool<br/> LocalAuthorities = bool<br/> UserDefinedComparators = bool<br/> DisableOrganisationClaimCheck = bool<br/> ForecastRisk = bool<br/> TrustComparison = bool<br/> FinancialBenchmarkingInsightsSummary = bool<br/> HistoricalTrends = bool<br/> HighNeeds = bool<br/> FilteredSearch = bool<br/> })<br/> CacheOptions = object({<br/> ReturnYears = object({<br/> SlidingExpiration = number<br/> AbsoluteExpiration = number<br/> })<br/> })<br/> }))</pre> | <pre>{<br/> "automated-test": {<br/> "CacheOptions": {<br/> "ReturnYears": {<br/> "AbsoluteExpiration": 60,<br/> "SlidingExpiration": 10<br/> }<br/> },<br/> "features": {<br/> "CurriculumFinancialPlanning": true,<br/> "CustomData": true,<br/> "DisableOrganisationClaimCheck": false,<br/> "FilteredSearch": false,<br/> "FinancialBenchmarkingInsightsSummary": true,<br/> "ForecastRisk": true,<br/> "HighNeeds": true,<br/> "HistoricalTrends": true,<br/> "LocalAuthorities": true,<br/> "TrustComparison": true,<br/> "Trusts": true,<br/> "UserDefinedComparators": true<br/> },<br/> "front_door_sku_name": "Standard_AzureFrontDoor",<br/> "sku_name": "B1",<br/> "waf_mode": "Detection",<br/> "worker_count": 1,<br/> "zone_balancing_enabled": false<br/> },<br/> "development": {<br/> "CacheOptions": {<br/> "ReturnYears": {<br/> "AbsoluteExpiration": 60,<br/> "SlidingExpiration": 10<br/> }<br/> },<br/> "features": {<br/> "CurriculumFinancialPlanning": true,<br/> "CustomData": true,<br/> "DisableOrganisationClaimCheck": true,<br/> "FilteredSearch": false,<br/> "FinancialBenchmarkingInsightsSummary": true,<br/> "ForecastRisk": true,<br/> "HighNeeds": true,<br/> "HistoricalTrends": true,<br/> "LocalAuthorities": true,<br/> "TrustComparison": true,<br/> "Trusts": true,<br/> "UserDefinedComparators": true<br/> },<br/> "front_door_sku_name": "Standard_AzureFrontDoor",<br/> "sku_name": "B1",<br/> "waf_mode": "Detection",<br/> "worker_count": 1,<br/> "zone_balancing_enabled": false<br/> },<br/> "feature": {<br/> "CacheOptions": {<br/> "ReturnYears": {<br/> "AbsoluteExpiration": 60,<br/> "SlidingExpiration": 10<br/> }<br/> },<br/> "features": {<br/> "CurriculumFinancialPlanning": true,<br/> "CustomData": true,<br/> "DisableOrganisationClaimCheck": true,<br/> "FilteredSearch": true,<br/> "FinancialBenchmarkingInsightsSummary": true,<br/> "ForecastRisk": true,<br/> "HighNeeds": true,<br/> "HistoricalTrends": true,<br/> "LocalAuthorities": true,<br/> "TrustComparison": true,<br/> "Trusts": true,<br/> "UserDefinedComparators": true<br/> },<br/> "front_door_sku_name": "Standard_AzureFrontDoor",<br/> "sku_name": "B1",<br/> "waf_mode": "Detection",<br/> "worker_count": 1,<br/> "zone_balancing_enabled": false<br/> },<br/> "pre-production": {<br/> "CacheOptions": {<br/> "ReturnYears": {<br/> "AbsoluteExpiration": 60,<br/> "SlidingExpiration": 10<br/> }<br/> },<br/> "features": {<br/> "CurriculumFinancialPlanning": true,<br/> "CustomData": true,<br/> "DisableOrganisationClaimCheck": false,<br/> "FilteredSearch": false,<br/> "FinancialBenchmarkingInsightsSummary": true,<br/> "ForecastRisk": true,<br/> "HighNeeds": false,<br/> "HistoricalTrends": true,<br/> "LocalAuthorities": true,<br/> "TrustComparison": true,<br/> "Trusts": true,<br/> "UserDefinedComparators": true<br/> },<br/> "front_door_sku_name": "Standard_AzureFrontDoor",<br/> "sku_name": "P0v3",<br/> "waf_mode": "Prevention",<br/> "worker_count": 1,<br/> "zone_balancing_enabled": false<br/> },<br/> "production": {<br/> "CacheOptions": {<br/> "ReturnYears": {<br/> "AbsoluteExpiration": 60,<br/> "SlidingExpiration": 10<br/> }<br/> },<br/> "features": {<br/> "CurriculumFinancialPlanning": true,<br/> "CustomData": true,<br/> "DisableOrganisationClaimCheck": false,<br/> "FilteredSearch": false,<br/> "FinancialBenchmarkingInsightsSummary": true,<br/> "ForecastRisk": true,<br/> "HighNeeds": false,<br/> "HistoricalTrends": true,<br/> "LocalAuthorities": true,<br/> "TrustComparison": true,<br/> "Trusts": true,<br/> "UserDefinedComparators": true<br/> },<br/> "front_door_sku_name": "Standard_AzureFrontDoor",<br/> "sku_name": "P1v3",<br/> "waf_mode": "Prevention",<br/> "worker_count": 1,<br/> "zone_balancing_enabled": false<br/> },<br/> "test": {<br/> "CacheOptions": {<br/> "ReturnYears": {<br/> "AbsoluteExpiration": 60,<br/> "SlidingExpiration": 10<br/> }<br/> },<br/> "features": {<br/> "CurriculumFinancialPlanning": true,<br/> "CustomData": true,<br/> "DisableOrganisationClaimCheck": true,<br/> "FilteredSearch": false,<br/> "FinancialBenchmarkingInsightsSummary": true,<br/> "ForecastRisk": true,<br/> "HighNeeds": true,<br/> "HistoricalTrends": true,<br/> "LocalAuthorities": true,<br/> "TrustComparison": true,<br/> "Trusts": true,<br/> "UserDefinedComparators": true<br/> },<br/> "front_door_sku_name": "Standard_AzureFrontDoor",<br/> "sku_name": "P0v3",<br/> "waf_mode": "Prevention",<br/> "worker_count": 1,<br/> "zone_balancing_enabled": false<br/> }<br/>}</pre> | no |
73+
| <a name="input_configuration"></a> [configuration](#input\_configuration) | n/a | <pre>map(object({<br> sku_name = string<br> zone_balancing_enabled = bool<br> worker_count = number<br> front_door_sku_name = string<br> waf_mode = string<br> features = object({<br> CurriculumFinancialPlanning = bool<br> CustomData = bool<br> Trusts = bool<br> LocalAuthorities = bool<br> UserDefinedComparators = bool<br> DisableOrganisationClaimCheck = bool<br> ForecastRisk = bool<br> TrustComparison = bool<br> FinancialBenchmarkingInsightsSummary = bool<br> HistoricalTrends = bool<br> HighNeeds = bool<br> FilteredSearch = bool<br> SchoolSpendingPrioritiesSsrCharts = bool<br> })<br> CacheOptions = object({<br> ReturnYears = object({<br> SlidingExpiration = number<br> AbsoluteExpiration = number<br> })<br> })<br> }))</pre> | <pre>{<br> "automated-test": {<br> "CacheOptions": {<br> "ReturnYears": {<br> "AbsoluteExpiration": 60,<br> "SlidingExpiration": 10<br> }<br> },<br> "features": {<br> "CurriculumFinancialPlanning": true,<br> "CustomData": true,<br> "DisableOrganisationClaimCheck": false,<br> "FilteredSearch": false,<br> "FinancialBenchmarkingInsightsSummary": true,<br> "ForecastRisk": true,<br> "HighNeeds": true,<br> "HistoricalTrends": true,<br> "LocalAuthorities": true,<br> "SchoolSpendingPrioritiesSsrCharts": false,<br> "TrustComparison": true,<br> "Trusts": true,<br> "UserDefinedComparators": true<br> },<br> "front_door_sku_name": "Standard_AzureFrontDoor",<br> "sku_name": "B1",<br> "waf_mode": "Detection",<br> "worker_count": 1,<br> "zone_balancing_enabled": false<br> },<br> "development": {<br> "CacheOptions": {<br> "ReturnYears": {<br> "AbsoluteExpiration": 60,<br> "SlidingExpiration": 10<br> }<br> },<br> "features": {<br> "CurriculumFinancialPlanning": true,<br> "CustomData": true,<br> "DisableOrganisationClaimCheck": true,<br> "FilteredSearch": false,<br> "FinancialBenchmarkingInsightsSummary": true,<br> "ForecastRisk": true,<br> "HighNeeds": true,<br> "HistoricalTrends": true,<br> "LocalAuthorities": true,<br> "SchoolSpendingPrioritiesSsrCharts": false,<br> "TrustComparison": true,<br> "Trusts": true,<br> "UserDefinedComparators": true<br> },<br> "front_door_sku_name": "Standard_AzureFrontDoor",<br> "sku_name": "B1",<br> "waf_mode": "Detection",<br> "worker_count": 1,<br> "zone_balancing_enabled": false<br> },<br> "feature": {<br> "CacheOptions": {<br> "ReturnYears": {<br> "AbsoluteExpiration": 60,<br> "SlidingExpiration": 10<br> }<br> },<br> "features": {<br> "CurriculumFinancialPlanning": true,<br> "CustomData": true,<br> "DisableOrganisationClaimCheck": true,<br> "FilteredSearch": true,<br> "FinancialBenchmarkingInsightsSummary": true,<br> "ForecastRisk": true,<br> "HighNeeds": true,<br> "HistoricalTrends": true,<br> "LocalAuthorities": true,<br> "SchoolSpendingPrioritiesSsrCharts": true,<br> "TrustComparison": true,<br> "Trusts": true,<br> "UserDefinedComparators": true<br> },<br> "front_door_sku_name": "Standard_AzureFrontDoor",<br> "sku_name": "B1",<br> "waf_mode": "Detection",<br> "worker_count": 1,<br> "zone_balancing_enabled": false<br> },<br> "pre-production": {<br> "CacheOptions": {<br> "ReturnYears": {<br> "AbsoluteExpiration": 60,<br> "SlidingExpiration": 10<br> }<br> },<br> "features": {<br> "CurriculumFinancialPlanning": true,<br> "CustomData": true,<br> "DisableOrganisationClaimCheck": false,<br> "FilteredSearch": false,<br> "FinancialBenchmarkingInsightsSummary": true,<br> "ForecastRisk": true,<br> "HighNeeds": false,<br> "HistoricalTrends": true,<br> "LocalAuthorities": true,<br> "SchoolSpendingPrioritiesSsrCharts": false,<br> "TrustComparison": true,<br> "Trusts": true,<br> "UserDefinedComparators": true<br> },<br> "front_door_sku_name": "Standard_AzureFrontDoor",<br> "sku_name": "P0v3",<br> "waf_mode": "Prevention",<br> "worker_count": 1,<br> "zone_balancing_enabled": false<br> },<br> "production": {<br> "CacheOptions": {<br> "ReturnYears": {<br> "AbsoluteExpiration": 60,<br> "SlidingExpiration": 10<br> }<br> },<br> "features": {<br> "CurriculumFinancialPlanning": true,<br> "CustomData": true,<br> "DisableOrganisationClaimCheck": false,<br> "FilteredSearch": false,<br> "FinancialBenchmarkingInsightsSummary": true,<br> "ForecastRisk": true,<br> "HighNeeds": false,<br> "HistoricalTrends": true,<br> "LocalAuthorities": true,<br> "SchoolSpendingPrioritiesSsrCharts": false,<br> "TrustComparison": true,<br> "Trusts": true,<br> "UserDefinedComparators": true<br> },<br> "front_door_sku_name": "Standard_AzureFrontDoor",<br> "sku_name": "P1v3",<br> "waf_mode": "Prevention",<br> "worker_count": 1,<br> "zone_balancing_enabled": false<br> },<br> "test": {<br> "CacheOptions": {<br> "ReturnYears": {<br> "AbsoluteExpiration": 60,<br> "SlidingExpiration": 10<br> }<br> },<br> "features": {<br> "CurriculumFinancialPlanning": true,<br> "CustomData": true,<br> "DisableOrganisationClaimCheck": true,<br> "FilteredSearch": false,<br> "FinancialBenchmarkingInsightsSummary": true,<br> "ForecastRisk": true,<br> "HighNeeds": true,<br> "HistoricalTrends": true,<br> "LocalAuthorities": true,<br> "SchoolSpendingPrioritiesSsrCharts": false,<br> "TrustComparison": true,<br> "Trusts": true,<br> "UserDefinedComparators": true<br> },<br> "front_door_sku_name": "Standard_AzureFrontDoor",<br> "sku_name": "P0v3",<br> "waf_mode": "Prevention",<br> "worker_count": 1,<br> "zone_balancing_enabled": false<br> }<br>}</pre> | no |
7474
| <a name="input_dfe-signin"></a> [dfe-signin](#input\_dfe-signin) | n/a | `any` | n/a | yes |
7575
| <a name="input_environment"></a> [environment](#input\_environment) | n/a | `any` | n/a | yes |
7676
| <a name="input_environment-prefix"></a> [environment-prefix](#input\_environment-prefix) | n/a | `any` | n/a | yes |

0 commit comments

Comments
 (0)