@instructure/canvas-rce 5.6.16 → 5.6.17

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

@@ -21,6 +21,7 @@ import bridge from '../../../../bridge';
 import { asVideoElement, findMediaPlayerIframe } from '../../shared/ContentSelection';
 import VideoOptionsTray from '.';
 import { isStudioEmbeddedMedia, parseStudioOptions } from '../../shared/StudioLtiSupportUtils';
+import RCEGlobals from '../../../RCEGlobals';
 export const CONTAINER_ID = 'instructure-video-options-tray-container';
 export const VIDEO_SIZE_DEFAULT = {
   height: '225px',
@@ -130,17 +131,23 @@ export default class TrayController {
         this._editor.selection.select(link);
 
         this.$videoContainer = null;
+      }
+
+      const data = {
+        media_object_id: videoOptions.media_object_id,
+        title: videoOptions.titleText,
+        subtitles: videoOptions.subtitles
+      };
+
+      if (RCEGlobals.getFeatures().media_links_use_attachment_id) {
+        data.attachment_id = videoOptions.attachment_id;
       } // If the video just edited came from a file uploaded to canvas
       // and not notorious, we probably don't have a media_object_id.
       // If not, we can't update the MediaObject in the canvas db.
 
 
-      if (videoOptions.media_object_id && videoOptions.media_object_id !== 'undefined') {
-        videoOptions.updateMediaObject({
-          media_object_id: videoOptions.media_object_id,
-          title: videoOptions.titleText,
-          subtitles: videoOptions.subtitles
-        }).then(_r => {
+      if (videoOptions.media_object_id && videoOptions.media_object_id !== 'undefined' && !videoOptions.isLocked) {
+        videoOptions.updateMediaObject(data).then(_r => {
           if (this.$videoContainer && videoOptions.displayAs === 'embed') {
             this.$videoContainer.contentWindow.postMessage({
               subject: 'reload_media',
@@ -174,15 +181,10 @@ export default class TrayController {
     let vo = {};
 
     if (this._shouldOpen) {
-      /*
-       * When the tray is being opened again, it should be rendered fresh
-       * (clearing the internal state) so that the currently-selected video can
-       * be used for initial video options.
-       */
       this._renderId++;
-      vo = asVideoElement(this.$videoContainer) || {};
     }
 
+    vo = asVideoElement(this.$videoContainer) || {};
     const element = /*#__PURE__*/React.createElement(VideoOptionsTray, {
       id: "video-options-tray",
       key: this._renderId,

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

@@ -38,10 +38,13 @@ import DimensionsInput, { useDimensionsState } from '../../shared/DimensionsInpu
 import { getTrayHeight } from '../../shared/trayUtils';
 import { instuiPopupMountNode } from '../../../../util/fullscreenHelpers';
 import { parsedStudioOptionsPropType } from '../../shared/StudioLtiSupportUtils';
+import RCEGlobals from '../../../RCEGlobals';
 
 const getLiveRegion = () => document.getElementById('flash_screenreader_holder');
 
 export default function VideoOptionsTray(_ref) {
+  var _RCEGlobals$getConfig;
+
   let {
     videoOptions,
     onRequestClose,
@@ -68,7 +71,9 @@ 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 lock_statuses = (_RCEGlobals$getConfig = RCEGlobals.getConfig()) === null || _RCEGlobals$getConfig === void 0 ? void 0 : _RCEGlobals$getConfig.lockedAttachments;
   const isStudio = !!studioOptions;
+  const isLocked = !!lock_statuses && !!lock_statuses[videoOptions.attachmentId];
   const showDisplayOptions = !isStudio || studioOptions.convertibleToLink;
   const showSizeControls = !isStudio || studioOptions.resizable;
   const dimensionsState = useDimensionsState(videoOptions, {
@@ -118,12 +123,14 @@ export default function VideoOptionsTray(_ref) {
 
     onSave({
       media_object_id: videoOptions.id,
+      attachment_id: videoOptions.attachmentId,
       titleText,
       appliedHeight,
       appliedWidth,
       displayAs,
       subtitles,
-      updateMediaObject
+      updateMediaObject,
+      isLocked
     });
   }
 
@@ -206,7 +213,7 @@ export default function VideoOptionsTray(_ref) {
     shouldShrink: true
   }, /*#__PURE__*/React.createElement(Flex, {
     direction: "column"
-  }, /*#__PURE__*/React.createElement(Flex.Item, {
+  }, !isLocked && /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "small"
   }, isStudio ? /*#__PURE__*/React.createElement(Flex, {
     direction: "column"
@@ -263,8 +270,9 @@ export default function VideoOptionsTray(_ref) {
     disabled: displayAs !== 'embed',
     minHeight: minHeight,
     minWidth: minWidth,
-    minPercentage: minPercentage
-  }))), !isStudio && /*#__PURE__*/React.createElement(Flex.Item, {
+    minPercentage: minPercentage,
+    hidePercentage: true
+  }))), !isStudio && !isLocked && /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "small"
   }, /*#__PURE__*/React.createElement(FormFieldGroup, {
     description: formatMessage('Closed Captions/Subtitles')
@@ -294,7 +302,7 @@ export default function VideoOptionsTray(_ref) {
 }
 VideoOptionsTray.propTypes = {
   videoOptions: shape({
-    titleText: string.isRequired,
+    titleText: string,
     appliedHeight: number,
     appliedWidth: number,
     naturalHeight: number.isRequired,

package/lib/rce/plugins/instructure_record/clickCallback.js

@@ -22,6 +22,7 @@ import { StoreProvider } from '../shared/StoreContext';
 import formatMessage from '../../../format-message';
 import { headerFor, originFromHost } from '../../../rcs/api';
 import { instuiPopupMountNode } from '../../../util/fullscreenHelpers';
+import RCEGlobals from '../../RCEGlobals';
 export const handleUpload = (error, uploadData, onUploadComplete, uploadBookmark) => {
   let err_msg = error && Bridge.uploadMediaTranslations.UploadMediaStrings.UPLOADING_ERROR;
 
@@ -97,7 +98,8 @@ export default function (ed, document) {
         record: true,
         upload: true
       },
-      uploadMediaTranslations: Bridge.uploadMediaTranslations
+      uploadMediaTranslations: Bridge.uploadMediaTranslations,
+      media_links_use_attachment_id: RCEGlobals.getFeatures().media_links_use_attachment_id
     })), container);
   });
 }

package/lib/rce/plugins/shared/CanvasContentTray.js

@@ -29,7 +29,6 @@ import Filter, { useFilterSettings } from './Filter';
 import { getTrayHeight } from './trayUtils';
 import { ICON_MAKER_ICONS } from '../instructure_icon_maker/svg/constants';
 import { getLinkContentFromEditor } from './ContentSelection';
-import { getIcon } from './linkUtils';
 import { LinkDisplay } from './LinkDisplay';
 /**
  * Returns the translated tray label
@@ -245,7 +244,6 @@ export default function CanvasContentTray(props) {
   const [link, setLink] = useState(null);
   const [linkText, setLinkText] = useState(null);
   const [placeholderText, setPlaceholderText] = useState(null);
-  const Icon = getIcon(link === null || link === void 0 ? void 0 : link.type);
   const {
     bridge,
     editor,
@@ -290,7 +288,7 @@ export default function CanvasContentTray(props) {
             published
           });
           setLinkText(text);
-          setPlaceholderText(text);
+          setPlaceholderText(fileName);
         } else {
           setIsEditTray(false);
         }
@@ -347,6 +345,9 @@ export default function CanvasContentTray(props) {
   }
 
   function handleCloseTray() {
+    // clear the store's saved search string so the tray doesn't
+    // reopen with a previous tray instance's search results
+    storeProps.onChangeSearchString('');
     setHasOpened(false);
     onTrayClosing && onTrayClosing(false); // tell RCEWrapper we're closed
   }
@@ -355,7 +356,7 @@ export default function CanvasContentTray(props) {
     handleDismissTray();
     const newLink = { ...link,
       forceRename: true,
-      text: linkText || placeholderText
+      text: linkText
     };
     bridge.insertLink(newLink);
   }
@@ -367,6 +368,7 @@ export default function CanvasContentTray(props) {
       padding: "small medium",
       textAlign: "end"
     }, /*#__PURE__*/React.createElement(Button, {
+      "data-testid": "cancel-replace-button",
       onClick: handleDismissTray
     }, formatMessage('Cancel')), /*#__PURE__*/React.createElement(Button, {
       margin: "0 0 0 x-small",
@@ -470,11 +472,11 @@ export default function CanvasContentTray(props) {
     screenReaderLabel: formatMessage('Close')
   }))), isEditTray && /*#__PURE__*/React.createElement(LinkDisplay, {
     linkText: linkText,
-    Icon: Icon,
-    placeholderText: placeholderText,
+    placeholderText: (link === null || link === void 0 ? void 0 : link.title) || placeholderText,
     linkFileName: (link === null || link === void 0 ? void 0 : link.title) || '',
     published: (link === null || link === void 0 ? void 0 : link.published) || false,
-    handleTextChange: setLinkText
+    handleTextChange: setLinkText,
+    linkType: link === null || link === void 0 ? void 0 : link.type
   }), /*#__PURE__*/React.createElement(Filter, Object.assign({}, filterSettings, {
     mountNode: props.mountNode,
     userContextType: props.contextType,

package/lib/rce/plugins/shared/DimensionsInput/index.js

@@ -21,6 +21,7 @@ import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { FormFieldGroup } from '@instructure/ui-form-field';
 import { IconLockLine } from '@instructure/ui-icons';
 import { Flex } from '@instructure/ui-flex';
+import { Text } from '@instructure/ui-text';
 import { RadioInput, RadioInputGroup } from '@instructure/ui-radio-input';
 import formatMessage from '../../../../format-message';
 import DimensionInput from './DimensionInput';
@@ -69,7 +70,8 @@ export default function DimensionsInput(props) {
     dimensionsState,
     minHeight,
     minWidth,
-    minPercentage
+    minPercentage,
+    hidePercentage
   } = props;
 
   const handleDimensionTypeChange = e => {
@@ -81,7 +83,9 @@ export default function DimensionsInput(props) {
     direction: "column"
   }, /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "small"
-  }, /*#__PURE__*/React.createElement(RadioInputGroup, {
+  }, hidePercentage ? /*#__PURE__*/React.createElement(Text, {
+    weight: "bold"
+  }, formatMessage('Custom width and height (Pixels)')) : /*#__PURE__*/React.createElement(RadioInputGroup, {
     "data-testid": "dimension-type",
     name: "dimension-type",
     description: formatMessage('Dimension Type'),
@@ -149,5 +153,9 @@ DimensionsInput.propTypes = {
   }),
   minHeight: number.isRequired,
   minWidth: number.isRequired,
-  minPercentage: number.isRequired
+  minPercentage: number.isRequired,
+  hidePercentage: bool
+};
+DimensionsInput.defaultProps = {
+  hidePercentage: false
 };

package/lib/rce/plugins/shared/LinkDisplay.js

@@ -22,15 +22,17 @@ import { Flex } from '@instructure/ui-flex';
 import { TextInput } from '@instructure/ui-text-input';
 import formatMessage from '../../../format-message';
 import { showFlashAlert } from '../../../common/FlashAlert';
-const EDIT_MESSAGE = formatMessage('If left empty link, text will display as course link name');
+import { ScreenReaderContent } from '@instructure/ui-a11y-content';
+import { getIcon, getFriendlyLinkType } from './linkUtils';
+const EDIT_MESSAGE = formatMessage('If left empty, link text will display as course link name');
 export const LinkDisplay = _ref => {
   let {
     linkText,
-    Icon,
     placeholderText,
     linkFileName,
     published,
-    handleTextChange
+    handleTextChange,
+    linkType
   } = _ref;
   useEffect(() => {
     showFlashAlert({
@@ -41,14 +43,18 @@ export const LinkDisplay = _ref => {
       srOnly: true
     });
   }, [linkFileName]);
+  const Icon = getIcon(linkType);
+  const linkTypeMessage = getFriendlyLinkType(linkType);
+  const publishedMessage = published ? formatMessage('published') : formatMessage('unpublished');
   return /*#__PURE__*/React.createElement(View, {
     as: "div",
     "data-testid": "LinkDisplay"
   }, /*#__PURE__*/React.createElement(View, {
     as: "div"
   }, /*#__PURE__*/React.createElement(Flex, null, /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(TextInput, {
+    "data-testId": "link-text-input",
     renderLabel: () => formatMessage('Text (optional)'),
-    onChange: (e, value) => handleTextChange(value),
+    onChange: (_e, value) => handleTextChange(value),
     value: linkText,
     placeholder: placeholderText,
     messages: [{
@@ -62,7 +68,7 @@ export const LinkDisplay = _ref => {
     margin: "small none small none"
   }, /*#__PURE__*/React.createElement(Text, {
     weight: "bold"
-  }, "Current Link")), /*#__PURE__*/React.createElement(Flex, {
+  }, formatMessage('Current Link'))), /*#__PURE__*/React.createElement(Flex, {
     margin: "small none none none"
   }, /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "0 x-small 0 small"
@@ -80,5 +86,9 @@ export const LinkDisplay = _ref => {
     as: "div"
   }, /*#__PURE__*/React.createElement("span", {
     "data-testid": "selected-link-name"
-  }, linkFileName))))));
+  }, linkFileName), linkType && /*#__PURE__*/React.createElement(ScreenReaderContent, {
+    "data-testid": "screenreader_content"
+  }, formatMessage('link type: {linkTypeMessage}', {
+    linkTypeMessage
+  }), linkType !== 'navigation' && publishedMessage))))));
 };

package/lib/rce/plugins/shared/RceFileBrowser.js

@@ -69,7 +69,7 @@ export default function RceFileBrowser(props) {
       title: fileInfo.name,
       href: url,
       embedded_iframe_url,
-      media_id: (_fileInfo$api$embed = fileInfo.api.embed) === null || _fileInfo$api$embed === void 0 ? void 0 : _fileInfo$api$embed.id,
+      media_id: ((_fileInfo$api$embed = fileInfo.api.embed) === null || _fileInfo$api$embed === void 0 ? void 0 : _fileInfo$api$embed.id) || fileInfo.api.mediaEntryId,
       target: '_blank',
       content_type
     };

package/lib/rce/plugins/shared/compressionUtils.js

@@ -74,7 +74,12 @@ export function shouldCompressImage(_ref2) {
   } = _ref2;
   return ['image/jpeg', 'image/webp', 'image/bmp', 'image/tiff'].includes(type) && size > MAX_IMAGE_SIZE_BYTES;
 }
-export function compressImage(encodedImage, previewWidth, previewHeight) {
+export function compressImage(_ref3) {
+  let {
+    encodedImage,
+    previewWidth,
+    previewHeight
+  } = _ref3;
   return new Promise((resolve, reject) => {
     const image = new Image();
     image.src = encodedImage;

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

@@ -93,12 +93,14 @@ export function mediaPlayerURLFromFile(file, canvasOrigin) {
   const content_type = file['content-type'] || file.content_type || file.type;
   const type = content_type.replace(/\/.*$/, '');
 
-  if ((_RCEGlobals$getFeatur = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur !== void 0 && _RCEGlobals$getFeatur.media_links_use_attachment_id && isAudioOrVideo(content_type)) {
-    const attachmentId = file.id;
-
-    if (attachmentId) {
-      return `/media_attachments_iframe/${attachmentId}?type=${type}&embedded=true`;
+  if ((_RCEGlobals$getFeatur = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur !== void 0 && _RCEGlobals$getFeatur.media_links_use_attachment_id && isAudioOrVideo(content_type) && file.id) {
+    if (!file.url && !file.href) {
+      return `/media_attachments_iframe/${file.id}?type=${type}&embedded=true`;
     }
+
+    const parsed_url = parse(file.url || file.href, true);
+    const verifier = parsed_url.query.verifier ? `&verifier=${parsed_url.query.verifier}` : '';
+    return `/media_attachments_iframe/${file.id}?type=${type}${verifier}&embedded=true`;
   }
 
   if (file.embedded_iframe_url) {
@@ -108,7 +110,7 @@ export function mediaPlayerURLFromFile(file, canvasOrigin) {
   if (isAudioOrVideo(content_type)) {
     var _file$embed;
 
-    const mediaEntryId = file.media_entry_id || ((_file$embed = file.embed) === null || _file$embed === void 0 ? void 0 : _file$embed.id);
+    const mediaEntryId = file.media_entry_id || ((_file$embed = file.embed) === null || _file$embed === void 0 ? void 0 : _file$embed.id) || file.mediaEntryId;
 
     if (mediaEntryId && mediaEntryId !== 'maybe') {
       return `/media_objects_iframe/${mediaEntryId}?type=${type}`;

package/lib/rce/plugins/shared/linkUtils.js

@@ -18,6 +18,7 @@
 import React from 'react';
 import { SVGIcon } from '@instructure/ui-svg-images';
 import { IconAssignmentLine, IconDiscussionLine, IconModuleLine, IconQuizLine, IconQuizSolid as IconNewQuiz, IconAnnouncementLine, IconDocumentLine } from '@instructure/ui-icons';
+import formatMessage from 'format-message';
 export const IconBlank = props => {
   return /*#__PURE__*/React.createElement(SVGIcon, Object.assign({
     name: "IconBlank",
@@ -55,4 +56,34 @@ export const getIcon = type => {
     default:
       return IconDocumentLine;
   }
+};
+export const getFriendlyLinkType = type => {
+  switch (type) {
+    case 'assignments':
+      return formatMessage('Assignment');
+
+    case 'discussions':
+      return formatMessage('Discussion');
+
+    case 'modules':
+      return formatMessage('Module');
+
+    case 'quizzes':
+      return formatMessage('Quiz');
+
+    case 'quizzes.next':
+      return formatMessage('New Quiz');
+
+    case 'announcements':
+      return formatMessage('Announcement');
+
+    case 'wikiPages':
+      return formatMessage('Page');
+
+    case 'navigation':
+      return formatMessage('Navigation');
+
+    default:
+      return '';
+  }
 };

package/lib/rcs/api.js

@@ -17,10 +17,11 @@
  */
 import 'isomorphic-fetch';
 import { parse } from 'url';
-import { saveClosedCaptions, CONSTANTS } from '@instructure/canvas-media';
+import { saveClosedCaptions, saveClosedCaptionsForAttachment, CONSTANTS } from '@instructure/canvas-media';
 import { downloadToWrap, fixupFileUrl } from '../common/fileUrl';
 import alertHandler from '../rce/alertHandler';
 import buildError from './buildError';
+import RCEGlobals from '../rce/RCEGlobals';
 export function headerFor(jwt) {
   return {
     Authorization: 'Bearer ' + jwt
@@ -182,17 +183,33 @@ class RceApiSource {
   }
 
   fetchMedia(props) {
+    var _RCEGlobals$getFeatur;
+
     const media = props.media[props.contextType];
     const uri = media.bookmark || this.uriFor('media', props);
+
+    if ((_RCEGlobals$getFeatur = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur !== void 0 && _RCEGlobals$getFeatur.media_links_use_attachment_id) {
+      return this.apiFetch(uri, headerFor(this.jwt)).then(_ref2 => {
+        let {
+          bookmark,
+          files
+        } = _ref2;
+        return {
+          bookmark,
+          files: files.map(f => fixupFileUrl(props.contextType, props.contextId, f, this.canvasOrigin))
+        };
+      });
+    }
+
     return this.apiFetch(uri, headerFor(this.jwt));
   }
 
   fetchFiles(uri) {
-    return this.fetchPage(uri).then(_ref2 => {
+    return this.fetchPage(uri).then(_ref3 => {
       let {
         bookmark,
         files
-      } = _ref2;
+      } = _ref3;
       return {
         bookmark,
         files: files.map(normalizeFileData)
@@ -230,27 +247,33 @@ class RceApiSource {
     return this.apiPost(this.baseUri('media_objects'), headerFor(this.jwt), body);
   }
 
-  updateMediaObject(apiProps, _ref3) {
+  updateMediaObject(apiProps, _ref4) {
+    var _RCEGlobals$getFeatur2;
+
     let {
       media_object_id,
-      title
-    } = _ref3;
-    const uri = `${this.baseUri('media_objects', apiProps.host)}/${media_object_id}?user_entered_title=${encodeURIComponent(title)}`;
+      title,
+      attachment_id
+    } = _ref4;
+    const uri = (_RCEGlobals$getFeatur2 = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur2 !== void 0 && _RCEGlobals$getFeatur2.media_links_use_attachment_id && attachment_id ? `${this.baseUri('media_attachments', apiProps.host)}/${attachment_id}?user_entered_title=${encodeURIComponent(title)}` : `${this.baseUri('media_objects', apiProps.host)}/${media_object_id}?user_entered_title=${encodeURIComponent(title)}`;
     return this.apiPost(uri, headerFor(this.jwt), null, 'PUT');
   } // PUT to //RCS/api/media_objects/:mediaId/media_tracks [{locale, content}, ...]
   // receive back a 200 with the new subtitles, or a 4xx error
 
 
-  updateClosedCaptions(apiProps, _ref4, maxBytes) {
+  updateClosedCaptions(apiProps, _ref5) {
     let {
       media_object_id,
+      attachment_id,
       subtitles
-    } = _ref4;
-    return saveClosedCaptions(media_object_id, subtitles, {
+    } = _ref5;
+    let maxBytes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : CONSTANTS.CC_FILE_MAX_BYTES;
+    const rcsConfig = {
       origin: originFromHost(apiProps.host),
       headers: headerFor(apiProps.jwt)
-    }, maxBytes || CONSTANTS.CC_FILE_MAX_BYTES).catch(e => {
-      console.error('Failed saving CC', e);
+    };
+    const saveCaptions = attachment_id ? saveClosedCaptionsForAttachment(attachment_id, subtitles, rcsConfig, maxBytes) : saveClosedCaptions(media_object_id, subtitles, rcsConfig, maxBytes);
+    return saveCaptions.catch(e => {
       this.alertFunc(buildError({
         message: 'failed to save captions'
       }, e));
@@ -303,11 +326,11 @@ class RceApiSource {
     return this.apiFetch(uri, headerFor(this.jwt));
   }
 
-  fetchIconMakerFolder(_ref5) {
+  fetchIconMakerFolder(_ref6) {
     let {
       contextId,
       contextType
-    } = _ref5;
+    } = _ref6;
     const uri = this.uriFor('folders/icon_maker', {
       contextId,
       contextType,
@@ -337,11 +360,11 @@ class RceApiSource {
     const images = props.images[props.contextType];
     const uri = images.bookmark || this.uriFor('images', props);
     const headers = headerFor(this.jwt);
-    return this.apiFetch(uri, headers).then(_ref6 => {
+    return this.apiFetch(uri, headers).then(_ref7 => {
       let {
         bookmark,
         files
-      } = _ref6;
+      } = _ref7;
       return {
         bookmark,
         files: files.map(f => fixupFileUrl(props.contextType, props.contextId, f, this.canvasOrigin)),

package/lib/sidebar/actions/media.js

@@ -110,14 +110,16 @@ export function fetchInitialMedia() {
 export function updateMediaObject(_ref3) {
   let {
     media_object_id,
+    attachment_id,
     title,
     subtitles
   } = _ref3;
   return (dispatch, getState) => {
     const state = getState();
-    const moupdate = state.source.updateMediaObject(state, {
+    const moUpdate = state.source.updateMediaObject(state, {
       media_object_id,
-      title
+      title,
+      attachment_id
     }).catch(e => {
       alertHandler.handleAlert({
         text: formatMessage('Though your video will have the correct title in the browser, we failed to update it in the database.'),
@@ -125,10 +127,16 @@ export function updateMediaObject(_ref3) {
       });
       throw e;
     });
-    const ccupdate = state.source.updateClosedCaptions(state, {
+    const ccData = {
       media_object_id,
       subtitles
-    });
-    return Promise.all([moupdate, ccupdate]);
+    };
+
+    if (attachment_id) {
+      ccData.attachment_id = attachment_id;
+    }
+
+    const ccUpdate = state.source.updateClosedCaptions(state, ccData);
+    return Promise.all([moUpdate, ccUpdate]);
   };
 }

package/lib/translated/ar/modules/bridge/Bridge.js

@@ -33,7 +33,7 @@ export default class Bridge {
           range: selection.getRng()
         };
 
-        if (!link.text) {
+        if (!link.text || link.text.trim().length === 0) {
           link.text = link.title || link.href;
         }
 

package/lib/translated/ar/modules/bridge/__tests__/bridge.test.js

@@ -213,6 +213,36 @@ describe('Editor/Sidebar bridge', () => {
         Bridge.insertImagePlaceholder({});
         expect(Bridge.getEditor().insertImagePlaceholder).not.toHaveBeenCalled();
       });
+      it('defaults to link title if no text is given', () => {
+        Bridge.focusEditor(editor);
+        Bridge.insertLink({
+          text: '',
+          title: 'some link'
+        });
+        expect(editor.insertLink).toHaveBeenCalledWith({
+          selectionDetails: {
+            node: 'some-node',
+            range: 'some-range'
+          },
+          text: 'some link',
+          title: 'some link'
+        });
+      });
+      it('defaults to link title if only spaces are given', () => {
+        Bridge.focusEditor(editor);
+        Bridge.insertLink({
+          text: '   ',
+          title: 'some link'
+        });
+        expect(editor.insertLink).toHaveBeenCalledWith({
+          selectionDetails: {
+            node: 'some-node',
+            range: 'some-range'
+          },
+          text: 'some link',
+          title: 'some link'
+        });
+      });
     });
     describe('insertFileLink', () => {
       it('inserts a link', () => {