sartography
/
bpmn-js-spiffworkflow
mirror of https://github.com/sartography/bpmn-js-spiffworkflow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix/messages bugs 1764 (#104) 

* Fix : Unable to add cProperties and handle empty formal expression

* Fix : Unable to modify retrieval expression

* Fix Message variable and payload are deleted on change

* MessagePayload disappears on message update

* Remove comment code and log

* Retrigger workflow

* removed some commented out code w/ burnettk

* removed console.log w/ burnettk

* removed useles node version declaration w/ burnettk

---------

Co-authored-by: jasquat <jasquat@users.noreply.github.com>
This commit is contained in:
Ayoub Ait Lachgar 2024-06-21 19:02:01 +01:00 committed by GitHub
parent fd7a9489d8
commit d63a3cbeb9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 226 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/tests.yml vendored
View File

@ -21,10 +21,7 @@ jobs:
- uses: actions/checkout@v4 #Checkout Repo - uses: actions/checkout@v4 #Checkout Repo
- uses: actions/setup-node@v4 #Setup Node - uses: actions/setup-node@v4 #Setup Node
- uses: nanasess/setup-chromedriver@v2 #Setup ChromeDriver - uses: nanasess/setup-chromedriver@v2 #Setup ChromeDriver
with:
node-version: '18'
- name: Run Karma Tests - name: Run Karma Tests
run: | run: |
npm ci npm ci
npm run test npm run test

2
.tool-versions
View File

@ -1 +1 @@
nodejs 18.3.0 nodejs 22.3.0

128
app/app.js
View File

