Commit Graph

56766 Commits

Author SHA1 Message Date
Samuel Lee e7e9f2aa4d add required peer review link to assignment header
add a link to the assignment header that allows the user to navigate
between assigned peer reviews

closes EVAL-3182
flag=peer_reviews_for_a2

test plan:
- Have a course with at three students
- Create an assignment with anonymous peer review disabled
- Assign the same student the other two peer reviews
- As the primary student with the two peer reviews, do not submit
  the assignment.
- Go to the non-anonymous peer review assignment page and see that
  there is a link called Required Peer Reviews on the header
- Confirm that all two students are under the Not Yet Submitted
  category when the link is clicked on and the popover is displayed
- Click on one of the students in the popover and see that it will
  navigate to the student's peer review page
- Confirm that the student whose peer review page is being viewed is
  the same student on the popover that has a grey box
- Confirm that there is a required peer review link on the page
  and the page says that you need to first submit before you
  can peer review
- As the primary student, submit the assignment and click on another
  student in the required peer review link
- Confirm that the page says the no submissions are available to review
  yet and the peer review link is shown on the page
- Go to one of the peer reviewee's account and submit the assignment
- Go back to the primary student's account and go to that assignments
  page.
- Confirm that the peer reviewee who just submitted is now in the
  Ready to Review section of the popover
- Click on the peer reviewee in the popover and submit a peer review
- Open the peer review popover again and confirm that the peer reviewee
  is now in the Completed Peer Reviews Section
- Perform the same steps with an anonymous assignment and confirm that
  the names on the popover says Anonymous with a number.
- Perform the same steps with a non-anonymous assignment with a rubric
- Create an assignment with peer reviews enabled but no peer reviews
  assigned
- Confirm that there is no required peer review link for the assignment

Change-Id: I314cb0842620cf5cf7129ec0bbe17064eb8f4dbe
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/323717
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Derek Williams <derek.williams@instructure.com>
QA-Review: Derek Williams <derek.williams@instructure.com>
Product-Review: Ravi Koll <ravi.koll@instructure.com>
2023-08-16 22:46:15 +00:00
Aaron Shafovaloff 6c2a88c254 Ignore console error with InstUI breakpoints
test plan:
  - build passes

flag=none

refs FOO-3190

Change-Id: I0d0070c101a906c9d24296e94ac26885faf71d58
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325405
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Reviewed-by: Michael Hulse <michael.hulse@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2023-08-16 22:36:05 +00:00
Spencer Olson 9e2b3f757e allow viewing deactivated students in speedgrader
closes EVAL-3330
flag=none

Allows teachers to view deactivated students for differentiated assignments
in SpeedGrader, so long as the "view inactive" option is selected
in Gradebook. Previously, if an assignment was differentiated, students
would only be shown in SpeedGrader if the students themselves had the
ability to view the assignment. This meant deactivated students wouldn't be
shown — even if teachers had the option selected in Gradebook to view
inactive students — because deactivated students can't view the assignment.

Test Plan:
1. Create an assignment and assign it to specific students

2. De-activate the enrollment of the students assigned.

3. Navigate to the Gradebook and enable the display of inactive
   enrollments.

4. Observe that the inactive student can be graded there.

5. Navigate back to the assignment in question.

6. Open SpeedGrader to view the submissions.

7. Verify you can see the deactivated students in SpeedGrader, and you
   don't get an error message like “Sorry, there are either no active
   students in the course or none are able to be graded by you”.

Change-Id: I793da6daa652abf41162fa8a9b11f437be05127f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/324998
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Reviewed-by: Derek Williams <derek.williams@instructure.com>
QA-Review: Samuel Lee <samuel.lee@instructure.com>
Product-Review: Ravi Koll <ravi.koll@instructure.com>
2023-08-16 22:35:08 +00:00
Samuel Lee c1e91c8f3e add late penalty and final grade to enhanced srgb
add late penalty and final grade labels to the grading results section
of the enhanced screen reader gradebook

