From 3add06926765126577a100845c8d3247323e5f4c Mon Sep 17 00:00:00 2001 From: burnettk Date: Mon, 27 Feb 2023 14:59:39 -0500 Subject: [PATCH] Squashed 'bpmn-js-spiffworkflow/' changes from f1f008e3e..a547888ef a547888ef run_pyl 53378437d BPMN.io -- Just show the message names not the ids - to assure we are only exposing the names. SpiffWorkflow - - start_messages function should return message names, not ids. - don't catch external thrown messages within the same workflow process - add an expected value to the Correlation Property Model so we can use this well defined class as an external communication tool (rather than building an arbitrary dictionary) - Added a "get_awaiting_correlations" to an event, so we can get a list of the correlation properties related to the workflows currently defined correlation values. - workflows.waiting_events() function now returns the above awaiting correlations as the value on returned message events Backend - Dropping MessageModel and MessageCorrelationProperties - at least for now. We don't need them to send / receive messages though we may eventually want to track the messages and correlations defined across the system - these things (which are ever changing) should not be directly connected to the Messages which may be in flux - and the cross relationships between the tables could cause unexpected and unceissary errors. Commented out the caching logic so we can turn this back on later. - Slight improvement to API Errors - MessageInstances are no longer in a many-to-many relationship with Correlations - Each message instance has a unique set of message correlations specific to the instance. - Message Instances have users, and can be linked through a "counterpart_id" so you can see what send is connected to what recieve. - Message Correlations are connected to recieving message instances. It is not to a process instance, and not to a message model. They now include the expected value and retrieval expression required to validate an incoming message. - A process instance is not connected to message correlations. - Message Instances are not always tied to a process instance (for example, a Send Message from an API) - API calls to create a message use the same logic as all other message catching code. - Make use of the new waiting_events() method to check for any new recieve messages in the workflow (much easier than churning through all of the tasks) - One giant mother of a migration. git-subtree-dir: bpmn-js-spiffworkflow git-subtree-split: a547888ef102046bab983b9004f07d4398e9a1bc --- app/app.js | 2 +- .../propertiesPanel/CorrelationPropertiesArray.js | 10 ---------- .../messages/propertiesPanel/MessageArray.js | 7 ------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/app/app.js b/app/app.js index 3876df3d2..dc8188ede 100644 --- a/app/app.js +++ b/app/app.js @@ -3,7 +3,7 @@ import { BpmnPropertiesPanelModule, BpmnPropertiesProviderModule, } from 'bpmn-js-properties-panel'; -import diagramXML from '../test/spec/bpmn/diagram.bpmn'; +import diagramXML from '../test/spec/bpmn/basic_message.bpmn'; import spiffworkflow from './spiffworkflow'; import setupFileOperations from './fileOperations'; diff --git a/app/spiffworkflow/messages/propertiesPanel/CorrelationPropertiesArray.js b/app/spiffworkflow/messages/propertiesPanel/CorrelationPropertiesArray.js index cb7cfbcb5..b158ab324 100644 --- a/app/spiffworkflow/messages/propertiesPanel/CorrelationPropertiesArray.js +++ b/app/spiffworkflow/messages/propertiesPanel/CorrelationPropertiesArray.js @@ -142,16 +142,6 @@ function MessageCorrelationPropertyGroup(props) { moddle, commandStack, }, - { - id: `${idPrefix}-correlation-property-id`, - component: CorrelationPropertyIdTextField, - isEdited: isTextFieldEntryEdited, - idPrefix, - element, - correlationPropertyModdleElement, - translate, - commandStack, - }, { id: `${idPrefix}-correlation-property-name`, component: CorrelationPropertyNameTextField, diff --git a/app/spiffworkflow/messages/propertiesPanel/MessageArray.js b/app/spiffworkflow/messages/propertiesPanel/MessageArray.js index 2f5b4c259..3e1a87c17 100644 --- a/app/spiffworkflow/messages/propertiesPanel/MessageArray.js +++ b/app/spiffworkflow/messages/propertiesPanel/MessageArray.js @@ -96,13 +96,6 @@ function removeFactory(props) { function messageGroup(props) { const { messageElement, commandStack, translate, idPrefix } = props; return [ - { - id: `${idPrefix}-id`, - component: MessageIdTextField, - messageElement, - commandStack, - translate, - }, { id: `${idPrefix}-name`, component: MessageNameTextField,