diff --git a/Gemfile b/Gemfile index 65fc882d1..702084009 100644 --- a/Gemfile +++ b/Gemfile @@ -25,8 +25,8 @@ gem "govuk_design_system_formbuilder" gem "govuk_markdown" # GOV UK Notify gem "notifications-ruby-client" -# Turbo and Stimulus -gem "hotwire-rails" +# A modest javascript framework for the html you already have +gem "stimulus-rails" # Administration framework gem "activeadmin" # Admin charts diff --git a/Gemfile.lock b/Gemfile.lock index e67720b85..a0a4e09a9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -188,10 +188,6 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) hashdiff (1.0.1) - hotwire-rails (0.1.3) - rails (>= 6.0.0) - stimulus-rails - turbo-rails i18n (1.10.0) concurrent-ruby (~> 1.0) inherited_resources (1.13.1) @@ -430,9 +426,6 @@ GEM thor (1.2.1) timecop (0.9.5) timeout (0.2.0) - turbo-rails (1.0.1) - actionpack (>= 6.0.0) - railties (>= 6.0.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) uk_postcode (2.1.7) @@ -480,7 +473,6 @@ DEPENDENCIES govuk-components govuk_design_system_formbuilder govuk_markdown - hotwire-rails jsbundling-rails json-schema listen (~> 3.3) @@ -507,6 +499,7 @@ DEPENDENCIES sentry-rails sentry-ruby simplecov + stimulus-rails timecop (~> 0.9.4) two_factor_authentication! tzinfo-data diff --git a/app/frontend/application.js b/app/frontend/application.js index d3a684d94..98742bb09 100644 --- a/app/frontend/application.js +++ b/app/frontend/application.js @@ -16,6 +16,5 @@ require.context("govuk-frontend/govuk/assets") import { initAll } from "govuk-frontend" import "./styles/application.scss" import "./controllers" -import "@hotwired/turbo-rails" initAll() diff --git a/app/views/case_logs/edit.html.erb b/app/views/case_logs/edit.html.erb index fe7e2d661..015db4454 100644 --- a/app/views/case_logs/edit.html.erb +++ b/app/views/case_logs/edit.html.erb @@ -4,30 +4,27 @@ content_for(:title) => "" }) %> -<%= turbo_frame_tag "case_log_form", target: "_top" do %> -
-
-

- <%= content_for(:title) %> -

+
+
+

+ <%= content_for(:title) %> +

- <% if @case_log.status == "in_progress" %> -

<%= get_subsections_count(@case_log, :completed) %> of <%= get_subsections_count(@case_log, :all) %> sections completed.

-

- <% next_incomplete_section = get_next_incomplete_section(@case_log) %> -

-

- <% if next_incomplete_section.present? %> - - Skip to next incomplete section: <%= next_incomplete_section.label %> - - <% end %> -

- <% elsif @case_log.status == "not_started" %> -

This log has not been started.

- <% end %> - - <%= render "tasklist" %> -
+ <% if @case_log.status == "in_progress" %> +

<%= get_subsections_count(@case_log, :completed) %> of <%= get_subsections_count(@case_log, :all) %> sections completed.

+

+ <% next_incomplete_section = get_next_incomplete_section(@case_log) %> +

+

+ <% if next_incomplete_section.present? %> + + Skip to next incomplete section: <%= next_incomplete_section.label %> + + <% end %> +

+ <% elsif @case_log.status == "not_started" %> +

This log has not been started.

+ <% end %> + <%= render "tasklist" %>
-<% end %> +
diff --git a/app/views/form/check_answers.html.erb b/app/views/form/check_answers.html.erb index 4be257a6f..c4c8b023c 100644 --- a/app/views/form/check_answers.html.erb +++ b/app/views/form/check_answers.html.erb @@ -5,31 +5,29 @@ subsection.label => "" }) %> -<%= turbo_frame_tag "case_log_form", target: "_top" do %> -
-
-

- <%= subsection.label %> - Check your answers -

+
+
+

+ <%= subsection.label %> + Check your answers +