closes EVAL-3358
flag=individual_gradebook_enhancements

test plan:
- skipped selenium test in srgb_grading_spec.rb for this ticket passes
- have a course with a late assignment, with a certain late penalty,
  such as 10 percent a day
- go to a student in the course and submit the assignment
- as a teacher, go to the enhanced screen reader gradebook and select
  the student and the assignment
- see that there is a late penalty and final grade label as well as
  0 for the late penalty and '-' for the final grade
- grade the student and see that there is a late penalty value based
  on the late penalty set
- the final grade value should reflect the entered grade with the late
  penalty deduction
- confirm that the grade in the grade input box is the user entered
  grade

Change-Id: I8c108ee1c76ea5236651a2633efa5dcc41013b9b
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/324598
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Christopher Soto <christopher.soto@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
QA-Review: Kai Bjorkman <kbjorkman@instructure.com>
Product-Review: Ravi Koll <ravi.koll@instructure.com>
2023-08-16 22:20:34 +00:00
Jackson Huang 663b58f0d9 Enable a2 view for lti
flag=none
closes EVAL-2546
refs INTEROP-8128

test plan
- create an external tools assignment with a2
enabled with multiple attempts
- as a student submit the assignment multiple times
- go to the lti assignment and you should be able to see the
tool

Change-Id: I4f9c1f0d138f372f88fbaae03d7cd55727c3fe00
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/320840
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Samuel Lee <samuel.lee@instructure.com>
QA-Review: Derek Williams <derek.williams@instructure.com>
Product-Review: Ravi Koll <ravi.koll@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2023-08-16 20:49:03 +00:00
Matheus c10f09ebe9 Create course_creation_accounts endpoint
This buils on top of manageable_accounts and includes
student and teacher enrollments for cases where those
result in more accounts where on can create courses.

refs LF-33
closes LF-532
flag=none

test plan:
- Hit /api/v1/accounts_to_create_courses_in
- Check the results is properly paginated
- Check that the resultset has all accounts
  you'd get from manageable_accounts
- Check that in addition to those you have
  accounts where student/teacehrs can create
  courses in (if you have enrollments there).

Change-Id: Id0924f56f6ea8ca0f987d63dac538c3e7386337b
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/315698
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jackson Howe <jackson.howe@instructure.com>
QA-Review: Jackson Howe <jackson.howe@instructure.com>
Product-Review: Luis Oliveira <luis.oliveira@instructure.com>
2023-08-16 20:36:31 +00:00
jake.oeding 968555913a modify progress management in course paces
closes LF-502
flag=course_paces
qa risk: low

test plan:
-smoke test the course pacing page by
 updating some paces and navigating away, coming
 back to the page, etc.
-normal user workflow should be the same as before

Change-Id: Ie1f814b81d85677945a863a5c3824b07fc0f8d85
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325120
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Eric Saupe <eric.saupe@instructure.com>
QA-Review: Eric Saupe <eric.saupe@instructure.com>
Product-Review: Jake Oeding <jake.oeding@instructure.com>
2023-08-16 20:04:46 +00:00
Omar Gerardo Soto-Fortuño fc9abe88ac Highlight discussion entry optimistic response
closes VICE-3629
flag=react_discussions_post

test plan:
  - Specs pass.
  - Try adding a discussion entry.
  - Optimistic response should be highlighted.

qa risk: low

Change-Id: Iaccba50ce43b89af39411caeea028952a0511b13
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325373
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jason Gillett <jason.gillett@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
2023-08-16 18:50:16 +00:00
Maya Tyner 746d760859 create enrollment tree within assign temp enroll screen
flag=temporary_enrollments
closes FOO-3333

test plan:
-parent display mixed relation correctly
-children dependedent on parent
-course state is shown
-mismatch warning appears when checked and diff role

Change-Id: Idcba70303a0c811d5b01bd7511742f3678f15c0b
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/324952
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Charley Kline <ckline@instructure.com>
QA-Review: Maya Tyner <maya.tyner@instructure.com>
Product-Review: Maya Tyner <maya.tyner@instructure.com>
2023-08-16 18:14:15 +00:00
Ed Schiebel 94755bc1fb Get correct date when editing existing event
closes LF-564
flag=none

