From ffc3f217cc24fbf2d2c52bdba5a213c87d1ae19f Mon Sep 17 00:00:00 2001
From: Jeff Ohrstrom <johrstrom@osc.edu>
Date: Thu, 14 Nov 2024 13:39:16 -0500
Subject: [PATCH] refactor qos

refactor qos computations so that the return value is a unique
list of qos names that have the appropriate data- attributes
applied to them.
---
 apps/dashboard/app/lib/account_cache.rb | 34 +++++++++++++++----------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/apps/dashboard/app/lib/account_cache.rb b/apps/dashboard/app/lib/account_cache.rb
index 20e8059449..9bb17072b2 100644
--- a/apps/dashboard/app/lib/account_cache.rb
+++ b/apps/dashboard/app/lib/account_cache.rb
@@ -93,27 +93,33 @@ def queues
 
   def dynamic_qos
     Rails.cache.fetch('dynamic_qos', expires_in: 4.hours) do
-      accounts.map do |account|
+      qos_tuples = accounts.map do |account|
         account.qos.map do |qos|
           [account.name, account.cluster, qos]
         end
-      end.flatten(1).map do |tuple|
-        other_accounts = account_names.reject { |acct| acct == tuple[0] }
-        other_clusters = Configuration.job_clusters.reject { |c| c.id.to_s == tuple[1] }
+      end.flatten(1).group_by { |tuple| tuple[2] }
 
-        data = {}.tap do |hash|
-          other_clusters.each do |cluster|
-            hash["data-option-for-cluster-#{cluster.id}"] = false
-          end
+      clusters = Configuration.job_clusters.map { |c| c.id.to_s }
 
-          other_accounts.each do |account|
-            hash["data-option-for-auto-accounts-#{account}"] = false
-          end
+      unique_qos_names.map do |qos|
+        data = {}
+        account_tuples = qos_tuples[qos]
+
+        available_clusters = account_tuples.map { |tuple| tuple[1] }.uniq
+        unavailable_clusters = clusters.reject { |c| available_clusters.include?(c) }
+
+        unavailable_clusters.each do |cluster|
+          data["data-option-for-cluster-#{cluster}"] = false
+        end
+
+        available_accounts = account_tuples.map { |tuple| tuple[0] }.uniq
+        unavailable_accounts = account_names.reject { |c| available_accounts.include?(c) }
+
+        unavailable_accounts.each do |account|
+          data["data-option-for-auto-accounts-#{account}"] = false
         end
 
-        [
-          tuple[2], tuple[2], data
-        ]
+        [qos, qos, data]
       end
     end
   end