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

Fix missing default property breaking codemirror overrides.json #15346

Merged
merged 1 commit into from
Nov 8, 2023
Merged

Fix missing default property breaking codemirror overrides.json #15346

merged 1 commit into from
Nov 8, 2023

Conversation

e4e
Copy link
Contributor

@e4e e4e commented Nov 2, 2023

References

fix server error 500 on trying to settings override "@jupyterlab/codemirror-extension:plugin" for all users:

Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]: [W 2023-11-02 03:54:57.430 LabApp] wrote error: 'Unhandled error'
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:     Traceback (most recent call last):
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:       File "/opt/tljh/user/lib/python3.10/site-packages/tornado/web.py", line 1784, in _execute
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:         result = method(*self.path_args, **self.path_kwargs)
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:       File "/opt/tljh/user/lib/python3.10/site-packages/tornado/web.py", line 3290, in wrapper
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:         return method(self, *args, **kwargs)
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:       File "/opt/tljh/user/lib/python3.10/site-packages/jupyterlab_server/settings_handler.py", line 48, in get
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:         result, warnings = get_settings(
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:       File "/opt/tljh/user/lib/python3.10/site-packages/jupyterlab_server/settings_utils.py", line 377, in get_settings
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:         settings_list, warnings = _list_settings(
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:       File "/opt/tljh/user/lib/python3.10/site-packages/jupyterlab_server/settings_utils.py", line 168, in _list_settings
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:         schema, version = _get_schema(schemas_dir, schema_name, overrides, None)
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:       File "/opt/tljh/user/lib/python3.10/site-packages/jupyterlab_server/settings_utils.py", line 57, in _get_schema
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:         schema = _override(schema_name, schema, overrides)
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:       File "/opt/tljh/user/lib/python3.10/site-packages/jupyterlab_server/settings_utils.py", line 232, in _override
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:         new_defaults = schema["properties"][key]["default"]
Nov 02 03:54:57 jupyterhub jupyterhub-singleuser[1817]:     KeyError: 'default'

Code changes

added key "default"

User-facing changes

this finally works as advertised

Backwards-incompatible changes

🤷

@jupyterlab-probot jupyterlab-probot
Copy link

Thanks for making a pull request to jupyterlab!
To try out this branch on binder, follow this link: Binder

@welcome Welcome
Copy link

welcome bot commented Nov 2, 2023

Thanks for submitting your first pull request! You are awesome! 🤗

If you haven't done so already, check out Jupyter's Code of Conduct. Also, please make sure you followed the pull request template, as this will help us review your contribution more quickly.
welcome
You can meet the other Jovyans by joining our Discourse forum. There is also a intro thread there where you can stop by and say Hi! 👋

Welcome to the Jupyter community! 🎉

@krassowski krassowski added the bug label Nov 2, 2023
@fcollonval fcollonval added this to the 4.0.x milestone Nov 4, 2023
fcollonval
fcollonval approved these changes Nov 8, 2023
View reviewed changes
Copy link
Member

@fcollonval fcollonval left a comment

Choose a reason for hiding this comment

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

Thanks @LJMP and congrats on the first PR.

@krassowski krassowski changed the title added default property Fix missing default property breaking overrides.json Nov 8, 2023
@krassowski krassowski changed the title Fix missing default property breaking overrides.json Fix missing default property breaking codemirror overrides.json Nov 8, 2023
@krassowski krassowski merged commit a688380 into jupyterlab:main Nov 8, 2023
78 of 83 checks passed
@welcome Welcome
Copy link

welcome bot commented Nov 8, 2023

Congrats on your first merged pull request in this project! 🎉
congrats
Thank you for contributing, we are very proud of you! ❤️

@krassowski
Copy link
Member

@meeseeksdev please backport to 4.0.x

@meeseeksmachine meeseeksmachine mentioned this pull request Nov 8, 2023
Merged
meeseeksmachine pushed a commit to meeseeksmachine/jupyterlab that referenced this pull request Nov 8, 2023
@e4e @meeseeksmachine
Backport PR jupyterlab#15346: Fix missing default property breaking c…
b023df9 
…odemirror `overrides.json`
krassowski pushed a commit that referenced this pull request Nov 9, 2023
@meeseeksmachine @e4e
Backport PR #15346: Fix missing default property breaking codemirror …
c8d092d 
…`overrides.json` (#15374)

Co-authored-by: LJMP <24670649+LJMP@users.noreply.github.com>
m158261 pushed a commit to m158261/jupyterlab that referenced this pull request Nov 13, 2023
@e4e @m158261
added default property (jupyterlab#15346)
3276210
krassowski added a commit that referenced this pull request Dec 15, 2023
@m158261 @krassowski
@skyetim @github-actions @fcollonval @paulkim3151 @pre-commit-ci @divyansshhh @dependabot @nbowditch-einblick @e4e @brichet @firai @trungleduc @jtpio
Clarify labels for user inputs and link dangling labels (#15222)
8eb902e 
* Updated input field with more descriptive aria-labels and placeholders

* Package integrity updates

* Run integrity

* Move ID generation to improve render flow

* Use ellipsis character for consistency

* Add error indicator in Table of Contents (#14784)

* feat: add error indicator in toc

* test: for error indicator

* Update Playwright Snapshots

* style: make the error symbol colorblind-accessible

* Update Playwright Snapshots

* fix: remove from _errorCells when cell is rerun

* perf: update error to -0.5 for api compatibility

* test: update error status to -0.5

* Update Playwright Snapshots

* Force text symbol

* Update Playwright Snapshots

* Update Playwright Snapshots

* Update Playwright Snapshots

* Revert notebook-panel-1 snapshot update

* Robustify test by defining notebook a priori

* Update Playwright Snapshots

---------

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>
Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>

* Remove unnecessary requirement from servicesPlugin (#15362)

* [pre-commit.ci] pre-commit autoupdate (#15358)

* [pre-commit.ci] pre-commit autoupdate

updates:
- [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v4.5.0](pre-commit/pre-commit-hooks@v4.4.0...v4.5.0)
- [github.com/python-jsonschema/check-jsonschema: 0.27.0 → 0.27.1](python-jsonschema/check-jsonschema@0.27.0...0.27.1)
- [github.com/psf/black: 23.9.1 → 23.10.1](psf/black@23.9.1...23.10.1)
- [github.com/astral-sh/ruff-pre-commit: v0.0.292 → v0.1.4](astral-sh/ruff-pre-commit@v0.0.292...v0.1.4)

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Alig ruff version

* Add ruff exception

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>

* Update notebook window on resize if height changes (#15357)

* Add a test for resizing notebook (should fail)

* Update window on resize

* Polish the test

* Add the test notebook

* Use throttler to limit the number of updates

Using throttler over debouncer proposed in #15109 because
debouncer would not show cells progressively during resize
until user has stopped resizing.

* Open files from errors (#13390)

* Create renderer to render errors

* WIP tests scaffold

* Implement opening files from paths in error renderer

* Finish sentence in a comment

* Apply suggestions from code review

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>

* Improve RFC 5147 adherence for ranges

* Switch to 0-based line numbers based on RFC5147 2.2.3:

"Line position counting starts with zero, so the line
position before the first line of a text/plain MIME
entity has the line position zero"

* Fix undefined check after adding `parseInt`

---------

Co-authored-by: krassowski <5832902+krassowski@users.noreply.github.com>
Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>

* Bump tj-actions/changed-files from 39.2.0 to 40.0.2 (#15342)

Bumps [tj-actions/changed-files](https://github.com/tj-actions/changed-files) from 39.2.0 to 40.0.2.
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](tj-actions/changed-files@v39.2.0...v40.0.2)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix scrolling past long outputs in presence of un-rendered headings (#15356)

* Add a test for smooth scrolling over long outputs

* Do no scroll when setting the cursor position in md cells

* Adjust test name to clarify the test case

* Add the test notebook

* Clean up the test directory

* Fix overreactive scrolling to next cell after `Shift + Enter` (#15288)

* Add a test case for #14878

* Fix the smart/auto scrolling logic for long items

Items larger than the size of the viewport were not
considered by the scroll logic leading to bad UX when
smart/auto scroll was requested on certain operations.

* Use pixel-based, cell-height-derived threshold for scrolling

* Implement dual behaviour, simplify code, account for top padding

* Use greater or equal to avoid scrolling if item fully visible

* Update tests to reflect new expectations

* Clean up the temp directory after tests

* Fix scrolling when dragging files in the file browser (#15318)

* Fix scrolling on edges in file browser

* Add a simple test

* Fix update button in extension manager (#15331)

* Fix update button in extension manager

* Apply suggestions from code review

Make action options more flexible

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>

* Fix docs and make install options optional

* Add test for update button

* Update Playwright Snapshots

* Revert spurious snapshot updates

---------

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: krassowski <5832902+krassowski@users.noreply.github.com>

* added default property (#15346)

* Exclude ipynb files in prettier pre-commit (#15378)

* Update @jupyter/ydoc in dev_mode (#15383)

* Define cells to run as independent of selection (#14996)

* Define cells to run as independent of selection

* Restore side effects of `runAll()`

* Skip optional `slice` argument

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>

* Restore previous behaviour of `runAllBelow()`

by making last cell active.

---------

Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>

* Fix highlighting search in an out-of-viewport cell (#15376)

* Fix highlighting search in an out-of-viewport cell

* Update cells count

* Don't show default value for objects in Settings Editor (#15380)

* Don't show default value if schema type is `object`

* Prettier

* Bump axios from 1.3.4 to 1.6.1 (#15385)

Bumps [axios](https://github.com/axios/axios) from 1.3.4 to 1.6.1.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md)
- [Commits](axios/axios@v1.3.4...v1.6.1)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix connection loop issue with standalone foreign document in LSP (#15262)

* Populate

* Improve VirtualDocument

* Add test

* Update packages/lsp/test/document.spec.ts

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>

---------

Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>

* Update to TypeScript 5.1 (#14638)

* Bump typescript to 5.1.6 and rimraf to 5.0.5

* Dedupe the yarn.lock

---------

Co-authored-by: Frédéric Collonval <fcollonval@gmail.com>

* Resolved merge conflict

* Package integrity updates

Merged changes from main

* Package integrity updates

* Package integrity updates

* Update Playwright Snapshots

* Fixed integrity

* Update Playwright Snapshots

* Update Playwright Snapshots

* Remove spurious snapshot updates

* Update the test to reflect the new wording

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: EC2 Default User <m158261@users.noreply.github.com>
Co-authored-by: Michał Krassowski <5832902+krassowski@users.noreply.github.com>
Co-authored-by: Tian Wang <wangtian0312@gmail.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>
Co-authored-by: Paul Kim <paulkim3151@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Divyansh Choudhary <divyanshchoudhary99@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Nate Bowditch <111072326+nbowditch-einblick@users.noreply.github.com>
Co-authored-by: LJMP <24670649+LJMP@users.noreply.github.com>
Co-authored-by: Nicolas Brichet <32258950+brichet@users.noreply.github.com>
Co-authored-by: firai <firai.admin@gmail.com>
Co-authored-by: Duc Trung Le <leductrungxf@gmail.com>
Co-authored-by: Jeremy Tuloup <jeremy.tuloup@gmail.com>
Co-authored-by: Frédéric Collonval <fcollonval@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fcollonval fcollonval fcollonval approved these changes

Assignees

@e4e e4e

Labels
bug pkg:codemirror
Projects
None yet
Milestone
4.0.x
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@e4e @krassowski @fcollonval