test plan:
  - with your user in various timezones
  - create an event in the calendar
  - consider making the start/end time near midnight (try them both)
  - edit the event and choose more options
  > expect the date and time fields in the edit page to be correct
  - edit the event, changed the date, choose more options
  > expect the new date to be in the edit page
  - load 0/users/:user_id/calendar_events/new directly, not from
    the calendar
  > expect the date to be today (I'm not sure what would happen here
    if wallclock time was near midnight and your user is in a
    different timezone than your browser)

  > always expect the date to be formatted like Aug 14, 2023

Change-Id: If33da20f985ed0feca0bcb73b2f5a35fed5eefd9
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325112
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Robin Kuss <rkuss@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Ed Schiebel <eschiebel@instructure.com>
2023-08-16 18:08:13 +00:00
Alexander Youngblood 38c07853c6 Make course query + related fragment
closes VICE-2502
flag=discussion_create

Test plan:
1. Verify AC are met
(fragments exist and query correct fields)

Change-Id: Icc418939c6aa68dd708fe8c94ea4d3bd72799538
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/322896
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
QA-Review: Omar Soto-Fortuño <omar.soto@instructure.com>
2023-08-16 17:51:19 +00:00
jake.oeding ac4fb40766 add differentiated modules flag
closes LF-607
flag=differentiated_modules
qa risk: none

test plan:
-specs pass

Change-Id: I6afbeee70b570dd9aeecce919b33c13e729e659c
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325380
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jackson Howe <jackson.howe@instructure.com>
QA-Review: Jake Oeding <jake.oeding@instructure.com>
Product-Review: Jake Oeding <jake.oeding@instructure.com>
2023-08-16 17:36:42 +00:00
Jason Gillett 2d5aadc714 Remove double scroll bar from split-screen Discussion
flag=react_discussions_post
flag=split_screen_view

fixes VICE-3612

test plan:
- create a discussion with a lot of replies
so that you will need to scroll y
- verify there is just one horizontal scrollbar on the right
- verify you can scroll through the replies
- Verify that in a discussion with 1 reply, that the split-screen
is not cut off
- Verify that the module menu is correctly placed

Change-Id: Ice8c095c928a99f9c6430686227d5eb89c15a6f5
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325313
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Omar Soto-Fortuño <omar.soto@instructure.com>
Product-Review: Omar Soto-Fortuño <omar.soto@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
2023-08-16 17:19:36 +00:00
Jason Gillett 9f0fba8ac2 Prevent RCE from Rendering in the drawer Transition
The Drawer Tray mounted the DiscussionEdit ( containing the RCE) twice
once when it first opens and begins the slide to open
A second time after the transition finishes

The Canvas RCE causes a message to appear when it is mounted and a
draft is saved. Being mounted twice caused it to flash twice.

This Ticket prevents the DiscussionEdit from rendering until after the transition is completed.

closes VICE-3330
flag= split_screen_view

Test Plan
1. Verify that all forms of closing the split-screen view work
2. Type in the Canvas RCE then close
3. Reopen the reply
4. a pop up to put in saved content should appear only once

Change-Id: I97085f78c32b496bcfcd25725b2c124b8ba87c8f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325303
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Drake Harper <drake.harper@instructure.com>
QA-Review: Omar Soto-Fortuño <omar.soto@instructure.com>
Product-Review: Omar Soto-Fortuño <omar.soto@instructure.com>
2023-08-16 16:41:29 +00:00
Kai Bjorkman 26e2328f13 show last name first in enhanced srgb
flag=enhanced_individual_gradebook
closes EVAL-3356

test plan:
- go to enhanced srgb
- verify that the names are last name, first
- verify that the names are sorted by last name

