renaming restore component route, impl removing to_delete from component, wip on edge restore

Author: jobelenus

lib/dal/src/attribute/prototype.rs

@@ -51,6 +51,8 @@ pub enum AttributePrototypeError {
     LayerDb(#[from] LayerDbError),
     #[error("attribute prototype {0} is missing a function edge")]
     MissingFunction(AttributePrototypeId),
+    #[error("No attribute values for: {0}")]
+    NoAttributeValues(AttributePrototypeId),
     #[error("node weight error: {0}")]
     NodeWeight(#[from] NodeWeightError),
     #[error("Attribute Prototype not found: {0}")]

lib/sdf-server/src/server/service/diagram.rs

@@ -3,6 +3,7 @@ use axum::response::{IntoResponse, Response};
 use axum::routing::{get, post};
 use axum::Json;
 use axum::Router;
+use dal::attribute::prototype::AttributePrototypeError;
 use dal::component::ComponentError;
 use dal::socket::input::InputSocketError;
 use dal::workspace_snapshot::WorkspaceSnapshotError;
@@ -24,9 +25,9 @@ pub mod set_component_position;
 
 // mod connect_component_to_frame;
 pub mod delete_component;
-// pub mod delete_connection;
+//pub mod delete_connection;
 // pub mod paste_component;
-// mod restore_component;
+pub mod remove_delete_intent;
 // pub mod restore_connection;
 
 #[remain::sorted]
@@ -36,6 +37,8 @@ pub enum DiagramError {
     Action(#[from] ActionError),
     #[error("action: {0}")]
     ActionPrototype(#[from] ActionPrototypeError),
+    #[error("prototype error: {0}")]
+    AttributePrototype(#[from] AttributePrototypeError),
     #[error("changeset error: {0}")]
     ChangeSet(#[from] ChangeSetPointerError),
     #[error("change set not found")]
@@ -121,14 +124,10 @@ pub fn routes() -> Router<AppState> {
             "/delete_components",
             post(delete_component::delete_components),
         )
-        // .route(
-        //     "/restore_component",
-        //     post(restore_component::restore_component),
-        // )
-        // .route(
-        //     "/restore_components",
-        //     post(restore_component::restore_components),
-        // )
+        .route(
+            "/remove_delete_intent",
+            post(remove_delete_intent::remove_delete_intent),
+        )
         .route(
             "/connect_component_to_frame",
             post(connect_component_to_frame::connect_component_to_frame),

lib/sdf-server/src/server/service/diagram/delete_connection.rs

@@ -1,19 +1,20 @@
 use axum::extract::OriginalUri;
 use axum::{response::IntoResponse, Json};
-use dal::edge::EdgeId;
-use dal::{ChangeSet, Component, Connection, Edge, Socket, Visibility};
+use dal::attribute::prototype::argument::{AttributePrototypeArgumentId, AttributePrototypeArgument };
+use dal::{AttributePrototype, ChangeSetPointer, Visibility, AttributeValue};
+use dal::attribute::prototype::AttributePrototypeError;
 use serde::{Deserialize, Serialize};
 
 use super::DiagramResult;
 use crate::server::extract::{AccessBuilder, HandlerContext, PosthogClient};
 use crate::server::tracking::track;
 use crate::service::diagram::DiagramError;
-use dal::standard_model::StandardModel;
 
 #[derive(Deserialize, Serialize, Debug)]
 #[serde(rename_all = "camelCase")]
+
 pub struct DeleteConnectionRequest {
-    pub edge_id: EdgeId,
+    pub edge_id: AttributePrototypeArgumentId,
     #[serde(flatten)]
     pub visibility: Visibility,
 }
@@ -29,46 +30,27 @@ pub async fn delete_connection(
     let mut ctx = builder.build(request_ctx.build(request.visibility)).await?;
 
     let force_changeset_pk = ChangeSetPointer::force_new(&mut ctx).await?;
-    let edge = Edge::get_by_id(&ctx, &request.edge_id)
-        .await?
-        .ok_or(DiagramError::EdgeNotFound)?;
-
-    let conn = Connection::from_edge(&edge);
-    let from_component_schema = Component::get_by_id(&ctx, &conn.source.component_id)
-        .await?
-        .ok_or(DiagramError::ComponentNotFound)?
-        .schema(&ctx)
-        .await?
-        .ok_or(DiagramError::SchemaNotFound)?;
-
-    let from_socket = Socket::get_by_id(&ctx, &conn.source.socket_id)
-        .await?
-        .ok_or(DiagramError::SocketNotFound)?;
-
-    let to_component_schema = Component::get_by_id(&ctx, &conn.destination.component_id)
-        .await?
-        .ok_or(DiagramError::ComponentNotFound)?
-        .schema(&ctx)
-        .await?
-        .ok_or(DiagramError::SchemaNotFound)?;
 
-    let to_socket = Socket::get_by_id(&ctx, &conn.destination.socket_id)
-        .await?
-        .ok_or(DiagramError::SocketNotFound)?;
+    let attribute_prototype_argument = AttributePrototypeArgument::get_by_id(&ctx, request.edge_id).await?;
+    let targets = attribute_prototype_argument.targets();
+    let source = attribute_prototype_argument.value_source(&ctx).await?;
+    let prototype_id = attribute_prototype_argument.prototype_id(&ctx).await?;
+    let value_id = AttributePrototype::attribute_value_ids(&ctx, prototype_id).await?.first().copied().ok_or(AttributePrototypeError::NoAttributeValues(prototype_id))?;
+    let destination = AttributeValue::is_for(&ctx, value_id).await?;
 
-    Connection::delete_for_edge(&ctx, request.edge_id).await?;
+    //attribute_prototype_argument.delete(&ctx).await?;
 
     track(
         &posthog_client,
         &ctx,
         &original_uri,
         "delete_connection",
         serde_json::json!({
-            "from_component_id": conn.source.component_id,
+            "from_component_id": targets.source_component_id,
             "from_component_schema_name": from_component_schema.name(),
             "from_socket_id": conn.source.socket_id,
             "from_socket_name": &from_socket.name(),
-            "to_component_id": conn.destination.component_id,
+            "to_component_id": targets.destination_component_id,
             "to_component_schema_name": to_component_schema.name(),
             "to_socket_id": conn.destination.socket_id,
             "to_socket_name":  &to_socket.name(),

lib/sdf-server/src/server/service/diagram/remove_delete_intent.rs

@@ -0,0 +1,76 @@
+use axum::Json;
+use axum::{extract::OriginalUri, http::uri::Uri, response::IntoResponse};
+use dal::{ChangeSetPointer, Component, ComponentId, DalContext, Visibility};
+use serde::{Deserialize, Serialize};
+
+use super::DiagramResult;
+use crate::server::extract::{AccessBuilder, HandlerContext, PosthogClient};
+use crate::server::tracking::track;
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct RestoreComponentRequest {
+    pub component_id: ComponentId,
+    #[serde(flatten)]
+    pub visibility: Visibility,
+}
+
+async fn remove_single_delete_intent(
+    ctx: &DalContext,
+    component_id: ComponentId,
+    original_uri: &Uri,
+    PosthogClient(posthog_client): &PosthogClient,
+) -> DiagramResult<()> {
+
+    let comp = Component::get_by_id(ctx, component_id).await?;
+
+    let comp_schema = comp.schema(ctx).await?;
+    let comp = comp.set_to_delete(ctx, false).await?;
+
+    track(
+        posthog_client,
+        ctx,
+        original_uri,
+        "restore_component",
+        serde_json::json!({
+                    "component_id": comp.id(),
+                    "component_schema_name": comp_schema.name(),
+        }),
+    );
+
+    Ok(())
+}
+
+
+#[derive(Deserialize, Serialize, Debug)]
+#[serde(rename_all = "camelCase")]
+pub struct RemoveDeleteIntentRequest {
+    pub component_ids: Vec<ComponentId>,
+    #[serde(flatten)]
+    pub visibility: Visibility,
+}
+
+/// Restore a set of [`Component`](dal::Component)s via their componentId. Creating change set if on head.
+pub async fn remove_delete_intent(
+    HandlerContext(builder): HandlerContext,
+    AccessBuilder(request_ctx): AccessBuilder,
+    posthog_client: PosthogClient,
+    OriginalUri(original_uri): OriginalUri,
+    Json(request): Json<RemoveDeleteIntentRequest>,
+) -> DiagramResult<impl IntoResponse> {
+    let mut ctx = builder.build(request_ctx.build(request.visibility)).await?;
+
+    let force_changeset_pk = ChangeSetPointer::force_new(&mut ctx).await?;
+
+    for component_id in request.component_ids {
+        remove_single_delete_intent(&ctx, component_id, &original_uri, &posthog_client).await?;
+    }
+
+    ctx.commit().await?;
+
+    let mut response = axum::response::Response::builder();
+    if let Some(force_changeset_pk) = force_changeset_pk {
+        response = response.header("force_changeset_pk", force_changeset_pk.to_string());
+    }
+    Ok(response.body(axum::body::Empty::new())?)
+}