@instructure/canvas-rce 5.6.16 → 5.7.0

package/lib/rce/tinyRCE.js

@@ -40,7 +40,6 @@ import './plugins/instructure-ui-icons/plugin';
 import './plugins/instructure_condensed_buttons/plugin';
 import './plugins/instructure_equation/plugin';
 import './plugins/instructure_image/plugin';
-import './plugins/instructure_external_tools/plugin';
 import './plugins/instructure_rce_external_tools/plugin';
 import './plugins/instructure_record/plugin';
 import './plugins/instructure_links/plugin';

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', () => {

package/lib/translated/ar/modules/getThemeVars.js

@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2023 - 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 { ThemeRegistry } from '@instructure/ui-themeable'; // ^^ at InstUI 8, just directly import getRegistry directly from @instructure/theme-registry
+
+import { merge, cloneDeep } from 'lodash'; // The running theme is the running theme for this page load, and it never
+// changes, so there's no point in doing the work more than once.
+
+let memoizedVariables;
+
+function getThemeVars() {
+  if (memoizedVariables) return memoizedVariables;
+  const {
+    defaultThemeKey,
+    overrides,
+    themes
+  } = ThemeRegistry.getRegistry(); // Just assume the "canvas" theme if the default key is null. This will
+  // never happen in the live app because one way or another a theme gets
+  // used, but unit tests don't always do that.
+  // Also we have to cloneDeep this because the merge below is about to
+  // mutate the whole thing.
+
+  const variables = cloneDeep(themes[defaultThemeKey !== null && defaultThemeKey !== void 0 ? defaultThemeKey : 'canvas'].variables);
+  merge(variables, overrides);
+  memoizedVariables = {
+    variables,
+    key: defaultThemeKey
+  };
+  return memoizedVariables;
+}
+
+export { getThemeVars };