Remove rce_ux_improvements flag
flag = none closes LF-775 Test plan (regression testing the feature): - Open an RCE - Create a course link to a page/assignment/etc - Click "Edit link" - Expect to see the edit course link tray - Switch the link and hit save - Expect the link to be updated Change-Id: I8481fb2a7a461849ee39114e514dd44c12d94ad4 Reviewed-on: https://gerrit.instructure.com/c/canvas-lms/+/329843 Tested-by: Service Cloud Jenkins <svc.cloudjenkins@instructure.com> Reviewed-by: Jake Oeding <jake.oeding@instructure.com> QA-Review: Jake Oeding <jake.oeding@instructure.com> Product-Review: Jackson Howe <jackson.howe@instructure.com>
This commit is contained in:
parent
d323747490
commit
054ad9d0ef
|
@ -348,7 +348,6 @@ class ApplicationController < ActionController::Base
|
|||
lti_platform_storage
|
||||
calendar_series
|
||||
account_level_blackout_dates
|
||||
rce_ux_improvements
|
||||
render_both_to_do_lists
|
||||
course_paces_redesign
|
||||
course_paces_for_students
|
||||
|
|
|
@ -9,12 +9,6 @@ buttons_and_icons_root_account:
|
|||
production:
|
||||
state: hidden
|
||||
|
||||
rce_ux_improvements:
|
||||
state: hidden
|
||||
display_name: RCE UX Improvements
|
||||
description: Improve and streamline the RCE button and tray UX
|
||||
applies_to: SiteAdmin
|
||||
|
||||
explicit_latex_typesetting:
|
||||
state: hidden
|
||||
display_name: Explicit LaTeX Typesetting
|
||||
|
|
|
@ -315,7 +315,6 @@ 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,
|
||||
|
@ -323,7 +322,6 @@ class RCEWrapper extends React.Component {
|
|||
|
||||
return {
|
||||
new_math_equation_handling,
|
||||
rce_ux_improvements,
|
||||
explicit_latex_typesetting,
|
||||
rce_transform_loaded_content,
|
||||
media_links_use_attachment_id,
|
||||
|
|
|
@ -40,12 +40,10 @@ export default function Link(props) {
|
|||
props.type === 'quizzes' && props.link.quiz_type === 'quizzes.next'
|
||||
? 'quizzes.next'
|
||||
: props.type
|
||||
if (RCEGlobals.getFeatures()?.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
|
||||
}
|
||||
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 Icon = getIcon(type)
|
||||
const color = published ? 'success' : 'primary'
|
||||
let dateString = null
|
||||
|
|
|
@ -323,10 +323,6 @@ describe('RCE "Links" Plugin > Link', () => {
|
|||
},
|
||||
}
|
||||
|
||||
beforeAll(() => {
|
||||
RCEGlobals.getFeatures = jest.fn().mockReturnValue({rce_ux_improvements: true})
|
||||
})
|
||||
|
||||
afterAll(() => {
|
||||
jest.resetAllMocks()
|
||||
})
|
||||
|
|
|
@ -68,7 +68,6 @@ 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, {Editor} from 'tinymce'
|
||||
import {TsMigrationAny} from '../../../types/ts-migration'
|
||||
|
||||
|
@ -78,13 +77,8 @@ const COURSE_PLUGIN_KEY = 'course_links'
|
|||
const GROUP_PLUGIN_KEY = 'group_links'
|
||||
|
||||
function getCommandName(selectedNode: Element) {
|
||||
// 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.getFeatures()?.rce_ux_improvements
|
||||
const isCourseLink = selectedNode.getAttribute('data-course-type')
|
||||
return showCourseLinkTray && isCourseLink
|
||||
? 'instructureTrayForCourseLinks'
|
||||
: 'instructureTrayToEditLink'
|
||||
return isCourseLink ? 'instructureTrayForCourseLinks' : 'instructureTrayToEditLink'
|
||||
}
|
||||
|
||||
function selectedAnchorCount(ed: Editor) {
|
||||
|
|
|
@ -595,9 +595,8 @@ describe "RCE next tests", :ignore_js_errors do
|
|||
end
|
||||
end
|
||||
|
||||
context "edit course link sidebar with rce_ux_improvements enabled" do
|
||||
context "edit course link sidebar" do
|
||||
before do
|
||||
Account.site_admin.enable_feature!(:rce_ux_improvements)
|
||||
@wiki_page_title1 = "test_page"
|
||||
@wiki_page_title2 = "test_page2"
|
||||
unpublished = false
|
||||
|
|
|
@ -177,7 +177,6 @@ export type SiteAdminFeatureId =
|
|||
| 'calendar_series'
|
||||
| 'account_level_blackout_dates'
|
||||
| 'account_calendar_events'
|
||||
| 'rce_ux_improvements'
|
||||
| 'instui_nav'
|
||||
| 'render_both_to_do_lists'
|
||||
| 'course_paces_redesign'
|
||||
|
|
|
@ -94,7 +94,6 @@ describe('getRCSProps', () => {
|
|||
canUploadFiles: true,
|
||||
filesTabDisabled: false,
|
||||
themeUrl: 'http://the.theme.here/',
|
||||
features: {},
|
||||
})
|
||||
})
|
||||
|
||||
|
|
|
@ -46,8 +46,5 @@ export default function getRCSProps() {
|
|||
jwt: ENV.JWT,
|
||||
refreshToken: refreshToken(ENV.JWT),
|
||||
themeUrl: ENV.active_brand_config_json_url,
|
||||
features: {
|
||||
rce_ux_improvements: ENV.FEATURES?.rce_ux_improvements,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue