@instructure/canvas-rce 5.11.1 → 5.12.1

package/es/rce/plugins/instructure_record/VideoOptionsTray/TrayController.js

@@ -146,7 +146,7 @@ export default class TrayController {
       // If not, we can't update the MediaObject in the canvas db.
 
 
-      if (videoOptions.media_object_id && videoOptions.media_object_id !== 'undefined') {
+      if (videoOptions.media_object_id && videoOptions.media_object_id !== 'undefined' && !videoOptions.editLocked) {
         videoOptions.updateMediaObject(data).then(_r => {
           if (this.$videoContainer && videoOptions.displayAs === 'embed') {
             this.$videoContainer.contentWindow.postMessage({
@@ -177,6 +177,27 @@ export default class TrayController {
     this._editor = null;
   }
 
+  requestSubtitlesFromIframe(cb) {
+    var _this$$videoContainer2, _this$$videoContainer3;
+
+    if (!bridge.canvasOrigin) return;
+    this._subtitleListener = new AbortController();
+    window.addEventListener('message', event => {
+      var _event$data;
+
+      if ((event === null || event === void 0 ? void 0 : (_event$data = event.data) === null || _event$data === void 0 ? void 0 : _event$data.subject) === "media_tracks_response") {
+        var _event$data2;
+
+        cb(event === null || event === void 0 ? void 0 : (_event$data2 = event.data) === null || _event$data2 === void 0 ? void 0 : _event$data2.payload);
+      }
+    }, {
+      signal: this._subtitleListener.signal
+    });
+    (_this$$videoContainer2 = this.$videoContainer) === null || _this$$videoContainer2 === void 0 ? void 0 : (_this$$videoContainer3 = _this$$videoContainer2.contentWindow) === null || _this$$videoContainer3 === void 0 ? void 0 : _this$$videoContainer3.postMessage({
+      subject: 'media_tracks_request'
+    }, bridge.canvasOrigin);
+  }
+
   _renderTray(trayProps) {
     let vo = {};
 
@@ -198,8 +219,11 @@ export default class TrayController {
         this._isOpen = true;
       },
       onExited: () => {
+        var _this$_subtitleListen;
+
         bridge.focusActiveEditor(false);
         this._isOpen = false;
+        (_this$_subtitleListen = this._subtitleListener) === null || _this$_subtitleListen === void 0 ? void 0 : _this$_subtitleListen.abort();
       },
       onSave: videoOptions => {
         this._applyVideoOptions(videoOptions);
@@ -207,7 +231,8 @@ export default class TrayController {
       onRequestClose: () => this._dismissTray(),
       open: this._shouldOpen,
       trayProps: trayProps,
-      studioOptions: isStudioEmbeddedMedia(this.$videoContainer) ? parseStudioOptions(this.$videoContainer) : null
+      studioOptions: isStudioEmbeddedMedia(this.$videoContainer) ? parseStudioOptions(this.$videoContainer) : null,
+      requestSubtitlesFromIframe: cb => this.requestSubtitlesFromIframe(cb)
     });
     ReactDOM.render(element, this.$container);
   }

package/es/rce/plugins/instructure_record/VideoOptionsTray/index.js

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU Affero General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { arrayOf, bool, func, number, shape, string } from 'prop-types';
 import { Button, CloseButton, IconButton } from '@instructure/ui-buttons';
 import { Heading } from '@instructure/ui-heading';
@@ -27,12 +27,14 @@ import { IconQuestionLine } from '@instructure/ui-icons';
 import { Flex } from '@instructure/ui-flex';
 import { FormFieldGroup } from '@instructure/ui-form-field';
 import { View } from '@instructure/ui-view';
+import { Spinner } from '@instructure/ui-spinner';
 import { Tooltip } from '@instructure/ui-tooltip';
 import { Tray } from '@instructure/ui-tray';
 import { StoreProvider } from '../../shared/StoreContext';
 import { ClosedCaptionPanel } from '@instructure/canvas-media';
 import { CUSTOM, MIN_WIDTH_VIDEO, MIN_PERCENTAGE, videoSizes, labelForImageSize, scaleToSize } from '../../instructure_image/ImageEmbedOptions';
 import Bridge from '../../../../bridge';
+import RceApiSource from '../../../../rcs/api';
 import formatMessage from '../../../../format-message';
 import DimensionsInput, { useDimensionsState } from '../../shared/DimensionsInput';
 import { getTrayHeight } from '../../shared/trayUtils';
@@ -48,6 +50,7 @@ export default function VideoOptionsTray(_ref) {
     onSave,
     open,
     trayProps,
+    requestSubtitlesFromIframe = () => {},
     onEntered = null,
     onExited = null,
     id = 'video-options-tray',
@@ -68,6 +71,8 @@ export default function VideoOptionsTray(_ref) {
   const [minWidth] = useState(MIN_WIDTH_VIDEO);
   const [minHeight] = useState(Math.round(videoHeight / videoWidth * MIN_WIDTH_VIDEO));
   const [minPercentage] = useState(MIN_PERCENTAGE);
+  const [editLocked, setEditLocked] = useState(null);
+  const [loading, setLoading] = useState(true);
   const isStudio = !!studioOptions;
   const showDisplayOptions = !isStudio || studioOptions.convertibleToLink;
   const showSizeControls = !isStudio || studioOptions.resizable;
@@ -76,6 +81,22 @@ export default function VideoOptionsTray(_ref) {
     minWidth,
     minPercentage
   });
+  const api = new RceApiSource(trayProps);
+  useEffect(() => {
+    if (videoOptions.attachmentId) {
+      api.getFile(videoOptions.attachmentId, {
+        include: ['blueprint_course_status']
+      }).then(response => {
+        setEditLocked((response === null || response === void 0 ? void 0 : response.restricted_by_master_course) && (response === null || response === void 0 ? void 0 : response.is_master_course_child_content));
+        setLoading(false);
+      }).catch(error => {
+        setLoading(false);
+      });
+    }
+  }, [videoOptions.attachmentId]);
+  useEffect(() => {
+    if (subtitles.length === 0) requestSubtitlesFromIframe(setSubtitles);
+  }, []);
 
   function handleTitleTextChange(event) {
     setTitleText(event.target.value);
@@ -124,7 +145,8 @@ export default function VideoOptionsTray(_ref) {
       appliedWidth,
       displayAs,
       subtitles,
-      updateMediaObject
+      updateMediaObject,
+      editLocked
     });
   }
 
@@ -192,7 +214,13 @@ export default function VideoOptionsTray(_ref) {
     color: "primary",
     onClick: onRequestClose,
     screenReaderLabel: formatMessage('Close')
-  })))), /*#__PURE__*/React.createElement(Flex.Item, {
+  })))), loading && videoOptions.attachmentId ? /*#__PURE__*/React.createElement(Flex.Item, {
+    textAlign: "center",
+    margin: "xx-large",
+    padding: "xx-large"
+  }, /*#__PURE__*/React.createElement(Spinner, {
+    renderTitle: formatMessage("Loading")
+  })) : /*#__PURE__*/React.createElement(Flex.Item, {
     as: "form",
     shouldGrow: true,
     margin: "none",
@@ -207,7 +235,7 @@ export default function VideoOptionsTray(_ref) {
     shouldShrink: true
   }, /*#__PURE__*/React.createElement(Flex, {
     direction: "column"
-  }, /*#__PURE__*/React.createElement(Flex.Item, {
+  }, !editLocked && /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "small"
   }, isStudio ? /*#__PURE__*/React.createElement(Flex, {
     direction: "column"
@@ -266,7 +294,7 @@ export default function VideoOptionsTray(_ref) {
     minWidth: minWidth,
     minPercentage: minPercentage,
     hidePercentage: true
-  }))), !isStudio && /*#__PURE__*/React.createElement(Flex.Item, {
+  }))), !isStudio && !editLocked && /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "small"
   }, /*#__PURE__*/React.createElement(FormFieldGroup, {
     description: formatMessage('Closed Captions/Subtitles')
@@ -317,5 +345,6 @@ VideoOptionsTray.propTypes = {
     jwt: string.isRequired
   }),
   id: string,
-  studioOptions: parsedStudioOptionsPropType
+  studioOptions: parsedStudioOptionsPropType,
+  requestSubtitlesFromIframe: func
 };

