diff --git a/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/__snapshots__/editor-nav.test.js.snap b/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/__snapshots__/editor-nav.test.js.snap index 9e406718ad..b6a478d32f 100644 --- a/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/__snapshots__/editor-nav.test.js.snap +++ b/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/__snapshots__/editor-nav.test.js.snap @@ -91,6 +91,74 @@ exports[`EditorNav EditorNav component with all list item types 1`] = ` `; +exports[`EditorNav EditorNav component with start page 1`] = ` +
+ + +
+`; + exports[`EditorNav addAssessment hides the modal and calls EditorUtil 1`] = `undefined`; exports[`EditorNav addAssessment hides the modal and calls EditorUtil 2`] = `undefined`; diff --git a/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/__snapshots__/more-info-box.test.js.snap b/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/__snapshots__/more-info-box.test.js.snap index c2dfb46d89..6877c7f814 100644 --- a/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/__snapshots__/more-info-box.test.js.snap +++ b/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/__snapshots__/more-info-box.test.js.snap @@ -1,26 +1,26 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`MoreInfoBox More Info Box changes to open 1`] = `"
Triggers:
"`; +exports[`MoreInfoBox More Info Box changes to open 1`] = `"
Triggers:
"`; -exports[`MoreInfoBox More Info Box edits values 1`] = `"
Mock Toggle
Mock Abstract Toggle
Triggers:
"`; +exports[`MoreInfoBox More Info Box edits values 1`] = `"
Mock Toggle
Mock Abstract Toggle
Triggers:
"`; -exports[`MoreInfoBox More Info Box edits values 2`] = `"
Mock Toggle
Mock Abstract Toggle
Triggers:
"`; +exports[`MoreInfoBox More Info Box edits values 2`] = `"
Mock Toggle
Mock Abstract Toggle
Triggers:
"`; -exports[`MoreInfoBox More Info Box edits values 3`] = `"
Mock Toggle
Mock Abstract Toggle
Triggers:
"`; +exports[`MoreInfoBox More Info Box edits values 3`] = `"
Mock Toggle
Mock Abstract Toggle
Triggers:
"`; -exports[`MoreInfoBox More Info Box edits values 4`] = `"
Mock Toggle
Mock Abstract Toggle
Triggers:
"`; +exports[`MoreInfoBox More Info Box edits values 4`] = `"
Mock Toggle
Mock Abstract Toggle
Triggers:
"`; -exports[`MoreInfoBox More Info Box edits values 5`] = `"
Mock Toggle
Mock Abstract Toggle
Triggers:
"`; +exports[`MoreInfoBox More Info Box edits values 5`] = `"
Mock Toggle
Mock Abstract Toggle
Triggers:
"`; exports[`MoreInfoBox More Info Box edits values 6`] = `"
"`; -exports[`MoreInfoBox More Info Box for assessment 1`] = `"
Triggers:
"`; +exports[`MoreInfoBox More Info Box for assessment 1`] = `"
Triggers:
"`; -exports[`MoreInfoBox More Info Box for assessment 2`] = `"
Triggers:
"`; +exports[`MoreInfoBox More Info Box for assessment 2`] = `"
Triggers:
"`; -exports[`MoreInfoBox More Info Box input with explicit and default placeholders 1`] = `"
Triggers:
"`; +exports[`MoreInfoBox More Info Box input with explicit and default placeholders 1`] = `"
Triggers:
"`; -exports[`MoreInfoBox More Info Box prevents tab escape 1`] = `"
Triggers:
"`; +exports[`MoreInfoBox More Info Box prevents tab escape 1`] = `"
Triggers:
"`; exports[`MoreInfoBox More Info Box renders properly 1`] = `
`; -exports[`MoreInfoBox More Info Box tries to save with error 1`] = `"
Triggers:

A simple Error

"`; +exports[`MoreInfoBox More Info Box tries to save with error 1`] = `"
Triggers:

A simple Error

"`; -exports[`MoreInfoBox More Info Box with contentDescriptions 1`] = `"
Mock Toggle
Mock Abstract Toggle
Triggers:
"`; +exports[`MoreInfoBox More Info Box with contentDescriptions 1`] = `"
Mock Toggle
Mock Abstract Toggle
Triggers:
"`; -exports[`MoreInfoBox More Info Box with no button bar 1`] = `"
Triggers:
"`; +exports[`MoreInfoBox More Info Box with no button bar 1`] = `"
Triggers:
"`; -exports[`MoreInfoBox More Info Box with no move buttons 1`] = `"
Triggers:
"`; +exports[`MoreInfoBox More Info Box with no move buttons 1`] = `"
Triggers:
"`; -exports[`MoreInfoBox More Info Box with triggers 1`] = `"
Triggers:mockTrigger, mockSecondTrigger
"`; +exports[`MoreInfoBox More Info Box with triggers 1`] = `"
Triggers:mockTrigger, mockSecondTrigger
"`; diff --git a/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/__snapshots__/sub-menu.test.js.snap b/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/__snapshots__/sub-menu.test.js.snap index 0de5892c23..ef5e89a144 100644 --- a/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/__snapshots__/sub-menu.test.js.snap +++ b/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/__snapshots__/sub-menu.test.js.snap @@ -30,7 +30,18 @@ exports[`SubMenu SubMenu component adds page 1`] = ` } ], \\"showMoveButtons\\": true, - \\"isAssessment\\": false + \\"isAssessment\\": false, + \\"navItems\\": [ + { + \\"id\\": 5, + \\"type\\": \\"link\\", + \\"label\\": \\"label5\\", + \\"contentType\\": \\"Page\\", + \\"flags\\": { + \\"assessment\\": false + } + } + ] }
" `; @@ -92,7 +103,17 @@ exports[`SubMenu SubMenu component selected as assessment 1`] = ` } ], "showMoveButtons": false, - "isAssessment": true + "isAssessment": true, + "navItems": [ + { + "id": 6, + "type": "link", + "label": "label6", + "flags": { + "assessment": true + } + } + ] } diff --git a/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/editor-nav.test.js b/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/editor-nav.test.js index 95c76a14f9..3c37d9870a 100644 --- a/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/editor-nav.test.js +++ b/packages/app/obojobo-document-engine/__tests__/oboeditor/components/navigation/editor-nav.test.js @@ -39,7 +39,13 @@ describe('EditorNav', () => { test('EditorNav component', () => { EditorUtil.getOrderedList.mockReturnValueOnce([]) const props = { - navState: {} + navState: {}, + model: { + attributes: { + content: { start: 'mockId' }, + children: [{ children: [{}] }] + } + } } const component = renderer.create() const tree = component.toJSON() @@ -49,7 +55,13 @@ describe('EditorNav', () => { test('EditorNav component adds page', () => { EditorUtil.getOrderedList.mockReturnValueOnce([]) const props = { - navState: {} + navState: {}, + model: { + attributes: { + content: { start: 'mockId' }, + children: [{ children: [{}] }] + } + } } const component = mount() @@ -65,7 +77,13 @@ describe('EditorNav', () => { test('EditorNav component adds assessment', () => { EditorUtil.getOrderedList.mockReturnValueOnce([]) const props = { - navState: {} + navState: {}, + model: { + attributes: { + content: { start: 'mockId' }, + children: [{ children: [{}] }] + } + } } const component = mount() @@ -118,6 +136,63 @@ describe('EditorNav', () => { open: false, locked: true, navTargetId: 56 // select this item + }, + model: { + attributes: { + content: { start: null }, + children: [ + { + children: [{ children: [] }, { children: [] }] + }, + { + children: [] + } + ] + } + } + } + const component = renderer.create() + const tree = component.toJSON() + expect(tree).toMatchSnapshot() + }) + + test('EditorNav component with start page', () => { + EditorUtil.getOrderedList.mockReturnValueOnce([ + { + id: 4, + type: 'heading', + label: 'label4', + flags: {} + }, + { + id: 56, + type: 'link', + label: 'label5', + contentType: 'Page', + flags: { + assessment: false + } + } + ]) + + const props = { + navState: { + open: false, + locked: true, + navTargetId: 56 // select this item + }, + model: { + attributes: { + content: { start: 56 }, + children: [ + { + children: [{ children: [] }, { children: [] }] + }, + { + children: [] + } + ] + } } } const component = renderer.create() @@ -139,7 +214,20 @@ describe('EditorNav', () => { ]) .mockReturnValueOnce([]) - const props = { navState: {} } + const props = { + navState: {}, + model: { + attributes: { + content: {}, + children: [ + { children: [{}] }, + { + children: [{ children: [{ children: [] }] }, { children: [{ children: [] }] }] + } + ] + } + } + } const component = mount() component.instance().onNavItemClick({ @@ -157,7 +245,13 @@ describe('EditorNav', () => { test('addAssessment hides the modal and calls EditorUtil', () => { EditorUtil.getOrderedList.mockReturnValue([]) const props = { - navState: {} + navState: {}, + model: { + attributes: { + content: { start: 'mockId' }, + children: [{ children: [{}] }] + } + } } const component = mount() @@ -177,7 +271,13 @@ describe('EditorNav', () => { test('addPage hides the modal and calls EditorUtil', () => { EditorUtil.getOrderedList.mockReturnValue([]) const props = { - navState: {} + navState: {}, + model: { + attributes: { + content: { start: 'mockId' }, + children: [{ children: [{}] }] + } + } } const component = mount() diff --git a/packages/app/obojobo-document-engine/__tests__/oboeditor/components/triggers/__snapshots__/trigger-list-modal.test.js.snap b/packages/app/obojobo-document-engine/__tests__/oboeditor/components/triggers/__snapshots__/trigger-list-modal.test.js.snap index b958697529..869bf8dc2c 100644 --- a/packages/app/obojobo-document-engine/__tests__/oboeditor/components/triggers/__snapshots__/trigger-list-modal.test.js.snap +++ b/packages/app/obojobo-document-engine/__tests__/oboeditor/components/triggers/__snapshots__/trigger-list-modal.test.js.snap @@ -1,14 +1,14 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`TriggerListModal adds a trigger 1`] = `"

