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: block team ORAs from ESG (for now) #1849

Merged
merged 5 commits into from Apr 19, 2022

Conversation

jansenk
Copy link
Contributor

@jansenk jansenk commented Apr 18, 2022

TL;DR - block team ORAs from ESG (for now)

JIRA:AU-617 (Not exactly FOR this ticket, but relates to)

What changed?

  • In Staff area:
    • Team ORAs will Ignore ESG Enabled flag, always have "Grade Available Responses" button open the old staff grading workflow.
    • Team ORAs will never show demo button
  • In Instructor Dashboard:
    • Rows for Team ORAs will ignore "ESG Enabled" and always have the old behavior. Clicking the staff column will open staff grading, and they will have no text or link in the "Staff Grader" column.
    • I also fixed a bug where the link to the ESG will now only show up for ORAs that have a staff step.

Developer Checklist

Testing Instructions

In a course with both Team and Individual ORAs visit the Instructor Dashboard ORA page with the ESG enabled flag on and off. Click into the ORAs to see staff area.

Reviewer Checklist

Collectively, these should be completed by reviewers of this PR:

  • I've done a visual code review
  • I've tested the new functionality

FYI: @openedx/content-aurora

Screenshots:

Instructor Dashboard (ESG Enabled)

Dash Enabled

Instructor Dashboard (ESG Disabled)

Dash Disabled

Team ORA Staff Area(ESG Enabled)

Staff Area Team Enabled

Team ORA Staff Area (ESG Disabled)

Staff Area Team Disabled

Staff ORA Staff Area (ESG Enabled) [Existing Behavior]

Staff Area Staff Enabled

Staff ORA Staff Area (ESG Disabled) [Existing Behavior]

Staff Area Staff Disabled

@jansenk jansenk requested a review from a team as a code owner April 18, 2022 19:38
@codecov
Copy link

codecov bot commented Apr 18, 2022

Codecov Report

❗ No coverage uploaded for pull request base (feature/esg-demo-mode@4b0a8c3). Click here to learn what that means.
The diff coverage is n/a.

@@                   Coverage Diff                    @@
##             feature/esg-demo-mode    #1849   +/-   ##
========================================================
  Coverage                         ?   94.99%           
========================================================
  Files                            ?      153           
  Lines                            ?    17246           
  Branches                         ?     1896           
========================================================
  Hits                             ?    16383           
  Misses                           ?      647           
  Partials                         ?      216           
Flag Coverage Δ
unittests 94.99% <0.00%> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4b0a8c3...98f6e8e. Read the comment docs.

Copy link
Contributor

@mattcarter mattcarter left a comment

Choose a reason for hiding this comment

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

Approved

Copy link
Contributor

@muselesscreator muselesscreator left a comment

Choose a reason for hiding this comment

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

LGTM

@mattcarter mattcarter merged commit 8790ee8 into feature/esg-demo-mode Apr 19, 2022
@mattcarter mattcarter deleted the jkantor/teams-esg branch April 19, 2022 14:13
mattcarter pushed a commit that referenced this pull request Apr 19, 2022
* feat: block team ORAs from ESG (for now)

* style: quality

* test: test

* chore: static

* chore: version
mattcarter added a commit that referenced this pull request Apr 19, 2022
* feat: stuff column should not be clickable on ESG enable

test: update unit testing

chore: update static

chore: update translations

chore: version bump

* feat: add link from xblock staff area to ESG (#1839)

Added a link to ESG demo when ESG is not enabled.
Made the staff area buttons inline-block with a margin because they are now overflowing.
I tried to mimic a Paragon Button in terms of coloring: used primary-500 for background, darkened by 7.5% on hover.

* feat: block team ORAs from ESG (for now) (#1849)

* feat: block team ORAs from ESG (for now)

* style: quality

* test: test

* chore: static

* chore: version

* chore: Update version

* chore: Update translations

* chore: translations

* chore: js versions

Co-authored-by: Leangseu Kim <lkim@edx.org>
Co-authored-by: Jansen Kantor <jkantor@edx.org>
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

4 participants