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

Chore/back nav new #1191

Merged
merged 10 commits into from
Jun 6, 2022
Merged

Chore/back nav new #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7853dd6
Add workflow_history attribute and next/previous methods
PaulDoyle-DEFRA Jun 1, 2022
19d284e
Change form controllers to use new workflow history metods
PaulDoyle-DEFRA Jun 1, 2022
b1d0c1b
Remove back event from form navigation workflows
PaulDoyle-DEFRA Jun 1, 2022
03f6275
Add workflow_history to do-not-copy-to-registration list of transient…
PaulDoyle-DEFRA Jun 1, 2022
a056a49
Support direct navigation to previous form if token is defined
PaulDoyle-DEFRA Jun 1, 2022
afdf087
Replace bespoke back-navigation paths with single go_back path
PaulDoyle-DEFRA Jun 1, 2022
a7724ec
Add go_back route and remove bespoke form-specific back routes
PaulDoyle-DEFRA Jun 1, 2022
b809f57
New form back-navigation request specs
PaulDoyle-DEFRA Jun 1, 2022
847e04a
Drop hard-wired unit tests for form back-navigation
PaulDoyle-DEFRA Jun 1, 2022
7d880d3
Drop hard-wired unit tests for form back-navigation
PaulDoyle-DEFRA Jun 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/controllers/waste_carriers_engine/forms_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def create(form_class, form)
def go_back
find_or_initialize_transient_registration(params[:token])

@transient_registration.back! if form_matches_state?
@transient_registration.previous_valid_state!
redirect_to_correct_form
end

Expand Down Expand Up @@ -71,7 +71,7 @@ def set_up_form(form_class, form, token, get_request = false)
def submit_form(form, params)
respond_to do |format|
if form.submit(params)
@transient_registration.next!
@transient_registration.next_state!
format.html { redirect_to_correct_form }
true
else
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/waste_carriers_engine/worldpay_forms_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def respond_to_acceptable_payment(action)

if response_is_valid?(action, params)
log_and_send_worldpay_response(true, action)
@transient_registration.next!
@transient_registration.next_state!
redirect_to_correct_form
else
log_and_send_worldpay_response(false, action)
Expand Down
5 changes: 0 additions & 5 deletions app/models/concerns/waste_carriers_engine/can_use_ceased_or_revoked_registration_workflow.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ module CanUseCeasedOrRevokedRegistrationWorkflow
to: :ceased_or_revoked_completed_form

end

event :back do
transitions from: :ceased_or_revoked_confirm_form,
to: :cease_or_revoke_form
end
end
end
end
Expand Down
68 changes: 0 additions & 68 deletions app/models/concerns/waste_carriers_engine/can_use_edit_registration_workflow.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,74 +189,6 @@ module CanUseEditRegistrationWorkflow
to: :edit_cancelled_form
end

event :back do
# Registration and account
transitions from: :cbd_type_form,
to: :edit_form

# Business details
transitions from: :company_name_form,
to: :edit_form

transitions from: :main_people_form,
to: :edit_form

# Company address
transitions from: :company_postcode_form,
to: :edit_form

transitions from: :company_address_form,
to: :company_postcode_form

transitions from: :company_address_manual_form,
to: :edit_form,
if: :based_overseas?

transitions from: :company_address_manual_form,
to: :company_postcode_form

# Contact details
transitions from: :contact_name_form,
to: :edit_form

transitions from: :contact_phone_form,
to: :edit_form

transitions from: :contact_email_form,
to: :edit_form

# Contact address
transitions from: :contact_postcode_form,
to: :edit_form

transitions from: :contact_address_form,
to: :contact_postcode_form

transitions from: :contact_address_manual_form,
to: :edit_form,
if: :based_overseas?

transitions from: :contact_address_manual_form,
to: :contact_postcode_form

# Complete an edit
transitions from: :declaration_form,
to: :edit_form

transitions from: :edit_payment_summary_form,
to: :declaration_form

transitions from: :edit_bank_transfer_form,
to: :edit_payment_summary_form

transitions from: :worldpay_form,
to: :edit_payment_summary_form

# Cancelling the edit process
transitions from: :confirm_edit_cancelled_form,
to: :edit_form
end

event :skip_to_manual_address do
transitions from: :company_postcode_form,
to: :company_address_manual_form
Expand Down
164 changes: 0 additions & 164 deletions app/models/concerns/waste_carriers_engine/can_use_new_registration_workflow.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,170 +283,6 @@ module CanUseNewRegistrationWorkflow
end

# Transitions
event :back do
transitions from: :location_form, to: :start_form

transitions from: :renew_registration_form, to: :start_form

# Location

transitions from: :location_form, to: :renewal_start_form

transitions from: :register_in_northern_ireland_form, to: :location_form

transitions from: :register_in_scotland_form, to: :location_form

transitions from: :register_in_wales_form, to: :location_form

# End location

transitions from: :business_type_form, to: :register_in_northern_ireland_form,
if: :should_register_in_northern_ireland?

transitions from: :business_type_form, to: :register_in_scotland_form,
if: :should_register_in_scotland?

transitions from: :business_type_form, to: :register_in_wales_form,
if: :should_register_in_wales?

