Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RAS-843 Fix breaking changes for DS 63.0.0 #914

Merged
merged 2 commits into from
Jul 28, 2023
Merged

RAS-843 Fix breaking changes for DS 63.0.0 #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a0a75d
RAS-843 Fix breaking changes for DS 63.0.0
LJBabbage Jul 26, 2023
db7e014
auto patch increment
Jul 26, 2023
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
2 changes: 1 addition & 1 deletion .design-system-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
62.2.4
63.0.0
4 changes: 2 additions & 2 deletions _infra/helm/frontstage/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ type: application

# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
version: 2.4.70
version: 2.4.71

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
appVersion: 2.4.70
appVersion: 2.4.71
2 changes: 1 addition & 1 deletion frontstage/templates/account/account-change-password.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/password/_macro.njk" import onsPassword %}

{% set page_title = "Change password" %}
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/account/account-contact-detail-change.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}

{% set page_title = "Change contact details" %}
{% set breadcrumbsData = [
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/account/account-something-else.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "layouts/_block_content.html" %}
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/panel/_macro.njk" import onsPanel %}
{% from "components/textarea/_macro.njk" import onsTextarea %}

Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/cookies.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{% from "components/panel/_macro.njk" import onsPanel %}
{% from "components/collapsible/_macro.njk" import onsCollapsible %}
{% from "components/table/_macro.njk" import onsTable %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}

{% set page_title = "Cookies on surveys.ons.gov.uk" %}

Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/help/help-info-how-safe-data.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "layouts/_block_content.html" %}
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}

{% set page_title = "Help how safe is my data" %}
{% set breadcrumbsData = [
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/help/help-with-password-reset-email.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "layouts/_block_content.html" %}
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}