Change-Id: If9fd0a233d97cc2c5ee3a8de6fb849fde3cf7b03
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/324446
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Samuel Lee <samuel.lee@instructure.com>
QA-Review: Samuel Lee <samuel.lee@instructure.com>
Product-Review: Jody Sailor
2023-08-16 16:39:40 +00:00
Chris Soto c9aeea6cf9 enhanced gradebook lock down query param routing
currently the new enhanced individual gradebook is able to be accessed
with the FF off if the user knows to navigate to the gradebook url with
the query param ?version=individual_enhanced. This commit adds a check
on the backend during the routing that will now direct the user to the
traditional gradebook grid if the FF is off.

closes EVAL-3419

flag=individual_gradebook_enhancements

test plan:
- navigate to /courses/<course_id>/gradebook?version=individual_enhanced
  and verify that you are directed to traditional gradebook

Change-Id: Ief0c905ffd919a0ea87a3c7643a07fff3ab9ac67
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325291
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Aaron Shafovaloff <ashafovaloff@instructure.com>
QA-Review: Rohan Chugh <rohan.chugh@instructure.com>
Product-Review: Ravi Koll <ravi.koll@instructure.com>
2023-08-16 15:35:53 +00:00
Derek Williams 05a574d908 show 'use this rubric for grading' option when adding to assignment
this option would only show if you checked then unchecked the option
'remove points from rubric'

fixes EVAL-3231
flag=none

test plan:
- create an external tool assignment
- from the assignment show page, click the '+ Rubric' button
- notice 'use this rubric for assignment grading' shows up as an option
- save the rubric with the option checked
- ensure the resulting dialog has actual values (not NaN)

Change-Id: I7eda43c2b267b41fd341efe49c40d63fc243d76b
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/320909
Reviewed-by: Samuel Lee <samuel.lee@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
QA-Review: Samuel Lee <samuel.lee@instructure.com>
Product-Review: Ravi Koll <ravi.koll@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2023-08-16 15:30:31 +00:00
Chris Soto e3dd4c4033 todo list return active or pending peer reviews
todo list was returning all peer reviews with no restrictions to review
user enrollment status. this change now returns only active or pending
peer reviews based on the user's enrollment status. the logic for
determining active or pending enrollment status was taken from the
existing active_or_pending method in the enrollment model.

fixes EVAL-3277
flag=non

test plan:
- you will probably need to refresh your local redis cache
- set up a peer review assignment with an end date
- assign a student 2 reviews to complete
- as each student submit the assignment
- as the student needing to review, go to the course home page and view
  the todo list. you should have the peer review assignment with 2 peer
  reviews to complete.
- as a teacher, make one of the reviewee students inactive
- as the student needing to review, go to the course home page and view
  the todo list. you should now have the peer review assignment with 1
  peer review to complete.
- click on the peer review url. it should navigate you to the peer
  review page for that submission.

Change-Id: I638441e4dfa993b0652cae6d1fe92948505dcb9d
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325118
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Derek Williams <derek.williams@instructure.com>
Product-Review: Ravi Koll <ravi.koll@instructure.com>
2023-08-16 15:27:48 +00:00
Ed Schiebel cc28d0b423 Correctly update calendar when editing an event
If you change the calendar of an event in a series, it is not
correctly updated on the selected events. This fixes that.

closes LF-571
flag=calendar_series

test plan:
  - create an event series
  - pick one and edit it
  - change the calendar (and any other stuff)
  - Submit and choose All Events
  > expect the calendar to be updated in all the events of the series
  - repeat but update only this event
  - repeat and update this and following
  - make other edits and expect it to work as expected

Change-Id: Iae3013c4621db3fed2197b3b23fd4d64f34b0ee1
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325265
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Robin Kuss <rkuss@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Ed Schiebel <eschiebel@instructure.com>
2023-08-16 14:40:34 +00:00
juan.chavez 2dc92b3a67 Update event series default recurrence count
closes LF-598

flag=calendar_series

test plan:
- Create a daily event in Calendar view or Event Form view.
> Verify that 365 occurrences of this event were created
(until next year).
- Create an "every weekdays" event in Calendar view or
Event Form view.
> Verify that 260 occurrences of this event were created
every weekdays (until next year).