package/es/rce/plugins/shared/fileShape.js

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU Affero General Public License along
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-import { bool, number, oneOfType, string } from 'prop-types';
+import { arrayOf, bool, number, oneOfType, shape, string, checkPropTypes } from 'prop-types';
 export const fileShape = {
   content_type: string.isRequired,
   date: string.isRequired,
-  display_name: string,
+  display_name: string.isRequired,
   filename: string.isRequired,
   href: string.isRequired,
   id: oneOfType([number, string]).isRequired,
@@ -31,13 +31,13 @@ export const fileShape = {
   locked_for_user: bool,
   published: bool
 };
-export const mediaObjectShape = {
-  content_type: string.isRequired,
-  date: string.isRequired,
-  embedded_iframe_url: string,
-  id: oneOfType([number, string]).isRequired,
+export const imageShape = { ...fileShape,
+  thumbnail_url: string
+};
+export const mediaObjectShape = { ...imageShape,
   title: string.isRequired,
-  published: bool
+  embedded_iframe_url: string,
+  media_entry_id: string
 };
 export const fileOrMediaObjectShape = {
   content_type: string.isRequired,
@@ -54,4 +54,76 @@ export const fileOrMediaObjectShape = {
   unlock_at: string,
   locked_for_user: bool,
   published: bool
-};
+};
+export const documentQueryReturnShape = {
+  files: arrayOf(shape(fileShape)).isRequired,
+  bookmark: string,
+  hasMore: bool,
+  isLoading: bool,
+  error: string
+};
+export const imageQueryReturnShape = {
+  files: arrayOf(shape(imageShape)).isRequired,
+  bookmark: string,
+  hasMore: bool,
+  isLoading: bool,
+  error: string
+};
+export const mediaQueryReturnShape = {
+  files: arrayOf(shape(mediaObjectShape)).isRequired,
+  bookmark: string,
+  hasMore: bool,
+  isLoading: bool,
+  error: string
+};
+
+function createContentTrayDocumentShape(isRequired) {
+  return function validateContentTrayDocuments(props, propName, componentName) {
+    const p = props[propName];
+
+    if (!p) {
+      if (isRequired) {
+        if (!p) {
+          return new Error(`Required prop \`${propName}\` not supplied to \`${componentName}\`. Validation failed.`);
+        }
+      }
+
+      return undefined;
+    } else {
+      const files = p.user || p.course || p.group || p.User || p.Course || p.Group;
+
+      if (!files) {
+        return new Error(`Invalid prop \`${propName}\` supplied to \`${componentName}\`. Missing "user"|"course"|"group" key.`);
+      }
+
+      if ('searchString' in p) {
+        if (!(typeof p.searchString === 'string')) {
+          return new Error(`Invalid prop \`${propName}\` supplied to \`${componentName}\`. "searchString" must be a string.`);
+        }
+      }
+
+      if (propName === 'documents') {
+        checkPropTypes({
+          docs: shape(documentQueryReturnShape)
+        }, {
+          docs: files
+        }, componentName, componentName);
+      } else if (propName === 'images') {
+        checkPropTypes({
+          images: shape(imageQueryReturnShape)
+        }, {
+          images: files
+        }, componentName, componentName);
+      } else if (propName === 'media') {
+        checkPropTypes({
+          media: shape(mediaQueryReturnShape)
+        }, {
+          media: files
+        }, componentName, componentName);
+      }
+    }
+  };
+}
+
+export const contentTrayDocumentShape = createContentTrayDocumentShape(false);
+contentTrayDocumentShape.isRequired = createContentTrayDocumentShape(true);

package/es/rce/plugins/shared/fileTypeUtils.js

@@ -112,6 +112,12 @@ export function mediaPlayerURLFromFile(file, canvasOrigin) {
   }
 
   if (file.embedded_iframe_url) {
+    const url = new URL(file.embedded_iframe_url, canvasOrigin);
+
+    if (url.searchParams.has('type')) {
+      return `${absoluteToRelativeUrl(file.embedded_iframe_url, canvasOrigin)}`;
+    }
+
     return `${absoluteToRelativeUrl(file.embedded_iframe_url, canvasOrigin)}?type=${type}`;
   }
 

package/es/rcs/api.js

@@ -468,11 +468,13 @@ class RceApiSource {
 
     const {
       replacement_chain_context_type,
-      replacement_chain_context_id
+      replacement_chain_context_id,
+      include
     } = options;
     const uri = this.addParamsIfPresent(`${base}/${id}`, {
       replacement_chain_context_type,
-      replacement_chain_context_id
+      replacement_chain_context_id,
+      include
     });
     return this.apiFetch(uri, headers).then(normalizeFileData);
   } // @private
@@ -558,10 +560,10 @@ class RceApiSource {
       } else {
         return response;
       }
-    }).then(checkStatus).then(res => res.json()).catch(throwConnectionError).catch(e => e.response.json().then(body => {
+    }).then(checkStatus).then(res => res.json()).catch(throwConnectionError).catch(e => e.response.json().then(responseBody => {
       console.error(e); // eslint-disable-line no-console
 
-      this.alertFunc(buildError(body));
+      this.alertFunc(buildError(responseBody));
       throw e;
     }));
   } // @private

