Remove buttons (#984)

* Remove re/undo buttons and move console to end

* Update tests

Author: gjmooney

packages/base/src/toolbar/widget.tsx

@@ -12,8 +12,6 @@ import {
   Toolbar,
   ToolbarButton,
   addIcon,
-  redoIcon,
-  undoIcon,
 } from '@jupyterlab/ui-components';
 import { CommandRegistry } from '@lumino/commands';
 import { Widget } from '@lumino/widgets';
@@ -74,42 +72,12 @@ export class ToolbarWidget extends ReactiveToolbar {
     this.addClass('jGIS-toolbar-widget');
 
     if (options.commands) {
-      const undoButton = new CommandToolbarButton({
-        id: CommandIDs.undo,
-        label: '',
-        icon: undoIcon,
-        commands: options.commands,
-      });
-
-      this.addItem('undo', undoButton);
-      undoButton.node.dataset.testid = 'undo-button';
-
-      const redoButton = new CommandToolbarButton({
-        id: CommandIDs.redo,
-        label: '',
-        icon: redoIcon,
-        commands: options.commands,
-      });
-      this.addItem('redo', redoButton);
-
-      this.addItem('separator0', new Separator());
-
-      const toggleConsoleButton = new CommandToolbarButton({
-        id: CommandIDs.toggleConsole,
-        commands: options.commands,
-        label: '',
-        icon: terminalToolbarIcon,
-      });
-      this.addItem('Toggle console', toggleConsoleButton);
-      toggleConsoleButton.node.dataset.testid = 'toggle-console-button';
-
-      this.addItem('separator1', new Separator());
-
       const openLayersBrowserButton = new CommandToolbarButton({
         id: CommandIDs.openLayerBrowser,
         label: '',
         commands: options.commands,
       });
+
       this.addItem('openLayerBrowser', openLayersBrowserButton);
       openLayersBrowserButton.node.dataset.testid = 'open-layers-browser';
 
@@ -138,17 +106,18 @@ export class ToolbarWidget extends ReactiveToolbar {
           NewSubMenu.open(bbox.x, bbox.bottom);
         },
       });
-      NewEntryButton.node.dataset.testid = 'new-entry-button';
 
       this.addItem('New', NewEntryButton);
+      NewEntryButton.node.dataset.testid = 'new-entry-button';
 
-      this.addItem('separator2', new Separator());
+      this.addItem('separator1', new Separator());
 
       const geolocationButton = new CommandToolbarButton({
         id: CommandIDs.getGeolocation,
         commands: options.commands,
         label: '',
       });
+
       this.addItem('Geolocation', geolocationButton);
       geolocationButton.node.dataset.testid = 'geolocation-button';
 
@@ -166,6 +135,7 @@ export class ToolbarWidget extends ReactiveToolbar {
         label: '',
         commands: options.commands,
       });
+
       this.addItem('temporalController', temporalControllerButton);
       temporalControllerButton.node.dataset.testid =
         'temporal-controller-button';
@@ -175,9 +145,21 @@ export class ToolbarWidget extends ReactiveToolbar {
         label: '',
         commands: options.commands,
       });
+
       this.addItem('addMarker', addMarkerButton);
       addMarkerButton.node.dataset.testid = 'add-marker-controller-button';
 
+      this.addItem('separator2', new Separator());
+
+      const toggleConsoleButton = new CommandToolbarButton({
+        id: CommandIDs.toggleConsole,
+        commands: options.commands,
+        label: '',
+        icon: terminalToolbarIcon,
+      });
+      this.addItem('Toggle console', toggleConsoleButton);
+      toggleConsoleButton.node.dataset.testid = 'toggle-console-button';
+
       this.addItem('spacer', ReactiveToolbar.createSpacerItem());
 
       // Users

ui-tests/tests/contextmenu.spec.ts

@@ -72,8 +72,6 @@ test.describe('context menu', () => {
       .press('Enter');
 
     await expect(page.getByText('new group', { exact: true })).toHaveCount(1);
-    await page.getByRole('button', { name: 'Undo' }).click();
-    await expect(layer).toBeVisible();
   });
 
   test('clicking remove layer should remove the layer from the tree', async ({
@@ -121,9 +119,6 @@ test.describe('context menu', () => {
 
     await page.getByRole('menu').getByText('Remove Group').click();
     await expect(firstItem).not.toBeVisible();
-
-    await page.getByRole('button', { name: 'Undo' }).click();
-    await expect(firstItem).toBeVisible();
   });
 
   test('pressing F2 should start rename for layer', async ({ page }) => {