fix: time cycle expression error message

camunda · Jul 24, 2023 · 02435fa · 02435fa
1 parent 55a62ec
commit 02435fa
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/lib/utils/error-messages.js b/lib/utils/error-messages.js
@@ -9,7 +9,10 @@ import {
 
 import { getTypeString } from './types';
 
-import { toSemverMinor } from './version';
+import {
+  greaterOrEqual,
+  toSemverMinor
+} from './version';
 
 const TIMER_PROPERTIES = [
   'timeCycle',
@@ -122,7 +125,7 @@ export function getErrorMessage(report, executionPlatform, executionPlatformVers
   }
 
   if (type === ERROR_TYPES.EXPRESSION_VALUE_NOT_ALLOWED) {
-    return getExpressionValueNotAllowedErrorMessage(report);
+    return getExpressionValueNotAllowedErrorMessage(report, executionPlatform, executionPlatformVersion);
   }
 
   if (type === ERROR_TYPES.EXPRESSION_NOT_ALLOWED) {
@@ -507,7 +510,7 @@ function getExpressionRequiredErrorMessage(report) {
   return message;
 }
 
-function getExpressionValueNotAllowedErrorMessage(report) {
+function getExpressionValueNotAllowedErrorMessage(report, executionPlatform, executionPlatformVersion) {
   const {
     data,
     message
@@ -522,7 +525,11 @@ function getExpressionValueNotAllowedErrorMessage(report) {
   const typeString = getTypeString(parentNode || node);
 
   if (is(node, 'bpmn:FormalExpression') && property === 'timeCycle') {
-    return `${ getIndefiniteArticle(typeString) } <${ typeString }> <Time cycle> must be an expression, an ISO 8601 repeating interval, or a cron expression (cron requires Camunda Platform 8.1 or newer)`;
+    if (!greaterOrEqual(executionPlatformVersion, '8.1')) {
+      return `${ getIndefiniteArticle(typeString) } <${ typeString }> <Time cycle> must be an expression, an ISO 8601 repeating interval, or a cron expression (cron only supported by Camunda Platform 8.1 or newer)`;
+    } else {
+      return `${ getIndefiniteArticle(typeString) } <${ typeString }> <Time cycle> must be an expression, an ISO 8601 repeating interval, or a cron expression`;
+    }
   }
 
   if (is(node, 'bpmn:FormalExpression') && property === 'timeDate') {

diff --git a/lib/utils/properties-panel.js b/lib/utils/properties-panel.js
@@ -4,6 +4,8 @@ import { is } from 'bpmnlint-utils';
 
 import { ERROR_TYPES } from 'bpmnlint-plugin-camunda-compat/rules/utils/error-types';
 
+import { greaterOrEqual } from './version';
+
 const TIMER_PROPERTIES = [
   'timeDate',
   'timeDuration',
@@ -268,7 +270,10 @@ export function getEntryIds(report) {
 }
 
 export function getErrorMessage(id, report) {
-  const { data = {} } = report;
+  const {
+    data = {},
+    executionPlatformVersion
+  } = report;
 
   // do not override FEEL message
   if (data.type === ERROR_TYPES.FEEL_EXPRESSION_INVALID) {
@@ -397,7 +402,11 @@ export function getErrorMessage(id, report) {
     const { property } = data;
 
     if (property === 'timeCycle') {
-      return 'Must be an expression, an ISO 8601 repeating interval, or a cron expression (cron requires Camunda Platform 8.1 or newer).';
+      if (!greaterOrEqual(executionPlatformVersion, '8.1')) {
+        return 'Must be an expression, an ISO 8601 repeating interval, or a cron expression (cron only supported by Camunda Platform 8.1 or newer).';
+      }
+
+      return 'Must be an expression, an ISO 8601 repeating interval, or a cron expression.';
     }
 
     if (property === 'timeDate') {

diff --git a/test/spec/utils/error-messages.spec.js b/test/spec/utils/error-messages.spec.js
@@ -1299,10 +1299,10 @@ describe('utils/error-messages', function() {
           const report = await getLintError(node, rule, { version: executionPlatformVersion });
 
           // when
-          const errorMessage = getErrorMessage(report);
+          const errorMessage = getErrorMessage(report, 'Camunda Cloud', executionPlatformVersion);
 
           // then
-          expect(errorMessage).to.equal('A <Timer Boundary Event> <Time cycle> must be an expression, an ISO 8601 repeating interval, or a cron expression (cron requires Camunda Platform 8.1 or newer)');
+          expect(errorMessage).to.equal('A <Timer Boundary Event> <Time cycle> must be an expression, an ISO 8601 repeating interval, or a cron expression (cron only supported by Camunda Platform 8.1 or newer)');
         });
 
 

diff --git a/test/spec/utils/properties-panel.spec.js b/test/spec/utils/properties-panel.spec.js
@@ -1096,7 +1096,7 @@ describe('utils/properties-panel', function() {
           // then
           expect(entryIds).to.eql([ 'timerEventDefinitionValue' ]);
 
-          expectErrorMessage(entryIds[ 0 ], 'Must be an expression, an ISO 8601 repeating interval, or a cron expression (cron requires Camunda Platform 8.1 or newer).', report);
+          expectErrorMessage(entryIds[ 0 ], 'Must be an expression, an ISO 8601 repeating interval, or a cron expression (cron only supported by Camunda Platform 8.1 or newer).', report);
         });