From 2d4e76619f87cc28437daa5de1102e43d3883f26 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Tue, 9 Jun 2020 16:15:56 +0200
Subject: [PATCH] :bug: Fix group and upgroup events naming.

---
 frontend/src/uxbox/main/data/workspace.cljs          | 12 ++++++------
 .../src/uxbox/main/ui/workspace/context_menu.cljs    |  4 ++--
 frontend/src/uxbox/util/debug.cljs                   |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/src/uxbox/main/data/workspace.cljs b/frontend/src/uxbox/main/data/workspace.cljs
index 704d07c8f..c67ba08fd 100644
--- a/frontend/src/uxbox/main/data/workspace.cljs
+++ b/frontend/src/uxbox/main/data/workspace.cljs
@@ -1200,8 +1200,8 @@
    :width (:width selection-rect)
    :height (:height selection-rect)})
 
-(def create-group
-  (ptk/reify ::create-group
+(def group-selected
+  (ptk/reify ::group-selected
     ptk/WatchEvent
     (watch [_ state stream]
       (let [id (uuid/next)
@@ -1237,8 +1237,8 @@
             (rx/of (dwc/commit-changes rchanges uchanges {:commit-local? true})
                    (dws/select-shapes #{id}))))))))
 
-(def remove-group
-  (ptk/reify ::remove-group
+(def ungroup-selected
+  (ptk/reify ::ungroup-selected
     ptk/WatchEvent
     (watch [_ state stream]
       (let [page-id  (:current-page-id state)
@@ -1407,8 +1407,8 @@
    "ctrl+shift+'" #(st/emit! (toggle-layout-flag :snap-grid))
    "+" #(st/emit! (increase-zoom nil))
    "-" #(st/emit! (decrease-zoom nil))
-   "g" #(st/emit! create-group)
-   "shift+g" #(st/emit! remove-group)
+   "g" #(st/emit! group-selected)
+   "shift+g" #(st/emit! ungroup-selected)
    "shift+0" #(st/emit! reset-zoom)
    "shift+1" #(st/emit! zoom-to-fit-all)
    "shift+2" #(st/emit! zoom-to-selected-shape)
diff --git a/frontend/src/uxbox/main/ui/workspace/context_menu.cljs b/frontend/src/uxbox/main/ui/workspace/context_menu.cljs
index 16445a6ba..a626334ee 100644
--- a/frontend/src/uxbox/main/ui/workspace/context_menu.cljs
+++ b/frontend/src/uxbox/main/ui/workspace/context_menu.cljs
@@ -58,8 +58,8 @@
         do-hide-shape #(st/emit! (dw/recursive-assign id :hidden true))
         do-lock-shape #(st/emit! (dw/recursive-assign id :blocked true))
         do-unlock-shape #(st/emit! (dw/recursive-assign id :blocked false))
-        do-create-group #(st/emit! dw/create-group)
-        do-remove-group #(st/emit! dw/remove-group)]
+        do-create-group #(st/emit! dw/group-selected)
+        do-remove-group #(st/emit! dw/ungroup-selected)]
     [:*
      [:& menu-entry {:title "Copy"
                      :shortcut "Ctrl + c"
diff --git a/frontend/src/uxbox/util/debug.cljs b/frontend/src/uxbox/util/debug.cljs
index a6eae4df4..d997c3e5b 100644
--- a/frontend/src/uxbox/util/debug.cljs
+++ b/frontend/src/uxbox/util/debug.cljs
@@ -1,7 +1,7 @@
 (ns uxbox.util.debug
   "Debugging utils")
 
-(def debug-options #{:bounding-boxes :group :events :rotation-handler :resize-handler :selection-center #_:simple-selection })
+(def debug-options #{:bounding-boxes :group :events :rotation-handler :resize-handler :selection-center #_:simple-selection})
 
 (defonce ^:dynamic *debug* (atom #{}))