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

EGRC-130: Initial SSP Viewer UI #21

Merged
merged 39 commits into from
Mar 22, 2021
Merged

EGRC-130: Initial SSP Viewer UI #21

merged 39 commits into from
Mar 22, 2021

Conversation

rgauss
Copy link
Contributor

@rgauss rgauss commented Mar 22, 2021

Subtask PRs already reviewed.

rgauss and others added 30 commits March 13, 2021 16:55
@rgauss
EGRC-137: Add Initial Display of Control Implementation
3018a43
@rgauss
Layout changes
5773432
@rgauss
Added component implementation description to label tooltip
689a9e8
@rgauss
Initial commit of control implementation tests
a59ee19
@rgauss
EGRC-140: Added test of component control implementation description
2ad22ce
@rgauss
Fixed bug with catalog view
905b99a
@rgauss
Fixed assessment typo
74620a4
@rgauss
Fixed getStatementByComponent statementId evaluation
a8227a4
@rgauss
Merge branch 'EGRC-137' of github.com:EasyDynamics/oscal-viewer into …
ed24b56 
…EGRC-137
@rgauss
Initial OSCALSsp test file
b5d4eed
@rgauss
EGRC-248: Test SSP System Characteristics
6309dc5
@rgauss @hkps
Fix import spacing
59f4782 
Co-authored-by: Hannah Posey-Scholl <hkps.hannah@gmail.com>
@rgauss @hkps
Fix import spacing
a239e3e 
Co-authored-by: Hannah Posey-Scholl <hkps.hannah@gmail.com>
@rgauss @hkps
Fix system characteristics description space
a13477b 
Co-authored-by: Hannah Posey-Scholl <hkps.hannah@gmail.com>
@rgauss @kkennedy26
Fix import spacing
79abf46 
Co-authored-by: kkennedy26 <78984988+kkennedy26@users.noreply.github.com>
@rgauss
Merge branch 'EGRC-130' into EGRC-137
70e8da0
@rgauss
Merge branch 'EGRC-137' into EGRC-211
71827d3
@rgauss
Merge branch 'EGRC-211' into EGRC-140
9c49fd9
@rgauss
Merge pull request #11 from EasyDynamics/EGRC-140
546b7da 
EGRC-140: Added test of component control implementation description
@rgauss
Merge pull request #13 from EasyDynamics/EGRC-211
2c32cdc 
EGRC-211, EGRC-212, EGRC-210, EGRC-213 Testing and Control Implementation Description
@rgauss
Merge pull request #4 from EasyDynamics/EGRC-137
0a831b9 
EGRC-137: Add Initial Display of Control Implementation
@rgauss
Merge branch 'EGRC-130' into EGRC-248
d14ca65
@rgauss
Fix for SSP tests with no import-profile
b8b06f8
@rgauss @hkps
Add period to info type description for consistency
8b91b7f 
Co-authored-by: Hannah Posey-Scholl <hkps.hannah@gmail.com>
@rgauss
Merge pull request #14 from EasyDynamics/EGRC-248
7848b80 
EGRC-248: Test SSP System Characteristics
@rgauss
EGRC-249: Test SSP System Implementation
e5c0031
@rgauss
Merge pull request #15 from EasyDynamics/EGRC-249
62021f7 
EGRC-249: Test SSP System Implementation
@rgauss
Merge branch 'develop' into EGRC-130
3a8d161
@rgauss
EGRC-247: Test SSP Metadata
9ee1034
@rgauss
Removed unused import
eca5c1a
kkennedy26
kkennedy26 approved these changes Mar 22, 2021
View reviewed changes
Copy link
Contributor

@kkennedy26 kkennedy26 left a comment

Choose a reason for hiding this comment

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

Looked over SSP Viewer and ran tests. Looks good!

zclarkEDC
zclarkEDC approved these changes Mar 22, 2021
View reviewed changes
Copy link
Member

@zclarkEDC zclarkEDC left a comment

Choose a reason for hiding this comment

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

No issues when rendering, tests ran without error.

@rgauss rgauss merged commit fd6ac69 into develop Mar 22, 2021
@rgauss rgauss deleted the EGRC-130 branch March 22, 2021 19:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@zclarkEDC zclarkEDC zclarkEDC approved these changes

@kkennedy26 kkennedy26 kkennedy26 approved these changes

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@rgauss @zclarkEDC @kkennedy26