package/es/sidebar/store/configureStore.js

@@ -18,9 +18,9 @@
 import { createStore, applyMiddleware } from 'redux';
 import rootReducer from '../reducers';
 import initialState from './initialState';
-import thunkMiddleware from 'redux-thunk';
+import { thunk } from 'redux-thunk';
 import { batch, batching } from 'redux-batch-middleware';
 export default function (props, state) {
-  const store = createStore(batching(rootReducer), state || initialState(props), applyMiddleware(thunkMiddleware, batch));
+  const store = createStore(batching(rootReducer), state || initialState(props), applyMiddleware(thunk, batch));
   return store;
 }

package/es/translations/locales/ab.js

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 - present Instructure, Inc.
+ *
+ * This file is part of Canvas.
+ *
+ * Canvas is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License as published by the Free
+ * Software Foundation, version 3 of the License.
+ *
+ * Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+import formatMessage from '../../format-message';
+const locale = {
+  "count_plural_one_item_loaded_other_items_loaded_857023b7": {
+    "message": "{ count, plural,\n    one {}\n  other {}\n}"
+  }
+};
+formatMessage.addLocale({
+  ab: locale
+});

package/es/translations/locales/cs.js

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2021 - present Instructure, Inc.
+ *
+ * This file is part of Canvas.
+ *
+ * Canvas is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License as published by the Free
+ * Software Foundation, version 3 of the License.
+ *
+ * Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+import formatMessage from '../../format-message';
+import '../tinymce/cs';
+const locale = {
+  "count_plural_one_item_loaded_other_items_loaded_857023b7": {
+    "message": "{ count, plural,\n    one {}\n    few {}\n   many {}\n  other {}\n}"
+  }
+};
+formatMessage.addLocale({
+  cs: locale
+});

