Merge branch 'main' into CLDC-2572-merged-status

# Conflicts: # app/helpers/organisation_helper.rb # app/models/organisation.rb # app/views/organisations/show.html.erb # spec/models/organisation_spec.rb
3 years ago · eaf65ce902
31 changed files with 1063 additions and 1227 deletions
--- a/.github/workflows/production_pipeline.yml
+++ b/.github/workflows/production_pipeline.yml
@ -68,7 +68,7 @@ jobs:
        uses: actions/setup-node@v3
        with:
          cache: yarn
-          node-version: 16
+          node-version: 18

      - name: Create database
        run: |
@ -127,7 +127,7 @@ jobs:
        uses: actions/setup-node@v3
        with:
          cache: yarn
-          node-version: 16
+          node-version: 18

      - name: Create database
        run: |
--- a/.github/workflows/staging_pipeline.yml
+++ b/.github/workflows/staging_pipeline.yml
@ -60,7 +60,7 @@ jobs:
        uses: actions/setup-node@v3
        with:
          cache: yarn
-          node-version: 16
+          node-version: 18

      - name: Create database
        run: |
@ -118,7 +118,7 @@ jobs:
        uses: actions/setup-node@v3
        with:
          cache: yarn
-          node-version: 16
+          node-version: 18

      - name: Create database
        run: |
@ -149,7 +149,7 @@ jobs:
        uses: actions/setup-node@v3
        with:
          cache: yarn
-          node-version: 16
+          node-version: 18

      - name: Install packages and symlink local dependencies
        run: |
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1 @@
-16
+18
--- a/.ruby-version
+++ b/.ruby-version
@ -1 +1 @@
-3.1.2
+3.1.4
--- a/4
+++ b/4
@ -1,5 +1,5 @@
 # Build compilation image
-FROM ruby:3.1.2-alpine as builder
+FROM ruby:3.1.4-alpine as builder

 # The application runs from /app
 WORKDIR /app
@ -45,7 +45,7 @@ RUN rm -rf node_modules log tmp && \
      find /usr/local/bundle/gems -name "*.html" -delete

 # Build runtime image
-FROM ruby:3.1.2-alpine as production
+FROM ruby:3.1.4-alpine as production

 # The application runs from /app
 WORKDIR /app
--- a/2
+++ b/2
@ -1,5 +1,5 @@
 # Build compilation image
-FROM ruby:3.1.2-alpine
+FROM ruby:3.1.4-alpine

 # The application runs from /app
 WORKDIR /app
--- a/2
+++ b/2
@ -3,7 +3,7 @@
 source "https://rubygems.org"
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }

-ruby "3.1.2"
+ruby "3.1.4"

 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
 gem "rails", "~> 7.0.2"
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -501,7 +501,7 @@ DEPENDENCIES
  webmock

 RUBY VERSION
-   ruby 3.1.2p20
+   ruby 3.1.4p223

 BUNDLED WITH
   2.3.14
--- a/app/components/bulk_upload_error_row_component.html.erb
+++ b/app/components/bulk_upload_error_row_component.html.erb
@ -1,13 +1,13 @@
-<div class="x-govuk-summary-card govuk-!-margin-bottom-6">
-  <div class="x-govuk-summary-card__header">
+<div class="govuk-summary-card govuk-!-margin-bottom-6">
+  <div class="govuk-summary-card__title-wrapper">
    <% if lettings? %>
-      <h3 class="x-govuk-summary-card__title"><strong>Row <%= row %></strong> <%= tenant_code_html %> <%= property_ref_html %></h3>
+      <h3 class="govuk-summary-card__title"><strong>Row <%= row %></strong> <%= tenant_code_html %> <%= property_ref_html %></h3>
    <% else %>
-      <h3 class="x-govuk-summary-card__title"><strong>Row <%= row %></strong> <%= purchaser_code_html %></h3>
+      <h3 class="govuk-summary-card__title"><strong>Row <%= row %></strong> <%= purchaser_code_html %></h3>
    <% end %>
  </div>

-  <div class="x-govuk-summary-card__body">
+  <div class="govuk-summary-card__content">
    <%= govuk_table do |table| %>
      <% table.head do |head| %>
        <% head.row do |row| %>
--- a/app/components/check_answers_summary_list_card_component.html.erb
+++ b/app/components/check_answers_summary_list_card_component.html.erb
@ -1,12 +1,12 @@
 <% if applicable_questions.first %>
