diff --git a/crates/nexus/src/http/ui/handlers/databases.rs b/crates/nexus/src/http/ui/handlers/databases.rs index c4c16f510..1328da1ac 100644 --- a/crates/nexus/src/http/ui/handlers/databases.rs +++ b/crates/nexus/src/http/ui/handlers/databases.rs @@ -105,7 +105,7 @@ pub async fn delete_database( ("warehouseId" = Uuid, description = "Warehouse ID"), ("databaseName" = String, description = "Database Name"), ), - operation_id = "webDatabaseDashboard", + operation_id = "webGetDatabase", responses( (status = 200, description = "Successful Response", body = Database), (status = 404, description = "Database not found", body = AppError), @@ -117,9 +117,6 @@ pub async fn get_database( Path((warehouse_id, database_name)): Path<(Uuid, String)>, ) -> Result, AppError> { let mut warehouse = state.get_warehouse_by_id(warehouse_id).await?; - let profile = state - .get_profile_by_id(warehouse.storage_profile_id.unwrap()) - .await?; let ident = DatabaseIdent { warehouse: WarehouseIdent::new(warehouse.id), namespace: NamespaceIdent::new(database_name), @@ -127,7 +124,6 @@ pub async fn get_database( let mut database = state.get_database(&ident).await?; let tables = state.list_tables(&ident).await?; - warehouse.with_details(Option::from(profile), None); database.with_details(Option::from(tables)); Ok(Json(database)) } diff --git a/crates/nexus/src/http/ui/handlers/tables.rs b/crates/nexus/src/http/ui/handlers/tables.rs index ce37a5c50..2104c4cf4 100644 --- a/crates/nexus/src/http/ui/handlers/tables.rs +++ b/crates/nexus/src/http/ui/handlers/tables.rs @@ -35,7 +35,7 @@ pub struct ApiDoc; #[utoipa::path( get, path = "/ui/warehouses/{warehouseId}/databases/{databaseName}/tables/{tableName}", - operation_id = "webTableDashboard", + operation_id = "webGetTable", params( ("warehouseId" = Uuid, description = "Warehouse ID"), ("databaseName" = String, description = "Database Name"), @@ -53,20 +53,14 @@ pub async fn get_table( Path((warehouse_id, database_name, table_name)): Path<(Uuid, String, String)>, ) -> Result, AppError> { let mut warehouse = state.get_warehouse_by_id(warehouse_id).await?; - let profile = state - .get_profile_by_id(warehouse.storage_profile_id.unwrap()) - .await?; - let ident = DatabaseIdent { - warehouse: WarehouseIdent::new(warehouse.id), - namespace: NamespaceIdent::new(database_name), - }; - let mut database = state.get_database(&ident).await?; let table_ident = TableIdent { - database: ident, + database: DatabaseIdent { + warehouse: WarehouseIdent::new(warehouse.id), + namespace: NamespaceIdent::new(database_name), + }, table: table_name, }; - warehouse.with_details(Option::from(profile), None); - let mut table = state.get_table(&table_ident).await?; + let table = state.get_table(&table_ident).await?; Ok(Json(table)) } diff --git a/crates/nexus/src/http/ui/handlers/warehouses.rs b/crates/nexus/src/http/ui/handlers/warehouses.rs index 1090207e1..1326aa408 100644 --- a/crates/nexus/src/http/ui/handlers/warehouses.rs +++ b/crates/nexus/src/http/ui/handlers/warehouses.rs @@ -82,7 +82,7 @@ pub async fn list_warehouses( #[utoipa::path( get, path = "/ui/warehouses/{warehouseId}", - operation_id = "webWarehouseDashboard", + operation_id = "webGetWarehouse", params( ("warehouseId" = Uuid, Path, description = "Warehouse ID") ), @@ -139,7 +139,7 @@ pub async fn create_warehouse( #[utoipa::path( delete, path = "/ui/warehouses/{warehouseId}", - operation_id = "webCreateWarehouse", + operation_id = "webDeleteWarehouse", params( ("warehouseId" = Uuid, Path, description = "Warehouse ID") ), diff --git a/crates/nexus/src/http/ui/models/table.rs b/crates/nexus/src/http/ui/models/table.rs index 41ed02a8f..c43c1cc04 100644 --- a/crates/nexus/src/http/ui/models/table.rs +++ b/crates/nexus/src/http/ui/models/table.rs @@ -62,14 +62,6 @@ pub struct Table { pub updated_at: Option>, } -// impl Table { -// pub fn with_details(&mut self, database: Option) { -// if database.is_some() { -// self.database = database; -// } -// } -// } - impl From for Table { fn from(table: catalog::models::Table) -> Self { Self { diff --git a/object_store/test/873fa8c7-7819-4949-b050-403ffe6d2c91/table_data_1/metadata/196b2daf-e1e6-4c65-ab41-7c88aef05e6f.metadata.json b/object_store/test/873fa8c7-7819-4949-b050-403ffe6d2c91/table_data_1/metadata/196b2daf-e1e6-4c65-ab41-7c88aef05e6f.metadata.json deleted file mode 100644 index d4c909f99..000000000 --- a/object_store/test/873fa8c7-7819-4949-b050-403ffe6d2c91/table_data_1/metadata/196b2daf-e1e6-4c65-ab41-7c88aef05e6f.metadata.json +++ /dev/null @@ -1 +0,0 @@ -{"format-version":1,"table-uuid":"0192d2bd-ab85-76f1-9285-e0d8d22accb1","location":"test/873fa8c7-7819-4949-b050-403ffe6d2c91/table_data_1","last-updated-ms":1730112498565,"last-column-id":5,"schema":{"schema-id":0,"type":"struct","fields":[{"id":1,"name":"vendor_id","required":false,"type":"long"},{"id":2,"name":"trip_id","required":false,"type":"long"},{"id":3,"name":"trip_distance","required":false,"type":"float"},{"id":4,"name":"fare_amount","required":false,"type":"double"},{"id":5,"name":"store_and_fwd_flag","required":false,"type":"string"}]},"schemas":[{"schema-id":0,"type":"struct","fields":[{"id":1,"name":"vendor_id","required":false,"type":"long"},{"id":2,"name":"trip_id","required":false,"type":"long"},{"id":3,"name":"trip_distance","required":false,"type":"float"},{"id":4,"name":"fare_amount","required":false,"type":"double"},{"id":5,"name":"store_and_fwd_flag","required":false,"type":"string"}]}],"current-schema-id":0,"partition-spec":[],"partition-specs":[{"spec-id":0,"fields":[]}],"default-spec-id":0,"last-partition-id":999,"properties":{"owner":"root"},"current-snapshot-id":-1,"sort-orders":[{"order-id":0,"fields":[]}],"default-sort-order-id":0} \ No newline at end of file diff --git a/object_store/test/873fa8c7-7819-4949-b050-403ffe6d2c91/table_data_2/metadata/348e11f4-f1fa-45f5-b58f-fea65c1eb16a.metadata.json b/object_store/test/873fa8c7-7819-4949-b050-403ffe6d2c91/table_data_2/metadata/348e11f4-f1fa-45f5-b58f-fea65c1eb16a.metadata.json deleted file mode 100644 index db373bf8b..000000000 --- a/object_store/test/873fa8c7-7819-4949-b050-403ffe6d2c91/table_data_2/metadata/348e11f4-f1fa-45f5-b58f-fea65c1eb16a.metadata.json +++ /dev/null @@ -1 +0,0 @@ -{"format-version":1,"table-uuid":"0192d2bc-7c29-7ac2-8458-a4adc6a8117a","location":"test/873fa8c7-7819-4949-b050-403ffe6d2c91/table_data_2","last-updated-ms":1730112420905,"last-column-id":5,"schema":{"schema-id":0,"type":"struct","fields":[{"id":1,"name":"vendor_id","required":false,"type":"long"},{"id":2,"name":"trip_id","required":false,"type":"long"},{"id":3,"name":"trip_distance","required":false,"type":"float"},{"id":4,"name":"fare_amount","required":false,"type":"double"},{"id":5,"name":"store_and_fwd_flag","required":false,"type":"string"}]},"schemas":[{"schema-id":0,"type":"struct","fields":[{"id":1,"name":"vendor_id","required":false,"type":"long"},{"id":2,"name":"trip_id","required":false,"type":"long"},{"id":3,"name":"trip_distance","required":false,"type":"float"},{"id":4,"name":"fare_amount","required":false,"type":"double"},{"id":5,"name":"store_and_fwd_flag","required":false,"type":"string"}]}],"current-schema-id":0,"partition-spec":[],"partition-specs":[{"spec-id":0,"fields":[]}],"default-spec-id":0,"last-partition-id":999,"properties":{"owner":"root"},"current-snapshot-id":-1,"sort-orders":[{"order-id":0,"fields":[]}],"default-sort-order-id":0} \ No newline at end of file