@camunda/linting 3.8.1 → 3.10.0

package/lib/utils/error-messages.js

@@ -4,7 +4,8 @@ import { is, isAny } from 'bpmnlint-utils';
 
 import {
   every,
-  isArray
+  isArray,
+  isString
 } from 'min-dash';
 
 import { getTypeString } from './types';
@@ -394,6 +395,10 @@ function getPropertyNotAllowedErrorMessage(report, executionPlatform, executionP
     return getSupportedMessage(`${ getIndefiniteArticle(typeString) } <${ typeString }> with <${ TIMER_PROPERTY_LABELS[ property ] }>`, executionPlatform, executionPlatformVersion, allowedVersion);
   }
 
+  if (is(node, 'zeebe:FormDefinition') && property === 'formId') {
+    return getSupportedMessage(`${ getIndefiniteArticle(typeString) } <${ typeString }> with <Form type: Camunda form (linked)>`, executionPlatform, executionPlatformVersion, allowedVersion);
+  }
+
   return message;
 }
 
@@ -483,12 +488,20 @@ function getPropertyRequiredErrorMessage(report, executionPlatform, executionPla
     return `${ getIndefiniteArticle(typeString) } <${ typeString }> must have a defined <Signal Reference>`;
   }
 
-  if (is(node, 'zeebe:FormDefinition') && requiredProperty === 'formKey') {
+  if (is(node, 'zeebe:FormDefinition')
+    && (
+      requiredProperty === 'formKey'
+      || (isArray(requiredProperty) && requiredProperty.includes('formKey') && isEmptyString(node.get('formKey')))
+    )) {
     return `${ getIndefiniteArticle(typeString) } <${ typeString }> with <Form type: Custom form key> must have a defined <Form key>`;
   }
 
+  if (is(node, 'zeebe:FormDefinition') && isArray(requiredProperty) && requiredProperty.includes('formId') && isEmptyString(node.get('formId'))) {
+    return `${ getIndefiniteArticle(typeString) } <${ typeString }> with <Form type: Camunda form (linked)> must have a defined <Form ID>`;
+  }
+
   if (is(node, 'zeebe:UserTaskForm') && requiredProperty === 'body') {
-    return `${ getIndefiniteArticle(typeString) } <${ typeString }> with <Form type: Camunda forms> must have a defined <Form JSON configuration>`;
+    return `${ getIndefiniteArticle(typeString) } <${ typeString }> with <Form type: Camunda form (embedded)> must have a defined <Form JSON configuration>`;
   }
 
   if (is(node, 'bpmn:SequenceFlow') && requiredProperty === 'conditionExpression') {
@@ -550,7 +563,7 @@ function getExpressionValueNotAllowedErrorMessage(report, executionPlatform, exe
 
   if (is(node, 'bpmn:FormalExpression') && property === 'timeCycle') {
     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)`;
+      return `${ getIndefiniteArticle(typeString) } <${ typeString }> <Time cycle> must be an expression, an ISO 8601 repeating interval, or a cron expression (cron only supported by Camunda 8.1 or newer)`;
     } else {
       return `${ getIndefiniteArticle(typeString) } <${ typeString }> <Time cycle> must be an expression, an ISO 8601 repeating interval, or a cron expression`;
     }
@@ -672,4 +685,8 @@ function getLoopNotAllowedErrorMessage(report) {
   const { elements } = data;
 
   return `A <Process> is not allowed to contain a straight-through processing loop: ${ elements.map(element => `<${ element }>`).join(', ') }`;
+}
+
+function isEmptyString(value) {
+  return isString(value) && value.trim() === '';
 }

package/lib/utils/properties-panel.js

@@ -1,4 +1,7 @@
-import { isArray } from 'min-dash';
+import {
+  isArray,
+  isString
+} from 'min-dash';
 
 import { is } from 'bpmnlint-utils';
 
@@ -159,6 +162,23 @@ export function getEntryIds(report) {
     return [ 'customFormKey' ];
   }
 
+  if (isType(data, 'zeebe:FormDefinition')) {
+    const {
+      node,
+      requiredProperty
+    } = data;
+
+    if (isArray(requiredProperty) && requiredProperty.includes('formKey') && isEmptyString(node.get('formKey'))) {
+      return [ 'customFormKey' ];
+    } else if (isArray(requiredProperty) && requiredProperty.includes('formId') && isEmptyString(node.get('formId'))) {
+      return [ 'formId' ];
+    }
+  }
+
+  if (isPropertyError(data, 'formId', 'zeebe:FormDefinition')) {
+    return [ 'formId' ];
+  }
+
   if (isPropertyError(data, 'body', 'zeebe:UserTaskForm')) {
     return [ 'formConfiguration' ];
   }
@@ -396,6 +416,14 @@ export function getErrorMessage(id, report) {
     return 'Form key must be defined.';
   }
 
+  if (id === 'formId') {
+    if (data.type === ERROR_TYPES.PROPERTY_REQUIRED) {
+      return 'Form ID must be defined.';
+    } else if (data.type === ERROR_TYPES.PROPERTY_NOT_ALLOWED) {
+      return 'Form ID not supported.';
+    }
+  }
+
   if (id === 'formConfiguration') {
     return 'Form JSON configuration must be defined.';
   }
@@ -425,7 +453,7 @@ export function getErrorMessage(id, report) {
 
     if (property === 'timeCycle') {
       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 (cron only supported by Camunda 8.1 or newer).';
       }
 
       return 'Must be an expression, an ISO 8601 repeating interval, or a cron expression.';
@@ -547,4 +575,8 @@ function isElementPropertyValueDuplicated(data, propertyName, type) {
 
 function getBusinessObject(element) {
   return element.businessObject || element;
+}
+
+function isEmptyString(value) {
+  return isString(value) && value.trim() === '';
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@camunda/linting",
-  "version": "3.8.1",
-  "description": "Linting for Camunda Platform",
+  "version": "3.10.0",
+  "description": "Linting for Camunda",
   "main": "index.js",
   "scripts": {
     "all": "npm run lint && npm test",
@@ -32,7 +32,7 @@
     "@bpmn-io/diagram-js-ui": "^0.2.2",
     "bpmn-moddle": "^8.0.0",
     "bpmnlint": "^9.2.0",
-    "bpmnlint-plugin-camunda-compat": "^2.8.1",
+    "bpmnlint-plugin-camunda-compat": "^2.11.1",
     "bpmnlint-utils": "^1.0.2",
     "camunda-bpmn-moddle": "^7.0.1",
     "clsx": "^2.0.0",
@@ -45,8 +45,8 @@
   "devDependencies": {
     "bpmn-js": "^13.2.2",
     "bpmn-js-element-templates": "^1.3.0",
-    "bpmn-js-properties-panel": "^5.0.0",
-    "camunda-bpmn-js-behaviors": "^1.0.0",
+    "bpmn-js-properties-panel": "^5.6.1",
+    "camunda-bpmn-js-behaviors": "^1.2.2",
     "chai": "^4.3.7",
     "cross-env": "^7.0.3",
     "eslint": "^8.45.0",