Change-Id: I32da38d0d7fc611e44846486d62f277062443d9c
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325286
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Ed Schiebel <eschiebel@instructure.com>
QA-Review: Ed Schiebel <eschiebel@instructure.com>
Product-Review: Juan Chavez <juan.chavez@instructure.com>
2023-08-16 14:11:59 +00:00
Ed Schiebel de909f2620 Get red outline on custom recurrence count picker
closes LF-595
flag=calendar_series

test plan:
  - create and event and choose Custom from the freq picker
  - enter an invalid value for count (<0 or >401)
  > expect the number input to get a red outline
  > expect the error message is still there too

Change-Id: Iff48c7de52956d52f9c7951bbfe0222cbb8be691
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325254
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Robin Kuss <rkuss@instructure.com>
QA-Review: Robin Kuss <rkuss@instructure.com>
Product-Review: Ed Schiebel <eschiebel@instructure.com>
2023-08-16 12:59:53 +00:00
Cody Cutrer 15ec75cf72 bundle update twilio-ruby
Change-Id: Ie725fc2227c014741c7ecb10f311b075996ac144
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325309
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>
2023-08-16 12:22:00 +00:00
Cody Cutrer cc7b5cef69 bundle update oauth2
Change-Id: Ibb12d5fb5f1d51cb62b6121c6e477882215e7b89
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325311
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>
2023-08-15 23:31:23 +00:00
Cody Cutrer a18c485b6d bundle update diplomat
Change-Id: Id76e639558f47981e0e5b9866dff6514252b67e4
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325304
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>
2023-08-15 23:31:13 +00:00
Cody Cutrer 7c6068acc9 don't commit if the bundle update failed
Change-Id: Icaa682e215760e311acf492ad3d50d7d552824f8
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325275
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2023-08-15 23:30:52 +00:00
Cody Cutrer 26b2cdee1c make sure to fully resolve secondary lockfiles when deps didn't match
Change-Id: Ibe844a260a313790195bba47bfd40f5662d047af
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325095
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
2023-08-15 23:30:36 +00:00
Caleb Guanzon 066016a6ed add left margin & padding to DeletedPostMessage
flag=react_discussions_post
fixes VICE-3630

test plan:
- as a teacher or admin
- verify that deleted discussion entries no matter what level
and no matter what view (inline or split screen) are left aligned
with their not deleted siblings

Change-Id: I61073f2c14886ea0d68f20aeae8933639a9ffc3e
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325252
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jason Gillett <jason.gillett@instructure.com>
Reviewed-by: Omar Soto-Fortuño <omar.soto@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
2023-08-15 22:29:36 +00:00
rohan.chugh 3dd98ac1d9 move final grade text box to shared component
move the final grade override text box from enhanced individual
gradebook to a shared component to be reused in the traditional
gradebook total grade override tray

closes EVAL-3416

flag=individual_gradebook_enhancements

test plan:
- have a course with a student and a grading scheme and grading periods
- enable final grade override
- go to the enhanced individual gradebook (either by enabling the ff
  or adding ?version=individual_enhanced to the url of the normal srgb)
- choose a student and scroll to the override text box
- enter a grade to change it
- if a numeric grade was entered, the letter grade should appear in the
  box and the numeric percentage should appear to the right side of the
  box if grading schemes are enabled
- if grading schemes are not enabled, it should show the numeric grade
  in the text box
- if a letter grade was entered, the letter grade should appear in the
  box and the lower bound numeric percentage of the grading scheme
  should appear to the right side of the box if grading schemes
  are enabled
- do this for a grading period, all grading periods, and a course
  without grading periods

Change-Id: If2e3e35ab7d0494f06ee079182ed537c15caf94f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325289
Reviewed-by: Christopher Soto <christopher.soto@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Christopher Soto <christopher.soto@instructure.com>
Product-Review: Jody Sailor
2023-08-15 22:13:34 +00:00
Aaron Shafovaloff 516a7f351c revert changes to TempEnrollModal.tsx
test plan:
  - build passes