-  <div class="x-govuk-summary-card govuk-!-margin-bottom-6">
+  <div class="govuk-summary-card govuk-!-margin-bottom-6">
    <% if applicable_questions.first.check_answers_card_number != 0 && applicable_questions.first.check_answers_card_number.present? %>
-      <div class="x-govuk-summary-card__header">
-        <h3 class="x-govuk-summary-card__title"><%= check_answers_card_title(applicable_questions.first) %></h3>
+      <div class="govuk-summary-card__title-wrapper">
+        <h3 class="govuk-summary-card__title"><%= check_answers_card_title(applicable_questions.first) %></h3>
      </div>
    <% end %>

-    <div class="x-govuk-summary-card__body">
+    <div class="govuk-summary-card__content">
      <%= govuk_summary_list do |summary_list| %>
        <% applicable_questions.each do |question| %>
          <% summary_list.row do |row| %>
--- a/app/frontend/application.js
+++ b/app/frontend/application.js
@ -13,7 +13,7 @@ import 'regenerator-runtime/runtime'

 //
 import { initAll as GOVUKFrontend } from 'govuk-frontend'
-import { initAll as GOVUKPrototypeComponents } from 'govuk-prototype-components'
+import { initAll as GOVUKPrototypeComponents } from '@x-govuk/govuk-prototype-components'
 import './controllers'
 import './cookie-banner'
 import './styles/application.scss'
--- a/app/frontend/controllers/govukfrontend_controller.js
+++ b/app/frontend/controllers/govukfrontend_controller.js
@ -1,5 +1,5 @@
 import { initAll as GOVUKFrontend } from 'govuk-frontend'
