Merge pull request #813 from kitsudaiki/feat/more-information-in-the-dashboard

related issue: #810

Author: kitsudaiki

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+### BREAKING-CHANGES
+
+#### Database-Breaking
+
+- in the meta-cluster table of hanami the name of the cluster is now also stored
+
 ### Added
 
 - Vagrantfile with ansible playbook to deploy multiple virtual machines with a kubernestes with fully deployed ainari-setup and sdk-api-test
@@ -14,6 +20,8 @@
     - added cluster-list without actions to overview-page
     - automatic logout in case the token is expired
     - quota-management was added to the admin-section of the dashboard
+    - dataset list in the dashboard now prints the number of rows and columns
+    - cluster list in the dashboard now prints the cluster adress
 
 ### Changed
 
@@ -26,6 +34,7 @@
     - hide admin-section in case that the user is not an admin
     - user-logo in the right upper corner now is always white with the starting letter of the user-id
     - gauge-charts of the overview-page now has animation
+    - disabled the hexagon background pattern in the left upper corner again
 
 ### Fixed
 

src/binaries/hanami/src/api/http_endpoints/cluster/create_cluster_v1_0.rs

@@ -110,6 +110,7 @@ pub async fn create_cluster(
     let cluster_uuid = cluster_resp.uuid;
     meta_cluster_table::add_new_meta_cluster(
         &cluster_uuid,
+        &body.name,
         &sakura_uuid,
         &proxy_resp.uuid,
         &context,

src/binaries/hanami/src/api/http_endpoints/cluster/list_cluster_v1_0.rs

@@ -16,13 +16,14 @@ use actix_web::web::Json;
 use apistos::api_operation;
 
 use crate::config;
-use crate::database::host_table;
+use crate::database::meta_cluster_table;
 
 use ainari_api::common_functions::*;
 use ainari_api::errors::ErrorResponse;
 use ainari_api_structs::cluster_structs::*;
 use ainari_api_structs::user_context::UserContext;
-use ainari_clients::cluster as cluster_clients;
+use ainari_clients::endpoints::*;
+use ainari_clients::proxy as proxy_clients;
 
 #[api_operation(
     tag = "cluster",
@@ -32,26 +33,45 @@ use ainari_clients::cluster as cluster_clients;
     error_code = 500
 )]
 pub async fn list_cluster(context: UserContext) -> Result<Json<ClusterListResp>, ErrorResponse> {
-    let mut complete_resp = ClusterListResp {
+    // get clusters from db
+    let clusters = meta_cluster_table::list_meta_clusters(&context)
+        .map_err(|e| map_db_list_error("hosts", e))?;
+
+    // get endpoints from miko
+    let miko_endpoint = &config::CONFIG.miko;
+    let endpoints = get_endpoints(miko_endpoint, config::CONFIG.skip_tls_verification)
+        .await
+        .map_err(map_ainari_error_to_api_response)?;
+
+    // prepare response
+    let mut resp = ClusterListResp {
         clusters: Vec::new(),
     };
 
-    let host_list = host_table::list_hosts(&context).map_err(|e| map_db_list_error("hosts", e))?;
+    // fill reponse
+    for cluster in clusters {
+        let uuid = convert_uuid(&cluster.uuid)?;
 
-    for host in host_list {
-        let cluster_list_resp = cluster_clients::list_cluster(
-            &host.address,
+        // get port of the cluster from torii
+        let proxy_uuid = convert_uuid(&cluster.proxy_uuid)?;
+        let proxy_resp = proxy_clients::get_proxy(
+            &endpoints.torii,
             &context.token,
-            &config::INTERNAL_API_KEY,
+            &proxy_uuid,
             config::CONFIG.skip_tls_verification,
         )
         .await
         .map_err(map_ainari_error_to_api_response)?;
 
-        for cluster in cluster_list_resp.clusters {
-            complete_resp.clusters.push(cluster);
-        }
+        // add single object to the reponse-list
+        let obj = ClusterBasicResp {
+            uuid,
+            name: cluster.name.clone(),
+            proxy_port: proxy_resp.port,
+        };
+
+        resp.clusters.push(obj);
     }
 
-    Ok(Json(complete_resp))
+    Ok(Json(resp))
 }

src/binaries/hanami/src/database/meta_cluster_table.rs

@@ -28,6 +28,7 @@ use ainari_common::enums;
 table! {
     meta_clusters (uuid) {
         uuid -> Varchar,
+        name -> Varchar,
         sakura_host_uuid -> Varchar,
         proxy_uuid -> Varchar,
         owner_id -> Varchar,
@@ -46,6 +47,7 @@ table! {
 #[diesel(table_name = meta_clusters)]
 pub struct MetaClusterEntry {
     pub uuid: String,
+    pub name: String,
     pub sakura_host_uuid: String,
     pub proxy_uuid: String,
     pub owner_id: String,
@@ -64,6 +66,7 @@ pub fn init_meta_cluster_table() -> Result<(), Box<dyn Error>> {
     conn.batch_execute(
         "CREATE TABLE IF NOT EXISTS meta_clusters (
         uuid VARCHAR(40) PRIMARY KEY,
+        name VARCHAR(256),
         sakura_host_uuid VARCHAR(40),
         proxy_uuid VARCHAR(40),
         owner_id VARCHAR(256),
@@ -83,12 +86,14 @@ pub fn init_meta_cluster_table() -> Result<(), Box<dyn Error>> {
 
 pub fn add_new_meta_cluster(
     meta_cluster_uuid: &Uuid,
+    cluster_name: &str,
     sakura_host_uuid: &Uuid,
     proxy_uuid: &Uuid,
     context: &UserContext,
 ) -> QueryResult<usize> {
     let meta_cluster = MetaClusterEntry {
         uuid: meta_cluster_uuid.to_string().clone(),
+        name: cluster_name.to_string().clone(),
         sakura_host_uuid: sakura_host_uuid.to_string().clone(),
         proxy_uuid: proxy_uuid.to_string().clone(),
         owner_id: context.user_id.clone(),
@@ -259,6 +264,7 @@ mod tests {
     fn test_add_get_meta_cluster() {
         let _ = init_meta_cluster_table();
         let uuid1 = Uuid::new_v4();
+        let name = "test-cluster".to_string();
         let sakura_host_uuid1 = Uuid::new_v4();
         let proxy_uuid1 = Uuid::new_v4();
 
@@ -274,6 +280,7 @@ mod tests {
 
         let meta_cluster = MetaClusterEntry {
             uuid: uuid1.to_string(),
+            name: name.clone(),
             sakura_host_uuid: sakura_host_uuid1.to_string(),
             proxy_uuid: proxy_uuid1.to_string(),
             owner_id: owner_id.clone(),
@@ -320,6 +327,7 @@ mod tests {
         let _ = init_meta_cluster_table();
         let uuid1 = Uuid::new_v4();
         let uuid2 = Uuid::new_v4();
+        let name = "test-cluster".to_string();
         let sakura_host_uuid1 = Uuid::new_v4();
         let proxy_uuid1 = Uuid::new_v4();
 
@@ -335,6 +343,7 @@ mod tests {
 
         let meta_cluster1 = MetaClusterEntry {
             uuid: uuid1.to_string(),
+            name: name.clone(),
             sakura_host_uuid: sakura_host_uuid1.to_string(),
             proxy_uuid: proxy_uuid1.to_string(),
             owner_id: owner_id.clone(),
@@ -350,6 +359,7 @@ mod tests {
 
         let meta_cluster2 = MetaClusterEntry {
             uuid: uuid2.to_string(),
+            name: name.clone(),
             sakura_host_uuid: sakura_host_uuid1.to_string(),
             proxy_uuid: proxy_uuid1.to_string(),
             owner_id: owner_id.clone(),
@@ -379,6 +389,7 @@ mod tests {
     fn test_delete_meta_cluster() {
         let _ = init_meta_cluster_table();
         let uuid1 = Uuid::new_v4();
+        let name = "test-cluster".to_string();
         let sakura_host_uuid1 = Uuid::new_v4();
         let proxy_uuid1 = Uuid::new_v4();
 
@@ -394,6 +405,7 @@ mod tests {
 
         let meta_cluster = MetaClusterEntry {
             uuid: uuid1.to_string(),
+            name: name.clone(),
             sakura_host_uuid: sakura_host_uuid1.to_string(),
             proxy_uuid: proxy_uuid1.to_string(),
             owner_id: owner_id.clone(),
@@ -422,6 +434,7 @@ mod tests {
         let uuid1 = Uuid::new_v4();
         let uuid2 = Uuid::new_v4();
         let uuid3 = Uuid::new_v4();
+        let name = "test-cluster".to_string();
         let sakura_host_uuid1 = Uuid::new_v4();
         let proxy_uuid1 = Uuid::new_v4();
 
@@ -437,6 +450,7 @@ mod tests {
 
         let meta_cluster1 = MetaClusterEntry {
             uuid: uuid1.to_string(),
+            name: name.clone(),
             sakura_host_uuid: sakura_host_uuid1.to_string(),
             proxy_uuid: proxy_uuid1.to_string(),
             owner_id: owner_id.clone(),
@@ -452,6 +466,7 @@ mod tests {
 
         let meta_cluster2 = MetaClusterEntry {
             uuid: uuid2.to_string(),
+            name: name.clone(),
             sakura_host_uuid: sakura_host_uuid1.to_string(),
             proxy_uuid: proxy_uuid1.to_string(),
             owner_id: owner_id.clone(),
@@ -467,6 +482,7 @@ mod tests {
 
         let meta_cluster3 = MetaClusterEntry {
             uuid: uuid3.to_string(),
+            name: name.clone(),
             sakura_host_uuid: sakura_host_uuid1.to_string(),
             proxy_uuid: proxy_uuid1.to_string(),
             owner_id: owner_id.clone(),
@@ -503,11 +519,13 @@ mod tests {
         let uuid1 = Uuid::new_v4();
         let uuid2 = Uuid::new_v4();
         let uuid3 = Uuid::new_v4();
+        let name = "test-cluster".to_string();
         let sakura_host_uuid1 = Uuid::new_v4();
         let proxy_uuid1 = Uuid::new_v4();
 
         let meta_cluster1 = MetaClusterEntry {
             uuid: uuid1.to_string(),
+            name: name.clone(),
             sakura_host_uuid: sakura_host_uuid1.to_string(),
             proxy_uuid: proxy_uuid1.to_string(),
             owner_id: "test-user-42".to_string(),
@@ -523,6 +541,7 @@ mod tests {
 
         let meta_cluster2 = MetaClusterEntry {
             uuid: uuid2.to_string(),
+            name: name.clone(),
             sakura_host_uuid: sakura_host_uuid1.to_string(),
             proxy_uuid: proxy_uuid1.to_string(),
             owner_id: "test-user-43".to_string(),
@@ -538,6 +557,7 @@ mod tests {
 
         let meta_cluster3 = MetaClusterEntry {
             uuid: uuid3.to_string(),
+            name: name.clone(),
             sakura_host_uuid: sakura_host_uuid1.to_string(),
             proxy_uuid: proxy_uuid1.to_string(),
             owner_id: "test-user-44".to_string(),

src/binaries/ryokan/src/api/http_endpoints/dataset/list_dataset_v1_0.rs

@@ -42,6 +42,8 @@ pub async fn list_dataset(context: UserContext) -> Result<Json<DatasetListResp>,
         let obj = DatasetBasicResp {
             uuid,
             name: dataset.name.clone(),
+            number_of_rows: dataset.number_of_rows as u64,
+            number_of_columns: dataset.number_of_columns as u64,
         };
 
         resp.datasets.push(obj);

src/binaries/sakura/src/api/http_endpoints/cluster/list_cluster_internal_v1_0.rs

@@ -49,6 +49,7 @@ pub async fn list_cluster_internal(
         let obj = ClusterBasicResp {
             uuid,
             name: cluster.name,
+            proxy_port: 0,
         };
 
         resp.clusters.push(obj);

src/dashboard/app/src/App.vue

@@ -17,10 +17,10 @@
 <template>
     <div class="app">
         <div class="background">
-            <img
+            <!-- <img
                 src="./assets/background_pattern.svg"
                 class="logo-icon top-left"
-            />
+            /> -->
             <img
                 src="./assets/background_pattern2.svg"
                 class="logo-icon bottom-right"

src/dashboard/app/src/auth_context.ts

@@ -143,9 +143,9 @@ export async function createAuthContext(token: string) {
     // This is useful for constructing URLs without specifying a port
     if (authContext.torii_address) {
         const toriiParts = authContext.torii_address.split(":");
-        if (toriiParts.length > 1) {
+        if (toriiParts.length > 2) {
             // Remove the port and any path/query parameters
-            authContext.torii_base_address = toriiParts[0];
+            authContext.torii_base_address = toriiParts[0] + ":" + toriiParts[1];
         } else {
             // If there's no port, use the full address as the base
             authContext.torii_base_address = authContext.torii_address;

src/dashboard/app/src/components/overview.vue

@@ -26,13 +26,15 @@
                     <tr>
                         <th>UUID</th>
                         <th>Name</th>
+                        <th>Adress</th>
                         <th></th>
                     </tr>
                 </thead>
                 <tbody>
                     <tr v-for="cluster in clusters" :key="cluster.uuid">
                         <td>{{ cluster.uuid }}</td>
                         <td>{{ cluster.name }}</td>
+                        <td>{{torii_base_address}}:{{ cluster.proxy_port }}</td>
                         <td></td>
                     </tr>
                 </tbody>
@@ -89,6 +91,7 @@ import { handleAxiosError } from "@/handleAxiosError";
 
 // Cluster management
 const clusters = ref<{ uuid: string; clusterName: string }[]>([]);
+const torii_base_address = ref<string>("");
 
 // Error handling
 const errorPopupMsg = ref<string>("");
@@ -116,6 +119,8 @@ const quotaMetrics = reactive({
 // API client creation helper
 function createApiClient(baseURL: string | null) {
     const authContext = getAuthContext();
+    torii_base_address.value = authContext.torii_base_address;
+
     return axios.create({
         baseURL,
         headers: { Authorization: `Bearer ${authContext.token}` },
@@ -221,4 +226,9 @@ onMounted(() => {
     display: flex;
     flex-wrap: wrap;
 }
+/* Columns 2 through n-1 share remaining space equally */
+th:not(:first-child):not(:last-child),
+td:not(:first-child):not(:last-child) {
+    width: 30%;
+}
 </style>

src/dashboard/app/src/components/storage/dataset/dataset_create_modal.vue

@@ -128,7 +128,7 @@ const onFile2Change = (event: Event) => {
 };
 
 async function handleAccept() {
-    datasetNameError.value = form.datasetName.length < 8;
+    datasetNameError.value = form.datasetName.length < 4;
 
     if (datasetNameError.value) {
         return;
@@ -156,6 +156,8 @@ async function handleAccept() {
                     },
                 },
             );
+
+            emit("accept");
         } catch (err) {
             errorPopupMsg.value = handleAxiosError(
                 err,