package/es/translations/locales/cs_CZ.js

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2021 - present Instructure, Inc.
+ *
+ * This file is part of Canvas.
+ *
+ * Canvas is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License as published by the Free
+ * Software Foundation, version 3 of the License.
+ *
+ * Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+import formatMessage from '../../format-message';
+import '../tinymce/cs';
+const locale = {
+  "count_plural_one_item_loaded_other_items_loaded_857023b7": {
+    "message": "{ count, plural,\n    one {}\n    few {}\n   many {}\n  other {}\n}"
+  }
+};
+formatMessage.addLocale({
+  'cs-CZ': locale
+});

package/es/translations/locales/da_DK.js

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2021 - present Instructure, Inc.
+ *
+ * This file is part of Canvas.
+ *
+ * Canvas is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License as published by the Free
+ * Software Foundation, version 3 of the License.
+ *
+ * Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+import formatMessage from '../../format-message';
+import '../tinymce/da';
+const locale = {
+  "count_plural_one_item_loaded_other_items_loaded_857023b7": {
+    "message": "{ count, plural,\n    one {}\n  other {}\n}"
+  }
+};
+formatMessage.addLocale({
+  'da-DK': locale
+});

package/es/translations/locales/en_NZ.js

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 - present Instructure, Inc.
+ *
+ * This file is part of Canvas.
+ *
+ * Canvas is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License as published by the Free
+ * Software Foundation, version 3 of the License.
+ *
+ * Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+import formatMessage from '../../format-message';
+const locale = {
+  "count_plural_one_item_loaded_other_items_loaded_857023b7": {
+    "message": "{ count, plural,\n    one {}\n  other {}\n}"
+  }
+};
+formatMessage.addLocale({
+  'en-NZ': locale
+});

package/es/translations/locales/en_SE.js

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 - present Instructure, Inc.
+ *
+ * This file is part of Canvas.
+ *
+ * Canvas is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License as published by the Free
+ * Software Foundation, version 3 of the License.
+ *
+ * Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+import formatMessage from '../../format-message';
+const locale = {
+  "count_plural_one_item_loaded_other_items_loaded_857023b7": {
+    "message": "{ count, plural,\n    one {}\n  other {}\n}"
+  }
+};
+formatMessage.addLocale({
+  'en-SE': locale
+});

package/es/translations/locales/en_US.js

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2021 - present Instructure, Inc.
+ *
+ * This file is part of Canvas.
+ *
+ * Canvas is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License as published by the Free
+ * Software Foundation, version 3 of the License.
+ *
+ * Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+import formatMessage from '../../format-message';
+const locale = {
+  "count_plural_one_item_loaded_other_items_loaded_857023b7": {
+    "message": "{ count, plural,\n    one {}\n  other {}\n}"
+  }
+};
+formatMessage.addLocale({
+  'en-US': locale
+});

package/es/translations/locales/hu_HU.js

@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2021 - present Instructure, Inc.
+ *
+ * This file is part of Canvas.
+ *
+ * Canvas is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Affero General Public License as published by the Free
+ * Software Foundation, version 3 of the License.
+ *
+ * Canvas is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+import formatMessage from '../../format-message';
+import '../tinymce/hu_HU';
+const locale = {
+  "count_plural_one_item_loaded_other_items_loaded_857023b7": {
+    "message": "{ count, plural,\n    one {}\n  other {}\n}"
+  }
+};
+formatMessage.addLocale({
+  'hu-HU': locale
+});