mirror of https://github.com/buster-so/buster.git
BUS-1453: Address PR comments - fix duplicate color and improve org palette query
Co-Authored-By: Dallin Bentley <dallinbentley98@gmail.com>
This commit is contained in:
parent
d5beb5edeb
commit
c4da72173c
|
@ -8,7 +8,7 @@ use uuid::Uuid;
|
||||||
pub const DEFAULT_COLOR_PALETTE: [&str; 10] = [
|
pub const DEFAULT_COLOR_PALETTE: [&str; 10] = [
|
||||||
"#B399FD", "#FC8497", "#FBBC30", "#279EFF",
|
"#B399FD", "#FC8497", "#FBBC30", "#279EFF",
|
||||||
"#E83562", "#41F8FF", "#F3864F", "#C82184",
|
"#E83562", "#41F8FF", "#F3864F", "#C82184",
|
||||||
"#31FCB4", "#E83562"
|
"#31FCB4", "#6B5B95"
|
||||||
];
|
];
|
||||||
|
|
||||||
pub async fn get_organization_color_palette(organization_id: &Uuid) -> Result<Option<Vec<String>>> {
|
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
|
INNER JOIN users_to_organizations ON users.id = users_to_organizations.user_id
|
||||||
WHERE users_to_organizations.organization_id = $1
|
WHERE users_to_organizations.organization_id = $1
|
||||||
AND users_to_organizations.deleted_at IS NULL
|
AND users_to_organizations.deleted_at IS NULL
|
||||||
|
ORDER BY users_to_organizations.role = 'admin' DESC, users_to_organizations.created_at ASC
|
||||||
LIMIT 1"
|
LIMIT 1"
|
||||||
)
|
)
|
||||||
.bind::<diesel::sql_types::Uuid, _>(organization_id)
|
.bind::<diesel::sql_types::Uuid, _>(organization_id)
|
||||||
|
|
Loading…
Reference in New Issue