From 09102f6999fd9701158b1ad1e81dba5f2b55044b Mon Sep 17 00:00:00 2001
From: timalces <tim.brackfield@alces-software.com>
Date: Tue, 12 Mar 2024 11:32:25 +0000
Subject: [PATCH] always show rack owner label if showing name label in irv

---
 app/javascript/canvas/irv/view/Rack.js      | 4 ++--
 app/javascript/canvas/irv/view/RackSpace.js | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/javascript/canvas/irv/view/Rack.js b/app/javascript/canvas/irv/view/Rack.js
index c958f0df..ceded8a7 100644
--- a/app/javascript/canvas/irv/view/Rack.js
+++ b/app/javascript/canvas/irv/view/Rack.js
@@ -306,14 +306,14 @@ class Rack extends RackObject {
     })();
   }
 
-  draw(show_u_labels, show_name_label, show_owner_label) {
+  draw(show_u_labels, show_name_label) {
     Profiler.begin(Profiler.DEBUG, this.draw);
     // clear
     for (var asset of Array.from(this.assets)) { RackObject.RACK_GFX.remove(asset); }
     this.assets = [];
 
     // add labels as necessary
-    this.showOwnerLabel(show_owner_label);
+    this.showOwnerLabel(show_name_label);
     this.showNameLabel(show_name_label);
     this.showULabels(show_u_labels);
 
diff --git a/app/javascript/canvas/irv/view/RackSpace.js b/app/javascript/canvas/irv/view/RackSpace.js
index 1702796d..c08fe6f6 100644
--- a/app/javascript/canvas/irv/view/RackSpace.js
+++ b/app/javascript/canvas/irv/view/RackSpace.js
@@ -539,9 +539,8 @@ class RackSpace {
 
     const show_u_labels = this.scale >= RackSpace.U_LBL_SCALE_CUTOFF;
     const show_name_label = this.scale >= RackSpace.NAME_LBL_SCALE_CUTOFF;
-    const show_owner_label = show_name_label;
     if (this.model.showingRacks()) {
-      for (var rack of Array.from(this.racks)) { rack.draw(show_u_labels, show_name_label, show_owner_label); }
+      for (var rack of Array.from(this.racks)) { rack.draw(show_u_labels, show_name_label); }
       this.updateRackImage();
     }
     if (this.model.showHoldingArea()) {
@@ -1013,11 +1012,10 @@ class RackSpace {
   evHalfFlipped(img_id) {
     const show_u_labels   = this.scale >= RackSpace.U_LBL_SCALE_CUTOFF;
     const show_name_label = this.scale >= RackSpace.NAME_LBL_SCALE_CUTOFF;
-    const show_owner_label = show_name_label;
 
     // redraw the rack in the (hidden) rack layer, since the rack image in the fx layer is a slice of the rack layer it will automatically
     // reflect the changes
-    this.rackLookup[img_id].draw(show_u_labels, show_name_label, show_owner_label);
+    this.rackLookup[img_id].draw(show_u_labels, show_name_label);
 
     const x     = this.fx.getAttribute(img_id, 'x');
     const width = this.fx.getAttribute(img_id, 'sliceWidth');