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/vadc sprint23 #1649

Merged
merged 12 commits into from
Nov 27, 2024
Merged

Feat/vadc sprint23 #1649

merged 12 commits into from
Nov 27, 2024

Conversation

jarvisraymond-uchicago
Copy link
Contributor

@jarvisraymond-uchicago jarvisraymond-uchicago commented Nov 27, 2024

Link to JIRA ticket if there is one:
VADC-1482
VADC-1530
VADC-1544
VADC-1472
VADC-1477
VADC-1487
VADC-1457
VADC-1461
VADC-1486

Sprint Branch 23 for VADC

Bug Fixes

  • ensures the old AtlasDictionaryButton behavior is fully restored.
  • Fixes eslint-new linting
  • Improves accessibility

vzpgb and others added 12 commits November 6, 2024 11:10
…#1626)

* fix(cardDescriptionParsing): initial commit (#1612)

* fix(cardDescriptionParsing): initial commit

* fix(cardDescriptionParsing): ranner linter and fixed error

* Bugfix/combo box labels (#1611)

* bugfix(comboBoxLabels): Began dev of new select box component, need to resolve issues with setting selectedValue

* bugfix(comboBoxLabels): made select box a controllable component, moved IsEnterOrSpace into accessibilityUtils folder

* bugfix(comboBoxLabels): removed console.log statements

* bugfix(comboBoxLabels): ran linter

* bugfix(comboBoxLabels): removed commented code

* bugfix(comboBoxLabels): ran linter

* bugfix(comboBoxLabels): Added Teams Dropdown test

* bugfix(comboBoxLabels): updated  Teams Dropdown test

* bugfix(comboBoxLabels): removed unneeded div element from TeamDropdown

* fix(comboBoxLabels): Updated label text

* fix(comboBoxLabels): Updated unit test

* VADC-1420: Fixed modal button color to ensure accessibility (#1615)

* fix(vadc-1420): Fixed modal button color to ensure accessibility

* Updated background/border/hover colors for modal window

* (VADC-1430): fix(vaLogoAltText)

* VADC-1479: Updated Previous/Next buttons' colors for VA GWAS according to 508 (#1618)

* fix(vadc-1479): Updated colors for the GWAS next/previous buttons

* fix(vadc-1479): Undo automatic discovery style changes

* fix(vadc-1479): Updated class in CSS for Previous/Next buttons

* Use updated colors only for active button (#1620)

* VADC-1516: Updated colors for the buttons in the GWAS modal according to 508 (#1621)

* fix(vadc-1516): Updated colors for the buttons in the GWAS modal

* fix(vadc-1516): Unify style order

* fix(vadc-1516): Refactor CSS

* fix(vadc-1516): Added comment

* fix(vadc-1516): Updated text color for the dropdown in the Team's modal

* fix(vadc-1516): formatting

* fix(vadc-1516): formatting

* fix(vadc-1516): formatting

* fix(vadc-1516): formatting

* fix(vadc-1482):  Updated button colors in Eurler diagram

* fix(vadc-1482): Updated focus color for the Eurler diagram

---------

Co-authored-by: Jarvis <[email protected]>
...replacing it with a more generic error message that applies better to
all possible error scenarios
* fix: revert and bring back old data dictionary button component

...from https://github.com/uc-cdis/data-portal/tree/5dc09282573e93f8e11d44f53d65e3cf677256c6/src/Analysis/AtlasDataDictionary/AtlasDataDictionaryButton
...which in turn is a restore from older code #1478

* fix: using AtlasLegacyDataDictionaryButton for the legacy scenario

* fix: remove unused variables

* fix: fix AtlasLegacyDataDictionaryButton tests

* feat: use feature flag legacyDataDictionary instead of analysis app attribute

* fix: remove duplicated AtlasDataDictionaryButton css file

* fix: use project specific feature flag name
* fix discovery batch loading (#1632)

* fix discovery batch loading

* fix return as needed

* fix(vadc-1544): Refactor CSS

* Branch fix

* Missing syntax added

* Undo

* Undo

* fix(vadc-1544): Refactor CSS to LESS

* fix(vadc-1544): Formatting

* fix(vadc-1544): Formatting

---------

Co-authored-by: Mingfei Shao <[email protected]>
…#1640)

* fix(vadc-1472): Change link color

* fix(vadc-1472): eslint-new configuration
* fix discovery batch loading (#1632)

* fix discovery batch loading

* fix return as needed

* new changes for B3 WALDER project to make changes for discovery porta… (#1551)

* new changes for B3 WALDER project to make changes for discovery portal in PRC

* spacing changes for code

* changes suggested by mingfei

* changes made after mingfei's comments and meeting

* eslint on openfillrequestformbutton

* added missing variables in discovey config

* added null condition and ran eslint

* added check for null to pass npm test

* added check for null to pass npm test

* refactor: simplify button logic by removing redundant check

* refactor: remove redundant  check from disabled condition

* changes for failing test

* new variable fillRequestFormCheckField added

* changes for if condition

* if condition fixes

* new property added to allow checkboxes if not logged in

* revert change

* removed extra space

* changed text for tooltip

* fixes for props variable

* Update src/Discovery/DiscoveryActionBar/components/OpenFillRequestFormButton.tsx

Co-authored-by: Mingfei Shao <[email protected]>

* changes for tooltip if multiple flags are on

* Update src/Discovery/DiscoveryListView.tsx

Co-authored-by: Mingfei Shao <[email protected]>

---------

Co-authored-by: Mingfei Shao <[email protected]>

* Update team project filter (#1633)

* update team project filter

* update unit test

* (VADC-1444): add please login to access text to login page (#1617)

* (VADC-1439): add link to access denied page (#1616)

* VADC-1448: add logout warning (#1636)

* (VADC-1455, VADC-1454, VADC-1424): mis 508 fixes (#1637)

* Fix/vadc 1417 (#1638)

* update link color

* styling format

---------

Co-authored-by: Mingfei Shao <[email protected]>
Co-authored-by: Urvi Sheth <[email protected]>
Co-authored-by: Jian <[email protected]>
…es (#1646)

* fix(vadc-1477): Fix pagination colors

* Formatting

* fix(vadc-1477): More pagination styles
* fix(radioButtons508): initial commit

* fix(radioButtons508): resolved eslint issues with proptypes

* fix(radioButtons508): removed unintentional changes from auto formatting

* fix(radioButtons508): Updated aria label texts
… guidelines (#1648)

* fix(vadc-1486): Fix selected phenotypes/covariates colors

* fix(vadc-1486): Restore styles for gwas and teams modals
@jarvisraymond-uchicago jarvisraymond-uchicago marked this pull request as ready for review November 27, 2024 16:34
Copy link
Contributor

@vzpgb vzpgb left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thank you!

Copy link

filepath $$\textcolor{#23d18b}{\tt{passed}}$$ $$\textcolor{#ffa500}{\tt{skipped}}$$ SUBTOTAL
$$\textcolor{#23d18b}{\tt{tests/test\_requestor.py}}$$ $$\textcolor{#23d18b}{\tt{5}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{5}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_ras\_authn.py}}$$ $$\textcolor{#23d18b}{\tt{3}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{3}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_login\_page.py}}$$ $$\textcolor{#23d18b}{\tt{2}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{2}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_data\_upload.py}}$$ $$\textcolor{#23d18b}{\tt{2}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{2}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_audit\_service.py}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_indexing\_page.py}}$$ $$\textcolor{#23d18b}{\tt{2}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{2}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_homepage.py}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_pfb\_export.py}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_discoverypage.py}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#23d18b}{\tt{tests/test\_graph\_submit\_and\_query.py}}$$ $$\textcolor{#23d18b}{\tt{1}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#23d18b}{\tt{1}}$$
$$\textcolor{#ffa500}{\tt{tests/test\_gen3ff\_landing\_page.py}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#ffa500}{\tt{2}}$$ $$\textcolor{#ffa500}{\tt{2}}$$
$$\textcolor{#ffa500}{\tt{tests/test\_register\_user.py}}$$ $$\textcolor{#666666}{\tt{0}}$$ $$\textcolor{#ffa500}{\tt{2}}$$ $$\textcolor{#ffa500}{\tt{2}}$$
$$\textcolor{#ffa500}{\tt{TOTAL}}$$ $$\textcolor{#23d18b}{\tt{19}}$$ $$\textcolor{#ffa500}{\tt{4}}$$ $$\textcolor{#ffa500}{\tt{23}}$$

Please find the detailed integration test report here

Please find the ci env pod logs here

@jarvisraymond-uchicago jarvisraymond-uchicago merged commit 6f568b5 into master Nov 27, 2024
9 checks passed
@jarvisraymond-uchicago jarvisraymond-uchicago deleted the feat/vadc_sprint23 branch November 27, 2024 18:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants