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

Mui5 react18 rebase #1

Closed
wants to merge 207 commits into from
Closed

Mui5 react18 rebase #1

wants to merge 207 commits into from

Conversation

nwalker2398
Copy link

Rebased from ProjectMirador/Mirador mud5-react18 branch, added CI, all tests pass.

morpheus-87 and others added 30 commits August 17, 2023 15:54
@morpheus-87
Fix selector for the manifest description or summary by considering t…
2bbeff5 
…he current language
added jsdoc for workspace, windows, viewer and utils selectors
a62f51c
added jsdocs for selectors
a2f21d0
added missing german translations
69670f6
@jcoyne
Merge pull request ProjectMirador#3788 from fstoe/fix_german_internat…
5a95d44 
…ionalization_errors

add missing german translations
@marlo-longley
Run CI tests when making PRs against the mui5 branch
93c466a
@lutzhelm @cbeer
Make OSD viewer test compatible with OSD 2.4.2
222378a 
Tests would previously fail if OSD version 2.4.2 was installed.
See  ProjectMirador#3792
@enriquediaz @cbeer
Update CONTRIBUTING.md
f86d5d9 
Additional context and considerations for prospective contributors, external link updates
@marlo-longley
Migrate MUI Tree View from labs to mui-x
8932afd 
See https://mui.com/blog/lab-tree-view-to-mui-x/
@marlo-longley
Address linter errors
bbab594
@marlo-longley
Avoid nesting h2 elements
9b53dff
@phil-plencner-hl
Merge pull request ProjectMirador#3793 from marlo-longley/mui5-tests
d348a06 
Fix MUI5 testing errors
@marlo-longley
Fix styling in companion window panels
38c36a6
@marlo-longley
Remove invalid prop from CanvasAnnotations
2627f47
@cbeer
Merge pull request ProjectMirador#3803 from ProjectMirador/companion-…
f48d5e1 
…fixes

Fix some styling and console errors on mui5 branch
@cbeer
Merge pull request ProjectMirador#3794 from marlo-longley/mui5-ci
7866f7e 
Run CI tests when making PRs against the mui5 branch
Fix linting errors
9b069eb
Add mui5 emotion right-to-left support
00b8980
@marlo-longley @cbeer
Run CI tests when making PRs against the mui5 branch
863aea1
@barmintor @cbeer
selected Thumbnails have class 'selected'
63a8419
@barmintor @cbeer
ManifestListItem component sets selected from active prop, has class …
51eb3d4 
…'active' when selected
@barmintor @cbeer
SearchHit component ListItems have class 'windowSelected' if inidicat…
472cadd 
…ed in props
@barmintor @cbeer
CompanionArea component uses namespaced position class and includes c…
8fbe37c 
…onfigured area layout from props
@barmintor @cbeer
CompanionWindow component renders layout and size classes configured …
359570c 
…in pros
@barmintor @cbeer
SanitizedHtml component renders root class configured in props
8825332
@barmintor @cbeer
ScrollIndicatedDialogContent component renders configured shadowScrol…
a6473fe 
…lDialog class if given in props
@barmintor @cbeer
WindowSideBar component renders configured drawer class name from pro…
179b227 
…ps if configured
@barmintor @cbeer
ZoomControls renders divider with configured className from props if …
8366596 
…given
@barmintor @cbeer
WindowTopMenuButton renders configured ctrlBtnSelected from props on …
df39388 
…open windows if configured
@barmintor @cbeer
WorkspaceElasticWindow renders configured focused className if given …
aa828e5 
…and element is focused
cbeer and others added 26 commits December 19, 2023 15:57
@cbeer
Name Window slots
8923572
@cbeer
Name the WorkspaceArea root component
5ebf51f
@cbeer
Use flexbox to lay out the workspace
1961328
@cbeer
Use the palette shade for the workspace background
7306b0e
@cbeer
Use a consistent root styled component for the workspace
45ecb49
@cbeer
Fix elastic workspace panning
a476b2d
@cbeer
Pull WorkspaceElastic styles up
bc0cc02
@jcoyne
Merge pull request ProjectMirador#3868 from ProjectMirador/mui5-clean…
afe3a3a 
…-up-wrappers