- <%= display_answered_questions_summary(subsection, @case_log) %> + <%= display_answered_questions_summary(subsection, @case_log) %> -
- <% subsection.applicable_questions(@case_log).each do |question| %> - <%= render partial: 'form/check_answers_table', locals: { question: question, case_log: @case_log } %> - <% end %> -
+
+ <% subsection.applicable_questions(@case_log).each do |question| %> + <%= render partial: 'form/check_answers_table', locals: { question: question, case_log: @case_log } %> + <% end %> +
- <%= form_with model: @case_log, method: "get" do |f| %> - <%= f.govuk_submit 'Save and return to log' do %> - <% if @case_log.status == "in_progress" && @case_log.status == "completed" || @case_log.form.all_subsections_except_declaration_completed?(@case_log) == false %> - <%= govuk_button_link_to 'Save and go to next incomplete section', "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %> - <% elsif @case_log.status == "completed" || @case_log.form.all_subsections_except_declaration_completed?(@case_log) %> - <%= govuk_button_link_to 'Save and go to submit', "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %> - <% end%> - <% end %> + <%= form_with model: @case_log, method: "get" do |f| %> + <%= f.govuk_submit 'Save and return to log' do %> + <% if @case_log.status == "in_progress" && @case_log.status == "completed" || @case_log.form.all_subsections_except_declaration_completed?(@case_log) == false %> + <%= govuk_button_link_to 'Save and go to next incomplete section', "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %> + <% elsif @case_log.status == "completed" || @case_log.form.all_subsections_except_declaration_completed?(@case_log) %> + <%= govuk_button_link_to 'Save and go to submit', "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %> + <% end%> <% end %> -
+ <% end %>
-<% end %> +
diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb index 78cbd1b96..d946c3e2d 100644 --- a/app/views/form/page.html.erb +++ b/app/views/form/page.html.erb @@ -1,7 +1,3 @@ -<% content_for :head do %> - -<% end %> - <% content_for :title, @page.header.present? ? @page.header : @page.questions.first().header.html_safe %> <% content_for :before_content do %> @@ -13,48 +9,46 @@
-<%= turbo_frame_tag "case_log_form", target: "_top" do %> - <%= form_with model: @case_log, url: form_case_log_path(@case_log), method: "post" do |f| %> -
-
> - <% remove_other_page_errors(@case_log, @page) %> - <%= f.govuk_error_summary %> - - <% if @page.header.present? %> -

- <% if !@page.hide_subsection_label %> - <%= @subsection.label %> - <% end %> - <%= @page.header %> -

- <% end %> - - <% if @page.description.present? %> -

<%= @page.description.html_safe %>

- <% end %> +<%= form_with model: @case_log, url: form_case_log_path(@case_log), method: "post" do |f| %> +
+
> + <% remove_other_page_errors(@case_log, @page) %> + <%= f.govuk_error_summary %> - <% @page.non_conditional_questions.map do |question| %> -
<%= display_question_key_div(@page, question) %> > - <% if question.read_only? %> -
- <% end %> - <% if question.type == "interruption_screen" %> - <%= render partial: "form/#{question.type}_question", locals: { question: question, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, title_text: @page.title_text, informative_text: @page.informative_text, form: @form, f: f, conditional: false } %> - <% else %> - <%= render partial: "form/#{question.type}_question", locals: { question: question, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, f: f, conditional: false } %> - <% end %> -
- <% end %> - - <%= f.hidden_field :page, value: @page.id %> - <% if @case_log.form.is_last_question?(@page, @subsection, @case_log) %> - <%= f.govuk_submit "Submit lettings log", accesskey: "s" %> - <%else %> - <% if !@page.id.include?("value_check") %> - <%= f.govuk_submit "Save and continue", accesskey: "s" %> + <% if @page.header.present? %> +

+ <% if !@page.hide_subsection_label %> + <%= @subsection.label %> + <% end %> + <%= @page.header %> +

+ <% end %> + + <% if @page.description.present? %> +

<%= @page.description.html_safe %>

