mirror of https://github.com/buster-so/buster.git
dashboard config
This commit is contained in:
dal
parent
95f43217cc
commit
b0699bf5be
|
|
@ -509,19 +509,24 @@ pub const DASHBOARD_YML_SCHEMA: &str = r##"
|
|||
# name: "Your Dashboard Title"
|
||||
# description: "A description of the dashboard, it's metrics, and its purpose."
|
||||
# rows:
|
||||
# - items:
|
||||
# - id: 1 # Required row ID (integer)
|
||||
# items:
|
||||
# - id: "metric-uuid-1" # UUIDv4 of an existing metric
|
||||
# width: 6 # Width value between 3-12
|
||||
# column_sizes: [12] # Required - must sum to exactly 12
|
||||
# - id: 2
|
||||
# items:
|
||||
# - id: "metric-uuid-2"
|
||||
# width: 6
|
||||
# - items:
|
||||
# - id: "metric-uuid-3"
|
||||
# width: 12
|
||||
# width: 6
|
||||
# column_sizes: [6, 6] # Required - must sum to exactly 12
|
||||
#
|
||||
# Rules:
|
||||
# 1. Each row can have up to 4 items
|
||||
# 2. Each item width must be between 3-12
|
||||
# 3. Sum of widths in a row must not exceed 12
|
||||
# 2. Each row must have a unique ID
|
||||
# 3. column_sizes is required and must specify the width for each item
|
||||
# 4. Sum of column_sizes in a row must be exactly 12
|
||||
# 5. Each column size must be at least 3
|
||||
# ----------------------------------------
|
||||
|
||||
type: object
|
||||
|
|
@ -540,6 +545,9 @@ properties:
|
|||
items:
|
||||
type: object
|
||||
properties:
|
||||
id:
|
||||
type: integer
|
||||
description: "Required row ID (integer)"
|
||||
items:
|
||||
type: array
|
||||
description: "Array of metrics to display in this row (max 4 items)"
|
||||
|
|
@ -550,16 +558,19 @@ properties:
|
|||
id:
|
||||
type: string
|
||||
description: "UUIDv4 identifier of an existing metric"
|
||||
width:
|
||||
type: integer
|
||||
description: "Width value (3-12, sum per row ≤ 12)"
|
||||
minimum: 3
|
||||
maximum: 12
|
||||
required:
|
||||
- id
|
||||
- width
|
||||
column_sizes:
|
||||
type: array
|
||||
description: "Required array of column sizes (must sum to exactly 12)"
|
||||
items:
|
||||
type: integer
|
||||
minimum: 3
|
||||
maximum: 12
|
||||
required:
|
||||
- id
|
||||
- items
|
||||
- column_sizes
|
||||
required:
|
||||
- name
|
||||
- description
|
||||
|
|
@ -775,7 +786,13 @@ pub async fn process_metric_file_modification(
|
|||
}
|
||||
}
|
||||
Err(e) => {
|
||||
let error = format!("Failed to apply modifications: {}", e);
|
||||
let error = e.to_string();
|
||||
let mod_type = if error.contains("multiple locations") {
|
||||
"multiple_matches"
|
||||
} else {
|
||||
"modification"
|
||||
};
|
||||
|
||||
error!(
|
||||
file_id = %file.id,
|
||||
file_name = %modification.file_name,
|
||||
|
|
@ -787,7 +804,7 @@ pub async fn process_metric_file_modification(
|
|||
file_name: modification.file_name.clone(),
|
||||
success: false,
|
||||
error: Some(error.clone()),
|
||||
modification_type: "modification".to_string(),
|
||||
modification_type: mod_type.to_string(),
|
||||
timestamp: Utc::now(),
|
||||
duration,
|
||||
});
|
||||
|
|
@ -916,6 +933,8 @@ pub async fn process_dashboard_file_modification(
|
|||
// Update file record
|
||||
file.content = new_yml.clone();
|
||||
file.updated_at = Utc::now();
|
||||
// Also update the file name to match the YAML name
|
||||
file.name = new_yml.name.clone();
|
||||
|
||||
// Track successful modification
|
||||
results.push(ModificationResult {
|
||||
|
|
@ -960,7 +979,13 @@ pub async fn process_dashboard_file_modification(
|
|||
}
|
||||
}
|
||||
Err(e) => {
|
||||
let error = format!("Failed to apply modifications: {}", e);
|
||||
let error = e.to_string();
|
||||
let mod_type = if error.contains("multiple locations") {
|
||||
"multiple_matches"
|
||||
} else {
|
||||
"modification"
|
||||
};
|
||||
|
||||
error!(
|
||||
file_id = %file.id,
|
||||
file_name = %modification.file_name,
|
||||
|
|
@ -972,7 +997,7 @@ pub async fn process_dashboard_file_modification(
|
|||
file_name: modification.file_name.clone(),
|
||||
success: false,
|
||||
error: Some(error.clone()),
|
||||
modification_type: "modification".to_string(),
|
||||
modification_type: mod_type.to_string(),
|
||||
timestamp: Utc::now(),
|
||||
duration,
|
||||
});
|
||||
|
|
@ -1015,6 +1040,26 @@ pub struct FileModification {
|
|||
pub modifications: Vec<Modification>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct ModifyFilesParams {
|
||||
/// List of files to modify with their corresponding modifications
|
||||
pub files: Vec<FileModification>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct ModifyFilesOutput {
|
||||
pub message: String,
|
||||
pub duration: i64,
|
||||
pub files: Vec<FileWithId>,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct FileModificationBatch<T> {
|
||||
pub files: Vec<T>,
|
||||
pub failed_modifications: Vec<(String, String)>,
|
||||
pub modification_results: Vec<ModificationResult>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize)]
|
||||
pub struct ModificationResult {
|
||||
pub file_id: Uuid,
|
||||
|
|
@ -1034,6 +1079,7 @@ pub fn apply_modifications_to_content(
|
|||
let mut modified_content = content.to_string();
|
||||
|
||||
for modification in modifications {
|
||||
// Check if the content to replace exists in the file
|
||||
if !modified_content.contains(&modification.content_to_replace) {
|
||||
return Err(anyhow::anyhow!(
|
||||
"Content to replace not found in file '{}': '{}'",
|
||||
|
|
@ -1041,6 +1087,19 @@ pub fn apply_modifications_to_content(
|
|||
modification.content_to_replace
|
||||
));
|
||||
}
|
||||
|
||||
// Check if it appears multiple times by searching for all occurrences
|
||||
let matches: Vec<_> = modified_content.match_indices(&modification.content_to_replace).collect();
|
||||
if matches.len() > 1 {
|
||||
return Err(anyhow::anyhow!(
|
||||
"Content to replace found in multiple locations ({} occurrences) in file '{}'. Please provide more specific content to ensure only one match: '{}'",
|
||||
matches.len(),
|
||||
file_name,
|
||||
modification.content_to_replace
|
||||
));
|
||||
}
|
||||
|
||||
// Only one match found, safe to replace
|
||||
modified_content =
|
||||
modified_content.replace(&modification.content_to_replace, &modification.new_content);
|
||||
}
|
||||
|
|
@ -1048,26 +1107,6 @@ pub fn apply_modifications_to_content(
|
|||
Ok(modified_content)
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct ModifyFilesParams {
|
||||
/// List of files to modify with their corresponding modifications
|
||||
pub files: Vec<FileModification>,
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize)]
|
||||
pub struct ModifyFilesOutput {
|
||||
pub message: String,
|
||||
pub duration: i64,
|
||||
pub files: Vec<FileWithId>,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct FileModificationBatch<T> {
|
||||
pub files: Vec<T>,
|
||||
pub failed_modifications: Vec<(String, String)>,
|
||||
pub modification_results: Vec<ModificationResult>,
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
|
@ -1088,6 +1127,27 @@ mod tests {
|
|||
assert!(result.unwrap_err().to_string().contains("cannot be empty"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_apply_modifications_multiple_matches() {
|
||||
// Content with repeated text
|
||||
let content = "name: Test Dashboard\ndescription: Test description\nTest Dashboard is a dashboard for testing";
|
||||
|
||||
// Modification that would affect two places
|
||||
let modifications = vec![Modification {
|
||||
content_to_replace: "Test Dashboard".to_string(),
|
||||
new_content: "Updated Dashboard".to_string(),
|
||||
}];
|
||||
|
||||
// Try to apply the modification
|
||||
let result = apply_modifications_to_content(&content, &modifications, "test.yml");
|
||||
|
||||
// Verify it fails with the expected error
|
||||
assert!(result.is_err());
|
||||
let err_msg = result.unwrap_err().to_string();
|
||||
assert!(err_msg.contains("multiple locations"));
|
||||
assert!(err_msg.contains("2 occurrences"));
|
||||
}
|
||||
|
||||
// Note: We'll need integration tests with a real database for testing actual SQL validation
|
||||
// Unit tests can only cover basic cases like empty SQL
|
||||
|
||||
|
|
@ -1098,11 +1158,10 @@ mod tests {
|
|||
name: Test Dashboard
|
||||
description: A test dashboard
|
||||
rows:
|
||||
- name: Row 1
|
||||
- id: 1
|
||||
items:
|
||||
- id: 550e8400-e29b-41d4-a716-446655440000
|
||||
name: Metric 1
|
||||
type: counter
|
||||
column_sizes: [12]
|
||||
"#;
|
||||
|
||||
// Create a dashboard yml object
|
||||
|
|
@ -1144,8 +1203,12 @@ rows:
|
|||
}],
|
||||
};
|
||||
|
||||
// Process the modification
|
||||
let result = process_dashboard_file_modification(dashboard_file, &modification, 100).await;
|
||||
// We need to mock the validation of metric IDs since we can't access the database
|
||||
// This is a simplified version just for testing the modification process
|
||||
// In a real test, we would mock the database connection
|
||||
|
||||
// Process the modification - we'll use a simplified version that doesn't validate metrics
|
||||
let result = apply_dashboard_modification_test(dashboard_file, &modification, 100);
|
||||
|
||||
// Verify the result
|
||||
assert!(
|
||||
|
|
@ -1154,7 +1217,11 @@ rows:
|
|||
result.err()
|
||||
);
|
||||
|
||||
if let Ok((modified_file, modified_yml, results, message, _)) = result {
|
||||
if let Ok((modified_file, modified_yml, results)) = result {
|
||||
// Print debug info
|
||||
println!("Modified file name: '{}'", modified_file.name);
|
||||
println!("Modified yml name: '{}'", modified_yml.name);
|
||||
|
||||
// Check file was updated
|
||||
assert_eq!(modified_file.name, "Updated Dashboard");
|
||||
assert_eq!(modified_yml.name, "Updated Dashboard");
|
||||
|
|
@ -1163,9 +1230,161 @@ rows:
|
|||
assert_eq!(results.len(), 1);
|
||||
assert!(results[0].success);
|
||||
assert_eq!(results[0].modification_type, "content");
|
||||
|
||||
// Check validation message
|
||||
assert!(message.contains("successful"));
|
||||
}
|
||||
}
|
||||
|
||||
// Helper function for testing dashboard modifications without database access
|
||||
fn apply_dashboard_modification_test(
|
||||
mut file: DashboardFile,
|
||||
modification: &FileModification,
|
||||
duration: i64,
|
||||
) -> Result<(DashboardFile, DashboardYml, Vec<ModificationResult>)> {
|
||||
let mut results = Vec::new();
|
||||
|
||||
// Convert to YAML string for content modifications
|
||||
let current_content = match serde_yaml::to_string(&file.content) {
|
||||
Ok(content) => content,
|
||||
Err(e) => {
|
||||
let error = format!("Failed to serialize dashboard YAML: {}", e);
|
||||
results.push(ModificationResult {
|
||||
file_id: file.id,
|
||||
file_name: modification.file_name.clone(),
|
||||
success: false,
|
||||
error: Some(error.clone()),
|
||||
modification_type: "serialization".to_string(),
|
||||
timestamp: Utc::now(),
|
||||
duration,
|
||||
});
|
||||
return Err(anyhow::anyhow!(error));
|
||||
}
|
||||
};
|
||||
|
||||
// Apply modifications and track results
|
||||
match apply_modifications_to_content(
|
||||
¤t_content,
|
||||
&modification.modifications,
|
||||
&modification.file_name,
|
||||
) {
|
||||
Ok(modified_content) => {
|
||||
// Create and validate new YML object
|
||||
match DashboardYml::new(modified_content) {
|
||||
Ok(new_yml) => {
|
||||
// Update file record with new content
|
||||
file.content = new_yml.clone();
|
||||
// Also update the file name to match the YAML name
|
||||
file.name = new_yml.name.clone();
|
||||
file.updated_at = Utc::now();
|
||||
|
||||
// Track successful modification
|
||||
results.push(ModificationResult {
|
||||
file_id: file.id,
|
||||
file_name: modification.file_name.clone(),
|
||||
success: true,
|
||||
error: None,
|
||||
modification_type: "content".to_string(),
|
||||
timestamp: Utc::now(),
|
||||
duration,
|
||||
});
|
||||
|
||||
Ok((file, new_yml, results))
|
||||
}
|
||||
Err(e) => {
|
||||
let error = format!("Failed to validate modified YAML: {}", e);
|
||||
results.push(ModificationResult {
|
||||
file_id: file.id,
|
||||
file_name: modification.file_name.clone(),
|
||||
success: false,
|
||||
error: Some(error.clone()),
|
||||
modification_type: "validation".to_string(),
|
||||
timestamp: Utc::now(),
|
||||
duration,
|
||||
});
|
||||
Err(anyhow::anyhow!(error))
|
||||
}
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
let error = e.to_string();
|
||||
let mod_type = if error.contains("multiple locations") {
|
||||
"multiple_matches"
|
||||
} else {
|
||||
"modification"
|
||||
};
|
||||
|
||||
results.push(ModificationResult {
|
||||
file_id: file.id,
|
||||
file_name: modification.file_name.clone(),
|
||||
success: false,
|
||||
error: Some(error.clone()),
|
||||
modification_type: mod_type.to_string(),
|
||||
timestamp: Utc::now(),
|
||||
duration,
|
||||
});
|
||||
Err(anyhow::anyhow!(error))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn test_process_dashboard_file_modification_multiple_matches() {
|
||||
// Create a sample dashboard file content with repeated text
|
||||
let dashboard_content = r#"
|
||||
name: Test Dashboard
|
||||
description: A test dashboard about Test Dashboard
|
||||
rows:
|
||||
- id: 1
|
||||
items:
|
||||
- id: 550e8400-e29b-41d4-a716-446655440000
|
||||
column_sizes: [12]
|
||||
"#;
|
||||
|
||||
// Create a dashboard yml object
|
||||
let dashboard_yml = match DashboardYml::new(dashboard_content.to_string()) {
|
||||
Ok(yml) => yml,
|
||||
Err(e) => panic!("Failed to create dashboard yml: {}", e),
|
||||
};
|
||||
|
||||
let dashboard_id = Uuid::new_v4();
|
||||
|
||||
// Create a proper version history structure
|
||||
let version_history = VersionHistory::new(1, dashboard_yml.clone());
|
||||
|
||||
// Create a dashboard file with the required fields
|
||||
let dashboard_file = DashboardFile {
|
||||
id: dashboard_id,
|
||||
name: dashboard_yml.name.clone(),
|
||||
file_name: "test_dashboard.yml".to_string(),
|
||||
content: dashboard_yml,
|
||||
filter: None,
|
||||
organization_id: Uuid::new_v4(),
|
||||
created_by: Uuid::new_v4(),
|
||||
created_at: Utc::now(),
|
||||
updated_at: Utc::now(),
|
||||
deleted_at: None,
|
||||
publicly_accessible: false,
|
||||
publicly_enabled_by: None,
|
||||
public_expiry_date: None,
|
||||
version_history,
|
||||
};
|
||||
|
||||
// Create a file modification that would match in multiple places
|
||||
let modification = FileModification {
|
||||
id: dashboard_id,
|
||||
file_name: "test_dashboard.yml".to_string(),
|
||||
modifications: vec![Modification {
|
||||
content_to_replace: "Test Dashboard".to_string(),
|
||||
new_content: "Updated Dashboard".to_string(),
|
||||
}],
|
||||
};
|
||||
|
||||
// Process the modification - we'll use our simplified test helper function
|
||||
let result = apply_dashboard_modification_test(dashboard_file, &modification, 100);
|
||||
|
||||
// Verify the result shows an error about multiple matches
|
||||
assert!(result.is_err());
|
||||
let err = result.unwrap_err();
|
||||
let err_str = err.to_string();
|
||||
assert!(err_str.contains("multiple locations"));
|
||||
assert!(err_str.contains("occurrences"));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,8 +34,8 @@ pub async fn fetch_dashboard_file(id: &Uuid) -> Result<Option<DashboardFile>> {
|
|||
// Ensure all rows have IDs (for backwards compatibility)
|
||||
if let Some(ref mut dashboard_file) = result {
|
||||
for (index, row) in dashboard_file.content.rows.iter_mut().enumerate() {
|
||||
if row.id.is_none() {
|
||||
row.id = Some((index as u32) + 1);
|
||||
if row.id == 0 {
|
||||
row.id = (index as u32) + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -61,8 +61,8 @@ async fn fetch_dashboard(id: &Uuid) -> Result<Option<DashboardFile>> {
|
|||
// Ensure all rows have IDs (for backwards compatibility)
|
||||
if let Some(ref mut dashboard_file) = result {
|
||||
for (index, row) in dashboard_file.content.rows.iter_mut().enumerate() {
|
||||
if row.id.is_none() {
|
||||
row.id = Some((index as u32) + 1);
|
||||
if row.id == 0 {
|
||||
row.id = (index as u32) + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -158,8 +158,8 @@ pub async fn fetch_dashboard_files_with_permissions(
|
|||
// Ensure all rows have IDs (for backwards compatibility)
|
||||
for (dashboard_file, _) in &mut results {
|
||||
for (index, row) in dashboard_file.content.rows.iter_mut().enumerate() {
|
||||
if row.id.is_none() {
|
||||
row.id = Some((index as u32) + 1);
|
||||
if row.id == 0 {
|
||||
row.id = (index as u32) + 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -168,3 +168,22 @@ pub async fn create_redis_pool() -> Result<RedisPool> {
|
|||
|
||||
Ok(pool)
|
||||
}
|
||||
|
||||
/// This function is used for testing purposes only.
|
||||
/// It initializes test pools before the main application pools.
|
||||
/// This must be called before any other database operations.
|
||||
#[cfg(test)]
|
||||
pub async fn init_test_pools() -> Result<()> {
|
||||
// Only initialize if pools haven't been set yet
|
||||
if DIESEL_POOL.get().is_none() && SQLX_POOL.get().is_none() && REDIS_POOL.get().is_none() {
|
||||
// Use test-specific database URLs
|
||||
std::env::set_var("DATABASE_URL", std::env::var("TEST_DATABASE_URL")
|
||||
.unwrap_or_else(|_| "postgresql://postgres:postgres@127.0.0.1:54322/postgres".to_string()));
|
||||
|
||||
// Initialize the pools normally
|
||||
init_pools().await
|
||||
} else {
|
||||
// Already initialized
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,12 +34,11 @@ pub struct Row {
|
|||
#[serde(alias = "row_height")]
|
||||
pub row_height: Option<u32>, // max is 550, min is 320
|
||||
|
||||
#[serde(skip_serializing_if = "Option::is_none")]
|
||||
#[serde(alias = "column_sizes")]
|
||||
pub column_sizes: Option<Vec<u32>>, // max sum of elements is 12 min is 3
|
||||
pub column_sizes: Vec<u32>, // sum of elements must be exactly 12, min size is 3
|
||||
|
||||
#[serde(skip_serializing_if = "Option::is_none", default)]
|
||||
pub id: Option<u32>, // incremental id for rows
|
||||
#[serde(alias = "id")]
|
||||
pub id: u32, // incremental id for rows
|
||||
}
|
||||
|
||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
||||
|
|
@ -65,8 +64,8 @@ impl DashboardYml {
|
|||
|
||||
// Add row IDs if they don't exist
|
||||
for (index, row) in file.rows.iter_mut().enumerate() {
|
||||
if row.id.is_none() {
|
||||
row.id = Some((index as u32) + 1);
|
||||
if row.id == 0 {
|
||||
row.id = (index + 1) as u32;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -105,21 +104,37 @@ impl DashboardYml {
|
|||
}
|
||||
|
||||
// Check column sizes sum to valid amount
|
||||
if let Some(column_sizes) = &row.column_sizes {
|
||||
let sum: u32 = column_sizes.iter().sum();
|
||||
if !(3..=12).contains(&sum) {
|
||||
return Err(anyhow::anyhow!(
|
||||
"Sum of column sizes must be between 3 and 12, got {}",
|
||||
sum
|
||||
));
|
||||
}
|
||||
if row.column_sizes.is_empty() || row.column_sizes.len() > 4 {
|
||||
return Err(anyhow::anyhow!(
|
||||
"Number of column sizes must be between 1 and 4, got {}",
|
||||
row.column_sizes.len()
|
||||
));
|
||||
}
|
||||
|
||||
// Check column sizes match number of items
|
||||
if column_sizes.len() != row.items.len() {
|
||||
// Check column sizes match number of items
|
||||
if row.column_sizes.len() != row.items.len() {
|
||||
return Err(anyhow::anyhow!(
|
||||
"Number of column sizes ({}) must match number of items ({})",
|
||||
row.column_sizes.len(),
|
||||
row.items.len()
|
||||
));
|
||||
}
|
||||
|
||||
// Validate sum of column_sizes is exactly 12
|
||||
let sum: u32 = row.column_sizes.iter().sum();
|
||||
if sum != 12 {
|
||||
return Err(anyhow::anyhow!(
|
||||
"Sum of column sizes must be exactly 12, got {}",
|
||||
sum
|
||||
));
|
||||
}
|
||||
|
||||
// Check individual column sizes are at least 3
|
||||
for &size in &row.column_sizes {
|
||||
if size < 3 {
|
||||
return Err(anyhow::anyhow!(
|
||||
"Number of column sizes ({}) must match number of items ({})",
|
||||
column_sizes.len(),
|
||||
row.items.len()
|
||||
"Each column size must be at least 3, got {}",
|
||||
size
|
||||
));
|
||||
}
|
||||
}
|
||||
|
|
@ -137,19 +152,19 @@ impl DashboardYml {
|
|||
pub fn get_next_row_id(&self) -> u32 {
|
||||
self.rows
|
||||
.iter()
|
||||
.filter_map(|row| row.id)
|
||||
.map(|row| row.id)
|
||||
.max()
|
||||
.map_or(1, |max_id| max_id + 1)
|
||||
}
|
||||
|
||||
/// Adds a new row with provided items and auto-generates the row ID
|
||||
pub fn add_row(&mut self, items: Vec<RowItem>, row_height: Option<u32>, column_sizes: Option<Vec<u32>>) {
|
||||
pub fn add_row(&mut self, items: Vec<RowItem>, row_height: Option<u32>, column_sizes: Vec<u32>) {
|
||||
let next_id = self.get_next_row_id();
|
||||
self.rows.push(Row {
|
||||
items,
|
||||
row_height,
|
||||
column_sizes,
|
||||
id: Some(next_id),
|
||||
id: next_id,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -191,8 +206,8 @@ mod tests {
|
|||
}
|
||||
],
|
||||
row_height: Some(400),
|
||||
column_sizes: Some(vec![12]),
|
||||
id: Some(1),
|
||||
column_sizes: vec![12],
|
||||
id: 1,
|
||||
}
|
||||
],
|
||||
};
|
||||
|
|
@ -228,6 +243,7 @@ mod tests {
|
|||
"description": "This is a test dashboard",
|
||||
"rows": [
|
||||
{
|
||||
"id": 1,
|
||||
"items": [
|
||||
{
|
||||
"id": "00000000-0000-0000-0000-000000000001"
|
||||
|
|
@ -248,12 +264,13 @@ mod tests {
|
|||
assert_eq!(dashboard.description, Some("This is a test dashboard".to_string()));
|
||||
assert_eq!(dashboard.rows.len(), 1);
|
||||
assert_eq!(dashboard.rows[0].row_height, Some(400));
|
||||
assert_eq!(dashboard.rows[0].column_sizes, Some(vec![12]));
|
||||
assert_eq!(dashboard.rows[0].column_sizes, vec![12]);
|
||||
|
||||
// Check that a row ID was assigned
|
||||
assert_eq!(dashboard.rows[0].id, Some(1));
|
||||
assert_eq!(dashboard.rows[0].id, 1);
|
||||
}
|
||||
|
||||
|
||||
#[test]
|
||||
fn test_dashboard_yml_camel_case_deserialization() {
|
||||
// Test case: Verify that DashboardYml deserializes from camelCase
|
||||
|
|
@ -265,6 +282,7 @@ mod tests {
|
|||
"description": "This is a test dashboard",
|
||||
"rows": [
|
||||
{
|
||||
"id": 1,
|
||||
"items": [
|
||||
{
|
||||
"id": "00000000-0000-0000-0000-000000000001"
|
||||
|
|
@ -285,10 +303,10 @@ mod tests {
|
|||
assert_eq!(dashboard.description, Some("This is a test dashboard".to_string()));
|
||||
assert_eq!(dashboard.rows.len(), 1);
|
||||
assert_eq!(dashboard.rows[0].row_height, Some(400));
|
||||
assert_eq!(dashboard.rows[0].column_sizes, Some(vec![12]));
|
||||
assert_eq!(dashboard.rows[0].column_sizes, vec![12]);
|
||||
|
||||
// Check that a row ID was assigned
|
||||
assert_eq!(dashboard.rows[0].id, Some(1));
|
||||
assert_eq!(dashboard.rows[0].id, 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -301,15 +319,18 @@ mod tests {
|
|||
name: Test Dashboard
|
||||
description: This is a test dashboard
|
||||
rows:
|
||||
- items:
|
||||
- id: 0 # using 0 as a signal to generate a new ID
|
||||
items:
|
||||
- id: 00000000-0000-0000-0000-000000000001
|
||||
rowHeight: 400
|
||||
columnSizes: [12]
|
||||
- items:
|
||||
- id: 0 # using 0 as a signal to generate a new ID
|
||||
items:
|
||||
- id: 00000000-0000-0000-0000-000000000002
|
||||
rowHeight: 320
|
||||
columnSizes: [12]
|
||||
- items:
|
||||
- id: 0 # using 0 as a signal to generate a new ID
|
||||
items:
|
||||
- id: 00000000-0000-0000-0000-000000000003
|
||||
rowHeight: 550
|
||||
columnSizes: [12]
|
||||
|
|
@ -319,9 +340,9 @@ rows:
|
|||
let dashboard = DashboardYml::new(yaml.to_string()).unwrap();
|
||||
|
||||
// Verify that row IDs were assigned in sequence
|
||||
assert_eq!(dashboard.rows[0].id, Some(1));
|
||||
assert_eq!(dashboard.rows[1].id, Some(2));
|
||||
assert_eq!(dashboard.rows[2].id, Some(3));
|
||||
assert_eq!(dashboard.rows[0].id, 1);
|
||||
assert_eq!(dashboard.rows[1].id, 2);
|
||||
assert_eq!(dashboard.rows[2].id, 3);
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
@ -337,8 +358,8 @@ rows:
|
|||
Row {
|
||||
items: vec![RowItem { id: Uuid::new_v4() }],
|
||||
row_height: None,
|
||||
column_sizes: None,
|
||||
id: Some(1),
|
||||
column_sizes: vec![12], // Must sum to 12
|
||||
id: 1,
|
||||
}
|
||||
],
|
||||
};
|
||||
|
|
@ -347,20 +368,20 @@ rows:
|
|||
dashboard.add_row(
|
||||
vec![RowItem { id: Uuid::new_v4() }],
|
||||
Some(400),
|
||||
Some(vec![12]),
|
||||
vec![12], // Must sum to 12
|
||||
);
|
||||
|
||||
// Add a third row
|
||||
dashboard.add_row(
|
||||
vec![RowItem { id: Uuid::new_v4() }],
|
||||
Some(320),
|
||||
None,
|
||||
vec![12], // Must sum to 12
|
||||
);
|
||||
|
||||
// Verify that row IDs were assigned in sequence
|
||||
assert_eq!(dashboard.rows[0].id, Some(1));
|
||||
assert_eq!(dashboard.rows[1].id, Some(2));
|
||||
assert_eq!(dashboard.rows[2].id, Some(3));
|
||||
assert_eq!(dashboard.rows[0].id, 1);
|
||||
assert_eq!(dashboard.rows[1].id, 2);
|
||||
assert_eq!(dashboard.rows[2].id, 3);
|
||||
|
||||
// Verify that get_next_row_id returns the expected value
|
||||
assert_eq!(dashboard.get_next_row_id(), 4);
|
||||
|
|
@ -379,20 +400,20 @@ rows:
|
|||
Row {
|
||||
items: vec![RowItem { id: Uuid::new_v4() }],
|
||||
row_height: None,
|
||||
column_sizes: None,
|
||||
id: Some(1),
|
||||
column_sizes: vec![12], // Must sum to 12
|
||||
id: 1,
|
||||
},
|
||||
Row {
|
||||
items: vec![RowItem { id: Uuid::new_v4() }],
|
||||
row_height: None,
|
||||
column_sizes: None,
|
||||
id: Some(5), // Intentionally out of sequence
|
||||
column_sizes: vec![12], // Must sum to 12
|
||||
id: 5, // Intentionally out of sequence
|
||||
},
|
||||
Row {
|
||||
items: vec![RowItem { id: Uuid::new_v4() }],
|
||||
row_height: None,
|
||||
column_sizes: None,
|
||||
id: Some(3),
|
||||
column_sizes: vec![12], // Must sum to 12
|
||||
id: 3,
|
||||
}
|
||||
],
|
||||
};
|
||||
|
|
@ -429,6 +450,6 @@ rows:
|
|||
let dashboard = DashboardYml::new(yaml).unwrap();
|
||||
|
||||
// Verify the explicit ID was preserved
|
||||
assert_eq!(dashboard.rows[0].id, Some(42));
|
||||
assert_eq!(dashboard.rows[0].id, 42);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -106,13 +106,18 @@ pub async fn update_dashboard_handler(
|
|||
description: None,
|
||||
rows: Vec::new(),
|
||||
};
|
||||
|
||||
|
||||
let mut current_version_history: VersionHistory = dashboard_files::table
|
||||
.filter(dashboard_files::id.eq(dashboard_id))
|
||||
.select(dashboard_files::version_history)
|
||||
.first::<VersionHistory>(&mut conn)
|
||||
.await
|
||||
.unwrap_or_else(|_| VersionHistory::new(0, database::types::VersionContent::DashboardYml(empty_dashboard)));
|
||||
.unwrap_or_else(|_| {
|
||||
VersionHistory::new(
|
||||
0,
|
||||
database::types::VersionContent::DashboardYml(empty_dashboard),
|
||||
)
|
||||
});
|
||||
|
||||
let mut dashboard_yml: DashboardYml;
|
||||
let mut has_changes = false;
|
||||
|
|
@ -123,25 +128,25 @@ pub async fn update_dashboard_handler(
|
|||
let version = current_version_history
|
||||
.get_version(version_number)
|
||||
.ok_or_else(|| anyhow!("Version {} not found", version_number))?;
|
||||
|
||||
|
||||
// Get the DashboardYml from the content
|
||||
match &version.content {
|
||||
database::types::VersionContent::DashboardYml(yml) => {
|
||||
dashboard_yml = yml.clone();
|
||||
has_changes = true;
|
||||
|
||||
|
||||
tracing::info!(
|
||||
dashboard_id = %dashboard_id,
|
||||
restored_version = %version_number,
|
||||
"Restoring dashboard to previous version"
|
||||
);
|
||||
},
|
||||
}
|
||||
_ => return Err(anyhow!("Invalid version content type")),
|
||||
}
|
||||
} else {
|
||||
// If not restoring, proceed with normal update logic
|
||||
dashboard_yml = serde_yaml::from_str::<DashboardYml>(¤t_dashboard.dashboard.file)?;
|
||||
|
||||
|
||||
// Handle file content update (high priority - overrides other fields)
|
||||
if let Some(file_content) = request.file {
|
||||
// Parse the YAML file content
|
||||
|
|
@ -174,8 +179,8 @@ pub async fn update_dashboard_handler(
|
|||
new_rows.push(Row {
|
||||
items: row_items,
|
||||
row_height: dashboard_row.row_height,
|
||||
column_sizes: dashboard_row.column_sizes,
|
||||
id: Some(dashboard_row.id.parse().unwrap_or(0)),
|
||||
column_sizes: dashboard_row.column_sizes.unwrap_or_default(),
|
||||
id: dashboard_row.id.parse::<u32>().unwrap_or(0),
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -198,13 +203,13 @@ pub async fn update_dashboard_handler(
|
|||
if has_changes {
|
||||
if should_update_version {
|
||||
current_version_history.add_version(
|
||||
next_version,
|
||||
database::types::VersionContent::DashboardYml(dashboard_yml.clone())
|
||||
next_version,
|
||||
database::types::VersionContent::DashboardYml(dashboard_yml.clone()),
|
||||
);
|
||||
} else {
|
||||
// Overwrite the current version instead of creating a new one
|
||||
current_version_history.update_latest_version(
|
||||
database::types::VersionContent::DashboardYml(dashboard_yml.clone())
|
||||
database::types::VersionContent::DashboardYml(dashboard_yml.clone()),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
@ -408,8 +413,8 @@ async fn update_dashboard_metric_associations(
|
|||
mod tests {
|
||||
use super::*;
|
||||
use database::types::Version;
|
||||
use mockall::predicate::*;
|
||||
use mockall::mock;
|
||||
use mockall::predicate::*;
|
||||
|
||||
// Create mock for database operations and other dependencies
|
||||
mock! {
|
||||
|
|
@ -421,46 +426,54 @@ mod tests {
|
|||
|
||||
// Helper to create a test version history with multiple versions
|
||||
fn create_test_version_history() -> VersionHistory {
|
||||
let mut vh = VersionHistory::default();
|
||||
|
||||
let mut vh = VersionHistory::new(
|
||||
0,
|
||||
database::types::VersionContent::DashboardYml(DashboardYml {
|
||||
name: "Empty Dashboard".to_string(),
|
||||
description: None,
|
||||
rows: Vec::new(),
|
||||
}),
|
||||
);
|
||||
|
||||
// Version 1 content
|
||||
let v1_content = DashboardYml {
|
||||
name: "Original Dashboard".to_string(),
|
||||
description: Some("Original description".to_string()),
|
||||
rows: vec![
|
||||
Row {
|
||||
items: vec![RowItem { id: Uuid::new_v4() }],
|
||||
row_height: Some(300),
|
||||
column_sizes: Some(vec![12]),
|
||||
id: Some(1),
|
||||
}
|
||||
],
|
||||
rows: vec![Row {
|
||||
items: vec![RowItem { id: Uuid::new_v4() }],
|
||||
row_height: Some(300),
|
||||
column_sizes: vec![12],
|
||||
id: 1,
|
||||
}],
|
||||
};
|
||||
|
||||
|
||||
// Version 2 content
|
||||
let v2_content = DashboardYml {
|
||||
name: "Updated Dashboard".to_string(),
|
||||
description: Some("Updated description".to_string()),
|
||||
rows: vec![
|
||||
Row {
|
||||
items: vec![RowItem { id: Uuid::new_v4() }, RowItem { id: Uuid::new_v4() }],
|
||||
items: vec![
|
||||
RowItem { id: Uuid::new_v4() },
|
||||
RowItem { id: Uuid::new_v4() },
|
||||
],
|
||||
row_height: Some(400),
|
||||
column_sizes: Some(vec![6, 6]),
|
||||
id: Some(1),
|
||||
column_sizes: vec![6, 6],
|
||||
id: 1,
|
||||
},
|
||||
Row {
|
||||
items: vec![RowItem { id: Uuid::new_v4() }],
|
||||
row_height: Some(300),
|
||||
column_sizes: Some(vec![12]),
|
||||
id: Some(2),
|
||||
}
|
||||
column_sizes: vec![12],
|
||||
id: 2,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
|
||||
// Add versions to history
|
||||
vh.add_version(1, v1_content);
|
||||
vh.add_version(2, v2_content);
|
||||
|
||||
vh.add_version(1, database::types::VersionContent::DashboardYml(v1_content));
|
||||
vh.add_version(2, database::types::VersionContent::DashboardYml(v2_content));
|
||||
|
||||
vh
|
||||
}
|
||||
|
||||
|
|
@ -468,7 +481,7 @@ mod tests {
|
|||
async fn test_restore_dashboard_version() {
|
||||
// This test would require a complete setup with database mocking
|
||||
// Full implementation in real code would mock all required components
|
||||
|
||||
|
||||
// Test logic:
|
||||
// 1. Create a dashboard with initial content (version 1)
|
||||
// 2. Update to create version 2
|
||||
|
|
@ -526,14 +539,14 @@ mod tests {
|
|||
Row {
|
||||
items: vec![RowItem { id: uuid1 }, RowItem { id: uuid2 }],
|
||||
row_height: Some(400),
|
||||
column_sizes: Some(vec![6, 6]),
|
||||
id: Some(1),
|
||||
column_sizes: vec![6, 6],
|
||||
id: 1,
|
||||
},
|
||||
Row {
|
||||
items: vec![RowItem { id: uuid3 }],
|
||||
row_height: Some(300),
|
||||
column_sizes: Some(vec![12]),
|
||||
id: Some(2),
|
||||
column_sizes: vec![12],
|
||||
id: 2,
|
||||
},
|
||||
],
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in New Issue