feat: re-enable ORAs with reordered steps (#2145)

* feat: re-enable ORAs with reordered steps

* chore: bump ORA to 6.0.17

openassessment/__init__.py

@@ -2,4 +2,4 @@
 Initialization Information for Open Assessment Module
 """
 
-__version__ = '6.0.16'
+__version__ = '6.0.17'

openassessment/xblock/openassessmentblock.py

@@ -633,33 +633,15 @@ def student_view(self, context=None): # pylint: disable=unused-argument
  }
  )
 
- @property
- def uses_default_assessment_order(self):
- """
- Determine if our steps have been reordered (omission of steps is fine)
- """
- mfe_supported_step_ordering = ['student-training', 'self-assessment', 'peer-assessment', 'staff-assessment']
-
- last_step_index = 0
- for assessment_step in self.assessment_steps:
- step_index = mfe_supported_step_ordering.index(assessment_step)
-
- if step_index < last_step_index:
- return False
- last_step_index = step_index
-
- return True
-
  @property
  def mfe_views_supported(self):
  """
  Currently, there are some unsupported use-cases for ORA MFE views.
 
  Unsupported use-cases:
  1) Team assignments
- 2) Assignments with reordered assessment steps
- 3) ORAs with leaderboards
- 4) ORAs with LaTeX previews enabled
+ 2) ORAs with leaderboards
+ 3) ORAs with LaTeX previews enabled
 
  Returns:
  - False if we are in one of these unsupported configurations.
@@ -670,10 +652,6 @@ def mfe_views_supported(self):
  if self.is_team_assignment():
  return False
 
- # Assessment step reordering is currently unsupported
- if not self.uses_default_assessment_order:
- return False
-
  # We currently don't support leaderboards
  if self.leaderboard_show != 0:
  return False

openassessment/xblock/test/test_openassessment.py

@@ -716,13 +716,6 @@ def test_mfe_views_supported__teams(self, xblock, mock_teams_assignment):
  expected_supported = not mock_teams_assignment
  self.assertEqual(xblock.mfe_views_supported, expected_supported)
 
- @scenario('data/assessment_steps_reordered.xml')
- def test_mfe_views_supported__rearranged_steps(self, xblock):
- # Given this ORA has rearranged our assessment steps
- # When I see if MFE views are supported
- # Then they are unsupported for team assignments
- self.assertFalse(xblock.mfe_views_supported)
-
  @ddt.unpack
  @ddt.data((0, True), (5, False))
  @patch.object(openassessmentblock.OpenAssessmentBlock, 'leaderboard_show', new_callable=PropertyMock)

package.json

@@ -1,6 +1,6 @@
 {
  "name": "edx-ora2",
- "version": "6.0.16",
+ "version": "6.0.17",
  "repository": "https://github.com/openedx/edx-ora2.git",
  "dependencies": {
  "@edx/frontend-build": "8.0.6",