changed delete effect sub format in backend, clean unused import

editor-blender/core/actions/state/led_editor.py

@@ -1,4 +1,4 @@
-from typing import List, Optional, Tuple
+from typing import List, Tuple
 
 import bpy
 

editor-blender/core/actions/state/led_map.py

@@ -1,6 +1,5 @@
 from ...models import LEDEffect, LEDMap
 from ...states import state
-from ...utils.notification import notify
 from ...utils.ui import redraw_area
 from ..property.animation_data import set_ctrl_keyframes_from_state
 

editor-blender/graphqls/subscriptions.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass
 from enum import Enum
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Dict, List, Optional, Tuple, Union
 
 from dataclass_wizard import JSONWizard
 from gql import gql

editor-server/src/graphql/mutations/led.rs

@@ -405,17 +405,23 @@ impl LEDMutation {
         let mysql = clients.mysql_pool();
 
         // check if effect exists
-        let led_effect = sqlx::query!(
+        let led_effect = match sqlx::query!(
             r#"
-                SELECT * FROM LEDEffect WHERE id = ?;
+                SELECT
+                    LEDEffect.*,
+                    Model.name as "model_name",
+                    Part.name as "part_name"
+                FROM LEDEffect
+                INNER JOIN Model ON LEDEffect.model_id = Model.id
+                INNER JOIN Part ON LEDEffect.part_id = Part.id
+                WHERE LEDEffect.id = ?;
             "#,
             id
         )
-        .fetch_optional(mysql)
-        .await;
-
-        match led_effect {
-            Ok(_) => {}
+        .fetch_one(mysql)
+        .await
+        {
+            Ok(led_effect) => led_effect,
             Err(_) => {
                 return Ok(DeleteLEDEffectResponse {
                     ok: false,
@@ -495,7 +501,14 @@ impl LEDMutation {
         let led_payload = LEDPayload {
             create_effects: Vec::new(),
             update_effects: Vec::new(),
-            delete_effects: vec![id],
+            delete_effects: vec![LEDEffectData {
+                id,
+                name: "".to_string(),
+                model_name: led_effect.model_name.clone(),
+                part_name: led_effect.part_name.clone(),
+                repeat: 0,
+                frames: vec![],
+            }],
         };
 
         Subscriptor::publish(led_payload);

editor-server/src/graphql/subscriptions/led.rs

@@ -9,7 +9,7 @@ use futures_core::stream::Stream;
 pub struct LEDPayload {
     pub create_effects: Vec<LEDEffectData>,
     pub update_effects: Vec<LEDEffectData>,
-    pub delete_effects: Vec<i32>,
+    pub delete_effects: Vec<LEDEffectData>,
 }
 
 #[derive(Default)]