flag=none

Change-Id: I5e01d738a347a424c4a026d3732e347f13471382
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325306
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Maya Tyner <maya.tyner@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
2023-08-15 22:08:00 +00:00
Cody Cutrer aebb87b7c8 bundle update faraday
Change-Id: I17ad4bfec0bdaeb90b9fdfe5c6de1a09f81b3145
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325308
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>
2023-08-15 21:56:26 +00:00
Caleb Guanzon c105848b05 render reply preview message as html
flag=react_discussuons_post
fixes VICE-3649

this renders the quoted entry
as html when creating a new reply
that quotes another reply

this operates on the knowledge that
the backend sanitizes the message body
when it is stored

test plan:
- create a short reply with
```
I like

<script>console.log('bananas')</script>
```
- post it, then quote it
- in the quote create component, verify
that the quoted preview of your reply
is formatted the same way as your reply is formatted
- verify bananas was not logged in the console

- repeat the test, this time with a long message
that includes html tags (must be over 165 chars, use
an ipsum generator if you want)

- verify the truncated quoted preview matches the
formatting of the reply
- verify no console logs was logged in the console

Change-Id: I1f005040b0c0b3e74ff0be792afec25e9fa5dc27
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325293
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Jason Gillett <jason.gillett@instructure.com>
Reviewed-by: Alexander Youngblood <alexander.youngblood@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
2023-08-15 21:45:23 +00:00
Aaron Suggs e7be723471 Add README for code ownership
refs VICE-3684

test plan:
  - N/A. This is a doc-only change.

flag=none

Change-Id: I51f15892ac523857c8760bb5a7d0e1609f35fe22
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325288
Reviewed-by: Omar Soto-Fortuño <omar.soto@instructure.com>
QA-Review: Omar Soto-Fortuño <omar.soto@instructure.com>
Product-Review: Omar Soto-Fortuño <omar.soto@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2023-08-15 21:03:23 +00:00
Aaron Shafovaloff 4b84bfbe37 Prepare for InstUI upgrade
Test plan
  - Build passes

flag=none

Refs FOO-3190

Change-Id: I98cffac1add43a52c2f35806022520a1bccf90e4
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325271
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Michael Hulse <michael.hulse@instructure.com>
Reviewed-by: Charley Kline <ckline@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
2023-08-15 20:57:53 +00:00
Michael Hulse 0ded50ee87 update check for temporary_enrollments to use root account
When testing the temporary_enrollments feature flag, I noticed
that the feature check was not using the root account. This
caused the feature check to fail when the feature was enabled
on the root account but not on the current (sub) account. This
fixes the feature check to use the root account.

refs FOO-3071
flag=none

test plan:

1. create sub-account
2. create two users on account (a.k.a. user1/user2)
3. from root account: settings > features > turn on temp enrollment
4. enable permissions: User - Temporary Enrollments
5. create course add user1 as teacher
6. add module/assignment and publish everything
7. cURL this:

curl --location 'http://<canvas>/api/v1/courses/1/enrollments' \
--header 'Authorization: Bearer <token>' \
--form 'enrollment[start_at]="2023-08-14T00:00:00Z"' \
--form 'enrollment[end_at]="2024-08-14T00:00:00Z"' \
--form 'enrollment[user_id]="2"' \
--form 'enrollment[type]="TeacherEnrollment"' \
--form 'enrollment[enrollment_state]="active"' \
--form 'enrollment[course_section_id]="1"' \
--form 'enrollment[temporary_enrollment_source_user_id]="1"'

Where temporary_enrollment_source_user_id would be the already
enrolled user id, and user_id would the recipient user id of the
temporary enrollment

8. expect enrollments.temporary_enrollment_source_user_id for user_id
   to equal the already enrolled user id
9. also, expect newly-included specs pass

