@instructure/canvas-rce 5.14.1 → 5.15.0

package/es/sidebar/actions/media.js

@@ -15,6 +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 alertHandler from '../../rce/alertHandler';
 import formatMessage from '../../format-message';
 export const REQUEST_INITIAL_MEDIA = 'REQUEST_INITIAL_MEDIA';
@@ -37,11 +38,10 @@ export function requestMedia(contextType) {
     }
   };
 }
-export function receiveMedia(_ref) {
-  let {
-    response,
-    contextType
-  } = _ref;
+export function receiveMedia({
+  response,
+  contextType
+}) {
   const {
     files,
     bookmark
@@ -55,11 +55,10 @@ export function receiveMedia(_ref) {
     }
   };
 }
-export function failMedia(_ref2) {
-  let {
-    error,
-    contextType
-  } = _ref2;
+export function failMedia({
+  error,
+  contextType
+}) {
   return {
     type: FAIL_MEDIA,
     payload: {
@@ -67,10 +66,11 @@ export function failMedia(_ref2) {
       contextType
     }
   };
-} // dispatches the start of the load, requests a page for the collection from
+}
+
+// dispatches the start of the load, requests a page for the collection from
 // the source, then dispatches the loaded page to the store on success or
 // clears the load on failure
-
 export function fetchMedia() {
   return (dispatch, getState) => {
     const state = getState();
@@ -83,37 +83,38 @@ export function fetchMedia() {
       contextType: state.contextType
     })));
   };
-} // fetches a page only if a page is not already being loaded and the
-// collection is not yet completely loaded
+}
 
+// fetches a page only if a page is not already being loaded and the
+// collection is not yet completely loaded
 export function fetchNextMedia() {
   return (dispatch, getState) => {
     const state = getState();
     const media = state.media[state.contextType];
-
-    if (!(media !== null && media !== void 0 && media.isLoading) && media !== null && media !== void 0 && media.hasMore) {
+    if (!media?.isLoading && media?.hasMore) {
       dispatch(requestMedia(state.contextType));
       return dispatch(fetchMedia());
     }
   };
-} // fetches the next page (subject to conditions on fetchNextMedia) only if the
-// collection is currently empty
+}
 
+// fetches the next page (subject to conditions on fetchNextMedia) only if the
+// collection is currently empty
 export function fetchInitialMedia() {
   return (dispatch, getState) => {
     const state = getState();
     dispatch(requestInitialMedia(state.contextType));
     return dispatch(fetchMedia());
   };
-} // update the media object.
+}
 
