From fa06c7614af0f99e742e87d6f70824bf7a147fdb Mon Sep 17 00:00:00 2001 From: Ed Schiebel Date: Thu, 6 Jun 2019 10:31:53 -0400 Subject: [PATCH] Update course link icons Pages -> documents icon Navigaion -> no icon closes CORE-2872 test plan - open /courses/:course_id/assignments/new in a course with some pages - select Links > Course Links from the RCE toolbar - expand the Pages section in the tray > expect the document icon - expand the Navigation section in the tray > expect no icon, but the items are lined up correctly because the space is properly taken up by a blank icon Change-Id: I92265f017249aac64271f14e5439989f6e59a33a Reviewed-on: https://gerrit.instructure.com/196704 Tested-by: Jenkins Reviewed-by: Ryan Shaw QA-Review: Ryan Shaw Product-Review: Ed Schiebel --- .../instructure_links/components/Link.js | 18 +++++++++++++++--- .../components/__tests__/Link.test.js | 12 ++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/packages/canvas-rce/src/rce/plugins/instructure_links/components/Link.js b/packages/canvas-rce/src/rce/plugins/instructure_links/components/Link.js index ec58ab5097a..c2324ca0df9 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_links/components/Link.js +++ b/packages/canvas-rce/src/rce/plugins/instructure_links/components/Link.js @@ -26,6 +26,7 @@ import dragHtml from "../../../../sidebar/dragHtml"; import {AccessibleContent} from '@instructure/ui-a11y' import {Flex, View} from '@instructure/ui-layout' import {Text} from '@instructure/ui-elements' +import {SVGIcon} from '@instructure/ui-svg-images' import { IconDragHandleLine, IconAssignmentLine, @@ -35,9 +36,17 @@ import { IconAnnouncementLine, IconPublishSolid, IconUnpublishedSolid, - IconQuestionLine + IconDocumentLine } from '@instructure/ui-icons' +function IconBlank() { + return ( + + + + ) +} + function getIcon(type) { switch(type) { case 'assignments': @@ -50,9 +59,12 @@ function getIcon(type) { return IconQuizLine case 'announcements': return IconAnnouncementLine - case 'wikiPages': // waiting on an answer from design + case 'wikiPages': + return IconDocumentLine + case 'navigation': + return IconBlank default: - return IconQuestionLine + return IconDocumentLine } } diff --git a/packages/canvas-rce/src/rce/plugins/instructure_links/components/__tests__/Link.test.js b/packages/canvas-rce/src/rce/plugins/instructure_links/components/__tests__/Link.test.js index ffe060e31c0..34e41fba6e0 100644 --- a/packages/canvas-rce/src/rce/plugins/instructure_links/components/__tests__/Link.test.js +++ b/packages/canvas-rce/src/rce/plugins/instructure_links/components/__tests__/Link.test.js @@ -45,8 +45,8 @@ describe('RCE "Links" Plugin > Link', () => { {type: 'modules', icon: 'IconModule'}, {type: 'quizzes', icon: 'IconQuiz'}, {type: 'announcements', icon: 'IconAnnouncement'}, - {type: 'wikiPages', icon: 'IconQuestion'}, - {type: 'navigation', icon: 'IconQuestion'}, + {type: 'wikiPages', icon: 'IconDocument'}, + {type: 'navigation', icon: 'IconBlank'}, ] linkTypes.forEach(lt => { @@ -57,12 +57,12 @@ describe('RCE "Links" Plugin > Link', () => { published: true } const {container, getByText} = renderComponent({type: lt.type, link}) - + expect(getByText(link.title)).toBeInTheDocument() expect(queryIconByName(container, 'IconPublish')).toBeInTheDocument() expect(queryIconByName(container, lt.icon)).toBeInTheDocument() }) - + it(`renders unpublished ${lt.type}`, () => { const link = { href: 'the_url', @@ -70,7 +70,7 @@ describe('RCE "Links" Plugin > Link', () => { published: false } const {container, getByText} = renderComponent({type: lt.type, link}) - + expect(getByText(link.title)).toBeInTheDocument() expect(queryIconByName(container, 'IconUnpublished')).toBeInTheDocument() expect(queryIconByName(container, lt.icon)).toBeInTheDocument() @@ -80,7 +80,7 @@ describe('RCE "Links" Plugin > Link', () => { describe('date variant', () => { const value = '2019-04-24T13:00:00Z' const formattedValue = formatMessage.date(Date.parse(value), 'long') - + it('renders muliple due dates', () => { const link = { href: 'the_url',