feat(ui): add Delete key binding to remove systems

updraft0 · Jun 11, 2024 · 2050285 · 2050285
1 parent a4ee8ce
commit 2050285
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 17 deletions.
diff --git a/ui/src/main/css/app.css b/ui/src/main/css/app.css
@@ -25,11 +25,6 @@
     box-sizing: border-box;
 }
 
-button {
-    padding: 0;
-    color: $gray-lightest;
-}
-
 :root {
     font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
     line-height: 1.5;
@@ -49,6 +44,12 @@ button {
     scrollbar-color: $gray-darker $gray-dark;
 }
 
+
+button {
+    padding: 2px;
+    color: $gray-lightest;
+}
+
 table {
     border-collapse: collapse;
 }

diff --git a/ui/src/main/scala/controltower/component/Modal.scala b/ui/src/main/scala/controltower/component/Modal.scala
@@ -75,7 +75,7 @@ object Modal:
         div(
           cls := "dialog-view",
           cls := "confirm-dialog-view",
-          div(cls := "dialog-header", title),
+          h2(cls  := "dialog-header", title),
           div(cls := "dialog-body", description),
           form(
             method := "dialog",

diff --git a/ui/src/main/scala/controltower/page/map/view/MapView.scala b/ui/src/main/scala/controltower/page/map/view/MapView.scala
@@ -150,6 +150,16 @@ private class MapView(
 
     div(
       idAttr := "map-view-inner",
+
+      // delete -> remove system
+
+      // TODO: make helpers for these
+      documentEvents(
+        _.onKeyDown
+          .filter(ev => !ev.repeat && ev.code == "Delete")
+      ).mapToUnit.compose(_.withCurrentValueOf(controller.selectedSystem)).filterNot(_.isEmpty).map(_.get) --> (
+        system => removeSystemConfirm(system, controller.actionsBus)(using rds)
+      ),
       div(
         idAttr := "map-parent",
         cls    := "grid",

diff --git a/ui/src/main/scala/controltower/page/map/view/ToolbarView.scala b/ui/src/main/scala/controltower/page/map/view/ToolbarView.scala
@@ -43,17 +43,7 @@ class ToolbarView(
         "ti-trash",
         disableWhenNotSelectedAndRole(selected, mapRole, RoleController.canRemoveSystem, isConnected),
         onClick.stopPropagation.compose(_.sampleCollectSome(selected)) --> (system =>
-          Modal.showConfirmation(
-            "Confirm removal",
-            span(
-              child.text <-- Signal
-                .fromFuture(rds.systemForId(system.system.systemId))
-                .map(_.flatten.map(_.name).getOrElse(s"?? ${system.system.systemId}"))
-                .map(n => s"Remove system $n?")
-            ),
-            actions.contramap(_ => MapAction.Remove(system.system.systemId)),
-            isDestructive = true
-          )
+          removeSystemConfirm(system, actions)(using rds)
         )
       ),
       toolbarButtonS(
@@ -233,3 +223,21 @@ private def systemAddView(
       )
     )
   )
+
+private[map] def removeSystemConfirm(system: MapSystemSnapshot, actions: WriteBus[MapAction])(using
+    rds: ReferenceDataStore
+) =
+  Modal.showConfirmation(
+    "Confirm removal",
+    span(
+      child.text <--
+        Signal
+          .fromFuture(rds.systemForId(system.system.systemId))
+          .map(_.flatten.map(_.name).getOrElse(s"?? ${system.system.systemId}"))
+          .map(solarName =>
+            system.system.name.map(n => s"Remove system $n ($solarName)?").getOrElse(s"Remove system $solarName?")
+          )
+    ),
+    actions.contramap(_ => MapAction.Remove(system.system.systemId)),
+    isDestructive = true
+  )