-import { initAll as GOVUKPrototypeComponents } from 'govuk-prototype-components'
+import { initAll as GOVUKPrototypeComponents } from '@x-govuk/govuk-prototype-components'
 import { Controller } from '@hotwired/stimulus'

 export default class extends Controller {
--- a/app/helpers/organisation_helper.rb
+++ b/app/helpers/organisation_helper.rb
--- a/app/views/form/_interruption_screen_question.html.erb
+++ b/app/views/form/_interruption_screen_question.html.erb
@ -3,8 +3,8 @@
 <h1 class="govuk-heading-m">
  Make sure these answers are correct:
 </h1>
-<div class="x-govuk-summary-card govuk-!-margin-bottom-6">
-  <div class="x-govuk-summary-card__body">
+<div class="govuk-summary-card govuk-!-margin-bottom-6">
+  <div class="govuk-summary-card__content">

    <%= render partial: "form/check_answers_summary_list", locals: {
        lettings_log:,
--- a/app/views/form/review.html.erb
+++ b/app/views/form/review.html.erb
@ -14,11 +14,11 @@
      <h2 class="govuk-heading-m"><%= section.label %></h2>
      <% section.subsections.map do |subsection| %>
        <% if total_applicable_questions(subsection, @log, current_user).any? %>
-          <div class="x-govuk-summary-card govuk-!-margin-bottom-6">
-            <div class="x-govuk-summary-card__header">
-              <h3 class="x-govuk-summary-card__title"><%= subsection.label %></h3>
+          <div class="govuk-summary-card govuk-!-margin-bottom-6">
+            <div class="govuk-summary-card__title-wrapper">
+              <h3 class="govuk-summary-card__title"><%= subsection.label %></h3>
            </div>
-            <div class="x-govuk-summary-card__body">
+            <div class="govuk-summary-card__content">
              <%= render partial: "form/check_answers_summary_list", locals: { subsection:, questions: total_applicable_questions(subsection, @log, current_user), referrer: "check_answers" } %>
            </div>
          </div>
--- a/app/views/organisations/edit.html.erb
+++ b/app/views/organisations/edit.html.erb
@ -11,8 +11,9 @@
        <%= content_for(:title) %>
      </h1>

-      <%= f.govuk_text_field :name,
-        autocomplete: "name" %>
+      <% if current_user.support? %>
+        <%= f.govuk_text_field :name, autocomplete: "name" %>
+      <% end %>

      <%= f.govuk_text_field :address_line1,
        label: { text: "Address line 1" },
--- a/app/views/organisations/show.html.erb
+++ b/app/views/organisations/show.html.erb
@ -14,6 +14,7 @@
 <div class="govuk-grid-row">
  <div class="govuk-grid-column-two-thirds-from-desktop">
    <%= govuk_summary_list do |summary_list| %>
+      <%= organisation_name_row(user: current_user, organisation: @organisation, summary_list:) %>
      <% display_organisation_attributes(@organisation).each do |attr| %>
        <% if can_edit_org?(current_user) && attr[:editable] %>
          <%= summary_list.row do |row| %>
--- a/config/cloud_foundry/review_manifest.yml
+++ b/config/cloud_foundry/review_manifest.yml
@ -1,7 +1,7 @@
 ---
 defaults: &defaults
  buildpacks:
-    - https://github.com/cloudfoundry/ruby-buildpack.git#v1.8.59
+    - https://github.com/cloudfoundry/ruby-buildpack.git
  processes:
    - type: web
      command: bundle exec rake cf:on_first_instance db:migrate db:seed && bin/rails server
--- a/docs/setup.md
+++ b/docs/setup.md
@ -64,8 +64,8 @@ We recommend using [nvm](https://github.com/nvm-sh/nvm) to manage NodeJS version
 4. Install Ruby and Bundler

    ```bash
-    rbenv install 3.1.2
-    rbenv global 3.1.2
+    rbenv install 3.1.4
+    rbenv global 3.1.4
    source ~/.bashrc
    gem install bundler
    ```
--- a/manifest.yml
+++ b/manifest.yml
@ -1,7 +1,7 @@
 ---
 defaults: &defaults
  buildpacks:
-    - https://github.com/cloudfoundry/ruby-buildpack.git#v1.8.59
+    - https://github.com/cloudfoundry/ruby-buildpack.git
  processes:
    - type: web
      command: bundle exec rake cf:on_first_instance db:migrate && bin/rails server
--- a/package.json
+++ b/package.json
@ -2,7 +2,7 @@
  "name": "data-collector",
  "private": true,
  "engines": {
-    "node": "^16.0.0"
+    "node": "^18.0.0"
  },
  "dependencies": {
    "@babel/core": "^7.17.7",
@ -11,6 +11,7 @@
    "@hotwired/stimulus": "^3.0.0",
    "@stimulus/polyfills": "^2.0.0",
    "@webcomponents/webcomponentsjs": "^2.6.0",
+    "@x-govuk/govuk-prototype-components": "^2.0.1",
    "accessible-autocomplete": "^2.0.3",
    "babel-loader": "^8.2.3",
    "babel-plugin-macros": "^3.1.0",
@ -19,8 +20,7 @@
    "css-loader": "^6.7.1",
    "custom-event-polyfill": "^1.0.7",
    "file-loader": "^6.2.0",
-    "govuk-frontend": "4.2.0",
-    "govuk-prototype-components": "^0.4.0",
+    "govuk-frontend": "4.7.0",
    "html5shiv": "^3.7.3",
    "intersection-observer": "^0.12.0",
    "mini-css-extract-plugin": "^2.6.0",
--- a/spec/features/form/check_answers_page_lettings_logs_spec.rb
+++ b/spec/features/form/check_answers_page_lettings_logs_spec.rb
@ -148,14 +148,14 @@ RSpec.describe "Lettings Log Check Answers Page" do

    it "does not group questions into summary cards if the questions in the subsection don't have a check_answers_card_number attribute" do
      visit("/lettings-logs/#{completed_lettings_log.id}/household-needs/check-answers")
-      assert_selector ".x-govuk-summary-card__title", count: 0
+      assert_selector ".govuk-summary-card__title", count: 0
    end

    context "when the user is checking their answers for the household characteristics subsection" do
      it "they see a separate summary card for each member of the household" do
        visit("/lettings-logs/#{completed_lettings_log.id}/#{subsection}/check-answers")
-        assert_selector ".x-govuk-summary-card__title", text: "Lead tenant", count: 1
-        assert_selector ".x-govuk-summary-card__title", text: "Person 2", count: 1
+        assert_selector ".govuk-summary-card__title", text: "Lead tenant", count: 1
+        assert_selector ".govuk-summary-card__title", text: "Person 2", count: 1
      end
    end

--- a/spec/features/form/check_answers_page_sales_logs_spec.rb
+++ b/spec/features/form/check_answers_page_sales_logs_spec.rb
@ -36,33 +36,33 @@ RSpec.describe "Sales Log Check Answers Page" do

    it "does not group questions into summary cards if the questions in the subsection don't have a check_answers_card_number attribute" do
      visit("/sales-logs/#{completed_sales_log_joint_purchase.id}/household-needs/check-answers")
-      assert_selector ".x-govuk-summary-card__title", count: 0
+      assert_selector ".govuk-summary-card__title", count: 0
    end

    context "when the user is checking their answers for the household characteristics subsection" do
      context "and the log is for a joint purchase" do
        it "they see a separate summary card for each member of the household" do
          visit("/sales-logs/#{completed_sales_log_joint_purchase.id}/#{subsection}/check-answers")
-          assert_selector ".x-govuk-summary-card__title", text: "Buyer 1", count: 1
-          assert_selector ".x-govuk-summary-card__title", text: "Buyer 2", count: 1
-          assert_selector ".x-govuk-summary-card__title", text: "Person 1", count: 0
-          assert_selector ".x-govuk-summary-card__title", text: "Person 2", count: 0
-          assert_selector ".x-govuk-summary-card__title", text: "Person 3", count: 1
-          assert_selector ".x-govuk-summary-card__title", text: "Person 4", count: 1
-          assert_selector ".x-govuk-summary-card__title", text: "Person 5", count: 1
+          assert_selector ".govuk-summary-card__title", text: "Buyer 1", count: 1
+          assert_selector ".govuk-summary-card__title", text: "Buyer 2", count: 1
+          assert_selector ".govuk-summary-card__title", text: "Person 1", count: 0
+          assert_selector ".govuk-summary-card__title", text: "Person 2", count: 0
+          assert_selector ".govuk-summary-card__title", text: "Person 3", count: 1
+          assert_selector ".govuk-summary-card__title", text: "Person 4", count: 1
+          assert_selector ".govuk-summary-card__title", text: "Person 5", count: 1
        end
      end

      context "and the log is for a non-joint purchase" do
        it "they see a separate summary card for each member of the household" do
          visit("/sales-logs/#{completed_sales_log_non_joint_purchase.id}/#{subsection}/check-answers")
-          assert_selector ".x-govuk-summary-card__title", text: "Buyer 1", count: 1
-          assert_selector ".x-govuk-summary-card__title", text: "Buyer 2", count: 0
-          assert_selector ".x-govuk-summary-card__title", text: "Person 1", count: 0
-          assert_selector ".x-govuk-summary-card__title", text: "Person 2", count: 1
-          assert_selector ".x-govuk-summary-card__title", text: "Person 3", count: 1
-          assert_selector ".x-govuk-summary-card__title", text: "Person 4", count: 1
-          assert_selector ".x-govuk-summary-card__title", text: "Person 5", count: 1
+          assert_selector ".govuk-summary-card__title", text: "Buyer 1", count: 1
+          assert_selector ".govuk-summary-card__title", text: "Buyer 2", count: 0
+          assert_selector ".govuk-summary-card__title", text: "Person 1", count: 0
+          assert_selector ".govuk-summary-card__title", text: "Person 2", count: 1
+          assert_selector ".govuk-summary-card__title", text: "Person 3", count: 1
+          assert_selector ".govuk-summary-card__title", text: "Person 4", count: 1
+          assert_selector ".govuk-summary-card__title", text: "Person 5", count: 1
        end
      end
    end
--- a/spec/models/organisation_spec.rb
+++ b/spec/models/organisation_spec.rb
@ -230,4 +230,24 @@ RSpec.describe Organisation, type: :model do
      end
    end
  end
+
+  describe "display_organisation_attributes" do
+    let(:organisation) { create(:organisation) }
+
+    it "does not include data protection agreement" do
+      expect(organisation.display_organisation_attributes).to eq(
+        [
+          { editable: false, name: "Organisation ID", value: "ORG#{organisation.id}" },
+          { editable: true,
+            name: "Address",
+            value: "2 Marsham Street\nLondon\nSW1P 4DF" },
+          { editable: true, name: "Telephone number", value: nil },
+          { editable: false, name: "Type of provider", value: "Local authority" },
+          { editable: false, name: "Registration number", value: "1234" },
+          { editable: false, format: :bullet, name: "Rent periods", value: %w[All] },
+          { editable: false, name: "Owns housing stock", value: "Yes" },
+        ],
+      )
+    end
+  end
 end
--- a/spec/requests/organisations_controller_spec.rb
+++ b/spec/requests/organisations_controller_spec.rb
@ -262,9 +262,9 @@ RSpec.describe OrganisationsController, type: :request do
            expect(response.body).to include(organisation.name)
          end

-          it "has a change details link" do
+          it "does not include a change details link" do
            expected_html = "data-qa=\"change-name\" href=\"/organisations/#{organisation.id}/edit\""
-            expect(response.body).to include(expected_html)
+            expect(response.body).not_to include(expected_html)
          end

          it "displays a link to merge organisations" do
@ -345,9 +345,9 @@ RSpec.describe OrganisationsController, type: :request do
            get "/organisations/#{organisation.id}/edit", headers:, params: {}
          end

-          it "shows an edit form" do
+          it "shows an edit form without name field" do
            expect(response.body).to include("Change #{organisation.name}’s details")
-            expect(page).to have_field("organisation-name-field")
+            expect(page).not_to have_field("organisation-name-field")
            expect(page).to have_field("organisation-phone-field")
          end
        end
--- a/spec/views/bulk_upload_lettings_results/show.html.erb_spec.rb
+++ b/spec/views/bulk_upload_lettings_results/show.html.erb_spec.rb
@ -16,7 +16,7 @@ RSpec.describe "bulk_upload_lettings_results/show.html.erb" do

      fragment = Capybara::Node::Simple.new(rendered)

-      expect(fragment.find_css(".x-govuk-summary-card__title strong").map(&:inner_text)).to eql(["Row 10", "Row 14"])
+      expect(fragment.find_css(".govuk-summary-card__title strong").map(&:inner_text)).to eql(["Row 10", "Row 14"])
    end
  end

--- a/spec/views/bulk_upload_lettings_results/summary.html.erb_spec.rb
+++ b/spec/views/bulk_upload_lettings_results/summary.html.erb_spec.rb
@ -16,7 +16,7 @@ RSpec.describe "bulk_upload_lettings_results/summary.html.erb" do

      fragment = Capybara::Node::Simple.new(rendered)

-      expect(fragment.find_css(".x-govuk-summary-card__title strong").map(&:inner_text)).to eql(["Row 10", "Row 14"])
+      expect(fragment.find_css(".govuk-summary-card__title strong").map(&:inner_text)).to eql(["Row 10", "Row 14"])
    end
  end

--- a/spec/views/bulk_upload_sales_results/show.html.erb_spec.rb
+++ b/spec/views/bulk_upload_sales_results/show.html.erb_spec.rb
@ -16,7 +16,7 @@ RSpec.describe "bulk_upload_sales_results/show.html.erb" do

      fragment = Capybara::Node::Simple.new(rendered)

-      expect(fragment.find_css(".x-govuk-summary-card__title strong").map(&:inner_text)).to eql(["Row 10", "Row 14"])
+      expect(fragment.find_css(".govuk-summary-card__title strong").map(&:inner_text)).to eql(["Row 10", "Row 14"])
    end
  end

--- a/spec/views/bulk_upload_sales_results/summary.html.erb_spec.rb
+++ b/spec/views/bulk_upload_sales_results/summary.html.erb_spec.rb
@ -16,7 +16,7 @@ RSpec.describe "bulk_upload_sales_results/summary.html.erb" do

      fragment = Capybara::Node::Simple.new(rendered)

-      expect(fragment.find_css(".x-govuk-summary-card__title strong").map(&:inner_text)).to eql(["Row 10", "Row 14"])
+      expect(fragment.find_css(".govuk-summary-card__title strong").map(&:inner_text)).to eql(["Row 10", "Row 14"])
    end
  end

--- a/webpack.config.js
+++ b/webpack.config.js
@ -40,7 +40,7 @@ module.exports = {
  resolve: {
    alias: {
      'govuk-frontend-styles': path.resolve(__dirname, 'node_modules/govuk-frontend/govuk/all.scss'),
-      'govuk-prototype-styles': path.resolve(__dirname, 'node_modules/govuk-prototype-components/x-govuk/all.scss')
+      'govuk-prototype-styles': path.resolve(__dirname, 'node_modules/@x-govuk/govuk-prototype-components/x-govuk/all.scss')
    },
    modules: ['node_modules', 'node_modules/govuk-frontend/govuk']
  },
--- a/yarn.lock
+++ b/yarn.lock
 @ -1 +1 @@
 .1.2
 .1.4