@instructure/canvas-rce 5.6.0-beta.0 → 5.6.1

package/lib/translated/en/modules/rce/plugins/shared/useDataUrl.js

@@ -22,6 +22,7 @@ import { useState, useEffect } from 'react'; // Given a URL to some resource (li
 const useDataUrl = () => {
   const [url, setUrl] = useState('');
   const [dataUrl, setDataUrl] = useState('');
+  const [dataBlob, setDataBlob] = useState(null);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState();
   useEffect(() => {
@@ -37,7 +38,10 @@ const useDataUrl = () => {
         return new Promise((resolve, reject) => {
           const reader = new FileReader();
 
-          reader.onloadend = () => resolve(reader.result);
+          reader.onloadend = () => resolve({
+            result: reader.result,
+            blob
+          });
 
           reader.onerror = reject;
           reader.readAsDataURL(blob);
@@ -47,9 +51,14 @@ const useDataUrl = () => {
       }
     }
 
-    if (!!url) {
-      fetchDataUrl().then(result => {
+    if (url) {
+      fetchDataUrl().then(_ref => {
+        let {
+          result,
+          blob
+        } = _ref;
         setDataUrl(result);
+        setDataBlob(blob);
       }).catch(e => {
         setError(e);
       }).finally(() => setLoading(false));
@@ -59,7 +68,8 @@ const useDataUrl = () => {
     setUrl,
     dataUrl,
     dataLoading: loading,
-    dataError: error
+    dataError: error,
+    dataBlob
   };
 };
 

package/lib/translated/en/modules/rce/userOS.js

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2022 - 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 const determineUserOS = () => {
+  const rawOS = navigator.userAgent;
+  if (rawOS.indexOf('Mac') !== -1) return 'Mac';else if (rawOS.indexOf('Win') !== -1) return 'Windows';else return 'Other';
+};
+export const determineOSDependentKey = () => {
+  switch (determineUserOS()) {
+    case 'Mac':
+      return 'OPTION';
+
+    case 'Windows':
+    default:
+      return 'ALT';
+  }
+};

package/lib/translated/en-AU-x-unimelb/modules/canvasFileBrowser/FlashAlert.js

@@ -49,10 +49,11 @@ import { Button } from '@instructure/ui-buttons';
 import { Text } from '@instructure/ui-text';
 import { PresentationContent, ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { Transition } from '@instructure/ui-motion';
+import RCEGlobals from '../rce/RCEGlobals';
 const messageHolderId = 'flashalert_message_holder'; // specs fail if I reuse jquery's elements
 
 const screenreaderMessageHolderId = 'flash_screenreader_holder';
-const timeout = 10000; // An Alert with a message and "Details" button which surfaces
+const TIMEOUT = 10000; // An Alert with a message and "Details" button which surfaces
 // more info about the error when pressed.
 // Is displayed at the top of the document, and will close itself after a while
 
@@ -187,7 +188,7 @@ FlashAlert.propTypes = {
 FlashAlert.defaultProps = {
   error: null,
   variant: 'info',
-  timeout,
+  timeout: TIMEOUT,
   screenReaderOnly: false
 };
 export function showFlashAlert(_ref) {
@@ -218,13 +219,15 @@ export function showFlashAlert(_ref) {
   }
 
   function renderAlert(parent) {
+    var _RCEGlobals$getConfig;
+
+    const configuredTimeout = (_RCEGlobals$getConfig = RCEGlobals.getConfig()) === null || _RCEGlobals$getConfig === void 0 ? void 0 : _RCEGlobals$getConfig.flashAlertTimeout;
     ReactDOM.render( /*#__PURE__*/React.createElement(FlashAlert, {
       message: message,
-      timeout: Number.isNaN(parseInt(ENV.flashAlertTimeout, 10)) ? timeout : ENV.flashAlertTimeout,
+      timeout: Number.isNaN(parseInt(configuredTimeout, 10)) ? TIMEOUT : configuredTimeout,
       error: err,
       variant: type,
-      onClose: closeAlert.bind(null, parent) // eslint-disable-line react/jsx-no-bind
-      ,
+      onClose: closeAlert.bind(null, parent),
       screenReaderOnly: srOnly
     }), parent);
   }

package/lib/translated/en-AU-x-unimelb/modules/common/components/LoadMore.js

@@ -68,7 +68,8 @@ class LoadMore extends Component {
     }, /*#__PURE__*/React.createElement(Button, {
       variant: "link",
       onClick: this.loadMore,
-      fluidWidth: true
+      display: "block",
+      textAlign: "start"
     }, "Load more results")), hasChildren && this.props.hasMore && /*#__PURE__*/React.createElement("div", {
       "aria-hidden": !this.props.isLoading,
       className: css(styles.loader),

package/lib/translated/en-AU-x-unimelb/modules/rce/KeyboardShortcutModal.js

@@ -24,7 +24,9 @@ import { Modal } from '@instructure/ui-modal';
 import { CloseButton } from '@instructure/ui-buttons';
 import { View } from '@instructure/ui-view';
 import formatMessage from '../format-message';
+import { determineOSDependentKey } from './userOS';
 export default function KeyboardShortcutModal(props) {
+  const OSKey = determineOSDependentKey();
   return /*#__PURE__*/React.createElement(Modal, {
     "data-testid": "RCE_KeyboardShortcutModal",
     "data-mce-component": true,
@@ -39,22 +41,23 @@ export default function KeyboardShortcutModal(props) {
   }, /*#__PURE__*/React.createElement(Modal.Header, null, /*#__PURE__*/React.createElement(CloseButton, {
     placement: "end",
     offset: "medium",
-    variant: "icon",
-    onClick: props.onDismiss
-  }, "Close"), /*#__PURE__*/React.createElement(Heading, null, "Keyboard Shortcuts")), /*#__PURE__*/React.createElement(Modal.Body, null, /*#__PURE__*/React.createElement(View, {
+    color: "primary",
+    onClick: props.onDismiss,
+    screenReaderLabel: "Close"
+  }), /*#__PURE__*/React.createElement(Heading, null, "Keyboard Shortcuts")), /*#__PURE__*/React.createElement(Modal.Body, null, /*#__PURE__*/React.createElement(View, {
     as: "div",
     margin: "small"
   }, /*#__PURE__*/React.createElement(List, {
-    variant: "unstyled"
+    isUnstyled: true
   }, /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
     weight: "bold"
-  }, "ALT+F8/ALT+0"), ' ', "Open this keyboard shortcuts dialog"), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
+  }, OSKey, "+F8/", OSKey, "+0"), ' ', "Open this keyboard shortcuts dialog"), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
     weight: "bold"
   }, "CTRL+F9"), " ", "Focus element options toolbar"), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
     weight: "bold"
-  }, "ALT+F9"), " ", "Go to the editor's menubar"), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
+  }, OSKey, "+F9"), " ", "Go to the editor's menubar"), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
     weight: "bold"
-  }, "ALT+F10"), " ", "Go to the editor's toolbar"), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
+  }, OSKey, "+F10"), " ", "Go to the editor's toolbar"), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
     weight: "bold"
   }, "ESC"), ' ', "Close a menu or dialogue. Also returns you to the editor area"), /*#__PURE__*/React.createElement(List.Item, null, /*#__PURE__*/React.createElement(Text, {
     weight: "bold"

package/lib/translated/en-AU-x-unimelb/modules/rce/RCE.js

@@ -26,7 +26,6 @@ import editorLanguage from './editorLanguage';
 import normalizeLocale from './normalizeLocale';
 import wrapInitCb from './wrapInitCb';
 import tinyRCE from './tinyRCE';
-import defaultTinymceConfig from '../defaultTinymceConfig';
 import getTranslations from '../getTranslations';
 import '@instructure/canvas-theme';
 
@@ -59,6 +58,7 @@ const RCE = /*#__PURE__*/forwardRef(function RCE(props, rceRef) {
     textareaClassName,
     rcsProps,
     use_rce_icon_maker,
+    features,
     onFocus,
     onBlur,
     onInit,
@@ -97,11 +97,12 @@ const RCE = /*#__PURE__*/forwardRef(function RCE(props, rceRef) {
       textareaClassName,
       trayProps: rcsProps,
       use_rce_icon_maker,
-      editorOptions: Object.assign(editorOptions, {
-        selector: `#${textareaId}`,
+      features,
+      editorOptions: { ...editorOptions,
+        selector: editorOptions.selector || `#${textareaId}`,
         height,
         language: editorLanguage(props.language)
-      })
+      }
     };
     wrapInitCb(mirroredAttrs, iProps.editorOptions);
     return iProps;
@@ -186,6 +187,12 @@ RCE.propTypes = {
   rcsProps: trayPropTypes,
   // enable the custom icon maker feature (temporary until the feature is forced on)
   use_rce_icon_maker: bool,
+  // record of feature statuses from containing page
+  features: objectOf(bool),
+  // configurable default timeout value for flash alerts
+  flashAlertTimeout: number,
+  // user's timezone
+  timezone: string,
   // event handlers
   onFocus: func,
   // f(RCEWrapper component)
@@ -202,8 +209,7 @@ RCE.defaultProps = {
     maxAge: 3600000
   },
   defaultContent: '',
-  editorOptions: { ...defaultTinymceConfig
-  },
+  editorOptions: {},
   renderKBShortcutModal: true,
   highContrastCSS: [],
   instRecordDisabled: false,

package/lib/translated/en-AU-x-unimelb/modules/rce/RCEGlobals.js

@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2022 - 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/>.
+ */
+const isEmpty = obj => Object.keys(obj).length === 0;
+
+class RCEGlobals {
+  constructor() {
+    if (!RCEGlobals.instance) {
+      RCEGlobals.instance = this;
+      this._data = {
+        features: {},
+        config: {}
+      };
+    }
+
+    return RCEGlobals.instance;
+  }
+
+  getFeatures() {
+    return this._data.features;
+  }
+
+  setFeatures(features) {
+    // Set only once
+    if (isEmpty(this._data.features)) {
+      this._data.features = { ...features
+      };
+      Object.freeze(this._data.features);
+    }
+  }
+
+  getConfig() {
+    return this._data.config;
+  }
+
+  setConfig(config) {
+    // Set only once
+    if (isEmpty(this._data.config)) {
+      this._data.config = { ...config
+      };
+      Object.freeze(this._data.config);
+    }
+  }
+
+}
+
+const instance = new RCEGlobals();
+export default instance;

package/lib/translated/en-AU-x-unimelb/modules/rce/RCEWrapper.js

@@ -1,4 +1,4 @@
-var _dec, _class, _class2;
+var _dec, _class, _class2, _Intl, _Intl$DateTimeFormat, _Intl$DateTimeFormat$;
 
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 
@@ -37,6 +37,8 @@ import editorLanguage from './editorLanguage';
 import normalizeLocale from './normalizeLocale';
 import { sanitizePlugins } from './sanitizePlugins';
 import { getCanvasUrl } from './getCanvasUrl';
+import RCEGlobals from './RCEGlobals';
+import defaultTinymceConfig from '../defaultTinymceConfig';
 import indicate from '../common/indicate';
 import bridge from '../bridge';
 import CanvasContentTray, { trayPropTypes } from './plugins/shared/CanvasContentTray';
@@ -3658,7 +3660,7 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
       // document. We need this so that click events get captured properly by instui
       // focus-trapping components, so they properly ignore trapping focus on click.
 
-      editor.on('click', () => window.top.document.body.click(), true);
+      editor.on('click', () => window.document.body.click(), true);
       editor.on('Cut Paste Change input Undo Redo', debounce(this.handleInputChange, 1000));
       this.announceContextToolbars(editor);
 
@@ -3681,27 +3683,24 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
     };
 
     this._toggleFullscreen = event => {
+      const isTinyFullscreen = event.state;
+      const fullscreenState = {
+        isTinyFullscreen
+      };
       const header = document.getElementById('header');
 
       if (header) {
-        if (event.state) {
-          this.setState({
-            fullscreenState: {
-              headerDisp: header.style.display,
-              isTinyFullscreen: true
-            }
-          });
+        if (isTinyFullscreen) {
+          fullscreenState.headerDisp = header.style.display;
           header.style.display = 'none';
         } else {
           header.style.display = this.state.fullscreenState.headerDisp;
-          this.setState({
-            fullscreenState: {
-              isTinyFullscreen: false
-            }
-          });
         }
-      } // if we're leaving fullscreen, remove event listeners on the fullscreen element
+      }
 
+      this.setState({
+        fullscreenState
+      }); // if we're leaving fullscreen, remove event listeners on the fullscreen element
 
       if (!document[FS_ELEMENT] && this.state.fullscreenElem) {
         this.state.fullscreenElem.removeEventListener('fullscreenchange', this._toggleFullscreen);
@@ -3995,6 +3994,11 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
       alertIdValue = 0;
     };
 
+    // Set up some limited global state that can be referenced
+    // as needed in RCE's components and function / plugin definitions
+    // Not intended to be dynamically changed!
+    RCEGlobals.setFeatures(this.getRequiredFeatureStatuses());
+    RCEGlobals.setConfig(this.getRequiredConfigValues());
     this.editor = null; // my tinymce editor instance
 
     this.language = normalizeLocale(this.props.language); // interface consistent with editorBox
@@ -4051,6 +4055,27 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
     });
   }
 
+  getRequiredFeatureStatuses() {
+    const {
+      new_equation_editor = false,
+      new_math_equation_handling = false,
+      rce_ux_improvements = false
+    } = this.props.features;
+    return {
+      new_equation_editor,
+      new_math_equation_handling,
+      rce_ux_improvements
+    };
+  }
+
+  getRequiredConfigValues() {
+    return {
+      locale: normalizeLocale(this.props.language),
+      flashAlertTimeout: this.props.flashAlertTimeout,
+      timezone: this.props.timezone
+    };
+  }
+
   getCanvasUrl() {
     if (!this.canvasUrl) this.canvasUrl = getCanvasUrl(this.props.trayProps);
     return this.canvasUrl.then(url => {
@@ -4693,7 +4718,8 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
     }
 
     const possibleNewMenubarItems = this.props.editorOptions.menu ? Object.keys(this.props.editorOptions.menu).join(' ') : undefined;
-    const wrappedOpts = { ...options,
+    const wrappedOpts = { ...defaultTinymceConfig,
+      ...options,
       readonly: this.props.readOnly,
       theme: 'silver',
       // some older code specified 'modern', which doesn't exist any more
@@ -4973,7 +4999,6 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
       return /*#__PURE__*/React.createElement("div", {
         ref: this._editorPlaceholderRef,
         style: {
-          width: `${this.props.editorOptions.width}px`,
           height: `${this.props.editorOptions.height}px`,
           border: '1px solid grey'
         }
@@ -5086,7 +5111,10 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
   instRecordDisabled: PropTypes.bool,
   highContrastCSS: PropTypes.arrayOf(PropTypes.string),
   maxInitRenderedRCEs: PropTypes.number,
-  use_rce_icon_maker: PropTypes.bool
+  use_rce_icon_maker: PropTypes.bool,
+  features: PropTypes.objectOf(PropTypes.bool),
+  flashAlertTimeout: PropTypes.number,
+  timezone: PropTypes.string
 }, _class2.defaultProps = {
   trayProps: null,
   languages: [{
@@ -5098,7 +5126,9 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
   },
   highContrastCSS: [],
   ltiTools: [],
-  maxInitRenderedRCEs: -1
+  maxInitRenderedRCEs: -1,
+  features: {},
+  timezone: (_Intl = Intl) === null || _Intl === void 0 ? void 0 : (_Intl$DateTimeFormat = _Intl.DateTimeFormat()) === null || _Intl$DateTimeFormat === void 0 ? void 0 : (_Intl$DateTimeFormat$ = _Intl$DateTimeFormat.resolvedOptions()) === null || _Intl$DateTimeFormat$ === void 0 ? void 0 : _Intl$DateTimeFormat$.timeZone
 }, _class2.skinCssInjected = false, _class2)) || _class); // standard: string of tinymce menu commands
 // e.g. 'instructure_links | inserttable instructure_media_embed | hr'
 // custom: a string of tinymce menu commands

package/lib/translated/en-AU-x-unimelb/modules/rce/RestoreAutoSaveModal.js

@@ -41,9 +41,10 @@ export default function RestoreAutoSaveModal(props) {
   }, /*#__PURE__*/React.createElement(Modal.Header, null, /*#__PURE__*/React.createElement(CloseButton, {
     placement: "end",
     offset: "medium",
-    variant: "icon",
-    onClick: props.onNo
-  }, "Close"), /*#__PURE__*/React.createElement(Heading, null, "Found auto-saved content")), /*#__PURE__*/React.createElement(Modal.Body, null, /*#__PURE__*/React.createElement(View, {
+    color: "primary",
+    onClick: props.onNo,
+    screenReaderLabel: "Close"
+  }), /*#__PURE__*/React.createElement(Heading, null, "Found auto-saved content")), /*#__PURE__*/React.createElement(Modal.Body, null, /*#__PURE__*/React.createElement(View, {
     as: "div",
     margin: "small"
   }, /*#__PURE__*/React.createElement(Alert, {

package/lib/translated/en-AU-x-unimelb/modules/rce/__tests__/RCEGlobals.test.js

@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2022 - 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 RCEGlobals from '../RCEGlobals';
+describe('RCEGlobals', () => {
+  describe('features', () => {
+    const initialFeatures = {
+      new_equation_editor: true,
+      new_math_equation_handling: true
+    };
+    const otherFeatures = {
+      some_other_feature: true
+    };
+    beforeAll(() => {
+      RCEGlobals.setFeatures(initialFeatures);
+      RCEGlobals.setFeatures(otherFeatures);
+    });
+    it('sets the global features exactly once', () => {
+      expect(RCEGlobals._data.features).toEqual(initialFeatures);
+    });
+    it('returns the features', () => {
+      expect(RCEGlobals.getFeatures()).toMatchObject(initialFeatures);
+    });
+    it('does not allow modfication of features directly', () => {
+      expect(() => {
+        RCEGlobals._data.features.another_feature = false;
+      }).toThrow(/object is not extensible/);
+    });
+  });
+  describe('config', () => {
+    const initialConfig = {
+      locale: 'en',
+      timezone: 'America/Denver'
+    };
+    const otherConfig = {
+      somethingElse: true
+    };
+    beforeAll(() => {
+      RCEGlobals.setConfig(initialConfig);
+      RCEGlobals.setConfig(otherConfig);
+    });
+    it('sets the global config exactly once', () => {
+      expect(RCEGlobals._data.config).toEqual(initialConfig);
+    });
+    it('returns the config', () => {
+      expect(RCEGlobals.getConfig()).toMatchObject(initialConfig);
+    });
+    it('does not allow modfication of config directly', () => {
+      expect(() => {
+        RCEGlobals._data.config.more_config = 'abcdefg';
+      }).toThrow(/object is not extensible/);
+    });
+  });
+});

package/lib/translated/en-AU-x-unimelb/modules/rce/__tests__/contentInsertion.test.js

@@ -179,6 +179,12 @@ describe('contentInsertion', () => {
       contentInsertion.insertLink(editor, link);
       expect(editor.content).toEqual('<a class="instructure_file_link foo" data-canvas-previewable="true" href="/some/path" title="Here Be Links">Click On Me</a>');
     });
+    it('includes attributes for course link when supplied', () => {
+      link['data-published'] = true;
+      link['data-course-type'] = 'wikiPages';
+      contentInsertion.insertLink(editor, link);
+      expect(editor.content).toEqual('<a data-course-type="wikiPages" data-published="true" href="/some/path" title="Here Be Links">Click On Me</a>');
+    });
     it('respects the current selection building the link by delegating to tinymce', () => {
       editor.selection.setContent('link me');
       contentInsertion.insertLink(editor, link);

package/lib/translated/en-AU-x-unimelb/modules/rce/__tests__/userOS.test.js

@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2022 - 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 { determineUserOS, determineOSDependentKey } from '../userOS';
+var UserAgent;
+
+(function (UserAgent) {
+  UserAgent["MAC"] = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:103.0) Gecko/20100101 Firefox/103.0";
+  UserAgent["WINDOWS"] = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/104.0.0.0 Safari/537.36";
+  UserAgent["LINUX"] = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.114 Safari/537.36";
+})(UserAgent || (UserAgent = {}));
+
+describe('userOS', () => {
+  let userAgentSpy;
+  beforeAll(() => {
+    userAgentSpy = jest.spyOn(window.navigator, 'userAgent', 'get');
+  });
+  afterAll(() => {
+    jest.restoreAllMocks();
+  });
+  describe('when the user is running a Mac OS', () => {
+    beforeEach(() => {
+      userAgentSpy.mockReturnValue(UserAgent.MAC);
+    });
+    it('determineUserOS returns Mac', () => {
+      expect(determineUserOS()).toEqual('Mac');
+    });
+    it('determineOSDependentKey returns the correct value', () => {
+      expect(determineOSDependentKey()).toEqual('OPTION');
+    });
+  });
+  describe('when the user is running a Windows OS', () => {
+    beforeEach(() => {
+      userAgentSpy.mockReturnValue(UserAgent.WINDOWS);
+    });
+    it('determineUserOS returns Windows', () => {
+      expect(determineUserOS()).toEqual('Windows');
+    });
+    it('determineOSDependentKey returns the correct value', () => {
+      expect(determineOSDependentKey()).toEqual('ALT');
+    });
+  });
+  describe('when the user is running something other than Mac or Windows', () => {
+    beforeEach(() => {
+      userAgentSpy.mockReturnValue(UserAgent.LINUX);
+    });
+    it('determineUserOS returns Other', () => {
+      expect(determineUserOS()).toEqual('Other');
+    });
+    it('determineOSDependentKey returns the correct value', () => {
+      expect(determineOSDependentKey()).toEqual('ALT');
+    });
+  });
+});

package/lib/translated/en-AU-x-unimelb/modules/rce/contentInsertion.js

@@ -211,7 +211,9 @@ function insertUndecoratedLink(editor, linkProps) {
     target: linkProps.target,
     class: linkProps.class,
     title: linkProps.title,
-    'data-canvas-previewable': linkProps['data-canvas-previewable']
+    'data-canvas-previewable': linkProps['data-canvas-previewable'],
+    'data-course-type': linkProps['data-course-type'],
+    'data-published': linkProps['data-published']
   };
 
   if (linkAttrs.target === '_blank') {

package/lib/translated/en-AU-x-unimelb/modules/rce/initA11yChecker.js

@@ -15,9 +15,6 @@
  * 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/>.
  */
-//
-// TODO: remove dependency on ENV.url_for_high_contrast
-//
 import { setLocale } from 'tinymce-a11y-checker';
 export default function initA11yChecker(locale) {
   if (locale) {