Skip to content

Backporting IUser/Collaboration PRs#13242

Merged
afshin merged 21 commits into
jupyterlab:3.6.xfrom
martinRenou:collaboration
Oct 22, 2022
Merged

Backporting IUser/Collaboration PRs#13242
afshin merged 21 commits into
jupyterlab:3.6.xfrom
martinRenou:collaboration

Conversation

@martinRenou

Copy link
Copy Markdown
Member

References

Backports of all PRs concerning real-time collaboration UI changes (left panel, top menu) #11443 #11605 #11703 #11774 #12046 #12175 #12548 #12095

@jupyterlab-probot

Copy link
Copy Markdown

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

@github-advanced-security github-advanced-security AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

CodeQL found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.

@martinRenou

Copy link
Copy Markdown
Member Author

It's technically working. It might be missing some CSS imports somewhere though.

Screenshot from 2022-10-14 14-12-38

@jtpio

jtpio commented Oct 14, 2022

Copy link
Copy Markdown
Member

Probably need #12586 or related to align the user menu to the right. Although this might be breaking for some folks / extensions already using the top area in 3.x.

@martinRenou

Copy link
Copy Markdown
Member Author

You're commenting at the right time, I was looking for this! Thanks.

Do you think there is a way to do this in a non-breaking way?

@fcollonval fcollonval mentioned this pull request Oct 14, 2022
23 tasks
@jtpio

jtpio commented Oct 15, 2022

Copy link
Copy Markdown
Member

Probably the only "breaking" change would be visually with the addition of the spacer widget in the top area.

This might affect extensions that add widgets to the top area, similar to https://github.com/jtpio/jupyterlab-system-monitor.

Not sure we should do anything clever to handle this, or just document this change in a 3.5.x -> 3.6.x migration (similar to https://jupyterlab.readthedocs.io/en/latest/extension/extension_migration.html#jupyterlab-3-0-to-3-1).

Another option would be to leave the user menu indicator on the left hand side as is and not backport #12586.

…b#11443)

* Adds a new package for the user information

* Read user info from IUser when opening a new document

* Adds a user menu

* Remove anonymous names from docprovider and runs integrity and eslint:typed

* Small fix menu

* Rename tokens ID to match the token name

* Adds new tokens to the documentation

* Review

* Remove components

* Adds tests

* Create the user menu only if collaborative flag is true

* Revert changes on UI tests

* Adds tests to the user menu

* Review

* Integrity

* Small issue

* Store user in local storage, remove StateDB and run integrity

* Remove 'id', 'name', and adds 'givenName', 'familyName', and 'initials'

* Update packages as part of the rebase

* Removes role, and solves an issue with names on the editor

* Change tests user package

* Makes colors private, removes public methods from IUserMenu

* Package integrity updates

* Tag ICurrentUser token and interface as experimental
* Adds the list of colors for collaborators to themes

* Change colors

* Update palette dark theme

* Fix mistake from the rebase

* Change name variables
* Adds name and displayName to the user

* Adds initials to the url

* solves a mistake in URL parameters
martinRenou and others added 9 commits October 17, 2022 17:26
* Add left panel for RTC

Co-authored-by: martinRenou <martin.renou@gmail.com>
Co-authored-by: Jeremy Tuloup <jeremy.tuloup@gmail.com>
Co-authored-by: "Afshin T. Darian" <git@darian.email>

* Remove sidepanel

* Remove uneeded token

* Remove custom rtc panel CSS

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

* Add translation

* Regenerate yarn.lock and run prettier

* Re-generate yarn.lock

Co-authored-by: Carlos Herrero <carlosherrerocontact@gmail.com>
Co-authored-by: Jeremy Tuloup <jeremy.tuloup@gmail.com>
Co-authored-by: "Afshin T. Darian" <git@darian.email>
Co-authored-by: Frédéric Collonval <fcollonval@users.noreply.github.com>
Co-authored-by: foo <foo@bar.com>
@martinRenou

Copy link
Copy Markdown
Member Author

CI failing with error Couldn't find any versions for "@jupyterlab/collaboration" that matches "~3.5.0-beta.0" as expected because it's not available yet.

@martinRenou martinRenou marked this pull request as ready for review October 17, 2022 16:07

@fcollonval fcollonval left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Thanks @martinRenou

I have some suggestion

Comment thread tsconfigdoc.json Outdated
Comment thread packages/application-extension/schema/top-bar.json Outdated
@jtpio

jtpio commented Oct 19, 2022

Copy link
Copy Markdown
Member

CI failing with error Couldn't find any versions for "@jupyterlab/collaboration" that matches "~3.5.0-beta.0" as expected because it's not available yet.

Probably we can publish the package from this branch as is to make the CI pass.

@jtpio

jtpio commented Oct 20, 2022

Copy link
Copy Markdown
Member

Just published @jupyterlab/collaboration and @jupyterlab/collaboration-extension to npm to help make the CI pass:

@jtpio jtpio added this to the 3.6.0 milestone Oct 21, 2022
@afshin afshin merged commit c842ec6 into jupyterlab:3.6.x Oct 22, 2022
@jtpio

jtpio commented Oct 23, 2022

Copy link
Copy Markdown
Member

Thanks Marin for doing all these backports!

@martinRenou martinRenou deleted the collaboration branch October 24, 2022 07:07
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Oct 25, 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.

6 participants