@jahia/cypress 3.32.0 → 3.34.0

package/dist/page-object/moonstone/menu.d.ts

@@ -8,5 +8,7 @@ export declare class Menu extends BaseComponent {
     shouldNotHaveItem(item: string): void;
     select(item: string): Menu;
     selectByRole(item: string): Menu;
+    /** Can be used for choicelist dropdown menu */
+    selectByValue(value: string): Menu;
     close(): Chainable<unknown>;
 }

package/dist/page-object/moonstone/menu.js

@@ -44,6 +44,12 @@ var Menu = /** @class */ (function (_super) {
         this.get().find(".moonstone-menuItem[data-sel-role=\"" + item + "\"]").trigger('click');
         return this;
     };
+    /** Can be used for choicelist dropdown menu */
+    Menu.prototype.selectByValue = function (value) {
+        this.get().find(".moonstone-menuItem[data-value=\"" + value + "\"]").scrollIntoView().should('be.visible');
+        this.get().find(".moonstone-menuItem[data-value=\"" + value + "\"]").trigger('click');
+        return this;
+    };
     Menu.prototype.close = function () {
         return cy.get(Menu.overlaySelector).click('topRight');
     };

package/dist/utils/JahiaPlatformHelper.d.ts

@@ -1 +1,3 @@
 export declare const getJahiaVersion: () => Cypress.Chainable;
+export declare const getStartedModulesVersion: () => Cypress.Chainable;
+export declare const getStartedModuleVersion: (moduleId: string) => Cypress.Chainable;

package/dist/utils/JahiaPlatformHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 exports.__esModule = true;
-exports.getJahiaVersion = void 0;
+exports.getStartedModuleVersion = exports.getStartedModulesVersion = exports.getJahiaVersion = void 0;
 var getJahiaVersion = function () {
     return cy.apollo({
         fetchPolicy: 'no-cache',
@@ -11,3 +11,20 @@ var getJahiaVersion = function () {
     });
 };
 exports.getJahiaVersion = getJahiaVersion;
+var getStartedModulesVersion = function () {
+    return cy.apollo({
+        fetchPolicy: 'no-cache',
+        queryFile: 'graphql/jcr/query/getStartedModulesVersion.graphql'
+    }).then(function (result) {
+        var _a;
+        return (_a = result === null || result === void 0 ? void 0 : result.data) === null || _a === void 0 ? void 0 : _a.dashboard.modules;
+    });
+};
+exports.getStartedModulesVersion = getStartedModulesVersion;
+var getStartedModuleVersion = function (moduleId) {
+    return exports.getStartedModulesVersion().then(function (modules) {
+        var _a;
+        return (_a = modules.find(function (module) { return module.id === moduleId; })) === null || _a === void 0 ? void 0 : _a.version;
+    });
+};
+exports.getStartedModuleVersion = getStartedModuleVersion;

package/dist/utils/PublicationAndWorkflowHelper.js

@@ -55,7 +55,7 @@ var waitAllJobsFinished = function (errorMessage, timeout) {
         })
             .then(function (response) {
             var _a, _b, _c, _d;
-            var jobs = (_d = (_c = (_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.admin) === null || _b === void 0 ? void 0 : _b.jahia) === null || _c === void 0 ? void 0 : _c.scheduler) === null || _d === void 0 ? void 0 : _d.jobs;
+            var jobs = (_d = (_c = (_b = (_a = response === null || response === void 0 ? void 0 : response.data) === null || _a === void 0 ? void 0 : _a.admin) === null || _b === void 0 ? void 0 : _b.jahia) === null || _c === void 0 ? void 0 : _c.scheduler) === null || _d === void 0 ? void 0 : _d.jobs.nodes;
             var publicationJobs = jobs.filter(function (job) { return job.group === 'PublicationJob'; });
             var hasActivePublicationJobs = publicationJobs.some(function (job) { return job.jobStatus === 'EXECUTING'; });
             return !hasActivePublicationJobs;

package/fixtures/graphql/jcr/query/getJobsWithStatus.graphql

@@ -3,9 +3,11 @@ query getJobsWithStatus{
         jahia {
             scheduler{
                 jobs {
-                    siteKey
-                    group
-                    jobStatus
+                    nodes {
+                        siteKey
+                        group
+                        jobStatus
+                    }
                 }
             }
         }

package/fixtures/graphql/jcr/query/getStartedModulesVersion.graphql

@@ -0,0 +1,8 @@
+query getStartedModulesVersion {
+    dashboard {
+        modules {
+            id
+            version
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jahia/cypress",
-  "version": "3.32.0",
+  "version": "3.34.0",
   "scripts": {
     "build": "tsc",
     "lint": "eslint src -c .eslintrc.json --ext .ts"

package/schema.graphql

@@ -100,6 +100,8 @@ interface JCRNode {
     defaultWipInfo: wipInfo
     "Returns the node definition that applies to this node."
     definition: JCRNodeDefinition
+    "The depth in the JCR Tree of the JCR node this object represents"
+    depth: Int!
     "GraphQL representation of a descendant node, based on its relative path"
     descendant(
         "Name or relative path of the sub node"
@@ -123,6 +125,8 @@ interface JCRNode {
         last: Int,
         "fetching only the first certain number of nodes"
         limit: Int,
+        "Maximum depth in JCR tree for descendants from the current node, 0 (or less) for all sub nodes, 1 for one sub level, etc"
+        maxDepth: Int,
         "fetching only nodes after this node (inclusive)"
         offset: Int,
         "Filter of descendant nodes by their property values; null to avoid such filtering"
@@ -749,6 +753,8 @@ type GenericJCRNode implements JCRNode {
     defaultWipInfo: wipInfo
     "Returns the node definition that applies to this node."
     definition: JCRNodeDefinition
+    "The depth in the JCR Tree of the JCR node this object represents"
+    depth: Int!
     "GraphQL representation of a descendant node, based on its relative path"
     descendant(
         "Name or relative path of the sub node"
@@ -772,6 +778,8 @@ type GenericJCRNode implements JCRNode {
         last: Int,
         "fetching only the first certain number of nodes"
         limit: Int,
+        "Maximum depth in JCR tree for descendants from the current node, 0 (or less) for all sub nodes, 1 for one sub level, etc"
+        maxDepth: Int,
         "fetching only nodes after this node (inclusive)"
         offset: Int,
         "Filter of descendant nodes by their property values; null to avoid such filtering"
@@ -998,29 +1006,36 @@ type GqlBackgroundJob {
     group: String
     "The job (Boolean) property that correspond to the given name. The returned value will be null in case the job doesn't have the property"
     jobBooleanProperty(
-        "The job name"
+        "The name of the property"
         name: String
     ): Boolean
+    "Job description"
+    jobDescription: String
     "The job (Int) property that correspond to the given name. The returned value will be null in case the job doesn't have the property"
     jobIntegerProperty(
-        "The job name"
+        "The name of the property"
         name: String
     ): Int
     "The job (Long) property that correspond to the given name. The returned value will be null in case the job doesn't have the property"
     jobLongProperty(
-        "The job name"
+        "The name of the property"
         name: String
     ): Long
     "The job state is different from the status, it reflect the last action done on the job instance (Started, Vetoed, Finished)"
     jobState: GqlBackgroundJobState
     "The job status"
     jobStatus: GqlBackgroundJobStatus
+    "List of strings property from the job map (eg. publicationInfos, publicationPaths)"
+    jobStringListProperty(
+        "The name of the property"
+        name: String
+    ): [String]
     "The job (String) property that correspond to the given name. The returned value will be null in case the job doesn't have the property"
     jobStringProperty(
-        "The job name"
+        "The name of the property"
         name: String
     ): String
-    "The job name"
+    "The name of the property"
     name: String
     "GraphQL representation of publication job"
     publicationJob: GqlPublicationBackgroundJob
@@ -1030,6 +1045,26 @@ type GqlBackgroundJob {
     userKey: String
 }
 
+"A connection to a list of items."
+type GqlBackgroundJobConnection {
+    "a list of edges"
+    edges: [GqlBackgroundJobEdge]
+    "a list of nodes"
+    nodes: [GqlBackgroundJob]
+    "details about this specific page"
+    pageInfo: PageInfo!
+}
+
+"An edge in a connection"
+type GqlBackgroundJobEdge {
+    "cursor marks a unique position or index into the connection"
+    cursor: String!
+    "index in the connection"
+    index: Int
+    "The item at the end of the edge"
+    node: GqlBackgroundJob
+}
+
 "Condition for override item"
 type GqlCondition {
     "Item will apply only on this nodetype"
@@ -1109,58 +1144,6 @@ type GqlDashboard {
     toolsAccess: Boolean
 }
 
-type GqlDistributedSessionsMutation {
-    "Delete a session"
-    removeSession(
-        "Session id"
-        id: String!
-    ): Boolean
-}
-
-type GqlDistributedSessionsQuery {
-    localSessions(
-        "fetching only nodes after this node (exclusive)"
-        after: String,
-        "fetching only nodes before this node (exclusive)"
-        before: String,
-        "Filter by graphQL fields values"
-        fieldFilter: InputFieldFiltersInput,
-        "Group fields by criteria"
-        fieldGrouping: InputFieldGroupingInput,
-        "sort by GraphQL field values"
-        fieldSorter: InputFieldSorterInput,
-        "fetching only the first certain number of nodes"
-        first: Int,
-        "fetching only the last certain number of nodes"
-        last: Int,
-        "fetching only the first certain number of nodes"
-        limit: Int,
-        "fetching only nodes after this node (inclusive)"
-        offset: Int
-    ): GqlSessionConnection
-    sessions(
-        "fetching only nodes after this node (exclusive)"
-        after: String,
-        "fetching only nodes before this node (exclusive)"
-        before: String,
-        "Filter by graphQL fields values"
-        fieldFilter: InputFieldFiltersInput,
-        "Group fields by criteria"
-        fieldGrouping: InputFieldGroupingInput,
-        "sort by GraphQL field values"
-        fieldSorter: InputFieldSorterInput,
-        "fetching only the first certain number of nodes"
-        first: Int,
-        "fetching only the last certain number of nodes"
-        last: Int,
-        "fetching only the first certain number of nodes"
-        limit: Int,
-        "fetching only nodes after this node (inclusive)"
-        offset: Int
-    ): GqlSessionConnection
-    sessionsCount: Int
-}
-
 type GqlEditorForm {
     "Retrieve a description text for the form, might contain explanations on how to use the form"
     description: String
@@ -1380,9 +1363,29 @@ type GqlHealthCheck {
     status: GqlProbeStatus
 }
 
-type GqlHzPartition {
-    id: Int
-    owner: String
+"jContent API"
+type GqlJContent {
+    "Returns html with marked differences"
+    diffHtml(
+        "New html"
+        newHtml: String,
+        "Original html"
+        originalHtml: String
+    ): String
+}
+
+"jContent API"
+type GqlJContentMutations {
+    "Flushes cache for a page, checks adminCache permission and node type"
+    flushPageCache(
+        "Page path"
+        pagePath: String!
+    ): Boolean
+    "Flushes cache for a site, will resolve site node if the path supplied is not a site, checks adminCache permission"
+    flushSiteCache(
+        "Site path"
+        sitePath: String!
+    ): Boolean
 }
 
 type GqlJcrImageTransformMutation {
@@ -1582,31 +1585,38 @@ type GqlPublicationBackgroundJob {
     group: String
     "The job (Boolean) property that correspond to the given name. The returned value will be null in case the job doesn't have the property"
     jobBooleanProperty(
-        "The job name"
+        "The name of the property"
         name: String
     ): Boolean
+    "Job description"
+    jobDescription: String
     "The job (Int) property that correspond to the given name. The returned value will be null in case the job doesn't have the property"
     jobIntegerProperty(
-        "The job name"
+        "The name of the property"
         name: String
     ): Int
     "The job (Long) property that correspond to the given name. The returned value will be null in case the job doesn't have the property"
     jobLongProperty(
-        "The job name"
+        "The name of the property"
         name: String
     ): Long
     "The job state is different from the status, it reflect the last action done on the job instance (Started, Vetoed, Finished)"
     jobState: GqlBackgroundJobState
     "The job status"
     jobStatus: GqlBackgroundJobStatus
+    "List of strings property from the job map (eg. publicationInfos, publicationPaths)"
+    jobStringListProperty(
+        "The name of the property"
+        name: String
+    ): [String]
     "The job (String) property that correspond to the given name. The returned value will be null in case the job doesn't have the property"
     jobStringProperty(
-        "The job name"
+        "The name of the property"
         name: String
     ): String
     "Publication language"
     language: String
-    "The job name"
+    "The name of the property"
     name: String
     "The site key. The returned value will be null in case the job doesn't have associated site key"
     siteKey: String
@@ -1645,7 +1655,26 @@ type GqlPublicationInfo {
 "Scheduler object which allows to access to background jobs"
 type GqlScheduler {
     "List of active jobs"
-    jobs: [GqlBackgroundJob]
+    jobs(
+        "fetching only nodes after this node (exclusive)"
+        after: String,
+        "fetching only nodes before this node (exclusive)"
+        before: String,
+        "Exclude jobs with these statuses"
+        excludeStatuses: [GqlBackgroundJobStatus],
+        "fetching only the first certain number of nodes"
+        first: Int,
+        "The group jobs belong to"
+        group: String,
+        "Include jobs with these statuses"
+        includeStatuses: [GqlBackgroundJobStatus],
+        "fetching only the last certain number of nodes"
+        last: Int,
+        "fetching only the first certain number of nodes"
+        limit: Int,
+        "fetching only nodes after this node (inclusive)"
+        offset: Int
+    ): GqlBackgroundJobConnection
 }
 
 "API Scope"
@@ -1656,36 +1685,6 @@ type GqlScope {
     name: String
 }
 
-type GqlSession {
-    cost: Long
-    creationTime: String
-    id: String
-    lastAccessedTime: String
-    maxInactiveIntervalInSeconds: Int
-    partition: GqlHzPartition
-    user: User
-}
-
-"A connection to a list of items."
-type GqlSessionConnection {
-    "a list of edges"
-    edges: [GqlSessionEdge]
-    "a list of nodes"
-    nodes: [GqlSession]
-    "details about this specific page"
-    pageInfo: PageInfo!
-}
-
-"An edge in a connection"
-type GqlSessionEdge {
-    "cursor marks a unique position or index into the connection"
-    cursor: String!
-    "index in the connection"
-    index: Int
-    "The item at the end of the edge"
-    node: GqlSession
-}
-
 type GqlWorkflowEvent {
     "Number of tasks for current user"
     activeWorkflowTaskCountForUser: Int
@@ -2630,6 +2629,8 @@ type JCRSite implements JCRNode {
     defaultWipInfo: wipInfo
     "Returns the node definition that applies to this node."
     definition: JCRNodeDefinition
+    "The depth in the JCR Tree of the JCR node this object represents"
+    depth: Int!
     "GraphQL representation of a descendant node, based on its relative path"
     descendant(
         "Name or relative path of the sub node"
@@ -2653,6 +2654,8 @@ type JCRSite implements JCRNode {
         last: Int,
         "fetching only the first certain number of nodes"
         limit: Int,
+        "Maximum depth in JCR tree for descendants from the current node, 0 (or less) for all sub nodes, 1 for one sub level, etc"
+        maxDepth: Int,
         "fetching only nodes after this node (inclusive)"
         offset: Int,
         "Filter of descendant nodes by their property values; null to avoid such filtering"
@@ -2682,7 +2685,7 @@ type JCRSite implements JCRNode {
         "The name of the permission"
         permissionName: String!
     ): Boolean
-    "Returns the node of the home page"
+    "Returns the node of the home page or null if no home page is defined or is not accessible"
     homePage: JCRNode
     "Retrieves a collection of module IDs, which are installed on the site, the node belongs to"
     installedModules: [String]
@@ -2929,8 +2932,6 @@ type JahiaAdminMutation {
         "Service name"
         service: String!
     ): Boolean
-    "Distributed sessions admin"
-    distributedSessions: GqlDistributedSessionsMutation
     "Shutdown the server"
     shutdown(
         "Do not send the shutdown event"
@@ -2953,8 +2954,6 @@ type JahiaAdminQuery {
     ): GqlConfigurationQuery
     "Details about the database Jahia is connected to"
     database: JahiaDatabase
-    "Distributed sessions admin"
-    distributedSessions: GqlDistributedSessionsQuery
     "HealthCheck node"
     healthCheck(
         "Returns only SAM probes with probe names included in this list"
@@ -3112,6 +3111,8 @@ type Mutation {
     admin: AdminMutation!
     "Main access field to the DX GraphQL Form mutation API"
     forms: GqlEditorFormMutations
+    "Main access field to the jContent mutation API"
+    jcontent: GqlJContentMutations
     "JCR Mutation"
     jcr(
         "Should save"
@@ -3328,6 +3329,8 @@ type Query {
     dashboard: GqlDashboard
     "Main access field to the DX GraphQL Form API"
     forms: GqlEditorForms
+    "Main access field to the jContent API"
+    jcontent: GqlJContent
     "JCR Queries"
     jcr(
         "The name of the workspace to fetch the node from; either EDIT, LIVE, or null to use EDIT by default"
@@ -3686,6 +3689,8 @@ type VanityUrl implements JCRNode {
     defaultWipInfo: wipInfo
     "Returns the node definition that applies to this node."
     definition: JCRNodeDefinition
+    "The depth in the JCR Tree of the JCR node this object represents"
+    depth: Int!
     "GraphQL representation of a descendant node, based on its relative path"
     descendant(
         "Name or relative path of the sub node"
@@ -3709,6 +3714,8 @@ type VanityUrl implements JCRNode {
         last: Int,
         "fetching only the first certain number of nodes"
         limit: Int,
+        "Maximum depth in JCR tree for descendants from the current node, 0 (or less) for all sub nodes, 1 for one sub level, etc"
+        maxDepth: Int,
         "fetching only nodes after this node (inclusive)"
         offset: Int,
         "Filter of descendant nodes by their property values; null to avoid such filtering"

package/src/page-object/moonstone/menu.ts

@@ -32,6 +32,13 @@ export class Menu extends BaseComponent {
         return this;
     }
 
+    /** Can be used for choicelist dropdown menu */
+    selectByValue(value: string): Menu {
+        this.get().find(`.moonstone-menuItem[data-value="${value}"]`).scrollIntoView().should('be.visible');
+        this.get().find(`.moonstone-menuItem[data-value="${value}"]`).trigger('click');
+        return this;
+    }
+
     close(): Chainable<unknown> {
         return cy.get(Menu.overlaySelector).click('topRight');
     }

package/src/utils/JahiaPlatformHelper.ts

@@ -6,3 +6,18 @@ export const getJahiaVersion = (): Cypress.Chainable => {
         return result?.data?.admin.jahia.version;
     });
 };
+
+export const getStartedModulesVersion = (): Cypress.Chainable => {
+    return cy.apollo({
+        fetchPolicy: 'no-cache',
+        queryFile: 'graphql/jcr/query/getStartedModulesVersion.graphql'
+    }).then(result => {
+        return result?.data?.dashboard.modules;
+    });
+};
+
+export const getStartedModuleVersion = (moduleId: string): Cypress.Chainable => {
+    return getStartedModulesVersion().then(modules => {
+        return modules.find(module => module.id === moduleId)?.version;
+    });
+};

package/src/utils/PublicationAndWorkflowHelper.ts

@@ -51,7 +51,7 @@ export const waitAllJobsFinished = (errorMessage?: string, timeout = 60000): voi
                     queryFile: 'graphql/jcr/query/getJobsWithStatus.graphql'
                 })
                 .then(response => {
-                    const jobs = response?.data?.admin?.jahia?.scheduler?.jobs;
+                    const jobs = response?.data?.admin?.jahia?.scheduler?.jobs.nodes;
                     const publicationJobs = jobs.filter(job => job.group === 'PublicationJob');
                     const hasActivePublicationJobs = publicationJobs.some(job => job.jobStatus === 'EXECUTING');
                     return !hasActivePublicationJobs;