Triggers

"`; +exports[`TriggerListModal adds a trigger 1`] = `"

Triggers

"`; -exports[`TriggerListModal adds an action 1`] = `"

Triggers

"`; +exports[`TriggerListModal adds an action 1`] = `"

Triggers

"`; exports[`TriggerListModal changes action type 1`] = `"

Triggers

"`; -exports[`TriggerListModal changes action value 1`] = `"

Triggers

"`; +exports[`TriggerListModal changes action value 1`] = `"

Triggers

"`; -exports[`TriggerListModal changes trigger 1`] = `"

Triggers

"`; +exports[`TriggerListModal changes trigger 1`] = `"

Triggers

"`; exports[`TriggerListModal createNewDefaultActionValueObject(assessment:endAttempt) creates a new default action value object 1`] = ` Object { @@ -74,6 +74,8 @@ exports[`TriggerListModal deletes an action 1`] = `"

Triggers

"`; -exports[`TriggerListModal renders all options 1`] = `"

Triggers

Animate Scroll
Fade Out Other Items
"`; +exports[`TriggerListModal renders actions with id select boxes 1`] = `"

Triggers

Fade Out Other Items
"`; + +exports[`TriggerListModal renders all options 1`] = `"

Triggers

Animate Scroll
Fade Out Other Items
"`; exports[`TriggerListModal renders if given no triggers 1`] = `"

