Skip to content
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

Add Access Levels to Sharing Permissions #1997

Merged
merged 16 commits into from
Nov 16, 2022
Merged

Add Access Levels to Sharing Permissions #1997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
faef75f
add access level column to draft
deundrewilliams Mar 24, 2022
6b1fdc7
allow users to change other users' access levels
deundrewilliams Mar 29, 2022
f9d1cd3
allow users to change other users' access levels
deundrewilliams Mar 30, 2022
8967ed1
add access level changes to more views, disable delete in visual edit…
deundrewilliams Apr 4, 2022
f8653bf
allow anyone with full access level to delete modules
deundrewilliams Apr 6, 2022
1d5995e
css updates for access levels
deundrewilliams Apr 11, 2022
cbdfcbd
add access level support to bulk operations
deundrewilliams Apr 18, 2022
a598c5d
bug fixes, hiding module options instead of disabling
deundrewilliams Apr 19, 2022
80f087c
merge dev/28
deundrewilliams Apr 19, 2022
17616a5
remove all refs to userHasPermissionToDraft
deundrewilliams Apr 19, 2022
9df7844
css fixes, fix module deselection when closing a modal
deundrewilliams Apr 21, 2022
2241d2e
clean up
deundrewilliams Aug 25, 2022
37c2837
remove unneeded changes
deundrewilliams Aug 25, 2022
17a511f
use constants instead of strings
deundrewilliams Sep 15, 2022
f85c25a
use access level constants
deundrewilliams Sep 19, 2022
c483ad1
update people list item styling
deundrewilliams Sep 19, 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
5 changes: 5 additions & 0 deletions ...o-document-engine/__tests__/oboeditor/components/__snapshots__/visual-editor.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,7 @@ exports[`VisualEditor VisualEditor component 1`] = `
</button>
</div>
<div
accessLevel={1}
className="mockFileToolbarViewer"
insertableItems="mock-insertable-items"
mode="visual"
Expand Down Expand Up @@ -1177,6 +1178,7 @@ exports[`VisualEditor VisualEditor component changes pages 1`] = `
</button>
</div>
<div
accessLevel={1}
className="mockFileToolbarViewer"
insertableItems="mock-insertable-items"
mode="visual"
Expand Down Expand Up @@ -1820,6 +1822,7 @@ exports[`VisualEditor VisualEditor component changes pages 2`] = `
</button>
</div>
<div
accessLevel={1}
className="mockFileToolbarViewer"
insertableItems="mock-insertable-items"
mode="visual"
Expand Down Expand Up @@ -2509,6 +2512,7 @@ exports[`VisualEditor VisualEditor component with no page 1`] = `
</button>
</div>
<div
accessLevel={1}
className="mockFileToolbarViewer"
insertableItems="mock-insertable-items"
mode="visual"
Expand Down Expand Up @@ -3148,6 +3152,7 @@ exports[`VisualEditor reload disables event listener and calls location.reload 1
</button>
</div>
<div
accessLevel={1}
className="mockFileToolbarViewer"
insertableItems="mock-insertable-items"
mode="visual"
Expand Down
2 changes: 1 addition & 1 deletion ...ument-engine/__tests__/oboeditor/components/toolbars/__snapshots__/file-menu.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

exports[`File Menu File Menu node 1`] = `
"<div class=\\"visual-editor--drop-down-menu\\"><div class=\\"dropdown is-not-open\\" tabindex=\\"-1\\"><button class=\\"menu-title\\">File</button><div class=\\"menu-items\\"><button>Save Module<span>
CTRL+S</span></button><button>New</button><button>Make a copy...</button><div class=\\"dropdown is-not-open\\" tabindex=\\"-1\\"><button class=\\"menu-title\\">Download</button><div class=\\"menu-items\\"><button>XML Document (.xml)</button><button>JSON Document (.json)</button></div></div><button>Import from file...</button><button>Delete Module...</button><button>Copy LTI Link</button></div></div></div>"
CTRL+S</span></button><button>New</button><button>Make a copy...</button><div class=\\"dropdown is-not-open\\" tabindex=\\"-1\\"><button class=\\"menu-title\\">Download</button><div class=\\"menu-items\\"><button>XML Document (.xml)</button><button>JSON Document (.json)</button></div></div><button>Import from file...</button><button disabled=\\"\\">Delete Module...</button><button>Copy LTI Link</button></div></div></div>"
`;
18 changes: 17 additions & 1 deletion ...ges/app/obojobo-document-engine/__tests__/oboeditor/components/toolbars/file-menu.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jest.mock('../../../../src/scripts/oboeditor/stores/editor-store', () => ({
import { downloadDocument } from '../../../../src/scripts/common/util/download-document'
jest.mock('../../../../src/scripts/common/util/download-document')

import { FULL, PARTIAL } from 'obojobo-express/server/constants'

const CONTENT_NODE = 'ObojoboDraft.Sections.Content'
const ASSESSMENT_NODE = 'ObojoboDraft.Sections.Assessment'

Expand Down Expand Up @@ -166,7 +168,7 @@ describe('File Menu', () => {
title: 'mockTitle'
}

const component = mount(<FileMenu draftId="mockDraft" model={model} />)
const component = mount(<FileMenu draftId="mockDraft" model={model} accessLevel={FULL} />)

component
.findWhere(n => n.type() === 'button' && n.html().includes('Delete Module...'))
Expand All @@ -175,6 +177,20 @@ describe('File Menu', () => {
expect(ModalUtil.show).toHaveBeenCalled()
})

test('FileMenu does not call Delete if accessLevel is not "Full"', () => {
const model = {
title: 'mockTitle'
}

const component = mount(<FileMenu draftId="mockDraft" model={model} accessLevel={PARTIAL} />)

component
.findWhere(n => n.type() === 'button' && n.html().includes('Delete Module...'))
.simulate('click')

expect(ModalUtil.show).not.toHaveBeenCalled()
})

test('FileMenu calls Copy LTI Link', () => {
const model = {
title: 'mockTitle'
Expand Down
Loading