feat: boostrap tui

Cargo.toml

@@ -1,7 +1,8 @@
 [workspace]
 resolver="2"
 members = [
-    "edc-connector-client"
+    "edc-connector-client",
+    "edc-connector-tui"
 ]
 
 [workspace.dependencies]

edc-connector-client/src/api/catalog.rs

@@ -15,15 +15,15 @@ impl<'a> CatalogApi<'a> {
     }
 
     pub async fn request(&self, request: &CatalogRequest) -> EdcResult<Catalog> {
-        let url = format!("{}/v2/catalog/request", self.0.management_url);
+        let url = format!("{}/v3/catalog/request", self.0.management_url);
         self.0
             .post::<_, WithContext<Catalog>>(url, &WithContextRef::default_context(request))
             .await
             .map(|ctx| ctx.inner)
     }
 
     pub async fn dataset(&self, request: &DatasetRequest) -> EdcResult<Dataset> {
-        let url = format!("{}/v2/catalog/dataset/request", self.0.management_url);
+        let url = format!("{}/v3/catalog/dataset/request", self.0.management_url);
         self.0
             .post::<_, WithContext<Dataset>>(url, &WithContextRef::default_context(request))
             .await

edc-connector-client/src/api/contract_agreement.rs

@@ -16,15 +16,15 @@ impl<'a> ContractAgreementApi<'a> {
     }
 
     pub async fn get(&self, id: &str) -> EdcResult<ContractAgreement> {
-        let url = format!("{}/v2/contractagreements/{}", self.0.management_url, id);
+        let url = format!("{}/v3/contractagreements/{}", self.0.management_url, id);
         self.0
             .get::<WithContext<ContractAgreement>>(url)
             .await
             .map(|ctx| ctx.inner)
     }
 
     pub async fn query(&self, query: Query) -> EdcResult<Vec<ContractAgreement>> {
-        let url = format!("{}/v2/contractagreements/request", self.0.management_url);
+        let url = format!("{}/v3/contractagreements/request", self.0.management_url);
         self.0
             .post::<_, Vec<WithContext<ContractAgreement>>>(
                 url,

edc-connector-client/src/api/contract_definitions.rs

@@ -20,7 +20,7 @@ impl<'a> ContractDefinitionApi<'a> {
         &self,
         contract_definition: &NewContractDefinition,
     ) -> EdcResult<IdResponse<String>> {
-        let url = format!("{}/v2/contractdefinitions", self.0.management_url);
+        let url = format!("{}/v3/contractdefinitions", self.0.management_url);
         self.0
             .post::<_, WithContext<IdResponse<String>>>(
                 url,
@@ -31,22 +31,22 @@ impl<'a> ContractDefinitionApi<'a> {
     }
 
     pub async fn get(&self, id: &str) -> EdcResult<ContractDefinition> {
-        let url = format!("{}/v2/contractdefinitions/{}", self.0.management_url, id);
+        let url = format!("{}/v3/contractdefinitions/{}", self.0.management_url, id);
         self.0
             .get::<WithContext<ContractDefinition>>(url)
             .await
             .map(|ctx| ctx.inner)
     }
 
     pub async fn update(&self, contract_definition: &ContractDefinition) -> EdcResult<()> {
-        let url = format!("{}/v2/contractdefinitions", self.0.management_url);
+        let url = format!("{}/v3/contractdefinitions", self.0.management_url);
         self.0
             .put(url, &WithContextRef::default_context(contract_definition))
             .await
     }
 
     pub async fn query(&self, query: Query) -> EdcResult<Vec<ContractDefinition>> {
-        let url = format!("{}/v2/contractdefinitions/request", self.0.management_url);
+        let url = format!("{}/v3/contractdefinitions/request", self.0.management_url);
         self.0
             .post::<_, Vec<WithContext<ContractDefinition>>>(
                 url,
@@ -57,7 +57,7 @@ impl<'a> ContractDefinitionApi<'a> {
     }
 
     pub async fn delete(&self, id: &str) -> EdcResult<()> {
-        let url = format!("{}/v2/contractdefinitions/{}", self.0.management_url, id);
+        let url = format!("{}/v3/contractdefinitions/{}", self.0.management_url, id);
         self.0.del(url).await
     }
 }

edc-connector-client/src/api/contract_negotiations.rs

@@ -23,7 +23,7 @@ impl<'a> ContractNegotiationApi<'a> {
         &self,
         contract_request: &ContractRequest,
     ) -> EdcResult<IdResponse<String>> {
-        let url = format!("{}/v2/contractnegotiations", self.0.management_url);
+        let url = format!("{}/v3/contractnegotiations", self.0.management_url);
         self.0
             .post::<_, WithContext<IdResponse<String>>>(
                 url,
@@ -34,15 +34,15 @@ impl<'a> ContractNegotiationApi<'a> {
     }
 
     pub async fn get(&self, id: &str) -> EdcResult<ContractNegotiation> {
-        let url = format!("{}/v2/contractnegotiations/{}", self.0.management_url, id);
+        let url = format!("{}/v3/contractnegotiations/{}", self.0.management_url, id);
         self.0
             .get::<WithContext<ContractNegotiation>>(url)
             .await
             .map(|ctx| ctx.inner)
     }
 
     pub async fn get_state(&self, id: &str) -> EdcResult<ContractNegotiationState> {
-        let url = format!("{}/v2/contractnegotiations/{}", self.0.management_url, id);
+        let url = format!("{}/v3/contractnegotiations/{}", self.0.management_url, id);
         self.0
             .get::<WithContext<NegotiationState>>(url)
             .await
@@ -51,7 +51,7 @@ impl<'a> ContractNegotiationApi<'a> {
 
     pub async fn terminate(&self, id: &str, reason: &str) -> EdcResult<()> {
         let url = format!(
-            "{}/v2/contractnegotiations/{}/terminate",
+            "{}/v3/contractnegotiations/{}/terminate",
             self.0.management_url, id
         );
 
@@ -66,7 +66,7 @@ impl<'a> ContractNegotiationApi<'a> {
     }
 
     pub async fn query(&self, query: Query) -> EdcResult<Vec<ContractNegotiation>> {
-        let url = format!("{}/v2/contractnegotiations/request", self.0.management_url);
+        let url = format!("{}/v3/contractnegotiations/request", self.0.management_url);
         self.0
             .post::<_, Vec<WithContext<ContractNegotiation>>>(
                 url,

edc-connector-client/src/api/dataplanes.rs

@@ -1,9 +1,8 @@
 use crate::{
     client::EdcConnectorClientInternal,
     types::{
-        context::{WithContext, WithContextRef},
+        context::WithContext,
         dataplane::DataPlaneInstance,
-        response::IdResponse,
     },
     EdcResult,
 };
@@ -15,14 +14,11 @@ impl<'a> DataPlaneApi<'a> {
         DataPlaneApi(client)
     }
 
-    pub async fn register(&self, data_plane: &DataPlaneInstance) -> EdcResult<IdResponse<String>> {
-        let url = format!("{}/v2/dataplanes", self.0.management_url);
+    pub async fn list(&self) -> EdcResult<Vec<DataPlaneInstance>> {
+        let url = format!("{}/v3/dataplanes", self.0.management_url);
         self.0
-            .post::<_, WithContext<IdResponse<String>>>(
-                url,
-                &WithContextRef::default_context(data_plane),
-            )
+            .get::<Vec<WithContext<DataPlaneInstance>>>(url)
             .await
-            .map(|ctx| ctx.inner)
+            .map(|results| results.into_iter().map(|ctx| ctx.inner).collect())
     }
 }

edc-connector-client/src/api/edrs.rs

@@ -37,15 +37,15 @@ impl<'a> EdrApi<'a> {
     }
 
     pub async fn get_data_address(&self, id: &str) -> EdcResult<DataAddress> {
-        let url = format!("{}/v2/edrs/{}/dataaddress", self.0.management_url, id);
+        let url = format!("{}/v3/edrs/{}/dataaddress", self.0.management_url, id);
         self.0
             .get::<WithContext<DataAddress>>(url)
             .await
             .map(|ctx| ctx.inner)
     }
 
     pub async fn query(&self, query: Query) -> EdcResult<Vec<EndpointDataReferenceEntry>> {
-        let url = format!("{}/v1/edrs/request", self.0.management_url);
+        let url = format!("{}/v3/edrs/request", self.0.management_url);
         self.0
             .post::<_, Vec<WithContext<EndpointDataReferenceEntry>>>(
                 url,
@@ -56,7 +56,7 @@ impl<'a> EdrApi<'a> {
     }
 
     pub async fn delete(&self, id: &str) -> EdcResult<()> {
-        let url = format!("{}/v1/edrs/{}", self.0.management_url, id);
+        let url = format!("{}/v3/edrs/{}", self.0.management_url, id);
         self.0.del(url).await
     }
 }

edc-connector-client/src/api/policies.rs

@@ -20,7 +20,7 @@ impl<'a> PolicyApi<'a> {
         &self,
         policy_definition: &NewPolicyDefinition,
     ) -> EdcResult<IdResponse<String>> {
-        let url = format!("{}/v2/policydefinitions", self.0.management_url);
+        let url = format!("{}/v3/policydefinitions", self.0.management_url);
         self.0
             .post::<_, WithContext<IdResponse<String>>>(
                 url,
@@ -31,7 +31,7 @@ impl<'a> PolicyApi<'a> {
     }
 
     pub async fn get(&self, id: &str) -> EdcResult<PolicyDefinition> {
-        let url = format!("{}/v2/policydefinitions/{}", self.0.management_url, id);
+        let url = format!("{}/v3/policydefinitions/{}", self.0.management_url, id);
         self.0
             .get::<WithContext<PolicyDefinition>>(url)
             .await
@@ -50,7 +50,7 @@ impl<'a> PolicyApi<'a> {
     }
 
     pub async fn query(&self, query: Query) -> EdcResult<Vec<PolicyDefinition>> {
-        let url = format!("{}/v2/policydefinitions/request", self.0.management_url);
+        let url = format!("{}/v3/policydefinitions/request", self.0.management_url);
         self.0
             .post::<_, Vec<WithContext<PolicyDefinition>>>(
                 url,
@@ -61,7 +61,7 @@ impl<'a> PolicyApi<'a> {
     }
 
     pub async fn delete(&self, id: &str) -> EdcResult<()> {
-        let url = format!("{}/v2/policydefinitions/{}", self.0.management_url, id);
+        let url = format!("{}/v3/policydefinitions/{}", self.0.management_url, id);
         self.0.del(url).await
     }
 }

edc-connector-client/src/api/transfer_process.rs

@@ -23,7 +23,7 @@ impl<'a> TransferProcessApi<'a> {
         &self,
         transfer_request: &TransferRequest,
     ) -> EdcResult<IdResponse<String>> {
-        let url = format!("{}/v2/transferprocesses", self.0.management_url);
+        let url = format!("{}/v3/transferprocesses", self.0.management_url);
         self.0
             .post::<_, WithContext<IdResponse<String>>>(
                 url,
@@ -34,23 +34,23 @@ impl<'a> TransferProcessApi<'a> {
     }
 
     pub async fn get(&self, id: &str) -> EdcResult<TransferProcess> {
-        let url = format!("{}/v2/transferprocesses/{}", self.0.management_url, id);
+        let url = format!("{}/v3/transferprocesses/{}", self.0.management_url, id);
         self.0
             .get::<WithContext<TransferProcess>>(url)
             .await
             .map(|ctx| ctx.inner)
     }
 
     pub async fn get_state(&self, id: &str) -> EdcResult<TransferProcessState> {
-        let url = format!("{}/v2/transferprocesses/{}", self.0.management_url, id);
+        let url = format!("{}/v3/transferprocesses/{}", self.0.management_url, id);
         self.0
             .get::<WithContext<TransferState>>(url)
             .await
             .map(|ctx| ctx.inner.state().clone())
     }
 
     pub async fn query(&self, query: Query) -> EdcResult<Vec<TransferProcess>> {
-        let url = format!("{}/v2/transferprocesses/request", self.0.management_url);
+        let url = format!("{}/v3/transferprocesses/request", self.0.management_url);
         self.0
             .post::<_, Vec<WithContext<TransferProcess>>>(
                 url,
@@ -62,7 +62,7 @@ impl<'a> TransferProcessApi<'a> {
 
     pub async fn terminate(&self, id: &str, reason: &str) -> EdcResult<()> {
         let url = format!(
-            "{}/v2/transferprocesses/{}/terminate",
+            "{}/v3/transferprocesses/{}/terminate",
             self.0.management_url, id
         );
 
@@ -78,7 +78,7 @@ impl<'a> TransferProcessApi<'a> {
 
     pub async fn suspend(&self, id: &str, reason: &str) -> EdcResult<()> {
         let url = format!(
-            "{}/v2/transferprocesses/{}/suspend",
+            "{}/v3/transferprocesses/{}/suspend",
             self.0.management_url, id
         );
 
@@ -94,7 +94,7 @@ impl<'a> TransferProcessApi<'a> {
 
     pub async fn resume(&self, id: &str) -> EdcResult<()> {
         let url = format!(
-            "{}/v2/transferprocesses/{}/resume",
+            "{}/v3/transferprocesses/{}/resume",
             self.0.management_url, id
         );
 

edc-connector-client/src/types/asset.rs

@@ -7,7 +7,7 @@ use super::{
     properties::{FromValue, Properties, PropertyValue, ToValue},
 };
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct Asset {
     #[serde(rename = "@id")]
@@ -55,6 +55,18 @@ where {
     pub fn id(&self) -> &str {
         &self.id
     }
+
+    pub fn properties(&self) -> &Properties {
+        &self.properties
+    }
+
+    pub fn private_properties(&self) -> &Properties {
+        &self.private_properties
+    }
+
+    pub fn data_address(&self) -> &DataAddress {
+        &self.data_address
+    }
 }
 
 #[derive(Default)]

edc-connector-client/src/types/contract_definition.rs

@@ -1,19 +1,21 @@
-use serde::{Deserialize, Serialize};
-
 use crate::{BuilderError, ConversionError};
+use serde::{Deserialize, Serialize};
+use serde_with::{formats::PreferMany, serde_as, OneOrMany};
 
 use super::{
     properties::{FromValue, Properties, ToValue},
     query::Criterion,
 };
 
-#[derive(Debug, Serialize, Deserialize)]
+#[serde_as]
+#[derive(Debug, Serialize, Deserialize, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct ContractDefinition {
     #[serde(rename = "@id")]
     id: String,
     access_policy_id: String,
     contract_policy_id: String,
+    #[serde_as(deserialize_as = "OneOrMany<_, PreferMany>")]
     #[serde(default)]
     assets_selector: Vec<Criterion>,
     #[serde(default)]

edc-connector-client/src/types/data_address.rs

@@ -4,7 +4,7 @@ use crate::{error::BuilderError, ConversionError};
 
 use super::properties::{FromValue, Properties, ToValue};
 
-#[derive(Debug, Deserialize, Serialize)]
+#[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct DataAddress(Properties);
 
 impl DataAddress {