Merge pull request #2340 from ministryofjustice/check-your-claim-page…

…-changes

Check your claim page changes

.rubocop_todo.yml

@@ -53,6 +53,7 @@ Metrics/MethodLength:
     - 'app/interfaces/api/helpers/api_helper.rb'
     - 'app/models/ability.rb'
     - 'app/models/allocation.rb'
+    - 'app/models/claim/base_claim.rb'
     - 'app/models/claim/transfer_brain_data_item.rb'
     - 'app/models/claim/transfer_brain_data_item_collection.rb'
     - 'app/models/claims/calculations.rb'

app/assets/stylesheets/v1/application.css.scss

@@ -203,3 +203,25 @@ form{
 
 .highlight { background-color: #ffffca }
 
+a.link-change {
+  float: right;
+  font-size: 19px;
+  line-height: 1.31579;
+  &:hover {
+    color: #2b8cc4;
+  }
+  @media (max-width: 640px) {
+    font-size: 16px;
+    line-height: 1.25;
+  }
+}
+
+a.link-delete {
+  color: #b10e1e;
+  position: relative;
+  padding: .526315em 0em .263157em;
+  border: none;
+  &:hover {
+    color: #df3034;
+  }
+}

app/assets/stylesheets/v1/moj/_forms.scss

@@ -14,11 +14,11 @@ form {
       margin: 20px 0 !important;
     }
   }
+}
 
-  .form-buttons * {
-    margin-right: 10px;
-    display: inline-block;
-  }
+.form-buttons * {
+  margin-right: 10px;
+  display: inline-block;
 }
 
 .expense-group {

app/assets/stylesheets/v1/moj/_tables.scss

@@ -296,4 +296,57 @@ table{
   td {
     padding: em(12, 16) em(20, 16) em(9, 16) 0;
   }
-}
+}
+
+table.summary, table.nested-summary {
+  width: 100%;
+  margin-bottom: 1em;
+  background-color: #fff;
+  border-collapse: collapse;
+  border-top: none;
+
+  caption {
+    @include core-19;
+    font-weight: 700;
+    text-align: left;
+    padding-bottom: $gutter-half/2;
+  }
+
+  thead th {
+    padding-top: $gutter-half;
+    padding-bottom: $gutter-half;
+    vertical-align: bottom;
+  }
+
+  tbody {
+    tr:nth-child(odd) {
+      background: transparent;
+    }
+
+    th {
+      @include core-19;
+      font-weight: 700;
+      color: $text-colour;
+      background: transparent;
+
+      &:first-child {
+        width: 33%;
+        padding-left: 0;
+      }
+    }
+
+    td {
+      @include core-19;
+    }
+  }
+}
+
+table.nested-summary {
+  tbody {
+    tr:last-child {
+      th, td {
+        border-bottom: 0;
+      }
+    }
+  }
+}

app/controllers/external_users/certifications_controller.rb

@@ -1,20 +1,14 @@
 class ExternalUsers::CertificationsController < ExternalUsers::ApplicationController
   before_action :set_claim, only: %i[new create update]
   before_action :redirect_already_certified, only: %i[new create]
+  before_action :redirect_if_not_valid, only: %i[new create]
 
   def new
-    redirect_to external_users_claim_path(@claim), alert: t('shared.certification.alert') if @claim.submitted?
-
-    @claim.force_validation = true
-    if @claim.valid?
-      build_certification
-      track_visit({
-                    url: 'external_user/%{type}/claim/%{action}/certification',
-                    title: '%{action_t} %{type} claim certification'
-                  }, claim_tracking_substitutions)
-    else
-      redirect_to edit_polymorphic_path(@claim), alert: 'Claim is not in a state to be submitted'
-    end
+    build_certification
+    track_visit({
+                  url: 'external_user/%{type}/claim/%{action}/certification',
+                  title: '%{action_t} %{type} claim certification'
+                }, claim_tracking_substitutions)
   end
 
   def create
