diff --git a/app/spiffworkflow/extensions/propertiesPanel/ExtensionsPropertiesProvider.js b/app/spiffworkflow/extensions/propertiesPanel/ExtensionsPropertiesProvider.js index d879d81..6f6bad5 100644 --- a/app/spiffworkflow/extensions/propertiesPanel/ExtensionsPropertiesProvider.js +++ b/app/spiffworkflow/extensions/propertiesPanel/ExtensionsPropertiesProvider.js @@ -37,7 +37,12 @@ export default function ExtensionsPropertiesProvider( } if (is(element, 'bpmn:ManualTask')) { groups.push( - createManualTaskPropertiesGroup(element, translate, moddle, commandStack) + createManualTaskPropertiesGroup( + element, + translate, + moddle, + commandStack + ) ); } if (is(element, 'bpmn:ServiceTask')) { @@ -176,7 +181,12 @@ function createBusinessRuleGroup(element, translate, moddle, commandStack) { * @param moddle * @returns entries */ -function createManualTaskPropertiesGroup(element, translate, moddle, commandStack) { +function createManualTaskPropertiesGroup( + element, + translate, + moddle, + commandStack +) { return { id: 'manual_task_properties', label: translate('Manual Task Properties'), @@ -187,7 +197,9 @@ function createManualTaskPropertiesGroup(element, translate, moddle, commandStac commandStack, component: SpiffExtensionInstructionsForEndUser, label: translate('Instructions For End User'), - description: translate('The instructions to show the user(s) who are responsible for completing the task.'), + description: translate( + 'The instructions to show the user(s) who are responsible for completing the task.' + ), }, ], }; diff --git a/app/spiffworkflow/messages/propertiesPanel/CorrelationKeysArray.js b/app/spiffworkflow/messages/propertiesPanel/CorrelationKeysArray.js index 6fac689..49f816b 100644 --- a/app/spiffworkflow/messages/propertiesPanel/CorrelationKeysArray.js +++ b/app/spiffworkflow/messages/propertiesPanel/CorrelationKeysArray.js @@ -44,10 +44,7 @@ export function CorrelationKeysArray(props) { currentCorrelationKeyElements.push(newCorrelationKeyElement); commandStack.execute('element.updateProperties', { element, - moddleElement: moddle, - properties: { - correlationKeys: currentCorrelationKeyElements, - }, + properties: {} }); } } @@ -68,7 +65,6 @@ function removeFactory(props) { ); commandStack.execute('element.updateProperties', { element, - moddleElement: moddle, properties: { correlationKey: currentCorrelationKeyElements, }, diff --git a/app/spiffworkflow/messages/propertiesPanel/MessageArray.js b/app/spiffworkflow/messages/propertiesPanel/MessageArray.js index b54ddab..a2b0dc3 100644 --- a/app/spiffworkflow/messages/propertiesPanel/MessageArray.js +++ b/app/spiffworkflow/messages/propertiesPanel/MessageArray.js @@ -51,10 +51,7 @@ export function MessageArray(props) { rootElements.push(newMessageElement); commandStack.execute('element.updateProperties', { element, - moddleElement: moddle, - properties: { - messages: rootElements, - }, + properties: {} }); } } @@ -72,10 +69,7 @@ function removeFactory(props) { removeFirstInstanceOfItemFromArrayInPlace(rootElements, messageElement); commandStack.execute('element.updateProperties', { element, - moddleElement: moddle, - properties: { - messages: rootElements, - }, + properties: {} }); }; } diff --git a/app/spiffworkflow/service_tasks/index.js b/app/spiffworkflow/service_tasks/index.js deleted file mode 100644 index b37dcea..0000000 --- a/app/spiffworkflow/service_tasks/index.js +++ /dev/null @@ -1,6 +0,0 @@ -import ConditionsPropertiesProvider from './propertiesPanel/ConditionsPropertiesProvider'; - -export default { - __init__: ['conditionsPropertiesProvider'], - conditionsPropertiesProvider: ['type', ConditionsPropertiesProvider], -}; diff --git a/app/spiffworkflow/service_tasks/propertiesPanel/ConditionsPropertiesProvider.js b/app/spiffworkflow/service_tasks/propertiesPanel/ConditionsPropertiesProvider.js deleted file mode 100644 index f473de1..0000000 --- a/app/spiffworkflow/service_tasks/propertiesPanel/ConditionsPropertiesProvider.js +++ /dev/null @@ -1,101 +0,0 @@ -import { is } from 'bpmn-js/lib/util/ModelUtil'; -import { - isTextFieldEntryEdited, - TextFieldEntry, -} from '@bpmn-io/properties-panel'; -import { useService } from 'bpmn-js-properties-panel'; - -const LOW_PRIORITY = 500; - -export default function ConditionsPropertiesProvider( - propertiesPanel, - translate, - moddle, - commandStack, - _elementRegistry -) { - this.getGroups = function getGroupsCallback(element) { - return function pushGroup(groups) { - if (is(element, 'bpmn:SequenceFlow')) { - const { source } = element; - if (is(source, 'bpmn:ExclusiveGateway')) { - groups.push( - createConditionsGroup(element, translate, moddle, commandStack) - ); - } - } - return groups; - }; - }; - propertiesPanel.registerProvider(LOW_PRIORITY, this); -} - -ConditionsPropertiesProvider.$inject = [ - 'propertiesPanel', - 'translate', - 'moddle', - 'commandStack', - 'elementRegistry', -]; - -function createConditionsGroup(element, translate, moddle, commandStack) { - return { - id: 'conditions', - label: translate('Conditions'), - entries: conditionGroup( - element, - moddle, - 'Condition Expression', - 'Expression to Execute', - commandStack - ), - }; -} - -function conditionGroup(element, moddle, label, description, commandStack) { - return [ - { - id: `condition_expression`, - element, - component: ConditionExpressionTextField, - moddle, - label, - description, - commandStack, - }, - ]; -} - -function ConditionExpressionTextField(props) { - const { element } = props; - const { moddle } = props; - const { label } = props; - - const debounce = useService('debounceInput'); - const getValue = () => { - const { conditionExpression } = element.businessObject; - if (conditionExpression) { - return conditionExpression.body; - } - return ''; - }; - - const setValue = (value) => { - let { conditionExpressionModdleElement } = element.businessObject; - if (!conditionExpressionModdleElement) { - conditionExpressionModdleElement = moddle.create('bpmn:Expression'); - } - conditionExpressionModdleElement.body = value; - element.businessObject.conditionExpression = - conditionExpressionModdleElement; - }; - - return TextFieldEntry({ - element, - id: `the-id`, - label, - getValue, - setValue, - debounce, - }); -}