Change-Id: Ib800822e10e4b3819a305edf10f81f82bcb499bd
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325210
Reviewed-by: August Thornton <august@instructure.com>
Reviewed-by: Michael Hulse <michael.hulse@instructure.com>
QA-Review: Michael Hulse <michael.hulse@instructure.com>
Product-Review: Michael Hulse <michael.hulse@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2023-08-15 20:42:46 +00:00
Cody Cutrer d8e95db85f bundle update stackprof
Change-Id: Iead1018731c9be3932a7704492c1a93b77b68c67
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325280
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>
2023-08-15 20:20:54 +00:00
Cody Cutrer 6d6d09c3e0 bundle update sqlite3
Change-Id: If943867d8f514d1573ef974508f3f6c5eb3415d2
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325279
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>
2023-08-15 20:20:26 +00:00
Cody Cutrer e1f3572229 bundle update code_ownership
Change-Id: Ifbedc2ea19a39e11217b34b2320a05e9cd3e1d16
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325278
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>
2023-08-15 20:19:48 +00:00
Cody Cutrer 562f56cd58 bundle update inst_statsd
Change-Id: I07900190cad93a4f2ec0d6449ef96f0d37cc0df3
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325276
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>
2023-08-15 20:19:00 +00:00
Cody Cutrer 176e41cc89 bundle update timecop
Change-Id: Ic1fb4a864b2b40d0b9e5f6df7bdb640189e3ac66
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325281
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>
2023-08-15 20:16:56 +00:00
Cody Cutrer 0810360b15 bundle update aws-partitions
Change-Id: I83cb5b8548de56a4d809f2d7a36402a4dc0c9f69
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325277
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>
2023-08-15 20:16:27 +00:00
Cody Cutrer 3543fd8d71 bundle update mime-types-data
Change-Id: I4e8b52cf162b7c6082888cbf8e6f5905ef0150b8
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325010
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jacob Burroughs <jburroughs@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
Build-Review: Cody Cutrer <cody@instructure.com>
2023-08-15 20:16:15 +00:00
rohan.chugh 4d2c6522d5 add custom status pills for final grade overrides
add custom status pills to the student grades page (grade summary
page) if there is a custom status for a final grade override

closes EVAL-3403

flag=custom_gradebook_statuses

test plan:
- add a custom status to a final grade override through the
  traditional gradebooks for a course with grading periods for
  a specific grading period and also for the "all grading periods"
  filter
- go to that student's grade summary page (student grades page) and
  verify that a custom status pill exists in the final grade row
  for the grading period that the custom status was added for, and
  does not exist for a grading period that it wasn't added for

Change-Id: I46648be4fb6f225663eb3dc5b25ee02495fdba22
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325109
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Christopher Soto <christopher.soto@instructure.com>
QA-Review: Spencer Olson <solson@instructure.com>
Product-Review: Jody Sailor
2023-08-15 19:02:27 +00:00
Sarah Gerard af7d698fee Clean up stuck progresses
looks for progresses for course_pace_publish that
are in a queued state and have a delayed_job_id where
the DelayedJob for that id does not exist and set them to failed

Fixes LF-506
flag=none

test plan:
- if you don't have some already, make some course pacings, thus
  making progresses for publishing the pacings
- in a rails console, find some completed progresses for
  course_pace_publish:
  Progress.where(tag: "course_pace_publish", workflow_state: "completed")
- set some of those progresses to "queued"
  Progress.find(id).update_attribute(:workflow_state, "queued")
- run the migration
- the progresses that were set to queued should now have a
  workflow_state of "failed"

Change-Id: I599b224cad9bf84b12b3e39c75c988a7c0289aaf
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/324928
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Eric Saupe <eric.saupe@instructure.com>
QA-Review: Eric Saupe <eric.saupe@instructure.com>
Migration-Review: Cody Cutrer <cody@instructure.com>
Product-Review: Sarah Gerard <sarah.gerard@instructure.com>
2023-08-15 18:21:36 +00:00
rohan.chugh b2d4fc4c5d update group search to filter on backend
modifies the REST API endpoint that the student view groups page uses
to fetch groups to add a filter query param. this param filters
groups by group name or the names of the users of the group.

