From 671894bd0b5b1afd318322cbfbbe3ca734e306d0 Mon Sep 17 00:00:00 2001
From: Micah <micahnyc@gmail.com>
Date: Thu, 2 Sep 2021 14:56:25 -0400
Subject: [PATCH] changes for action panel

---
 data/assets/util/webgui.asset               | 2 +-
 modules/server/src/topics/shortcuttopic.cpp | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset
index aea760c206..d405b8140e 100644
--- a/data/assets/util/webgui.asset
+++ b/data/assets/util/webgui.asset
@@ -3,7 +3,7 @@ asset.require('./static_server')
 local guiCustomization = asset.require('customization/gui')
 
 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "224ef14e76ab76f5f91df2f0e35d6b9f6805aaf4"
+local frontendHash = "f3e5a4021304c15bfdfb11835a6d19eeb332d1b8"
 local dataProvider = "data.openspaceproject.com/files/webgui"
 
 local frontend = asset.syncedResource({
diff --git a/modules/server/src/topics/shortcuttopic.cpp b/modules/server/src/topics/shortcuttopic.cpp
index cd8fce7995..c40ed6ec25 100644
--- a/modules/server/src/topics/shortcuttopic.cpp
+++ b/modules/server/src/topics/shortcuttopic.cpp
@@ -47,6 +47,7 @@ std::vector<nlohmann::json> ShortcutTopic::shortcutsJson() const {
     std::vector<nlohmann::json> json;
     for (const interaction::Action& action : global::actionManager->actions()) {
         nlohmann::json shortcutJson = {
+            { "identifier", action.identifier },
             { "name", action.name },
             { "script", action.command },
             { "synchronization", static_cast<bool>(action.synchronization) },
@@ -77,11 +78,7 @@ std::vector<nlohmann::json> ShortcutTopic::shortcutsJson() const {
                     { "super" , hasKeyModifier(k.modifier, KeyModifier::Super) }
                 }
             },
-            { "name", action.name },
-            { "script", action.command },
-            { "synchronization", static_cast<bool>(action.synchronization) },
-            { "documentation", action.documentation },
-            { "guiPath", action.guiPath },
+            { "action", action.name },
         };
         json.push_back(shortcutJson);
     }