From 3542c38472ac27f6feb6fdbd4e34764e7d35fee3 Mon Sep 17 00:00:00 2001 From: diana-villalvazo-wgu Date: Mon, 12 May 2025 16:33:36 -0600 Subject: [PATCH 1/3] fix: incorrect usage of header elements --- src/containers/CoursesPanel/NoCoursesView/index.jsx | 4 ++-- src/containers/Dashboard/DashboardLayout.jsx | 3 +-- src/containers/Dashboard/index.scss | 8 ++++++++ .../LearnerDashboardHeader/ConfirmEmailBanner/index.jsx | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/containers/CoursesPanel/NoCoursesView/index.jsx b/src/containers/CoursesPanel/NoCoursesView/index.jsx index 0810e04..f7a38c6 100644 --- a/src/containers/CoursesPanel/NoCoursesView/index.jsx +++ b/src/containers/CoursesPanel/NoCoursesView/index.jsx @@ -19,9 +19,9 @@ export const NoCoursesView = () => { className="d-flex align-items-center justify-content-center mb-4.5" > {formatMessage(messages.bannerAlt)} -

+

{formatMessage(messages.lookingForChallengePrompt)} -

+

{formatMessage(messages.exploreCoursesPrompt)}

diff --git a/src/containers/Dashboard/DashboardLayout.jsx b/src/containers/Dashboard/DashboardLayout.jsx index d970998..4c68236 100644 --- a/src/containers/Dashboard/DashboardLayout.jsx +++ b/src/containers/Dashboard/DashboardLayout.jsx @@ -40,8 +40,7 @@ export const DashboardLayout = ({ children }) => { {children} - - {!isCollapsed && (

 

)} + diff --git a/src/containers/Dashboard/index.scss b/src/containers/Dashboard/index.scss index 9b5089f..be09d46 100644 --- a/src/containers/Dashboard/index.scss +++ b/src/containers/Dashboard/index.scss @@ -6,6 +6,14 @@ .sidebar-column { padding: 0 map-get($spacers, 3) 0 map-get($spacers, 1); + + &.not-collapsed { + padding-top: map-get($spacers, 2); + + & >:first-child { + margin-top: map-get($spacers, 5\.5); + } + } } @include media-breakpoint-down(lg) { diff --git a/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/index.jsx b/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/index.jsx index f5f9313..a5eb1fa 100644 --- a/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/index.jsx +++ b/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/index.jsx @@ -64,7 +64,7 @@ export const ConfirmEmailBanner = () => { )} > -

{formatMessage(messages.confirmEmailModalHeader)}

+

{formatMessage(messages.confirmEmailModalHeader)}

{formatMessage(messages.confirmEmailModalBody)}

From a5522faa42d1f3fd1faf3d4ca13326bcc3c5ef3a Mon Sep 17 00:00:00 2001 From: diana-villalvazo-wgu Date: Mon, 12 May 2025 17:15:40 -0600 Subject: [PATCH 2/3] test: update related tests --- .../__snapshots__/index.test.jsx.snap | 6 ++- .../Dashboard/DashboardLayout.test.jsx | 5 +-- .../DashboardLayout.test.jsx.snap | 38 ++++++++++++------- .../__snapshots__/index.test.jsx.snap | 6 +-- 4 files changed, 33 insertions(+), 22 deletions(-) diff --git a/src/containers/CoursesPanel/NoCoursesView/__snapshots__/index.test.jsx.snap b/src/containers/CoursesPanel/NoCoursesView/__snapshots__/index.test.jsx.snap index 8f6fabd..fc408e1 100644 --- a/src/containers/CoursesPanel/NoCoursesView/__snapshots__/index.test.jsx.snap +++ b/src/containers/CoursesPanel/NoCoursesView/__snapshots__/index.test.jsx.snap @@ -9,9 +9,11 @@ exports[`NoCoursesView snapshot 1`] = ` alt="No Courses view banner" src="icon/mock/path" /> -

+

Looking for a new challenge? -

+

Explore our courses to add them to your dashboard.

diff --git a/src/containers/Dashboard/DashboardLayout.test.jsx b/src/containers/Dashboard/DashboardLayout.test.jsx index 4e92637..fabb984 100644 --- a/src/containers/Dashboard/DashboardLayout.test.jsx +++ b/src/containers/Dashboard/DashboardLayout.test.jsx @@ -84,10 +84,9 @@ describe('DashboardLayout', () => { describe('not collapsed', () => { const testWidgetSpacing = () => { - it('shows a blank (nbsp) h2 spacer component above widget sidebar', () => { + it('shows not-collapsed class on widget sidebar', () => { const columns = el.instance.findByType(Col); - // nonbreaking space equivalent - expect(columns[1].findByType('h2')[0].children[0].el).toEqual('\xA0'); + expect(columns[1].props.className).toContain('not-collapsed'); }); }; describe('sidebar showing', () => { diff --git a/src/containers/Dashboard/__snapshots__/DashboardLayout.test.jsx.snap b/src/containers/Dashboard/__snapshots__/DashboardLayout.test.jsx.snap index dc7e7a3..c1cd867 100644 --- a/src/containers/Dashboard/__snapshots__/DashboardLayout.test.jsx.snap +++ b/src/containers/Dashboard/__snapshots__/DashboardLayout.test.jsx.snap @@ -24,7 +24,12 @@ exports[`DashboardLayout collapsed sidebar not showing snapshot 1`] = ` test-children -

-   -

@@ -161,7 +171,12 @@ exports[`DashboardLayout not collapsed sidebar showing snapshot 1`] = ` test-children -

-   -

diff --git a/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/__snapshots__/index.test.jsx.snap b/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/__snapshots__/index.test.jsx.snap index b68c507..315dbee 100644 --- a/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/__snapshots__/index.test.jsx.snap +++ b/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/__snapshots__/index.test.jsx.snap @@ -55,11 +55,11 @@ exports[`ConfirmEmailBanner snapshot Show on unverified 1`] = ` onClose={[MockFunction closeConfirmModal]} title="" > -

Confirm your email -

+

From 5dcd596ac991fe005007a2e71cd52b30ae6d34a2 Mon Sep 17 00:00:00 2001 From: diana-villalvazo-wgu Date: Fri, 16 May 2025 09:49:14 -0600 Subject: [PATCH 3/3] chore: change heading for confirm email --- .../ConfirmEmailBanner/__snapshots__/index.test.jsx.snap | 4 ++-- .../LearnerDashboardHeader/ConfirmEmailBanner/index.jsx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/__snapshots__/index.test.jsx.snap b/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/__snapshots__/index.test.jsx.snap index 315dbee..9cff65a 100644 --- a/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/__snapshots__/index.test.jsx.snap +++ b/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/__snapshots__/index.test.jsx.snap @@ -55,11 +55,11 @@ exports[`ConfirmEmailBanner snapshot Show on unverified 1`] = ` onClose={[MockFunction closeConfirmModal]} title="" > -

Confirm your email -

+

diff --git a/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/index.jsx b/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/index.jsx index a5eb1fa..806a50c 100644 --- a/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/index.jsx +++ b/src/containers/LearnerDashboardHeader/ConfirmEmailBanner/index.jsx @@ -64,7 +64,7 @@ export const ConfirmEmailBanner = () => { )} > -

{formatMessage(messages.confirmEmailModalHeader)}

+

{formatMessage(messages.confirmEmailModalHeader)}

{formatMessage(messages.confirmEmailModalBody)}