Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion polaris-e2e/pipelines/stages/stage_run-e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ stages:
parameters:
checkoutRef: ${{ parameters.checkoutRef }}

- template: jobs/job_run-dot-net-tests.yml
# Disable dotnet tests as pdf-redactor have changed drastically and tests are no longer valid. Will need to be re-written and re-enabled in the future.
# - template: jobs/job_run-dot-net-tests.yml

- template: jobs/job_run-cypress-tests-a.yml
parameters:
Expand Down
2 changes: 2 additions & 0 deletions polaris-terraform/main-terraform/function-gateway-staging.tf
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ resource "azurerm_linux_function_app_slot" "fa_polaris_staging1" {
"https://as-web-${local.global_resource_name}.azurewebsites.net",
"https://${local.global_resource_name}-cmsproxy.azurewebsites.net",
"https://${local.global_resource_name}-notprod.cps.gov.uk",
var.env == "qa" ? "https://cps-tst.outsystemsenterprise.com" : "",
var.env == "qa" ? "https://cps-tst1.outsystemsenterprise.com" : "",
var.env == "dev" ? "http://localhost:3000" : ""
]
support_credentials = true
Expand Down
2 changes: 2 additions & 0 deletions polaris-terraform/main-terraform/function-gateway.tf
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ resource "azurerm_linux_function_app" "fa_polaris" {
"https://as-web-${local.global_resource_name}.azurewebsites.net",
"https://${local.global_resource_name}-cmsproxy.azurewebsites.net",
"https://${local.global_resource_name}-notprod.cps.gov.uk",
var.env == "qa" ? "https://cps-tst.outsystemsenterprise.com" : "",
var.env == "qa" ? "https://cps-tst1.outsystemsenterprise.com" : "",
var.env == "dev" ? "http://localhost:3000" : ""
]
support_credentials = true
Expand Down
2 changes: 1 addition & 1 deletion polaris-terraform/main-terraform/qa.tfvars
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ cms_details = {
cin5_upstream_cms_services_domain_name = "cin5.cps.gov.uk"
}

auth_handover_whitelist = "/auth-refresh-inbound,https://cps-tst.outsystemsenterprise.com/,https://housekeeping-fn-staging.int.cps.gov.uk/,https://fa-lacc-api-staging.azurewebsites.net/,https://fa-cmrc-api-staging.azurewebsites.net/,https://polaris-qa-notprod.cps.gov.uk/auth-refresh-inbound?polaris-ui-url=/materials-ui"
auth_handover_whitelist = "/auth-refresh-inbound,https://cps-tst.outsystemsenterprise.com/,https://cpslon-tst.outsystemsenterprise.com/,https://housekeeping-fn-staging.int.cps.gov.uk/,https://fa-lacc-api-staging.azurewebsites.net/,https://fa-cmrc-api-staging.azurewebsites.net/,https://polaris-qa-notprod.cps.gov.uk/auth-refresh-inbound?polaris-ui-url=/materials-ui"

app_service_log_retention = 90
app_service_log_total_retention = 2555
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -910,7 +910,11 @@ export const RedactionLogContent: React.FC<RedactionLogContentProps> = ({
children: (
<span className={classes.textAreaLabel}>
Supporting notes{" "}
<span className={classes.greyColor}>(optional)</span>
{!isSelectedRedactionOfOtherType && (
<span className={classes.greyColor}>
(optional)
</span>
)}
</span>
),
}}
Expand Down
Loading