@@ -38,6 +32,11 @@ def redirect_already_certified
     redirect_to external_users_claim_path(@claim), alert: t('shared.certification.alert') if @claim.submitted?
   end
 
+  def redirect_if_not_valid
+    return if @claim.invalid_steps.empty?
+    redirect_to summary_external_users_claim_path(@claim), alert: t('shared.certification.invalid_claim')
+  end
+
   def notify_legacy_importers
     NotificationQueue::AwsClient.new.send!(@claim)
     Rails.logger.info "Successfully sent #{log_suffix}"

app/controllers/external_users/claims_controller.rb

@@ -17,8 +17,8 @@ class ResourceClassNotDefined < StandardError; end
 
   before_action :set_and_authorize_claim, only: %i[show edit update unarchive clone_rejected destroy summary
                                                    confirmation show_message_controls messages disc_evidence]
-  before_action :redirect_unless_editable, only: %i[edit update]
   before_action :set_form_step, only: %i[edit]
+  before_action :redirect_unless_editable, only: %i[edit update]
   before_action :generate_form_id, only: %i[new edit]
   before_action :initialize_submodel_counts
 
@@ -426,7 +426,7 @@ def submitting_to_laa?
   end
 
   def continue_claim?
-    params.key?(:commit_continue) || params.key?(:commit_stage_1)
+    params.key?(:commit_continue)
   end
 
   def render_action_with_resources(action)
@@ -448,7 +448,7 @@ def redirect_to_next_step
                   title: '%{action_t} %{type} claim page %{step}'
                 }, claim_tracking_substitutions)
 
-    redirect_to edit_polymorphic_path(@claim, step: @claim.next_step!)
+    redirect_to edit_polymorphic_path(@claim, step: @claim.next_step)
   end
 
   def render_or_redirect(result)
@@ -506,7 +506,26 @@ def claim_tracking_substitutions
   end
 
   def redirect_unless_editable
-    return if @claim.editable?
-    redirect_to external_users_claims_url, notice: 'Can only edit "draft" claims'
+    return if @claim.current_step_editable?
+    error_code = !@claim.editable? ? :not_editable : :dependencies_missing
+    options = redirect_options_for(error_code)
+    redirect_to options[:url], alert: options[:message]
+  end
+
+  def redirect_options_for(error_code)
+    {
+      not_editable: {
+        url: external_users_claims_url,
+        message: t('errors.not_editable', scope: default_scope)
+      },
+      dependencies_missing: {
+        url: summary_external_users_claim_path(@claim),
+        message: t('errors.dependencies_missing', scope: default_scope)
+      }
+    }[error_code&.to_sym]
+  end
+
+  def default_scope
+    %i[external_users claims]
   end
 end

app/helpers/external_users/claims_helper.rb

@@ -60,4 +60,15 @@ def supplier_number_hint
       'Admin users can add more LGFS supplier numbers on the Manage provider page'
     end
   end
+
+  def external_users_claim_path_for_state(claim)
+    claim.draft? ? summary_external_users_claim_path(claim) : external_users_claim_path(claim)
+  end
+
+  def url_for_referrer(referrer, claim)
+    return unless claim
+    {
+      'summary' => summary_external_users_claim_path(claim)
+    }[referrer.to_s]
+  end
 end

app/models/claim/advocate_claim.rb

@@ -101,22 +101,32 @@ class AdvocateClaim < BaseClaim
             condition: ->(claim) { !claim.fixed_fee_case? }
           },
           {
-            to_stage: :basic_and_fixed_fees,
+            to_stage: :fixed_fees,
             condition: ->(claim) { claim.fixed_fee_case? }
           }
