Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Psdp 358 ] allow add custom perspective element tree in element t… #149

Merged
merged 2 commits into from
Oct 12, 2023
Merged

[Psdp 358 ] allow add custom perspective element tree in element t… #149

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
723a917
[Improvements] allow add custom perspective element tree in element t…
samyemad Oct 2, 2023
ad8a65c
[improvenments ] change type of some variables
samyemad Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions src/Resources/public/js/pimcore/perspective/events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,24 @@ pimcore.events.onPerspectiveEditorLoadPermissions = "pimcore.perspectiveEditor.p
*/
pimcore.events.onPerspectiveEditorLoadStructureForPermissions = "pimcore.perspectiveEditor.permissions.structure.load";

/**
* fired before add elementTreeSettingsForm to perspectiveEditPanel
* record and perspectiveElementTreeSettingsFormId and setDirtyCallBack are passed as parameters
*/
pimcore.events.preAddPerspectiveEditorElementTreeSettingsForm = "pimcore.perspectiveEditor.elementTreeSettingsForm.preAdd";

/**
* fired after PerspectiveElementTreeTypeStore was created
* PerspectiveElementTreeTypeStoreId is passed as parameter
*/
pimcore.events.postCreatePerspectiveEditorElementTreeTypeStore = "pimcore.perspectiveEditor.elementTreeTypeStore.postCreate";

/**
* fired after ElementTreeIcons Array was initialized
*/
pimcore.events.addPerspectiveEditorElementTreeIcon = 'pimcore.perspectiveEditor.elementTreeIcon.add';




