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.

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

Set deny permisssion #1493

Merged
merged 11 commits into from
Apr 28, 2023
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
4 changes: 2 additions & 2 deletions apps/sensenet/cypress.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ export default defineConfig({
id: "/Root/IMS/Public('businesscat')",
},
superAdmin: {
clientId: 'iixy2lBXNIUJq6Gh',
clientSecret: 'QufWcKT4cDdNa8lhs7USupXPR5udUdE61Q2yhj1f1fWsEYwuHaqM3RIuCA2C53Qq',
clientId: 'A5E6uTwVnZpuOddm',
clientSecret: 'WmjbMMPMM8yALI8NrhNmQb4uLUn7SkDQB3O834Wyu3eoMjNy4vLn7uYdpawnGloO',
id: "/Root/IMS/BuiltIn/Portal/('Admin')",
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import { pathWithQueryParams } from '../../../src/services/query-string-builder'

describe('Add new permission entry', () => {
before(() => {
cy.login()
cy.login('superAdmin')
cy.visit(pathWithQueryParams({ path: '/', newParams: { repoUrl: Cypress.env('repoUrl') } }))
})

it('opens a new dialog', () => {
cy.viewport(1840, 890)
cy.get('[data-test="drawer-menu-item-content"]').click()
cy.get('[data-test="menu-item-it-workspace"]').rightclick()
cy.get('[data-test*="-workspace"]').eq(0).rightclick()
cy.get('[data-test="content-context-menu-setpermissions"]').click()
cy.get('[data-test="assign-new-permission"]').click()
cy.get('[data-test="member-select-dialog"]').should('contain.text', 'New permission entry')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ describe('Permission editor dialog buttons', () => {

it('opens the permission editor dialog and clicking on Submit closes it', () => {
cy.get('[data-test="drawer-menu-item-content"]').click()
cy.get('[data-test="menu-item-it-workspace"]').rightclick()
cy.get('[data-test*="-workspace"]').eq(0).rightclick()
cy.get('[data-test="content-context-menu-setpermissions"]').click()
cy.get('[data-test="set-on-this-visitors"]').click()
cy.get('[data-test*="set-on-this-administrators"]').click()

cy.get('[data-test="permission-dialog-title"]').should('have.text', 'Visitors/Root/Content/IT/Groups/Visitors')
cy.get('[data-test="permission-dialog-title"]').should('contain.text', '/Root/IMS/Public/Administrators')
cy.get('[data-test="permission-editor-submit"]').click()
cy.get('[data-test="permission-dialog-title"]').should('not.exist')
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ const expectedMembersAfterAdditon = ['Developer Dog', 'Business Cat']

describe('Editing group member in permission editor', () => {
beforeEach(() => {
cy.login()
cy.login('superAdmin')
cy.visit(pathWithQueryParams({ path: '/', newParams: { repoUrl: Cypress.env('repoUrl') } }))
})

it('adding a new member to a group works from permission editor', () => {
cy.get('[data-test="drawer-menu-item-content"]').click()
cy.get('[data-test="menu-item-it-workspace"]').rightclick()
cy.get('[data-test*="-workspace"]').eq(0).rightclick()
cy.get('[data-test="content-context-menu-setpermissions"]').click()
cy.get('[data-test="permission-inherited-list"]').click()
cy.get('[data-test="inherited-developers"]').click()
Expand All @@ -31,6 +31,7 @@ describe('Editing group member in permission editor', () => {
})
cy.get('[data-test="permission-editor-submit"]').click()
cy.get('[data-test="drawer-menu-item-users-and-groups"]').click()
cy.get('[data-test="menu-item-public"]').click()
cy.get('[data-test="groups"]').click()
cy.get(`[data-test="developers-members"]`).click()
cy.get('[data-test="reference-list"] li')
Expand All @@ -43,7 +44,7 @@ describe('Editing group member in permission editor', () => {

it('contains the appropriate values', () => {
cy.get('[data-test="drawer-menu-item-content"]').click()
cy.get('[data-test="menu-item-it-workspace"]').rightclick()
cy.get('[data-test*="-workspace"]').eq(0).rightclick()
cy.get('[data-test="content-context-menu-setpermissions"]').click()
cy.get('[data-test="permission-inherited-list"]').click()
cy.get('[data-test="inherited-developers"]').click()
Expand Down
54 changes: 39 additions & 15 deletions apps/sensenet/cypress/e2e/permission-editor/force_relations.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,52 @@ describe('Permission editor group switcher and force relations', () => {

it('switching a group switcher influences the permission items', () => {
cy.get('[data-test="drawer-menu-item-content"]').click()
cy.get('[data-test="menu-item-it-workspace"]').rightclick()
cy.get('[data-test*="-workspace"]').eq(0).rightclick()
cy.get('[data-test="content-context-menu-setpermissions"]').click()
cy.get('[data-test="set-on-this-visitors"]').click()
cy.get('[data-test="switcher-read"]').should('be.visible').click()

cy.checkReadPermissionGroup(false)

cy.get('[data-test="permission-editor-submit"]').click()
cy.get('[data-test="set-on-this-administrators"]').click()

cy.setGroupPermission('read', 'allow')
cy.setGroupPermission('read', 'deny')

cy.setGroupPermission('write', 'allow')
cy.setGroupPermission('write', 'deny')
cy.setGroupPermission('versioning', 'allow')
cy.setGroupPermission('versioning', 'deny')
cy.setGroupPermission('advanced', 'allow')
cy.setGroupPermission('advanced', 'deny')

cy.setGroupPermission('read', 'undefined')
cy.setGroupPermission('write', 'undefined')
cy.setGroupPermission('versioning', 'undefined')
cy.setGroupPermission('advanced', 'undefined')
})

it('force relations should work properly', () => {
cy.get('[data-test="drawer-menu-item-content"]').click()
cy.get('[data-test="menu-item-it-workspace"]').rightclick()
cy.get('[data-test="content-context-menu-setpermissions"]').click()
cy.get('[data-test="set-on-this-visitors"]').click()
cy.get('[data-test="permission-group-read"]').click()

cy.get('[data-test="read-group-permissions"]').as('readGroupPermissions')
cy.get('@readGroupPermissions').find('[data-test="permission-item-open"]').as('openPermission')

cy.get('@openPermission').find('[data-test="allow"]').click()

cy.get(`[data-test="read-group-permissions"] input[value="allow"]`).should('be.checked')

cy.get('@readGroupPermissions').find('[data-test="permission-item-see"]').as('seePermission')

cy.checkReadPermissionGroup(false)
cy.get('@seePermission').find('[data-test="undefined"]').click()

cy.get('[data-test="switcher-open"]').should('be.visible').click()
cy.get(`[data-test="read-group-permissions"] input[value="undefined"]`).should('be.checked')

cy.checkReadPermissionGroup(true)
cy.get('@seePermission').find('[data-test="deny"]').click()

cy.get('[data-test="permission-editor-submit"]').click()
cy.get(`[data-test="permission-group-read"] [data-test="permission-switcher"] input[value="deny"]`).should(
'be.checked',
)
cy.get(`[data-test="permission-group-write"] [data-test="permission-switcher"] input[value="deny"]`).should(
'be.checked',
)
cy.get(`[data-test="permission-group-versioning"] [data-test="permission-switcher"] input[value="deny"]`).should(
'be.checked',
)
})
})
13 changes: 13 additions & 0 deletions apps/sensenet/cypress/support/commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,19 @@ Cypress.Commands.add('login', (userType = 'admin') => {
})
})

// setGroup Permission to given permission
Cypress.Commands.add('setGroupPermission', (groupPermisisonName, permission) => {
cy.get(`[data-test="permission-group-${groupPermisisonName}"] [data-test="permission-switcher"]`).as(
'GroupPermissionSwitcher',
)

cy.get('@GroupPermissionSwitcher').should('be.visible')

cy.get('@GroupPermissionSwitcher').find(`[data-test="${permission}"]`).click()

cy.get(`[data-test="${groupPermisisonName}-group-permissions"] input[value=${permission}]`).should('be.checked')
})

//All permissions should be enabled/disabled on Read tab
Cypress.Commands.add('checkReadPermissionGroup', (enabled = true) => {
cy.get('[data-test="switcher-see"]')
Expand Down
6 changes: 6 additions & 0 deletions apps/sensenet/cypress/support/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
declare namespace Cypress {
type UserTypes = 'admin' | 'superAdmin'

type PermissionValues = 'allow' | 'deny' | 'undefined'

interface Chainable {
/**
* Custom command to log in programmatically.
Expand All @@ -21,6 +23,10 @@ declare namespace Cypress {
restoreLocalStorage(): void

checkReadPermissionGroup(enabled?: boolean): void
/**
* Set the permission for the selected group
*/
setGroupPermission(groupPermisisonName: string, permission: PermissionValues): void

/**
* Check the items of the add button dropdown list by name
Expand Down
Loading