Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable jupyterlab-jhub-apps extension when jhub-apps is disabled #2804

Merged
merged 4 commits into from
Nov 28, 2024
Merged

Disable jupyterlab-jhub-apps extension when jhub-apps is disabled #2804

merged 4 commits into from
Nov 28, 2024

Conversation

krassowski
Copy link
Member

@krassowski krassowski commented Oct 29, 2024 •
edited
Loading

Reference Issues or PRs

Reference for the labconfig/page_config.json file:

What does this implement/fix?

Put a x in the boxes that apply

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds a feature)
  • Breaking change (fix or feature that would cause existing features not to work as expected)
  • Documentation Update
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no API changes)
  • Build related changes
  • Other (please describe):

Testing

  • Did you test the pull request locally?
    Yes
  • Did you add new tests?

How to test this PR?

  1. Deploy with:
default_images:
  jupyterhub: quay.io/nebari/nebari-jupyterhub:jhub-apps-2024-10-1-and-jlab-ext
  jupyterlab: quay.io/nebari/nebari-jupyterlab:jhub-apps-2024-10-1-and-jlab-ext
jhub_apps:
  enabled: true
  1. Open JupyterLab
  2. Open a Notebook
  3. See that there is a toolbar item ":rocket: Deploy App" like this:
    image
  4. Switch jhub_apps.enabled to false and deploy again
  5. Open JupyterLab/Notebook see that the toolbar item is no longer here

Any other comments?

None

@krassowski krassowski mentioned this pull request Oct 29, 2024
Merged
10 tasks
@krassowski
Copy link
Member Author

I believe the failing integration test is unrelated and tracked in #2777.

@krassowski
Mount page_config.json in top-level
b8530d6 
so that it applies across potential JupyterLab startup environments

also the previous spec was incorrectly pointing to a file (not a dir)
@krassowski krassowski marked this pull request as ready for review October 29, 2024 14:12
@marcelovilla marcelovilla added this to the 2024.10.1 release milestone Oct 29, 2024
marcelovilla
marcelovilla approved these changes Nov 28, 2024
View reviewed changes
Copy link
Member

@marcelovilla marcelovilla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @krassowski 🚀 ! I just tested this and it behaves as expected.

I will merge this and we'll include it in the next release of Nebari

@marcelovilla marcelovilla merged commit bbbcde3 into nebari-dev:main Nov 28, 2024
12 checks passed
smokestacklightnin added a commit to smokestacklightnin/nebari that referenced this pull request Dec 4, 2024
@smokestacklightnin
Squashed commit of the following:
c5f02e3 
commit bbbcde3
Merge: ce71236 3ac01b4
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Thu Nov 28 14:42:36 2024 -0500

    Disable `jupyterlab-jhub-apps` extension when jhub-apps is disabled (nebari-dev#2804)

commit ce71236
Author: Vinicius D. Cerutti <51954708+viniciusdc@users.noreply.github.com>
Date:   Thu Nov 21 13:53:57 2024 -0300

    Add 2024.11.1 release notes and bump version (nebari-dev#2859)

commit d272176
Merge: b442200 bbff007
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Wed Nov 20 08:56:51 2024 -0500

    Use tofu binary instead of terraform one (nebari-dev#2773)

commit bbff007
Merge: 0ecf6ef b442200
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Tue Nov 19 08:55:47 2024 -0500

    Merge branch 'main' into terraform-to-opentofu

commit 3ac01b4
Merge: a0bceea 621ea23
Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com>
Date:   Mon Nov 18 19:13:53 2024 +0100

    Merge branch 'main' into disable-jupyterlab-jhub-apps-extension

commit 0ecf6ef
Merge: a40cd40 621ea23
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Thu Nov 14 16:32:07 2024 -0500

    Merge branch 'main' into terraform-to-opentofu

commit a40cd40
Merge: 8e59c24 e7ff089
Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com>
Date:   Thu Nov 14 21:35:20 2024 +0100

    specify terraform registry for providers not in opentofu registry (nebari-dev#2852)

commit e7ff089
Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com>
Date:   Thu Nov 14 17:56:35 2024 +0100

    only update kind

commit 6f1b8d6
Merge: b2dd11c 8e59c24
Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com>
Date:   Wed Nov 13 18:03:11 2024 +0100

    Merge branch 'terraform-to-opentofu' into 2857-fix-providers

commit 8e59c24
Merge: ff29935 87ed92b
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Wed Nov 13 10:16:32 2024 -0500

    Merge branch 'main' into terraform-to-opentofu

commit b2dd11c
Merge: 415b136 ff29935
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Wed Nov 13 10:15:25 2024 -0500

    Merge branch 'terraform-to-opentofu' into 2857-fix-providers

commit 415b136
Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com>
Date:   Wed Nov 13 13:44:29 2024 +0100

    specify terraform registry for providers not in opentofu registry

commit ff29935
Merge: aef2796 855aa14
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Wed Nov 6 13:29:43 2024 -0500

    Merge branch 'main' into terraform-to-opentofu

commit aef2796
Merge: 06f9043 3429260
Author: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com>
Date:   Wed Nov 6 16:26:34 2024 +0100

    Merge branch 'main' into terraform-to-opentofu

commit a0bceea
Author: krassowski <5832902+krassowski@users.noreply.github.com>
Date:   Thu Oct 31 12:56:20 2024 +0000

    Fix typo

commit b8530d6
Author: krassowski <5832902+krassowski@users.noreply.github.com>
Date:   Tue Oct 29 13:56:56 2024 +0000

    Mount `page_config.json` in top-level

    so that it applies across potential JupyterLab startup environments

    also the previous spec was incorrectly pointing to a file (not a dir)

commit d1572eb
Author: krassowski <5832902+krassowski@users.noreply.github.com>
Date:   Tue Oct 29 10:43:29 2024 +0000

    Disable `jupyterlab-jhub-apps` extension when jhub-apps is disabled (if installed)

commit 06f9043
Merge: 8f709da ba0ae82
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Fri Oct 25 03:28:49 2024 -0500

    Merge branch 'main' into terraform-to-opentofu

commit 8f709da
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Thu Oct 17 08:03:09 2024 +0200

    Fix wrong function reference

commit 2b8c347
Merge: 80d67b9 c2ae895
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Wed Oct 16 23:36:10 2024 +0200

    Merge branch 'terraform-to-opentofu' of https://github.com/nebari-dev/nebari into terraform-to-opentofu

commit 80d67b9
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Wed Oct 16 23:36:01 2024 +0200

    Rename terraform.py file and terraform_init calls

commit c2ae895
Merge: 6a09d4e ccb8b7e
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Wed Oct 16 08:16:50 2024 -0500

    Merge branch 'main' into terraform-to-opentofu

commit 6a09d4e
Merge: d1dfabe 38960ea
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Tue Oct 15 04:54:16 2024 -0500

    Merge branch 'main' into terraform-to-opentofu

commit d1dfabe
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Tue Oct 15 11:53:49 2024 +0200

    Remove terraform open source license test

commit 96609c8
Author: Marcelo Villa <mvilla@quansight.com>
Date:   Mon Oct 14 23:00:05 2024 +0200

    Use tofu binary instead of terraform one
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marcelovilla marcelovilla marcelovilla approved these changes

Assignees
No one assigned
Labels
None yet
Projects
🪴 Nebari Project Management
Status: Done 💪🏾
Milestone
2025.1.1 release
Development

Successfully merging this pull request may close these issues.
3 participants
@krassowski @marcelovilla @dcmcand