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

[DUOS-2860] Remove duplicate display of profile and lc warning in DAR form #2444

Merged
merged 10 commits into from
Jan 31, 2024
Merged

[DUOS-2860] Remove duplicate display of profile and lc warning in DAR form #2444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e9ba1bf
deleted second warning & started tinkering w outline once submitted
aarohinadkarni Jan 17, 2024
ee7bb14
playing with completed logic
aarohinadkarni Jan 18, 2024
bd602e6
try or
aarohinadkarni Jan 18, 2024
2885d92
use showNihValidationError for now
aarohinadkarni Jan 22, 2024
b13e2ba
style: remove debugging comments
aarohinadkarni Jan 22, 2024
648bff3
feat: make alert on top danger & fix logic
aarohinadkarni Jan 22, 2024
c1761ab
style: cleanup unused variable
aarohinadkarni Jan 22, 2024
0661e82
style: fix spacing for className
aarohinadkarni Jan 22, 2024
ae14a45
style: fix spacing pt2
aarohinadkarni Jan 22, 2024
229f817
test: changing tests to reflect current warning
aarohinadkarni Jan 23, 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
7 changes: 2 additions & 5 deletions cypress/component/DataAccessRequest/researcher_info.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,25 +87,22 @@ describe('Researcher Info', () => {
it('renders the missing library cards alert correctly', () => {
const mergedProps = {...props, ...{formData: {...props.formData }}};
mount(<WrappedResearcherInfo {...mergedProps}/>);
cy.get('[dataCy=researcher-info-missing-library-cards]').should('be.visible');
cy.get('[dataCy=researcher-info-profile-unsubmitted]').should('not.exist');
cy.get('[dataCy=researcher-info-profile-submitted]').should('not.exist');
cy.get('[dataCy=researcher-info-profile-submitted]').should('be.visible');
});

it('renders the profile submitted alert', () => {
const mergedProps = {...props, ...{completed: true, researcher: researcherWithLibraryCards}};
mount(<WrappedResearcherInfo {...mergedProps}/>);
cy.get('[dataCy=researcher-info-profile-submitted]').should('be.visible');
cy.get('[dataCy=researcher-info-profile-unsubmitted]').should('not.exist');
cy.get('[dataCy=researcher-info-missing-library-cards]').should('not.exist');
});

it('renders the profile unsubmitted alert', () => {
const mergedProps = {...props, ...{completed: false, researcher: researcherWithLibraryCards}};
mount(<WrappedResearcherInfo {...mergedProps}/>);
cy.get('[dataCy=researcher-info-profile-unsubmitted]').should('be.visible');
cy.get('[dataCy=researcher-info-profile-submitted]').should('not.exist');
cy.get('[dataCy=researcher-info-missing-library-cards]').should('not.exist');
cy.get('[dataCy=researcher-info-profile-submitted]').should('be.visible');
});

it('renders the internal lab staff button and form', () => {
Expand Down
12 changes: 3 additions & 9 deletions src/pages/dar_application/ResearcherInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const profileLink = h(Link, {to:'/profile', style: linkStyle}, ['Your Profile'])
const profileUnsubmitted = span(['Please submit ', profileLink, ' to be able to create a Data Access Request']);
const profileSubmitted = span(['Please make sure ', profileLink, ' is updated as it will be used to pre-populate parts of the Data Access Request']);
const libraryCardLink = a({href: 'https://broad-duos.zendesk.com/hc/en-us/articles/4402736994971-Researcher-FAQs', style: linkStyle, target: '_blank'}, ['Library Card']);
const missingLibraryCard = span(['You must submit ', profileLink, ' and obtain a ', libraryCardLink, ' from your Signing Official before you can submit a Data Access Request']);

export default function ResearcherInfo(props) {
const {
Expand Down Expand Up @@ -58,11 +57,11 @@ export default function ResearcherInfo(props) {
div({ className: 'dar-step-card' }, [
div({
datacy: 'researcher-info-profile-submitted',
isRendered: (completed === false && libraryCardReqSatisfied === false), className: 'rp-alert' }, [
isRendered: (completed === false || libraryCardReqSatisfied === false)}, [
!readOnlyMode && Alert({
id: 'profileSubmitted',
type: 'important',
title: span([
type: 'danger',
title: span({ className: 'errored' }, [
`You must submit `, profileLink, ` and obtain a `, libraryCardLink,
` from your Signing official before you can submit a Data Access Request.`
])
Expand Down Expand Up @@ -103,11 +102,6 @@ export default function ResearcherInfo(props) {
})
]),
fieldset({ }, [
div({
datacy: 'researcher-info-missing-library-cards',
isRendered: libraryCardReqSatisfied === false, className: 'rp-alert' }, [
!readOnlyMode && Alert({ id: 'missingLibraryCard', type: 'danger', title: missingLibraryCard })
]),
div({
datacy: 'researcher-info-profile-unsubmitted',
isRendered: (completed === false && libraryCardReqSatisfied === true), className: 'rp-alert' }, [
Expand Down
Loading