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

Cleanup tabs and tests on My PL page #58186

Merged
merged 52 commits into from
May 1, 2024
Merged

Cleanup tabs and tests on My PL page #58186

merged 52 commits into from
May 1, 2024

Conversation

TurnerRiley
Copy link
Contributor

@TurnerRiley TurnerRiley commented Apr 23, 2024

This PR cleans up how the different My PL page tabs are rendered so it's more readable and easier to add more content in the future. Aside from adding unit tests to test that the right sections are in each tab, this PR does the following cleanup tasks:

  • Show the "Regional Partner Center" tab and the "Workshop Organizer Center" tab if the user has the program_manager or the workshop_organizer permissions, respectively
  • Render the Enrolled Workshops table and the Workshop Feedback banner on the "Facilitator Center", "Regional Partner Center", and "Workshop Organizer Center" tabs
  • Make the section code links purple and the other links black with an underline to match the Figma for the Joined Professional Learning Sections table and the Instructor Professional Learning Sections table

Demos

"Facilitator Center" tab

FacilitatorCenter

"Instructor Center" tab

UniversalInstructorView

"Regional Partner Center" tab

Regional Partner Center

"Workshop Organizer Center" tab

Workshop Organizer Center

Updates the link styling in the Joined Professional Learning Sections table and the Instructor Professional Learning Sections table

Previous Joined PL Sections table:
My PL with sections 2

New Joined PL Sections table:
NewJoinedPL

Previous Instructor PL Sections table:
OldInstructed

New Instructor PL Sections table:
NewInstructedPLSectionsTable

Links

Jira ticket (general cleanup): here
Jira ticket (Workshop table on right tabs): here
Jira ticket (Workshop Feedback section on right tabs): here
Figma of page for reference: here

Testing story

Local testing and adding unit tests.

@TurnerRiley TurnerRiley requested a review from a team as a code owner April 23, 2024 16:10
@TurnerRiley TurnerRiley changed the base branch from staging to move-joined-pl-sections-to-my-pl-page April 23, 2024 16:10
Base automatically changed from move-joined-pl-sections-to-my-pl-page to staging April 23, 2024 20:07
@TurnerRiley TurnerRiley changed the title Cleanup my pl tabs Cleanup tabs and tests on My PL page Apr 23, 2024
@TurnerRiley TurnerRiley requested a review from a team April 23, 2024 23:01
<>
{lastWorkshopSurveyUrl && RenderLastWorkshopSurveyBanner()}
{RenderOwnedPlSections()}
{RenderEnrolledWorkshops()}
Copy link
Contributor

Choose a reason for hiding this comment

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

For facilitators, regional partners, and workshop organizers, we want to render the workshops related to that role. That data should be passed down to the client, but you might need to pull it through to this component.

Here's where that data is fetched in the controller.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh you're so right, my bad! I'll fix this!

<AddSectionDialog />
</section>
)}
{currentTab === 'myPL' && RenderMyPlTab()}
Copy link
Contributor

Choose a reason for hiding this comment

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

so clean 🤩

Copy link
Contributor

Choose a reason for hiding this comment

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

➕ Amazing!

Copy link
Contributor

@bethanyaconnor bethanyaconnor left a comment

Choose a reason for hiding this comment

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

Thanks for doing all of this! It looks good, but one comment about workshops.

Copy link
Contributor

@kelbyhawn kelbyhawn left a comment

Choose a reason for hiding this comment

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

I mostly looked at the LandingPage.jsx changes and styling updates, so approving based off of that, but overall this looks incredible!

<h2>My Workshops</h2>
{this.renderWorkshopsTable()}
{this.props.workshops && (
<section>
Copy link
Contributor

Choose a reason for hiding this comment

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

🎉

<AddSectionDialog />
</section>
)}
{currentTab === 'myPL' && RenderMyPlTab()}
Copy link
Contributor

Choose a reason for hiding this comment

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

➕ Amazing!

@TurnerRiley TurnerRiley merged commit a49015d into staging May 1, 2024
2 checks passed
@TurnerRiley TurnerRiley deleted the cleanup-my-pl-tabs branch May 1, 2024 17:21
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.

None yet

3 participants