Skip to content

Dropdown ID inputs for trigger modal #1935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: dev/29-sodalite
Choose a base branch
from
Open

Dropdown ID inputs for trigger modal #1935

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dcf40e2
changes trigger modal id inputs to dropdowns
jpeterson976 Nov 23, 2021
a69ad16
resolves errors with trigger modal in buttons and nav pages ☢
jpeterson976 Dec 2, 2021
af95cba
fixed an error with buttons and adding triggers to nav items
jpeterson976 Feb 3, 2022
796b3f6
fixed bug that prevented creating a new page
jpeterson976 Feb 3, 2022
35bc190
prevents an error when attempting to edit a newly created module
jpeterson976 Feb 10, 2022
d4096ea
prevents an error when adding a focus:component action after creating…
jpeterson976 Feb 22, 2022
431ef27
list of elements in trigger modal now updates with new nodes in the n…
jpeterson976 Mar 7, 2022
5a3717c
adds id property to default trigger actions to allow for the new drop…
jpeterson976 Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions ...nt-engine/__tests__/oboeditor/components/navigation/__snapshots__/editor-nav.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,74 @@ exports[`EditorNav EditorNav component with all list item types 1`] = `
</div>
`;

exports[`EditorNav EditorNav component with start page 1`] = `
<div
className="visual-editor--draft-nav is-locked is-not-open is-enabled"
>
<ul>
<li
className="heading is-not-selected"
>
<span>
label4
</span>
<div
className="visual-editor--more-info "
onKeyDown={[Function]}
>
<button
aria-label="Toggle More Info Box"
className="more-info-button "
onClick={[Function]}
tabIndex={0}
>
<svg
fill="none"
stroke="#000"
viewBox="0 0 214 214"
xmlns="http://www.w3.org/2000/svg"
>
<circle
cx="107"
cy="107"
r="100"
strokeWidth="14"
/>
<circle
cx="57"
cy="107"
fill="#000"
r="7"
strokeWidth="16"
/>
<circle
cx="107"
cy="107"
fill="#000"
r="7"
strokeWidth="16"
/>
<circle
cx="157"
cy="107"
fill="#000"
r="7"
strokeWidth="16"
/>
</svg>
</button>
</div>
</li>
</ul>
<button
className="add-node-button"
onClick={[Function]}
>
+ Add Assessment
</button>
</div>
`;

exports[`EditorNav addAssessment hides the modal and calls EditorUtil 1`] = `undefined`;

exports[`EditorNav addAssessment hides the modal and calls EditorUtil 2`] = `undefined`;
Expand Down
30 changes: 15 additions & 15 deletions ...engine/__tests__/oboeditor/components/navigation/__snapshots__/more-info-box.test.js.snap
View file
Open in desktop

Large diffs are not rendered by default.

25 changes: 23 additions & 2 deletions ...ment-engine/__tests__/oboeditor/components/navigation/__snapshots__/sub-menu.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
]
}</div><div class=\\"add-page\\"><button class=\\"add-page-button\\">+ Page</button></div></li>"
`;

Expand Down Expand Up @@ -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
}
}
]
}
</div>
</li>
Expand Down
107 changes: 101 additions & 6 deletions .../app/obojobo-document-engine/__tests__/oboeditor/components/navigation/editor-nav.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ describe('EditorNav', () => {
test('EditorNav component', () => {
EditorUtil.getOrderedList.mockReturnValueOnce([])
const props = {
navState: {}
navState: {},
model: {
attributes: {
content: {}
}
}
}
const component = renderer.create(<EditorNav {...props} />)
const tree = component.toJSON()
Expand All @@ -49,7 +54,12 @@ describe('EditorNav', () => {
test('EditorNav component adds page', () => {
EditorUtil.getOrderedList.mockReturnValueOnce([])
const props = {
navState: {}
navState: {},
model: {
attributes: {
content: {}
}
}
}
const component = mount(<EditorNav {...props} />)

Expand All @@ -65,7 +75,12 @@ describe('EditorNav', () => {
test('EditorNav component adds assessment', () => {
EditorUtil.getOrderedList.mockReturnValueOnce([])
const props = {
navState: {}
navState: {},
model: {
attributes: {
content: {}
}
}
}
const component = mount(<EditorNav {...props} />)

Expand Down Expand Up @@ -118,6 +133,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(<EditorNav {...props} />)
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(<EditorNav {...props} />)
Expand All @@ -139,7 +211,20 @@ describe('EditorNav', () => {
])
.mockReturnValueOnce([])

const props = { navState: {} }
const props = {
navState: {},
model: {
attributes: {
content: {},
children: [
{},
{
children: [{ children: [{ children: [] }] }, { children: [{ children: [] }] }]
}
]
}
}
}
const component = mount(<EditorNav {...props} />)

component.instance().onNavItemClick({
Expand All @@ -157,7 +242,12 @@ describe('EditorNav', () => {
test('addAssessment hides the modal and calls EditorUtil', () => {
EditorUtil.getOrderedList.mockReturnValue([])
const props = {
navState: {}
navState: {},
model: {
attributes: {
content: {}
}
}
}
const component = mount(<EditorNav {...props} />)

Expand All @@ -177,7 +267,12 @@ describe('EditorNav', () => {
test('addPage hides the modal and calls EditorUtil', () => {
EditorUtil.getOrderedList.mockReturnValue([])
const props = {
navState: {}
navState: {},
model: {
attributes: {
content: {}
}
}
}
const component = mount(<EditorNav {...props} />)

Expand Down
12 changes: 7 additions & 5 deletions ...ine/__tests__/oboeditor/components/triggers/__snapshots__/trigger-list-modal.test.js.snap
View file
Open in desktop

Large diffs are not rendered by default.

Loading