Clean up some unnecessary wrappers and clean up workspace styles
@cbeer
Update to React 18
cec72ca
@cbeer
Get rid of a function as an input to a selector
d6e71d6
@cbeer
Don't construct new objects in selector inputs
df8f56f
@cbeer
Merge pull request ProjectMirador#3780 from dbmdz/fix-description-sel…
5cb692e 
…ector

Fix selector for the manifest description or summary by considering the current language
@cbeer
Merge pull request ProjectMirador#3648 from ProjectMirador/mui5
593e81b 
Upgrade from MUI4 to MUI5
@cbeer
Merge branch 'master' into mui5-react-18
fac2bad
@barmintor @nwalker2398
MiradorCanvas inspects annotation type and service profile to determi…
7afaf78 
…ne iiif images

- jest specs for image service identification
- jest specs for resource type filters
- ProjectMirador#3789
@barmintor @nwalker2398
add IIIF Auth2 authentication profiles to settings (ProjectMirador#3789)
c484f40
@barmintor @nwalker2398
auth state selector should check non-image resources
4fa19fa 
- IIIF Auth2 services will be members of a probe service
- ProjectMirador#3789
@barmintor @nwalker2398
look for typed services providing Auth2 token/logout (ProjectMirador#…
9191734 
…3789)

- DRY search routines into functions defined in getServices
- all routines should look for Auth2 types and Auth1 profiles
- include search for uncoducmented Auth1 implementation of explicit probe service
@barmintor @nwalker2398
VideoViewer component skips resources without an id attribute
69c6b7d
@barmintor @nwalker2398
add reducers and actions for auth2 probe responses
8693292 
- correct a spec name in accessTokens.test.js
- stop refetching accessTokens if state has an ok true/false attribute
- ProjectMirador#3789
@barmintor @nwalker2398
Auth2 Probe responses WIP - needs specs for:
5bebe70 
- src/state/sagas/auth.js
- src/state/sagas/iiif.js
- src/state/sagas/windows.js
- src/state/selectors/auth.js
- src/state/selectors/canvases.js
@barmintor @nwalker2398
WIP-react18
1b41071
@barmintor @nwalker2398
columbia fork release number
fecb94f
@barmintor @nwalker2398
rough out a NativeObjectViewer for PDFs
c031422
@barmintor @nwalker2398
columbia fork release number
1fff04c
@elohanlon
Run GitHub CI for all branches
9d4dbfc
@barmintor
Copy link
Member

Am I correct in understanding that issue-3789_auth2-mui5-react18 was our/my original fork, from upstream before mui5/react18, and that mui5-react18-rebase is a rebase of issue-3789_auth2-mui5-react18 on the upstream react18 branch?

If that is correct, I don't think we want to merge anything back - I think we just want the new branch, right?

If that is correct, I think there's some commits we might want to drop - our goal should be the smallest delta possible, right? - at least 1b41071 looks unnecessary.

@nwalker2398
Copy link
Author

nwalker2398 commented Feb 28, 2024 •
edited
Loading

Am I correct in understanding that issue-3789_auth2-mui5-react18 was our/my original fork, from upstream before mui5/react18, and that mui5-react18-rebase is a rebase of issue-3789_auth2-mui5-react18 on the upstream react18 branch?

If that is correct, I don't think we want to merge anything back - I think we just want the new branch, right?

If that is correct, I think there's some commits we might want to drop - our goal should be the smallest delta possible, right? - at least 1b41071 looks unnecessary.

Yes, this is a rebase of issue-3789_auth2-mui5-react18 on the upstream mui5-react18 branch. It makes sense that these changes aren't meant to be merged back into main—I was unsure where the final destination for these was so I made this PR figuring we could just close it if it's unnecessary.

I'll see where I can pare down unnecessary commits—I haven't rebased much before so this is definitely a learning process for me. After that, does it make more sense to keep this as a new branch or merge it into issue-3789_auth2-mui5-react18?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@barmintor barmintor Awaiting requested review from barmintor

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@nwalker2398 @barmintor @morpheus-87 @jcoyne @marlo-longley @lutzhelm @enriquediaz @phil-plencner-hl @cbeer @elohanlon