@instructure/canvas-rce 5.12.1 → 5.12.2

package/lib/sidebar/actions/upload.js

@@ -1,550 +0,0 @@
-/*
- * Copyright (C) 2018 - 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 { saveMediaRecording } from '@instructure/canvas-media';
-import { headerFor, originFromHost } from '../../rcs/api';
-import * as files from './files';
-import * as images from './images';
-import bridge from '../../bridge';
-import { fileEmbed } from '../../common/mimeClass';
-import { isPreviewable } from '../../rce/plugins/shared/Previewable';
-import { isAudioOrVideo, isImage } from '../../rce/plugins/shared/fileTypeUtils';
-import { fixupFileUrl } from '../../common/fileUrl';
-import { ICON_MAKER_ICONS } from '../../rce/plugins/instructure_icon_maker/svg/constants';
-import * as CategoryProcessor from '../../rce/plugins/shared/Upload/CategoryProcessor';
-export const COMPLETE_FILE_UPLOAD = 'COMPLETE_FILE_UPLOAD';
-export const FAIL_FILE_UPLOAD = 'FAIL_FILE_UPLOAD';
-export const FAIL_FOLDERS_LOAD = 'FAIL_FOLDERS_LOAD';
-export const FAIL_MEDIA_UPLOAD = 'FAIL_MEDIA_UPLOAD';
-export const MEDIA_UPLOAD_SUCCESS = 'MEDIA_UPLOAD_SUCCESS';
-export const PROCESSED_FOLDER_BATCH = 'PROCESSED_FOLDER_BATCH';
-export const QUOTA_EXCEEDED_UPLOAD = 'QUOTA_EXCEEDED_UPLOAD';
-export const RECEIVE_FOLDER = 'RECEIVE_FOLDER';
-export const START_FILE_UPLOAD = 'START_FILE_UPLOAD';
-export const START_LOADING = 'START_LOADING';
-export const START_MEDIA_UPLOADING = 'START_MEDIA_UPLOADING';
-export const STOP_LOADING = 'STOP_LOADING';
-export const STOP_MEDIA_UPLOADING = 'STOP_MEDIA_UPLOADING';
-export const TOGGLE_UPLOAD_FORM = 'TOGGLE_UPLOAD_FORM';
-export function startLoading() {
-  return {
-    type: START_LOADING
-  };
-}
-export function stopLoading() {
-  return {
-    type: STOP_LOADING
-  };
-}
-export function receiveFolder(_ref) {
-  let {
-    id,
-    name,
-    parentId
-  } = _ref;
-  return {
-    type: RECEIVE_FOLDER,
-    id,
-    name,
-    parentId
-  };
-}
-export function failFoldersLoad(error) {
-  return {
-    type: FAIL_FOLDERS_LOAD,
-    error
-  };
-}
-export function failMediaUpload(error) {
-  bridge.showError(error);
-  return {
-    type: FAIL_MEDIA_UPLOAD,
-    error
-  };
-}
-export function mediaUploadSuccess() {
-  return {
-    type: MEDIA_UPLOAD_SUCCESS
-  };
-}
-export function startUpload(fileMetaProps) {
-  return {
-    type: START_FILE_UPLOAD,
-    file: fileMetaProps
-  };
-}
-export function failUpload(error) {
-  return {
-    type: FAIL_FILE_UPLOAD,
-    error
-  };
-}
-export function quotaExceeded(error) {
-  return {
-    type: QUOTA_EXCEEDED_UPLOAD,
-    error
-  };
-}
-export function completeUpload(results) {
-  return {
-    type: COMPLETE_FILE_UPLOAD,
-    results
-  };
-}
-export function openOrCloseUploadForm() {
-  return {
-    type: TOGGLE_UPLOAD_FORM
-  };
-}
-export function processedFolderBatch(_ref2) {
-  let {
-    folders
-  } = _ref2;
-  return {
-    type: PROCESSED_FOLDER_BATCH,
-    folders
-  };
-}
-export function startMediaUploading(fileMetaProps) {
-  return {
-    type: START_MEDIA_UPLOADING,
-    payload: fileMetaProps
-  };
-}
-export function stopMediaUploading() {
-  return {
-    type: STOP_MEDIA_UPLOADING
-  };
-}
-export function activateMediaUpload(fileMetaProps) {
-  return dispatch => {
-    dispatch(startMediaUploading(fileMetaProps));
-    bridge.insertImagePlaceholder(fileMetaProps);
-  };
-}
-export function removePlaceholdersFor(name) {
-  return dispatch => {
-    dispatch(stopMediaUploading());
-    bridge.removePlaceholders(name);
-  };
-}
-export function allUploadCompleteActions(results, fileMetaProps, contextType) {
-  const actions = [];
-  actions.push(completeUpload(results));
-  const fileProps = {
-    id: results.id,
-    name: results.display_name,
-    url: results.preview_url,
-    type: fileMetaProps.contentType,
-    embed: fileEmbed(results)
-  };
-  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();
-    const file_props = {
-      href: results.href || results.url,
-      title: results.title,
-      display_name: results.display_name || results.name || results.title || results.filename,
-      alt_text: results.alt_text,
-      isDecorativeImage: results.isDecorativeImage,
-      content_type: results['content-type'],
-      contextType: results.contextType,
-      contextId: results.contextId,
-      uuid: results.uuid
-    };
-    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.
-
-    return bridge.embedMedia({
-      id: results.id,
-      embedded_iframe_url: results.embedded_iframe_url,
-      href: results.href || results.url,
-      media_id: results.media_id,
-      title: results.title,
-      type: embedData.type,
-      contextType: results.contextType,
-      contextId: results.contextId,
-      uuid: results.uuid
-    });
-  } else {
-    return bridge.insertLink({
-      'data-canvas-previewable': isPreviewable(results['content-type']),
-      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,
-        disableInlinePreview: true
-      },
-      target: '_blank',
-      contextType: results.contextType,
-      contextId: results.contextId,
-      uuid: results.uuid
-    }, false);
-  }
-} // fetches the list of folders to select from when uploading a file
-
-export function fetchFolders(bookmark) {
-  return (dispatch, getState) => {
-    dispatch(startLoading());
-    const {
-      source,
-      jwt,
-      upload,
-      host,
-      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;
-        dispatch(folders.map(receiveFolder));
-        const {
-          upload
-        } = getState();
-        dispatch(processedFolderBatch(upload));
-
-        if (bookmark) {
-          dispatch(fetchFolders(bookmark));
-        } else {
-          dispatch(stopLoading());
-        }
-      }).catch(error => {
-        dispatch(failFoldersLoad(error));
-      });
-    }
-  };
-} // uploads handled via canvas-media
-
-export function mediaUploadComplete(error, uploadData) {
-  const {
-    mediaObject,
-    uploadedFile
-  } = uploadData || {};
-  return (dispatch, _getState) => {
-    if (error) {
-      dispatch(failMediaUpload(error));
-      dispatch(removePlaceholdersFor(uploadedFile === null || uploadedFile === void 0 ? void 0 : uploadedFile.name));
-    } else {
-      const embedData = {
-        embedded_iframe_url: mediaObject.embedded_iframe_url,
-        media_id: mediaObject.media_object.media_id,
-        type: uploadedFile.type,
-        title: uploadedFile.title || uploadedFile.name,
-        id: mediaObject.media_object.attachment_id,
-        uuid: mediaObject.media_object.uuid,
-        contextType: mediaObject.media_object.context_type
-      };
-      dispatch(removePlaceholdersFor(uploadedFile.name));
-      embedUploadResult(embedData, 'media');
-      dispatch(mediaUploadSuccess());
-    }
-  };
-}
-export function createMediaServerSession() {
-  return (dispatch, getState) => {
-    const {
-      source
-    } = getState();
-
-    if (!bridge.mediaServerSession) {
-      return source.mediaServerSession().then(data => {
-        bridge.setMediaServerSession(data);
-      });
-    }
-  };
-}
-export function uploadToIconMakerFolder(svg) {
-  let uploadSettings = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return (_dispatch, getState) => {
-    const {
-      source,
-      jwt,
-      host,
-      contextId,
-      contextType
-    } = getState();
-    const {
-      onDuplicate
-    } = uploadSettings;
-    const svgAsFile = new File([svg.domElement.outerHTML], svg.name, {
-      type: 'image/svg+xml'
-    });
-    const fileMetaProps = {
-      file: {
-        name: svg.name,
-        type: 'image/svg+xml'
-      },
-      name: svg.name
-    };
-    return source.fetchIconMakerFolder({
-      jwt,
-      host,
-      contextId,
-      contextType
-    }).then(_ref4 => {
-      let {
-        folders
-      } = _ref4;
-      fileMetaProps.parentFolderId = folders[0].id;
-      return source.preflightUpload(fileMetaProps, {
-        host,
-        contextId,
-        contextType,
-        onDuplicate,
-        category: ICON_MAKER_ICONS
-      }).then(results => {
-        return source.uploadFRD(svgAsFile, results);
-      });
-    });
-  };
-}
-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);
-    dispatch(activateMediaUpload(fileMetaProps));
-    const {
-      source,
-      jwt,
-      host,
-      contextId,
-      contextType
-    } = getState();
-
-    if (tabContext === 'media' && fileMetaProps.domObject) {
-      return saveMediaRecording(fileMetaProps.domObject, {
-        contextId,
-        contextType,
-        origin: originFromHost(host),
-        headers: headerFor(jwt)
-      }, (err, uploadData) => {
-        dispatch(mediaUploadComplete(err, uploadData));
-      });
-    }
-
-    return source.fetchMediaFolder({
-      jwt,
-      host,
-      contextId,
-      contextType
-    }).then(_ref5 => {
-      let {
-        folders
-      } = _ref5;
-      fileMetaProps.parentFolderId = folders[0].id;
-
-      if (fileMetaProps.domObject) {
-        delete fileMetaProps.domObject.preview; // don't need this anymore
-      }
-
-      dispatch(uploadPreflight(tabContext, { ...fileMetaProps,
-        bookmark
-      }));
-    }).catch(e => {
-      // Get rid of any placeholder that might be there.
-      dispatch(removePlaceholdersFor(fileMetaProps.name)); // eslint-disable-next-line no-console
-
-      console.error('Fetching the media folder failed.', e);
-    });
-  };
-}
-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();
-  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 => {
-      results.thumbnail_url = result;
-      return results;
-    });
-  } else {
-    return Promise.resolve(results);
-  }
-}
-export function setAltText(altText, results) {
-  if (altText) {
-    results.alt_text = altText;
-  }
-
-  return results;
-}
-export function handleFailures(error, dispatch) {
-  if (error && error.response) {
-    return error.response.json().then(resp => {
-      if (resp.message === 'file size exceeds quota') {
-        dispatch(quotaExceeded(error));
-      } else {
-        dispatch(failUpload(error));
-      }
-    }).catch(error => dispatch(failUpload(error)));
-  }
-
-  if (error) {
-    return Promise.resolve().then(() => dispatch(failUpload(error)));
-  }
-}
-export function uploadPreflight(tabContext, fileMetaProps) {
-  return (dispatch, getState) => {
-    const {
-      source,
-      jwt,
-      host,
-      contextId,
-      contextType
-    } = getState();
-    const {
-      fileReader
-    } = fileMetaProps;
-
-    const getCategory = async fileProps => {
-      const categoryObject = await CategoryProcessor.process(fileProps.domObject);
-      return categoryObject === null || categoryObject === void 0 ? void 0 : categoryObject.category;
-    };
-
-    dispatch(startUpload(fileMetaProps));
-    return getCategory(fileMetaProps).then(category => {
-      return source.preflightUpload(fileMetaProps, {
-        jwt,
-        host,
-        contextId,
-        contextType,
-        category
-      }).then(results => {
-        return source.uploadFRD(fileMetaProps.domObject, results);
-      }).then(results => {
-        return setUsageRights(source, fileMetaProps, results);
-      }).then(results => {
-        return getFileUrlIfMissing(source, results);
-      }).then(results => {
-        return fixupFileUrl(contextType, contextId, results, source.canvasOrigin);
-      }).then(results => {
-        return generateThumbnailUrl(results, fileMetaProps.domObject, fileReader);
-      }).then(results => {
-        return setAltText(fileMetaProps.altText, results);
-      }).then(results => {
-        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) {
-          // 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));
-      }).catch(err => {
-        // This may or may not be necessary depending on the upload
-        dispatch(removePlaceholdersFor(fileMetaProps.name));
-        handleFailures(err, dispatch);
-      });
-    });
-  };
-}

package/lib/sidebar/containers/Sidebar.js

@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2018 - 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/>.
- */
-export function propsFromState(state) {
-  const {
-    ui,
-    containingContext,
-    contextType,
-    contextId,
-    files,
-    images,
-    documents,
-    media,
-    folders,
-    rootFolderId,
-    flickr,
-    upload,
-    session,
-    newPageLinkExpanded,
-    all_files,
-    jwt,
-    host,
-    source
-  } = state;
-  const collections = {};
-
-  for (const key in state.collections) {
-    const collection = state.collections[key];
-    collections[key] = collection;
-  }
-
-  return {
-    containingContext,
-    contextType,
-    contextId,
-    collections,
-    files,
-    images,
-    documents,
-    media,
-    folders,
-    rootFolderId,
-    flickr,
-    upload,
-    session,
-    newPageLinkExpanded,
-    ...ui,
-    all_files,
-    jwt,
-    host,
-    source
-  };
-}

