From a5ebbe24fd84816f1ec1512518dda2740aa2b76f Mon Sep 17 00:00:00 2001 From: burnettk Date: Fri, 7 Apr 2023 11:46:18 -0400 Subject: [PATCH] Squashed 'bpmn-js-spiffworkflow/' changes from c4843c17b..6391337a8 6391337a8 Fix for lanes that doesn't break the world. 5f849c690 Revert "Revert "Fix bug with Data Object Interceptor picking up too much."" 1fa1f8741 Merge branch 'main' of github.com:sartography/bpmn-js-spiffworkflow into main 76e6ac22f Revert "Fix bug with Data Object Interceptor picking up too much." Seems to be preventing someone from saving the file. This reverts commit c807dbcb2c1c2a30a1c8e20851c60082d46eddeb. 2822ba164 Merge pull request #25 from sartography/dependabot/github_actions/dependabot/fetch-metadata-1.3.6 9ee6d378f Merge pull request #20 from sartography/dependabot/github_actions/crazy-max/ghaction-github-labeler-4.1.0 c807dbcb2 Fix bug with Data Object Interceptor picking up too much. don't look for the color picker right now. clean up the css 82260144f Merge branch 'feature/inherited-data-objects' into main 0f7253032 remove ununsed code, and alter correlation properties such that the id and name are always set to the same thing. 1178d2fb7 Bump dependabot/fetch-metadata from 1.3.4 to 1.3.6 d9bf091f2 Bump crazy-max/ghaction-github-labeler from 4.0.0 to 4.1.0 git-subtree-dir: bpmn-js-spiffworkflow git-subtree-split: 6391337a86a6342fcfcfcd3e57d39cb61c7af668 --- .../workflows/auto-merge-dependabot-prs.yml | 2 +- .github/workflows/labeler.yml | 2 +- app/css/app.css | 3 ++ .../DataObject/DataObjectInterceptor.js | 7 ++-- .../CorrelationPropertiesArray.js | 35 +------------------ webpack.config.js | 1 - 6 files changed, 10 insertions(+), 40 deletions(-) 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',