-
Notifications
You must be signed in to change notification settings - Fork 2
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
Cde design system #773
Open
edlu77
wants to merge
22
commits into
cde-mvp2
Choose a base branch
from
cde-design-system
base: cde-mvp2
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Cde design system #773
Changes from 16 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
017a8c3
Merge branch 'cde-mvp2' of https://github.com/hubmapconsortium/hra-ui…
edlu77 e39172d
Use design system for cde-visualization
edlu77 b951a66
Update landing page to use design system
edlu77 58bc2c9
More style updates for tooltips and visualization page
edlu77 563a4a3
Change violin vis size
edlu77 7e516af
Fix build issue
edlu77 1777db0
Merge branch 'cde-mvp2' of https://github.com/hubmapconsortium/hra-ui…
edlu77 e77e6ae
Update testing
edlu77 9b7f3f8
Merge branch 'cde-mvp2' of https://github.com/hubmapconsortium/hra-ui…
edlu77 4864fd5
Tweaks
edlu77 0117c1d
Merge branch 'cde-mvp2' of https://github.com/hubmapconsortium/hra-ui…
edlu77 07f52f1
Use error indicator component in design system
edlu77 cd69c85
Add delete file button to design system and cde
edlu77 147dc15
Remove export
edlu77 742226b
Fix bugs in file upload
edlu77 41ccd69
Add workflow card to design system and cde
edlu77 4d1c9f4
Add load progress bar to workflow cards
edlu77 0fa64bd
Remove commented out code
edlu77 15276b2
Improve progress bar
edlu77 02116c6
Merge branch 'cde-mvp2' of https://github.com/hubmapconsortium/hra-ui…
edlu77 2250b90
Merge branch 'cde-mvp2' of https://github.com/hubmapconsortium/hra-ui…
edlu77 c45e0f4
Merge branch 'design-system-workflow-card' into cde-design-system
edlu77 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 2 additions & 20 deletions
22
apps/cde-ui/src/app/components/file-upload/file-upload.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 21 additions & 47 deletions
68
apps/cde-ui/src/app/components/file-upload/file-upload.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,55 +1,29 @@ | ||
:host { | ||
.upload-success { | ||
height: 2.5rem; | ||
display: flex; | ||
align-items: center; | ||
padding: 0 1rem; | ||
background: var(--sys-surface-container); | ||
gap: 0.5rem; | ||
border-radius: 1rem; | ||
font: var(--sys-label-large); | ||
// .upload-success { | ||
// height: 2.5rem; | ||
// display: flex; | ||
// align-items: center; | ||
// padding: 0 1rem; | ||
// background: var(--sys-surface-container); | ||
// gap: 0.5rem; | ||
// border-radius: 1rem; | ||
// font: var(--sys-label-large); | ||
|
||
.filename { | ||
display: flex; | ||
} | ||
// .filename { | ||
// display: flex; | ||
// } | ||
|
||
.file-name { | ||
color: var(--sys-primary); | ||
} | ||
// .file-name { | ||
// color: var(--sys-primary); | ||
// } | ||
|
||
.remove-file { | ||
color: var(--sys-secondary); | ||
cursor: pointer; | ||
} | ||
} | ||
|
||
.error { | ||
display: flex; | ||
gap: 0.5rem; | ||
margin-bottom: 2rem; | ||
padding: 0.5rem 0.75rem; | ||
border-radius: 0.25rem; | ||
font: var(--sys-label-large); | ||
width: fit-content; | ||
// .remove-file { | ||
// color: var(--sys-secondary); | ||
// cursor: pointer; | ||
// } | ||
// } | ||
|
||
.error-messages { | ||
display: flex; | ||
flex-direction: column; | ||
} | ||
} | ||
|
||
.action-required { | ||
display: flex; | ||
align-items: center; | ||
gap: 1rem; | ||
hra-error-indicator { | ||
margin-bottom: 2rem; | ||
position: relative; | ||
left: -3rem; | ||
|
||
mat-icon { | ||
width: 2rem; | ||
height: 2rem; | ||
font-size: 2rem; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,11 @@ | ||
import { Injector, OutputEmitterRef, signal } from '@angular/core'; | ||
import { TestBed } from '@angular/core/testing'; | ||
import { render, screen } from '@testing-library/angular'; | ||
import { render } from '@testing-library/angular'; | ||
|
||
import { FileUploadComponent } from './file-upload.component'; | ||
|
||
describe('FileUploadComponent', () => { | ||
const loader = jest.fn(); | ||
const mockFiles = { | ||
0: { | ||
name: 'nodes.csv', | ||
type: 'text/csv', | ||
} as File, | ||
length: 1, | ||
} as unknown as FileList; | ||
|
||
beforeEach(() => { | ||
loader.mockReturnValue({ | ||
|
@@ -21,29 +14,12 @@ describe('FileUploadComponent', () => { | |
}); | ||
}); | ||
|
||
it('should load', async () => { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why did you remove the tests for file loading? |
||
const { | ||
fixture: { componentInstance: instance }, | ||
} = await render(FileUploadComponent, { | ||
componentInputs: { | ||
actionNotification: 'test', | ||
accept: 'csv', | ||
loader: loader, | ||
options: {}, | ||
}, | ||
}); | ||
|
||
instance.load({ files: mockFiles } as HTMLInputElement); | ||
expect(screen.getByText(/test/i)).toBeInTheDocument(); | ||
}); | ||
|
||
it('should cancel load', async () => { | ||
const loadCancelled = jest.fn(); | ||
const { | ||
fixture: { componentInstance: instance }, | ||
} = await render(FileUploadComponent, { | ||
componentInputs: { | ||
actionNotification: 'test', | ||
accept: 'csv', | ||
loader: loader, | ||
options: {}, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 0 additions & 16 deletions
16
apps/cde-ui/src/app/components/header/header.component.html
This file was deleted.
Oops, something went wrong.
123 changes: 0 additions & 123 deletions
123
apps/cde-ui/src/app/components/header/header.component.scss
This file was deleted.
Oops, something went wrong.
21 changes: 0 additions & 21 deletions
21
apps/cde-ui/src/app/components/header/header.component.spec.ts
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove commented out code please