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

BACKLOG-21626: Backport #181

Merged
merged 3 commits into from
Nov 8, 2023
Merged

BACKLOG-21626: Backport #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b5e226d
BACKLOG-21626: Update check permission test
jahia-carp Nov 3, 2023
476963f
BACKLOG-21626: Update label/description and check vanity action write…
jahia-carp Nov 2, 2023
9c45753
BACKLOG-21626: fix cypress test
jahia-carp Nov 8, 2023
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
2 changes: 1 addition & 1 deletion src/javascript/components/actions/VanityAction.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export const VanityAction = ({render: Render, loading: Loading, label, requiredP
return (
<>
<Render
enabled={mode !== 'create'}
enabled={mode !== 'create' && nodeData.hasWritePermission}
{...otherProps}
mode={mode}
buttonLabel={label}
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/resources/site-settings-seo_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
jnt_siteSettingsSeo=SEO
label.permission.siteAdminUrlmapping.description=Erm�glicht Ihnen die Verwaltung von Vanity-URLs einer Website
label.permission.siteAdminUrlmapping=Site admin url mapping
label.permission.siteAdminUrlmapping=SEO & Vanity-URLs
label.permission.siteAdminUrlmapping.description=Zugriff auf SEO-Funktionen in jContent => Zus�tzlich, einschlie�lich Vanity-URLs Dashboard.
label.permission.viewVanityUrlModal.description=Bearbeiten Sie Vanity-URLs f�r Website
siteSettingsSeo.title=URL-Mappings
5 changes: 2 additions & 3 deletions src/main/resources/resources/site-settings-seo_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
jnt_siteSettingsSeo=SEO
label.permission.siteAdminUrlmapping=Site admin url mapping
label.permission.siteAdminUrlmapping.description=Allows you to manage vanity URLs of a site
label.permission.siteAdminUrlmapping=Site admin url mapping
label.permission.siteAdminUrlmapping=SEO & Vanity URLs
label.permission.siteAdminUrlmapping.description=Access to SEO features in jContent => Additional, including vanity URLs dashboard
label.permission.viewVanityUrlModal.description=Edit Vanity URLs for site
siteSettingsSeo.title=Vanity URLs
5 changes: 2 additions & 3 deletions src/main/resources/resources/site-settings-seo_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
jnt_siteSettingsSeo=SEO
label.permission.siteAdminUrlmapping=Site admin url mapping
label.permission.siteAdminUrlmapping.description=Permet de g�rer les mapping d'URLs d'un site
label.permission.siteAdminUrlmapping=Site admin url mapping
label.permission.siteAdminUrlmapping=SEO & URL personnalis�es
label.permission.siteAdminUrlmapping.description=Acc�s aux fonctionnalit�s SEO dans jContent => Extensions, y compris le tableau de bord des URLs personnalis�es.
label.permission.viewVanityUrlModal.description=Modifier les URL personnalis�es pour le site
siteSettingsSeo.title=URL personnalis�es
6 changes: 2 additions & 4 deletions tests/cypress/e2e/permissions/checkUisPermissions.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,13 @@ describe('Test UIs permissions', () => {
cy.logout()
})

it('Verify that user have access to vanity url in content editor in read only', function () {
it('Verify that user have no access to vanity url modal in content editor in read only', function () {
cy.login('secondEditorUser', 'password')
const composer = new PageComposer()
PageComposer.visit(siteKey, 'en', 'home.html')
composer.editPage(`${pageName}-a`)
const contenteditor = new ContentEditorSEO()
const vanityUrlUi = contenteditor.openVanityUrlUi()
vanityUrlUi.findReadOnlyBadge().should('exist')
vanityUrlUi.getVanityUrlRow('/vanityOnPageA').should('exist')
contenteditor.checkVanityUrlAccessibility('false')
cy.logout()
})
})
5 changes: 5 additions & 0 deletions tests/cypress/page-object/ContentEditorSEO.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,9 @@ export class ContentEditorSEO extends ContentEditor {
cy.get('li[data-sel-role="vanityUrls"]').click()
return new VanityUrlUi()
}

checkVanityUrlAccessibility(enabled) {
cy.get('button[data-sel-role="3dotsMenuAction"]').click()
cy.get('li[data-sel-role="vanityUrls"]').should('have.attr', 'aria-disabled', enabled)
}
}