{% set page_title = "Help not received the password reset email" %}
{% set breadcrumbsData = [
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/passwords/reset-password.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

{% extends "layouts/_block_content.html" %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/password/_macro.njk" import onsPassword %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/fieldset/_macro.njk" import onsFieldset %}
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/privacy-and-data-protection.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "layouts/_block_content.html" %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}

{% set page_title = "Privacy and data protection" %}

Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/radio-option-select-error-panel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/panel/_macro.njk" import onsPanel %}

{% set ns.optionError = false %}
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/register/enter-enrolment-code.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
})
%}
<p>This <strong>must be corrected</strong> to continue.</p>
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{{
onsList({
"element": "ol",
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/register/enter-your-details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

{% extends "layouts/_block_content.html" %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/password/_macro.njk" import onsPassword %}
{% from "components/fieldset/_macro.njk" import onsFieldset %}
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/register/register-pending-survey-enter-your-details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

{% extends "layouts/_block_content.html" %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/password/_macro.njk" import onsPassword %}
{% from "components/fieldset/_macro.njk" import onsFieldset %}
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/register/register-pending-survey-registration-complete.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/button/_macro.njk" import onsButton %}

{% set page_title = "Pending survey registration complete" %}
Expand Down
6 changes: 2 additions & 4 deletions frontstage/templates/secure-messages/conversation-view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/message/_macro.njk" import onsMessage %}
{% from "components/textarea/_macro.njk" import onsTextarea %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}

{% set page_title = "View message" %}
{% set subject = conversation[-1]["subject"] or "No Subject" %}
Expand Down Expand Up @@ -78,7 +78,6 @@ <h1 class="ons-u-fs-xl" name="page-messages-title">{{ subject }}</h1>
{% call onsMessage({
"type": msgType,
"id": 'conversation-message-' + loop.index|string,
"name": 'conversation-message',
"fromLabel": 'From',
"fromName": 'sm-sender',
"fromId": 'sm-sender-' + loop.index|string,
Expand All @@ -87,8 +86,7 @@ <h1 class="ons-u-fs-xl" name="page-messages-title">{{ subject }}</h1>
"sentValue": message.get('sent_date'),
"sentName": 'sm-sent-date',
"sentId": 'sm-sent-date-' + loop.index|string,
"messageID": 'conversation-message-body-' + loop.index|string,
"messageName": 'conversation-message-body'
"messageID": 'conversation-message-body-' + loop.index|string
}) %}
<span style="white-space:pre-line">{{ message.get('body') }}</span>
{% endcall %}
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/secure-messages/help/secure-message-send-messages-view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "layouts/_block_content.html" %}
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/panel/_macro.njk" import onsPanel %}
{% from "components/textarea/_macro.njk" import onsTextarea %}

Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/secure-messages/help/secure-message-send-technical-messages-view.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "layouts/_block_content.html" %}
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/panel/_macro.njk" import onsPanel %}
{% from "components/textarea/_macro.njk" import onsTextarea %}

Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/secure-messages/message-error-summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% if "subject" in errors or "body" in errors %}
{% set errorData = [] %}

Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/sign-in/sign-in.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
%}
<p>This <strong>must be corrected</strong> to continue.</p>

{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{{
onsList({
"element": "ol",
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/help/surveys-help-how-safe-is-my-data.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "layouts/_block_content.html" %}
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}

{% set breadcrumbsData = [
{
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-access.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends 'layouts/_base.html' %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/collapsible/_macro.njk" import onsCollapsible %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}

{% set page_title = survey_info.longName ~ ' ' ~ collection_exercise_info.userDescription %}

Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-add.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
})
%}
<p>This <strong>must be corrected</strong> to continue.</p>
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{{
onsList({
"element": "ol",
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-link-expired.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/button/_macro.njk" import onsButton %}

{% set page_title = "survey link has expired" %}
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-link-not-valid.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/button/_macro.njk" import onsButton %}

{% set page_title = "survey link not valid" %}
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-share/overview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "layouts/_block_content.html" %}
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}

{% set page_title = "Share surveys overview" %}
{% set breadcrumbsData = [
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-share/recipient-email-address.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/panel/_macro.njk" import onsPanel %}
{% from "components/button/_macro.njk" import onsButton %}
{% set page_title = "Survey share email entry" %}
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-share/send-instructions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/panel/_macro.njk" import onsPanel %}

Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-share/share-survey-complete-thank-you.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/button/_macro.njk" import onsButton %}

{% set page_title = "Share survey complete" %}
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-share/summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/button/_macro.njk" import onsButton %}

{% set page_title = "Confirm survey access" %}
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-share/survey-select.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/checkboxes/_macro.njk" import onsCheckboxes %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}

{% set page_title = "Survey share survey select" %}

Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-transfer/overview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "layouts/_block_content.html" %}
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}

{% set page_title = "Transfer surveys overview" %}
{% set breadcrumbsData = [
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-transfer/recipient-email-address.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/button/_macro.njk" import onsButton %}
{% set page_title = "Survey transfer email entry" %}
{% set breadcrumbsData = [
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-transfer/send-instructions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/button/_macro.njk" import onsButton %}
{% set page_title = "Survey transfer email send instructions" %}
{% set breadcrumbsData = [
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-transfer/summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/button/_macro.njk" import onsButton %}
{% set page_title = "Confirm transfer survey access" %}
{% block main %}
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-transfer/survey-select.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/checkboxes/_macro.njk" import onsCheckboxes %}
{% from "components/button/_macro.njk" import onsButton %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% set page_title = "Survey transfer survey select" %}
{% set breadcrumbsData = [
{
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/surveys/surveys-transfer/transfer-survey-complete-thank-you.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% from "components/breadcrumbs/_macro.njk" import onsBreadcrumbs %}
{% from "components/fieldset/_macro.njk" import onsFieldset %}
{% from "components/input/_macro.njk" import onsInput %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}
{% from "components/button/_macro.njk" import onsButton %}

{% set page_title = "Transfer survey complete" %}
Expand Down
2 changes: 1 addition & 1 deletion frontstage/templates/vunerability_disclosure.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "layouts/_block_content.html" %}
{% from "components/lists/_macro.njk" import onsList %}
{% from "components/list/_macro.njk" import onsList %}

{% set page_title = "Vulnerability Disclosure Policy" %}

Expand Down
Loading