@instructure/canvas-rce 5.10.0 → 5.11.1

package/CHANGELOG.md

@@ -5,34 +5,67 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 5.11.1 - 2023-10-12
+
+### Fixed
+
+- An issue where the RCE can't be built due to an extraneous dependency
+
+## 5.11.0 - 2023-10-10
+
+### Fixed
+
+- Fix styling on a11y checker why IconButton
+- fix instui8 regression in course link tray (RCE)
+- focus close button on ECL tray launch
+- fix video media comment in speedgrader
+
+### Changed
+
+- Bump instui to 8.45.0
+- update dockerfiles for node 18
+- InstUI 8 upgrade post-work: theme -> themeOverride
+- Allow other users to view media in discussions
+- Revert "Stop rendering title and CC panels on media tray for locked attachments"
+
+### Added
+
+- respond to all postMessages in active RCE
+
 ## 5.10.0 - 2023-09-26
 
 ### Fixed
+
 - An issue where media controls don't respond in Safari
 - An issue where embedded Studio videos cause unresponsiveness
 - A potential race condition in postMessage forwarding
 
 ### Changed
+
 - Ignore a11y check on elements with a background image or gradient
 - Remove math processing percentage indicator
 
 ## 5.9.0 - 2023-08-30
 
 ### Fixed
+
 - An issue where LTI postMessages were not working inside active RCE
 
 ### Changed
+
 - Encrypt auto-saved RCE content
 - Remove dependency on `@instructure/filter-console-messages`
 
 ## 5.8.0 - 2023-08-15
 
 ### Fixed
+
 - An issue where filenames are incorrectly recognized in the accessibility checker
 - An issue where the accessibility checker's color picker would not work with invalid RGBA values
 - An issue where the RCS is required to use the new external tools plugin
 
 ### Changed
+
 - Removed CJS build from package
 - Renamed .js files to .jsx
 - Upgraded react-aria-live dependency to v2.0.5
@@ -41,6 +74,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Reduced amount of console errors when running jest tests by providing missing props, fixing async issues, etc in tests
 
 ### Added
+
 - New translations
 - Improved messaging in the Add Course Link tray when there's no results
 - Explanations for inherited media captions
@@ -48,27 +82,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## 5.7.0 - 2023-07-18
 
 ### Fixed
+
 - Some broken translations in the 'Edit Course Link' tray and the word count modal
 - Some Typescript errors
 - An issue where the a11y checker incorrectly shows the issues icon
 
 ### Changed
+
 - Removed the `rce_new_external_tool_dialog_in_canvas` feature flag
 - Removed the deprecated `instructure_external_tools` package code which was not in use
 - Replaced themeable with emotion
 
 ### Added
+
 - Selected link indicator alert for screenreaders in the 'Edit Course Link' tray
 
 ## 5.6.17 - 2023-06-27
 
 ### Fixed
+
 - Added some missing media translations
 - Fixed some a11y/usability issues in the 'Edit Course Link' tray
 - Fixed an icon maker bug related to image compression
 - Fixed some issues related to pasting images in Firefox and embedding media
 
 ### Changed
+
 - Removed the `rce_improved_placeholders`, `rce_better_paste`, `rce_show_studio_media_options`, and
   `buttons_and_icons_cropper` feature flags
 - Improved the accessibility checker's performance
@@ -76,10 +115,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## 5.6.16 - 2023-05-17
 
 ### Fixed
+
 - Fullscreen issues with several select components
 - A significant number of missing translations across various locales
 
 ### Changed
+
 - Restored previous mathjax delimiter config
 - Absorbed the `tinymce-a11y-checker` plugin
 - Updated the placeholders when inserting media, images, files, etc.
@@ -87,6 +128,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Moved MathML to one shared location
 
 ### Added
+
 - Studio Media Options plugin
 - Equilibrium button to the Equation Editor
 - Icon support for iWork files

package/Dockerfile

@@ -1,4 +1,4 @@
-FROM instructure/node:16
+FROM instructure/node:18
 
 ARG NPM_PRIVATE_SCOPE
 ARG NPM_PRIVATE_REGISTRY

package/es/common/mimeClass.js

