diff --git a/.github/workflows/auto-merge-dependabot-prs.yml b/.github/workflows/auto-merge-dependabot-prs.yml index f5e175f9..ddf2ab3e 100644 --- a/.github/workflows/auto-merge-dependabot-prs.yml +++ b/.github/workflows/auto-merge-dependabot-prs.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@v1.3.4 + uses: dependabot/fetch-metadata@v1.3.6 with: github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Enable auto-merge for Dependabot PRs diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 9da4ff43..074c3a3f 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -14,6 +14,6 @@ jobs: uses: actions/checkout@v3 - name: Run Labeler - uses: crazy-max/ghaction-github-labeler@v4.0.0 + uses: crazy-max/ghaction-github-labeler@v4.1.0 with: skip-delete: true diff --git a/app/css/app.css b/app/css/app.css index 6beed193..295da8b0 100644 --- a/app/css/app.css +++ b/app/css/app.css @@ -78,3 +78,6 @@ html, body { right: 10px; } +.djs-palette.two-column.open { + width: 95px; +} diff --git a/app/spiffworkflow/DataObject/DataObjectInterceptor.js b/app/spiffworkflow/DataObject/DataObjectInterceptor.js index 1dc65380..df544bd7 100644 --- a/app/spiffworkflow/DataObject/DataObjectInterceptor.js +++ b/app/spiffworkflow/DataObject/DataObjectInterceptor.js @@ -46,13 +46,14 @@ export default class DataObjectInterceptor extends CommandInterceptor { } } else if (is(businessObject, 'bpmn:DataObject')) { // For data objects, only update the flowElements for new data objects, and set the parent so it doesn't get moved. - if (typeof(businessObject.$parent) === 'undefined') { + if (typeof (businessObject.$parent) === 'undefined') { const flowElements = realParent.get('flowElements'); flowElements.push(businessObject); businessObject.$parent = realParent; } - } else - bpmnUpdater.__proto__.updateSemanticParent.call(this, businessObject, parentBusinessObject); + } else { + bpmnUpdater.__proto__.updateSemanticParent.call(bpmnUpdater, businessObject, parentBusinessObject); + } }; /** diff --git a/app/spiffworkflow/messages/propertiesPanel/CorrelationPropertiesArray.js b/app/spiffworkflow/messages/propertiesPanel/CorrelationPropertiesArray.js index 86a82353..0e73336b 100644 --- a/app/spiffworkflow/messages/propertiesPanel/CorrelationPropertiesArray.js +++ b/app/spiffworkflow/messages/propertiesPanel/CorrelationPropertiesArray.js @@ -255,40 +255,6 @@ function MessageCorrelationKeySelect(props) { }); } -function CorrelationPropertyIdTextField(props) { - const { - id, - element, - correlationPropertyModdleElement, - commandStack, - translate, - } = props; - - const debounce = useService('debounceInput'); - const setValue = (value) => { - commandStack.execute('element.updateModdleProperties', { - element, - moddleElement: correlationPropertyModdleElement, - properties: { - id: value, - }, - }); - }; - - const getValue = () => { - return correlationPropertyModdleElement.id; - }; - - return TextFieldEntry({ - element, - id: `${id}-id-textField`, - label: translate('ID'), - getValue, - setValue, - debounce, - }); -} - function CorrelationPropertyNameTextField(props) { const { id, @@ -305,6 +271,7 @@ function CorrelationPropertyNameTextField(props) { moddleElement: correlationPropertyModdleElement, properties: { name: value, + id: value, }, }); }; diff --git a/webpack.config.js b/webpack.config.js index 8fe08cf5..0774e48e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -35,7 +35,6 @@ module.exports = { new CopyWebpackPlugin({ patterns: [ { from: 'assets/**', to: 'vendor/bpmn-js', context: 'node_modules/bpmn-js/dist/' }, - { from: '*.css', to: 'vendor/bpmn-js-color-picker', context: 'node_modules/bpmn-js-color-picker/colors' }, { from: 'assets/**', to: 'vendor/bpmn-js-properties-panel',