From f6035e69c8c44a3c532ea7a446a437ef4c4fe332 Mon Sep 17 00:00:00 2001 From: Marcelo Villa Date: Fri, 16 Feb 2024 11:24:31 -0500 Subject: [PATCH 1/7] Rename Nebari menu item label and move it before the Help menu item. --- .../services/jupyterhub/files/jupyterlab/overrides.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json index bdd69047c1..619f923e45 100644 --- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json +++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json @@ -15,10 +15,10 @@ "@jupyterlab/mainmenu-extension:plugin": { "menus": [ { - "id": "jp-mainmenu-nebari", + "id": "jp-mainmenu-services", "disabled": false, - "label": "Nebari", - "rank": 1001, + "label": "Services", + "rank": 999, "items": [ { "command": "hub:control-panel", From 0f34ffdfb22be2ce55fc1c99a4c620b8cbd173f3 Mon Sep 17 00:00:00 2001 From: Marcelo Villa Date: Fri, 16 Feb 2024 12:00:36 -0500 Subject: [PATCH 2/7] Add Nebari documentation as an item in the Help menu. --- .../jupyterhub/files/jupyterlab/overrides.json | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json index 619f923e45..95a29c2c06 100644 --- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json +++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json @@ -20,10 +20,6 @@ "label": "Services", "rank": 999, "items": [ - { - "command": "hub:control-panel", - "rank": 0 - }, { "command": "help:open", "rank": 1, @@ -61,6 +57,20 @@ } } ] + }, + { + "id": "jp-mainmenu-help", + "items": [ + { + "command": "help:open", + "rank": 1001, + "args": { + "url": "https://www.nebari.dev/docs/welcome", + "text": "Nebari documentation", + "newBrowserTab": true + } + } + ] } ] } From 2ef0863aab6687a2c15aa78d2f9d566dba41ce13 Mon Sep 17 00:00:00 2001 From: Marcelo Villa Date: Fri, 16 Feb 2024 12:51:15 -0500 Subject: [PATCH 3/7] Disable Hub Control Panel and Log out items and add Home item in the File menu. --- .../files/jupyterlab/overrides.json | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json index 95a29c2c06..1bf9723934 100644 --- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json +++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json @@ -14,6 +14,28 @@ }, "@jupyterlab/mainmenu-extension:plugin": { "menus": [ + { + "id": "jp-mainmenu-file", + "items": [ + { + "command": "hub:control-panel", + "disabled": true + }, + { + "command": "hub:logout", + "disabled": true + }, + { + "command": "help:open", + "rank": 101, + "args": { + "url": "/hub/home", + "text": "Home", + "newBrowserTab": true + } + } + ] + }, { "id": "jp-mainmenu-services", "disabled": false, From e8b91a11558abb3cad11e0d16ffed6a6a1e449b3 Mon Sep 17 00:00:00 2001 From: Marcelo Villa Date: Fri, 16 Feb 2024 13:54:43 -0500 Subject: [PATCH 4/7] Move Home item to the top. --- .../files/jupyterlab/overrides.json | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json index 1bf9723934..00a221c885 100644 --- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json +++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json @@ -17,22 +17,29 @@ { "id": "jp-mainmenu-file", "items": [ - { - "command": "hub:control-panel", - "disabled": true - }, - { - "command": "hub:logout", - "disabled": true - }, { "command": "help:open", - "rank": 101, + "rank": 0, "args": { "url": "/hub/home", "text": "Home", "newBrowserTab": true } + }, + { + "type": "submenu", + "submenu": { + "id": "jp-mainmenu-file-new" + }, + "rank": 0.5 + }, + { + "command": "hub:control-panel", + "disabled": true + }, + { + "command": "hub:logout", + "disabled": true } ] }, From cb9e1ac8e03878c05908f13f9d8313e4c0e55c1b Mon Sep 17 00:00:00 2001 From: Marcelo Villa Date: Fri, 16 Feb 2024 14:55:51 -0500 Subject: [PATCH 5/7] Make sure that the Services menu item is left from the Help menu. --- .../services/jupyterhub/files/jupyterlab/overrides.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json index 00a221c885..5c9b8eb8cb 100644 --- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json +++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json @@ -47,7 +47,7 @@ "id": "jp-mainmenu-services", "disabled": false, "label": "Services", - "rank": 999, + "rank": 1000, "items": [ { "command": "help:open", @@ -89,6 +89,7 @@ }, { "id": "jp-mainmenu-help", + "rank": 1001, "items": [ { "command": "help:open", From 790e7afc319c70803928d53e943c537bd367f7be Mon Sep 17 00:00:00 2001 From: Marcelo Villa Date: Sun, 18 Feb 2024 15:26:08 -0500 Subject: [PATCH 6/7] Update menu item to Home because it changed in the UI. --- tests/common/navigator.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/common/navigator.py b/tests/common/navigator.py index 50fc1837bc..12a1445bd5 100644 --- a/tests/common/navigator.py +++ b/tests/common/navigator.py @@ -413,9 +413,7 @@ def stop_server(self) -> None: self.page.get_by_text("File", exact=True).click() with self.context.expect_page() as page_info: - self.page.get_by_role( - "menuitem", name="Hub Control Panel", exact=True - ).click() + self.page.get_by_role("menuitem", name="Home", exact=True).click() home_page = page_info.value home_page.wait_for_load_state() From d11993e85544c78a286bcdb29da696ccac20a8cd Mon Sep 17 00:00:00 2001 From: Marcelo Villa Date: Mon, 19 Feb 2024 09:31:13 -0500 Subject: [PATCH 7/7] Update src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com> --- .../services/jupyterhub/files/jupyterlab/overrides.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json index 5c9b8eb8cb..357ab1af0c 100644 --- a/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json +++ b/src/_nebari/stages/kubernetes_services/template/modules/kubernetes/services/jupyterhub/files/jupyterlab/overrides.json @@ -95,7 +95,7 @@ "command": "help:open", "rank": 1001, "args": { - "url": "https://www.nebari.dev/docs/welcome", + "url": "https://www.nebari.dev/docs/welcome/", "text": "Nebari documentation", "newBrowserTab": true }