From c4da72173cbc643333103feccfaeefcc215c9943 Mon Sep 17 00:00:00 2001
From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Date: Fri, 18 Jul 2025 21:00:36 +0000
Subject: [PATCH] BUS-1453: Address PR comments - fix duplicate color and
 improve org palette query

Co-Authored-By: Dallin Bentley <dallinbentley98@gmail.com>
---
 apps/api/libs/handlers/src/metrics/color_palette_helpers.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/api/libs/handlers/src/metrics/color_palette_helpers.rs b/apps/api/libs/handlers/src/metrics/color_palette_helpers.rs
index 264eaa1cb..d1bf35a3f 100644
--- a/apps/api/libs/handlers/src/metrics/color_palette_helpers.rs
+++ b/apps/api/libs/handlers/src/metrics/color_palette_helpers.rs
@@ -8,7 +8,7 @@ use uuid::Uuid;
 pub const DEFAULT_COLOR_PALETTE: [&str; 10] = [
     "#B399FD", "#FC8497", "#FBBC30", "#279EFF", 
     "#E83562", "#41F8FF", "#F3864F", "#C82184", 
-    "#31FCB4", "#E83562"
+    "#31FCB4", "#6B5B95"
 ];
 
 pub async fn get_organization_color_palette(organization_id: &Uuid) -> Result<Option<Vec<String>>> {
@@ -19,6 +19,7 @@ pub async fn get_organization_color_palette(organization_id: &Uuid) -> Result<Op
          INNER JOIN users_to_organizations ON users.id = users_to_organizations.user_id
          WHERE users_to_organizations.organization_id = $1 
          AND users_to_organizations.deleted_at IS NULL
+         ORDER BY users_to_organizations.role = 'admin' DESC, users_to_organizations.created_at ASC
          LIMIT 1"
     )
     .bind::<diesel::sql_types::Uuid, _>(organization_id)