//TODO: delete once support for Pimcore 10.6 is dropped
Expand Down
72 changes: 49 additions & 23 deletions src/Resources/public/js/pimcore/perspective/perspective.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,33 +674,43 @@ pimcore.bundle.perspectiveeditor.PerspectiveEditor = class {
if(!config.treeContextMenu){
config.treeContextMenu = {};
}

var treeElementTypStore = new Ext.data.Store({
let elementTreeTypeStoreId = 'perspective_editor_element_tree_type_store';
let elementTreeTypeStore = new Ext.data.Store({
samyemad marked this conversation as resolved.
Show resolved Hide resolved
fields: ['name', 'value'],
id: elementTreeTypeStoreId,
data: [
{name: t('plugin_pimcore_perspectiveeditor_document'), value: 'documents'},
{name: t('plugin_pimcore_perspectiveeditor_asset'), value: 'assets'},
{name: t('plugin_pimcore_perspectiveeditor_object'), value: 'objects'},
{name: t('plugin_pimcore_perspectiveeditor_custom_view'), value: 'customview'}
]
});
const postCreatePerspectiveEditorElementTreeTypeStore = new CustomEvent(pimcore.events.postCreatePerspectiveEditorElementTreeTypeStore, {
detail: {
elementTreeTypeStoreId: elementTreeTypeStoreId,
}
});
document.dispatchEvent(postCreatePerspectiveEditorElementTreeTypeStore);

var customViewComboBox = new Ext.form.ComboBox({
name: 'perspective_editor_customview',
padding: 10,
width: '75%',
fieldLabel: t('plugin_pimcore_perspectiveeditor_custom_view'),
queryMode: 'local',
store: this.availableViewsStore,
displayField: 'name',
valueField: 'id',
name: 'view-id',
editable: true,
editable: false,
value: config.id,
forceSelection:true,
hidden: config.type !== 'customview',
listeners: {
change: function(elem, newValue, oldValue){
config.id = newValue;
this.setDirty(true);
if(config.type == 'customview'){
config.id = newValue;
this.setDirty(true);
}
}.bind(this)
}
});
Expand All @@ -718,6 +728,7 @@ pimcore.bundle.perspectiveeditor.PerspectiveEditor = class {


var documentTreeContextMenuGroup = new Ext.form.FieldSet({
name: 'perspective_editor_documents',
title: t('plugin_pimcore_perspectiveeditor_document') + ' - ' + t('plugin_pimcore_perspectiveeditor_contextmenu'),
hidden: config.type !== 'documents',
margin: '30 10 0',
Expand All @@ -729,6 +740,7 @@ pimcore.bundle.perspectiveeditor.PerspectiveEditor = class {
pimcore.bundle.perspectiveeditor.PerspectiveViewHelper.generateCheckboxesForStructure(config.treeContextMenu.asset, assetContextMenuItems, this.setDirty.bind(this, true), 'plugin_pimcore_perspectiveeditor_asset');

var assetTreeContextMenuGroup = new Ext.form.FieldSet({
name: 'perspective_editor_assets',
title: t('plugin_pimcore_perspectiveeditor_asset') + ' - ' + t('plugin_pimcore_perspectiveeditor_contextmenu'),
hidden: config.type !== 'assets',
margin: '30 10 0',
Expand All @@ -740,23 +752,35 @@ pimcore.bundle.perspectiveeditor.PerspectiveEditor = class {
pimcore.bundle.perspectiveeditor.PerspectiveViewHelper.generateCheckboxesForStructure(config.treeContextMenu.object, objectContextMenuItems, this.setDirty.bind(this, true), 'plugin_pimcore_perspectiveeditor_object');

var objectTreeContextMenuGroup = new Ext.form.FieldSet({
name: 'perspective_editor_objects',
title: t('plugin_pimcore_perspectiveeditor_object') + ' - ' + t('plugin_pimcore_perspectiveeditor_contextmenu'),
hidden: config.type !== 'objects',
margin: '30 10 0',
width: 500,
items: objectContextMenuItems
});

return new Ext.form.Panel({
const elementTreeIcons = {
documents: 'pimcore_icon_document',
assets: 'pimcore_icon_asset',
objects: 'pimcore_icon_object',
customview: 'pimcore_icon_custom_views',
}
const addPerspectiveEditorElementTreeIcon = new CustomEvent(pimcore.events.addPerspectiveEditorElementTreeIcon);
addPerspectiveEditorElementTreeIcon.data = elementTreeIcons;
document.dispatchEvent(addPerspectiveEditorElementTreeIcon);
let elementTreeSettingsFormId = 'perspective_element_tree_settings_form';
let elementTreeSettingsForm = new Ext.form.Panel({
samyemad marked this conversation as resolved.
Show resolved Hide resolved
disabled: !record.data["writeable"],
id: elementTreeSettingsFormId,
title: t('plugin_pimcore_perspectiveeditor_tree_element_selection'),
icon: '/bundles/pimcoreadmin/img/flat-color-icons/genealogy.svg',
items: [
new Ext.form.ComboBox({
padding: 10,
fieldLabel: t('plugin_pimcore_perspectiveeditor_view_type'),
queryMode: 'local',
store: treeElementTypStore,
store: elementTreeTypeStore,
displayField: 'name',
valueField: 'value',
name: 'type',
Expand All @@ -765,21 +789,12 @@ pimcore.bundle.perspectiveeditor.PerspectiveEditor = class {
listeners: {
change: function(elem, newValue, oldValue){
config.type = newValue;
customViewComboBox.setHidden(newValue !== 'customview');

documentTreeContextMenuGroup.setHidden(newValue !== 'documents');
assetTreeContextMenuGroup.setHidden(newValue !== 'assets');
objectTreeContextMenuGroup.setHidden(newValue !== 'objects');

const iconCls = {
documents: 'pimcore_icon_document',
assets: 'pimcore_icon_asset',
objects: 'pimcore_icon_object',
customview: 'pimcore_icon_custom_views',
}

record.data.text = newValue;
record.data.iconCls = iconCls[newValue];
Ext.each(elementTreeSettingsForm.query('[name^=perspective_editor]'), function(component) {
let componentName = 'perspective_editor_'+newValue;
samyemad marked this conversation as resolved.
Show resolved Hide resolved
component.setHidden(component.name == componentName ? false : true);
samyemad marked this conversation as resolved.
Show resolved Hide resolved
});
record.data.text = t(newValue);
record.data.iconCls = elementTreeIcons[newValue];
pimcore.bundle.perspectiveeditor.PerspectiveViewHelper.reloadTreeNode(record);
this.setDirty(true);
}.bind(this)
Expand Down Expand Up @@ -813,6 +828,16 @@ pimcore.bundle.perspectiveeditor.PerspectiveEditor = class {
objectTreeContextMenuGroup
]
});

const preAddElementTreeSettingsForm = new CustomEvent(pimcore.events.preAddPerspectiveEditorElementTreeSettingsForm, {
detail: {
record: record,
elementTreeSettingsFormId : elementTreeSettingsFormId,
setDirtyCallBack: this.setDirty.bind(this),
}
});
document.dispatchEvent(preAddElementTreeSettingsForm);
return elementTreeSettingsForm;
}

setDirty(dirty) {
Expand All @@ -830,4 +855,5 @@ pimcore.bundle.perspectiveeditor.PerspectiveEditor = class {
sanitizeName (name) {
return name.replace(/[^a-z0-9_\-.+]/gi,'');
}

}
Loading