Triggers

"`; diff --git a/packages/app/obojobo-document-engine/__tests__/oboeditor/components/triggers/trigger-list-modal.test.js b/packages/app/obojobo-document-engine/__tests__/oboeditor/components/triggers/trigger-list-modal.test.js index 0c83193044..180c04dcbd 100644 --- a/packages/app/obojobo-document-engine/__tests__/oboeditor/components/triggers/trigger-list-modal.test.js +++ b/packages/app/obojobo-document-engine/__tests__/oboeditor/components/triggers/trigger-list-modal.test.js @@ -23,7 +23,37 @@ describe('TriggerListModal', () => { } ] } - const component = shallow() + const navItems = [{ id: 1, type: 'mockType' }, { id: 2, type: 'mockType' }] + const elements = [{ id: 3, type: 'mockType' }, { id: 4, type: 'mockType' }] + const component = shallow( + + ) + const tree = component.html() + expect(tree).toMatchSnapshot() + }) + + test('renders actions with id select boxes', () => { + const content = { + triggers: [ + { + type: 'onMount', + actions: [ + { type: 'nav:goto', value: { id: '' } }, + { type: 'assessment:startAttempt', value: { id: '' } }, + { type: 'assessment:endAttempt', value: { id: '' } }, + { type: 'focus:component', value: { id: '' } } + ] + } + ] + } + const navItems = [ + { id: 1, type: 'mockType', flags: {} }, + { id: 2, type: 'mockType', flags: { assessment: true } } + ] + const elements = [{ id: 3, type: 'mockType' }, { id: 4, type: 'mockType' }] + const component = shallow( + + ) const tree = component.html() expect(tree).toMatchSnapshot() }) @@ -47,7 +77,8 @@ describe('TriggerListModal', () => { } ] } - const component = shallow() + const navItems = [{ id: 1, type: 'mockType' }, { id: 2, type: 'mockType' }] + const component = shallow() component .find('button') @@ -71,7 +102,8 @@ describe('TriggerListModal', () => { } ] } - const component = shallow() + const navItems = [{ id: 1, type: 'mockType' }, { id: 2, type: 'mockType' }] + const component = shallow() component .find('button') @@ -87,7 +119,7 @@ describe('TriggerListModal', () => { triggers: [ { type: 'onMount', - actions: [{ type: 'nav:goto', value: {} }] + actions: [{ type: 'nav:goto', value: { id: '' } }] }, { type: 'onUnmount', @@ -95,7 +127,8 @@ describe('TriggerListModal', () => { } ] } - const component = mount() + const navItems = [{ id: 1, type: 'link' }, { id: 2, type: 'link' }] + const component = mount() component .find('button') @@ -119,7 +152,8 @@ describe('TriggerListModal', () => { } ] } - const component = mount() + const navItems = [{ id: 1, type: 'mockType' }, { id: 2, type: 'mockType' }] + const component = mount() component .find('button') @@ -143,8 +177,11 @@ describe('TriggerListModal', () => { } ] } + const navItems = [{ id: 1, type: 'mockType' }, { id: 2, type: 'mockType' }] const close = jest.fn() - const component = mount() + const component = mount( + + ) component .find('button') @@ -164,7 +201,7 @@ describe('TriggerListModal', () => { expect(close).toHaveBeenCalledWith() }) - test('unounts when there is no close prop', () => { + test('unmounts when there is no close prop', () => { const content = { triggers: [] } const component = mount() @@ -186,7 +223,8 @@ describe('TriggerListModal', () => { } ] } - const component = mount() + const navItems = [{ id: 1, type: 'mockType' }, { id: 2, type: 'mockType' }] + const component = mount() component .find('select') @@ -212,7 +250,8 @@ describe('TriggerListModal', () => { } ] } - const component = mount() + const navItems = [{ id: 1, type: 'mockType' }, { id: 2, type: 'mockType' }] + const component = mount() component .find('select') @@ -238,31 +277,32 @@ describe('TriggerListModal', () => { } ] } - const component = mount() + const navItems = [{ id: 1, type: 'mockType' }, { id: 2, type: 'mockType' }] + const component = mount() // make sure this is the expected label/input combo const inputLabel = component.find('label').at(2) - expect(inputLabel.props().children).toBe('Item Id') + expect(inputLabel.props().children).toBe('Page') // change the value component - .find('input') + .find('select') .at(2) - .simulate('change', { target: { type: 'text', value: '10' } }) + .simulate('change', { target: { type: 'select-one', value: 2 } }) // check that the value changed expect( component - .find('input') + .find('select') .at(2) .props() - ).toHaveProperty('value', '10') + ).toHaveProperty('value', 2) // check the change to state expect(component.state()).toHaveProperty('triggers') expect(component.state().triggers[0].actions).toContainEqual({ type: 'nav:goto', - value: { id: '10' } + value: { id: 2 } }) // check the rendered component @@ -286,11 +326,12 @@ describe('TriggerListModal', () => { } ] } - const component = mount() + const elements = [{ id: 1, type: 'mockType' }, { id: 2, type: 'mockType' }] + const component = mount() component .find('select') - .at(2) + .at(3) .simulate('change', { target: { value: 'animateScroll' } }) @@ -299,7 +340,7 @@ describe('TriggerListModal', () => { component .find('select') - .at(2) + .at(3) .simulate('change', { target: { value: 'preventScroll' } }) @@ -308,7 +349,7 @@ describe('TriggerListModal', () => { component .find('select') - .at(2) + .at(3) .simulate('change', { target: { value: 'jumpScroll' } }) @@ -329,7 +370,8 @@ describe('TriggerListModal', () => { } ] } - const component = mount() + const elements = [{ id: 1 }, { id: 2 }] + const component = mount() const input = component.find(Switch).find('input') input.simulate('change', { target: { type: 'checkbox', checked: true } }) expect(component.state().triggers[0].actions[0].value).toHaveProperty('fade', true) @@ -379,4 +421,199 @@ describe('TriggerListModal', () => { expect(TriggerListModal.prototype.createNewDefaultActionValueObject(type)).toMatchSnapshot() } ) + + test('createNewDefaultActionValueObject selects assessment by id for start/end attempt triggers', () => { + const content = { + triggers: [ + { + type: 'onMount', + actions: [{ type: 'assessment:startAttempt', value: { id: 2 } }] + } + ] + } + const navItems = [ + { id: 1, type: 'mockType', flags: {} }, + { id: 2, type: 'mockType', flags: { assessment: true } } + ] + const component = mount() + + expect( + component.instance().createNewDefaultActionValueObject('assessment:startAttempt') + ).toEqual({ id: 2 }) + expect(component.instance().createNewDefaultActionValueObject('assessment:endAttempt')).toEqual( + { id: 2 } + ) + }) + + test('getElementText returns expected values', () => { + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.Text', + content: { textGroup: [{ text: { value: 'mock text' } }] } + }) + ).toBe('TEXT: mock text') + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.Text', + content: { textGroup: [{ text: { value: 'very long mock text that is very long' } }] } + }) + ).toBe('TEXT: very long mock text that is very l...') + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.Text', + content: {}, + children: [{ children: [{ text: 'mock text' }] }] + }) + ).toBe('TEXT: mock text') + + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.Heading', + content: { textGroup: [{ text: { value: 'mock text' } }] } + }) + ).toBe('HEADING: mock text') + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.Heading', + content: {}, + children: [{ text: 'mock text' }] + }) + ).toBe('HEADING: mock text') + + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.Figure', + content: { textGroup: [{ text: { value: 'mock text' } }] } + }) + ).toBe('FIGURE: mock text') + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.Figure', + content: {}, + children: [{ text: 'mock text' }] + }) + ).toBe('FIGURE: mock text') + + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.ActionButton', + content: { textGroup: [{ text: { value: 'mock text' } }] } + }) + ).toBe('BUTTON: mock text') + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.ActionButton', + content: {}, + children: [{ text: 'mock text' }] + }) + ).toBe('BUTTON: mock text') + + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.List', + content: { textGroup: [{ text: { value: 'mock text' } }] } + }) + ).toBe('LIST: mock text') + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.List', + content: {}, + children: [{ children: [{ children: [{ text: 'mock text' }] }] }] + }) + ).toBe('LIST: mock text') + + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.Table', + content: { textGroup: { textGroup: [{ text: { value: 'mock text' } }] } } + }) + ).toBe('TABLE: mock text') + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.Table', + content: { textGroup: {} }, + children: [{ children: [{ children: [{ text: 'mock text' }] }] }] + }) + ).toBe('TABLE: mock text') + + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.Break' + }) + ).toBe('BREAK') + + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.MathEquation', + content: { latex: 'mock latex' } + }) + ).toBe('MATH: mock latex') + + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.Code', + content: { textGroup: [{ text: { value: 'mock text' } }] } + }) + ).toBe('CODE: mock text') + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.Code', + content: {}, + children: [{ children: [{ text: 'mock text' }] }] + }) + ).toBe('CODE: mock text') + + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.YouTube' + }) + ).toBe('YouTube Video') + + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.IFrame', + content: { title: 'mock title' } + }) + ).toBe('IFRAME: mock title') + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.IFrame', + content: { src: 'mock source' } + }) + ).toBe('IFRAME: mock source') + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.IFrame', + content: {} + }) + ).toBe('IFRAME: No source!') + + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.Question', + children: [ + { + content: { textGroup: [{ text: { value: 'mock text' } }] } + } + ] + }) + ).toBe('QUESTION: mock text') + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.Question', + children: [ + { + content: {} + } + ] + }) + ).toBe('QUESTION: [New Question]') + + expect( + TriggerListModal.prototype.getElementText({ + type: 'ObojoboDraft.Chunks.QuestionBank', + content: { textGroup: [{ text: { value: 'mock text' } }] } + }) + ).toBe('QUESTION BANK') + }) }) diff --git a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/editor-nav.js b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/editor-nav.js index ad6ee74f1a..08596b7452 100644 --- a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/editor-nav.js +++ b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/editor-nav.js @@ -90,11 +90,29 @@ class EditorNav extends React.PureComponent { }) } + const { attributes } = this.props.model + const startId = attributes.content.start || attributes.children[0].children[0].id + const startPage = + startId === attributes.children[1]?.id + ? attributes.children[1].children[0] + : attributes.children[0].children.find(el => el.id === startId) + return list.map((item, index) => { switch (item.type) { case 'heading': return ( -
+
) case 'link': return ( @@ -103,6 +121,7 @@ class EditorNav extends React.PureComponent { index={index} isSelected={this.props.navState.navTargetId === item.id} list={list} + elements={this.props.elements} onClick={this.onNavItemClick.bind(this, item)} savePage={this.props.savePage} markUnsaved={this.props.markUnsaved} diff --git a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/header.js b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/header.js index acd532a263..71e6d9f78d 100644 --- a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/header.js +++ b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/header.js @@ -104,6 +104,8 @@ class Header extends React.Component { savePage={this.props.savePage} contentDescription={contentDescription} markUnsaved={this.props.markUnsaved} + elements={this.props.elements} + navItems={this.props.list} hideButtonBar /> diff --git a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/more-info-box.js b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/more-info-box.js index 0d7b222d42..586ae979fc 100644 --- a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/more-info-box.js +++ b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/more-info-box.js @@ -175,7 +175,14 @@ class MoreInfoBox extends React.Component { showTriggersModal() { // Prevent info box from closing when modal is opened - ModalUtil.show() + ModalUtil.show( + + ) this.setState({ modalOpen: true }) } @@ -303,7 +310,7 @@ class MoreInfoBox extends React.Component { {this.props.contentDescription.map(description => this.renderItem(description))} -
+
Triggers: {triggers && triggers.length > 0 ? ( diff --git a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/sub-menu.js b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/sub-menu.js index c0648ed80f..68bc6ae0ff 100644 --- a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/sub-menu.js +++ b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/navigation/sub-menu.js @@ -261,6 +261,8 @@ class SubMenu extends React.Component { moveNode={this.movePage} showMoveButtons={!item.flags.assessment} isAssessment={item.flags.assessment} + elements={this.props.elements} + navItems={this.props.list} /> ) } diff --git a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/node/editor-component.js b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/node/editor-component.js index 8d95aaf741..f39a5f606a 100644 --- a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/node/editor-component.js +++ b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/node/editor-component.js @@ -219,6 +219,8 @@ class Node extends React.Component { showMoveButtons isFirst={thisSiblingIndex === 0} isLast={thisSiblingIndex >= siblingCount - 1} + elements={this.props.editor.children} + navItems={this.props.navItems} /> ) } diff --git a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/triggers/trigger-list-modal.js b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/triggers/trigger-list-modal.js index 11738f0ce0..da1dbe63ad 100644 --- a/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/triggers/trigger-list-modal.js +++ b/packages/app/obojobo-document-engine/src/scripts/oboeditor/components/triggers/trigger-list-modal.js @@ -49,7 +49,7 @@ class TriggerListModal extends React.Component { actions: [ { type: 'nav:goto', - value: {} + value: { id: '' } } ] }) @@ -57,12 +57,18 @@ class TriggerListModal extends React.Component { } createNewDefaultActionValueObject(type) { + const props = this.props || {} + switch (type) { case 'nav:goto': + return { + id: '' + } + case 'assessment:startAttempt': case 'assessment:endAttempt': return { - id: '' + id: props.navItems ? props.navItems.slice(-1)[0].id : '' } case 'nav:openExternalLink': @@ -167,7 +173,7 @@ class TriggerListModal extends React.Component { ? Object.assign(trigger, { actions: trigger.actions.concat({ type: 'nav:goto', - value: {} + value: { id: '' } }) }) : trigger @@ -218,19 +224,117 @@ class TriggerListModal extends React.Component { })) } + getElementText(element) { + const { content, children } = element + let text = '' + + switch (element.type) { + case 'ObojoboDraft.Chunks.Text': + text = + 'TEXT: ' + + (content.textGroup ? content.textGroup[0].text.value : children[0].children[0].text) + break + case 'ObojoboDraft.Chunks.Heading': + text = + 'HEADING: ' + (content.textGroup ? content.textGroup[0].text.value : children[0].text) + break + case 'ObojoboDraft.Chunks.Figure': + text = 'FIGURE: ' + (content.textGroup ? content.textGroup[0].text.value : children[0].text) + break + case 'ObojoboDraft.Chunks.ActionButton': + text = 'BUTTON: ' + (content.textGroup ? content.textGroup[0].text.value : children[0].text) + break + case 'ObojoboDraft.Chunks.List': + text = + 'LIST: ' + + (content.textGroup + ? content.textGroup[0].text.value + : children[0].children[0].children[0].text) + break + case 'ObojoboDraft.Chunks.Table': + text = + 'TABLE: ' + + (content.textGroup.textGroup + ? content.textGroup.textGroup[0].text.value + : children[0].children[0].children[0].text) + break + case 'ObojoboDraft.Chunks.Break': + text = 'BREAK' + break + case 'ObojoboDraft.Chunks.MathEquation': + text = 'MATH: ' + content.latex + break + case 'ObojoboDraft.Chunks.Code': + text = + 'CODE: ' + + (content.textGroup ? content.textGroup[0].text.value : children[0].children[0].text) + break + case 'ObojoboDraft.Chunks.YouTube': + text = 'YouTube Video' + break + case 'ObojoboDraft.Chunks.IFrame': + text = 'IFRAME: ' + (content.title || content.src || 'No source!') + break + case 'ObojoboDraft.Chunks.Question': + text = + 'QUESTION: ' + + (children[0].content.textGroup + ? children[0].content.textGroup[0].text.value + : '[New Question]') + break + case 'ObojoboDraft.Chunks.QuestionBank': + text = 'QUESTION BANK' + break + default: + text = element.type + } + + if (text.length > 40) { + text = text.slice(0, 40).trim() + '...' + } + + return text + } + + isValidId(id, elements) { + if (id === '') return true + + return !!elements.find(el => el.id === id) + } + renderActionOptions(triggerIndex, actionIndex, action) { switch (action.type) { case 'nav:goto': return (
-
- - -
+ {this.isValidId(action.value.id, this.props.navItems) ? ( +
+ + +
+ ) : ( +
+ + +
+ )}
) case 'nav:openExternalLink': @@ -250,14 +354,33 @@ class TriggerListModal extends React.Component { case 'assessment:endAttempt': return (
-
- - -
+ {this.isValidId(action.value.id, this.props.navItems) ? ( +
+ + +
+ ) : ( +
+ + +
+ )}
) case 'viewer:alert': @@ -299,14 +422,32 @@ class TriggerListModal extends React.Component { case 'focus:component': return (
-
- - -
+ {this.props.elements && this.isValidId(action.value.id, this.props.elements) ? ( +
+ + +
+ ) : ( +
+ + +
+ )} )} + ) } diff --git a/packages/obonode/obojobo-chunks-action-button/editor-component.test.js b/packages/obonode/obojobo-chunks-action-button/editor-component.test.js index 78435a56c1..20be86c522 100644 --- a/packages/obonode/obojobo-chunks-action-button/editor-component.test.js +++ b/packages/obonode/obojobo-chunks-action-button/editor-component.test.js @@ -88,7 +88,10 @@ describe('ActionButton Editor Node', () => { }) test('opens modal', () => { - const component = mount() + const editor = { + children: [nodeData] + } + const component = mount() component .find('button')