@@ -42,75 +42,78 @@ export function mimeClass(file) {
   } else {
     const contentType = getContentType(file); // NOTE: Keep this list in sync with what's in canvas-lms/app/models/attachment.rb
 
-    return {
-      'text/html': 'html',
-      'text/x-csharp': 'code',
-      'text/xml': 'code',
-      'text/css': 'code',
-      text: 'text',
-      'text/plain': 'text',
-      'application/rtf': 'doc',
-      'text/rtf': 'doc',
-      'application/vnd.oasis.opendocument.text': 'doc',
-      'application/pdf': 'pdf',
-      'application/vnd.openxmlformats-officedocument.wordprocessingml.document': 'doc',
-      'application/vnd.apple.pages': 'doc',
-      'application/x-docx': 'doc',
-      'application/msword': 'doc',
-      'application/vnd.ms-powerpoint': 'ppt',
-      'application/vnd.openxmlformats-officedocument.presentationml.presentation': 'ppt',
-      'applicatoin/vnd.apple.key': 'ppt',
-      'application/vnd.ms-excel': 'xls',
-      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': 'xls',
-      'application/vnd.apple.numbers': 'xls',
-      'application/vnd.oasis.opendocument.spreadsheet': 'xls',
-      'image/jpeg': 'image',
-      'image/pjpeg': 'image',
-      'image/png': 'image',
-      'image/gif': 'image',
-      'image/bmp': 'image',
-      'image/svg+xml': 'image',
-      'image/webp': 'image',
-      'application/x-rar': 'zip',
-      'application/x-rar-compressed': 'zip',
-      'application/x-zip': 'zip',
-      'application/x-zip-compressed': 'zip',
-      'application/xml': 'code',
-      'application/zip': 'zip',
-      'audio/mp3': 'audio',
-      'audio/mpeg': 'audio',
-      'audio/basic': 'audio',
-      'audio/mid': 'audio',
-      'audio/3gpp': 'audio',
-      'audio/x-aiff': 'audio',
-      'audio/x-m4a': 'audio',
-      'audio/x-mpegurl': 'audio',
-      'audio/x-ms-wma': 'audio',
-      'audio/x-pn-realaudio': 'audio',
-      'audio/x-wav': 'audio',
-      'audio/mp4': 'audio',
-      'audio/wav': 'audio',
-      'audio/webm': 'audio',
-      'audio/*': 'audio',
-      audio: 'audio',
-      'video/mpeg': 'video',
-      'video/quicktime': 'video',
-      'video/x-la-asf': 'video',
-      'video/x-ms-asf': 'video',
-      'video/x-ms-wma': 'audio',
-      'video/x-ms-wmv': 'video',
-      'video/x-msvideo': 'video',
-      'video/x-sgi-movie': 'video',
-      'video/3gpp': 'video',
-      'video/mp4': 'video',
-      'video/webm': 'video',
-      'video/avi': 'video',
-      'video/*': 'video',
-      video: 'video',
-      'application/x-shockwave-flash': 'flash'
-    }[contentType] || file.mime_class || 'file';
+    return contentMapping(contentType) || file.mime_class || 'file';
   }
 }