-        ]
+        ],
+        dependencies: %i[case_details]
       },
       {
         name: :offence_details,
         transitions: [
-          { to_stage: :basic_and_fixed_fees }
-        ]
+          { to_stage: :basic_fees }
+        ],
+        dependencies: %i[case_details defendants]
       },
       {
-        name: :basic_and_fixed_fees,
+        name: :basic_fees,
         transitions: [
           { to_stage: :miscellaneous_fees }
-        ]
+        ],
+        dependencies: %i[case_details defendants offence_details]
+      },
+      {
+        name: :fixed_fees,
+        transitions: [
+          { to_stage: :miscellaneous_fees }
+        ],
+        dependencies: %i[case_details defendants]
       },
       {
         name: :miscellaneous_fees,
@@ -138,7 +148,7 @@ def assign_total_attrs
       # left it here mostly to ensure the new changes do
       # not impact anything API related
       return if from_api?
-      assign_fees_total(%i[basic fixed misc]) if fees_changed?
+      assign_fees_total(%i[basic_fees fixed_fees misc_fees]) if fees_changed?
       assign_expenses_total if expenses_changed?
       return unless total_changes_required?
       assign_total
@@ -161,10 +171,6 @@ def fixed_fees_changed?
       fixed_fees.any?(&:changed?)
     end
 
-    def expenses_changed?
-      expenses.any?(&:changed?)
-    end
-
     def eligible_case_types
       CaseType.agfs
     end

app/models/claim/advocate_interim_claim.rb

@@ -24,27 +24,23 @@ class AdvocateInterimClaim < BaseClaim
       {
         name: :defendants,
         transitions: [
-          {
-            to_stage: :offence_details,
-            condition: ->(claim) { !claim.fixed_fee_case? }
-          },
-          {
-            to_stage: :basic_and_fixed_fees,
-            condition: ->(claim) { claim.fixed_fee_case? }
-          }
-        ]
+          { to_stage: :offence_details }
+        ],
+        dependencies: %i[case_details]
       },
       {
         name: :offence_details,
         transitions: [
           { to_stage: :interim_fees }
-        ]
+        ],
+        dependencies: %i[case_details defendants]
       },
       {
         name: :interim_fees,
         transitions: [
           { to_stage: :travel_expenses }
-        ]
+        ],
+        dependencies: %i[case_details defendants offence_details]
       },
       {
         name: :travel_expenses,

app/models/claim/base_claim.rb

@@ -222,10 +222,38 @@ def step_back?
       previous_step.present?
     end
 
+    def next_step?
+      next_step.present?
+    end
+
+    def invalid_steps
+      @invalid_steps ||= Claims::ValidateAllSteps.call(self)
+    end
+
+    def accessible_step?(step)
+      full_submission_flow.include?(step)
+    end
+
+    def editable_step?(step)
+      Claims::CheckStepEditability.call(self, step).valid?
+    end
+
+    def current_step_editable?
+      editable_step?(current_step)
+    end
+
+    def missing_dependencies_for(step)
+      Claims::CheckStepEditability.call(self, step).invalid_dependencies
+    end
+
     def misc_fees_changed?
       misc_fees.any?(&:changed?)
     end
 
+    def expenses_changed?
+      expenses.any?(&:changed?)
+    end
+
     # Override the corresponding method in the subclass
     def agfs?
       false
@@ -436,14 +464,23 @@ def submission_current_flow
       submission_stages.path_until(form_step)
     end
 
+    def full_submission_flow
+      submission_stages.path_until(submission_stages.last&.to_sym)
+    end
+
     def previous_step
       return unless form_step
-      submission_stages.previous_stage(form_step)
+      submission_stages.previous_stage(form_step)&.to_sym
+    end
+
+    def next_step
+      return unless form_step
+      submission_stages.next_stage(form_step)&.to_sym
     end
 
     def next_step!
       return unless form_step
-      self.form_step = submission_stages.next_stage(form_step)
+      self.form_step = next_step
     end
 
     def from_api?
@@ -552,6 +589,7 @@ def self.fee_associations
     end
 
     def disk_evidence_reference
+      return unless case_number && id
       "#{case_number}/#{id}"
     end