Commit Graph

13 Commits

Author SHA1 Message Date
Derek Williams fa6fa6d910 handle 'shop sharing' button when recording screen share
closes ARC-9763
flag=speedgrader_studio_media_capture

test plan:
- start recording a screen share media comment in speedgrader
- click the 'shop sharing' button
- verify that the recording stops and the media modal appears

Change-Id: Ib3de0b680acb9edc30b652e00b0c131354cfaac4
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/350455
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
QA-Review: Ojaswee Chaudhary <ojaswee.chaudhary@instructure.com>
Product-Review: Ravi Koll <ravi.koll@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
Reviewed-by: Rohan Chugh <rohan.chugh@instructure.com>
2024-07-03 13:46:10 +00:00
Aaron Shafovaloff b5e259f699 Apply various lint fixes
Change-Id: I1fcc99f3b3bc15e5f4d42762878bea12002d99e4
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/347493
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Michael Hulse <michael.hulse@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
2024-05-16 03:28:31 +00:00
Aaron Shafovaloff 94eec36cb6 run prettier on ui/ and spec/
Change-Id: If7c95860bab3791a5be1dea1961d83dbb6a5dd50
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/347401
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
2024-05-15 15:31:35 +00:00
Derek Williams b06cd5aa96 remove blocking modal when recording screen share
The modal that is used to record screen share media
on speed grader submission comments was blocking the
page, so you could not interact with the page while
the modal was open. This change removes the modal
and instead shows an indicator bar.

flag=speedgrader_studio_media_capture
closes EVAL-4130

test plan:
- go to speed grader
- click on the media recorder icon
- click the start button (this should default to
    the webcam recoring)
- the modal should stay on the page
- close the modal and click the media recorder
    icon again
- select screen share this time
- click the start button and the modal should
    disappear and the indicator bar should show
    at the top of the page
- click the 'cancel' button and the indicator bar
    should disappear
- click the media recorder icon again and select
    screen share
- click the start button and the indicator bar
    should show at the top of the page again
- click the 'finish' button and the indicator bar
    should disappear and the modal should show

Change-Id: I20911ae96c0bd9c2ce1519e3958f9b659adc0ec0
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/345967
Reviewed-by: Cameron Ray <cameron.ray@instructure.com>
QA-Review: Cameron Ray <cameron.ray@instructure.com>
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Product-Review: Melissa Kruger <melissa.kruger@instructure.com>
2024-05-03 19:37:53 +00:00
Derek Williams 17c1ab6215 use studio ScreenCapture in speed grader
flag=speedgrader_studio_media_capture

test plan:
- enable speedgrader_studio_media_capture feature flag
- go to the speed grader
- click on the media recorder button
- verify that the screen capture option is available

Change-Id: I37349bbe5fa29f431ecb028c2c96f05290974488
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/341093
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: Rohan Chugh <rohan.chugh@instructure.com>
Product-Review: Ravi Koll <ravi.koll@instructure.com>
2024-02-23 19:01:57 +00:00
Aaron Shafovaloff e0b90383b9 upgrade prettier
Change-Id: I9a0fd5a82163462822bec33fc5e39261e6adcd22
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/337220
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Derek Williams <derek.williams@instructure.com>
Reviewed-by: Omar Soto-Fortuño <omar.soto@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
2024-01-10 18:11:55 +00:00
Jacob DeWar f55815f59e Add default media extension
fixes LF-906
flag=none

Test Plan:
- In an RCE, record a video and save it
- Go to course file
- Verify new file has appropriate extension
- Repeat with uploading media

- Go to submission comments
  - Submit an assignment
  - Go to speedgrader for submission
- Record media
- Go to user files
- Verify new file has appropriate extension
- Repeat with uploading media

