@instructure/canvas-rce 5.6.0 → 5.6.1

package/lib/translated/ar/modules/rce/plugins/shared/ContentSelection.js

@@ -69,6 +69,9 @@ export function asLink($element, editor) {
     displayAs = DISPLAY_AS_EMBED_DISABLED;
   }
 
+  const contentType = $link.getAttribute('data-course-type');
+  const fileName = $link.getAttribute('title');
+  const published = $link.getAttribute('data-published') === 'true';
   const isPreviewable = $link.hasAttribute('data-canvas-previewable') || $link.classList.contains('instructure_scribd_file'); // needed to cover docs linked while there was a bug didn't add the data attr.
 
   return {
@@ -78,7 +81,10 @@ export function asLink($element, editor) {
     onlyTextSelected: isOnlyTextSelected(editor.selection.getContent()),
     type,
     isPreviewable,
-    url: $link.href
+    url: $link.href,
+    contentType,
+    fileName,
+    published
   };
 } // the video element is a bit tricky.
 // tinymce won't let me add many attributes to the iframe,

package/lib/translated/ar/modules/rce/plugins/shared/DimensionsInput/index.js

@@ -106,7 +106,7 @@ export default function DimensionsInput(props) {
   })), /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "x-small small"
   }, "%")) : /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Flex.Item, {
-    shrink: true
+    shouldShrink: true
   }, /*#__PURE__*/React.createElement(DimensionInput, {
     dimensionState: dimensionsState.widthState,
     label: "\u0627\u0644\u0639\u0631\u0636",
@@ -114,7 +114,7 @@ export default function DimensionsInput(props) {
   })), /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "x-small small"
   }, /*#__PURE__*/React.createElement(IconLockLine, null)), /*#__PURE__*/React.createElement(Flex.Item, {
-    shrink: true
+    shouldShrink: true
   }, /*#__PURE__*/React.createElement(DimensionInput, {
     dimensionState: dimensionsState.heightState,
     label: "\u0627\u0644\u0627\u0631\u062A\u0641\u0627\u0639",

package/lib/translated/ar/modules/rce/plugins/shared/Filter.js

@@ -200,14 +200,15 @@ export default function Filter(props) {
   const searchMessage = "\u0623\u062F\u062E\u0644 3 \u0623\u062D\u0631\u0641 \u0639\u0644\u0649 \u0627\u0644\u0623\u0642\u0644 \u0644\u0644\u0628\u062D\u062B";
   const loadingMessage = "\u062C\u0627\u0631\u064D \u0627\u0644\u062A\u062D\u0645\u064A\u0644\u060C \u064A\u0631\u062C\u0649 \u0627\u0644\u0627\u0646\u062A\u0638\u0627\u0631";
   const msg = isContentLoading ? loadingMessage : searchMessage;
+  const isEdit = contentSubtype === 'edit';
   return /*#__PURE__*/React.createElement(View, {
     display: "block",
     direction: "column"
-  }, renderType(contentType, contentSubtype, onChange, userContextType, containingContextType), contentType !== 'links' && /*#__PURE__*/React.createElement(Flex, {
+  }, !isEdit && renderType(contentType, contentSubtype, onChange, userContextType, containingContextType), contentType !== 'links' && /*#__PURE__*/React.createElement(Flex, {
     margin: "small none none none"
   }, /*#__PURE__*/React.createElement(Flex.Item, {
-    grow: true,
-    shrink: true,
+    shouldGrow: true,
+    shouldShrink: true,
     margin: "none xx-small none none"
   }, /*#__PURE__*/React.createElement(SimpleSelect, {
     renderLabel: /*#__PURE__*/React.createElement(ScreenReaderContent, null, "\u0627\u0644\u0646\u0648\u0639 \u0627\u0644\u0641\u0631\u0639\u064A \u0644\u0644\u0645\u062D\u062A\u0648\u0649"),
@@ -249,8 +250,8 @@ export default function Filter(props) {
     id: "all",
     value: "all"
   }, "\u0627\u0644\u0643\u0644"))), contentSubtype !== 'all' && /*#__PURE__*/React.createElement(Flex.Item, {
-    grow: true,
-    shrink: true,
+    shouldGrow: true,
+    shouldShrink: true,
     margin: "none none none xx-small"
   }, /*#__PURE__*/React.createElement(SimpleSelect, {
     renderLabel: /*#__PURE__*/React.createElement(ScreenReaderContent, null, "\u0627\u0644\u0641\u0632\u0631 \u062D\u0633\u0628"),

package/lib/translated/ar/modules/rce/plugins/shared/LinkDisplay.js

@@ -0,0 +1,82 @@
+/*
+ * 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 React, { useEffect } from 'react';
+import { View } from '@instructure/ui-view';
+import { Text } from '@instructure/ui-text';
+import { Flex } from '@instructure/ui-flex';
+import { TextInput } from '@instructure/ui-text-input';
+import formatMessage from '../../../format-message';
+import { showFlashAlert } from '../../../canvasFileBrowser/FlashAlert';
+const EDIT_MESSAGE = "If left empty link, text will display as course link name";
+export const LinkDisplay = _ref => {
+  let {
+    linkText,
+    Icon,
+    placeholderText,
+    linkFileName,
+    published,
+    handleTextChange
+  } = _ref;
+  useEffect(() => {
+    showFlashAlert({
+      message: "Selected " + linkFileName,
+      type: 'info',
+      srOnly: true
+    });
+  }, [linkFileName]);
+  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, {
+    renderLabel: () => "Text (optional)",
+    onChange: (e, value) => handleTextChange(value),
+    value: linkText,
+    placeholder: placeholderText,
+    messages: [{
+      type: 'hint',
+      text: EDIT_MESSAGE
+    }]
+  })))), /*#__PURE__*/React.createElement(View, {
+    as: "div",
+    margin: "medium none medium none"
+  }, /*#__PURE__*/React.createElement(Flex, {
+    margin: "small none small none"
+  }, /*#__PURE__*/React.createElement(Text, {
+    weight: "bold"
+  }, "Current Link")), /*#__PURE__*/React.createElement(Flex, {
+    margin: "small none none none"
+  }, /*#__PURE__*/React.createElement(Flex.Item, {
+    padding: "0 x-small 0 small"
+  }, /*#__PURE__*/React.createElement(Text, {
+    "data-testid": "icon-wrapper",
+    color: published ? 'success' : 'primary'
+  }, /*#__PURE__*/React.createElement(Icon, {
+    size: "x-small"
+  }))), /*#__PURE__*/React.createElement(Flex.Item, {
+    padding: "0 x-small 0 0",
+    grow: true,
+    shrink: true,
+    textAlign: "start"
+  }, /*#__PURE__*/React.createElement(View, {
+    as: "div"
+  }, /*#__PURE__*/React.createElement("span", {
+    "data-testid": "selected-link-name"
+  }, linkFileName))))));
+};

package/lib/translated/ar/modules/rce/plugins/shared/Upload/ComputerPanel.js

@@ -243,12 +243,10 @@ export default function ComputerPanel(_ref) {
         });
       },
       renderIcon: IconTrashLine,
-      withBackground: false,
-      withBorder: false,
       screenReaderLabel: "\u0645\u0633\u062D \u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0645\u062D\u062F\u062F: " + filename
     })), /*#__PURE__*/React.createElement(Flex.Item, {
-      grow: true,
-      shrink: true
+      shouldGrow: true,
+      shouldShrink: true
     }, /*#__PURE__*/React.createElement(PresentationContent, null, /*#__PURE__*/React.createElement(Text, null, filename)))), /*#__PURE__*/React.createElement(View, {
       as: "div",
       width: `${width}px`,

package/lib/translated/ar/modules/rce/plugins/shared/Upload/UnsplashPanel.js

@@ -143,7 +143,7 @@ function Attribution(_ref) {
     "data-fs-exclude": true
   })), /*#__PURE__*/React.createElement(Flex.Item, {
     margin: "xx-small",
-    shrink: true
+    shouldShrink: true
   }, /*#__PURE__*/React.createElement(Button, {
     size: "small",
     variant: "link-inverse",

package/lib/translated/ar/modules/rce/plugins/shared/__tests__/CanvasContentTray.test.js

@@ -16,14 +16,28 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 import React from 'react';
-import { act, render, waitFor, waitForElementToBeRemoved } from '@testing-library/react';
-import Bridge from '../../../../bridge/Bridge';
+import { act, render, waitFor, waitForElementToBeRemoved, fireEvent } from '@testing-library/react';
+import bridge from '../../../../bridge';
 import * as fakeSource from '../../../../rcs/fake';
 import CanvasContentTray from '../CanvasContentTray';
 jest.useFakeTimers();
 jest.mock('../../../../canvasFileBrowser/FileBrowser', () => {
   return jest.fn(() => 'Files Browser');
 });
+jest.mock('../ContentSelection', () => ({
+  getLinkContentFromEditor: jest.fn().mockReturnValue({
+    fileName: 'some filename',
+    contentType: 'wikiPages',
+    url: '/pages',
+    published: true,
+    text: 'some text'
+  })
+}));
+jest.mock('../../../../bridge', () => {
+  const original = jest.requireActual('../../../../bridge');
+  original.default.insertLink = jest.fn();
+  return original;
+});
 describe('RCE Plugins > CanvasContentTray', () => {
   let component;
   let props;
@@ -34,7 +48,7 @@ describe('RCE Plugins > CanvasContentTray', () => {
   function getProps() {
     let override = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     props = {
-      bridge: new Bridge(),
+      bridge,
       editor,
       containingContext: {
         contextType: 'course',
@@ -79,6 +93,37 @@ describe('RCE Plugins > CanvasContentTray', () => {
     return getTray().getAttribute('aria-label');
   }
 
+  describe('Edit Course Links Tray', () => {
+    beforeEach(async () => {
+      renderComponent();
+      await showTrayForPlugin('course_link_edit');
+    });
+    it('is labeled with "Edit Course Link"', async () => {
+      await waitFor(() => {
+        const header = getTray().querySelector('[data-cid="Heading"]').textContent;
+        expect(header).toEqual('Edit Course Link');
+      });
+    });
+    it('renders the LinkDisplay Component', async () => {
+      await waitFor(() => {
+        expect(component.getByTestId('LinkDisplay')).toBeInTheDocument();
+      });
+    });
+    it('replaces the old link when the Replace button is clicked', async () => {
+      const button = await component.findByTestId('replace-link-button');
+      fireEvent.click(button);
+      await waitFor(() => {
+        expect(bridge.insertLink).toHaveBeenCalledWith({
+          forceRename: true,
+          href: '/pages',
+          text: 'some text',
+          title: 'some filename',
+          type: 'wikiPages',
+          published: true
+        });
+      });
+    });
+  });
   describe('Tray Label in course context', () => {
     beforeEach(() => {
       renderComponent();

package/lib/translated/ar/modules/rce/plugins/shared/__tests__/ContentSelection.test.js

@@ -95,6 +95,18 @@ describe('RCE > Plugins > Shared > Content Selection', () => {
         $element.classList.add('no_preview');
         expect(getContentFromElement($element, editor).displayAs).toEqual(DISPLAY_AS_DOWNLOAD_LINK);
       });
+      it('includes the content type if the link contains the data course type', () => {
+        $element.setAttribute('data-course-type', 'wikiPages');
+        expect(getContentFromElement($element, editor).contentType).toEqual('wikiPages');
+      });
+      it('includes the filename if the link contains the title', () => {
+        $element.title = 'Assignment 1';
+        expect(getContentFromElement($element, editor).fileName).toEqual('Assignment 1');
+      });
+      it('includes published if the link contains data-published', () => {
+        $element.setAttribute('data-published', true);
+        expect(getContentFromElement($element, editor).published).toEqual(true);
+      });
     });
     describe('when the given element is a video container element', () => {
       beforeEach(() => {

package/lib/translated/ar/modules/rce/plugins/shared/__tests__/Filter.test.js

@@ -192,6 +192,13 @@ describe('RCE Plugins > Filter', () => {
       expect(component.getByText('User Files')).toBeInTheDocument();
       expect(component.queryByText('Course Files')).toBeNull();
     });
+    it('does not render Content Type when in Edit Course Link Tray', () => {
+      renderComponent({
+        contentSubtype: 'edit'
+      });
+      const contentTypeField = component.queryByLabelText('Content Type');
+      expect(contentTypeField).not.toBeInTheDocument();
+    });
   });
   describe('"Content Subtype" field', () => {
     beforeEach(() => {

package/lib/translated/ar/modules/rce/plugins/shared/__tests__/LinkDisplay.test.js

@@ -0,0 +1,119 @@
+/*
+ * 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 React from 'react';
+import { LinkDisplay } from '../LinkDisplay';
+import { render, fireEvent } from '@testing-library/react';
+import { IconBlank } from '../linkUtils';
+import { showFlashAlert } from '../../../../canvasFileBrowser/FlashAlert';
+jest.mock('../../../../canvasFileBrowser/FlashAlert');
+describe('LinkDisplay', () => {
+  let props;
+  beforeEach(() => {
+    props = {
+      linkText: 'default text',
+      linkFileName: 'default link filename',
+      Icon: IconBlank,
+      placeholderText: 'default placeholder',
+      published: true,
+      handleTextChange: jest.fn()
+    };
+  });
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+  afterAll(() => {
+    jest.resetAllMocks();
+  });
+
+  const renderComponent = overrideProps => {
+    return render( /*#__PURE__*/React.createElement(LinkDisplay, Object.assign({}, props, overrideProps)));
+  };
+
+  it('text input displays link text prop', () => {
+    const {
+      getByLabelText
+    } = renderComponent();
+    const textInput = getByLabelText(/text \(optional\)/i);
+    expect(textInput.value).toEqual('default text');
+  });
+  it('component displays the icon passed in as a prop', () => {
+    const {
+      container
+    } = renderComponent();
+    const icon = container.querySelector('svg[name="IconBlank"]');
+    expect(icon).toBeInTheDocument();
+  });
+  it('placeholder text matches the prop', () => {
+    const {
+      getByLabelText
+    } = renderComponent();
+    const textInput = getByLabelText(/text \(optional\)/i);
+    expect(textInput.placeholder).toEqual('default placeholder');
+  });
+  it('link file name inside the component matches the prop', () => {
+    const {
+      getByTestId
+    } = renderComponent();
+    const linkName = getByTestId('selected-link-name');
+    expect(linkName.innerHTML).toEqual('default link filename');
+  });
+  it('icon color is success when published', () => {
+    const {
+      getByTestId
+    } = renderComponent();
+    const iconWrapper = getByTestId('icon-wrapper');
+    expect(iconWrapper).toHaveAttribute('color', 'success');
+  });
+  it('icon color is primary when not published', () => {
+    const {
+      getByTestId
+    } = renderComponent({
+      published: false
+    });
+    const iconWrapper = getByTestId('icon-wrapper');
+    expect(iconWrapper).toHaveAttribute('color', 'primary');
+  });
+  it('handletextchange prop is called when user types in textinput', () => {
+    const callback = jest.fn();
+    const {
+      getByLabelText
+    } = renderComponent({
+      handleTextChange: callback
+    });
+    const textInput = getByLabelText(/text \(optional\)/i);
+    fireEvent.input(textInput, {
+      target: {
+        value: 'something'
+      }
+    });
+    expect(callback).toHaveBeenCalledWith('something');
+  });
+  it('announces selection changes', () => {
+    const {
+      rerender
+    } = renderComponent();
+    rerender( /*#__PURE__*/React.createElement(LinkDisplay, Object.assign({}, props, {
+      linkFileName: "Course Link 2"
+    })));
+    expect(showFlashAlert).toHaveBeenLastCalledWith({
+      message: 'Selected Course Link 2',
+      srOnly: true,
+      type: 'info'
+    });
+  });
+});

package/lib/translated/ca/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';
 
@@ -99,11 +98,11 @@ const RCE = /*#__PURE__*/forwardRef(function RCE(props, rceRef) {
       trayProps: rcsProps,
       use_rce_icon_maker,
       features,
-      editorOptions: Object.assign(editorOptions, {
-        selector: `#${textareaId}`,
+      editorOptions: { ...editorOptions,
+        selector: editorOptions.selector || `#${textareaId}`,
         height,
         language: editorLanguage(props.language)
-      })
+      }
     };
     wrapInitCb(mirroredAttrs, iProps.editorOptions);
     return iProps;
@@ -193,7 +192,7 @@ RCE.propTypes = {
   // configurable default timeout value for flash alerts
   flashAlertTimeout: number,
   // user's timezone
-  timezone: string.isRequired,
+  timezone: string,
   // event handlers
   onFocus: func,
   // f(RCEWrapper component)
@@ -210,8 +209,7 @@ RCE.defaultProps = {
     maxAge: 3600000
   },
   defaultContent: '',
-  editorOptions: { ...defaultTinymceConfig
-  },
+  editorOptions: {},
   renderKBShortcutModal: true,
   highContrastCSS: [],
   instRecordDisabled: false,

package/lib/translated/ca/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";
 
@@ -38,6 +38,7 @@ 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';
@@ -4056,9 +4057,9 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
 
   getRequiredFeatureStatuses() {
     const {
-      new_equation_editor,
-      new_math_equation_handling,
-      rce_ux_improvements
+      new_equation_editor = false,
+      new_math_equation_handling = false,
+      rce_ux_improvements = false
     } = this.props.features;
     return {
       new_equation_editor,
@@ -4717,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
@@ -4997,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'
         }
@@ -5113,7 +5114,7 @@ let RCEWrapper = (_dec = themeable(theme, styles), _dec(_class = (_class2 = clas
   use_rce_icon_maker: PropTypes.bool,
   features: PropTypes.objectOf(PropTypes.bool),
   flashAlertTimeout: PropTypes.number,
-  timezone: PropTypes.string.isRequired
+  timezone: PropTypes.string
 }, _class2.defaultProps = {
   trayProps: null,
   languages: [{
@@ -5125,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/ca/modules/rce/__tests__/RCE.test.js

@@ -19,14 +19,6 @@ import React, { createRef } from 'react';
 import { render, waitFor } from '@testing-library/react';
 import RCE from '../RCE';
 import bridge from '../../bridge';
-const requiredProps = {
-  features: {
-    new_equation_editor: true,
-    new_math_equation_handling: true,
-    rce_ux_improvements: true
-  },
-  timezone: 'America/Denver'
-};
 describe('RCE', () => {
   let target;
   beforeEach(() => {
@@ -41,18 +33,18 @@ describe('RCE', () => {
     bridge.focusEditor(null);
   });
   it('bridges newly rendered editors', async () => {
-    render( /*#__PURE__*/React.createElement(RCE, Object.assign({
+    render( /*#__PURE__*/React.createElement(RCE, {
       textareaId: "textarea3"
-    }, requiredProps)), target);
+    }), target);
     await waitFor(() => expect(bridge.activeEditor().constructor.displayName).toEqual('RCEWrapper'));
   });
   it('supports getCode() and setCode() on its ref', async () => {
     const rceRef = /*#__PURE__*/createRef(null);
-    render( /*#__PURE__*/React.createElement(RCE, Object.assign({
+    render( /*#__PURE__*/React.createElement(RCE, {
       ref: rceRef,
       textareaId: "textarea3",
       defaultContent: "Hello RCE!"
-    }, requiredProps)), target);
+    }), target);
     await waitFor(() => expect(rceRef.current).not.toBeNull());
     expect(rceRef.current.getCode()).toEqual('Hello RCE!');
     rceRef.current.setCode('How sweet.');

package/lib/translated/ca/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/ca/modules/rce/__tests__/root.test.js

@@ -32,13 +32,7 @@ describe('RceModule', () => {
       editorOptions: () => {
         return {};
       },
-      textareaId: 'textarea_id',
-      features: {
-        new_equation_editor: true,
-        new_math_equation_handling: true,
-        rce_ux_improvements: true
-      },
-      timezone: 'America/Denver'
+      textareaId: 'textarea_id'
     };
   });
   afterEach(() => {

package/lib/translated/ca/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/ca/modules/rce/plugins/instructure_documents/components/Link.js

@@ -111,7 +111,7 @@ export default function Link(props) {
     return callback;
   }
 
-  function dateOrMessage(dateString) {
+  function dateOrMessage(str) {
     if (disabled && disabledMessage) {
       return /*#__PURE__*/React.createElement(View, {
         display: "block"
@@ -122,10 +122,10 @@ export default function Link(props) {
       }, disabledMessage)));
     }
 
-    if (dateString) {
+    if (str) {
       return /*#__PURE__*/React.createElement(View, {
         as: "div"
-      }, dateString);
+      }, str);
     }
   }
 
@@ -179,8 +179,8 @@ export default function Link(props) {
     size: "x-small",
     inline: false
   }) : null), /*#__PURE__*/React.createElement(Flex.Item, {
-    grow: true,
-    shrink: true
+    shouldGrow: true,
+    shouldShrink: true
   }, /*#__PURE__*/React.createElement(Flex, null, /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "0 x-small 0 0"
   }, /*#__PURE__*/React.createElement(Text, {
@@ -189,8 +189,8 @@ export default function Link(props) {
     size: "x-small"
   }))), /*#__PURE__*/React.createElement(Flex.Item, {
     padding: "0 x-small 0 0",
-    grow: true,
-    shrink: true,
+    shouldGrow: true,
+    shouldShrink: true,
     textAlign: "start"
   }, /*#__PURE__*/React.createElement(View, {
     as: "div",

package/lib/translated/ca/modules/rce/plugins/instructure_equation/EquationEditorModal/__tests__/index.test.js

@@ -77,7 +77,7 @@ jest.mock('../advancedPreference', () => {
 describe('EquationEditorModal', () => {
   let editor, mockFn;
   beforeAll(() => {
-    RCEGlobals.getFeatures = jest.fn().mockReturnValue({
+    RCEGlobals.setFeatures({
       new_equation_editor: true
     });
     MathfieldElement.prototype.getValue = jest.fn().mockImplementation(function () {

package/lib/translated/ca/modules/rce/plugins/instructure_equation/EquationEditorToolbar/index.js

@@ -64,8 +64,6 @@ function EquationEditorToolbar(props) {
     }, /*#__PURE__*/React.createElement(IconButton, {
       onClick: () => props.executeCommand(command, advancedCommand),
       renderIcon: icon,
-      withBackground: false,
-      withBorder: false,
       screenReaderLabel: `${label}, LaTeX: ${name}`
     }));
   }));