transitions from: :business_type_form, to: :location_form

transitions from: :check_your_tier_form, to: :location_form,
if: :overseas?

transitions from: :check_your_tier_form, to: :business_type_form

# Smart answers
transitions from: :company_name_form, to: :check_your_tier_form,
if: :check_your_tier_lower?

transitions from: :company_name_form, to: :your_tier_form,
if: :lower_tier?

transitions from: :company_name_form, to: :main_people_form,
if: :skip_registration_number?

transitions from: :company_name_form, to: :check_registered_company_name_form

transitions from: :your_tier_form, to: :business_type_form,
if: :switch_to_lower_tier_based_on_business_type?

transitions from: :your_tier_form, to: :check_your_tier_form,
unless: :check_your_tier_unknown?

transitions from: :your_tier_form, to: :construction_demolition_form,
if: %i[lower_tier? only_carries_own_waste?]

transitions from: :your_tier_form, to: :waste_types_form,
if: %i[lower_tier? waste_is_main_service?]

transitions from: :your_tier_form, to: :construction_demolition_form,
if: %i[lower_tier?]

transitions from: :check_registered_company_name_form, to: :registration_number_form

transitions from: :incorrect_company_form, to: :check_registered_company_name_form

transitions from: :other_businesses_form, to: :check_your_tier_form

transitions from: :service_provided_form, to: :other_businesses_form

transitions from: :waste_types_form, to: :service_provided_form

transitions from: :construction_demolition_form, to: :other_businesses_form,
if: :only_carries_own_waste?

transitions from: :construction_demolition_form, to: :service_provided_form

transitions from: :cbd_type_form, to: :check_your_tier_form,
if: :check_your_tier_upper?

transitions from: :cbd_type_form, to: :your_tier_form

transitions from: :your_tier_form, to: :waste_types_form,
if: :not_only_amf?

transitions from: :your_tier_form, to: :construction_demolition_form

# End smart answers

transitions from: :registration_number_form, to: :cbd_type_form

# Registered address

transitions from: :company_postcode_form, to: :company_name_form

transitions from: :company_address_form, to: :company_postcode_form

transitions from: :company_address_manual_form, to: :company_name_form,
if: :overseas?

transitions from: :company_address_manual_form, to: :company_postcode_form

transitions from: :main_people_form, to: :cbd_type_form,
if: :skip_registration_number?

transitions from: :main_people_form, to: :check_registered_company_name_form

# End registered address

transitions from: :declare_convictions_form, to: :company_address_manual_form,
if: :registered_address_was_manually_entered?

transitions from: :declare_convictions_form, to: :company_address_form

transitions from: :conviction_details_form, to: :declare_convictions_form

transitions from: :contact_name_form, to: :company_address_manual_form,
if: %i[lower_tier? registered_address_was_manually_entered?]

transitions from: :contact_name_form, to: :company_address_form,
if: :lower_tier?

transitions from: :contact_name_form, to: :conviction_details_form,
if: :declared_convictions?

transitions from: :contact_name_form, to: :declare_convictions_form

transitions from: :contact_phone_form, to: :contact_name_form

transitions from: :contact_email_form, to: :contact_phone_form

# Contact address

transitions from: :contact_address_reuse_form, to: :contact_email_form

transitions from: :contact_postcode_form, to: :contact_address_reuse_form

transitions from: :contact_postcode_form, to: :contact_email_form

transitions from: :contact_address_form, to: :contact_postcode_form

transitions from: :contact_address_manual_form, to: :contact_address_reuse_form,
if: :overseas?

transitions from: :contact_address_manual_form, to: :contact_postcode_form

transitions from: :check_your_answers_form, to: :contact_address_manual_form,
if: :contact_address_was_manually_entered?

transitions from: :check_your_answers_form, to: :contact_address_reuse_form,
if: :reuse_registered_address?

transitions from: :check_your_answers_form, to: :contact_address_form

# End contact address

transitions from: :declaration_form, to: :check_your_answers_form

transitions from: :cards_form, to: :declaration_form

transitions from: :payment_summary_form, to: :cards_form

transitions from: :worldpay_form, to: :payment_summary_form

transitions from: :confirm_bank_transfer_form, to: :payment_summary_form
end

event :skip_to_manual_address do
transitions from: :company_postcode_form, to: :company_address_manual_form
Expand Down
13 changes: 0 additions & 13 deletions app/models/concerns/waste_carriers_engine/can_use_order_copy_cards_workflow.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ module CanUseOrderCopyCardsWorkflow
extend ActiveSupport::Concern
include Mongoid::Document

# rubocop:disable Metrics/BlockLength
included do
include AASM

Expand Down Expand Up @@ -39,20 +38,8 @@ module CanUseOrderCopyCardsWorkflow
transitions from: :worldpay_form,
to: :copy_cards_order_completed_form
end

event :back do
transitions from: :copy_cards_payment_form,
to: :copy_cards_form

transitions from: :worldpay_form,
to: :copy_cards_payment_form

transitions from: :copy_cards_bank_transfer_form,
to: :copy_cards_payment_form
end
end
end
# rubocop:enable Metrics/BlockLength

private

Expand Down