Update organisation labels to show when deleted

app/components/lettings_log_summary_component.html.erb

@@ -33,13 +33,13 @@
           <% if log.owning_organisation %>
             <div class="app-metadata__item">
               <dt class="app-metadata__term">Owned by</dt>
-              <dd class="app-metadata__definition"><%= log.owning_organisation&.name %></dd>
+              <dd class="app-metadata__definition"><%= organisation_label(log.owning_organisation) %></dd>
             </div>
           <% end %>
           <% if log.managing_organisation %>
             <div class="app-metadata__item">
               <dt class="app-metadata__term">Managed by</dt>
-              <dd class="app-metadata__definition"><%= log.managing_organisation&.name %></dd>
+              <dd class="app-metadata__definition"><%= organisation_label(log.managing_organisation) %></dd>
             </div>
           <% end %>
         </dl>

app/components/lettings_log_summary_component.rb

@@ -10,4 +10,10 @@ class LettingsLogSummaryComponent < ViewComponent::Base
   def log_status
     helpers.status_tag(log.status)
   end
+
+  def organisation_label(organisation)
+    return unless organisation
+
+    organisation.status == :deleted ? "#{organisation.name} (deleted)" : organisation.name
+  end
 end

app/components/sales_log_summary_component.html.erb

@@ -26,13 +26,13 @@
           <% if log.owning_organisation %>
             <div class="app-metadata__item">
               <dt class="app-metadata__term">Owned by</dt>
-              <dd class="app-metadata__definition"><%= log.owning_organisation&.name %></dd>
+              <dd class="app-metadata__definition"><%= organisation_label(log.owning_organisation) %></dd>
             </div>
           <% end %>
           <% if log.managing_organisation %>
             <div class="app-metadata__item">
               <dt class="app-metadata__term">Reported by</dt>
-              <dd class="app-metadata__definition"><%= log.managing_organisation&.name %></dd>
+              <dd class="app-metadata__definition"><%= organisation_label(log.managing_organisation) %></dd>
             </div>
           <% end %>
         </dl>

app/components/sales_log_summary_component.rb

@@ -10,4 +10,10 @@ class SalesLogSummaryComponent < ViewComponent::Base
   def log_status
     helpers.status_tag(log.status)
   end
+
+  def organisation_label(organisation)
+    return unless organisation
+
+    organisation.status == :deleted ? "#{organisation.name} (deleted)" : organisation.name
+  end
 end

app/models/form/lettings/questions/managing_organisation.rb

@@ -17,7 +17,8 @@ class Form::Lettings::Questions::ManagingOrganisation < ::Form::Question
     return opts unless log
 
     if log.managing_organisation.present?
-      opts = opts.merge({ log.managing_organisation.id => log.managing_organisation.name })
+      org_value = log.managing_organisation.status == :deleted ? "#{log.managing_organisation.name} (deleted)" : log.managing_organisation.name
+      opts = opts.merge({ log.managing_organisation.id => org_value })
     end
 
     if user.support?
@@ -72,7 +73,10 @@ class Form::Lettings::Questions::ManagingOrganisation < ::Form::Question
   end
 
   def answer_label(log, _current_user = nil)
-    Organisation.find_by(id: log.managing_organisation_id)&.name
+    organisation = Organisation.find_by(id: log.managing_organisation_id)
+    return unless organisation
+
+    organisation.status == :deleted ? "#{organisation.name} (deleted)" : organisation.name
   end
 
 private

app/models/form/lettings/questions/stock_owner.rb

@@ -17,7 +17,8 @@ class Form::Lettings::Questions::StockOwner < ::Form::Question
     return answer_opts unless log
 
     if log.owning_organisation_id.present?
-      answer_opts[log.owning_organisation.id] = log.owning_organisation.name
+      org_value = log.owning_organisation.status == :deleted ? "#{log.owning_organisation.name} (deleted)" : log.owning_organisation.name
+      answer_opts[log.owning_organisation.id] = org_value
     end
 
     recently_absorbed_organisations = user.organisation.absorbed_organisations.merged_during_open_collection_period

app/models/form/sales/questions/managing_organisation.rb

@@ -17,7 +17,8 @@ class Form::Sales::Questions::ManagingOrganisation < ::Form::Question
     return opts unless log
 
     if log.managing_organisation.present?
-      opts = opts.merge({ log.managing_organisation.id => log.managing_organisation.name })
+      org_value = log.managing_organisation.status == :deleted ? "#{log.managing_organisation.name} (deleted)" : log.managing_organisation.name
+      opts = opts.merge({ log.managing_organisation.id => org_value })
     end
 
     if user.support?

app/models/form/sales/questions/owning_organisation_id.rb

@@ -17,7 +17,8 @@ class Form::Sales::Questions::OwningOrganisationId < ::Form::Question
     return answer_opts unless log
 
     if log.owning_organisation_id.present?
-      answer_opts[log.owning_organisation.id] = log.owning_organisation.name
+      org_value = log.owning_organisation.status == :deleted ? "#{log.owning_organisation.name} (deleted)" : log.owning_organisation.name
+      answer_opts[log.owning_organisation.id] = org_value
     end
 
     unless user.support?