@jahia/cypress 3.34.0 → 4.0.0

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.nodes;
+            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 publicationJobs = jobs.filter(function (job) { return job.group === 'PublicationJob'; });
             var hasActivePublicationJobs = publicationJobs.some(function (job) { return job.jobStatus === 'EXECUTING'; });
             return !hasActivePublicationJobs;

package/env.Dockerfile

@@ -1,4 +1,4 @@
-FROM cypress/browsers:node-20.10.0-chrome-118.0.5993.88-1-ff-118.0.2-edge-118.0.2088.46-1
+FROM cypress/browsers:node-22.13.1-chrome-132.0.6834.159-1-ff-134.0.2-edge-132.0.2957.127-1
 
 ARG MAVEN_VER="3.8.1"
 ARG MAVEN_BASE_URL="https://archive.apache.org/dist/maven/maven-3"

package/env.provision.sh

@@ -81,13 +81,13 @@ if [[ -d artifacts/ ]]; then
     echo "$(date +'%d %B %Y - %k:%M') [MODULE_INSTALL] == Module submitted =="
   done
 
-  # This is done after classic .jar module to ensure NPM modules are installed after engine module
+  # This is done after classic .jar module to ensure Javascript modules are installed after engine module
   for file in $(ls -1 *-SNAPSHOT.tgz | sort -n)
     do
-      echo "$(date +'%d %B %Y - %k:%M') [MODULE_INSTALL] == Submitting NPM module from: $file =="
+      echo "$(date +'%d %B %Y - %k:%M') [MODULE_INSTALL] == Submitting Javascript module from: $file =="
       curl -u root:${SUPER_USER_PASSWORD} -X POST ${JAHIA_URL}/modules/api/provisioning --form script='[{"installAndStartBundle":"'"$file"'", "forceUpdate":true}]' --form file=@$file
       echo
-      echo "$(date +'%d %B %Y - %k:%M') [MODULE_INSTALL] == NPM Module submitted =="
+      echo "$(date +'%d %B %Y - %k:%M') [MODULE_INSTALL] == Javascript Module submitted =="
     done
   cd ..
 fi

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

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

package/package.json

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

package/schema.graphql

@@ -1065,6 +1065,18 @@ type GqlBackgroundJobEdge {
     node: GqlBackgroundJob
 }
 
+"Channel information"
+type GqlChannel {
+    "Channel label (not localized)"
+    displayName: String
+    "Return true if channel is visible, otherwise false"
+    isVisible: Boolean
+    "Channel name/identifier"
+    name: String
+    "Return variants for this channel, if available"
+    variants: [GqlVariant]
+}
+
 "Condition for override item"
 type GqlCondition {
     "Item will apply only on this nodetype"
@@ -1365,6 +1377,8 @@ type GqlHealthCheck {
 
 "jContent API"
 type GqlJContent {
+    "Returns all available channels"
+    channels: [GqlChannel]
     "Returns html with marked differences"
     diffHtml(
         "New html"
@@ -1654,8 +1668,10 @@ type GqlPublicationInfo {
 
 "Scheduler object which allows to access to background jobs"
 type GqlScheduler {
-    "List of active jobs"
-    jobs(
+    "List of active jobs (deprecated)"
+    jobs: [GqlBackgroundJob] @deprecated(reason: "Use paginatedJobs instead")
+    "List of active jobs (paginated)"
+    paginatedJobs(
         "fetching only nodes after this node (exclusive)"
         after: String,
         "fetching only nodes before this node (exclusive)"
@@ -1685,6 +1701,24 @@ type GqlScope {
     name: String
 }
 
+"Variant information for a given channel"
+type GqlVariant {
+    "Variant display name/label (not localized)"
+    displayName: String
+    "Variant dimension (width x height) if available"
+    imageSize: GqlVariantDimension
+    "Variant name/identifier"
+    name: String
+}
+
+"Represents dimensions (width, height) of a variant"
+type GqlVariantDimension {
+    "Variant height"
+    height: String
+    "Variant width"
+    width: String
+}
+
 type GqlWorkflowEvent {
     "Number of tasks for current user"
     activeWorkflowTaskCountForUser: Int

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.nodes;
+                    const jobs = response?.data?.admin?.jahia?.scheduler?.jobs;
                     const publicationJobs = jobs.filter(job => job.group === 'PublicationJob');
                     const hasActivePublicationJobs = publicationJobs.some(job => job.jobStatus === 'EXECUTING');
                     return !hasActivePublicationJobs;