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.

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

Backport/3.2.x/11608 Toggle side-by-side rendering for current notebook #11718

Merged
merged 2 commits into from
Dec 18, 2021

Conversation

echarles
Copy link
Member

Manual Backport to 3.2.x branch of Toggle side-by-side rendering for current notebook #11608

* Toggle side-by-side rendering for current notebook

* swap the shortcuts for the side-by-side toggling

* Use render_side_by_side as notebook metadata

* Add render_side_by_side in the unshared rtc keys

* Labe for side-by-side rendering

* Label for side-by-side rendering

* update opened-menu-view-jupyterlab-linux.png for galata test

* update opened-menu-view-jupyterlab-linux.png for galata test

* more generic rendering layout and use notebook widget to persist the rendering layout

* ensure side-by-side is correctly rendered when switching between different views of a same notebook

* fix widfget.spec.ts test

* fix widget.spec.ts test

* More type with RenderingMode

* Remove commands aiming to change the renderingLayout setting

* Show toogle indicator in the menu for Render Side-by-Side entry

* update the galata snapshot for side-by-side menu item
@jupyterlab-probot
Copy link

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

@echarles echarles changed the base branch from master to 3.2.x December 18, 2021 08:56
@echarles echarles closed this Dec 18, 2021
@echarles echarles reopened this Dec 18, 2021
Copy link
Member Author

@echarles echarles left a comment

Choose a reason for hiding this comment

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

CI green except check_i18n and enforce-label which I have seen failing also in previous backport PR. @fcollonval Can you confirm it is OK to merge?

@krassowski
Copy link
Member

IMO this is 3.3 material. I wouldn't mind the translations experience breakage as much as the settings key change.

@echarles
Copy link
Member Author

IMO this is 3.3 material.

Correct. The way we will release 3.3 is to branch from 3.2.x, this is why this PR targets 3.2.x

@echarles echarles mentioned this pull request Dec 18, 2021
20 tasks
@krassowski
Copy link
Member

So I guess we should create the 3.3.x branch soon so we could still have the same workflow when backporting bug fixes to 3.2.x? I think we will need at least one more 3.2.x to fix the console completer regression.

@echarles
Copy link
Member Author

I have added #11710 to the list of PR to go in 3.3.

I think the 3.3.x branch would typically be created just after the 3.3 release

I will merge this backport PR (green CI) unless anyone says otherwise.

@echarles echarles merged commit f4ef577 into jupyterlab:3.2.x Dec 18, 2021
@fcollonval
Copy link
Member

I think the 3.3.x branch would typically be created just after the 3.3 release

Actually this is not correct because, we need to be able to create patch release (for potential security fix).
Following the discussion at this week meeting, I'll create the 3.3.x branch.

Thanks @krassowski for pointing this was merged.

@fcollonval
Copy link
Member

To be able to rebase 3.3.x on 3.2.x up to the release date, I will revert this PR on 3.2.x and then re apply it targeting 3.3.x

@echarles
Copy link
Member Author

echarles commented Jan 6, 2022

Actually this is not correct because, we need to be able to create patch release (for potential security fix).

I have read the discussion, but not completely clear on that.

After the 3.2 release, we have merged many features in 3.2.x branch. Is this one the only one to be reverted or do we have to do that for all the PRs merged in 3.2.x?

@fcollonval
Copy link
Member

fcollonval commented Jan 6, 2022

The trouble of this PR is that it changes a setting key name => hence it should be part of 3.3

As far as of 3.1.x and 3.2.x (changelog link), there have been very few new features brought in patch releases. The only one I can spot that is actually not related to some fixes is #11533 that this PR is altering.

If we don't revert this one on 3.2.x and need to publish a new 3.2.# release, then this will break the behavior introduced in 3.2.5 as the side by side rendering setting is renamed.

@fcollonval
Copy link
Member

do we have to do that for all the PRs merged in 3.2.x?

So no only this one.

@echarles
Copy link
Member Author

echarles commented Jan 6, 2022

Sounds good. Thx for the explanations.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 7, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants