feat: fix delete workspace on reload (#723)

* feat: fix delete workspace on reload * Update src/main.js --------- Co-authored-by: Mark Haslinghuis <mark@numloq.nl>
betaflight · Mar 27, 2024 · 79334ae · 79334ae
1 parent 386f6c8
commit 79334ae
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/main.js b/src/main.js
@@ -1059,6 +1059,24 @@ function BlackboxLogViewer() {
         }
 
         graphLegend = new GraphLegend($(".log-graph-legend"), activeGraphConfig, onLegendVisbilityChange, onLegendSelectionChange, onLegendHighlightChange, zoomGraphConfig, expandGraphConfig, newGraphConfig);
+
+        // initial load of the configuration defaults if we have them
+        prefs.get('workspaceGraphConfigs', function(item) {
+            if (item) {
+                workspaceGraphConfigs = upgradeWorkspaceFormat(item);
+            } else {
+                workspaceGraphConfigs = [];
+            }
+        });
+
+        prefs.get('activeWorkspace', function (id){
+            if (id) {
+                activeWorkspace = id
+            }
+            else {
+                activeWorkspace = 1
+            }
+        });
 
         workspaceSelection = new WorkspaceSelection($(".log-workspace-selection"), workspaceGraphConfigs, onSwitchWorkspace, onSaveWorkspace);
         onSwitchWorkspace(workspaceGraphConfigs, workspaceSelection);

diff --git a/src/workspace_selection.js b/src/workspace_selection.js
@@ -1,3 +1,5 @@
+const UNTITLED = "Untitled";
+
 export function WorkspaceSelection(targetElem, workspaces, onSelectionChange, onSaveWorkspace) {
     var
         numberSpan = null,
@@ -39,7 +41,7 @@ export function WorkspaceSelection(targetElem, workspaces, onSelectionChange, on
         var inputElem = $('<input type="text" onkeyup="event.preventDefault()">');
         inputElem.click((e) => e.stopPropagation()); // Stop click from closing
         titleSpan.replaceWith(inputElem);
-        inputElem.val(workspaces[activeId].title)
+        inputElem.val(workspaces[activeId]?.title)
         inputElem.focus();
         inputElem.on('focusout', () => {
             inputElem.replaceWith(titleSpan);
@@ -88,7 +90,7 @@ export function WorkspaceSelection(targetElem, workspaces, onSelectionChange, on
             var saveButton = $('<span class="glyphicon glyphicon-floppy-disk" aria-hidden="true" data-toggle="tooltip" title="Save current graph setup to this Workspace"></span>');
             saveButton.click((e) => {
                 if (!element) {
-                    onSaveWorkspace(id, "Unnamed");
+                    onSaveWorkspace(id, UNTITLED);
                 }
                 else {
                     onSaveWorkspace(id, element.title);