closes EVAL-3254
refs EVAL-3253

flag=none

test plan:
- go to a canvas course that has a large number of groups (e.g. 100+)
- go to the people tab of the course
- click on student view at the top right
- go to the groups section on the people page of the student view
- search for a group name or a user's name that is in the group
- ensure that only one request is made to find those filtered groups
- ensure that the groups that are returned are filtered by the search
  term
- enter another search term
- ensure that only one request is made to find those filtered groups
- ensure that the groups that are returned are filtered by the search
  term and NOT the previous search term

Change-Id: Iaa62024aaef7f1db50d5cf7029bc590cf31c396b
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/324188
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Omar Soto-Fortuño <omar.soto@instructure.com>
Product-Review: Omar Soto-Fortuño <omar.soto@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
2023-08-15 18:13:46 +00:00
Omar Soto-Fortuño 3589a6c3ab Revert "Remove double scroll bar on discussion redesign"
This reverts commit e5ede9fb13.

Reason for revert: This is causing other issue with the modules component on Discussions. 

Change-Id: I88b460de17c498420acc3a36e3528895a307c04b
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/324716
Reviewed-by: Caleb Guanzon <cguanzon@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Caleb Guanzon <cguanzon@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
2023-08-15 18:10:41 +00:00
Cameron Ray 0cb51a3a65 Improve the recursive nature of grading standards
refs EVAL-3367
flag=default_account_grading_scheme

Test plan
 - Tests pass

Change-Id: I2837dc95a307e43b7e35fee6f63258436e6ce6f3
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/324664
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Kai Bjorkman <kbjorkman@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Cameron Ray <cameron.ray@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
2023-08-15 18:04:08 +00:00
Cameron Ray 1c45e43746 Remove DueDateCacher alias
closes EVAL-3286
flag=none

Test plan
- tests pass

Change-Id: I6f41a30681e567fb87801d475d7904f6a8ffa10f
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325255
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Derek Williams <derek.williams@instructure.com>
QA-Review: Cameron Ray <cameron.ray@instructure.com>
Product-Review: Cameron Ray <cameron.ray@instructure.com>
2023-08-15 17:18:14 +00:00
Kai Bjorkman bf8aa1ecb7 readable and internationalized submission types
flag=enhanced_individual_gradebook
closes EVAL-3373

test plan:
- go to a course with a student and assignment with mulitple submission
types and one with a single submission type
- go to the enhanced individual gradebook
- click on the student's name
- click on the assignment name
- verify that the submission type is in readable format with
comma's for multiple and only one submission type

Change-Id: Id720e73510c4a7960221419cad62ea69abaf416b
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/324445
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
Reviewed-by: Christopher Soto <christopher.soto@instructure.com>
QA-Review: Christopher Soto <christopher.soto@instructure.com>
Product-Review: Ravi Koll <ravi.koll@instructure.com>
2023-08-15 16:58:47 +00:00
James Butters c0ef47ebb7 prepend cystalball diff with gems/plugins
plugin builds are not getting accurate predictions,
override some of crystalball's methods to fit the way
Canvas-LMS handles plugins.

fixes: DE-1596
flag = none
[force-crystalball]

Change-Id: Ib347737f9e7f65660830ce0ffaaa6b3bc0a27f86
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/324830
QA-Review: James Butters <jbutters@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Andrea Cirulli <andrea.cirulli@instructure.com>
Product-Review: James Butters <jbutters@instructure.com>
2023-08-15 16:26:39 +00:00
Jackson Howe b50fe260eb Create canvas-media v1.7.0
Change-Id: I4d1a76b06a508e0682d62f3fc297c083f104ab22
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/325238
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Jake Oeding <jake.oeding@instructure.com>
QA-Review: Jake Oeding <jake.oeding@instructure.com>
Product-Review: Jackson Howe <jackson.howe@instructure.com>
2023-08-15 16:17:01 +00:00