+export function contentMapping(contentType) {
+  return {
+    'text/html': 'html',
+    'text/x-csharp': 'code',
+    'text/xml': 'code',
+    'text/css': 'code',
+    text: 'text',
+    'text/plain': 'text',
+    'application/rtf': 'doc',
+    'text/rtf': 'doc',
+    'application/vnd.oasis.opendocument.text': 'doc',
+    'application/pdf': 'pdf',
+    'application/vnd.openxmlformats-officedocument.wordprocessingml.document': 'doc',
+    'application/vnd.apple.pages': 'doc',
+    'application/x-docx': 'doc',
+    'application/msword': 'doc',
+    'application/vnd.ms-powerpoint': 'ppt',
+    'application/vnd.openxmlformats-officedocument.presentationml.presentation': 'ppt',
+    'applicatoin/vnd.apple.key': 'ppt',
+    'application/vnd.ms-excel': 'xls',
+    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': 'xls',
+    'application/vnd.apple.numbers': 'xls',
+    'application/vnd.oasis.opendocument.spreadsheet': 'xls',
+    'image/jpeg': 'image',
+    'image/pjpeg': 'image',
+    'image/png': 'image',
+    'image/gif': 'image',
+    'image/bmp': 'image',
+    'image/svg+xml': 'image',
+    'image/webp': 'image',
+    'application/x-rar': 'zip',
+    'application/x-rar-compressed': 'zip',
+    'application/x-zip': 'zip',
+    'application/x-zip-compressed': 'zip',
+    'application/xml': 'code',
+    'application/zip': 'zip',
+    'audio/mp3': 'audio',
+    'audio/mpeg': 'audio',
+    'audio/basic': 'audio',
+    'audio/mid': 'audio',
+    'audio/3gpp': 'audio',
+    'audio/x-aiff': 'audio',
+    'audio/x-m4a': 'audio',
+    'audio/x-mpegurl': 'audio',
+    'audio/x-ms-wma': 'audio',
+    'audio/x-pn-realaudio': 'audio',
+    'audio/x-wav': 'audio',
+    'audio/mp4': 'audio',
+    'audio/wav': 'audio',
+    'audio/webm': 'audio',
+    'audio/*': 'audio',
+    audio: 'audio',
+    'video/mpeg': 'video',
+    'video/quicktime': 'video',
+    'video/x-la-asf': 'video',
+    'video/x-ms-asf': 'video',
+    'video/x-ms-wma': 'audio',
+    'video/x-ms-wmv': 'video',
+    'video/x-msvideo': 'video',
+    'video/x-sgi-movie': 'video',
+    'video/3gpp': 'video',
+    'video/mp4': 'video',
+    'video/webm': 'video',
+    'video/avi': 'video',
+    'video/*': 'video',
+    video: 'video',
+    'application/x-shockwave-flash': 'flash'
+  }[contentType];
+}
 
 function getContentType(file) {
   return file['content-type'] || file.content_type || file.type;

package/es/enhance-user-content/doc_previews.js

@@ -65,7 +65,7 @@ export function showLoadingImage($link) {
 
   ReactDOM.render( /*#__PURE__*/React.createElement(Spinner, {
     size: "x-small",
-    title: formatMessage('Loading')
+    renderTitle: formatMessage('Loading')
   }), $imageHolder);
   return $link;
 }

package/es/enhance-user-content/enhance_user_content.js

@@ -216,8 +216,16 @@ export function enhanceUserContent() {
           iframeElem.setAttribute('src', addParentFrameContextToUrl(src, containingCanvasLtiToolId));
         }
       });
