@camunda/linting 1.2.1 → 2.0.0

package/lib/utils/error-messages.js

@@ -17,6 +17,12 @@ const TIMER_PROPERTIES = [
   'timeDuration'
 ];
 
+const TIMER_PROPERTY_LABELS = {
+  timeCycle: 'Cycle',
+  timeDate: 'Date',
+  timeDuration: 'Duration'
+};
+
 const executionPlatformLabels = {
   'Camunda Cloud': {
     'default': 'Camunda',
@@ -361,6 +367,10 @@ function getPropertyNotAllowedErrorMessage(report, executionPlatform, executionP
     return `${ getIndefiniteArticle(typeString) } <${ typeString }> with <Condition expression> is only supported if the source is an <Exclusive Gateway> or <Inclusive Gateway>`;
   }
 
+  if (is(node, 'bpmn:TimerEventDefinition') && TIMER_PROPERTIES.includes(property)) {
+    return getSupportedMessage(`${ getIndefiniteArticle(typeString) } <${ typeString }> with <${ TIMER_PROPERTY_LABELS[ property ] }>`, executionPlatform, executionPlatformVersion, allowedVersion);
+  }
+
   return message;
 }
 
@@ -469,10 +479,6 @@ function getPropertyRequiredErrorMessage(report, executionPlatform, executionPla
     return `${ getIndefiniteArticle(typeString) } <${ typeString }> must have a defined <Timer type>`;
   }
 
-  if (is(node, 'bpmn:TimerEventDefinition') && requiredProperty === 'timeDuration') {
-    return `${ getIndefiniteArticle(typeString) } <${ typeString }> must have a defined <Timer duration>`;
-  }
-
   if (is(node, 'bpmn:Process') && requiredProperty === 'historyTimeToLive') {
     return `${ getIndefiniteArticle(typeString) } <${ typeString }> must have a defined <History time to live>`;
   }

package/lib/utils/properties-panel.js

@@ -48,9 +48,14 @@ export function getEntryIds(report) {
   const {
     data = {},
     id,
-    path
+    path,
+    entryIds
   } = report;
 
+  if (entryIds) {
+    return entryIds;
+  }
+
   if (isPropertyError(data, 'isExecutable')) {
     return [ 'isExecutable' ];
   }
@@ -174,10 +179,6 @@ export function getEntryIds(report) {
     return [ 'conditionExpression' ];
   }
 
-  if (isPropertyError(data, 'timeDuration', 'bpmn:TimerEventDefinition')) {
-    return [ 'timerEventDefinitionDurationValue' ];
-  }
-
   if (isPropertyError(data, 'completionCondition', 'bpmn:MultiInstanceLoopCharacteristics')) {
     return [ 'multiInstance-completionCondition' ];
   }
@@ -191,13 +192,19 @@ export function getEntryIds(report) {
   if (isExpressionRequiredError(data, 'timeCycle', 'bpmn:FormalExpression')
     || isExpressionRequiredError(data, 'timeDate', 'bpmn:FormalExpression')
     || isExpressionRequiredError(data, 'timeDuration', 'bpmn:FormalExpression')) {
-    return hasOnlyDurationTimer(data.parentNode) ? [ 'timerEventDefinitionDurationValue' ] : [ 'timerEventDefinitionValue' ];
+    return [ 'timerEventDefinitionValue' ];
   }
 
   if (isExpressionValueNotAllowedError(data, 'timeCycle', 'bpmn:FormalExpression')
     || isExpressionValueNotAllowedError(data, 'timeDate', 'bpmn:FormalExpression')
     || isExpressionValueNotAllowedError(data, 'timeDuration', 'bpmn:FormalExpression')) {
-    return hasOnlyDurationTimer(data.parentNode) ? [ 'timerEventDefinitionDurationValue' ] : [ 'timerEventDefinitionValue' ];
+    return [ 'timerEventDefinitionValue' ];
+  }
+
+  if (isPropertyError(data, 'timeCycle', 'bpmn:TimerEventDefinition')
+    || isPropertyError(data, 'timeDate', 'bpmn:TimerEventDefinition')
+    || isPropertyError(data, 'timeDuration', 'bpmn:TimerEventDefinition')) {
+    return [ 'timerEventDefinitionType' ];
   }
 
   const LIST_PROPERTIES = [
@@ -257,7 +264,7 @@ export function getEntryIds(report) {
 }
 
 export function getErrorMessage(id, report) {
-  const { data } = report;
+  const { data = {} } = report;
 
   // do not override FEEL message
   if (data.type === ERROR_TYPES.FEEL_EXPRESSION_INVALID) {
@@ -342,7 +349,11 @@ export function getErrorMessage(id, report) {
     return 'Process ID must be defined.';
   }
 
-  if (id === 'taskDefinitionType' || id === 'timerEventDefinitionType') {
+  if (id === 'taskDefinitionType') {
+    return 'Type must be defined.';
+  }
+
+  if (id === 'timerEventDefinitionType' && data.type === ERROR_TYPES.PROPERTY_REQUIRED) {
     return 'Type must be defined.';
   }
 
@@ -370,9 +381,8 @@ export function getErrorMessage(id, report) {
     return 'Condition expression must be defined.';
   }
 
-  if (id === 'timerEventDefinitionDurationValue') {
-    return data.type === ERROR_TYPES.EXPRESSION_REQUIRED ?
-      'Duration must be defined.' : 'Must be an expression, or an ISO 8601 interval.';
+  if (id === 'timerEventDefinitionType' && data.type === ERROR_TYPES.PROPERTY_NOT_ALLOWED) {
+    return 'Type not supported.';
   }
 
   if (id === 'timerEventDefinitionValue') {
@@ -482,12 +492,4 @@ function isExpressionValueNotAllowedError(data, propertyName, type) {
 
 function getBusinessObject(element) {
   return element.businessObject || element;
-}
-
-function hasOnlyDurationTimer(node) {
-  return is(node, 'bpmn:IntermediateCatchEvent') || isInterruptingBoundaryEvent(node);
-}
-
-function isInterruptingBoundaryEvent(event) {
-  return is(event, 'bpmn:BoundaryEvent') && event.get('cancelActivity') !== false;
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@camunda/linting",
-  "version": "1.2.1",
+  "version": "2.0.0",
   "description": "Linting for Camunda Platform",
   "main": "index.js",
   "scripts": {
@@ -29,7 +29,7 @@
   "dependencies": {
     "bpmn-moddle": "^8.0.0",
     "bpmnlint": "^8.0.0",
-    "bpmnlint-plugin-camunda-compat": "^1.2.0",
+    "bpmnlint-plugin-camunda-compat": "^1.3.2",
     "bpmnlint-utils": "^1.0.2",
     "min-dash": "^4.0.0",
     "min-dom": "^4.1.0",
@@ -38,8 +38,8 @@
   },
   "devDependencies": {
     "bpmn-js": "^11.1.1",
-    "bpmn-js-properties-panel": "^1.20.0",
-    "camunda-bpmn-js-behaviors": "^0.5.0",
+    "bpmn-js-properties-panel": "^2.0.0",
+    "camunda-bpmn-js-behaviors": "^0.6.0",
     "chai": "^4.3.7",
     "cross-env": "^7.0.3",
     "eslint": "^8.32.0",
@@ -59,7 +59,7 @@
     "webpack": "^5.75.0"
   },
   "peerDependencies": {
-    "bpmn-js-properties-panel": ">= 1.10.0"
+    "bpmn-js-properties-panel": ">= 2.0.0"
   },
   "peerDependenciesMeta": {
     "bpmn-js-properties-panel": {