diff --git a/.github/workflows/on-code-change.yml b/.github/workflows/on-code-change.yml index d87a0f2..e461983 100644 --- a/.github/workflows/on-code-change.yml +++ b/.github/workflows/on-code-change.yml @@ -26,7 +26,6 @@ jobs: - uses: Jahia/jahia-modules-action/static-analysis@v2 with: skip_lint_modules: true - node_version: 14 auditci_level: critical build: diff --git a/src/main/resources/META-INF/jahia-content-editor-forms/forms/jmix_mainResource_rename_description.json b/src/main/resources/META-INF/jahia-content-editor-forms/forms/jmix_mainResource_rename_description.json index 32d49b9..38ca48c 100644 --- a/src/main/resources/META-INF/jahia-content-editor-forms/forms/jmix_mainResource_rename_description.json +++ b/src/main/resources/META-INF/jahia-content-editor-forms/forms/jmix_mainResource_rename_description.json @@ -4,10 +4,12 @@ "sections": [ { "name": "seo", + "hide": false, "fieldSets": [ { "name": "htmlHead", "labelKey": "site-settings-seo:seo.htmlHeadSection.label", + "rank": 0.1, "fields": [ { "name": "jcr:description", @@ -30,6 +32,7 @@ }, { "name": "jmix:seoHtmlHead", + "rank": 0.2, "isAlwaysActivated": true, "alwaysPresent": true, "hide": true diff --git a/src/main/resources/META-INF/jahia-content-editor-forms/forms/jnt_page_rename_description.json b/src/main/resources/META-INF/jahia-content-editor-forms/forms/jnt_page_rename_description.json index 9604806..dde83b7 100644 --- a/src/main/resources/META-INF/jahia-content-editor-forms/forms/jnt_page_rename_description.json +++ b/src/main/resources/META-INF/jahia-content-editor-forms/forms/jnt_page_rename_description.json @@ -4,10 +4,12 @@ "sections": [ { "name": "seo", + "hide": false, "fieldSets": [ { "name": "htmlHead", "labelKey": "site-settings-seo:seo.htmlHeadSection.label", + "rank": 0.1, "fields": [ { "name": "jcr:description", @@ -30,6 +32,7 @@ }, { "name": "jmix:seoHtmlHead", + "rank": 0.2, "isAlwaysActivated": true, "alwaysPresent": true, "hide": true diff --git a/tests/cypress/e2e/seoOverrides/definitions.cy.ts b/tests/cypress/e2e/seoOverrides/definitions.cy.ts index db9c756..f57c3d8 100644 --- a/tests/cypress/e2e/seoOverrides/definitions.cy.ts +++ b/tests/cypress/e2e/seoOverrides/definitions.cy.ts @@ -77,8 +77,10 @@ describe('New SEO field definition tests', () => { }) }) - it('should not have new SEO fields for other types', function () { - JContent.visit(siteKey, 'en', 'content-folders/contents').createContent('Rich text').openSection('seo') + it('should not have SEO section and new SEO fields for other types', function () { + JContent.visit(siteKey, 'en', 'content-folders/contents').createContent('Rich text') + cy.get(`[data-sel-content-editor-fields-group="seo"]`).should('not.exist', { timeout: 10000 }) + const assertFieldNotExist = (contentType) => { cy.get(`[data-sel-content-editor-field="${contentType}"]`).should('not.exist', { timeout: 10000 }) }