+ <% end %> + + <% @page.non_conditional_questions.map do |question| %> +
<%= display_question_key_div(@page, question) %> > + <% if question.read_only? %> +
<% end %> - <%end %> -
+ <% if question.type == "interruption_screen" %> + <%= render partial: "form/#{question.type}_question", locals: { question: question, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, title_text: @page.title_text, informative_text: @page.informative_text, form: @form, f: f, conditional: false } %> + <% else %> + <%= render partial: "form/#{question.type}_question", locals: { question: question, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, f: f, conditional: false } %> + <% end %> +
+ <% end %> + + <%= f.hidden_field :page, value: @page.id %> + <% if @case_log.form.is_last_question?(@page, @subsection, @case_log) %> + <%= f.govuk_submit "Submit lettings log", accesskey: "s" %> + <%else %> + <% if !@page.id.include?("value_check") %> + <%= f.govuk_submit "Save and continue", accesskey: "s" %> + <% end %> + <%end %>
- <% end %> +
<% end %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index f47c55cac..279148da0 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -13,7 +13,7 @@ <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-152x152.png'), rel: 'apple-touch-icon', type: 'image/png', size: '152x152' %> <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-167x167.png'), rel: 'apple-touch-icon', type: 'image/png', size: '167x167' %> <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-180x180.png'), rel: 'apple-touch-icon', type: 'image/png', size: '180x180' %> - <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> + <%= stylesheet_link_tag "application" %> <%= javascript_include_tag "vendor/html5shiv.min.js" %> <%= javascript_tag do -%> window.html5.elements = 'output'; @@ -21,7 +21,7 @@ <% end -%> <%= javascript_include_tag "vendor/polyfill-output-value.js" %> <%= javascript_include_tag "vendor/outerHTML.js" %> - <%= javascript_include_tag "application", "data-turbo-track": "reload", defer: true %> + <%= javascript_include_tag "application", defer: true %> <% if content_for?(:head) %> <%= yield(:head) %> diff --git a/package.json b/package.json index e710c0e30..463c20606 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,6 @@ "@babel/plugin-transform-runtime": "^7.17.0", "@babel/preset-env": "^7.16.11", "@hotwired/stimulus": "^3.0.0", - "@hotwired/turbo": "^7.1.0", - "@hotwired/turbo-rails": "^7.1.0", "@stimulus/polyfills": "^2.0.0", "@webcomponents/webcomponentsjs": "^2.6.0", "accessible-autocomplete": "^2.0.3", diff --git a/yarn.lock b/yarn.lock index b8a1d0714..6779bf4eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -926,19 +926,6 @@ resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.0.1.tgz#141f15645acaa3b133b7c247cad58ae252ffae85" integrity sha512-oHsJhgY2cip+K2ED7vKUNd2P+BEswVhrCYcJ802DSsblJFv7mPFVk3cQKvm2vHgHeDVdnj7oOKrBbzp1u8D+KA== -"@hotwired/turbo-rails@^7.1.0": - version "7.1.1" - resolved "https://registry.yarnpkg.com/@hotwired/turbo-rails/-/turbo-rails-7.1.1.tgz#35c03b92b5c86f0137ed08bef843d955ec9bbe83" - integrity sha512-ZXpxUjCfkdbuXfoGrsFK80qsVzACs8xCfie9rt2jMTSN6o1olXVA0Nrk8u02yNEwSiVJm/4QSOa8cUcMj6VQjg== - dependencies: - "@hotwired/turbo" "^7.1.0" - "@rails/actioncable" "^7.0" - -"@hotwired/turbo@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@hotwired/turbo/-/turbo-7.1.0.tgz#27e44e0e3dc5bd1d4bda0766d579cf5a14091cd7" - integrity sha512-Q8kGjqwPqER+CtpQudbH+3Zgs2X4zb6pBAlr6NsKTXadg45pAOvxI9i4QpuHbwSzR2+x87HUm+rot9F/Pe8rxA== - "@jridgewell/resolve-uri@^3.0.3": version "3.0.5" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c" @@ -978,11 +965,6 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@rails/actioncable@^7.0": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@rails/actioncable/-/actioncable-7.0.2.tgz#69a6d999f4087e0537dd38fe0963db1f4305d650" - integrity sha512-G26maXW1Kx0LxQdmNNuNjQlRO/QlXNr3QfuwKiOKb5FZQGYe2OwtHTGXBAjSoiu4dW36XYMT/+L1Wo1Yov4ZXA== - "@stimulus/polyfills@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@stimulus/polyfills/-/polyfills-2.0.0.tgz#64b3e247c762330f80d88e993d1d26b24e3c13b1"