@ -6,6 +6,10 @@ import {
import diagramXML from '../test/spec/bpmn/user_form.bpmn'; import diagramXML from '../test/spec/bpmn/user_form.bpmn';
import spiffworkflow from './spiffworkflow'; import spiffworkflow from './spiffworkflow';
import setupFileOperations from './fileOperations'; import setupFileOperations from './fileOperations';
import {
SPIFF_ADD_MESSAGE_REQUESTED_EVENT,
SPIFF_ADD_MESSAGE_RETURNED_EVENT,
} from './spiffworkflow/constants';
const modelerEl = document.getElementById('modeler'); const modelerEl = document.getElementById('modeler');
const panelEl = document.getElementById('panel'); const panelEl = document.getElementById('panel');
@ -187,8 +191,13 @@ bpmnModeler.on('spiff.dmn_files.requested', (event) => {
bpmnModeler.on('spiff.data_stores.requested', (event) => { bpmnModeler.on('spiff.data_stores.requested', (event) => {
event.eventBus.fire('spiff.data_stores.returned', { event.eventBus.fire('spiff.data_stores.returned', {
options: [ options: [
{ id: 'countriesID', type: 'json', name: 'Countries', clz: 'JSONDataStore' }, {
{ id: 'foodsID', type: 'kkv', name: 'Foods', clz: 'JSONDataStore' } id: 'countriesID',
type: 'json',
name: 'Countries',
clz: 'JSONDataStore',
},
{ id: 'foodsID', type: 'kkv', name: 'Foods', clz: 'JSONDataStore' },
], ],
}); });
}); });
@ -196,87 +205,74 @@ bpmnModeler.on('spiff.data_stores.requested', (event) => {
bpmnModeler.on('spiff.messages.requested', (event) => { bpmnModeler.on('spiff.messages.requested', (event) => {
event.eventBus.fire('spiff.messages.returned', { event.eventBus.fire('spiff.messages.returned', {
configuration: { configuration: {
"messages": [ messages: [
{ {
"identifier": "basic_message", identifier: 'basic_message',
"location": "examples/1-basic-concepts", location: 'examples/1-basic-concepts',
"schema": {}, schema: {},
"correlation_properties": [] correlation_properties: [],
}, },
{ {
"identifier": "end_of_day_receipts", identifier: 'end_of_day_receipts',
"location": "examples", location: 'examples',
"schema": {}, schema: {},
"correlation_properties": [] correlation_properties: [],
}, },
{ {
"identifier": "order_ready", identifier: 'order_ready',
"location": "examples", location: 'examples',
"schema": {}, schema: {},
"correlation_properties": [ correlation_properties: [
{ {
"identifier": "table_number", identifier: 'table_number',
"retrieval_expression": "table_number" retrieval_expression: 'table_number',
}, },
{ {
"identifier": "franchise_id", identifier: 'franchise_id',
"retrieval_expression": "franchise_id" retrieval_expression: 'franchise_id',
} },
] ],
}, },
{ {
"identifier": "table_seated", identifier: 'table_seated',
"location": "examples", location: 'examples',
"schema": {}, schema: {},
"correlation_properties": [ correlation_properties: [
{ {
"identifier": "table_number", identifier: 'table_number',
"retrieval_expression": "table_number-v2" retrieval_expression: 'table_number-v2',
}, },
{ {
"identifier": "franchise_id", identifier: 'franchise_id',
"retrieval_expression": "franchise_id-v2" retrieval_expression: 'franchise_id-v2',
} },
] ],
} },
] ],
} },
}); });
}); });
bpmnModeler.on('spiff.add_message.requested', (event) => { bpmnModeler.on(SPIFF_ADD_MESSAGE_REQUESTED_EVENT, (event) => {
// event.eventBus.fire('spiff.add_message.returned', { event.eventBus.fire(SPIFF_ADD_MESSAGE_RETURNED_EVENT, {
// name: 'test_message', name: 'test_message1',
// correlation_properties: {
// "c1": {
// "retrieval_expressions": "c1_expression"
// },
// "c2": {
// "retrieval_expressions": "c2_expression"
// }
// }
// element: {}
// });
event.eventBus.fire('spiff.add_message.returned', {
name: 'test_message',
correlation_properties: { correlation_properties: {
"c1": { c1: {
"retrieval_expressions": ["c1_expression"] retrieval_expression: 'c1_expression',
},
c2: {
retrieval_expression: 'c2_expression',
}, },
"c2": {
"retrieval_expressions": ["c2_expression"]
}
}, },
element: { element: {
name: 'elementName' id: 'my_user_task',
} },
}); });
}); });
// As call activites might refernce processes across the system // As call activites might refernce processes across the system
// it should be possible to search for a paticular call activity. // it should be possible to search for a paticular call activity.
bpmnModeler.on('spiff.callactivity.search', (event) => { bpmnModeler.on('spiff.callactivity.search', (event) => {
console.log("Firing call activity update", event.element)
event.eventBus.fire('spiff.callactivity.update', { event.eventBus.fire('spiff.callactivity.update', {
value: 'searched_bpmn_id', value: 'searched_bpmn_id',
element: event.element, element: event.element,
@ -285,13 +281,19 @@ bpmnModeler.on('spiff.callactivity.search', (event) => {
/* This restores unresolved references that camunda removes */ /* This restores unresolved references that camunda removes */
bpmnModeler.on('import.parse.complete', event => { bpmnModeler.on('import.parse.complete', (event) => {
const refs = event.references.filter(r => r.property === 'bpmn:loopDataInputRef' || r.property === 'bpmn:loopDataOutputRef'); const refs = event.references.filter(
const desc = bpmnModeler._moddle.registry.getEffectiveDescriptor('bpmn:ItemAwareElement'); (r) =>
refs.forEach(ref => { r.property === 'bpmn:loopDataInputRef' ||
r.property === 'bpmn:loopDataOutputRef'
);
const desc = bpmnModeler._moddle.registry.getEffectiveDescriptor(
'bpmn:ItemAwareElement'
);
refs.forEach((ref) => {
const props = { const props = {
id: ref.id, id: ref.id,
name: ref.id ? typeof (ref.name) === 'undefined' : ref.name, name: ref.id ? typeof ref.name === 'undefined' : ref.name,
}; };
let elem = bpmnModeler._moddle.create(desc, props); let elem = bpmnModeler._moddle.create(desc, props);
elem.$parent = ref.element; elem.$parent = ref.element;
@ -299,7 +301,7 @@ bpmnModeler.on('import.parse.complete', event => {
}); });
}); });
bpmnModeler.importXML(diagramXML).then(() => { }); bpmnModeler.importXML(diagramXML).then(() => {});
// This handles the download and upload buttons - it isn't specific to // This handles the download and upload buttons - it isn't specific to
// the BPMN modeler or these extensions, just a quick way to allow you to // the BPMN modeler or these extensions, just a quick way to allow you to

2
app/spiffworkflow/constants.js
View File

@ -1 +1,3 @@
export const SPIFFWORKFLOW_XML_NAMESPACE = 'spiffworkflow'; export const SPIFFWORKFLOW_XML_NAMESPACE = 'spiffworkflow';
export const SPIFF_ADD_MESSAGE_REQUESTED_EVENT = 'spiff.add_message.requested';
export const SPIFF_ADD_MESSAGE_RETURNED_EVENT = 'spiff.add_message.returned';

59
app/spiffworkflow/messages/MessageHelpers.js
View File

@ -153,7 +153,7 @@ function getRetrievalExpressionFromCorrelationProperty(
for (const retrievalExpression of correlationProperty.correlationPropertyRetrievalExpression) { for (const retrievalExpression of correlationProperty.correlationPropertyRetrievalExpression) {
if ( if (
retrievalExpression.$type === retrievalExpression.$type ===
'bpmn:CorrelationPropertyRetrievalExpression' && 'bpmn:CorrelationPropertyRetrievalExpression' &&
retrievalExpression.messageRef && retrievalExpression.messageRef &&
retrievalExpression.messageRef.id === message.id retrievalExpression.messageRef.id === message.id
) { ) {
@ -416,6 +416,16 @@ export function createOrUpdateCorrelationPropertiesV2(
correlationProperty.correlationPropertyRetrievalExpression.push( correlationProperty.correlationPropertyRetrievalExpression.push(
retrievalExpression retrievalExpression
); );
} else {
const existingRetrievalExpression =
correlationProperty.correlationPropertyRetrievalExpression[
existingExpressionIndex
];
const existingFormalExpression =
existingRetrievalExpression.messagePath;
existingFormalExpression.body = propConfig.retrieval_expression
? propConfig.retrieval_expression
: '';
} }
const existingIndex = definitions.rootElements.findIndex( const existingIndex = definitions.rootElements.findIndex(
@ -496,8 +506,8 @@ function isMessageRefInCorrelationPropertiesRetrivalExpression(
) { ) {
return correlationProperty.correlationPropertyRetrievalExpression return correlationProperty.correlationPropertyRetrievalExpression
? correlationProperty.correlationPropertyRetrievalExpression.some( ? correlationProperty.correlationPropertyRetrievalExpression.some(
(expr) => expr.messageRef === messageRef (expr) => expr.messageRef === messageRef
) )
: false; : false;
} }
@ -617,11 +627,11 @@ export function setMessageRefToListofCorrelationProperties(
retrievalExpression.messageRef = messageRef; retrievalExpression.messageRef = messageRef;
rootElement.correlationPropertyRetrievalExpression rootElement.correlationPropertyRetrievalExpression
? rootElement.correlationPropertyRetrievalExpression.push( ? rootElement.correlationPropertyRetrievalExpression.push(
retrievalExpression retrievalExpression
) )
: (rootElement.correlationPropertyRetrievalExpression = [ : (rootElement.correlationPropertyRetrievalExpression = [
retrievalExpression, retrievalExpression,
]); ]);
} else if ( } else if (
rootElement.$type === 'bpmn:CorrelationProperty' && rootElement.$type === 'bpmn:CorrelationProperty' &&
!correlationPropertyIDs.includes(rootElement.id) && !correlationPropertyIDs.includes(rootElement.id) &&
@ -684,7 +694,6 @@ export function setParentCorrelationKeys(
element, element,
moddle moddle
) { ) {
// Retrieve all correlation properties // Retrieve all correlation properties
let correlationProperties = findCorrelationProperties( let correlationProperties = findCorrelationProperties(
element.businessObject, element.businessObject,
@ -716,7 +725,6 @@ export function setParentCorrelationKeys(
.find((element) => element.$type === 'bpmn:Collaboration'); .find((element) => element.$type === 'bpmn:Collaboration');
if (collaboration) { if (collaboration) {
// Remove existing correlation keys other than the main correlation key // Remove existing correlation keys other than the main correlation key
collaboration.get('correlationKeys').forEach((key, index) => { collaboration.get('correlationKeys').forEach((key, index) => {
if (key.name !== 'MainCorrelationKey') { if (key.name !== 'MainCorrelationKey') {
@ -734,7 +742,9 @@ export function setParentCorrelationKeys(
// Replace the existing key with mainCorrelationKey // Replace the existing key with mainCorrelationKey
const index = collaboration.get('correlationKeys').indexOf(existingKey); const index = collaboration.get('correlationKeys').indexOf(existingKey);
if (index !== -1) { if (index !== -1) {
collaboration.get('correlationKeys').splice(index, 1, mainCorrelationKey); collaboration
.get('correlationKeys')
.splice(index, 1, mainCorrelationKey);
} }
} }
} else { } else {
@ -788,10 +798,16 @@ function findOrCreateMainCorrelationKey(definitions, bpmnFactory, moddle) {
return mainCorrelationKey; return mainCorrelationKey;
} }
export function synCorrleationProperties(element, definitions, moddle, msgObject) { export function synCorrleationProperties(
element,
definitions,
moddle,
msgObject
) {
const { businessObject } = element; const { businessObject } = element;
const correlationProps = findCorrelationProperties(businessObject, moddle); const correlationProps = findCorrelationProperties(businessObject, moddle);
const expressionsToDelete = []; const expressionsToDelete = [];
for (let cProperty of correlationProps) { for (let cProperty of correlationProps) {
let isUsed = false; let isUsed = false;
for (const cpExpression of cProperty.correlationPropertyRetrievalExpression) { for (const cpExpression of cProperty.correlationPropertyRetrievalExpression) {
@ -800,16 +816,16 @@ export function synCorrleationProperties(element, definitions, moddle, msgObject
cpExpression.messageRef.id, cpExpression.messageRef.id,
definitions definitions
); );
isUsed = (msgRef && msgObject && cpExpression.messageRef.id !== msgObject.identifier) ? true : isUsed; isUsed =
msgRef &&
msgObject &&
cpExpression.messageRef.id !== msgObject.identifier
? true
: isUsed;
// if unused false, delete retrival expression // if unused false, delete retrival expression
if (!msgRef) { if (!msgRef) {
console.log('Delete expression', cpExpression);
expressionsToDelete.push(cpExpression);
} else if (msgObject && !msgObject.correlation_properties.some(obj => obj.identifier === cProperty.id)) {
console.log('Delete expression', cpExpression);
expressionsToDelete.push(cpExpression); expressionsToDelete.push(cpExpression);
} }
} }
// Delete the retrieval expressions that are not used // Delete the retrieval expressions that are not used
@ -826,11 +842,16 @@ export function synCorrleationProperties(element, definitions, moddle, msgObject
} }
// If Unused, delete the correlation property // If Unused, delete the correlation property
const propertyToBeDeleted = (isUsed || msgObject && msgObject.correlation_properties && msgObject.correlation_properties.some(obj => obj.identifier === cProperty.id)); const propertyToBeDeleted =
isUsed ||
(msgObject &&
msgObject.correlation_properties &&
msgObject.correlation_properties.some(
(obj) => obj.identifier === cProperty.id
));
if (!propertyToBeDeleted) { if (!propertyToBeDeleted) {
const index = definitions.get('rootElements').indexOf(cProperty); const index = definitions.get('rootElements').indexOf(cProperty);
if (index > -1) { if (index > -1) {
console.log('Delete property', cProperty);
definitions.rootElements.splice(index, 1); definitions.rootElements.splice(index, 1);
} }
} }

16
app/spiffworkflow/messages/propertiesPanel/MessagesPropertiesProvider.js
View File

@ -1,7 +1,5 @@
import { is } from 'bpmn-js/lib/util/ModelUtil';
import { isMessageElement } from '../MessageHelpers'; import { isMessageElement } from '../MessageHelpers';
import { createCollaborationGroup } from './processLevelProvider/CollaborationPropertiesProvider';
import { createMessageGroup } from './elementLevelProvider/TaskEventMessageProvider'; import { createMessageGroup } from './elementLevelProvider/TaskEventMessageProvider';
const LOW_PRIORITY = 500; const LOW_PRIORITY = 500;
@ -15,17 +13,6 @@ export default function MessagesPropertiesProvider(
) { ) {
this.getGroups = function getGroupsCallback(element) { this.getGroups = function getGroupsCallback(element) {
return function pushGroup(groups) { return function pushGroup(groups) {
// if (is(element, 'bpmn:Collaboration') || is(element, 'bpmn:Process')) {
// groups.push(
// ...createCollaborationGroup(
// element,
// translate,
// moddle,
// commandStack,
// elementRegistry
// )
// );
// } else
if (isMessageElement(element)) { if (isMessageElement(element)) {
const messageIndex = findEntry(groups, 'message'); const messageIndex = findEntry(groups, 'message');
if (messageIndex) { if (messageIndex) {
@ -64,4 +51,5 @@ MessagesPropertiesProvider.$inject = [
'moddle', 'moddle',
'commandStack', 'commandStack',
'elementRegistry', 'elementRegistry',
]; ];

209
app/spiffworkflow/messages/propertiesPanel/elementLevelProvider/MessageSelect.jsx
View File

@ -2,7 +2,6 @@ import React from 'react';
import { useService } from 'bpmn-js-properties-panel'; import { useService } from 'bpmn-js-properties-panel';
import { SelectEntry } from '@bpmn-io/properties-panel'; import { SelectEntry } from '@bpmn-io/properties-panel';
import { import {
createOrUpdateCorrelationProperties,
createOrUpdateCorrelationPropertiesV2, createOrUpdateCorrelationPropertiesV2,
findMessageModdleElements, findMessageModdleElements,
getMessageRefElement, getMessageRefElement,
@ -13,6 +12,7 @@ import {
setParentCorrelationKeys, setParentCorrelationKeys,
synCorrleationProperties, synCorrleationProperties,
} from '../../MessageHelpers'; } from '../../MessageHelpers';
import { SPIFF_ADD_MESSAGE_RETURNED_EVENT } from '../../../constants';
export const spiffExtensionOptions = {}; export const spiffExtensionOptions = {};
@ -38,135 +38,84 @@ export function MessageSelect(props) {
}; };
const setValue = async (value) => { const setValue = async (value) => {
if (ELEMENT_ID) {
// ⚠️⚠️ Not sure if we can keep this
// This condition verify if Setvalue trigger is about the same element triggered from spifarena
const nwElement = elementRegistry.get(ELEMENT_ID);
shapeElement = (nwElement) ? nwElement : shapeElement;
element = (nwElement) ? nwElement : element;
}
// Define variables
const messageId = value; const messageId = value;
const { businessObject } = element; const { businessObject } = element;
let oldMessageRef = (businessObject.eventDefinitions) ? businessObject.eventDefinitions[0].messageRef : businessObject.messageRef; const oldMessageRef =
let definitions = getRoot(businessObject); businessObject.eventDefinitions?.[0].messageRef ||
if (!definitions || !definitions.get('rootElements')) { businessObject.messageRef;
definitions.set('rootElements', []); const definitions = getRoot(businessObject);
if (ELEMENT_ID) {
// This condition verify if Setvalue trigger is about the same element triggered from spifarena
const nwElement = elementRegistry.get(ELEMENT_ID);
shapeElement = nwElement ? nwElement : shapeElement;
element = nwElement ? nwElement : element;
} }
// Retrieve Message if (!definitions?.rootElements) {
let bpmnMessage = definitions definitions.rootElements = [];
.get('rootElements') }
.find(
(element) => let bpmnMessage = findMessageById(definitions, messageId);
element.$type === 'bpmn:Message' &&
(element.id === messageId || element.name === messageId),
);
// If the Message doesn't exist, create new one
if (!bpmnMessage) { if (!bpmnMessage) {
bpmnMessage = bpmnFactory.create('bpmn:Message', { bpmnMessage = createMessage(bpmnFactory, messageId);
id: messageId, definitions.rootElements.push(bpmnMessage);
name: messageId,
});
definitions.get('rootElements').push(bpmnMessage);
} else if (bpmnMessage.id !== bpmnMessage.name) { } else if (bpmnMessage.id !== bpmnMessage.name) {
bpmnMessage.id = bpmnMessage.name; bpmnMessage.id = bpmnMessage.name;
} }
// Update messageRef of current Element updateElementMessageRef(element, bpmnMessage, moddle, commandStack);
if (isMessageEvent(shapeElement)) {
element.businessObject.eventDefinitions[0].set(
'extensionElements',
moddle.create('bpmn:ExtensionElements'),
); // Clear extension element
const messageEventDefinition = element.businessObject.eventDefinitions[0];
messageEventDefinition.messageRef = bpmnMessage;
// call this to update the other elements in the props panel like payload
commandStack.execute('element.updateModdleProperties', {
element: element,
moddleElement: element.businessObject,
properties: {},
});
} else if (isMessageElement(shapeElement)) {
element.businessObject.set(
'extensionElements',
moddle.create('bpmn:ExtensionElements'),
); // Clear extension element
element.businessObject.messageRef = bpmnMessage;
commandStack.execute('element.updateProperties', {
element: element,
properties: {},
});
}
// Add Correlation Properties of for the new message const messageObject = findMessageObject(messageId);
const msgObject = spiffExtensionOptions['spiff.messages']
? spiffExtensionOptions['spiff.messages'].find(
(msg) => msg.identifier === messageId,
)
: undefined;
if (msgObject) { if (messageObject) {
createOrUpdateCorrelationPropertiesV2( createOrUpdateCorrelationPropertiesV2(
bpmnFactory, bpmnFactory,
commandStack, commandStack,
element, element,
msgObject['correlation_properties'], messageObject.correlation_properties,
messageId, messageId
); );
} }
if (oldMessageRef) { if (oldMessageRef) {
cleanupOldMessage(definitions, oldMessageRef.id);
// Remove previous message in case it's not used anymore synCorrleationProperties(element, definitions, moddle, messageObject);
const isOldMessageUsed = isMessageRefUsed(definitions, oldMessageRef.id);
if (!isOldMessageUsed) {
const rootElements = definitions.get('rootElements');
const oldMessageIndex = rootElements.findIndex(
(element) =>
element.$type === 'bpmn:Message' && element.id === oldMessageRef.id,
);
if (oldMessageIndex !== -1) {
rootElements.splice(oldMessageIndex, 1);
definitions.rootElements = rootElements;
}
}
// Automatic deletion of previous message correlation properties
synCorrleationProperties(element, definitions, moddle, msgObject);
} }
// Update Correlation key if Process has collaboration
try { try {
setParentCorrelationKeys(definitions, bpmnFactory, element, moddle); setParentCorrelationKeys(definitions, bpmnFactory, element, moddle);
} catch (error) { } catch (error) {
console.error('Error Caught while synchronizing Correlation key', error); console.error('Error caught while synchronizing Correlation key', error);
} }
}; };
eventBus.on('spiff.add_message.returned', async (event) => { eventBus.on(SPIFF_ADD_MESSAGE_RETURNED_EVENT, async (event) => {
// Check if the received element matches the current element // Check if the received element matches the current element
if (event.elementId !== element.id) { if (event.elementId !== element.id) {
ELEMENT_ID = event.elementId; ELEMENT_ID = event.elementId;
} }
const cProperties = Object.entries(event.correlation_properties).map(([identifier, properties]) => ({ const cProperties = Object.entries(event.correlation_properties).map(
identifier, ([identifier, properties]) => ({
retrieval_expression: Array.isArray(properties.retrieval_expressions) ? properties.retrieval_expressions[0] : properties.retrieval_expressions identifier,
})); retrieval_expression: Array.isArray(properties.retrieval_expression)
? properties.retrieval_expression[0]
: properties.retrieval_expression,
})
);
let newMsg = { let newMsg = {
identifier: event.name, identifier: event.name,
correlation_properties: cProperties correlation_properties: cProperties,
}; };
spiffExtensionOptions['spiff.messages'] = (Array.isArray(spiffExtensionOptions['spiff.messages']) && spiffExtensionOptions['spiff.messages']) ? spiffExtensionOptions['spiff.messages'] : []; spiffExtensionOptions['spiff.messages'] =
Array.isArray(spiffExtensionOptions['spiff.messages']) &&
spiffExtensionOptions['spiff.messages']
? spiffExtensionOptions['spiff.messages']
: [];
const messageIndex = spiffExtensionOptions['spiff.messages'].findIndex( const messageIndex = spiffExtensionOptions['spiff.messages'].findIndex(
(msg) => msg.identifier === newMsg.identifier (msg) => msg.identifier === newMsg.identifier
); );
@ -175,7 +124,6 @@ export function MessageSelect(props) {
} else { } else {
spiffExtensionOptions['spiff.messages'].push(newMsg); spiffExtensionOptions['spiff.messages'].push(newMsg);
} }
setValue(event.name); setValue(event.name);
}); });
@ -234,3 +182,78 @@ function removeDuplicatesByLabel(array) {
return seen.has(item.label) ? false : seen.set(item.label, true); return seen.has(item.label) ? false : seen.set(item.label, true);
}); });
} }
function findMessageById(definitions, messageId) {
return definitions.rootElements?.find(
(element) =>
element.$type === 'bpmn:Message' &&
(element.id === messageId || element.name === messageId)
);
}
function createMessage(bpmnFactory, messageId) {
return bpmnFactory.create('bpmn:Message', {
id: messageId,
name: messageId,
});
}
function updateElementMessageRef(element, bpmnMessage, moddle, commandStack) {
if (isMessageEvent(element) && element.businessObject) {
const messageEventDefinition = element.businessObject.eventDefinitions[0];
messageEventDefinition.extensionElements =
messageEventDefinition.extensionElements
? messageEventDefinition.extensionElements
: moddle.create('bpmn:ExtensionElements');
messageEventDefinition.messageRef = bpmnMessage;
commandStack.execute('element.updateModdleProperties', {
element: element,
moddleElement: element.businessObject,
properties: {},
});
} else if (isMessageElement(element) && element.businessObject) {
element.businessObject.extensionElements = element.businessObject
.extensionElements
? element.businessObject.extensionElements
: moddle.create('bpmn:ExtensionElements');
element.businessObject.messageRef = bpmnMessage;
commandStack.execute('element.updateProperties', {
element: element,
properties: {},
});
}
}
function findMessageObject(messageId) {
const messageObject = spiffExtensionOptions['spiff.messages']?.find(
(msg) => msg.identifier === messageId
);
if (messageObject) {
return {
identifier: messageObject.identifier,
correlation_properties: messageObject.correlation_properties.map(
(prop) => ({
identifier: prop.identifier,
retrieval_expression: prop.retrieval_expression,
})
),
};
} else {
return null;
}
}
function cleanupOldMessage(definitions, oldMessageId) {
if (!isMessageRefUsed(definitions, oldMessageId)) {
const rootElements = definitions.rootElements;
const oldMessageIndex = rootElements.findIndex(
(element) =>
element.$type === 'bpmn:Message' && element.id === oldMessageId
);
if (rootElements && oldMessageIndex !== -1) {
rootElements.splice(oldMessageIndex, 1);
definitions.rootElements = rootElements;
}
}
}