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

feat(ui): move to React 18 and base for using shadcn/ui #4174

Merged
merged 30 commits into from
May 27, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
918409c
chore: Add UI components Button, Toaster, and ThemeWrapper
sedghi May 22, 2024
2cc9158
chore: Update tailwindcss version to 3.2.4 and button default variant…
sedghi May 23, 2024
d2aace1
chore: Remove Toaster component and update imports in index files
sedghi May 23, 2024
dd472b2
chore: Update Button component imports and tailwind.css
sedghi May 24, 2024
9d8267f
chore: Update Button component imports and button variants in Button …
sedghi May 24, 2024
f2cf1a8
chore: Update Button component imports and button variants in Button …
sedghi May 24, 2024
9c87fa5
chore: Update React version to "^18.3.1" in package.json files
sedghi May 24, 2024
e690cd5
move away from deafult props
sedghi May 24, 2024
84eee12
feat: Add Popover and Combobox components
sedghi May 24, 2024
0edf1d6
chore: Update Dialog component imports and add untrack series confirm…
sedghi May 24, 2024
f76ede4
Merge branch 'master' of github.com:OHIF/Viewers into feat/workers-ui-ux
sedghi May 24, 2024
b8d9adf
fix icons, cypress
IbrahimCSAE May 25, 2024
78fa6c2
memory fix
IbrahimCSAE May 25, 2024
bbd7f48
undo
IbrahimCSAE May 25, 2024
1fbf5ce
undo
IbrahimCSAE May 26, 2024
17b780d
update react-resize-detector
IbrahimCSAE May 26, 2024
f1e706f
xlarge resource class
IbrahimCSAE May 27, 2024
fcd838f
Try large since xlarge is unavailable
IbrahimCSAE May 27, 2024
9ff4582
check for undefined
IbrahimCSAE May 27, 2024
315467f
date picker replacement
IbrahimCSAE May 27, 2024
077f380
fix small bug
IbrahimCSAE May 27, 2024
0b1867b
update
sedghi May 27, 2024
1783430
Merge branch 'feat/workers-ui-ux' of github.com:OHIF/Viewers into fea…
sedghi May 27, 2024
fabf768
chore: Remove unused imports and update calendar caption layout
sedghi May 27, 2024
bb7071b
chore: Update calendar caption layout and remove unused imports
sedghi May 27, 2024
7890561
chore: Update calendar caption layout and remove unused imports
sedghi May 27, 2024
29fa404
feat: Update defaultMonth in DatePickerWithRange component
sedghi May 27, 2024
64f3744
fix: Update DatePickerWithRange component to handle input changes
sedghi May 27, 2024
68e6655
update
sedghi May 27, 2024
00c73b6
chore: Update date range input selectors in Cypress tests
sedghi May 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -408,9 +408,13 @@ jobs:
package-manager: << parameters.package-manager >>
post-install: << parameters.post-install >>
working-directory: << parameters.working-directory >>
- run:
name: Start Test Server
command: << parameters.start-command >>
background: true
- cypress/run-tests:
cypress-command: << parameters.cypress-command >>
start-command: << parameters.start-command >>
start-command: ''
working-directory: << parameters.working-directory >>

workflows:
Expand Down Expand Up @@ -495,18 +499,13 @@ workflows:
- BUILD:
filters:
branches:
only: /^release\/.*/
- HOLD_FOR_APPROVAL:
type: approval
requires:
- BUILD
only: release
- NPM_PUBLISH:
requires:
- HOLD_FOR_APPROVAL
- BUILD
- DOCKER_RELEASE_PUBLISH:
requires:
- NPM_PUBLISH

###
# Unit and E2E tests have already run for PR_CHECKS
# Re-running should not gain us any confidence here
Expand Down
4 changes: 2 additions & 2 deletions platform/app/cypress/integration/volume/MPR.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ describe('OHIF MPR', () => {
const fOR = Object.keys(fORMap)[0];
const fORAnnotation = fORMap[fOR];

// it should have crosshairs as the only key
expect(Object.keys(fORAnnotation)).to.have.length(1);
// it should have crosshairs as the only key (references lines make this 2)
expect(Object.keys(fORAnnotation)).to.have.length(2);

const crosshairs = fORAnnotation.Crosshairs;

Expand Down
Loading