From f0a0d2c9fcf8483a27f5d966589d54624792ebc1 Mon Sep 17 00:00:00 2001 From: DenisaCG Date: Tue, 5 Nov 2024 12:12:15 +0100 Subject: [PATCH 1/3] eliminate redundant panel --- src/index.ts | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/src/index.ts b/src/index.ts index c815a0f..f1ddf16 100644 --- a/src/index.ts +++ b/src/index.ts @@ -22,7 +22,6 @@ import { import { ISettingRegistry } from '@jupyterlab/settingregistry'; import { FilenameSearcher, IScore } from '@jupyterlab/ui-components'; import { CommandRegistry } from '@lumino/commands'; -import { Panel } from '@lumino/widgets'; import { DriveListModel, DriveListView, IDrive } from './drivelistmanager'; import { DriveIcon, driveBrowserIcon } from './icons'; @@ -203,9 +202,17 @@ const driveFileBrowser: JupyterFrontEndPlugin = { // Set attributes when adding the browser to the UI driveBrowser.node.setAttribute('role', 'region'); driveBrowser.node.setAttribute('aria-label', 'Drive Browser Section'); + driveBrowser.title.icon = driveBrowserIcon; + driveBrowser.title.caption = 'Drive File Browser'; + driveBrowser.id = 'Drive-File-Browser'; void Private.restoreBrowser(driveBrowser, commands, router, tree, labShell); + app.shell.add(driveBrowser, 'left', { rank: 102, type: 'File Browser' }); + if (restorer) { + restorer.add(driveBrowser, 'drive-file-browser'); + } + toolbarRegistry.addFactory( FILE_BROWSER_FACTORY, 'uploader', @@ -246,19 +253,6 @@ const driveFileBrowser: JupyterFrontEndPlugin = { translator ) ); - - // instate Drive Browser Panel - const drivePanel = new Panel(); - drivePanel.title.icon = driveBrowserIcon; - drivePanel.title.iconClass = 'jp-sideBar-tabIcon'; - drivePanel.title.caption = 'Drive File Browser'; - drivePanel.id = 'Drive-Browser-Panel'; - - app.shell.add(drivePanel, 'left', { rank: 102, type: 'File Browser' }); - drivePanel.addWidget(driveBrowser); - if (restorer) { - restorer.add(drivePanel, 'drive-sidepanel'); - } } }; From 0e75ea10fb40aeb0ccc2a891c68395cadc644310 Mon Sep 17 00:00:00 2001 From: DenisaCG Date: Tue, 5 Nov 2024 12:35:53 +0100 Subject: [PATCH 2/3] hide toolbar button labels --- schema/drives-file-browser.json | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/schema/drives-file-browser.json b/schema/drives-file-browser.json index aabaeea..ec4167d 100644 --- a/schema/drives-file-browser.json +++ b/schema/drives-file-browser.json @@ -2,30 +2,36 @@ "title": "Jupyter Drives Settings", "description": "jupyter-drives settings.", "jupyter.lab.toolbars": { + "displayMode": "icon", "DriveBrowser": [ { "name": "new-launcher", "command": "launcher:create", + "label": "", "rank": 1 }, { "name": "new-directory", "command": "filebrowser:create-new-directory", + "label": "", "rank": 10 }, - { "name": "uploader", "rank": 20 }, + { "name": "uploader", "label": "", "rank": 20 }, { "name": "refresh", "command": "filebrowser:refresh", + "label": "", "rank": 30 }, { "name": "toggle-file-filter", "command": "filebrowser:toggle-file-filter", + "label": "", "rank": 40 }, { "name": "file-name-searcher", + "label": "", "rank": 50 } ] From d986533a3530410673b071667e9d90595231fda7 Mon Sep 17 00:00:00 2001 From: DenisaCG Date: Tue, 5 Nov 2024 12:37:53 +0100 Subject: [PATCH 3/3] remove additional arguments from schema --- schema/drives-file-browser.json | 1 - 1 file changed, 1 deletion(-) diff --git a/schema/drives-file-browser.json b/schema/drives-file-browser.json index ec4167d..1fe7a13 100644 --- a/schema/drives-file-browser.json +++ b/schema/drives-file-browser.json @@ -2,7 +2,6 @@ "title": "Jupyter Drives Settings", "description": "jupyter-drives settings.", "jupyter.lab.toolbars": { - "displayMode": "icon", "DriveBrowser": [ { "name": "new-launcher",