diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/models/message_instance.py b/spiffworkflow-backend/src/spiffworkflow_backend/models/message_instance.py index 3c278b92..99168ec3 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/models/message_instance.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/models/message_instance.py @@ -104,7 +104,6 @@ class MessageInstanceModel(SpiffworkflowBaseDBModel): # Then there is nothing more to match on -- we accept any message with the given name. return True - # Loop over the receives' correlation keys - if any of the keys fully match, then we match. for expected_values in self.correlation_keys.values(): if self.payload_matches_expected_values( diff --git a/spiffworkflow-backend/src/spiffworkflow_backend/services/message_service.py b/spiffworkflow-backend/src/spiffworkflow_backend/services/message_service.py index ddd4f497..fb9ef6c4 100644 --- a/spiffworkflow-backend/src/spiffworkflow_backend/services/message_service.py +++ b/spiffworkflow-backend/src/spiffworkflow_backend/services/message_service.py @@ -1,7 +1,8 @@ """Message_service.""" from spiffworkflow_backend.models.db import db -from spiffworkflow_backend.models.message_instance import MessageInstanceModel, MessageTypes +from spiffworkflow_backend.models.message_instance import MessageInstanceModel from spiffworkflow_backend.models.message_instance import MessageStatuses +from spiffworkflow_backend.models.message_instance import MessageTypes from spiffworkflow_backend.models.message_triggerable_process_model import ( MessageTriggerableProcessModel, ) @@ -42,8 +43,9 @@ class MessageService: # Find available messages that might match available_receive_messages = MessageInstanceModel.query.filter_by( - name=message_instance_send.name, status=MessageStatuses.ready.value, - message_type=MessageTypes.receive.value + name=message_instance_send.name, + status=MessageStatuses.ready.value, + message_type=MessageTypes.receive.value, ).all() message_instance_receive: MessageInstanceModel | None = None try: diff --git a/spiffworkflow-frontend/src/routes/MessageInstanceList.tsx b/spiffworkflow-frontend/src/routes/MessageInstanceList.tsx index c1a1658e..67c47ff6 100644 --- a/spiffworkflow-frontend/src/routes/MessageInstanceList.tsx +++ b/spiffworkflow-frontend/src/routes/MessageInstanceList.tsx @@ -70,11 +70,7 @@ export default function MessageInstanceList() { {failureCausePre}
Correlations:
- {JSON.stringify( - messageInstanceForModal.correlation_keys, - null, - 2 - )} + {JSON.stringify(messageInstanceForModal.correlation_keys, null, 2)}); @@ -95,17 +91,20 @@ export default function MessageInstanceList() { > ); } - let processLink = External Call - let instanceLink = + let processLink = External Call; + let instanceLink = ; if (row.process_instance_id != null) { - processLink = FormatProcessModelDisplayName(row) - instanceLink = + processLink = FormatProcessModelDisplayName(row); + instanceLink = ( + row.process_model_identifier + )}/${row.process_instance_id}`} + > {row.process_instance_id} + ); } return (