Skip to content

Commit

Permalink
All Updates Page + Updated Homepage + Updated Article and Project Pag…
Browse files Browse the repository at this point in the history
…es (#1049)

* fix dictionary offset

* use new scLabProject property in ExploreUpdates

* remove slice from filterItems.js

* remove hardcoded updatesData, replace with persisted query

* create All Updates page

* create MultiSelectField component

* Project page unit tests (#1040)

* updated mockStore.js to include current projects

* removed updatesData query from pages since the data is available through the pageData object, updated props value for updatesData

* added unit testing for pages

* updated mockStore.js to include current projects

* updated mockStore.js

* added experiments data import to OAS benefits navigator test

* create i18n files for MultiSelect

* [Snyk] Upgrade sharp from 0.33.3 to 0.33.4 (#1037)

* fix: upgrade sharp from 0.33.3 to 0.33.4

Snyk has created this PR to upgrade sharp from 0.33.3 to 0.33.4.

See this package in yarn:
sharp

See this project in Snyk:
https://app.snyk.io/org/p0nder0sa/project/270b554d-5de8-452f-ad01-8bceb7604a92?utm_source=github&utm_medium=referral&page=upgrade-pr

* update yarn.lock

---------

Co-authored-by: snyk-bot <[email protected]>
Co-authored-by: Jordan <[email protected]>

* [Snyk] Upgrade @apollo/client from 3.10.1 to 3.10.4 (#1041)

* fix: upgrade @apollo/client from 3.10.1 to 3.10.4

Snyk has created this PR to upgrade @apollo/client from 3.10.1 to 3.10.4.

See this package in yarn:
@apollo/client

See this project in Snyk:
https://app.snyk.io/org/p0nder0sa/project/270b554d-5de8-452f-ad01-8bceb7604a92?utm_source=github&utm_medium=referral&page=upgrade-pr

* update yarn.lock

---------

Co-authored-by: snyk-bot <[email protected]>

* [Snyk] Upgrade @fortawesome/react-fontawesome from 0.2.0 to 0.2.2 (#1042)

* fix: upgrade @fortawesome/react-fontawesome from 0.2.0 to 0.2.2

Snyk has created this PR to upgrade @fortawesome/react-fontawesome from 0.2.0 to 0.2.2.

See this package in yarn:
@fortawesome/react-fontawesome

See this project in Snyk:
https://app.snyk.io/org/p0nder0sa/project/270b554d-5de8-452f-ad01-8bceb7604a92?utm_source=github&utm_medium=referral&page=upgrade-pr

* update yarn.lock

---------

Co-authored-by: snyk-bot <[email protected]>

* [Snyk] Upgrade @types/react from 18.3.2 to 18.3.3 (#1043)

* fix: upgrade @types/react from 18.3.2 to 18.3.3

Snyk has created this PR to upgrade @types/react from 18.3.2 to 18.3.3.

See this package in yarn:
@types/react

See this project in Snyk:
https://app.snyk.io/org/p0nder0sa/project/270b554d-5de8-452f-ad01-8bceb7604a92?utm_source=github&utm_medium=referral&page=upgrade-pr

* update yarn.lock

---------

Co-authored-by: snyk-bot <[email protected]>

* Image vertical line content update (#1047)

* updated mockStore.js to include current projects

* removed updatesData query from pages since the data is available through the pageData object, updated props value for updatesData

* added unit testing for pages

* updated mockStore.js to include current projects

* updated mockStore.js

* added experiments data import to OAS benefits navigator test

* updated ImageVerticalLineContent component to include optional collapse, also updated unit test and storybook entry

* updated TextWithImage component to include optional collapse in the case of image-vertical-line-content, also updated unit test and storybook entry

* added CollapseData to mock store so it can be reused by each component that has a Collapse

* updated FragmentRender.js to include TextRender component for fragments that have children prop, also removed unused generateCollapseElements() call, also updated unit test and storybook entry

* updated ImageWithCollapse unit test to check that the collapse is opened after being clicked

* Revert "updated ImageWithCollapse unit test to check that the collapse is opened after being clicked"

This reverts commit 08f0333.

* updated ImageWithCollapse unit test to check that the collapse is opened after being clicked, also updated storybook entry to include TextRender component

* added data-testid to elements for testing

* removed unused imports

* added switch case to SCLabs-Comp-Content-Image-v1 that only sets title, longDesc and children props if the layout is image-vertical-line-content, without this the app was failing to build in prod

* added storybook entry and unit test for TextWithImage w/Collapse

* updated Collapse Data to more accurately represent data in testing

* updated FragmentRender storybook entry and unit test

* updated ImageVerticalLineContent component to match dashboard page design

* updated ImageVerticalLineContent story and unit test

* updated ImageWithCollapse story and unit test

* updated TextWithImage story and unit test

* commented out feature-section div so that we dont forget about it. uncomment and view in storybook to see that design matches dashboard page

* [Snyk] Upgrade sharp from 0.33.3 to 0.33.4 (#1037)

* fix: upgrade sharp from 0.33.3 to 0.33.4

Snyk has created this PR to upgrade sharp from 0.33.3 to 0.33.4.

See this package in yarn:
sharp

See this project in Snyk:
https://app.snyk.io/org/p0nder0sa/project/270b554d-5de8-452f-ad01-8bceb7604a92?utm_source=github&utm_medium=referral&page=upgrade-pr

* update yarn.lock

---------

Co-authored-by: snyk-bot <[email protected]>
Co-authored-by: Jordan <[email protected]>

* [Snyk] Upgrade @apollo/client from 3.10.1 to 3.10.4 (#1041)

* fix: upgrade @apollo/client from 3.10.1 to 3.10.4

Snyk has created this PR to upgrade @apollo/client from 3.10.1 to 3.10.4.

See this package in yarn:
@apollo/client

See this project in Snyk:
https://app.snyk.io/org/p0nder0sa/project/270b554d-5de8-452f-ad01-8bceb7604a92?utm_source=github&utm_medium=referral&page=upgrade-pr

* update yarn.lock

---------

Co-authored-by: snyk-bot <[email protected]>

* [Snyk] Upgrade @fortawesome/react-fontawesome from 0.2.0 to 0.2.2 (#1042)

* fix: upgrade @fortawesome/react-fontawesome from 0.2.0 to 0.2.2

Snyk has created this PR to upgrade @fortawesome/react-fontawesome from 0.2.0 to 0.2.2.

See this package in yarn:
@fortawesome/react-fontawesome

See this project in Snyk:
https://app.snyk.io/org/p0nder0sa/project/270b554d-5de8-452f-ad01-8bceb7604a92?utm_source=github&utm_medium=referral&page=upgrade-pr

* update yarn.lock

---------

Co-authored-by: snyk-bot <[email protected]>

* [Snyk] Upgrade @types/react from 18.3.2 to 18.3.3 (#1043)

* fix: upgrade @types/react from 18.3.2 to 18.3.3

Snyk has created this PR to upgrade @types/react from 18.3.2 to 18.3.3.

See this package in yarn:
@types/react

See this project in Snyk:
https://app.snyk.io/org/p0nder0sa/project/270b554d-5de8-452f-ad01-8bceb7604a92?utm_source=github&utm_medium=referral&page=upgrade-pr

* update yarn.lock

---------

Co-authored-by: snyk-bot <[email protected]>

* add wrapper to ImageVerticalLineContent story

---------

Co-authored-by: Kris Charbonneau <[email protected]>
Co-authored-by: snyk-bot <[email protected]>
Co-authored-by: Jordan <[email protected]>
Co-authored-by: Jordan Willis <[email protected]>

* update MultiSelect a11y translations

* add react-select as dependency

* increase h2l line-height value

* update MultiSelect component

* allow for custom styling of Card.js heading

* create util function getDictionaryTerm

* update ExploreUpdates section to use getDctionaryTerm

* dictionary prop on home passed in as array

* update updates.js

* include scLabProject in project/article queries

* remove superfuous check in ProjectInfo.test.js

* allow excluding H1s in FragmentRender

* ExploreUpdates story consumes dictionary directly

* sort updates newest->oldest and remove unused imports

* pages use getDictionaryTerm and pass in dictionary array directly

* update yarn.lock

* slice projects array in project page ExploreProjects

* pass TextRender to FragmentRender SCLabs-Image-v1

* update Dashboard page and query to support FragmentRender

* update unit tests

* add new AEM_BASE_URL var (#1050)

* linting

---------

Co-authored-by: Marcus Blais <[email protected]>
Co-authored-by: Kris Charbonneau <[email protected]>
Co-authored-by: snyk-bot <[email protected]>
  • Loading branch information
4 people authored Jun 21, 2024
1 parent bd21e2c commit f8597e0
Show file tree
Hide file tree
Showing 59 changed files with 9,733 additions and 6,844 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/dast.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ jobs:
env:
CI: true
AEM_GRAPHQL_ENDPOINT: ${{secrets.AEM_GRAPHQL_ENDPOINT}}
AEM_BASE_URL: ${{ secrets.AEM_BASE_URL }}

- name: Docker run
run: docker run -d -p 3000:3000 sc-labs
env:
CI: true
AEM_GRAPHQL_ENDPOINT: ${{secrets.AEM_GRAPHQL_ENDPOINT}}
AEM_BASE_URL: ${{ secrets.AEM_BASE_URL }}

- name: OWASP ZAP FULL Scan
uses: zaproxy/[email protected]
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-and-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
env:
NEXT_PUBLIC_API_MOCKING: enabled
AEM_GRAPHQL_ENDPOINT: ${{ secrets.AEM_GRAPHQL_ENDPOINT }}
AEM_BASE_URL: ${{ secrets.AEM_BASE_URL }}
ADOBE_ANALYTICS_URL: ${{ secrets.ADOBE_ANALYTICS_URL }}
THANK_YOU_EMAIL: ${{ secrets.THANK_YOU_EMAIL }}
CI: true
Expand Down
Loading

0 comments on commit f8597e0

Please sign in to comment.