From 8ff29bb6ddf118087c71bcf3a850ed7d5873dd72 Mon Sep 17 00:00:00 2001 From: Alexander Kriebisch Date: Tue, 4 Apr 2023 12:59:54 +0200 Subject: [PATCH 1/3] Workflow Extend Bundle - Added ID to place settings --- CHANGELOG.md | 5 ++++- README.md | 7 ++++++- composer.json | 3 ++- docs/place_settings.png | Bin 0 -> 44212 bytes patches/addIDPlaceSettings.patch | 31 +++++++++++++++++++++++++++++++ src/WorkflowExtendBundle.php | 2 +- 6 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 docs/place_settings.png create mode 100644 patches/addIDPlaceSettings.patch diff --git a/CHANGELOG.md b/CHANGELOG.md index 52bd152..c330b46 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,8 +2,11 @@ All notable changes to the Workflow Extend Bundle will be documented in this file. +## [1.1.0] - 2023-04-04 +- Added ID to place settings + ## [1.0.1] - 2023-01-20 - Check if PimcoreWorkflowDesignerBundle is present and add javascript only if it is. ## [1.0.0] - 2023-01-13 -- initial release +- Initial release diff --git a/README.md b/README.md index ab31d19..142372a 100755 --- a/README.md +++ b/README.md @@ -101,7 +101,12 @@ Can be found in `var/log/workflow-extend-bundle.log`. - Adds the `data` option to the workflow configuration - A patch file is needed, since there is no other way to extend the dependency injection configuration of the workflow bundle +- [addIDPlaceSettings.patch](patches/addIDPlaceSettings.patch) + - Adds the `id` field to the state configuration + - A patch file is needed, since there is no other way to extend the place settings of the + workflow bundle + - ![Backend Configuration](docs/place_settings.png) --- -Last Modified: 2023-01-20 \ No newline at end of file +Last modified: 2023-04-04 \ No newline at end of file diff --git a/composer.json b/composer.json index 251e1c4..63858c4 100755 --- a/composer.json +++ b/composer.json @@ -30,7 +30,8 @@ }, "patches": { "pimcore/pimcore": { - "WorkFlowExtendBundle extend dependency injection patch": "vendor/studio1/workflow-extend/patches/addDiConfiguration.patch" + "WorkFlowExtendBundle extend dependency injection patch": "vendor/studio1/workflow-extend/patches/addDiConfiguration.patch", + "WorkFlowExtendBundle extend state settings patch": "vendor/studio1/workflow-extend/patches/addIDPlaceSettings.patch" } } }, diff --git a/docs/place_settings.png b/docs/place_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..7bc9ed784e75786cdb633e9f67b4255081a99140 GIT binary patch literal 44212 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 literal 0 HcmV?d00001 diff --git a/patches/addIDPlaceSettings.patch b/patches/addIDPlaceSettings.patch new file mode 100644 index 0000000..9f2964f --- /dev/null +++ b/patches/addIDPlaceSettings.patch @@ -0,0 +1,31 @@ +Index: pimcore/vendor/pimcore/workflow-designer/src/Resources/public/js/pimcore/configuration/item/placeSettings.js +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/pimcore/vendor/pimcore/workflow-designer/src/Resources/public/js/pimcore/configuration/item/placeSettings.js b/pimcore/vendor/pimcore/workflow-designer/src/Resources/public/js/pimcore/configuration/item/placeSettings.js +--- a/pimcore/vendor/pimcore/workflow-designer/src/Resources/public/js/pimcore/configuration/item/placeSettings.js ++++ b/pimcore/vendor/pimcore/workflow-designer/src/Resources/public/js/pimcore/configuration/item/placeSettings.js (date 1680598907695) +@@ -4,7 +4,7 @@ + + + initialize: function(placeId, placeData, callback) { +- ++ placeData.id = placeId; + const data = placeData || {}; + placeData.permissions = placeData.permissions || []; + +@@ -64,6 +64,13 @@ + }, + items: [ + { ++ xtype: 'textfield', ++ fieldLabel: t('id'), ++ name: '__ignore_name', ++ value: placeData.id, ++ readOnly: true, ++ width: 540, ++ }, { + xtype: 'textfield', + fieldLabel: t('label'), + name: 'label', diff --git a/src/WorkflowExtendBundle.php b/src/WorkflowExtendBundle.php index 5024df8..6466b12 100755 --- a/src/WorkflowExtendBundle.php +++ b/src/WorkflowExtendBundle.php @@ -69,6 +69,6 @@ public function getNiceName() */ public function getVersion() { - return '1.0.1'; + return '1.1.0'; } } From 775db5780b11256124e096db962bc6fe466beb64 Mon Sep 17 00:00:00 2001 From: Alexander Kriebisch Date: Thu, 6 Apr 2023 10:20:35 +0200 Subject: [PATCH 2/3] Workflow Extend Bundle - Changed adding id field to extension ot item settings - Removed patch --- CHANGELOG.md | 2 +- README.md | 8 +- composer.json | 3 +- patches/addIDPlaceSettings.patch | 31 -- .../configuration/item/placeSettings.js | 337 ++++++++++++++++++ src/WorkflowExtendBundle.php | 3 +- 6 files changed, 344 insertions(+), 40 deletions(-) delete mode 100644 patches/addIDPlaceSettings.patch create mode 100644 src/Resources/public/js/pimcore/configuration/item/placeSettings.js diff --git a/CHANGELOG.md b/CHANGELOG.md index c330b46..6f60311 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to the Workflow Extend Bundle will be documented in this file. -## [1.1.0] - 2023-04-04 +## [1.1.0] - 2023-04-06 - Added ID to place settings ## [1.0.1] - 2023-01-20 diff --git a/README.md b/README.md index 142372a..8b5b18f 100755 --- a/README.md +++ b/README.md @@ -101,12 +101,10 @@ Can be found in `var/log/workflow-extend-bundle.log`. - Adds the `data` option to the workflow configuration - A patch file is needed, since there is no other way to extend the dependency injection configuration of the workflow bundle -- [addIDPlaceSettings.patch](patches/addIDPlaceSettings.patch) - - Adds the `id` field to the state configuration - - A patch file is needed, since there is no other way to extend the place settings of the - workflow bundle +- [placeSettings.js](src/Resources/public/js/pimcore/configuration/item/placeSettings.js) + - Extends the Pimcore Workflow Designer by additional field for the state id - ![Backend Configuration](docs/place_settings.png) --- -Last modified: 2023-04-04 \ No newline at end of file +Last modified: 2023-04-06 \ No newline at end of file diff --git a/composer.json b/composer.json index 63858c4..251e1c4 100755 --- a/composer.json +++ b/composer.json @@ -30,8 +30,7 @@ }, "patches": { "pimcore/pimcore": { - "WorkFlowExtendBundle extend dependency injection patch": "vendor/studio1/workflow-extend/patches/addDiConfiguration.patch", - "WorkFlowExtendBundle extend state settings patch": "vendor/studio1/workflow-extend/patches/addIDPlaceSettings.patch" + "WorkFlowExtendBundle extend dependency injection patch": "vendor/studio1/workflow-extend/patches/addDiConfiguration.patch" } } }, diff --git a/patches/addIDPlaceSettings.patch b/patches/addIDPlaceSettings.patch deleted file mode 100644 index 9f2964f..0000000 --- a/patches/addIDPlaceSettings.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: pimcore/vendor/pimcore/workflow-designer/src/Resources/public/js/pimcore/configuration/item/placeSettings.js -IDEA additional info: -Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP -<+>UTF-8 -=================================================================== -diff --git a/pimcore/vendor/pimcore/workflow-designer/src/Resources/public/js/pimcore/configuration/item/placeSettings.js b/pimcore/vendor/pimcore/workflow-designer/src/Resources/public/js/pimcore/configuration/item/placeSettings.js ---- a/pimcore/vendor/pimcore/workflow-designer/src/Resources/public/js/pimcore/configuration/item/placeSettings.js -+++ b/pimcore/vendor/pimcore/workflow-designer/src/Resources/public/js/pimcore/configuration/item/placeSettings.js (date 1680598907695) -@@ -4,7 +4,7 @@ - - - initialize: function(placeId, placeData, callback) { -- -+ placeData.id = placeId; - const data = placeData || {}; - placeData.permissions = placeData.permissions || []; - -@@ -64,6 +64,13 @@ - }, - items: [ - { -+ xtype: 'textfield', -+ fieldLabel: t('id'), -+ name: '__ignore_name', -+ value: placeData.id, -+ readOnly: true, -+ width: 540, -+ }, { - xtype: 'textfield', - fieldLabel: t('label'), - name: 'label', diff --git a/src/Resources/public/js/pimcore/configuration/item/placeSettings.js b/src/Resources/public/js/pimcore/configuration/item/placeSettings.js new file mode 100644 index 0000000..d6aa97f --- /dev/null +++ b/src/Resources/public/js/pimcore/configuration/item/placeSettings.js @@ -0,0 +1,337 @@ +/** + * Created by PhpStorm. + * User: akriebisch + * Date: 06.04.23 + * Time: 09:10 + */ + +/** + * Extend the original place settings panel + * @see workflow-designer/src/Resources/public/js/pimcore/configuration/item/placeSettings.js + * + * Most of the code is copied from the original file, due to the fact that the original file is not extendable. + * Changes are marked with "Studio1 start" and "Studio1 end". + */ + +pimcore.registerNS('pimcore.plugin.studio1.workflowDesigner.item.placeSettings'); +pimcore.bundle.workflowDesigner.item.placeSettings = Class.create(pimcore.bundle.workflowDesigner.item.placeSettings, { + + + initialize: function(placeId, placeData, callback) { + + // Studio1 start + placeData.id = placeId; + // Studio1 end + const data = placeData || {}; + placeData.permissions = placeData.permissions || []; + + this.window = new Ext.window.Window({ + title: t('bundle_wfdesigner_place_settings'), + modal: true, + resizeable: false, + layout: 'fit', + width: 800, + height: '90%', + autoScroll: true, + buttons: [ + { + text: t('apply'), + iconCls: 'pimcore_icon_apply', + handler: function(){ + const values = this.generalFormPanel.getValues(); + let permissions = []; + + if(this.permissionPanel) { + this.permissionPanel.items.items.forEach(function(item) { + permissions.push(item.getValues()); + }); + } else { + permissions = placeData.permissions; + } + + values.permissions = permissions; + + if(callback) { + callback(values); + } + + this.window.hide(); + this.window.destroy(); + + }.bind(this) + } + ], + items: [ + this.getFormPanel(data) + ] + }); + + const user = pimcore.globalmanager.get('user'); + if(user.isAllowed('permission_workflow_designer_place_permissions')) { + this.initPermissionPanel(placeData.permissions); + } + this.window.show(); + }, + + getFormPanel: function(placeData) { + this.generalFormPanel = Ext.create('Pimcore.WorkflowDesigner.StructuredValueForm', { + defaults: { + labelWidth: 180, + listeners: pimcore.bundle.workflowDesigner.tooltipDefinition.definition.listeners + }, + items: [ + // Studio1 start + { + xtype: 'textfield', + fieldLabel: t('id'), + name: '__ignore_name', + value: placeData.id, + readOnly: true, + width: 540, + }, { + // Studio1 end + xtype: 'textfield', + fieldLabel: t('label'), + name: 'label', + value: placeData.label, + width: 540, + tooltip: t('bundle_wfdesigner_tooltip_place_name') + },{ + xtype: 'textfield', + fieldLabel: t('title'), + name: 'title', + value: placeData.title, + width: 540, + tooltip: t('bundle_wfdesigner_tooltip_place_title') + },{ + xtype: 'checkbox', + name: 'visibleInHeader', + value: placeData.hasOwnProperty('visibleInHeader') ? placeData.visibleInHeader : true, + inputValue: true, + uncheckedValue: false, + fieldLabel: t('bundle_wfdesigner_place_visibleInHeader'), + tooltip: t('bundle_wfdesigner_tooltip_place_visibleInHeader') + },{ + xtype: 'colorfield', + name: 'color', + value: (placeData.color) ? placeData.color : '000000', + fieldLabel: t('color'), + tooltip: t('bundle_wfdesigner_tooltip_place_color') + },{ + xtype: 'checkbox', + name: 'colorInverted', + value: placeData.colorInverted, + inputValue: true, + uncheckedValue: false, + fieldLabel: t('bundle_wfdesigner_place_colorInverted'), + tooltip: t('bundle_wfdesigner_tooltip_place_colorInverted') + } + ] + }); + + const items = [{ + xtype: 'fieldset', + width: '100%', + title: t('bundle_wfdesigner_general'), + items: [ + this.generalFormPanel + ] + }]; + + const user = pimcore.globalmanager.get('user'); + if(user.isAllowed('permission_workflow_designer_place_permissions')) { + items.push({ + xtype: 'fieldset', + width: '100%', + collapsible: true, + title: t('bundle_wfdesigner_place_permissions'), + items: [ + { + xtype: 'displayfield', + value: t('bundle_wfdesigner_tooltip_place_permissions') + }, + this.buildPermissionPanel() + ] + }); + } + + this.mainPanel = Ext.create('Ext.panel.Panel', { + border: false, + frame:false, + bodyStyle: 'padding:10px', + items: items, + labelWidth: 130, + collapsible: false, + autoScroll: true + }); + + return this.mainPanel; + }, + + /* + buildPermissionPanel: function() { + this.permissionPanel = Ext.create('Ext.panel.Panel', { + scrollable: true, + tbar: { + items: [ + { + text: t('add'), + iconCls: 'pimcore_icon_add', + handler: function() { + this.collapseAll(); + this.addItem({}, false, true); + }.bind(this) + }, '->', { + text: t('bundle_wfdesigner_place_permissions_collapse_all'), + iconCls: 'workflow_designer_icon_collapse', + handler: this.collapseAll.bind(this) + } + ] + }, + }); + + return this.permissionPanel; + }, + + initPermissionPanel: function(permissions) { + + permissions.forEach(function(permission) { + this.addItem(permission, true, false); + }.bind(this)); + + }, + + collapseAll: function() { + this.permissionPanel.items.items.forEach(function(item) { + item.collapse(null, false); + }); + }, + + + addItem: function(data, collapsed, scrollToBottom) { + + const item = Ext.create('Pimcore.WorkflowDesigner.StructuredValueForm', { + bodyStyle: 'padding:10px;', + collapsed : true, + collapsible: true, + titleCollapse: true, + hideCollapseTool: true, + headerOverCls: 'workflow_designer_cursor_pointer', + cls: 'workflow_designer_settings_accordion_panel', + collapsedCls: 'workflow_designer_collapsed', + defaults: { + labelWidth: 100 + }, + tools: [{ + type: 'close', + cls: 'workflow_designer_icon_settings_accordion_panel_remove', + handler: function(owner, tool, event) { + const ownerContainer = event.container.component.ownerCt; + ownerContainer.remove(event.container.component, true); + ownerContainer.updateLayout(); + }.bind(this) + }], + }); + + item.add([ + { + xtype: 'textfield', + fieldLabel: t('bundle_wfdesigner_place_permissions_condition'), + name: 'condition', + value: data.condition, + tooltip: t('bundle_wfdesigner_tooltip_place_permission_condition'), + width: '100%', + listeners: { + render: pimcore.bundle.workflowDesigner.tooltipDefinition.definition.listeners.render, + change: function(field, newValue) { + this.updatePermissionItemTitle(newValue, item); + }.bind(this) + } + },{ + xtype: 'panel', + layout: 'column', + items: [ + { + xtype: 'panel', + columnWidth: 0.5, + items: [ + this.getPermissionCheckbox('modify', data.modify), + this.getPermissionCheckbox('save', data.save), + this.getPermissionCheckbox('publish', data.publish), + this.getPermissionCheckbox('unpublish', data.unpublish), + this.getPermissionCheckbox('delete', data.delete), + ] + },{ + xtype: 'panel', + columnWidth: 0.5, + items: [ + this.getPermissionCheckbox('rename', data.rename), + this.getPermissionCheckbox('view', data.view), + this.getPermissionCheckbox('settings', data.settings), + this.getPermissionCheckbox('versions', data.versions), + this.getPermissionCheckbox('properties', data.properties), + ] + } + ] + }, + + + { + xtype: 'textfield', + fieldLabel: t('bundle_wfdesigner_place_permissions_object_layout'), + name: 'objectLayout', + value: data.objectLayout, + tooltip: t('bundle_wfdesigner_tooltip_place_permission_object_layout'), + listeners: { + render: pimcore.bundle.workflowDesigner.tooltipDefinition.definition.listeners.render, + }, + width: '100%' + }, + ]); + + this.updatePermissionItemTitle(data.condition, item); + + this.permissionPanel.add(item); + + if(collapsed) { + item.collapse(null, false); + } else { + item.expand(false); + } + + if(scrollToBottom) { + this.mainPanel.getScrollable().scrollTo(0, 9999, false); + } + }, + + getPermissionCheckbox: function (name, initValue) { + return { + xtype: 'combobox', + fieldLabel: t('bundle_wfdesigner_place_permissions_' + name), + name: name, + store: Ext.data.ArrayStore({ + fields: ['type'], + data: [ + [null, t('bundle_wfdesigner_place_permissions_nc')], + [true, t('bundle_wfdesigner_place_permissions_yes')], + [false, t('bundle_wfdesigner_place_permissions_no')] + ] + }), + value: initValue, + displayField: 'type', + valueField: 'type' + }; + }, + + updatePermissionItemTitle: function(condition, itemPanel) { + let title = t('bundle_wfdesigner_place_permissions_title'); + if(condition && condition.length > 0) { + + title = title + t('bundle_wfdesigner_place_permissions_title_for') + condition; + + } + itemPanel.setTitle(title); + } +*/ + +}); \ No newline at end of file diff --git a/src/WorkflowExtendBundle.php b/src/WorkflowExtendBundle.php index 6466b12..b30d1be 100755 --- a/src/WorkflowExtendBundle.php +++ b/src/WorkflowExtendBundle.php @@ -38,7 +38,8 @@ public function getJsPaths() } return [ - '/bundles/workflowextend/js/pimcore/configuration/item/transitionSettings.js' + '/bundles/workflowextend/js/pimcore/configuration/item/transitionSettings.js', + '/bundles/workflowextend/js/pimcore/configuration/item/placeSettings.js', ]; } From fc834bf80d99d09ed0ee2d57af7300e19acc42e2 Mon Sep 17 00:00:00 2001 From: Alexander Kriebisch Date: Thu, 6 Apr 2023 11:06:23 +0200 Subject: [PATCH 3/3] Workflow Extend Bundle - Removed comment --- .../configuration/item/placeSettings.js | 166 ------------------ 1 file changed, 166 deletions(-) diff --git a/src/Resources/public/js/pimcore/configuration/item/placeSettings.js b/src/Resources/public/js/pimcore/configuration/item/placeSettings.js index d6aa97f..25589dd 100644 --- a/src/Resources/public/js/pimcore/configuration/item/placeSettings.js +++ b/src/Resources/public/js/pimcore/configuration/item/placeSettings.js @@ -168,170 +168,4 @@ pimcore.bundle.workflowDesigner.item.placeSettings = Class.create(pimcore.bundle return this.mainPanel; }, - /* - buildPermissionPanel: function() { - this.permissionPanel = Ext.create('Ext.panel.Panel', { - scrollable: true, - tbar: { - items: [ - { - text: t('add'), - iconCls: 'pimcore_icon_add', - handler: function() { - this.collapseAll(); - this.addItem({}, false, true); - }.bind(this) - }, '->', { - text: t('bundle_wfdesigner_place_permissions_collapse_all'), - iconCls: 'workflow_designer_icon_collapse', - handler: this.collapseAll.bind(this) - } - ] - }, - }); - - return this.permissionPanel; - }, - - initPermissionPanel: function(permissions) { - - permissions.forEach(function(permission) { - this.addItem(permission, true, false); - }.bind(this)); - - }, - - collapseAll: function() { - this.permissionPanel.items.items.forEach(function(item) { - item.collapse(null, false); - }); - }, - - - addItem: function(data, collapsed, scrollToBottom) { - - const item = Ext.create('Pimcore.WorkflowDesigner.StructuredValueForm', { - bodyStyle: 'padding:10px;', - collapsed : true, - collapsible: true, - titleCollapse: true, - hideCollapseTool: true, - headerOverCls: 'workflow_designer_cursor_pointer', - cls: 'workflow_designer_settings_accordion_panel', - collapsedCls: 'workflow_designer_collapsed', - defaults: { - labelWidth: 100 - }, - tools: [{ - type: 'close', - cls: 'workflow_designer_icon_settings_accordion_panel_remove', - handler: function(owner, tool, event) { - const ownerContainer = event.container.component.ownerCt; - ownerContainer.remove(event.container.component, true); - ownerContainer.updateLayout(); - }.bind(this) - }], - }); - - item.add([ - { - xtype: 'textfield', - fieldLabel: t('bundle_wfdesigner_place_permissions_condition'), - name: 'condition', - value: data.condition, - tooltip: t('bundle_wfdesigner_tooltip_place_permission_condition'), - width: '100%', - listeners: { - render: pimcore.bundle.workflowDesigner.tooltipDefinition.definition.listeners.render, - change: function(field, newValue) { - this.updatePermissionItemTitle(newValue, item); - }.bind(this) - } - },{ - xtype: 'panel', - layout: 'column', - items: [ - { - xtype: 'panel', - columnWidth: 0.5, - items: [ - this.getPermissionCheckbox('modify', data.modify), - this.getPermissionCheckbox('save', data.save), - this.getPermissionCheckbox('publish', data.publish), - this.getPermissionCheckbox('unpublish', data.unpublish), - this.getPermissionCheckbox('delete', data.delete), - ] - },{ - xtype: 'panel', - columnWidth: 0.5, - items: [ - this.getPermissionCheckbox('rename', data.rename), - this.getPermissionCheckbox('view', data.view), - this.getPermissionCheckbox('settings', data.settings), - this.getPermissionCheckbox('versions', data.versions), - this.getPermissionCheckbox('properties', data.properties), - ] - } - ] - }, - - - { - xtype: 'textfield', - fieldLabel: t('bundle_wfdesigner_place_permissions_object_layout'), - name: 'objectLayout', - value: data.objectLayout, - tooltip: t('bundle_wfdesigner_tooltip_place_permission_object_layout'), - listeners: { - render: pimcore.bundle.workflowDesigner.tooltipDefinition.definition.listeners.render, - }, - width: '100%' - }, - ]); - - this.updatePermissionItemTitle(data.condition, item); - - this.permissionPanel.add(item); - - if(collapsed) { - item.collapse(null, false); - } else { - item.expand(false); - } - - if(scrollToBottom) { - this.mainPanel.getScrollable().scrollTo(0, 9999, false); - } - }, - - getPermissionCheckbox: function (name, initValue) { - return { - xtype: 'combobox', - fieldLabel: t('bundle_wfdesigner_place_permissions_' + name), - name: name, - store: Ext.data.ArrayStore({ - fields: ['type'], - data: [ - [null, t('bundle_wfdesigner_place_permissions_nc')], - [true, t('bundle_wfdesigner_place_permissions_yes')], - [false, t('bundle_wfdesigner_place_permissions_no')] - ] - }), - value: initValue, - displayField: 'type', - valueField: 'type' - }; - }, - - updatePermissionItemTitle: function(condition, itemPanel) { - let title = t('bundle_wfdesigner_place_permissions_title'); - if(condition && condition.length > 0) { - - title = title + t('bundle_wfdesigner_place_permissions_title_for') + condition; - - } - itemPanel.setTitle(title); - } -*/ - }); \ No newline at end of file