-export function updateMediaObject(_ref3) {
-  let {
-    media_object_id,
-    attachment_id,
-    title,
-    subtitles
-  } = _ref3;
+// update the media object.
+export function updateMediaObject({
+  media_object_id,
+  attachment_id,
+  title,
+  subtitles
+}) {
   return (dispatch, getState) => {
     const state = getState();
     const moUpdate = state.source.updateMediaObject(state, {
@@ -131,11 +132,9 @@ export function updateMediaObject(_ref3) {
       media_object_id,
       subtitles
     };
-
     if (attachment_id) {
       ccData.attachment_id = attachment_id;
     }
-
     const ccUpdate = state.source.updateClosedCaptions(state, ccData);
     return Promise.all([moUpdate, ccUpdate]);
   };

package/es/sidebar/actions/session.js

@@ -15,20 +15,17 @@
  * 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/>.
  */
-export const RECEIVE_SESSION = 'action.session.receive_session';
 
+export const RECEIVE_SESSION = 'action.session.receive_session';
 function receiveSession(data) {
   return {
     type: RECEIVE_SESSION,
     data
   };
 }
-
 export function get(dispatch, getState) {
-  var _source$getSession;
-
   const {
     source
   } = getState();
-  return (_source$getSession = source.getSession) === null || _source$getSession === void 0 ? void 0 : _source$getSession.call(source).then(data => dispatch(receiveSession(data)));
+  return source.getSession?.().then(data => dispatch(receiveSession(data)));
 }

package/es/sidebar/actions/ui.js

@@ -15,6 +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/>.
  */
+
 export const CHANGE_TAB = 'CHANGE_TAB';
 export const CHANGE_ACCORDION = 'CHANGE_ACCORDION';
 export const RESET_UI = 'RESET_UI';

package/es/sidebar/actions/upload.js

@@ -15,6 +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 { saveMediaRecording } from '@instructure/canvas-media';
 import { headerFor, originFromHost } from '../../rcs/api';
 import * as files from './files';
@@ -50,12 +51,11 @@ export function stopLoading() {
     type: STOP_LOADING
   };
 }
-export function receiveFolder(_ref) {
-  let {
-    id,
-    name,
-    parentId
-  } = _ref;
+export function receiveFolder({
+  id,
+  name,
+  parentId
+}) {
   return {
     type: RECEIVE_FOLDER,
     id,
@@ -110,10 +110,9 @@ export function openOrCloseUploadForm() {
     type: TOGGLE_UPLOAD_FORM
   };
 }
-export function processedFolderBatch(_ref2) {
-  let {
-    folders
-  } = _ref2;
+export function processedFolderBatch({
+  folders
+}) {
   return {
     type: PROCESSED_FOLDER_BATCH,
     folders
@@ -154,21 +153,16 @@ export function allUploadCompleteActions(results, fileMetaProps, contextType) {
   };
   actions.push(files.createAddFile(fileProps));
   actions.push(files.createInsertFile(fileMetaProps.parentFolderId, results.id));
-
   if (/^image\//.test(results['content-type'])) {
     actions.push(images.createAddImage(results, contextType));
   }
-
   return actions;
 }
 export function embedUploadResult(results, selectedTabType) {
   const embedData = fileEmbed(results);
-
   if (selectedTabType === 'images' && isImage(embedData.type) && results.displayAs !== 'link') {
-    var _bridge$activeEditor, _bridge$activeEditor$;
-
     // embed the image after any current selection rather than link to it or replace it
-    (_bridge$activeEditor = bridge.activeEditor()) === null || _bridge$activeEditor === void 0 ? void 0 : (_bridge$activeEditor$ = _bridge$activeEditor.mceInstance()) === null || _bridge$activeEditor$ === void 0 ? void 0 : _bridge$activeEditor$.selection.collapse();
+    bridge.activeEditor()?.mceInstance()?.selection.collapse();
     const file_props = {
       href: results.href || results.url,
       title: results.title,
@@ -182,12 +176,11 @@ export function embedUploadResult(results, selectedTabType) {
     };
     return bridge.insertImage(file_props);
   } else if (selectedTabType === 'media' && isAudioOrVideo(embedData.type)) {
-    var _bridge$activeEditor2, _bridge$activeEditor3;
-
     // embed media after any current selection rather than link to it or replace it
-    (_bridge$activeEditor2 = bridge.activeEditor()) === null || _bridge$activeEditor2 === void 0 ? void 0 : (_bridge$activeEditor3 = _bridge$activeEditor2.mceInstance()) === null || _bridge$activeEditor3 === void 0 ? void 0 : _bridge$activeEditor3.selection.collapse(); // when we record audio, notorious thinks it's a video. use the content type we got
-    // from the recorded file, not the returned media object.
+    bridge.activeEditor()?.mceInstance()?.selection.collapse();
 
+    // when we record audio, notorious thinks it's a video. use the content type we got
+    // from the recorded file, not the returned media object.
     return bridge.embedMedia({
       id: results.id,
       embedded_iframe_url: results.embedded_iframe_url,
@@ -205,7 +198,8 @@ export function embedUploadResult(results, selectedTabType) {
       href: results.href || results.url,
       title: results.alt_text || results.display_name || results.name || results.title || results.filename,
       content_type: results['content-type'],
-      embed: { ...embedData,
+      embed: {
+        ...embedData,
         disableInlinePreview: true
       },
       target: '_blank',
@@ -214,8 +208,9 @@ export function embedUploadResult(results, selectedTabType) {
       uuid: results.uuid
     }, false);
   }
-} // fetches the list of folders to select from when uploading a file
+}
 
+// fetches the list of folders to select from when uploading a file
 export function fetchFolders(bookmark) {
   return (dispatch, getState) => {
     dispatch(startLoading());
@@ -227,24 +222,21 @@ export function fetchFolders(bookmark) {
       contextId,
       contextType
     } = getState();
-
     if (bookmark || upload.folders && Object.keys(upload.folders).length === 0) {
       return source.fetchFolders({
         jwt,
         host,
         contextId,
         contextType
-      }, bookmark).then(_ref3 => {
-        let {
-          folders,
-          bookmark
-        } = _ref3;
+      }, bookmark).then(({
+        folders,
+        bookmark
+      }) => {
         dispatch(folders.map(receiveFolder));
         const {
           upload
         } = getState();
         dispatch(processedFolderBatch(upload));
-
         if (bookmark) {
           dispatch(fetchFolders(bookmark));
         } else {
@@ -255,8 +247,9 @@ export function fetchFolders(bookmark) {
       });
     }
   };
-} // uploads handled via canvas-media
+}
 
+// uploads handled via canvas-media
 export function mediaUploadComplete(error, uploadData) {
   const {
     mediaObject,
@@ -265,7 +258,7 @@ export function mediaUploadComplete(error, uploadData) {
   return (dispatch, _getState) => {
     if (error) {
       dispatch(failMediaUpload(error));
-      dispatch(removePlaceholdersFor(uploadedFile === null || uploadedFile === void 0 ? void 0 : uploadedFile.name));
+      dispatch(removePlaceholdersFor(uploadedFile?.name));
     } else {
       const embedData = {
         embedded_iframe_url: mediaObject.embedded_iframe_url,
@@ -287,7 +280,6 @@ export function createMediaServerSession() {
     const {
       source
     } = getState();
-
     if (!bridge.mediaServerSession) {
       return source.mediaServerSession().then(data => {
         bridge.setMediaServerSession(data);
@@ -295,8 +287,7 @@ export function createMediaServerSession() {
     }
   };
 }
-export function uploadToIconMakerFolder(svg) {
-  let uploadSettings = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+export function uploadToIconMakerFolder(svg, uploadSettings = {}) {
   return (_dispatch, getState) => {
     const {
       source,
@@ -323,10 +314,9 @@ export function uploadToIconMakerFolder(svg) {
       host,
       contextId,
       contextType
-    }).then(_ref4 => {
-      let {
-        folders
-      } = _ref4;
+    }).then(({
+      folders
+    }) => {
       fileMetaProps.parentFolderId = folders[0].id;
       return source.preflightUpload(fileMetaProps, {
         host,
@@ -342,10 +332,8 @@ export function uploadToIconMakerFolder(svg) {
 }
 export function uploadToMediaFolder(tabContext, fileMetaProps) {
   return (dispatch, getState) => {
-    var _editorComponent$edit;
-
     const editorComponent = bridge.activeEditor();
-    const bookmark = editorComponent === null || editorComponent === void 0 ? void 0 : (_editorComponent$edit = editorComponent.editor) === null || _editorComponent$edit === void 0 ? void 0 : _editorComponent$edit.selection.getBookmark(undefined, true);
+    const bookmark = editorComponent?.editor?.selection.getBookmark(undefined, true);
     dispatch(activateMediaUpload(fileMetaProps));
     const {
       source,
@@ -354,7 +342,6 @@ export function uploadToMediaFolder(tabContext, fileMetaProps) {
       contextId,
       contextType
     } = getState();
-
     if (tabContext === 'media' && fileMetaProps.domObject) {
       return saveMediaRecording(fileMetaProps.domObject, {
         contextId,
@@ -365,31 +352,27 @@ export function uploadToMediaFolder(tabContext, fileMetaProps) {
         dispatch(mediaUploadComplete(err, uploadData));
       });
     }
-
     return source.fetchMediaFolder({
       jwt,
       host,
       contextId,
       contextType
-    }).then(_ref5 => {
-      let {
-        folders
-      } = _ref5;
+    }).then(({
+      folders
+    }) => {
       fileMetaProps.parentFolderId = folders[0].id;
-
       if (fileMetaProps.domObject) {
         delete fileMetaProps.domObject.preview; // don't need this anymore
       }
-
-      return dispatch(uploadPreflight(tabContext, { ...fileMetaProps,
+      return dispatch(uploadPreflight(tabContext, {
+        ...fileMetaProps,
         bookmark
       })).then(results => {
         return results;
       });
     }).catch(e => {
       // Get rid of any placeholder that might be there.
-      dispatch(removePlaceholdersFor(fileMetaProps.name)); // eslint-disable-next-line no-console
-
+      dispatch(removePlaceholdersFor(fileMetaProps.name));
       console.error('Fetching the media folder failed.', e);
     });
   };
@@ -398,40 +381,32 @@ export function setUsageRights(source, fileMetaProps, results) {
   const {
     usageRights
   } = fileMetaProps;
-
   if (usageRights) {
     source.setUsageRights(results.id, usageRights);
   }
-
   return results;
 }
 export function getFileUrlIfMissing(source, results) {
   if (results.href || results.url) {
     return Promise.resolve(results);
   }
-
   return source.getFile(results.id).then(file => {
     results.url = file.url;
     return results;
   });
 }
-
-function readUploadedFileAsDataURL(file) {
-  let reader = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : new FileReader();
+function readUploadedFileAsDataURL(file, reader = new FileReader()) {
   return new Promise((resolve, reject) => {
     reader.onerror = () => {
       reader.abort();
       reject(new DOMException('Unable to parse file'));
     };
-
     reader.onload = () => {
       resolve(reader.result);
     };
-
     reader.readAsDataURL(file);
   });
 }
-
 export function generateThumbnailUrl(results, fileDOMObject, reader) {
   if (/^image\//.test(results['content-type'])) {
     return readUploadedFileAsDataURL(fileDOMObject, reader).then(result => {
@@ -446,7 +421,6 @@ export function setAltText(altText, results) {
   if (altText) {
     results.alt_text = altText;
   }
-
   return results;
 }
 export function handleFailures(error, dispatch) {
@@ -459,7 +433,6 @@ export function handleFailures(error, dispatch) {
       }
     }).catch(error => dispatch(failUpload(error)));
   }
-
   if (error) {
     return Promise.resolve().then(() => dispatch(failUpload(error)));
   }
@@ -476,12 +449,10 @@ export function uploadPreflight(tabContext, fileMetaProps) {
     const {
       fileReader
     } = fileMetaProps;
-
     const getCategory = async fileProps => {
       const categoryObject = await CategoryProcessor.process(fileProps.domObject);
-      return categoryObject === null || categoryObject === void 0 ? void 0 : categoryObject.category;
+      return categoryObject?.category;
     };
-
     dispatch(startUpload(fileMetaProps));
     return getCategory(fileMetaProps).then(category => {
       return source.preflightUpload(fileMetaProps, {
@@ -506,39 +477,32 @@ export function uploadPreflight(tabContext, fileMetaProps) {
         if (fileMetaProps.isDecorativeImage) {
           results.isDecorativeImage = fileMetaProps.isDecorativeImage;
         }
-
         if (fileMetaProps.displayAs) {
           results.displayAs = fileMetaProps.displayAs;
         }
-
         return results;
       }).then(async results => {
         let newBookmark;
         const editorComponent = bridge.activeEditor();
-
         if (fileMetaProps.bookmark) {
           newBookmark = editorComponent.editor.selection.getBookmark(undefined, true);
           editorComponent.editor.selection.moveToBookmark(fileMetaProps.bookmark);
         }
-
         const uploadResult = {
           contextType,
           contextId,
           ...results
         };
         const embedResult = embedUploadResult(uploadResult, tabContext);
-
         if (fileMetaProps.bookmark) {
           editorComponent.editor.selection.moveToBookmark(newBookmark);
         }
-
-        if (embedResult !== null && embedResult !== void 0 && embedResult.loadingPromise) {
+        if (embedResult?.loadingPromise) {
           // Wait until the image loads to remove the placeholder
           await embedResult.loadingPromise.finally(() => dispatch(removePlaceholdersFor(fileMetaProps.name)));
         } else {
           dispatch(removePlaceholdersFor(fileMetaProps.name));
         }
-
         return uploadResult;
       }).then(results => {
         dispatch(allUploadCompleteActions(results, fileMetaProps, contextType));

package/es/sidebar/containers/Sidebar.js

@@ -15,6 +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/>.
  */
+
 export function propsFromState(state) {
   const {
     ui,
@@ -37,12 +38,10 @@ export function propsFromState(state) {
     source
   } = state;
   const collections = {};
-
   for (const key in state.collections) {
     const collection = state.collections[key];
     collections[key] = collection;
   }
-
   return {
     containingContext,
     contextType,

package/es/sidebar/containers/sidebarHandlers.js

@@ -15,10 +15,12 @@
  * 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 { changeTab, changeAccordion } from '../actions/ui';
 import { fetchInitialPage, fetchNextPage } from '../actions/data';
 import { fetchInitialImages, fetchNextImages } from '../actions/images';
-import { createMediaServerSession, fetchFolders, openOrCloseUploadForm, // saveMediaRecording,
+import { createMediaServerSession, fetchFolders, openOrCloseUploadForm,
+// saveMediaRecording,
 mediaUploadComplete, uploadPreflight, uploadToIconMakerFolder, uploadToMediaFolder } from '../actions/upload';
 import { searchFlickr, openOrCloseFlickrForm } from '../actions/flickr';
 import { toggle as toggleFolder } from '../actions/files';
@@ -38,18 +40,12 @@ export default function propsFromDispatch(dispatch) {
     fetchNextPage: key => dispatch(fetchNextPage(key)),
     toggleFolder: id => dispatch(toggleFolder(id)),
     fetchFolders: () => dispatch(fetchFolders()),
-    fetchInitialImages: function () {
-      let opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
-        category: DEFAULT_FILE_CATEGORY
-      };
-      return dispatch(fetchInitialImages(opts));
-    },
-    fetchNextImages: function () {
-      let opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
-        category: DEFAULT_FILE_CATEGORY
-      };
-      return dispatch(fetchNextImages(opts));
-    },
+    fetchInitialImages: (opts = {
+      category: DEFAULT_FILE_CATEGORY
+    }) => dispatch(fetchInitialImages(opts)),
+    fetchNextImages: (opts = {
+      category: DEFAULT_FILE_CATEGORY
+    }) => dispatch(fetchNextImages(opts)),
     startUpload: (tabContext, fileMetaProps) => dispatch(uploadPreflight(tabContext, fileMetaProps)),
     flickrSearch: term => dispatch(searchFlickr(term)),
     toggleFlickrForm: () => dispatch(openOrCloseFlickrForm()),

package/es/sidebar/dragHtml.js

@@ -15,18 +15,22 @@
  * 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 * as browser from '../common/browser';
 export default function (ev, html) {
   // default data to store
   let format = 'text/html';
-  let data = html; // special handling for IE and Edge
+  let data = html;
 
+  // special handling for IE and Edge
   if (browser.edge()) {
     // MS Edge can do text/html, but may have stuff in ev.dataTransfer.files
     // (e.g. when dragging an image) that confuses tinymce's onDrop handler
     // into suppressing the drop event. fortunately, calling clear() on the
     // items will also clear the ev.dataTransfer.files.
-    ev.dataTransfer.items.clear();
+    if (ev.dataTransfer) {
+      ev.dataTransfer.items.clear();
+    }
   } else if (browser.ie()) {
     // pre-Edge Internet Explorer doesn't like setData with a type other than
     // 'Text' or 'URL'. fortunately tinymce already provides a workaround
@@ -42,8 +46,10 @@ export default function (ev, html) {
     //
     format = 'Text';
     data = `data:text/mce-internal,rcs-sidebar,${escape(html)}`;
-  } // place the data into the dataTransfer so it's available for the drop event
-
+  }
 
-  ev.dataTransfer.setData(format, data);
+  // place the data into the dataTransfer so it's available for the drop event
+  if (ev.dataTransfer) {
+    ev.dataTransfer.setData(format, data);
+  }
 }

package/es/sidebar/reducers/all_files.js

@@ -15,21 +15,20 @@
  * 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/>.
  */
+
 // This is a temporary patch until the All Files panel
 // is rewritten to use the files actions that query
 // data from the RCS, but still the CanvasContentTray
 // know when the FileBrowser is actively querying
 // so we can disable the search box in the Filter
-import { ALL_FILES_LOADING } from '../actions/all_files';
-export function allFilesLoading() {
-  let state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  let action = arguments.length > 1 ? arguments[1] : undefined;
 
+import { ALL_FILES_LOADING } from '../actions/all_files';
+export function allFilesLoading(state = {}, action) {
   if (action.type === ALL_FILES_LOADING) {
-    return { ...state,
+    return {
+      ...state,
       isLoading: action.payload
     };
   }
-
   return state;
 }