-    }
+    } // tell LTI tools that they are launching from within the active RCE
+
+
+    unenhanced_elem.querySelectorAll('iframe[src]').forEach(iframeElem => {
+      const src = iframeElem.getAttribute('src');
 
+      if (src.startsWith(canvasOrigin)) {
+        iframeElem.setAttribute('src', src.replace('display=in_rce', 'display=borderless'));
+      }
+    });
     unenhanced_elem.querySelectorAll('a:not(.not_external, .external)').forEach(childLink => {
       if (!isExternalLink(childLink, canvasOrigin)) return;
       if (childLink.tagName === 'IMG' || childLink.querySelectorAll('img').length > 0) return;

package/es/getThemeVars.js

@@ -15,8 +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 { ThemeRegistry } from '@instructure/ui-themeable'; // ^^ at InstUI 8, just directly import getRegistry directly from @instructure/theme-registry
-
+import { getRegistry } 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.
 
@@ -28,13 +27,13 @@ function getThemeVars() {
     defaultThemeKey,
     overrides,
     themes
-  } = ThemeRegistry.getRegistry(); // Just assume the "canvas" theme if the default key is null. This will
+  } = 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);
+  const variables = cloneDeep(themes[defaultThemeKey !== null && defaultThemeKey !== void 0 ? defaultThemeKey : 'canvas']);
   merge(variables, overrides);
   memoizedVariables = {
     variables,

package/es/rce/RCE.js

@@ -1,5 +1,3 @@
-var _process, _process$env;
-
 // @ts-nocheck
 
 /*
@@ -29,7 +27,7 @@ import tinyRCE from './tinyRCE';
 import getTranslations from '../getTranslations';
 import '@instructure/canvas-theme';
 
-if (!((_process = process) !== null && _process !== void 0 && (_process$env = _process.env) !== null && _process$env !== void 0 && _process$env.BUILD_LOCALE)) {
+if (!process || !process.env || !undefined) {
   formatMessage.setup({
     locale: 'en',
     generateId: require('format-message-generate-id/underscored_crc32'),

package/es/rce/RCEWrapper.js

@@ -2714,67 +2714,9 @@ class RCEWrapper extends React.Component {
 
       this.checkAccessibility();
       this.fixToolbarKeyboardNavigation();
-      this.forwardPostMessages();
       (_this$props$onInitted = (_this$props = this.props).onInitted) === null || _this$props$onInitted === void 0 ? void 0 : _this$props$onInitted.call(_this$props, editor);
     };
 
-    this.forwardPostMessages = () => {
-      const windowReferences = [];
-      const rceWindow = this.editor.getWin(); // explicitly assign name for reference by parent window
-
-      rceWindow.name = `${RCEWrapper.editorFrameName}_${this.id}`;
-      rceWindow.addEventListener('message', this.forwardPostMessagesHandler(rceWindow, windowReferences));
-    };
-
-    this.forwardPostMessagesHandler = (rceWindow, windowReferences) => e => {
-      let message;
-
-      try {
-        message = typeof e.data === 'string' ? JSON.parse(e.data) : e.data;
-      } catch (err) {
-        // unparseable message may not be meant for our handlers
-        return false;
-      } // NOTE: the code to encode/decode `sourceToolInfo` is duplicated in
-      // the ui/features/post_message_forwarding/index.ts, and
-      // cannot be DRY'd because RCE is in a package
-
-
-      if (e.origin === rceWindow.origin) {
-        const {
-          sourceToolInfo,
-          ...messageWithoutSourceToolInfo
-        } = message;
-        const targetOrigin = sourceToolInfo === null || sourceToolInfo === void 0 ? void 0 : sourceToolInfo.origin;
-        const targetWindow = windowReferences[sourceToolInfo === null || sourceToolInfo === void 0 ? void 0 : sourceToolInfo.windowId];
-
-        if (!targetOrigin || !targetWindow) {
-          return false;
-        }
-
-        targetWindow === null || targetWindow === void 0 ? void 0 : targetWindow.postMessage(messageWithoutSourceToolInfo, targetOrigin);
-      } else {
-        // message is from tool, forward to Canvas window
-        // We can't forward the whole `e.source` window in the postMessage,
-        // so we keep a list (`windowReferences`) of all windows we've received
-        // messages from, and include the index into that list as `windowId`
-        let windowId = windowReferences.indexOf(e.source);
-
-        if (windowId === -1) {
-          windowReferences.push(e.source);
-          windowId = windowReferences.length - 1;
-        }
-
-        const newMessage = { ...message,
-          sourceToolInfo: {
-            origin: e.origin,
-            windowId
-          },
-          frameName: rceWindow.name
-        };
-        rceWindow.parent.postMessage(newMessage, rceWindow.origin);
-      }
-    };
-
     this.fixToolbarKeyboardNavigation = () => {
       var _this$_elementRef$cur2;
 
@@ -3200,19 +3142,15 @@ class RCEWrapper extends React.Component {
   getRequiredFeatureStatuses() {
     const {
       new_math_equation_handling = false,
-      rce_ux_improvements = false,
       explicit_latex_typesetting = false,
       rce_transform_loaded_content = false,
-      media_links_use_attachment_id = false,
-      improved_no_results_messaging = false
+      media_links_use_attachment_id = false
     } = this.props.features;
     return {
       new_math_equation_handling,
-      rce_ux_improvements,
       explicit_latex_typesetting,
       rce_transform_loaded_content,
-      media_links_use_attachment_id,
-      improved_no_results_messaging
+      media_links_use_attachment_id
     };
   }
 
@@ -3220,8 +3158,7 @@ class RCEWrapper extends React.Component {
     return {
       locale: normalizeLocale(this.props.language),
       flashAlertTimeout: this.props.flashAlertTimeout,
-      timezone: this.props.timezone,
-      lockedAttachments: this.props.lockedAttachments
+      timezone: this.props.timezone
     };
   }
 
@@ -4257,7 +4194,6 @@ RCEWrapper.defaultProps = {
   canvasOrigin: ''
 };
 RCEWrapper.skinCssInjected = false;
-RCEWrapper.editorFrameName = 'active_rce_frame';
 
 function mergeMenuItems(standard, custom) {
   var _custom$trim;

package/es/rce/RceHtmlEditor.js

@@ -28,6 +28,28 @@ const RceHtmlEditor = /*#__PURE__*/React.forwardRef((_ref, editorRef) => {
   const [code, setCode] = useState(props.code);
   const label = formatMessage('html code editor');
   const [dir, setDir] = useState(getComputedStyle(document.body, null).direction);
+  const [codeMirrorEditorDiv, setCodeMirrorEditorDiv] = useState(null);
+  useEffect(() => {
+    ;
+
+    (async () => {
+      const p = new Promise(resolve => {
+        const timerid = setInterval(() => {
+          // scoping querySelector to the container div makes sure we're targeting this CodeEditor
+          // The CodeMirror docs (https://codemirror.net/doc/manual.html#styling)
+          // say this is the element we use to set the editor's height
+          const editor = editorRef.current.querySelector('.CodeMirror');
+
+          if (editor) {
+            clearInterval(timerid);
+            setCodeMirrorEditorDiv(editor);
+            resolve();
+          }
+        }, 60);
+      });
+      await p;
+    })();
+  }, [editorRef]);
   useEffect(() => {
     setCode(beautify.html(props.code)); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -57,14 +79,12 @@ const RceHtmlEditor = /*#__PURE__*/React.forwardRef((_ref, editorRef) => {
     setDir(getComputedStyle(editorRef.current || document.body, null).direction);
   }, [dir, editorRef]);
   useEffect(() => {
-    // scoping querySelector to the container div makes sure we're targeting this CodeEditor
-    // The CodeMirror docs (https://codemirror.net/doc/manual.html#styling)
-    // say this is the element we use to set the editor's height
-    const editor = editorRef.current.querySelector('.CodeMirror');
-    editor.CodeMirror.setSize(null, props.height);
-    editor.style.margin = '0';
-    editor.style.border = '0';
-  }, [props.height, editorRef]);
+    if (codeMirrorEditorDiv) {
+      codeMirrorEditorDiv.CodeMirror.setSize(null, props.height);
+      codeMirrorEditorDiv.style.margin = '0';
+      codeMirrorEditorDiv.style.border = '0';
+    }
+  }, [codeMirrorEditorDiv, props.height]);
   const isFocused = useRef(false); // move cursor to the top of the html code when the editor is focused for the first time
 
   const handleFocus = useCallback((editor, event) => {

package/es/rce/plugins/instructure_links/components/Link.js

@@ -31,8 +31,6 @@ import { IconDragHandleLine, IconPublishSolid, IconUnpublishedSolid } from '@ins
 import RCEGlobals from '../../../RCEGlobals';
 import { getIcon } from '../../shared/linkUtils';
 export default function Link(props) {
-  var _RCEGlobals$getFeatur;
-
   const internalLink = { ...props.link
   };
   const [isHovering, setIsHovering] = useState(false);
@@ -43,14 +41,10 @@ export default function Link(props) {
     date_type
   } = props.link;
   const type = props.type === 'quizzes' && props.link.quiz_type === 'quizzes.next' ? 'quizzes.next' : props.type;
+  internalLink['data-course-type'] = type; // Only included published attr if it makes sense for the link type
 
-  if ((_RCEGlobals$getFeatur = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur !== void 0 && _RCEGlobals$getFeatur.rce_ux_improvements) {
-    internalLink['data-course-type'] = type; // Only included published attr if it makes sense for the link type
-
-    const publishable = !['navigation', 'announcements'].includes(type);
-    internalLink['data-published'] = publishable ? published : null;
-  }
-
+  const publishable = !['navigation', 'announcements'].includes(type);
+  internalLink['data-published'] = publishable ? published : null;
   const Icon = getIcon(type);
   const color = published ? 'success' : 'primary';
   let dateString = null;

package/es/rce/plugins/instructure_links/components/LinkSet.js

@@ -113,7 +113,7 @@ class LinkSet extends Component {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ScreenReaderContent, {
       id: this.describedByID
     }, formatMessage('Click to insert a link into the editor.')), /*#__PURE__*/React.createElement(List, {
-      variant: "unstyled",
+      isUnstyled: true,
       as: "ul",
       margin: "0"
     }, this.props.collection.links.map((link, index, array) => {
@@ -137,18 +137,14 @@ class LinkSet extends Component {
   }
 
   renderEmptyIndicator() {
-    var _RCEGlobals$getFeatur, _this$props$searchStr;
+    var _this$props$searchStr;
 
-    return (_RCEGlobals$getFeatur = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur !== void 0 && _RCEGlobals$getFeatur.improved_no_results_messaging ? /*#__PURE__*/React.createElement(NoResults, {
+    return /*#__PURE__*/React.createElement(NoResults, {
       contextType: this.props.contextType,
       contextId: this.props.contextId,
       collectionType: this.props.type,
       isSearchResult: ((_this$props$searchStr = this.props.searchString) === null || _this$props$searchStr === void 0 ? void 0 : _this$props$searchStr.length) >= 3
-    }) : /*#__PURE__*/React.createElement(View, {
-      as: "div",
-      role: "alert",
-      padding: "medium"
-    }, formatMessage('No results.'));
+    });
   }
 
   renderLoadingError() {

package/es/rce/plugins/instructure_links/components/NoResults.js

@@ -23,11 +23,7 @@ import { Flex } from '@instructure/ui-flex';
 import { Text } from '@instructure/ui-text';
 import { Link } from '@instructure/ui-link';
 import formatMessage from '../../../../format-message';
-import { getIcon } from '../../shared/linkUtils'; // Doing this to avoid TS2339 errors-- remove once we're on InstUI 8
-
-const {
-  Item: FlexItem
-} = Flex;
+import { getIcon } from '../../shared/linkUtils';
 export function buildUrl(contextType, contextId, collectionType) {
   var _typeMap$collectionTy;
 
@@ -72,15 +68,14 @@ export const NoResults = _ref => {
     justifyItems: "center",
     alignItems: "center",
     direction: "column"
-  }, /*#__PURE__*/React.createElement(FlexItem, null, /*#__PURE__*/React.createElement(Icon, {
+  }, /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(Icon, {
     size: "large",
     color: "secondary",
     padding: "large"
-  })), /*#__PURE__*/React.createElement(FlexItem, {
+  })), /*#__PURE__*/React.createElement(Flex.Item, {
     margin: "small 0 0"
-  }, /*#__PURE__*/React.createElement(Text, null, getMessage(collectionType, isSearchResult))), !isSearchResult && /*#__PURE__*/React.createElement(FlexItem, null, /*#__PURE__*/React.createElement(Link, {
-    href: buildUrl(contextType, contextId, collectionType) // @ts-expect-error
-    ,
+  }, /*#__PURE__*/React.createElement(Text, null, getMessage(collectionType, isSearchResult))), !isSearchResult && /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(Link, {
+    href: buildUrl(contextType, contextId, collectionType),
     target: "_blank"
   }, formatMessage('Add one!')))));
 };

package/es/rce/plugins/instructure_links/plugin.js

@@ -68,20 +68,14 @@ import bridge from '../../../bridge';
 import { getAnchorElement, isOKToLink } from '../../contentInsertionUtils';
 import LinkOptionsTrayController from './components/LinkOptionsTray/LinkOptionsTrayController';
 import { CREATE_LINK, EDIT_LINK } from './components/LinkOptionsDialog/LinkOptionsDialogController';
-import RCEGlobals from '../../RCEGlobals';
 import tinymce from 'tinymce';
 const trayController = new LinkOptionsTrayController();
 const COURSE_PLUGIN_KEY = 'course_links';
 const GROUP_PLUGIN_KEY = 'group_links';
 
 function getCommandName(selectedNode) {
-  var _RCEGlobals$getFeatur;
-
-  // show the Course Tray if it's a course link and the ux improvement flag is on,
-  // otherwise show the default Link Tray
-  const showCourseLinkTray = !!((_RCEGlobals$getFeatur = RCEGlobals.getFeatures()) !== null && _RCEGlobals$getFeatur !== void 0 && _RCEGlobals$getFeatur.rce_ux_improvements);
   const isCourseLink = selectedNode.getAttribute('data-course-type');
-  return showCourseLinkTray && isCourseLink ? 'instructureTrayForCourseLinks' : 'instructureTrayToEditLink';
+  return isCourseLink ? 'instructureTrayForCourseLinks' : 'instructureTrayToEditLink';
 }
 
 function selectedAnchorCount(ed) {

package/es/rce/plugins/instructure_rce_external_tools/components/ExternalToolDialog/ExternalToolDialog.js

@@ -31,7 +31,6 @@ import { ExternalToolDialogTray } from './ExternalToolDialogTray';
 import { ExternalToolDialogModal } from './ExternalToolDialogModal';
 import { showFlashAlert } from '../../../../../common/FlashAlert';
 import { parseUrlOrNull } from '../../../../../util/url-util';
-const FlexItem = Flex.Item;
 export default class ExternalToolDialog extends React.Component {
   constructor() {
     super(...arguments);
@@ -246,7 +245,7 @@ export default class ExternalToolDialog extends React.Component {
     }, formatMessage('The following content is partner provided'))), !state.iframeLoaded && /*#__PURE__*/React.createElement(Flex, {
       alignItems: "center",
       justifyItems: "center"
-    }, /*#__PURE__*/React.createElement(FlexItem, null, /*#__PURE__*/React.createElement(Spinner, {
+    }, /*#__PURE__*/React.createElement(Flex.Item, null, /*#__PURE__*/React.createElement(Spinner, {
       renderTitle: formatMessage('Loading External Tool'),
       size: "large",
       margin: "0 0 0 medium"