diff --git a/bpmn-js-spiffworkflow/.github/workflows/auto-merge-dependabot-prs.yml b/bpmn-js-spiffworkflow/.github/workflows/auto-merge-dependabot-prs.yml index ddf2ab3e..a8971e0b 100644 --- a/bpmn-js-spiffworkflow/.github/workflows/auto-merge-dependabot-prs.yml +++ b/bpmn-js-spiffworkflow/.github/workflows/auto-merge-dependabot-prs.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@v1.3.6 + uses: dependabot/fetch-metadata@v1.4.0 with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Enable auto-merge for Dependabot PRs diff --git a/bpmn-js-spiffworkflow/.github/workflows/publish.yml b/bpmn-js-spiffworkflow/.github/workflows/publish.yml index 16e64908..bf47272d 100644 --- a/bpmn-js-spiffworkflow/.github/workflows/publish.yml +++ b/bpmn-js-spiffworkflow/.github/workflows/publish.yml @@ -18,7 +18,7 @@ jobs: node-version: 18 - run: npm install - run: npm test - - uses: JS-DevTools/npm-publish@v1 + - uses: JS-DevTools/npm-publish@v2 with: token: ${{ secrets.NPM_TOKEN }} access: public diff --git a/bpmn-js-spiffworkflow/app/spiffworkflow/extensions/propertiesPanel/ExtensionsPropertiesProvider.js b/bpmn-js-spiffworkflow/app/spiffworkflow/extensions/propertiesPanel/ExtensionsPropertiesProvider.js index 1955dd93..ff4869c4 100644 --- a/bpmn-js-spiffworkflow/app/spiffworkflow/extensions/propertiesPanel/ExtensionsPropertiesProvider.js +++ b/bpmn-js-spiffworkflow/app/spiffworkflow/extensions/propertiesPanel/ExtensionsPropertiesProvider.js @@ -37,14 +37,18 @@ export default function ExtensionsPropertiesProvider( createBusinessRuleGroup(element, translate, moddle, commandStack) ); } - if (isAny(element, ['bpmn:ManualTask', 'bpmn:UserTask', 'bpmn:EndEvent'])) { + if ( + isAny(element, [ + 'bpmn:ManualTask', + 'bpmn:UserTask', + 'bpmn:ServiceTask', + 'bpmn:EndEvent', + 'bpmn:ScriptTask', + 'bpmn:IntermediateCatchEvent', + ]) + ) { groups.push( - createUserInstructionsGroup ( - element, - translate, - moddle, - commandStack - ) + createUserInstructionsGroup(element, translate, moddle, commandStack) ); } if (is(element, 'bpmn:ServiceTask')) { @@ -237,7 +241,7 @@ function createUserInstructionsGroup ( component: SpiffExtensionTextArea, name: 'spiffworkflow:instructionsForEndUser', label: 'Instructions', - description: 'The instructions to display when completing this task.', + description: 'Displayed above user forms or when this task is executing.', }, { element, diff --git a/bpmn-js-spiffworkflow/app/spiffworkflow/extensions/propertiesPanel/SpiffExtensionServiceProperties.js b/bpmn-js-spiffworkflow/app/spiffworkflow/extensions/propertiesPanel/SpiffExtensionServiceProperties.js index 33f56d70..57ffeaf0 100644 --- a/bpmn-js-spiffworkflow/app/spiffworkflow/extensions/propertiesPanel/SpiffExtensionServiceProperties.js +++ b/bpmn-js-spiffworkflow/app/spiffworkflow/extensions/propertiesPanel/SpiffExtensionServiceProperties.js @@ -45,10 +45,6 @@ function requestServiceTaskOperators(eventBus, element, commandStack) { serviceTaskOperators = event.serviceTaskOperators.sort((a, b) => a.id.localeCompare(b.id) ); - commandStack.execute('element.updateProperties', { - element, - properties: {}, - }); } }); }