Change-Id: Ie79209fd6bd43eb5eeaae1dbd85c89bc34f7d2a3
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/331893
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Product-Review: Jacob DeWar <jacob.dewar@instructure.com>
Reviewed-by: Juan Chavez <juan.chavez@instructure.com>
QA-Review: Juan Chavez <juan.chavez@instructure.com>
2023-11-08 21:19:13 +00:00
Aaron Shafovaloff 11b284327c move .js files with JSX to .jsx extension
- .js files without JSX reduces unnecessary AST transformation
 - also paves way for vitest

test plan:
  - existing tests pass

flag=none

Change-Id: I392daefdfefab89e7cf511477e16c860b05519ff
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/323393
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Spencer Olson <solson@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Product-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
Build-Review: Andrea Cirulli <andrea.cirulli@instructure.com>
2023-07-24 14:59:37 +00:00
Aaron Shafovaloff 86d0e7ced2 Update JavaScript in ui/ to latest prettier config
Test plan:
  - All existing tests pass

flag=none

[skip-eslint]

Change-Id: I36c1a2f47004185f8f02f4155b838c877ee495e3
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/302256
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Charley Kline <ckline@instructure.com>
Reviewed-by: Ed Schiebel <eschiebel@instructure.com>
Product-Review: Charley Kline <ckline@instructure.com>
QA-Review: Aaron Shafovaloff <ashafovaloff@instructure.com>
2022-09-29 22:04:26 +00:00
Aaron Shafovaloff f8458c8699 fix formatting from useScope commits
test plan:
 - all tests pass

flag=none

Change-Id: I50e858039081b8bd0c5a497cdf9e697710a54dc5
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/287364
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Ahmad Amireh <ahmad@instructure.com>
QA-Review: Ahmad Amireh <ahmad@instructure.com>
Product-Review: Ahmad Amireh <ahmad@instructure.com>
2022-03-17 21:07:06 +00:00
Ahmad Amireh bf46b5cc33 rewrite i18n! to useScope in javascripts
refs FOO-2696
flag = none

applied by the codemod found here: https://github.com/instructure/canvas-i18n-loader-rewrite

this won't pass in isolation, see the mega patch that cherry-picks them
all for the status

~ test plan ~

do a cursory glance over the changes and verify we didn't miss anything

Change-Id: I9bc7dad55c7aba9053ab69c9bb477cb4ee3e78bb
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/286661
Tested-by: James Butters <jbutters@instructure.com>
Reviewed-by: Charley Kline <ckline@instructure.com>
QA-Review: Charley Kline <ckline@instructure.com>
Product-Review: Charley Kline <ckline@instructure.com>
2022-03-10 21:38:25 +00:00
Weston Dransfield 483a214713 Bump media capture
This bump fixes an issue in Chrome 92
that prevented media recording

Ignore some failing tests for now as it seems to be
a Jenkins environment issue

Closes MAT-375
flag=none

Change-Id: I9cae6048dfe23fbdc990f0dc03c1610616af06bf
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/271683
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Gary Mei <gmei@instructure.com>
QA-Review: Gary Mei <gmei@instructure.com>
Product-Review: Gary Mei <gmei@instructure.com>
2021-08-18 22:28:00 +00:00
Ahmad Amireh 4243097b21 rename some things
fixes FOO-1265

[skip-eslint=true]
[pin-commit-analytics=7e49eefd7f59cbf43fd03bf8957bbbfa76f8d9d5]
[pin-commit-demo_site=adade2e38e46a358a4643cd3db2fe5ccffe39ec5]
[pin-commit-instructure_misc_plugin=47a3161102b0611af56d134fbd0c828ddc1b8abf]
[pin-commit-migration_tool=0dbac2f5b421d894395605ce4b583ef0f7d60b22]
[pin-commit-multiple_root_accounts=cc96d28c0d59bbe47acc64de4fdd8e1d2b029805]

Change-Id: I14c07f20bd260cf0de1f48ceb70b3c2313edf2d2
Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/258807
Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com>
Reviewed-by: Michael Ziwisky <mziwisky@instructure.com>
QA-Review: Michael Ziwisky <mziwisky@instructure.com>
Product-Review: Michael Ziwisky <mziwisky@instructure.com>
2021-04-06 01:12:49 +00:00