package/lib/sidebar/containers/sidebarHandlers.js

@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2018 - 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 { changeTab, changeAccordion } from '../actions/ui';
-import { fetchInitialPage, fetchNextPage } from '../actions/data';
-import { fetchInitialImages, fetchNextImages } from '../actions/images';
-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';
-import { openOrCloseNewPageForm } from '../actions/links';
-import { fetchInitialDocs, fetchNextDocs } from '../actions/documents';
-import { fetchInitialMedia, fetchNextMedia, updateMediaObject } from '../actions/media';
-import { changeContext, changeSearchString, changeSortBy } from '../actions/filter';
-import { allFilesLoading } from '../actions/all_files';
-import { get as getSession } from '../actions/session';
-const DEFAULT_FILE_CATEGORY = 'uncategorized';
-export default function propsFromDispatch(dispatch) {
-  return {
-    loadSession: () => dispatch(getSession),
-    onChangeTab: index => dispatch(changeTab(index)),
-    onChangeAccordion: index => dispatch(changeAccordion(index)),
-    fetchInitialPage: key => dispatch(fetchInitialPage(key)),
-    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));
-    },
-    startUpload: (tabContext, fileMetaProps) => dispatch(uploadPreflight(tabContext, fileMetaProps)),
-    flickrSearch: term => dispatch(searchFlickr(term)),
-    toggleFlickrForm: () => dispatch(openOrCloseFlickrForm()),
-    toggleUploadForm: () => dispatch(openOrCloseUploadForm()),
-    toggleNewPageForm: () => dispatch(openOrCloseNewPageForm()),
-    startIconMakerUpload: (fileMetaProps, uploadSettings) => dispatch(uploadToIconMakerFolder(fileMetaProps, uploadSettings)),
-    startMediaUpload: (tabContext, fileMetaProps) => dispatch(uploadToMediaFolder(tabContext, fileMetaProps)),
-    createMediaServerSession: () => dispatch(createMediaServerSession()),
-    // saveMediaRecording: (file, editor, dismiss) => dispatch(saveMediaRecording(file, editor, dismiss)),
-    mediaUploadComplete: (error, uploadData) => dispatch(mediaUploadComplete(error, uploadData)),
-    fetchInitialDocs: () => dispatch(fetchInitialDocs()),
-    fetchNextDocs: () => dispatch(fetchNextDocs()),
-    fetchInitialMedia: () => dispatch(fetchInitialMedia()),
-    fetchNextMedia: () => dispatch(fetchNextMedia()),
-    updateMediaObject: new_values => dispatch(updateMediaObject(new_values)),
-    onChangeContext: newContext => dispatch(changeContext(newContext)),
-    onChangeSearchString: searchString => dispatch(changeSearchString(searchString)),
-    onChangeSortBy: sortBy => dispatch(changeSortBy(sortBy)),
-    onAllFilesLoading: isLoading => dispatch(allFilesLoading(isLoading))
-  };
-}