Fixes #1355

ironmansoftware · Dec 10, 2019 · ced212e · ced212e
1 parent dc058ea
commit ced212e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/src/UniversalDashboard/Cmdlets/RemoveElementCommand.cs b/src/UniversalDashboard/Cmdlets/RemoveElementCommand.cs
@@ -15,6 +15,9 @@ public class RemoveElementCommand : PSCmdlet
 
         [Parameter(Mandatory = true)]
         public string Id { get; set; }
+        [Parameter()]
+        public string ParentId { get; set; }
+
         [Parameter]
         public SwitchParameter Broadcast { get; set; }
 
@@ -24,12 +27,12 @@ protected override void EndProcessing()
 
             if (Broadcast)
             {
-                hub.RemoveElement(Id).Wait();
+                hub.RemoveElement(Id, ParentId).Wait();
             }
             else
             {
                 var connectionId = this.GetVariableValue("ConnectionId") as string;   
-                hub.RemoveElement(Id).Wait();
+                hub.RemoveElement(Id, ParentId).Wait();
             }
         }
     }

diff --git a/src/UniversalDashboard/Server/DashboardHub.cs b/src/UniversalDashboard/Server/DashboardHub.cs
@@ -84,14 +84,14 @@ public static async  Task AddElement(this IHubContext<DashboardHub> hub, string
             await hub.Clients.Client(clientId).SendAsync("addElement", parentComponentId, element);
         }
 
-        public static async Task RemoveElement(this IHubContext<DashboardHub> hub, string clientId, string componentId)
+        public static async Task RemoveElement(this IHubContext<DashboardHub> hub, string clientId, string componentId, string parentId)
         {
-            await hub.Clients.Client(clientId).SendAsync("removeElement", componentId);
+            await hub.Clients.Client(clientId).SendAsync("removeElement", componentId, parentId);
         }
 
-        public static async Task RemoveElement(this IHubContext<DashboardHub> hub, string componentId)
+        public static async Task RemoveElement(this IHubContext<DashboardHub> hub, string componentId, string parentId)
         {
-            await hub.Clients.All.SendAsync("removeElement", componentId);
+            await hub.Clients.All.SendAsync("removeElement", componentId, parentId);
         }
 
         public static async Task ClearElement(this IHubContext<DashboardHub> hub, string clientId, string componentId)

diff --git a/src/client/src/app/ud-dashboard.jsx b/src/client/src/app/ud-dashboard.jsx
@@ -77,10 +77,11 @@ export default class UdDashboard extends React.Component {
             });
         });
 
-        connection.on('removeElement', (componentId) => {
+        connection.on('removeElement', (componentId, parentId) => {
             PubSub.publish(componentId, {
                 type: "removeElement",
-                componentId: componentId
+                componentId: componentId,
+                parentId: parentId
             });
         });