+ {% set actionParameters = routeParameters is defined ? {
+ routeParameters: routeParameters
+ } : {} %}
+ {% set buttonsHtml %}
+ {% if defaultReplyButton is not defined or defaultReplyButton == 1 %}
+ {{ Actions.replyButton(email, actionParameters) }}
+ {{ Actions.replyAllButton(email, actionParameters) }}
+ {% else %}
+ {{ Actions.replyAllButton(email, actionParameters) }}
+ {{ Actions.replyButton(email, actionParameters) }}
+ {% endif %}
+ {{ Actions.forwardButton(email, actionParameters ) }}
+ {% endset %}
}
+ */
+ dropdownFitContainers: ['.ui-dialog-content', '#container:visible', 'body'],
+
/**
* Initialize.
*
@@ -224,6 +231,21 @@ define([
return this;
},
+ /**
+ * Find element that dropdown of filter should fit to
+ *
+ * @param {string|jQuery|HTMLElement} element
+ * @return {*}
+ */
+ _findDropdownFitContainer: function(element) {
+ element = element || this.$el;
+ var $container = $();
+ for (var i = 0; i < this.dropdownFitContainers.length && $container.length === 0; i += 1) {
+ $container = $(element).closest(this.dropdownFitContainers[i]);
+ }
+ return $container.length === 0 ? null : $container;
+ },
+
/**
* Converts a display value to raw format, e.g. decimal value can be displayed as "5,000,000.00"
* but raw value is 5000000.0
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js
index df43b8a974e..48d95399ca9 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/choice-tree-filter.js
@@ -192,7 +192,7 @@ define(function(require) {
items = this._getSelectedItems(items);
var temp = [];
_.each(items, function(value) {
- temp .push({
+ temp.push({
value: value,
children: []
});
@@ -249,19 +249,27 @@ define(function(require) {
},
_convertToTree: function(data) {
- var self = this;
var response = [];
+ var idToNodeMap = {};
+ var element = {};
+
_.each(data, function(value) {
- if (!value.owner_id) {
- response.push({
- value: value,
- children: []
- });
- }
- });
+ element = {};
+ element.value = value;
+ element.children = [];
- _.each(response, function(value, key) {
- response[key].children = self.searchEngine.findChild(value, data);
+ idToNodeMap[element.value.id] = element;
+
+ if (!element.value.owner_id) {
+ response.push(element);
+ } else {
+ var parentNode = idToNodeMap[element.value.owner_id];
+ if (parentNode) {
+ parentNode.children.push(element);
+ } else {
+ response.push(element);
+ }
+ }
});
return response;
@@ -298,12 +306,12 @@ define(function(require) {
var id = self.name + '-' + value.value.id;
template += '' +
- '';
if (value.children.length > 0) {
template += self.getListTemplate(value.children);
}
@@ -333,12 +341,12 @@ define(function(require) {
},
/**
- * Set raw value to filter
- *
- * @param value
- * @param skipRefresh
- * @return {*}
- */
+ * Set raw value to filter
+ *
+ * @param value
+ * @param skipRefresh
+ * @return {*}
+ */
setValue: function(value, skipRefresh) {
if (!tools.isEqualsLoosely(this.value, value)) {
var oldValue = this.value;
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/empty-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/empty-filter.js
index fa7ef12edd8..6d82e6bc2c3 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/empty-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/empty-filter.js
@@ -157,6 +157,7 @@ define([
*/
_onClickCriteriaSelector: function(e) {
e.stopPropagation();
+ e.preventDefault();
$('body').trigger('click');
if (!this.popupCriteriaShowed) {
this._showCriteria();
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
index 8b98faddf57..711c73832cb 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/select-filter.js
@@ -83,6 +83,13 @@ define([
classes: 'select-filter-widget'
},
+ /**
+ * Selector, jQuery object or HTML element that will be target for append multiselect dropdown menu
+ *
+ * @property
+ */
+ dropdownContainer: 'body',
+
/**
* Select widget menu opened flag
*
@@ -114,7 +121,7 @@ define([
* @param {Object} options
*/
initialize: function(options) {
- var opts = _.pick(options || {}, 'choices');
+ var opts = _.pick(options || {}, ['choices', 'dropdownContainer']);
_.extend(this, opts);
// init filter content options if it was not initialized so far
@@ -178,12 +185,23 @@ define([
return this;
},
+ /**
+ * Set dropdownContainer for dropdown element
+ *
+ * @param {(jQuery|Element|String)} container
+ * @protected
+ */
+ setDropdownContainer: function(container) {
+ this.dropdownContainer = $(container);
+ },
+
/**
* Initialize multiselect widget
*
* @protected
*/
_initializeSelectWidget: function() {
+ var $dropdownContainer = this._findDropdownFitContainer(this.dropdownContainer) || this.dropdownContainer;
this.selectWidget = new MultiselectDecorator({
element: this.$(this.inputSelector),
parameters: _.extend({
@@ -194,7 +212,9 @@ define([
position: {
my: 'left top+7',
at: 'left bottom',
- of: this.$(this.containerSelector)
+ of: this.$(this.containerSelector),
+ collision: 'fit none',
+ within: $dropdownContainer
},
open: _.bind(function() {
this.selectWidget.onOpenDropdown();
@@ -202,13 +222,17 @@ define([
this._setButtonPressed(this.$(this.containerSelector), true);
this._clearChoicesStyle();
this.selectDropdownOpened = true;
+ this.selectWidget.updateDropdownPosition();
}, this),
close: _.bind(function() {
this._setButtonPressed(this.$(this.containerSelector), false);
setTimeout(_.bind(function() {
- this.selectDropdownOpened = false;
+ if (!this.disposed) {
+ this.selectDropdownOpened = false;
+ }
}, this), 100);
- }, this)
+ }, this),
+ appendTo: this.dropdownContainer
}, this.widgetOptions),
contextSearch: this.contextSearch
});
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/text-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/text-filter.js
index 7cc81d71e5a..9cf14465fae 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/text-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/text-filter.js
@@ -48,13 +48,6 @@ define([
*/
criteriaSelector: '.filter-criteria',
- /**
- * Element enclosing a criteria dropdown
- *
- * @property {string|jQuery|HTMLElement}
- */
- limitCriteriaTo: '#container:visible, body',
-
/**
* Selectors for filter criteria elements
*
@@ -220,11 +213,21 @@ define([
* @private
*/
_alignCriteria: function() {
- var $container = $(this.limitCriteriaTo);
- var $criteria = this.$(this.criteriaSelector);
- var shift = $container.prop('clientWidth') + $container.offset().left -
- this.$el.offset().left - $criteria.outerWidth();
- $criteria.css('margin-left', shift < 0 ? shift : 0);
+ var $container = this._findDropdownFitContainer();
+ if ($container === null) {
+ return;
+ }
+ var $dropdown = this.$(this.criteriaSelector);
+ var rect = $dropdown.get(0).getBoundingClientRect();
+ var containerRect = $container.get(0).getBoundingClientRect();
+ var shift = rect.right - (containerRect.left + $container.prop('clientWidth'));
+ if (shift > 0) {
+ /**
+ * reduce shift to avoid overlaping left edge of container
+ */
+ shift -= Math.max(0, containerRect.left - (rect.left - shift));
+ $dropdown.css('margin-left', -shift);
+ }
},
/**
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js
index c597275e80d..1dd539fec92 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filters-manager.js
@@ -91,6 +91,13 @@ define(function(require) {
*/
buttonSelector: '.ui-multiselect.filter-list',
+ /**
+ * jQuery object that will be target for append multiselect dropdown menus
+ *
+ * @property
+ */
+ dropdownContainer: 'body',
+
/** @property */
events: {
'change [data-action=add-filter-select]': '_onChangeFilterSelect',
@@ -112,6 +119,8 @@ define(function(require) {
this.filters = {};
+ _.extend(this, _.pick(options, ['addButtonHint']));
+
if (options.filters) {
_.extend(this.filters, options.filters);
}
@@ -134,10 +143,6 @@ define(function(require) {
this.listenTo(filter, filterListeners);
}, this);
- if (options.addButtonHint) {
- this.addButtonHint = options.addButtonHint;
- }
-
FiltersManager.__super__.initialize.apply(this, arguments);
},
@@ -302,12 +307,17 @@ define(function(require) {
* @return {*}
*/
render: function() {
- var $container = $(this.template({filters: this.filters}));
- this.setElement($container);
+ this.$el.html(
+ this.template({filters: this.filters})
+ );
+ this.dropdownContainer = this.$el.find('.filter-container');
var fragment = document.createDocumentFragment();
_.each(this.filters, function(filter) {
+ if (_.isFunction(filter.setDropdownContainer)) {
+ filter.setDropdownContainer(this.dropdownContainer);
+ }
filter.render();
if (!filter.enabled) {
filter.hide();
@@ -318,9 +328,9 @@ define(function(require) {
this.trigger('rendered');
if (_.isEmpty(this.filters)) {
- $container.hide();
+ this.$el.hide();
} else {
- $container.find('.filter-container').append(fragment);
+ this.dropdownContainer.append(fragment);
this._initializeSelectWidget();
}
@@ -333,23 +343,29 @@ define(function(require) {
* @protected
*/
_initializeSelectWidget: function() {
+ var $button;
this.selectWidget = new MultiselectDecorator({
element: this.$(this.filterSelector),
parameters: {
multiple: true,
selectedList: 0,
selectedText: this.addButtonHint,
- classes: 'filter-list select-filter-widget',
+ classes: 'select-filter-widget',
+ position: {
+ my: 'left top+2',
+ at: 'left bottom'
+ },
open: $.proxy(function() {
this.selectWidget.onOpenDropdown();
this._setDropdownWidth();
- this._updateDropdownPosition();
- }, this)
+ }, this),
+ appendTo: this.dropdownContainer
}
});
this.selectWidget.setViewDesign(this);
- this.$('.filter-list span:first').replaceWith(
+ $button = this.selectWidget.multiselect('instance').button;
+ $button.find('span:first').replaceWith(
'' + this.addButtonHint +
''
);
@@ -382,29 +398,6 @@ define(function(require) {
this.disableFilter(filter);
}
}, this);
-
- this._updateDropdownPosition();
- },
-
- /**
- * Set dropdown position according to current element
- *
- * @protected
- */
- _updateDropdownPosition: function() {
- var button = this.$(this.buttonSelector);
- var buttonPosition = button.offset();
- var widgetWidth = this.selectWidget.getWidget().outerWidth();
- var windowWidth = $(window).width();
- var widgetLeftOffset = buttonPosition.left;
- if (buttonPosition.left + widgetWidth > windowWidth) {
- widgetLeftOffset = buttonPosition.left + button.outerWidth() - widgetWidth;
- }
-
- this.selectWidget.getWidget().css({
- top: buttonPosition.top + button.outerHeight(),
- left: widgetLeftOffset
- });
},
/**
diff --git a/src/Oro/Bundle/FilterBundle/Resources/views/Js/default_templates.js.twig b/src/Oro/Bundle/FilterBundle/Resources/views/Js/default_templates.js.twig
index 39354e87ac0..5daea6038da 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/views/Js/default_templates.js.twig
+++ b/src/Oro/Bundle/FilterBundle/Resources/views/Js/default_templates.js.twig
@@ -189,22 +189,18 @@
{% else %}
@@ -59,6 +84,7 @@
{% block style_widget %}
{% if attr.href is defined and attr.href is not empty %}
+ {% set attr = attr|merge({href: asset(attr.href)}) %}
{% else %}
@@ -100,7 +126,11 @@
{% endblock %}
{% block text_widget -%}
- {{ text|block_text(translation_domain) }}
+ {% if escape %}
+ {{- text|block_text(translation_domain) -}}
+ {% else %}
+ {{- text|block_text(translation_domain)|raw -}}
+ {% endif %}
{%- endblock %}
{% block link_widget -%}
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_attributes.html.php b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_attributes.html.php
index c7d9ca9af26..4057855695b 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_attributes.html.php
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/block_attributes.html.php
@@ -1,4 +1,5 @@
+
$v): ?>
-escape($k), $view->escape($k === 'title' ? $view['layout']->text($v, $translation_domain) : $v)) ?>
+ escape($k), $view->escape($k === 'title' ? $view['layout']->text($v, $translation_domain) : $v)) ?>
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/html_widget.html.php b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/html_widget.html.php
new file mode 100644
index 00000000000..6099166cd73
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/html_widget.html.php
@@ -0,0 +1,2 @@
+
+text($text, $translation_domain) ?>
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/input_widget.html.php b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/input_widget.html.php
new file mode 100644
index 00000000000..fb8065fdc43
--- /dev/null
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/input_widget.html.php
@@ -0,0 +1,3 @@
+
+text($attr['placeholder'], $translation_domain); ?>
+block($block, 'block_attributes') ?>/>
diff --git a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/script_widget.html.php b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/script_widget.html.php
index daab0c869d0..be2f522bb64 100644
--- a/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/script_widget.html.php
+++ b/src/Oro/Bundle/LayoutBundle/Resources/views/Layout/php/script_widget.html.php
@@ -1,5 +1,6 @@
+ getUrl($attr['src']); ?>
-
+
+
diff --git a/src/Oro/Bundle/NavigationBundle/Tests/Unit/OroNavigationBundleTest.php b/src/Oro/Bundle/NavigationBundle/Tests/Unit/OroNavigationBundleTest.php
deleted file mode 100644
index 07aef7f203b..00000000000
--- a/src/Oro/Bundle/NavigationBundle/Tests/Unit/OroNavigationBundleTest.php
+++ /dev/null
@@ -1,29 +0,0 @@
-getMock('Symfony\Component\DependencyInjection\ContainerBuilder');
- $container->expects($this->at(0))
- ->method('addCompilerPass')
- ->with(
- $this->isInstanceOf(
- 'Oro\Bundle\NavigationBundle\DependencyInjection\Compiler\MenuBuilderChainPass'
- )
- );
- $container->expects($this->at(1))
- ->method('addCompilerPass')
- ->with(
- $this->isInstanceOf(
- 'Oro\Bundle\NavigationBundle\DependencyInjection\Compiler\TagGeneratorPass'
- )
- );
-
- $bundle = new OroNavigationBundle();
- $bundle->build($container);
- }
-}
diff --git a/src/Oro/Bundle/NoteBundle/Model/Strategy/ReplaceStrategy.php b/src/Oro/Bundle/NoteBundle/Model/Strategy/ReplaceStrategy.php
index 42ae4ff3e52..bc3e769e42a 100644
--- a/src/Oro/Bundle/NoteBundle/Model/Strategy/ReplaceStrategy.php
+++ b/src/Oro/Bundle/NoteBundle/Model/Strategy/ReplaceStrategy.php
@@ -3,18 +3,16 @@
namespace Oro\Bundle\NoteBundle\Model\Strategy;
use Symfony\Component\Security\Core\Util\ClassUtils;
+
+use Oro\Component\PhpUtils\ArrayUtil;
+
use Oro\Bundle\ActivityListBundle\Entity\Manager\ActivityListManager;
use Oro\Bundle\ActivityListBundle\Entity\ActivityList;
use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
use Oro\Bundle\EntityMergeBundle\Data\FieldData;
use Oro\Bundle\EntityMergeBundle\Model\Strategy\StrategyInterface;
use Oro\Bundle\NoteBundle\Model\MergeModes;
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
-/**
- * Class ReplaceStrategy
- * @package Oro\Bundle\NoteBundle\Model\Strategy
- */
class ReplaceStrategy implements StrategyInterface
{
/** @var DoctrineHelper */
@@ -71,7 +69,7 @@ public function merge(FieldData $fieldData)
->getActivityListQueryBuilderByActivityClass($entityClass, $sourceEntity->getId(), $activityClass);
$activityListItems = $queryBuilder->getQuery()->getResult();
- $activityIds = ArrayUtils::arrayColumn($activityListItems, 'id');
+ $activityIds = ArrayUtil::arrayColumn($activityListItems, 'id');
$this->activityListManager
->replaceActivityTargetWithPlainQuery(
$activityIds,
diff --git a/src/Oro/Bundle/NoteBundle/Model/Strategy/UniteStrategy.php b/src/Oro/Bundle/NoteBundle/Model/Strategy/UniteStrategy.php
index 2c663fa7bd2..07912c7638f 100644
--- a/src/Oro/Bundle/NoteBundle/Model/Strategy/UniteStrategy.php
+++ b/src/Oro/Bundle/NoteBundle/Model/Strategy/UniteStrategy.php
@@ -2,14 +2,16 @@
namespace Oro\Bundle\NoteBundle\Model\Strategy;
-use Oro\Bundle\NoteBundle\Model\MergeModes;
use Symfony\Component\Security\Core\Util\ClassUtils;
+
+use Oro\Component\PhpUtils\ArrayUtil;
+
use Oro\Bundle\ActivityListBundle\Entity\Manager\ActivityListManager;
use Oro\Bundle\ActivityListBundle\Entity\ActivityList;
use Oro\Bundle\EntityBundle\ORM\DoctrineHelper;
use Oro\Bundle\EntityMergeBundle\Model\Strategy\StrategyInterface;
use Oro\Bundle\EntityMergeBundle\Data\FieldData;
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
+use Oro\Bundle\NoteBundle\Model\MergeModes;
class UniteStrategy implements StrategyInterface
{
@@ -60,7 +62,7 @@ public function merge(FieldData $fieldData)
$activityListItems = $queryBuilder->getQuery()->getResult();
- $activityIds = ArrayUtils::arrayColumn($activityListItems, 'id');
+ $activityIds = ArrayUtil::arrayColumn($activityListItems, 'id');
$this->activityListManager
->replaceActivityTargetWithPlainQuery(
$activityIds,
diff --git a/src/Oro/Bundle/NoteBundle/Resources/public/js/app/views/notes-view.js b/src/Oro/Bundle/NoteBundle/Resources/public/js/app/views/notes-view.js
index 7145ae60225..7e0e74ca299 100644
--- a/src/Oro/Bundle/NoteBundle/Resources/public/js/app/views/notes-view.js
+++ b/src/Oro/Bundle/NoteBundle/Resources/public/js/app/views/notes-view.js
@@ -70,13 +70,13 @@ define(function(require) {
},
expandAll: function() {
- _.each(this.subviews, function(itemView) {
+ _.each(this.getItemViews(), function(itemView) {
itemView.toggle(false);
});
},
collapseAll: function() {
- _.each(this.subviews, function(itemView) {
+ _.each(this.getItemViews(), function(itemView) {
itemView.toggle(true);
});
},
@@ -104,13 +104,13 @@ define(function(require) {
}
this._showLoading();
try {
- _.each(this.subviews, function(itemView) {
+ _.each(this.getItemViews(), function(itemView) {
state[itemView.model.get('id')] = itemView.isCollapsed();
});
this.collection.fetch({
reset: true,
success: _.bind(function() {
- _.each(this.subviews, function(itemView) {
+ _.each(this.getItemViews(), function(itemView) {
itemView.toggle(state[itemView.model.get('id')]);
});
this._hideLoading();
diff --git a/src/Oro/Bundle/NotificationBundle/DependencyInjection/Compiler/EventsCompilerPass.php b/src/Oro/Bundle/NotificationBundle/DependencyInjection/Compiler/EventsCompilerPass.php
index a374d94c1c2..67cd0def623 100644
--- a/src/Oro/Bundle/NotificationBundle/DependencyInjection/Compiler/EventsCompilerPass.php
+++ b/src/Oro/Bundle/NotificationBundle/DependencyInjection/Compiler/EventsCompilerPass.php
@@ -7,6 +7,8 @@
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
+use Oro\Bundle\EntityBundle\Tools\SafeDatabaseChecker;
+
class EventsCompilerPass implements CompilerPassInterface
{
/** a table name of {@see Oro\Bundle\NotificationBundle\Entity\Event} */
@@ -33,7 +35,7 @@ public function process(ContainerBuilder $container)
// ORM usage leads unnecessary loading of Doctrine metadata and ORO entity configs which is not needed here
/** @var Connection $connection */
$connection = $container->get('doctrine.dbal.default_connection');
- if ($this->checkDatabase($connection)) {
+ if (SafeDatabaseChecker::tablesExist($connection, self::EVENT_TABLE_NAME)) {
$dispatcher = $container->findDefinition(self::DISPATCHER_KEY);
$rows = $connection->fetchAll('SELECT name FROM ' . self::EVENT_TABLE_NAME);
@@ -45,23 +47,4 @@ public function process(ContainerBuilder $container)
}
}
}
-
- /**
- * @param Connection $connection
- *
- * @return bool
- */
- protected function checkDatabase(Connection $connection)
- {
- $result = false;
- try {
- $connection->connect();
- $result =
- $connection->isConnected()
- && $connection->getSchemaManager()->tablesExist([self::EVENT_TABLE_NAME]);
- } catch (\PDOException $e) {
- }
-
- return $result;
- }
}
diff --git a/src/Oro/Bundle/NotificationBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/NotificationBundle/Resources/config/datagrid.yml
index c13647beea4..9cdd78ad18a 100644
--- a/src/Oro/Bundle/NotificationBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/NotificationBundle/Resources/config/datagrid.yml
@@ -3,8 +3,8 @@ datagrid:
options:
entityHint: transactional email
entity_pagination: true
+ acl_resource: oro_notification_emailnotification_view
source:
- acl_resource: oro_notification_emailnotification_view
type: orm
query:
select:
diff --git a/src/Oro/Bundle/NotificationBundle/Tests/Unit/DependencyInjection/Compiler/EventsCompilerPassTest.php b/src/Oro/Bundle/NotificationBundle/Tests/Unit/DependencyInjection/Compiler/EventsCompilerPassTest.php
index 9c9874304e7..d8186158656 100644
--- a/src/Oro/Bundle/NotificationBundle/Tests/Unit/DependencyInjection/Compiler/EventsCompilerPassTest.php
+++ b/src/Oro/Bundle/NotificationBundle/Tests/Unit/DependencyInjection/Compiler/EventsCompilerPassTest.php
@@ -89,16 +89,13 @@ private function configureConnectionMock()
$connection->expects($this->once())
->method('connect');
- $connection->expects($this->once())
- ->method('isConnected')
- ->will($this->returnValue(true));
$schemaManager = $this->getMockBuilder('Doctrine\DBAL\Schema\MySqlSchemaManager')
->disableOriginalConstructor()
->getMock();
$schemaManager->expects($this->once())
->method('tablesExist')
- ->with([EventsCompilerPass::EVENT_TABLE_NAME])
+ ->with(EventsCompilerPass::EVENT_TABLE_NAME)
->will($this->returnValue(true));
$connection->expects($this->once())
diff --git a/src/Oro/Bundle/OrganizationBundle/Entity/BusinessUnit.php b/src/Oro/Bundle/OrganizationBundle/Entity/BusinessUnit.php
index f9d850d7e76..5456adbe2e0 100644
--- a/src/Oro/Bundle/OrganizationBundle/Entity/BusinessUnit.php
+++ b/src/Oro/Bundle/OrganizationBundle/Entity/BusinessUnit.php
@@ -46,6 +46,9 @@
* "security"={
* "type"="ACL",
* "group_name"=""
+ * },
+ * "grid"={
+ * "default"="business-unit-grid"
* }
* }
* )
diff --git a/src/Oro/Bundle/OrganizationBundle/Event/BusinessUnitGridListener.php b/src/Oro/Bundle/OrganizationBundle/Event/BusinessUnitGridListener.php
index d6e64cd0ba7..6f55005f4d5 100644
--- a/src/Oro/Bundle/OrganizationBundle/Event/BusinessUnitGridListener.php
+++ b/src/Oro/Bundle/OrganizationBundle/Event/BusinessUnitGridListener.php
@@ -72,10 +72,15 @@ public function onBuildBefore(BuildBefore $event)
$organization->getId()
);
}
- $where = array_merge(
- $where,
- ['u.id in (' . implode(', ', $resultBuIds) . ')']
- );
+ if (count($resultBuIds)) {
+ $where = array_merge(
+ $where,
+ ['u.id in (' . implode(', ', $resultBuIds) . ')']
+ );
+ } else {
+ // There are no records to show, make query to return empty result
+ $where = array_merge($where, ['1 = 0']);
+ }
}
if (count($where)) {
$config->offsetSetByPath('[source][query][where][and]', $where);
diff --git a/src/Oro/Bundle/OrganizationBundle/Filter/BusinessUnitChoiceFilter.php b/src/Oro/Bundle/OrganizationBundle/Filter/BusinessUnitChoiceFilter.php
index 51a7127831d..8f0721375fe 100644
--- a/src/Oro/Bundle/OrganizationBundle/Filter/BusinessUnitChoiceFilter.php
+++ b/src/Oro/Bundle/OrganizationBundle/Filter/BusinessUnitChoiceFilter.php
@@ -18,7 +18,7 @@ public function apply(FilterDatasourceAdapterInterface $ds, $data)
return false;
}
- $type = $data['type'];
+ $type = $data['type'];
if (count($data['value']) > 1 || (isset($data['value'][0]) && $data['value'][0] != "")) {
$parameterName = $ds->generateParameterName($this->getName());
@@ -26,30 +26,30 @@ public function apply(FilterDatasourceAdapterInterface $ds, $data)
->createQueryBuilder('u')
->select('u.id')
->leftJoin('u.businessUnits', 'bu')
- ->where('bu.id in (:'.$parameterName.')')
+ ->where('bu.id in (:' . $parameterName . ')')
->getQuery()
- ->getDQL();
+ ->getDQL();
$this->applyFilterToClause(
$ds,
- $this->get(FilterUtility::DATA_NAME_KEY) . ' in ('.$qb2.')'
+ $this->get(FilterUtility::DATA_NAME_KEY) . ' in (' . $qb2 . ')'
);
if (!in_array($type, [FilterUtility::TYPE_EMPTY, FilterUtility::TYPE_NOT_EMPTY], true)) {
$ds->setParameter($parameterName, $data['value']);
}
}
+
return true;
}
/**
- * @param $data
- *
- * @return mixed
+ * {@inheritDoc}
*/
public function parseData($data)
{
$data['value'] = explode(',', $data['value']);
+
return $data;
}
}
diff --git a/src/Oro/Bundle/OrganizationBundle/Provider/Filter/ChoiceTreeBusinessUnitProvider.php b/src/Oro/Bundle/OrganizationBundle/Provider/Filter/ChoiceTreeBusinessUnitProvider.php
index 650b51d2f2a..e68f05e24ca 100644
--- a/src/Oro/Bundle/OrganizationBundle/Provider/Filter/ChoiceTreeBusinessUnitProvider.php
+++ b/src/Oro/Bundle/OrganizationBundle/Provider/Filter/ChoiceTreeBusinessUnitProvider.php
@@ -5,10 +5,12 @@
use Doctrine\Bundle\DoctrineBundle\Registry;
use Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper;
+use Oro\Bundle\SecurityBundle\Owner\ChainOwnerTreeProvider;
+use Oro\Bundle\SecurityBundle\Owner\OwnerTree;
use Oro\Bundle\SecurityBundle\SecurityFacade;
-use Oro\Bundle\OrganizationBundle\Entity\Organization;
use Oro\Bundle\OrganizationBundle\Entity\Repository\BusinessUnitRepository;
use Oro\Bundle\OrganizationBundle\Entity\BusinessUnit;
+use Oro\Bundle\UserBundle\Entity\User;
class ChoiceTreeBusinessUnitProvider
{
@@ -21,44 +23,57 @@ class ChoiceTreeBusinessUnitProvider
/** @var SecurityFacade */
protected $securityFacade;
+ /** @var ChainOwnerTreeProvider */
+ protected $treeProvider;
+
/**
- * @param Registry $registry
- * @param SecurityFacade $securityFacade
- * @param AclHelper $aclHelper
+ * @param Registry $registry
+ * @param SecurityFacade $securityFacade
+ * @param AclHelper $aclHelper
+ * @param ChainOwnerTreeProvider $treeProvider
*/
public function __construct(
Registry $registry,
SecurityFacade $securityFacade,
- AclHelper $aclHelper
+ AclHelper $aclHelper,
+ ChainOwnerTreeProvider $treeProvider
) {
- $this->registry = $registry;
+ $this->registry = $registry;
$this->securityFacade = $securityFacade;
- $this->aclHelper = $aclHelper;
+ $this->aclHelper = $aclHelper;
+ $this->treeProvider = $treeProvider;
}
/**
- * @param Organization $currentOrganization
- *
* @return array
*/
public function getList()
{
- $businessUnitRepository = $this->getBusinessUnitRepo();
+ $businessUnitRepo = $this->getBusinessUnitRepo();
+
$response = [];
- $qb = $businessUnitRepository->getQueryBuilder();
+ $qb = $businessUnitRepo->getQueryBuilder();
+ $qb
+ ->andWhere(
+ $qb->expr()->in('businessUnit.id', ':ids')
+ )
+ ->orderBy('businessUnit.id', 'ASC');
+
+ $qb->setParameter('ids', $this->getBusinessUnitIds());
+
$businessUnits = $this->aclHelper->apply($qb)->getResult();
/** @var BusinessUnit $businessUnit */
foreach ($businessUnits as $businessUnit) {
if ($businessUnit->getOwner()) {
- $name =$businessUnit->getName();
+ $name = $businessUnit->getName();
} else {
$name = $this->getBusinessUnitName($businessUnit);
}
$response[] = [
- 'id' => $businessUnit->getId(),
- 'name' => $name,
+ 'id' => $businessUnit->getId(),
+ 'name' => $name,
'owner_id' => $businessUnit->getOwner() ? $businessUnit->getOwner()->getId() : null
];
}
@@ -81,6 +96,34 @@ protected function getBusinessUnitRepo()
*/
protected function getBusinessUnitName(BusinessUnit $businessUnit)
{
- return $businessUnit->getName();
+ return $businessUnit->getName();
+ }
+
+ /**
+ * @return User
+ */
+ protected function getUser()
+ {
+ return $this->securityFacade->getToken()->getUser();
+ }
+
+ /**
+ * @return array
+ */
+ protected function getBusinessUnitIds()
+ {
+ /** @var OwnerTree $tree */
+ $tree = $this->treeProvider->getTree();
+ $user = $this->getUser();
+ $result = [];
+
+ $organizations = $user->getOrganizations();
+
+ foreach ($organizations as $organization) {
+ $subBUIds = $tree->getUserSubordinateBusinessUnitIds($user->getId(), $organization->getId());
+ $result = array_merge($result, $subBUIds);
+ }
+
+ return array_unique($result);
}
}
diff --git a/src/Oro/Bundle/OrganizationBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/OrganizationBundle/Resources/config/datagrid.yml
index 59e48e6050f..13787f87a41 100644
--- a/src/Oro/Bundle/OrganizationBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/OrganizationBundle/Resources/config/datagrid.yml
@@ -3,11 +3,10 @@ datagrid:
extended_entity_name: %oro_organization.business_unit.entity.class%
options:
entityHint: business unit
- skip_acl_check: true
entity_pagination: true
source:
- acl_resource: oro_business_unit_view
type: orm
+ skip_acl_apply: true
query:
select:
- u.id
@@ -117,8 +116,8 @@ datagrid:
bu-update-users-grid:
extends: user-relation-grid
+ acl_resource: oro_business_unit_update
source:
- acl_resource: oro_business_unit_update
query:
select:
- >
@@ -198,8 +197,8 @@ datagrid:
extends: user-relation-grid
options:
entityHint: user
+ acl_resource: oro_business_unit_view
source:
- acl_resource: oro_business_unit_view
query:
where:
and:
diff --git a/src/Oro/Bundle/OrganizationBundle/Resources/config/services.yml b/src/Oro/Bundle/OrganizationBundle/Resources/config/services.yml
index 6fc011d8f57..98d0ec35c6d 100644
--- a/src/Oro/Bundle/OrganizationBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/OrganizationBundle/Resources/config/services.yml
@@ -200,6 +200,7 @@ services:
- @doctrine
- @oro_security.security_facade
- @oro_security.acl_helper
+ - @oro_security.ownership_tree_provider.chain
oro_organization.autocomplete.business_unit.search_handler:
class: %oro_organization.autocomplete.business_unit.search_handler.class%
diff --git a/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Provider/Filter/ChoiceTreeBusinessUnitProviderTest.php b/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Provider/Filter/ChoiceTreeBusinessUnitProviderTest.php
index 0ea4d9a949f..a8f96c63806 100644
--- a/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Provider/Filter/ChoiceTreeBusinessUnitProviderTest.php
+++ b/src/Oro/Bundle/OrganizationBundle/Tests/Unit/Provider/Filter/ChoiceTreeBusinessUnitProviderTest.php
@@ -7,7 +7,7 @@
class ChoiceTreeBusinessUnitProviderTest extends \PHPUnit_Framework_TestCase
{
/** @var ChoiceTreeBusinessUnitProvider */
- protected $choiceTreeBusinessUnitProvider;
+ protected $choiceTreeBUProvider;
/** @var \PHPUnit_Framework_MockObject_MockObject */
protected $registry;
@@ -18,133 +18,217 @@ class ChoiceTreeBusinessUnitProviderTest extends \PHPUnit_Framework_TestCase
/** @var \PHPUnit_Framework_MockObject_MockObject */
protected $aclHelper;
+ /** @var \PHPUnit_Framework_MockObject_MockObject */
+ protected $treeProvider;
+
public function setUp()
{
- $this->registry = $this->getMockBuilder('Doctrine\Bundle\DoctrineBundle\Registry')
+ $this->registry = $this->getMockBuilder('Doctrine\Bundle\DoctrineBundle\Registry')
->disableOriginalConstructor()
->getMock();
$this->securityFacade = $this->getMockBuilder('Oro\Bundle\SecurityBundle\SecurityFacade')
->disableOriginalConstructor()
->getMock();
- $this->aclHelper = $this->getMockBuilder('Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper')
+ $this->aclHelper = $this->getMockBuilder('Oro\Bundle\SecurityBundle\ORM\Walker\AclHelper')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->treeProvider = $this->getMockBuilder('Oro\Bundle\SecurityBundle\Owner\ChainOwnerTreeProvider')
+ ->setMethods(['getTree'])
->disableOriginalConstructor()
->getMock();
- $this->choiceTreeBusinessUnitProvider = new ChoiceTreeBusinessUnitProvider(
+ $this->choiceTreeBUProvider = new ChoiceTreeBusinessUnitProvider(
$this->registry,
$this->securityFacade,
- $this->aclHelper
+ $this->aclHelper,
+ $this->treeProvider
);
}
- public function testGetList()
+ /**
+ * @dataProvider getListDataProvider
+ */
+ public function testGetList($userBUIds, $queryResult, $result)
{
- $businessUnitRepository = $this->getMockBuilder('BusinessUnitRepository')
+ $businessUnitRepos = $this->getMockBuilder('BusinessUnitRepository')
->disableOriginalConstructor()
->setMethods(['getQueryBuilder'])
->getMock();
$qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
- ->setMethods(['getResult'])
+ ->setMethods(['getResult', 'expr', 'setParameter'])
->disableOriginalConstructor()
->getMock();
- $this->aclHelper->expects($this->any())->method('apply')->willReturn($qb);
- $businessUnitRepository->expects($this->any())->method('getQueryBuilder')->willReturn($qb);
- $qb->expects($this->any())->method('getResult')->willReturn($this->getTestBusinessUnits());
+ $treeOwner = $this->getMockBuilder('Oro\Bundle\SecurityBundle\Owner\OwnerTree')
+ ->setMethods(['getUserSubordinateBusinessUnitIds'])
+ ->disableOriginalConstructor()
+ ->getMock();
- $this->registry->expects($this->once())->method('getRepository')->with('OroOrganizationBundle:BusinessUnit')
- ->willReturn($businessUnitRepository);
+ $this->treeProvider->expects(self::once())->method('getTree')->willReturn($treeOwner);
- $result = $this->choiceTreeBusinessUnitProvider->getList();
+ $treeOwner
+ ->expects(self::once())
+ ->method('getUserSubordinateBusinessUnitIds')
+ ->willReturn($userBUIds);
- $this->assertEquals($this->getExpectedData(), $result);
- }
+ $this->aclHelper->expects(self::any())->method('apply')->willReturn($qb);
+ $businessUnitRepos->expects(self::any())->method('getQueryBuilder')->willReturn($qb);
- public function testGetEmptyList()
- {
- $businessUnitRepository = $this->getMockBuilder('BusinessUnitRepository')
+ $expression = $this->getMockBuilder('Doctrine\ORM\Query\Expr')
+ ->setMethods(['in'])
->disableOriginalConstructor()
- ->setMethods(['getQueryBuilder'])
->getMock();
- $qb = $this->getMockBuilder('Doctrine\ORM\QueryBuilder')
- ->setMethods(['getResult'])
+ $qb->expects(self::once())->method('getResult')->willReturn($queryResult);
+ $qb->expects(self::once())->method('expr')->willReturn($expression);
+ $qb->expects(self::once())->method('setParameter');
+
+ $tokenStorage = $this->getMock('Symfony\Component\Security\Core\Authentication\Token\TokenInterface');
+
+ $user = $this->getMockBuilder('Oro\Bundle\UserBundle\Entity\User')
+ ->setMethods(['getId', 'getOrganizations'])
->disableOriginalConstructor()
->getMock();
- $this->aclHelper->expects($this->any())->method('apply')->willReturn($qb);
- $businessUnitRepository->expects($this->any())->method('getQueryBuilder')->willReturn($qb);
- $qb->expects($this->any())->method('getResult')->willReturn([]);
+ $organization = $this->getMock('Oro\Bundle\OrganizationBundle\Entity\OrganizationInterface');
+ $organization->expects(self::once())->method('getId')->willReturn(1);
+ $user->expects(self::once())->method('getOrganizations')->willReturn([$organization]);
+ $this->securityFacade->expects(self::once())->method('getToken')->willReturn($tokenStorage);
+ $tokenStorage->expects(self::once())->method('getUser')->willReturn($user);
- $this->registry->expects($this->once())->method('getRepository')->with('OroOrganizationBundle:BusinessUnit')
- ->willReturn($businessUnitRepository);
+ $this->registry
+ ->expects(self::once())
+ ->method('getRepository')
+ ->with('OroOrganizationBundle:BusinessUnit')
+ ->willReturn($businessUnitRepos);
- $result = $this->choiceTreeBusinessUnitProvider->getList();
+ $resultedUserBUids = $this->choiceTreeBUProvider->getList();
- $this->assertEquals([], $result);
+ self::assertEquals($result, $resultedUserBUids);
}
- protected function getTestBusinessUnits()
+ /**
+ * @return array
+ */
+ public function getListDataProvider()
{
- $data = [
- [
- 'name' => 'Main Business Unit',
- 'id' => 1,
- 'owner_id' => null
+ return [
+ 'Three elements in the list' => [
+ 'userBUIds' => [1, 2, 3],
+ 'queryResult' => $this->getBusinessUnits('one'),
+ 'result' => [
+ [
+ 'name' => 'Main Business Unit 1',
+ 'id' => 1,
+ 'owner_id' => null
+ ],
+ [
+ 'name' => 'Business Unit 1',
+ 'id' => 2,
+ 'owner_id' => 1
+ ],
+ [
+ 'name' => 'Business Unit 2',
+ 'id' => 3,
+ 'owner_id' => 1
+ ],
+ ]
+ ],
+ 'Six elements in the list' => [
+ 'userBUIds' => [1, 2, 3, 4, 5, 6],
+ 'queryResult' => $this->getBusinessUnits('two'),
+ 'result' => [
+ [
+ 'name' => 'Main Business Unit 1',
+ 'id' => 1,
+ 'owner_id' => null
+ ],
+ [
+ 'name' => 'Main Business Unit 2',
+ 'id' => 2,
+ 'owner_id' => null
+ ],
+ [
+ 'name' => 'Business Unit 1',
+ 'id' => 3,
+ 'owner_id' => 1
+ ],
+ [
+ 'name' => 'Business Unit 2',
+ 'id' => 4,
+ 'owner_id' => 1
+ ],
+ [
+ 'name' => 'Business Unit 3',
+ 'id' => 5,
+ 'owner_id' => 2
+ ],
+ [
+ 'name' => 'Business Unit 4',
+ 'id' => 6,
+ 'owner_id' => 2
+ ],
+ [
+ 'name' => 'Business Unit 5',
+ 'id' => 7,
+ 'owner_id' => 4
+ ]
+ ]
+ ],
+ 'empty list' => [
+ 'userBUIds' => [],
+ 'queryResult' => [],
+ 'result' => []
],
- [
- 'name' => 'Business Uit 1',
- 'id' => 2,
- 'owner_id' => $this->getTestDataRootBusinessUnit()
- ]
];
-
- return $this->convertTestDataToBusinessUnitEntity($data);
}
- protected function convertTestDataToBusinessUnitEntity($data)
+ /**
+ * @param string $name
+ *
+ * @return array
+ */
+ protected function getBusinessUnits($name)
{
- $response = [];
- foreach ($data as $item) {
- $businessUnit = $this->getMockBuilder('Oro\Bundle\OrganizationBundle\Entity\BusinessUnit')
+ $scheme = [
+ 'one' => [
+ ['name' => 'Main Business Unit 1', 'owner' => null, 'id' => 1],
+ ['name' => 'Business Unit 1', 'owner' => 1, 'id' => 2],
+ ['name' => 'Business Unit 2', 'owner' => 1, 'id' => 3]
+ ],
+ 'two' => [
+ ['name' => 'Main Business Unit 1', 'owner' => null, 'id' => 1],
+ ['name' => 'Main Business Unit 2', 'owner' => null, 'id' => 2],
+ ['name' => 'Business Unit 1', 'owner' => 1, 'id' => 3],
+ ['name' => 'Business Unit 2', 'owner' => 1, 'id' => 4],
+ ['name' => 'Business Unit 3', 'owner' => 2, 'id' => 5],
+ ['name' => 'Business Unit 4', 'owner' => 2, 'id' => 6],
+ ['name' => 'Business Unit 5', 'owner' => 4, 'id' => 7],
+ ],
+ ];
+
+ $result = [];
+ $schemeSet = $scheme[$name];
+ $schemeSetCount = count($schemeSet);
+
+ for ($i = 0; $i < $schemeSetCount; $i++) {
+ $element = $this->getMockBuilder('Oro\Bundle\OrganizationBundle\Entity\BusinessUnit')
->disableOriginalConstructor()
->getMock();
- $businessUnit->expects($this->any())->method('getId')->willReturn($item['id']);
- $businessUnit->expects($this->any())->method('getOwner')->willReturn($item['owner_id']);
- $businessUnit->expects($this->any())->method('getName')->willReturn($item['name']);
- $response[] = $businessUnit;
- }
+ $owner = (null === $schemeSet[$i]['owner'])
+ ? $schemeSet[$i]['owner']
+ : $result[$schemeSet[$i]['owner'] - 1];
- return $response;
- }
+ $element->expects(self::any())->method('getOwner')->willReturn($owner);
+ $element->expects(self::any())->method('getName')->willReturn($schemeSet[$i]['name']);
+ $element->expects(self::any())->method('getId')->willReturn($schemeSet[$i]['id']);
- protected function getTestDataRootBusinessUnit()
- {
- $rootBusinessUnit = $this->getMockBuilder('Oro\Bundle\OrganizationBundle\Entity\BusinessUnit')
- ->disableOriginalConstructor()
- ->getMock();
- $rootBusinessUnit->expects($this->any())->method('getId')->willReturn('1');
- $rootBusinessUnit->expects($this->any())->method('getOwner')->willReturn(null);
- $rootBusinessUnit->expects($this->any())->method('getName')->willReturn('Main Business Unit');
-
- return $rootBusinessUnit;
- }
+ $result[] = $element;
+ }
- protected function getExpectedData()
- {
- return [
- [
- 'name' => 'Main Business Unit',
- 'id' => 1,
- 'owner_id' => null
- ],
- [
- 'name' => 'Business Uit 1',
- 'id' => 2,
- 'owner_id' => 1
- ]
- ];
+ return $result;
}
}
diff --git a/src/Oro/Bundle/PlatformBundle/DependencyInjection/Compiler/UpdateDoctrineConfigurationPass.php b/src/Oro/Bundle/PlatformBundle/DependencyInjection/Compiler/UpdateDoctrineConfigurationPass.php
new file mode 100644
index 00000000000..49b0cc78ebd
--- /dev/null
+++ b/src/Oro/Bundle/PlatformBundle/DependencyInjection/Compiler/UpdateDoctrineConfigurationPass.php
@@ -0,0 +1,23 @@
+hasParameter('installed') && $container->getParameter('installed');
+ if (!$isInstalled) {
+ $container->setParameter('doctrine.orm.auto_generate_proxy_classes', true);
+ }
+ }
+}
diff --git a/src/Oro/Bundle/PlatformBundle/DependencyInjection/OroPlatformExtension.php b/src/Oro/Bundle/PlatformBundle/DependencyInjection/OroPlatformExtension.php
index bfd342a88ef..0cbf23da26c 100644
--- a/src/Oro/Bundle/PlatformBundle/DependencyInjection/OroPlatformExtension.php
+++ b/src/Oro/Bundle/PlatformBundle/DependencyInjection/OroPlatformExtension.php
@@ -11,8 +11,9 @@
use Oro\Component\Config\Loader\CumulativeConfigLoader;
use Oro\Component\Config\Loader\YamlCumulativeFileLoader;
use Oro\Component\DependencyInjection\ExtendedContainerBuilder;
+use Oro\Component\PhpUtils\ArrayUtil;
+
use Oro\Bundle\EntityBundle\ORM\DatabaseDriverInterface;
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
class OroPlatformExtension extends Extension implements PrependExtensionInterface
{
@@ -111,7 +112,7 @@ private function mergeConfigIntoOne(ContainerBuilder $container, $name, array $c
$originalConfig[] = array();
}
- $mergedConfig = ArrayUtils::arrayMergeRecursiveDistinct($originalConfig[0], $config);
+ $mergedConfig = ArrayUtil::arrayMergeRecursiveDistinct($originalConfig[0], $config);
$originalConfig[0] = $mergedConfig;
$container->setExtensionConfig($name, $originalConfig);
diff --git a/src/Oro/Bundle/PlatformBundle/OroPlatformBundle.php b/src/Oro/Bundle/PlatformBundle/OroPlatformBundle.php
index 0746bd61772..790a78676e6 100644
--- a/src/Oro/Bundle/PlatformBundle/OroPlatformBundle.php
+++ b/src/Oro/Bundle/PlatformBundle/OroPlatformBundle.php
@@ -11,6 +11,7 @@
use Oro\Bundle\PlatformBundle\DependencyInjection\Compiler\LazyServicesCompilerPass;
use Oro\Bundle\PlatformBundle\DependencyInjection\Compiler\OptionalListenersCompilerPass;
+use Oro\Bundle\PlatformBundle\DependencyInjection\Compiler\UpdateDoctrineConfigurationPass;
use Oro\Bundle\PlatformBundle\DependencyInjection\Compiler\UpdateDoctrineEventHandlersPass;
class OroPlatformBundle extends Bundle
@@ -32,6 +33,7 @@ public function build(ContainerBuilder $container)
'Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink'
)
);
+ $container->addCompilerPass(new UpdateDoctrineConfigurationPass());
if ($container instanceof ExtendedContainerBuilder) {
$container->addCompilerPass(new UpdateDoctrineEventHandlersPass());
$container->moveCompilerPassBefore(
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/GroupingOrmFilterDatasourceAdapter.php b/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/GroupingOrmFilterDatasourceAdapter.php
index d80687f54f6..23bd47ebd27 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/GroupingOrmFilterDatasourceAdapter.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/GroupingOrmFilterDatasourceAdapter.php
@@ -3,9 +3,10 @@
namespace Oro\Bundle\QueryDesignerBundle\Grid\Extension;
use Doctrine\ORM\QueryBuilder;
-use Doctrine\ORM\Query\Expr;
+
use Oro\Bundle\FilterBundle\Datasource\Orm\OrmFilterDatasourceAdapter;
-use Oro\Bundle\FilterBundle\Filter\FilterUtility;
+use Oro\Bundle\QueryDesignerBundle\Model\ExpressionBuilder;
+use Oro\Bundle\QueryDesignerBundle\Model\Restriction;
/**
* Represents ORM data source adapter which allows to combine restrictions in groups,
@@ -13,25 +14,8 @@
*/
class GroupingOrmFilterDatasourceAdapter extends OrmFilterDatasourceAdapter
{
- /**
- * @var Expr\Composite[]
- */
- protected $exprStack;
-
- /**
- * @var string[]
- */
- protected $conditionStack;
-
- /**
- * @var Expr\Composite
- */
- protected $currentExpr = null;
-
- /**
- * @var string
- */
- protected $currentCondition = null;
+ /** @var ExpressionBuilder */
+ protected $expressionBuilder;
/**
* Constructor
@@ -41,7 +25,7 @@ class GroupingOrmFilterDatasourceAdapter extends OrmFilterDatasourceAdapter
public function __construct(QueryBuilder $qb)
{
parent::__construct($qb);
- $this->resetState();
+ $this->expressionBuilder = new ExpressionBuilder();
}
/**
@@ -49,48 +33,17 @@ public function __construct(QueryBuilder $qb)
*/
public function addRestriction($restriction, $condition, $isComputed = false)
{
- if ($isComputed) {
- throw new \LogicException('The HAVING restrictions is not supported yet.');
- }
-
- if ($this->currentExpr === null) {
- // this is the first item in a group
- $this->currentExpr = $restriction;
- } else {
- // other items
- if ($condition === FilterUtility::CONDITION_OR) {
- if ($this->currentExpr instanceof Expr\Orx) {
- $this->currentExpr->add($restriction);
- } else {
- $this->currentExpr = $this->qb->expr()->orX($this->currentExpr, $restriction);
- }
- } else {
- if ($this->currentExpr instanceof Expr\Andx) {
- $this->currentExpr->add($restriction);
- } else {
- $this->currentExpr = $this->qb->expr()->andX($this->currentExpr, $restriction);
- }
- }
- }
+ $this->expressionBuilder->addRestriction(new Restriction($restriction, $condition, $isComputed));
}
public function beginRestrictionGroup($condition)
{
- array_push($this->exprStack, $this->currentExpr);
- array_push($this->conditionStack, $this->currentCondition);
-
- $this->currentExpr = null;
- $this->currentCondition = $condition;
+ $this->expressionBuilder->beginGroup($condition);
}
public function endRestrictionGroup()
{
- $tmpExpr = $this->currentExpr;
- $tmpCondition = $this->currentCondition;
- $this->currentExpr = array_pop($this->exprStack);
- $this->currentCondition = array_pop($this->conditionStack);
-
- $this->addRestriction($tmpExpr, $tmpCondition);
+ $this->expressionBuilder->endGroup();
}
/**
@@ -98,26 +51,6 @@ public function endRestrictionGroup()
*/
public function applyRestrictions()
{
- if ($this->currentExpr === null && empty($this->exprStack)) {
- return;
- }
-
- if ($this->currentExpr === null) {
- $this->currentExpr = array_pop($this->exprStack);
- }
-
- $this->qb->andWhere($this->currentExpr);
- $this->resetState();
- }
-
- /**
- * Resets all 'state' variables of this adapter
- */
- protected function resetState()
- {
- $this->exprStack = [];
- $this->conditionStack = [];
- $this->currentExpr = null;
- $this->currentCondition = null;
+ $this->expressionBuilder->applyRestrictions($this->qb);
}
}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/OrmDatasourceExtension.php b/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/OrmDatasourceExtension.php
index a6b549f60f7..e325deceffb 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/OrmDatasourceExtension.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Grid/Extension/OrmDatasourceExtension.php
@@ -4,7 +4,6 @@
use Doctrine\ORM\QueryBuilder;
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
use Oro\Bundle\DataGridBundle\Datagrid\ParameterBag;
use Oro\Bundle\DataGridBundle\Extension\AbstractExtension;
use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource;
@@ -38,7 +37,7 @@ public function __construct(RestrictionBuilderInterface $restrictionBuilder)
*/
public function isApplicable(DatagridConfiguration $config)
{
- return $config->offsetGetByPath(Builder::DATASOURCE_TYPE_PATH) == OrmDatasource::TYPE
+ return $config->getDatasourceType() == OrmDatasource::TYPE
&& $config->offsetGetByPath('[source][query_config][filters]');
}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php b/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
new file mode 100644
index 00000000000..a9a3f4c9f95
--- /dev/null
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/ExpressionBuilder.php
@@ -0,0 +1,155 @@
+validator = Validation::createValidator();
+ }
+
+ /**
+ * @param string $condition
+ */
+ public function beginGroup($condition)
+ {
+ $groupNode = new GroupNode($condition);
+ if ($this->currentGroupNode) {
+ $this->currentGroupNode->addNode($groupNode);
+ $this->currentGroupNode = $groupNode;
+ } elseif ($this->groupNode) {
+ $this->currentGroupNode = $this->groupNode = $groupNode->addNode($this->groupNode);
+ } else {
+ $this->currentGroupNode = $this->groupNode = $groupNode;
+ }
+ }
+
+ /**
+ * @param Restriction $restriction
+ */
+ public function addRestriction(Restriction $restriction)
+ {
+ if (!$this->groupNode) {
+ $this->groupNode = new GroupNode(FilterUtility::CONDITION_AND);
+ $this->currentGroupNode = $this->groupNode;
+ }
+
+ $this->currentGroupNode->addNode($restriction);
+ }
+
+ public function endGroup()
+ {
+ $this->currentGroupNode = $this->currentGroupNode->getParent();
+ }
+
+ /**
+ * @param QueryBuilder $qb
+ */
+ public function applyRestrictions(QueryBuilder $qb)
+ {
+ if (!$this->groupNode) {
+ return;
+ }
+
+ $violationList = $this->validator->validate($this->groupNode, new GroupNodeConstraint());
+ foreach ($violationList as $violation) {
+ throw new LogicException($violation->getMessage());
+ }
+
+ list($uncomputedExpr, $computedExpr) = $this->resolveGroupNode($this->groupNode);
+ if ($computedExpr) {
+ $qb->andHaving($computedExpr);
+ }
+ if ($uncomputedExpr) {
+ $qb->andWhere($uncomputedExpr);
+ }
+ }
+
+ /**
+ * @param GroupNode $gNode
+ *
+ * @return mixed Expr[] Where first item is uncomputed expr and 2nd one is computed
+ */
+ protected function resolveGroupNode(GroupNode $gNode)
+ {
+ $uncomputedRestrictions = [];
+ $computedRestrictions = [];
+
+ foreach ($gNode->getChildren() as $node) {
+ if ($node instanceof Restriction) {
+ if ($node->isComputed()) {
+ $computedRestrictions[] = $node;
+ } else {
+ $uncomputedRestrictions[] = $node;
+ }
+ } else {
+ list($uncomputedExpr, $computedExpr) = $this->resolveGroupNode($node);
+ if ($uncomputedExpr) {
+ $uncomputedRestrictions[] = new Restriction($uncomputedExpr, $node->getCondition(), false);
+ }
+ if ($computedExpr) {
+ $computedRestrictions[] = new Restriction($computedExpr, $node->getCondition(), true);
+ }
+ }
+ }
+
+ return [
+ $this->createExprFromRestrictions($uncomputedRestrictions),
+ $this->createExprFromRestrictions($computedRestrictions),
+ ];
+ }
+
+ /**
+ * @param Restriction[] $restrictions
+ *
+ * @return mixed Expr
+ */
+ protected function createExprFromRestrictions(array $restrictions)
+ {
+ return array_reduce(
+ $restrictions,
+ function ($expr = null, Restriction $restriction) {
+ if ($expr === null) {
+ return $restriction->getRestriction();
+ }
+
+ if ($restriction->getCondition() === FilterUtility::CONDITION_OR) {
+ if ($expr instanceof Expr\Orx) {
+ $expr->add($restriction->getRestriction());
+ } else {
+ $expr = new Expr\Orx([$expr, $restriction->getRestriction()]);
+ }
+ } else {
+ if ($expr instanceof Expr\Andx) {
+ $expr->add($restriction->getRestriction());
+ } else {
+ $expr = new Expr\Andx([$expr, $restriction->getRestriction()]);
+ }
+ }
+
+ return $expr;
+ }
+ );
+ }
+}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php b/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
new file mode 100644
index 00000000000..42d6a220ce6
--- /dev/null
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/GroupNode.php
@@ -0,0 +1,130 @@
+condition = $condition;
+ }
+
+ /**
+ * @param GroupNode|Restriction $node
+ *
+ * @return $this
+ */
+ public function addNode($node)
+ {
+ $this->nodes[] = $node;
+ if ($node instanceof GroupNode) {
+ $node->setParent($this);
+ }
+
+ return $this;
+ }
+
+ /**
+ * @param GroupNode $node
+ *
+ * @return $this
+ */
+ public function setParent(GroupNode $node)
+ {
+ $this->parentNode = $node;
+
+ return $this;
+ }
+
+ /**
+ * @return GroupNode|null
+ */
+ public function getParent()
+ {
+ return $this->parentNode;
+ }
+
+ /**
+ * @param GroupNode[]|Restriction[] $node
+ */
+ public function getChildren()
+ {
+ return $this->nodes;
+ }
+
+ /**
+ * @return string
+ */
+ public function getCondition()
+ {
+ return $this->condition;
+ }
+
+ /**
+ * @return string
+ */
+ public function getType()
+ {
+ $mixed = $this->typedNodesExists(GroupNode::TYPE_MIXED);
+
+ if ($mixed) {
+ return GroupNode::TYPE_MIXED;
+ }
+
+ $computed = $this->typedNodesExists(GroupNode::TYPE_COMPUTED);
+ $unComputed = $this->typedNodesExists(GroupNode::TYPE_UNCOMPUTED);
+
+ if ($computed && $unComputed) {
+ return static::TYPE_MIXED;
+ }
+
+ return $computed ? static::TYPE_COMPUTED : static::TYPE_UNCOMPUTED;
+ }
+
+ /**
+ * @param $type
+ *
+ * @return bool
+ */
+ protected function typedNodesExists($type)
+ {
+ return ArrayUtil::some(
+ function ($node) use ($type) {
+ $exists = false;
+
+ if ($node instanceof GroupNode) {
+ $exists = $node->getType() === $type;
+ } else {
+ switch ($type) {
+ case GroupNode::TYPE_COMPUTED:
+ $exists = $node->isComputed();
+ break;
+ case GroupNode::TYPE_UNCOMPUTED:
+ $exists = !$node->isComputed();
+ }
+ }
+
+ return $exists;
+ },
+ $this->nodes
+ );
+ }
+}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Model/Restriction.php b/src/Oro/Bundle/QueryDesignerBundle/Model/Restriction.php
new file mode 100644
index 00000000000..72161890ef0
--- /dev/null
+++ b/src/Oro/Bundle/QueryDesignerBundle/Model/Restriction.php
@@ -0,0 +1,51 @@
+restriction = $restriction;
+ $this->condition = $condition;
+ $this->computed = $computed;
+ }
+
+ /**
+ * @return mixed Expr
+ */
+ public function getRestriction()
+ {
+ return $this->restriction;
+ }
+
+ /**
+ * @return string
+ */
+ public function getCondition()
+ {
+ return $this->condition;
+ }
+
+ /**
+ * @return bool
+ */
+ public function isComputed()
+ {
+ return $this->computed;
+ }
+}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php
index 5b879885abf..6a9e075c421 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/AbstractQueryConverter.php
@@ -440,6 +440,32 @@ protected function prepareColumnAliases()
}
}
+ /**
+ * @param array $column
+ *
+ * @return array Where array has elements: string|FunctionInterface|null, string|null
+ */
+ protected function createColumnFunction(array $column)
+ {
+ if (!empty($column['func'])) {
+ $function = $this->functionProvider->getFunction(
+ $column['func']['name'],
+ $column['func']['group_name'],
+ $column['func']['group_type']
+ );
+ $functionExpr = $function['expr'];
+ if (isset($function['return_type'])) {
+ $functionReturnType = $function['return_type'];
+ } else {
+ $functionReturnType = null;
+ }
+
+ return [$functionExpr, $functionReturnType];
+ }
+
+ return [null, null];
+ }
+
/**
* Performs conversion of SELECT statement
*/
@@ -448,21 +474,7 @@ protected function addSelectStatement()
foreach ($this->definition['columns'] as $column) {
$columnName = $column['name'];
$fieldName = $this->getFieldName($columnName);
- $functionExpr = null;
- $functionReturnType = null;
- if (!empty($column['func'])) {
- $function = $this->functionProvider->getFunction(
- $column['func']['name'],
- $column['func']['group_name'],
- $column['func']['group_type']
- );
- $functionExpr = $function['expr'];
- if (isset($function['return_type'])) {
- $functionReturnType = $function['return_type'];
- } else {
- $functionReturnType = null;
- }
- }
+ list($functionExpr, $functionReturnType) = $this->createColumnFunction($column);
$isDistinct = !empty($column['distinct']);
$tableAlias = $this->getTableAliasForColumn($columnName);
if (isset($column['label'])) {
@@ -651,6 +663,12 @@ protected function processFilter($filter)
$fieldName = $this->getFieldName($columnName);
$columnAliasKey = $this->buildColumnAliasKey($columnName);
$tableAlias = $this->getTableAliasForColumn($columnName);
+ $column = ['name' => $fieldName];
+ if (isset($filter['func'])) {
+ $column['func'] = $filter['func'];
+ }
+ list($functionExpr) = $this->createColumnFunction($column);
+
$this->addWhereCondition(
$this->getEntityClassName($columnName),
$tableAlias,
@@ -658,7 +676,8 @@ protected function processFilter($filter)
$this->buildColumnExpression($columnName, $tableAlias, $fieldName),
$this->getColumnAlias($columnAliasKey),
$filter['criterion']['filter'],
- $filter['criterion']['data']
+ $filter['criterion']['data'],
+ $functionExpr
);
}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/GroupingOrmQueryConverter.php b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/GroupingOrmQueryConverter.php
index 9f7a948e2d7..344b8c20f20 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/GroupingOrmQueryConverter.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/GroupingOrmQueryConverter.php
@@ -91,10 +91,24 @@ protected function addWhereCondition(
$columnExpr,
$columnAlias,
$filterName,
- array $filterData
+ array $filterData,
+ $functionExpr = null
) {
$filter = [
- 'column' => $this->getFilterByExpr($entityClassName, $tableAlias, $fieldName, $columnExpr),
+ 'column' => $this->getFilterByExpr(
+ $entityClassName,
+ $tableAlias,
+ $fieldName,
+ $functionExpr
+ ? $this->prepareFunctionExpression(
+ $functionExpr,
+ $tableAlias,
+ $fieldName,
+ $columnExpr,
+ $columnAlias
+ )
+ : $columnExpr
+ ),
'filter' => $filterName,
'filterData' => $filterData
];
diff --git a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/Manager.php b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/Manager.php
index 0d7a5938564..5f9dba7714d 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/Manager.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/QueryDesigner/Manager.php
@@ -217,11 +217,16 @@ protected function getMetadataForFunctions($groupType, $queryType)
$hintText = empty($function['hint_label'])
? null // if a label is empty it means that this function should inherit a label
: $this->translator->trans($function['hint_label']);
- $functions[] = [
+ $func = [
'name' => $function['name'],
'label' => $nameText,
'title' => $hintText,
];
+ if (isset($function['return_type'])) {
+ $func['return_type'] = $function['return_type'];
+ }
+
+ $functions[] = $func;
}
$attr['functions'] = $functions;
$result[$name] = $attr;
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/config/requirejs.yml b/src/Oro/Bundle/QueryDesignerBundle/Resources/config/requirejs.yml
index a9517905e07..9c997dc7b5c 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/config/requirejs.yml
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/config/requirejs.yml
@@ -2,6 +2,7 @@ config:
paths:
'oroquerydesigner/js/condition-builder': 'bundles/oroquerydesigner/js/condition-builder.js'
'oroquerydesigner/js/field-condition': 'bundles/oroquerydesigner/js/field-condition.js'
+ 'oroquerydesigner/js/aggregated-field-condition': 'bundles/oroquerydesigner/js/aggregated-field-condition.js'
'oroquerydesigner/js/function-choice': 'bundles/oroquerydesigner/js/function-choice.js'
'oroquerydesigner/js/items-manager/grouping-model': 'bundles/oroquerydesigner/js/items-manager/grouping-model.js'
'oroquerydesigner/js/items-manager/column-model': 'bundles/oroquerydesigner/js/items-manager/column-model.js'
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/css/less/condition-builder.less b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/css/less/condition-builder.less
index da8c1fc785b..09372a86b1d 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/css/less/condition-builder.less
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/css/less/condition-builder.less
@@ -26,10 +26,10 @@
display: none;
}
.conditions-group {
+ width: 100%;
list-style: none;
margin: 0;
padding: 0;
- min-height: 199px;
box-sizing: border-box;
&:before, &:after {
content: "";
@@ -249,18 +249,23 @@
border: 1px solid #c9c9c9;
min-width: 582px;/* @TODO temporary solution, will be fixed in CRM-2025 */
background-color: #eff2f5;
+
+ & > div {
+ display: flex;
+ }
.left-area {
width: 150px;
- float: left;
}
.right-area {
+ display: flex;
width: calc(~"100% - 150px");
- float: left;
padding: 0 10px;
border-left: 1px solid #c9c9c9;
background-color: white;
> div {
position: relative;
+ display: flex;
+ width: 100%;
}
}
}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
new file mode 100644
index 00000000000..207956267cd
--- /dev/null
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/aggregated-field-condition.js
@@ -0,0 +1,169 @@
+define([
+ 'jquery',
+ 'underscore',
+ 'orotranslation/js/translator',
+ 'oroquerydesigner/js/field-condition'
+], function($, _, __) {
+ 'use strict';
+
+ $.widget('oroauditquerydesigner.aggregatedFieldCondition', $.oroquerydesigner.fieldCondition, {
+ options: {
+ columnsCollection: null
+ },
+
+ _create: function() {
+ var data = this.element.data('value');
+
+ this.$fieldChoice = $('').addClass(this.options.fieldChoiceClass);
+ this.$filterContainer = $('').addClass(this.options.filterContainerClass);
+ this.element.append(this.$fieldChoice, this.$filterContainer);
+
+ this.$fieldChoice.fieldChoice(this.options.fieldChoice);
+
+ this._updateFieldChoice();
+ this.options.columnsCollection.on('remove', function(model) {
+ if (model.get('label') === this._getColumnLabel()) {
+ this.element.closest('.condition').find('.close').click();
+ }
+ }, this);
+ this.options.columnsCollection.on('change:func change:label', function(model) {
+ if (model._previousAttributes.label === this._getColumnLabel()) {
+ this.element.closest('.condition').find('.close').click();
+ }
+ }, this);
+ if (data && data.columnName && data.func) {
+ var column = this._getColumnByNameAndFunc(data.columnName, data.func);
+ if (column) {
+ this.$fieldChoice.fieldChoice('setData', {id: column.get('name'), text: column.get('label')});
+ this._renderFilter(column.get('name'));
+ }
+ }
+
+ this._on(this.$fieldChoice, {
+ changed: function(e, fieldId) {
+ $(':focus').blur();
+ // reset current value on field change
+ this.element.data('value', {});
+ this._renderFilter(fieldId);
+ e.stopPropagation();
+ }
+ });
+
+ this._on(this.$filterContainer, {
+ change: function() {
+ if (this.filter) {
+ this.filter.applyValue();
+ }
+ }
+ });
+ },
+
+ _updateFieldChoice: function() {
+ var fieldChoice = this.$fieldChoice.fieldChoice().data('oroentity-fieldChoice');
+ fieldChoice._select2Data = _.bind(this._getAggregatedSelectData, this);
+
+ fieldChoice.setData = function(data) {
+ this.element.select2('data', data, true);
+ };
+
+ var self = this;
+
+ fieldChoice.formatChoice = _.wrap(fieldChoice.formatChoice, function(original) {
+ var formatted = original.apply(this, _.rest(arguments));
+ var func = self._getCurrentFunc();
+ if (func && func.name) {
+ formatted += ' (' + func.name + ')';
+ }
+
+ return formatted;
+ });
+
+ fieldChoice.getApplicableConditions = _.wrap(
+ fieldChoice.getApplicableConditions,
+ function(original) {
+ var conditions = original.apply(this, _.rest(arguments));
+ var func = self._getCurrentFunc();
+ if (func && func.return_type) {
+ conditions.type = func.return_type;
+ }
+
+ return conditions;
+ }
+ );
+ },
+
+ _getAggregatedSelectData: function() {
+ return _.map(
+ this._getAggregatedColumns(),
+ function(model) {
+ return {
+ id: model.get('name'),
+ text: model.get('label')
+ };
+ }
+ );
+ },
+
+ _getAggregatedColumns: function() {
+ return _.filter(
+ this.options.columnsCollection.models,
+ _.compose(_.negate(_.isEmpty), _.property('func'), _.property('attributes'))
+ );
+ },
+
+ _onUpdate: function() {
+ var value;
+ var columnName = this._getColumnName();
+ var columnFunc = this._getCurrentFunc();
+
+ if (this.filter && !this.filter.isEmptyValue() && !_.isEmpty(columnFunc)) {
+ value = {
+ columnName: columnName,
+ criterion: this._getFilterCriterion(),
+ func: columnFunc
+ };
+ } else {
+ value = {};
+ }
+
+ this.element.data('value', value);
+ this.element.trigger('changed');
+ },
+
+ _getColumnName: function() {
+ return this.element.find('input.select').select2('val');
+ },
+
+ _getColumnLabel: function() {
+ var obj = this.element.find('input.select').select2('data');
+
+ return obj ? obj.text : undefined;
+ },
+
+ _getCurrentFunc: function() {
+ var column = this.options.columnsCollection.findWhere({label: this._getColumnLabel()});
+ if (_.isEmpty(column)) {
+ return;
+ }
+
+ return column.get('func');
+ },
+
+ _getColumnByNameAndFunc: function(name, func) {
+ if (!func) {
+ return;
+ }
+
+ return _.find(this.options.columnsCollection.where({name: name}), function(column) {
+ return column.get('func') && column.get('func').name === func.name;
+ });
+ },
+
+ _getFilterCriterion: function() {
+ var criterion = this._superApply(arguments);
+ $.extend(true, criterion, {'data': {'params': {'filter_by_having': true}}});
+
+ return criterion;
+ }
+ });
+});
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
index 64e4426f2d9..d41793c134d 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/condition-builder.js
@@ -82,6 +82,7 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
opts.criteriaList = $.extend({}, opts.sortable, opts.criteriaList);
opts.criteriaList.start = $.proxy(this._onCriteriaGrab, this);
opts.criteriaList.stop = $.proxy(this._onCriteriaDrop, this);
+ opts.criteriaList.change = $.proxy(this._onCriteriaChange, this);
opts.conditionsGroup.start = $.proxy(this._onConditionsGroupGrab, this);
opts.conditionsGroup.stop = $.proxy(this._onConditionsGroupDrop, this);
@@ -229,12 +230,46 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
this.$rootCondition.find('.hide-operator').removeClass('hide-operator');
},
- syncDropAreaOver: function() {
+ _onCriteriaChange: function(e, ui) {
+ if (this._isPlaceholderInValidPosition(e, ui)) {
+ this.element.find('.sortable-placeholder').removeClass('hide');
+ } else {
+ this.element.find('.sortable-placeholder').addClass('hide');
+ }
+ },
+
+ syncDropAreaOver: function(e, ui) {
this.$rootCondition
.parent()
.toggleClass('drop-area-over', this.$rootCondition.find('.sortable-placeholder').length !== 0);
},
+ _isPlaceholderInValidPosition: function(e, ui) {
+ if (ui.item.data('criteria') === 'aggregated-condition-item') {
+ if (
+ ui.placeholder.closest('[condition-type=aggregated-condition-item]').length ||
+ (ui.placeholder.is(':last-child') &&
+ !this.element.find('[condition-type=aggregated-condition-item]').length)
+ ) {
+ return true;
+ }
+
+ return false;
+ } else if (ui.item.data('criteria') !== 'conditions-group' &&
+ ui.placeholder.closest('[condition-type=aggregated-condition-item]').length
+ ) {
+ return false;
+ }
+
+ return !ui.placeholder.prev('[condition-type=aggregated-condition-item]').length;
+ },
+
+ _updateRootAggregatedCondition: function($condition) {
+ $condition
+ .attr('condition-type', 'aggregated-condition-item')
+ .find('>.operator [data-value=OR]').parent('li').remove();
+ },
+
_getCriteriaOrigin: function(criteria) {
var $criteria = this.$criteriaList.find('[data-criteria="' + criteria + '"]');
return $criteria.data('origin') || $criteria;
@@ -329,8 +364,22 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
var $condition;
// new condition
if (ui.sender && ui.sender.is(this.$criteriaList)) {
- $condition = this._createCondition(ui.item.data('criteria'));
- $condition.insertBefore(ui.item);
+ if (ui.placeholder && ui.placeholder.hasClass('hide')) {
+ return;
+ }
+
+ var criteria = ui.item.data('criteria');
+ if (criteria === 'aggregated-condition-item' &&
+ !this.element.find('[condition-type=aggregated-condition-item]').length
+ ) {
+ var $conditionsGroup = this._createCondition('conditions-group');
+ $conditionsGroup.insertBefore(ui.item);
+ $condition = this._createCondition(ui.item.data('criteria'));
+ $conditionsGroup.find('.conditions-group').append($condition);
+ } else {
+ $condition = this._createCondition(criteria);
+ $condition.insertBefore(ui.item);
+ }
} else {
$condition = ui.item;
}
@@ -353,7 +402,7 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
// add operators to proper conditions
$conditions.filter(':not(:first-child)').not(':has(>.operator)')
.each(function() {
- self._initConditionOperation(this);
+ self._initConditionOperation($(this));
}).trigger('changed');
},
@@ -365,7 +414,8 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
.prependTo($condition)
.dropdownSelect({
buttonClass: 'btn btn-mini',
- options: this.options.operations,
+ options: $condition.is('[condition-type=aggregated-condition-item]') ?
+ [operation] : this.options.operations,
selected: operation
});
},
@@ -387,6 +437,9 @@ define(['jquery', 'underscore', 'orotranslation/js/translator', 'jquery-ui',
_onChanged: function() {
this._setSourceValue(this.$rootCondition.data('value'));
+ this._updateRootAggregatedCondition(
+ this.$rootCondition.find('>[data-criteria]').has('[data-criteria=aggregated-condition-item]')
+ );
},
_setSourceValue: function(value) {
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/function-choice.js b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/function-choice.js
index 60f30e496b9..477c60c8137 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/function-choice.js
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/public/js/function-choice.js
@@ -7,9 +7,10 @@ define(['jquery', 'underscore', 'jquery-ui'], function($, _) {
$.widget('oroquerydesigner.functionChoice', {
options: {
fieldChoiceSelector: '',
- optionTemplate: _.template(''),
converters: [],
aggregates: []
@@ -90,7 +91,7 @@ define(['jquery', 'underscore', 'jquery-ui'], function($, _) {
});
_.each(functions, function(func) {
- content += options.optionTemplate(func);
+ content += options.optionTemplate({data: func});
});
if (content !== '') {
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/messages.en.yml
index 1197fd0a151..37c3fc4ced7 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/QueryDesignerBundle/Resources/translations/messages.en.yml
@@ -34,6 +34,7 @@ oro:
criteria:
drag_hint: drag to select
field_condition: Field Condition
+ aggregated_field_condition: Aggregation column
conditions_group: Conditions Group
choose_entity_field: Choose a field...
validation:
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
index dd510acb10d..26c58c75af7 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/GroupingOrmFilterDatasourceAdapterTest.php
@@ -5,7 +5,6 @@
use Doctrine\ORM\QueryBuilder;
use Oro\Bundle\TestFrameworkBundle\Test\Doctrine\ORM\OrmTestCase;
-
use Oro\Bundle\FilterBundle\Filter\FilterUtility;
use Oro\Bundle\QueryDesignerBundle\Grid\Extension\GroupingOrmFilterDatasourceAdapter;
@@ -45,6 +44,25 @@ public function testOneRestriction()
);
}
+ public function testOneComputedRestriction()
+ {
+ $qb = new QueryBuilder($this->getTestEntityManager());
+ $qb->select(['u.status, COUNT(u.id)'])
+ ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+ ->groupBy('u.status');
+ $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+ $ds->applyRestrictions();
+
+ $this->assertEquals(
+ 'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+ . 'GROUP BY u.status '
+ . 'HAVING COUNT(u.id) = 1',
+ $qb->getDQL()
+ );
+ }
+
public function testSeveralRestrictions()
{
$qb = new QueryBuilder($this->getTestEntityManager());
@@ -66,6 +84,27 @@ public function testSeveralRestrictions()
);
}
+ public function testSeveralComputedRestrictions()
+ {
+ $qb = new QueryBuilder($this->getTestEntityManager());
+ $qb->select(['u.status, COUNT(u.id)'])
+ ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+ ->groupBy('u.status');
+ $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+ $ds->addRestriction($qb->expr()->eq('MIN(u.id)', '2'), FilterUtility::CONDITION_OR, true);
+ $ds->addRestriction($qb->expr()->eq('MAX(u.id)', '3'), FilterUtility::CONDITION_AND, true);
+ $ds->applyRestrictions();
+
+ $this->assertEquals(
+ 'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+ . 'GROUP BY u.status '
+ . 'HAVING (COUNT(u.id) = 1 OR MIN(u.id) = 2) AND MAX(u.id) = 3',
+ $qb->getDQL()
+ );
+ }
+
public function testEmptyGroup()
{
$qb = new QueryBuilder($this->getTestEntityManager());
@@ -105,6 +144,27 @@ public function testOneRestrictionInGroup()
);
}
+ public function testOneComputedRestrictionInGroup()
+ {
+ $qb = new QueryBuilder($this->getTestEntityManager());
+ $qb->select(['u.status, COUNT(u.id)'])
+ ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+ ->groupBy('u.status');
+ $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+ $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+ $ds->endRestrictionGroup();
+ $ds->applyRestrictions();
+
+ $this->assertEquals(
+ 'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+ . 'GROUP BY u.status '
+ . 'HAVING COUNT(u.id) = 1',
+ $qb->getDQL()
+ );
+ }
+
public function testSeveralRestrictionsInGroup()
{
$qb = new QueryBuilder($this->getTestEntityManager());
@@ -128,6 +188,29 @@ public function testSeveralRestrictionsInGroup()
);
}
+ public function testSeveralComputedRestrictionsInGroup()
+ {
+ $qb = new QueryBuilder($this->getTestEntityManager());
+ $qb->select(['u.status, COUNT(u.id)'])
+ ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+ ->groupBy('u.status');
+ $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+ $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+ $ds->addRestriction($qb->expr()->eq('MIN(u.id)', '2'), FilterUtility::CONDITION_OR, true);
+ $ds->addRestriction($qb->expr()->eq('MAX(u.id)', '3'), FilterUtility::CONDITION_AND, true);
+ $ds->endRestrictionGroup();
+ $ds->applyRestrictions();
+
+ $this->assertEquals(
+ 'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+ . 'GROUP BY u.status '
+ . 'HAVING (COUNT(u.id) = 1 OR MIN(u.id) = 2) AND MAX(u.id) = 3',
+ $qb->getDQL()
+ );
+ }
+
public function testNestedGroupsWithOneRestrictionInNestedGroup()
{
$qb = new QueryBuilder($this->getTestEntityManager());
@@ -154,6 +237,33 @@ public function testNestedGroupsWithOneRestrictionInNestedGroup()
);
}
+ public function testNestedGroupsWithOneComputedRestrictionInNestedGroup()
+ {
+ $qb = new QueryBuilder($this->getTestEntityManager());
+ $qb->select(['u.status, COUNT(u.id)'])
+ ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+ ->groupBy('u.status')
+ ->andHaving('MAX(u.id) > 0');
+ $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+ // src: (1 OR (2))
+ // dest: (1 OR 2)
+ $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+ $ds->beginRestrictionGroup(FilterUtility::CONDITION_OR);
+ $ds->addRestriction($qb->expr()->eq('MIN(u.id)', '2'), FilterUtility::CONDITION_AND, true);
+ $ds->endRestrictionGroup();
+ $ds->endRestrictionGroup();
+ $ds->applyRestrictions();
+
+ $this->assertEquals(
+ 'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+ . 'GROUP BY u.status '
+ . 'HAVING MAX(u.id) > 0 AND (COUNT(u.id) = 1 OR MIN(u.id) = 2)',
+ $qb->getDQL()
+ );
+ }
+
public function testNestedGroupsWithSameCondition()
{
$qb = new QueryBuilder($this->getTestEntityManager());
@@ -181,6 +291,33 @@ public function testNestedGroupsWithSameCondition()
);
}
+ public function testNestedComputedGroupsWithSameCondition()
+ {
+ $qb = new QueryBuilder($this->getTestEntityManager());
+ $qb->select(['u.status, COUNT(u.id)'])
+ ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+ ->groupBy('u.status');
+ $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+ // src: (1 OR (2 OR 3))
+ // dest: (1 OR (2 OR 3))
+ $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+ $ds->beginRestrictionGroup(FilterUtility::CONDITION_OR);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '2'), FilterUtility::CONDITION_AND, true);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '3'), FilterUtility::CONDITION_OR, true);
+ $ds->endRestrictionGroup();
+ $ds->endRestrictionGroup();
+ $ds->applyRestrictions();
+
+ $this->assertEquals(
+ 'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+ . 'GROUP BY u.status '
+ . 'HAVING COUNT(u.id) = 1 OR (COUNT(u.id) = 2 OR COUNT(u.id) = 3)',
+ $qb->getDQL()
+ );
+ }
+
public function testNestedGroupsWithDifferentConditions()
{
$qb = new QueryBuilder($this->getTestEntityManager());
@@ -208,6 +345,33 @@ public function testNestedGroupsWithDifferentConditions()
);
}
+ public function testNestedComputedGroupsWithDifferentConditions()
+ {
+ $qb = new QueryBuilder($this->getTestEntityManager());
+ $qb->select(['u.status, COUNT(u.id)'])
+ ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+ ->groupBy('u.status');
+ $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+ // src: (1 OR (2 AND 3))
+ // dest: (1 OR (2 AND 3))
+ $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+ $ds->beginRestrictionGroup(FilterUtility::CONDITION_OR);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '2'), FilterUtility::CONDITION_AND, true);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '3'), FilterUtility::CONDITION_AND, true);
+ $ds->endRestrictionGroup();
+ $ds->endRestrictionGroup();
+ $ds->applyRestrictions();
+
+ $this->assertEquals(
+ 'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+ . 'GROUP BY u.status '
+ . 'HAVING COUNT(u.id) = 1 OR (COUNT(u.id) = 2 AND COUNT(u.id) = 3)',
+ $qb->getDQL()
+ );
+ }
+
public function testComplexExpr()
{
$qb = new QueryBuilder($this->getTestEntityManager());
@@ -247,4 +411,96 @@ public function testComplexExpr()
$qb->getDQL()
);
}
+
+ public function testComplexComputedExpr()
+ {
+ $qb = new QueryBuilder($this->getTestEntityManager());
+ $qb->select(['u.status, COUNT(u.id)'])
+ ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+ ->groupBy('u.status')
+ ->having('COUNT(u.id) = 0');
+ $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+ // src: (1 AND ((2 AND (3 OR 4)) OR (5) OR (6 AND 7)) AND 8)
+ // dest: (1 AND ((2 AND (3 OR 4)) OR 5 OR (6 AND 7)) AND 8)
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '1'), FilterUtility::CONDITION_AND, true);
+ $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+ $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '2'), FilterUtility::CONDITION_AND, true);
+ $ds->beginRestrictionGroup(FilterUtility::CONDITION_AND);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '3'), FilterUtility::CONDITION_AND, true);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '4'), FilterUtility::CONDITION_OR, true);
+ $ds->endRestrictionGroup();
+ $ds->endRestrictionGroup();
+ $ds->beginRestrictionGroup(FilterUtility::CONDITION_OR);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '5'), FilterUtility::CONDITION_AND, true);
+ $ds->endRestrictionGroup();
+ $ds->beginRestrictionGroup(FilterUtility::CONDITION_OR);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '6'), FilterUtility::CONDITION_AND, true);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '7'), FilterUtility::CONDITION_AND, true);
+ $ds->endRestrictionGroup();
+ $ds->endRestrictionGroup();
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '8'), FilterUtility::CONDITION_AND, true);
+ $ds->applyRestrictions();
+
+ $this->assertEquals(
+ 'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+ . 'GROUP BY u.status '
+ . 'HAVING COUNT(u.id) = 0 AND '
+ . '(COUNT(u.id) = 1 AND '
+ . '((COUNT(u.id) = 2 AND (COUNT(u.id) = 3 OR COUNT(u.id) = 4)) '
+ . 'OR COUNT(u.id) = 5 OR (COUNT(u.id) = 6 AND COUNT(u.id) = 7)) AND '
+ . 'COUNT(u.id) = 8)',
+ $qb->getDQL()
+ );
+ }
+
+ public function testComputedWithUnComputedRestrictionsTogether()
+ {
+ $qb = new QueryBuilder($this->getTestEntityManager());
+ $qb->select(['u.status, COUNT(u.id)'])
+ ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+ ->groupBy('u.status');
+ $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+ $ds->addRestriction($qb->expr()->eq('u.id', '1'), FilterUtility::CONDITION_AND);
+ $ds->addRestriction($qb->expr()->eq('u.id', '2'), FilterUtility::CONDITION_AND);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '3'), FilterUtility::CONDITION_AND, true);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '4'), FilterUtility::CONDITION_OR, true);
+ $ds->applyRestrictions();
+
+ $this->assertEquals(
+ 'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+ . 'WHERE u.id = 1 AND u.id = 2 '
+ . 'GROUP BY u.status '
+ . 'HAVING COUNT(u.id) = 3 OR COUNT(u.id) = 4',
+ $qb->getDQL()
+ );
+ }
+
+ /**
+ * @expectedException LogicException
+ * @expectedExceptionMessage Computed conditions cannot be mixed with uncomputed.
+ */
+ public function testComputedWithUnComputedRestrictionsTogetherShouldReturnExceptionWhenRestrictionsAreMixed()
+ {
+ $qb = new QueryBuilder($this->getTestEntityManager());
+ $qb->select(['u.status, COUNT(u.id)'])
+ ->from('Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser', 'u')
+ ->groupBy('u.status');
+ $ds = new GroupingOrmFilterDatasourceAdapter($qb);
+
+ $ds->addRestriction($qb->expr()->eq('u.id', '1'), FilterUtility::CONDITION_AND);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '2'), FilterUtility::CONDITION_AND, true);
+ $ds->addRestriction($qb->expr()->eq('COUNT(u.id)', '3'), FilterUtility::CONDITION_OR);
+ $ds->applyRestrictions();
+
+ $this->assertEquals(
+ 'SELECT u.status, COUNT(u.id) FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser u '
+ . 'WHERE u.id = 1 AND u.id = 2 '
+ . 'GROUP BY u.status '
+ . 'HAVING COUNT(u.id) = 3 OR COUNT(u.id) = 4',
+ $qb->getDQL()
+ );
+ }
}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/OrmDatasourceExtensionTest.php b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/OrmDatasourceExtensionTest.php
index e9c48f4c291..9cf29548b33 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/OrmDatasourceExtensionTest.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Grid/Extension/OrmDatasourceExtensionTest.php
@@ -188,10 +188,9 @@ function ($matches) use (&$counter) {
. 'FROM Oro\Bundle\QueryDesignerBundle\Tests\Unit\Fixtures\Models\CMS\CmsUser user '
. 'INNER JOIN user.address address '
//. 'WHERE (user_name IS NULL OR NOT(user_name LIKE :string1)) AND ('
- . 'WHERE user_name NOT LIKE :string1 AND ('
+ . 'WHERE user_name NOT LIKE :string1 AND '
. '(user_status < :datetime2 OR user_status > :datetime3) AND '
- . '(address.country LIKE :string4 OR address.city LIKE :string5 OR address.zip LIKE :string6)'
- . ')',
+ . '(address.country LIKE :string4 OR address.city LIKE :string5 OR address.zip LIKE :string6)',
$result
);
}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Validator/GroupNodeValidatorTest.php b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Validator/GroupNodeValidatorTest.php
new file mode 100644
index 00000000000..4ee1aab9b5f
--- /dev/null
+++ b/src/Oro/Bundle/QueryDesignerBundle/Tests/Unit/Validator/GroupNodeValidatorTest.php
@@ -0,0 +1,117 @@
+executionContext = $this->getMock('\Symfony\Component\Validator\ExecutionContextInterface');
+
+ $this->validator = new GroupNodeValidator();
+ $this->validator->initialize($this->executionContext);
+
+ $this->constraint = new GroupNodeConstraint();
+ }
+
+ /**
+ * @dataProvider validGroupNodesProvider
+ */
+ public function testValidGroupNodes(GroupNode $node)
+ {
+ $this->executionContext->expects($this->never())
+ ->method('addViolation');
+
+ $this->validator->validate($node, $this->constraint);
+ }
+
+ public function validGroupNodesProvider()
+ {
+ return [
+ [new GroupNode(FilterUtility::CONDITION_AND)],
+ [
+ (new GroupNode(FilterUtility::CONDITION_AND))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+ ],
+ [
+ (new GroupNode(FilterUtility::CONDITION_AND))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+ ],
+ [
+ (new GroupNode(FilterUtility::CONDITION_AND))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+ ],
+ [
+ (new GroupNode(FilterUtility::CONDITION_AND))
+ ->addNode(
+ (new GroupNode(FilterUtility::CONDITION_AND))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+ )
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+ ],
+ [
+ (new GroupNode(FilterUtility::CONDITION_AND))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+ ->addNode(
+ (new GroupNode(FilterUtility::CONDITION_AND))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+ )
+ ],
+ ];
+ }
+
+ /**
+ * @dataProvider invalidGroupNodesProvider
+ */
+ public function testInvalidGroupNodes(GroupNode $node)
+ {
+ $this->executionContext->expects($this->once())
+ ->method('addViolation')
+ ->with($this->constraint->mixedConditionsMessage);
+
+ $this->validator->validate($node, $this->constraint);
+ }
+
+ public function invalidGroupNodesProvider()
+ {
+ return [
+ [
+ (new GroupNode(FilterUtility::CONDITION_AND))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+ ],
+ [
+ (new GroupNode(FilterUtility::CONDITION_AND))
+ ->addNode(
+ (new GroupNode(FilterUtility::CONDITION_AND))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+ )
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+ ],
+ [
+ (new GroupNode(FilterUtility::CONDITION_AND))
+ ->addNode(
+ (new GroupNode(FilterUtility::CONDITION_AND))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, true))
+ )
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+ ->addNode(new Restriction('a = 5', FilterUtility::CONDITION_AND, false))
+ ],
+ ];
+ }
+}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Validator/Constraints/GroupNodeConstraint.php b/src/Oro/Bundle/QueryDesignerBundle/Validator/Constraints/GroupNodeConstraint.php
new file mode 100644
index 00000000000..fc41c512826
--- /dev/null
+++ b/src/Oro/Bundle/QueryDesignerBundle/Validator/Constraints/GroupNodeConstraint.php
@@ -0,0 +1,19 @@
+isValid($value)) {
+ $this->context->addViolation($constraint->mixedConditionsMessage);
+ }
+ }
+
+ /**
+ * @param GroupNode $rootNode
+ *
+ * @return boolean
+ */
+ protected function isValid(GroupNode $rootNode)
+ {
+ if ($rootNode->getType() !== GroupNode::TYPE_MIXED) {
+ return true;
+ }
+
+ $types = array_map(
+ function ($node) {
+ if ($node instanceof GroupNode) {
+ return $node->getType();
+ }
+
+ return $node->isComputed() ? GroupNode::TYPE_COMPUTED : GroupNode::TYPE_UNCOMPUTED;
+ },
+ $rootNode->getChildren()
+ );
+
+ if (in_array(GroupNode::TYPE_MIXED, $types)) {
+ return false;
+ }
+
+ $computedTypes = ArrayUtil::dropWhile(
+ function ($type) {
+ return $type === GroupNode::TYPE_UNCOMPUTED;
+ },
+ $types
+ );
+
+ return !in_array(GroupNode::TYPE_UNCOMPUTED, $computedTypes);
+ }
+}
diff --git a/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupingValidator.php b/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupingValidator.php
index 64e2b4c13f2..05a99061910 100644
--- a/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupingValidator.php
+++ b/src/Oro/Bundle/QueryDesignerBundle/Validator/GroupingValidator.php
@@ -6,9 +6,10 @@
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
+use Oro\Component\PhpUtils\ArrayUtil;
+
use Oro\Bundle\QueryDesignerBundle\Model\AbstractQueryDesigner;
use Oro\Bundle\QueryDesignerBundle\Validator\Constraints\GroupingConstraint;
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
class GroupingValidator extends ConstraintValidator
{
@@ -55,11 +56,11 @@ function (array $column) {
$groupingColumns = $definition['grouping_columns'];
}
- $groupingColumnNames = ArrayUtils::arrayColumn($groupingColumns, 'name');
- $columnNames = ArrayUtils::arrayColumn($columns, 'name');
+ $groupingColumnNames = ArrayUtil::arrayColumn($groupingColumns, 'name');
+ $columnNames = ArrayUtil::arrayColumn($columns, 'name');
$columnNamesToCheck = array_diff(
$columnNames,
- ArrayUtils::arrayColumn($aggregateColumns, 'name')
+ ArrayUtil::arrayColumn($aggregateColumns, 'name')
);
$columnsToGroup = array_diff($columnNamesToCheck, $groupingColumnNames);
diff --git a/src/Oro/Bundle/ReminderBundle/Resources/public/less/mobile/main.less b/src/Oro/Bundle/ReminderBundle/Resources/public/less/mobile/main.less
new file mode 100644
index 00000000000..190650f2ca4
--- /dev/null
+++ b/src/Oro/Bundle/ReminderBundle/Resources/public/less/mobile/main.less
@@ -0,0 +1,8 @@
+.mobile-version {
+ .reminders-collection, .ui-dialog .form-horizontal .control-group .controls .reminders-collection {
+ input.number {
+ height: 30px;
+ width: 40px !important;
+ }
+ }
+}
diff --git a/src/Oro/Bundle/ReminderBundle/Resources/public/less/style.less b/src/Oro/Bundle/ReminderBundle/Resources/public/less/style.less
index 0a941810610..3dbeb53377f 100644
--- a/src/Oro/Bundle/ReminderBundle/Resources/public/less/style.less
+++ b/src/Oro/Bundle/ReminderBundle/Resources/public/less/style.less
@@ -55,3 +55,5 @@
padding: 0 9px 0 8px;
}
}
+
+@import "./mobile/main";
diff --git a/src/Oro/Bundle/ReportBundle/EventListener/SegmentSubscriber.php b/src/Oro/Bundle/ReportBundle/EventListener/SegmentSubscriber.php
new file mode 100644
index 00000000000..1021b8b5d45
--- /dev/null
+++ b/src/Oro/Bundle/ReportBundle/EventListener/SegmentSubscriber.php
@@ -0,0 +1,58 @@
+ 'loadAggregatedFieldsWidgetOptions',
+ ConditionBuilderOptionsLoadEvent::EVENT_NAME => 'loadAggregatedFieldsBuilderOptions',
+ ];
+ }
+
+ /**
+ * @param WidgetOptionsLoadEvent $event
+ */
+ public function loadAggregatedFieldsWidgetOptions(WidgetOptionsLoadEvent $event)
+ {
+ if ($event->getWidgetType() !== 'oro_report') {
+ return;
+ }
+
+ $event->setWidgetOptions(array_merge_recursive(
+ $event->getWidgetOptions(),
+ [
+ 'extensions' => [
+ 'orosegment/js/app/components/aggregated-field-condition-extension',
+ ],
+ ]
+ ));
+ }
+
+ /**
+ * @param ConditionBuilderOptionsLoadEvent $event
+ */
+ public function loadAggregatedFieldsBuilderOptions(ConditionBuilderOptionsLoadEvent $event)
+ {
+ $event->setOptions(array_merge_recursive(
+ $event->getOptions(),
+ [
+ 'onFieldsUpdate' => [
+ 'toggleCriteria' => [
+ 'aggregated-condition-item',
+ ],
+ ],
+ ]
+ ));
+ }
+}
diff --git a/src/Oro/Bundle/ReportBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/ReportBundle/Resources/config/datagrid.yml
index 48db774d122..ecd26b22792 100644
--- a/src/Oro/Bundle/ReportBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/ReportBundle/Resources/config/datagrid.yml
@@ -1,8 +1,8 @@
datagrid:
reports-grid:
+ acl_resource: oro_report_view
source:
type: orm
- acl_resource: oro_report_view
query:
select:
- r.id
diff --git a/src/Oro/Bundle/ReportBundle/Resources/config/placeholders.yml b/src/Oro/Bundle/ReportBundle/Resources/config/placeholders.yml
new file mode 100644
index 00000000000..f07a4d54a81
--- /dev/null
+++ b/src/Oro/Bundle/ReportBundle/Resources/config/placeholders.yml
@@ -0,0 +1,10 @@
+placeholders:
+ segment_criteria_list:
+ items:
+ aggregated_field_condition:
+ order: 10
+
+items:
+ aggregated_field_condition:
+ template: OroReportBundle:Segment:aggregated_field_condition.html.twig
+ applicable: @oro_ui.placeholder.filter->isSame($params.id$, oro_report-condition-builder)
diff --git a/src/Oro/Bundle/ReportBundle/Resources/config/query_designer.yml b/src/Oro/Bundle/ReportBundle/Resources/config/query_designer.yml
index fab369f3daa..ebbde9b0357 100644
--- a/src/Oro/Bundle/ReportBundle/Resources/config/query_designer.yml
+++ b/src/Oro/Bundle/ReportBundle/Resources/config/query_designer.yml
@@ -19,3 +19,10 @@ query_designer:
- { name: Min, expr: MIN($column) }
- { name: Max, expr: MAX($column) }
query_type: [report]
+ date:
+ applicable: [{type: date}, {type: datetime}]
+ functions:
+ - { name: Count, expr: COUNT($column), return_type: integer }
+ - { name: Min, expr: MIN($column) }
+ - { name: Max, expr: MAX($column) }
+ query_type: [report]
diff --git a/src/Oro/Bundle/ReportBundle/Resources/config/services.yml b/src/Oro/Bundle/ReportBundle/Resources/config/services.yml
index e034476d3f4..0ea72443c82 100644
--- a/src/Oro/Bundle/ReportBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/ReportBundle/Resources/config/services.yml
@@ -4,6 +4,7 @@ parameters:
oro_report.listener.navigation_listener.class: Oro\Bundle\ReportBundle\EventListener\NavigationListener
oro_report.report_manager.class: Oro\Bundle\ReportBundle\Entity\Manager\ReportManager
oro_report.grid.base_configuration_builder.class: Oro\Bundle\ReportBundle\Grid\BaseReportConfigurationBuilder
+ oro_report.listener.segment_subscriber.class: Oro\Bundle\ReportBundle\EventListener\SegmentSubscriber
oro_report.grid.datagrid_configuration_builder.class: Oro\Bundle\ReportBundle\Grid\ReportDatagridConfigurationBuilder
services:
@@ -42,3 +43,8 @@ services:
oro_report.grid.datagrid_configuration_builder:
class: %oro_report.grid.datagrid_configuration_builder.class%
parent: oro_report.grid.base_configuration_builder
+
+ oro_report.listener.segment_subscriber:
+ class: %oro_report.listener.segment_subscriber.class%
+ tags:
+ - { name: kernel.event_subscriber }
diff --git a/src/Oro/Bundle/ReportBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/ReportBundle/Resources/translations/messages.en.yml
index 3dbc7513c2a..077c6487251 100644
--- a/src/Oro/Bundle/ReportBundle/Resources/translations/messages.en.yml
+++ b/src/Oro/Bundle/ReportBundle/Resources/translations/messages.en.yml
@@ -25,6 +25,16 @@ oro:
Max:
name: Max
hint: Maximum value
+ date:
+ Count:
+ name: Count
+ hint: Number of items
+ Min:
+ name: Min
+ hint: Minimum value
+ Max:
+ name: Max
+ hint: Maximum value
report:
menu:
diff --git a/src/Oro/Bundle/ReportBundle/Resources/views/Report/table/view.html.twig b/src/Oro/Bundle/ReportBundle/Resources/views/Report/table/view.html.twig
index 32880ffa91d..611f73a193c 100644
--- a/src/Oro/Bundle/ReportBundle/Resources/views/Report/table/view.html.twig
+++ b/src/Oro/Bundle/ReportBundle/Resources/views/Report/table/view.html.twig
@@ -40,8 +40,18 @@
{{ chartView.render()|raw }}
- {% set actionParameters = routeParameters is defined ? {
- routeParameters: routeParameters
- } : {} %}
- {% set buttonsHtml %}
- {% if defaultReplyButton is not defined or defaultReplyButton == 1 %}
- {{ Actions.replyButton(email, actionParameters) }}
- {{ Actions.replyAllButton(email, actionParameters) }}
- {% else %}
- {{ Actions.replyAllButton(email, actionParameters) }}
- {{ Actions.replyButton(email, actionParameters) }}
- {% endif %}
- {{ Actions.forwardButton(email, actionParameters ) }}
- {% endset %}
- {{ UI.pinnedDropdownButton({
- 'html': buttonsHtml
- }) }}
+ {% if isDesktopVersion() %}
+ {{ UI.pinnedDropdownButton({'html': buttonsHtml}) }}
+ {% endif %}
{% endblock content_data %}
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Email/js/groupedActivityItemTemplate.js.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Email/js/groupedActivityItemTemplate.js.twig
index b72dc3ac850..722748b6a72 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/Email/js/groupedActivityItemTemplate.js.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Email/js/groupedActivityItemTemplate.js.twig
@@ -43,7 +43,7 @@
{% set action %}
{% if resource_granted('oro_email_email_user_edit') %}
{{ 'oro.email.view'|trans|raw }}
+ {% endset %}
+ {% set actions = actions|merge([action]) %}
+
{{ parent() }}
{% endblock %}
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Form/fields.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Form/fields.html.twig
index 4e61a35f22a..6076910bd15 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/Form/fields.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Form/fields.html.twig
@@ -204,22 +204,6 @@
{% endblock %}
-{% block oro_email_email_folder_row %}
- {% if form.vars.value is not null and form.vars.value.outdatedAt is null %}
-
{% endmacro %}
+
+{% macro renderFolder(key, folder, namePrefix, maxDepth = 10) %}
+ {% if maxDepth %}
+
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/view.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/view.html.twig
index 539cb4998f6..6b88c64a84d 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/view.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/Email/Thread/view.html.twig
@@ -54,5 +54,12 @@
'contextsRendered': true
}) }}
+
- {{ form_widget(form.syncEnabled) }}
- {{ form_widget(form.fullName) }}
- {{ form_widget(form.name) }}
- {{ form_widget(form.type) }}
- {% if form.vars.value.subFolders|length > 0 %}
-
- {% endif %}
-{% endblock %}
-
{% block oro_email_email_folder_tree_row %}
{% if form.vars.value is not null and form.vars.value|length > 0 %}
{{ form_row(form) }}
@@ -230,10 +214,8 @@
@@ -354,3 +336,22 @@
{{ form_widget(form) }}
- {{ form_widget(form.subFolders) }}
-
- {% endif %}
-
+
+
+
+
+
+ {% if maxDepth > 1 and folder.subFolders|length > 0 %}
+
+ {% endif %}
+{% endmacro %}
diff --git a/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig b/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
index 38919a372aa..ce1c6bc932a 100644
--- a/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
+++ b/src/Oro/Bundle/EmailBundle/Resources/views/macros.html.twig
@@ -359,10 +359,10 @@
{%- placeholder email_actions with {email: email, entity: entity} -%}
{% endset -%}
{% set actions = actions|trim %}
-
- {{ _self.email_address_simple(email) }}
+
+ {{ _self.email_address_simple(email) }}
{% if actions is not empty -%}
- {{ actions|raw }}
+ {{ actions|raw }}
{%- endif %}
{% endif %}
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/Helper/EmailModelBuilderHelperTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/Helper/EmailModelBuilderHelperTest.php
index 0a066d5d4ab..9e80c7ffbf9 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/Helper/EmailModelBuilderHelperTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Builder/Helper/EmailModelBuilderHelperTest.php
@@ -95,6 +95,10 @@ protected function setUp()
$this->templating = $this->getMock('Symfony\Component\Templating\EngineInterface');
+ $mailboxManager = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Manager\MailboxManager')
+ ->disableOriginalConstructor()
+ ->getMock();
+
$this->helper = new EmailModelBuilderHelper(
$this->entityRoutingHelper,
$this->emailAddressHelper,
@@ -103,7 +107,8 @@ protected function setUp()
$this->emailAddressManager,
$this->entityManager,
$this->emailCacheManager,
- $this->templating
+ $this->templating,
+ $mailboxManager
);
}
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Datagrid/EmailQueryFactoryTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Datagrid/EmailQueryFactoryTest.php
index 75ca70423f3..e3124589bbc 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Datagrid/EmailQueryFactoryTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Datagrid/EmailQueryFactoryTest.php
@@ -2,11 +2,9 @@
namespace Oro\Bundle\EmailBundle\Tests\Unit\Datagrid;
-use Doctrine\Bundle\DoctrineBundle\Registry;
-
use Oro\Bundle\EmailBundle\Datagrid\EmailQueryFactory;
+use Oro\Bundle\EmailBundle\Entity\Manager\MailboxManager;
use Oro\Bundle\EmailBundle\Entity\Provider\EmailOwnerProviderStorage;
-use Oro\Bundle\EmailBundle\Entity\Repository\MailboxRepository;
use Oro\Bundle\EntityBundle\Provider\EntityNameResolver;
use Oro\Bundle\OrganizationBundle\Entity\Organization;
use Oro\Bundle\SecurityBundle\SecurityFacade;
@@ -28,14 +26,11 @@ class EmailQueryFactoryTest extends OrmTestCase
/** @var EmailQueryFactory */
protected $factory;
- /** @var Registry */
- protected $doctrine;
-
/** @var SecurityFacade */
protected $securityFacade;
- /** @var MailboxRepository */
- protected $mailboxRepository;
+ /** @var MailboxManager */
+ protected $mailboxManager;
public function setUp()
{
@@ -44,19 +39,10 @@ public function setUp()
$this->entityNameResolver = $this->getMockBuilder('Oro\Bundle\EntityBundle\Provider\EntityNameResolver')
->disableOriginalConstructor()->getMock();
- $this->mailboxRepository = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Repository\MailboxRepository')
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->doctrine = $this->getMockBuilder('Doctrine\Bundle\DoctrineBundle\Registry')
+ $this->mailboxManager = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Manager\MailboxManager')
->disableOriginalConstructor()
->getMock();
- $this->doctrine->expects($this->any())
- ->method('getRepository')
- ->with($this->equalTo('OroEmailBundle:Mailbox'))
- ->will($this->returnValue($this->mailboxRepository));
-
$this->securityFacade = $this->getMockBuilder('Oro\Bundle\SecurityBundle\SecurityFacade')
->disableOriginalConstructor()
->getMock();
@@ -64,7 +50,7 @@ public function setUp()
$this->factory = new EmailQueryFactory(
$this->providerStorage,
$this->entityNameResolver,
- $this->doctrine,
+ $this->mailboxManager,
$this->securityFacade
);
}
@@ -75,7 +61,7 @@ public function tearDown()
$this->factory,
$this->entityNameResolver,
$this->providerStorage,
- $this->mailboxRepository,
+ $this->mailboxManager,
$this->doctrine
);
}
@@ -141,7 +127,7 @@ public function testFilterQueryByUserIdWhenMailboxesAreFound()
->method('getOrganization')
->will($this->returnValue($organization));
- $this->mailboxRepository->expects($this->any())
+ $this->mailboxManager->expects($this->any())
->method('findAvailableMailboxIds')
->with($user, $organization)
->will($this->returnValue([1, 3, 5]));
@@ -174,7 +160,7 @@ public function testFilterQueryByUserIdWhenNoMailboxesFound()
->method('getOrganization')
->will($this->returnValue($organization));
- $this->mailboxRepository->expects($this->any())
+ $this->mailboxManager->expects($this->any())
->method('findAvailableMailboxIds')
->with($user, $organization)
->will($this->returnValue([1, 3, 5]));
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ActivityListPreQueryBuildListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ActivityListPreQueryBuildListenerTest.php
new file mode 100644
index 00000000000..8fa103b2ba1
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/ActivityListPreQueryBuildListenerTest.php
@@ -0,0 +1,103 @@
+doctrineHelper = $this->getMockBuilder('Oro\Bundle\EntityBundle\ORM\DoctrineHelper')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->listener = new ActivityListPreQueryBuildListener($this->doctrineHelper);
+ }
+
+ public function testPrepareIdsForEmailThreadEventSkippEntity()
+ {
+ $targetClass = 'testClass';
+ $targetId = 1;
+
+ $event = new ActivityListPreQueryBuildEvent($targetClass, $targetId);
+ $this->listener->prepareIdsForEmailThreadEvent($event);
+ $this->doctrineHelper->expects($this->never())
+ ->method('getEntity');
+ }
+
+ public function testPrepareIdsForEmailThreadWithoutThreadsEvent()
+ {
+ $targetClass = Email::ENTITY_CLASS;
+ $targetId = 1;
+
+ $email = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Email')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->doctrineHelper->expects($this->once())
+ ->method('getEntity')
+ ->willReturn($email);
+
+ $event = new ActivityListPreQueryBuildEvent($targetClass, $targetId);
+ $this->listener->prepareIdsForEmailThreadEvent($event);
+
+ $this->assertEquals([$targetId], $event->getTargetIds());
+ }
+
+ public function testPrepareIdsForEmailThreadWithThreadsEvent()
+ {
+ $targetClass = Email::ENTITY_CLASS;
+ $targetId = 1;
+ $expectedResult = [2, 3];
+
+ $email = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Email')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $thread = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\EmailThread')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $email1 = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Email')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $email2 = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Email')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->doctrineHelper->expects($this->once())
+ ->method('getEntity')
+ ->willReturn($email);
+
+ $email->expects($this->exactly(2))
+ ->method('getThread')
+ ->willReturn($thread);
+
+ $email1->expects($this->once())
+ ->method('getId')
+ ->willReturn(2);
+ $email2->expects($this->once())
+ ->method('getId')
+ ->willReturn(3);
+
+ $thread->expects($this->once())
+ ->method('getEmails')
+ ->willReturn(new ArrayCollection([$email1, $email2]));
+
+ $event = new ActivityListPreQueryBuildEvent($targetClass, $targetId);
+ $this->listener->prepareIdsForEmailThreadEvent($event);
+
+ $this->assertEquals($expectedResult, $event->getTargetIds());
+ }
+}
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareContextTitleListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareContextTitleListenerTest.php
new file mode 100644
index 00000000000..16011144c7b
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareContextTitleListenerTest.php
@@ -0,0 +1,78 @@
+router = $this->getMockBuilder('Symfony\Component\Routing\Router')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->doctrineHelper = $this->getMockBuilder('Oro\Bundle\EntityBundle\ORM\DoctrineHelper')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->listener = new PrepareContextTitleListener($this->router, $this->doctrineHelper);
+ }
+
+ public function testPrepareContextTitleEventSkippEntity()
+ {
+ $item = [];
+ $item['title'] = 'title';
+ $targetClass = 'test';
+ $expectedItem = ['title' => 'title'];
+
+ $event = new PrepareContextTitleEvent($item, $targetClass);
+ $this->listener->prepareEmailContextTitleEvent($event);
+
+ $this->assertEquals($expectedItem, $event->getItem());
+ }
+
+ public function testPrepareContextTitleDataEvent()
+ {
+ $item = [];
+ $item['title'] = 'title';
+ $item['targetId'] = 1;
+ $targetClass = Email::ENTITY_CLASS;
+ $expectedItem = ['title' => 'new title', 'link' => 'link', 'targetId' => 1];
+
+ $entity = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Email')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->doctrineHelper->expects($this->once())
+ ->method('getEntity')
+ ->willReturn($entity);
+
+ $this->router->expects($this->once())
+ ->method('generate')
+ ->willReturn('link');
+
+ $entity->expects($this->once())
+ ->method('getSubject')
+ ->willReturn('new title');
+
+ $event = new PrepareContextTitleEvent($item, $targetClass);
+ $this->listener->prepareEmailContextTitleEvent($event);
+
+ $this->assertEquals($expectedItem, $event->getItem());
+ }
+}
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php
new file mode 100644
index 00000000000..854a84d9cd6
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/PrepareResultItemListenerTest.php
@@ -0,0 +1,72 @@
+router = $this->getMockBuilder('Symfony\Component\Routing\Router')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->item = $this->getMockBuilder('Oro\Bundle\SearchBundle\Query\Result\Item')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->listener = new PrepareResultItemListener($this->router);
+ }
+
+ public function testPrepareEmailItemDataEventSkippEntity()
+ {
+ $this->item->expects($this->once())
+ ->method('getEntityName')
+ ->willReturn('test');
+ $this->item->expects($this->never())
+ ->method('getEntity');
+
+ $event = new PrepareResultItemEvent($this->item);
+ $this->listener->prepareEmailItemDataEvent($event);
+ }
+
+ public function testPrepareEmailItemDataEvent()
+ {
+ $entity = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\EmailUser')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $email = $this->getMockBuilder('Oro\Bundle\EmailBundle\Entity\Email')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $this->item->expects($this->once())
+ ->method('getEntityName')
+ ->willReturn(EmailUser::ENTITY_CLASS);
+ $this->item->expects($this->once())
+ ->method('getEntity')
+ ->willReturn($entity);
+ $entity->expects($this->once())
+ ->method('getEmail')
+ ->willReturn($email);
+ $email->expects($this->once())
+ ->method('getId');
+
+ $event = new PrepareResultItemEvent($this->item);
+ $this->listener->prepareEmailItemDataEvent($event);
+ }
+}
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/SearchAliasesListenerTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/SearchAliasesListenerTest.php
new file mode 100644
index 00000000000..5587fa58bbc
--- /dev/null
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/EventListener/SearchAliasesListenerTest.php
@@ -0,0 +1,38 @@
+listener = new SearchAliasesListener();
+ }
+
+ public function testAddEmailAliasEventSkipped()
+ {
+ $expectedAliases = [];
+ $targetClasses = [];
+ $aliases = [];
+ $event = new SearchAliasesEvent($aliases, $targetClasses);
+ $this->listener->addEmailAliasEvent($event);
+ $this->assertEquals($expectedAliases, $event->getAliases());
+ }
+
+ public function testAddEmailAliasEvent()
+ {
+ $expectedAliases = ['oro_email'];
+ $targetClasses = [Email::ENTITY_CLASS];
+ $aliases = [];
+ $event = new SearchAliasesEvent($aliases, $targetClasses);
+ $this->listener->addEmailAliasEvent($event);
+ $this->assertEquals($expectedAliases, $event->getAliases());
+ }
+}
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTreeTypeTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTreeTypeTest.php
index 3198b80f534..072e537e7e0 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTreeTypeTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTreeTypeTest.php
@@ -32,8 +32,7 @@ public function testSetDefaultOptions()
$resolver->expects($this->at(0))
->method('setDefaults')
->with([
- 'type' => 'oro_email_email_folder',
- 'allow_add' => true,
+ 'allow_extra_fields' => true
]);
$this->emailFolderTreeType->setDefaultOptions($resolver);
@@ -41,7 +40,7 @@ public function testSetDefaultOptions()
public function testGetParent()
{
- $this->assertEquals('collection', $this->emailFolderTreeType->getParent());
+ $this->assertEquals('form', $this->emailFolderTreeType->getParent());
}
public function testGetName()
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTypeTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTypeTest.php
deleted file mode 100644
index 58a05d49118..00000000000
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailFolderTypeTest.php
+++ /dev/null
@@ -1,86 +0,0 @@
-emailFolderType = new EmailFolderType();
-
- parent::setUp();
- }
-
- public function testSetDefaultOptions()
- {
- $resolver = $this->getMockBuilder('Symfony\Component\OptionsResolver\OptionsResolver')
- ->disableOriginalConstructor()
- ->getMock();
-
- $resolver->expects($this->at(0))
- ->method('setDefaults')
- ->with([
- 'data_class' => 'Oro\Bundle\EmailBundle\Entity\EmailFolder',
- 'nesting_level' => 10,
- ]);
-
- $this->emailFolderType->setDefaultOptions($resolver);
- }
-
- public function testBuildForm()
- {
- $builder = $this->getMockBuilder('Symfony\Component\Form\FormBuilder')
- ->disableOriginalConstructor()
- ->getMock();
-
- $builder->expects($this->at(0))
- ->method('add')
- ->with('syncEnabled', 'checkbox')
- ->willReturn($builder);
-
- $builder->expects($this->at(1))
- ->method('add')
- ->with('fullName', 'hidden')
- ->willReturn($builder);
-
- $builder->expects($this->at(2))
- ->method('add')
- ->with('name', 'hidden')
- ->willReturn($builder);
-
- $builder->expects($this->at(3))
- ->method('add')
- ->with('type', 'hidden')
- ->willReturn($builder);
-
- $builder->expects($this->at(4))
- ->method('add')
- ->with('subFolders', 'collection', [
- 'type' => 'oro_email_email_folder',
- 'allow_add' => true,
- 'options' => [
- 'nesting_level' => 4,
- ],
- ])
- ->willReturn($builder);
-
- $this->emailFolderType->buildForm($builder, ['nesting_level' => 5]);
- }
-
- public function testGetName()
- {
- $this->assertEquals('oro_email_email_folder', $this->emailFolderType->getName());
- }
-}
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTypeTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTypeTest.php
index 57de375c929..d1d7312c9fc 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTypeTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Form/Type/EmailTypeTest.php
@@ -156,7 +156,17 @@ protected function getExtensions()
$this->getMockBuilder('Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface')
->disableOriginalConstructor()
->getMock();
- $contextsSelectType = new ContextsSelectType($em, $configManager, $translator, $mapper, $securityTokenStorage);
+ $eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcher')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $contextsSelectType = new ContextsSelectType(
+ $em,
+ $configManager,
+ $translator,
+ $mapper,
+ $securityTokenStorage,
+ $eventDispatcher
+ );
return [
new PreloadedExtension(
diff --git a/src/Oro/Bundle/EmailBundle/Tests/Unit/Provider/EmailActivityListProviderTest.php b/src/Oro/Bundle/EmailBundle/Tests/Unit/Provider/EmailActivityListProviderTest.php
index 00ed47953f5..07a03c39c92 100644
--- a/src/Oro/Bundle/EmailBundle/Tests/Unit/Provider/EmailActivityListProviderTest.php
+++ b/src/Oro/Bundle/EmailBundle/Tests/Unit/Provider/EmailActivityListProviderTest.php
@@ -27,7 +27,7 @@ class EmailActivityListProviderTest extends \PHPUnit_Framework_TestCase
protected $doctrineRegistryLink;
/** @var \PHPUnit_Framework_MockObject_MockObject */
- protected $mailboxProcessStorage;
+ protected $mailboxProcessStorageLink;
protected function setUp()
{
@@ -65,8 +65,8 @@ protected function setUp()
->disableOriginalConstructor()
->getMock();
- $this->mailboxProcessStorage = $this->getMockBuilder(
- 'Oro\Bundle\EmailBundle\Mailbox\MailboxProcessStorage'
+ $this->mailboxProcessStorageLink = $this->getMockBuilder(
+ 'Oro\Bundle\EntityConfigBundle\DependencyInjection\Utils\ServiceLink'
)
->disableOriginalConstructor()
->getMock();
@@ -80,7 +80,7 @@ protected function setUp()
$emailThreadProvider,
$htmlTagHelper,
$this->securityFacadeLink,
- $this->mailboxProcessStorage
+ $this->mailboxProcessStorageLink
);
$this->emailActivityListProvider->setSecurityContextLink($this->securityContextLink);
}
diff --git a/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/datagrid.yml
index 4f82b651f62..e4cd22fddd1 100644
--- a/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/datagrid.yml
@@ -1,7 +1,7 @@
datagrid:
embedded-forms-grid:
+ acl_resource: oro_embedded_form_view
source:
- acl_resource: oro_embedded_form_view
type: orm
query:
select:
diff --git a/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/oro/layout.yml b/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/oro/layout.yml
deleted file mode 100644
index fc3c643e37b..00000000000
--- a/src/Oro/Bundle/EmbeddedFormBundle/Resources/config/oro/layout.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-oro_layout:
- themes:
- embedded_default:
- label: Default theme for embedded forms
- groups: [ embedded_forms ]
diff --git a/src/Oro/Bundle/EmbeddedFormBundle/Resources/views/layouts/embedded_default/theme.yml b/src/Oro/Bundle/EmbeddedFormBundle/Resources/views/layouts/embedded_default/theme.yml
new file mode 100644
index 00000000000..0824e79e6a4
--- /dev/null
+++ b/src/Oro/Bundle/EmbeddedFormBundle/Resources/views/layouts/embedded_default/theme.yml
@@ -0,0 +1,2 @@
+label: Default theme for embedded forms
+groups: [ embedded_forms ]
diff --git a/src/Oro/Bundle/EntityBundle/ORM/EntityAliasResolver.php b/src/Oro/Bundle/EntityBundle/ORM/EntityAliasResolver.php
index d347ca6f0dc..0632367695a 100644
--- a/src/Oro/Bundle/EntityBundle/ORM/EntityAliasResolver.php
+++ b/src/Oro/Bundle/EntityBundle/ORM/EntityAliasResolver.php
@@ -3,7 +3,6 @@
namespace Oro\Bundle\EntityBundle\ORM;
use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\ORM\Mapping\ClassMetadata;
use Symfony\Component\HttpKernel\CacheWarmer\WarmableInterface;
@@ -11,6 +10,7 @@
use Oro\Bundle\EntityBundle\Exception\RuntimeException;
use Oro\Bundle\EntityBundle\Model\EntityAlias;
use Oro\Bundle\EntityBundle\Provider\EntityAliasProviderInterface;
+use Oro\Bundle\EntityBundle\Tools\SafeDatabaseChecker;
class EntityAliasResolver implements WarmableInterface
{
@@ -306,8 +306,7 @@ protected function ensureAllAliasesLoaded()
return;
}
- /** @var ClassMetadata[] $allMetadata */
- $allMetadata = $this->doctrine->getManager()->getMetadataFactory()->getAllMetadata();
+ $allMetadata = SafeDatabaseChecker::getAllMetadata($this->doctrine->getManager());
foreach ($allMetadata as $metadata) {
if (!$metadata->isMappedSuperclass && !isset($this->aliases[$metadata->name])) {
$this->findEntityAlias($metadata->name);
diff --git a/src/Oro/Bundle/EntityBundle/Provider/AbstractChainProvider.php b/src/Oro/Bundle/EntityBundle/Provider/AbstractChainProvider.php
index 49b7de6d41a..bc2589cd307 100644
--- a/src/Oro/Bundle/EntityBundle/Provider/AbstractChainProvider.php
+++ b/src/Oro/Bundle/EntityBundle/Provider/AbstractChainProvider.php
@@ -36,11 +36,9 @@ protected function getProviders()
if (null === $this->sorted) {
ksort($this->providers);
- if (empty($this->providers)) {
- $this->sorted = [];
- } else {
- $this->sorted = call_user_func_array('array_merge', $this->providers);
- }
+ $this->sorted = $this->providers
+ ? call_user_func_array('array_merge', $this->providers)
+ : [];
}
return $this->sorted;
diff --git a/src/Oro/Bundle/EntityBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/EntityBundle/Resources/config/datagrid.yml
index 2006ed432bf..b56c95230f5 100644
--- a/src/Oro/Bundle/EntityBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/EntityBundle/Resources/config/datagrid.yml
@@ -1,12 +1,12 @@
datagrid:
custom-entity-grid:
+ acl_resource: ~
options:
base_datagrid_class: Oro\Bundle\EntityBundle\Grid\CustomEntityDatagrid
entityHint: entity
export: true
entity_pagination: true
source:
- acl_resource: ~
type: orm
query:
select:
@@ -61,6 +61,7 @@ datagrid:
columns: []
entity-relation-grid:
+ acl_resource: ~
options:
entityHint: entity
routerEnabled: false
@@ -71,7 +72,6 @@ datagrid:
included: '#appendRelation'
excluded: '#removeRelation'
source:
- acl_resource: ~
type: orm
columns:
assigned:
diff --git a/src/Oro/Bundle/EntityBundle/Resources/config/services.yml b/src/Oro/Bundle/EntityBundle/Resources/config/services.yml
index e26a53fde66..aa6ea58cc6f 100644
--- a/src/Oro/Bundle/EntityBundle/Resources/config/services.yml
+++ b/src/Oro/Bundle/EntityBundle/Resources/config/services.yml
@@ -30,7 +30,6 @@ parameters:
oro_entity.listener.orm.generated_value_strategy_listener.class: Oro\Bundle\EntityBundle\EventListener\ORM\GeneratedValueStrategyListener
oro_entity.migration.extension.change_type.class: Oro\Bundle\EntityBundle\Migrations\Extension\ChangeTypeExtension
- oro_entity.entity_context_provider.class: Oro\Bundle\EntityBundle\Provider\EntityContextProvider
oro_entity.entity_alias_resolver.class: Oro\Bundle\EntityBundle\ORM\EntityAliasResolver
oro_entity.entity_alias_config_bag.class: Oro\Bundle\EntityBundle\Provider\EntityAliasConfigBag
oro_entity.entity_alias_provider.class: Oro\Bundle\EntityBundle\Provider\EntityAliasProvider
@@ -260,13 +259,6 @@ services:
tags:
- { name: oro_migration.extension, extension_name: change_type }
- oro_entity.entity_context_provider:
- class: %oro_entity.entity_context_provider.class%
- arguments:
- - @oro_entity.routing_helper
- - @oro_entity.entity_provider
- - @oro_entity_config.provider.entity
-
oro_entity.entity_alias.cache.warmer:
class: Oro\Bundle\EntityBundle\Cache\EntityAliasCacheWarmer
arguments:
diff --git a/src/Oro/Bundle/EntityBundle/Resources/doc/entity_context.md b/src/Oro/Bundle/EntityBundle/Resources/doc/entity_context.md
deleted file mode 100644
index 51d4bd5a827..00000000000
--- a/src/Oro/Bundle/EntityBundle/Resources/doc/entity_context.md
+++ /dev/null
@@ -1,7 +0,0 @@
-## Context ##
-
-**Adding context entity to email**
-
-If you want add new context entity class name to email context dialog you need add
-"context-grid"="..." option to entity class @config (See CaseEntity.php, for example)
-and add datagrid with same name. (See cases-for-context-grid grid in CaseBundle)
diff --git a/src/Oro/Bundle/EntityBundle/Resources/public/js/components/select2-entity-field-choice-component.js b/src/Oro/Bundle/EntityBundle/Resources/public/js/components/select2-entity-field-choice-component.js
index c2db68fe60b..160303cc003 100644
--- a/src/Oro/Bundle/EntityBundle/Resources/public/js/components/select2-entity-field-choice-component.js
+++ b/src/Oro/Bundle/EntityBundle/Resources/public/js/components/select2-entity-field-choice-component.js
@@ -1,15 +1,16 @@
define(function(require) {
'use strict';
- var Select2EntityFieldChoiseComponent;
+ var Select2EntityFieldChoiceComponent;
var EntityFieldUtil = require('oroentity/js/entity-field-choice-util');
var Select2EntityFieldComponent = require('oro/select2-entity-field-component');
- Select2EntityFieldChoiseComponent = Select2EntityFieldComponent.extend({
+ Select2EntityFieldChoiceComponent = Select2EntityFieldComponent.extend({
initialize: function(options) {
this.util = new EntityFieldUtil(options._sourceElement);
- Select2EntityFieldChoiseComponent.__super__.initialize.call(this, options);
+ Select2EntityFieldChoiceComponent.__super__.initialize.call(this, options);
}
});
- return Select2EntityFieldChoiseComponent;
+
+ return Select2EntityFieldChoiceComponent;
});
diff --git a/src/Oro/Bundle/EntityBundle/Tests/Unit/ORM/DoctrineHelperTest.php b/src/Oro/Bundle/EntityBundle/Tests/Unit/ORM/DoctrineHelperTest.php
index 5564d464b1d..f970eb842ce 100644
--- a/src/Oro/Bundle/EntityBundle/Tests/Unit/ORM/DoctrineHelperTest.php
+++ b/src/Oro/Bundle/EntityBundle/Tests/Unit/ORM/DoctrineHelperTest.php
@@ -13,6 +13,7 @@
* @SuppressWarnings(PHPMD.TooManyMethods)
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
* @SuppressWarnings(PHPMD.ExcessivePublicCount)
+ * @SuppressWarnings(PHPMD.ExcessiveClassLength)
*/
class DoctrineHelperTest extends \PHPUnit_Framework_TestCase
{
diff --git a/src/Oro/Bundle/EntityBundle/Tests/Unit/Tools/SafeDatabaseCheckerTest.php b/src/Oro/Bundle/EntityBundle/Tests/Unit/Tools/SafeDatabaseCheckerTest.php
new file mode 100644
index 00000000000..4134db8d3af
--- /dev/null
+++ b/src/Oro/Bundle/EntityBundle/Tests/Unit/Tools/SafeDatabaseCheckerTest.php
@@ -0,0 +1,301 @@
+getMockBuilder('Doctrine\DBAL\Connection')
+ ->disableOriginalConstructor()
+ ->getMock();
+ $schemaManager = $this->getMockBuilder('Doctrine\DBAL\Schema\AbstractSchemaManager')
+ ->disableOriginalConstructor()
+ ->setMethods(['tablesExist'])
+ ->getMockForAbstractClass();
+
+ $connection->expects($this->once())
+ ->method('connect');
+ $connection
+ ->expects($this->once())
+ ->method('getSchemaManager')
+ ->willReturn($schemaManager);
+ $schemaManager
+ ->expects($this->once())
+ ->method('tablesExist')
+ ->with($tables)
+ ->willReturn($tablesExistResult);
+
+ $this->assertSame(
+ $expectedResult,
+ SafeDatabaseChecker::tablesExist($connection, $tables)
+ );
+ }
+
+ public function tablesExistProvider()
+ {
+ return [
+ ['table1'],
+ [['table1']],
+ [['table1', 'table2']],
+ ['table1', false, false],
+ ];
+ }
+
+ /**
+ * @dataProvider tablesExistWithEmptyTablesParamProvider
+ */
+ public function testTablesExistWithEmptyTablesParam($tables)
+ {
+ $connection = $this->getMockBuilder('Doctrine\DBAL\Connection')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $connection->expects($this->never())
+ ->method('connect');
+
+ $this->assertFalse(
+ SafeDatabaseChecker::tablesExist($connection, $tables)
+ );
+ }
+
+ public function tablesExistWithEmptyTablesParamProvider()
+ {
+ return [
+ [null],
+ [''],
+ [[]],
+ ];
+ }
+
+ /**
+ * @dataProvider expectedExceptionsForTablesExist
+ */
+ public function testTablesExistShouldHandleExpectedExceptions($exception)
+ {
+ $connection = $this->getMockBuilder('Doctrine\DBAL\Connection')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $connection->expects($this->once())
+ ->method('connect')
+ ->willThrowException($exception);
+
+ $this->assertFalse(
+ SafeDatabaseChecker::tablesExist($connection, 'table')
+ );
+ }
+
+ public function expectedExceptionsForTablesExist()
+ {
+ return [
+ [new \PDOException()],
+ [new DBALException()],
+ ];
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage unexpected
+ */
+ public function testTablesExistShouldRethrowUnexpectedException()
+ {
+ $connection = $this->getMockBuilder('Doctrine\DBAL\Connection')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $connection->expects($this->once())
+ ->method('connect')
+ ->willThrowException(new \Exception('unexpected'));
+
+ SafeDatabaseChecker::tablesExist($connection, 'table');
+ }
+
+ public function testGetTableName()
+ {
+ $doctrine = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+ $em = $this->getMock('Doctrine\ORM\EntityManagerInterface');
+ $classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $entityName = 'Test\Entity';
+ $tableName = 'test_table';
+
+ $doctrine->expects($this->any())
+ ->method('getManagerForClass')
+ ->with($entityName)
+ ->willReturn($em);
+ $em->expects($this->once())
+ ->method('getClassMetadata')
+ ->with($entityName)
+ ->willReturn($classMetadata);
+ $classMetadata->expects($this->once())
+ ->method('getTableName')
+ ->willReturn($tableName);
+
+ $this->assertEquals(
+ $tableName,
+ SafeDatabaseChecker::getTableName($doctrine, $entityName)
+ );
+ }
+
+ public function testGetTableNameForNotOrmEntity()
+ {
+ $doctrine = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+ $om = $this->getMock('Doctrine\Common\Persistence\ObjectManager');
+
+ $entityName = 'Test\Entity';
+
+ $doctrine->expects($this->any())
+ ->method('getManagerForClass')
+ ->with($entityName)
+ ->willReturn($om);
+ $om->expects($this->never())
+ ->method('getClassMetadata');
+
+ $this->assertNull(
+ SafeDatabaseChecker::getTableName($doctrine, $entityName)
+ );
+ }
+
+ /**
+ * @dataProvider getTableNameWithEmptyEntityNameParamProvider
+ */
+ public function testGetTableNameWithEmptyEntityNameParam($entityName)
+ {
+ $doctrine = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+
+ $doctrine->expects($this->never())
+ ->method('getManagerForClass');
+
+ $this->assertNull(
+ SafeDatabaseChecker::getTableName($doctrine, $entityName)
+ );
+ }
+
+ public function getTableNameWithEmptyEntityNameParamProvider()
+ {
+ return [
+ [null],
+ [''],
+ ];
+ }
+
+ /**
+ * @dataProvider expectedExceptionsForGetTableName
+ */
+ public function testGetTableNameShouldHandleExpectedExceptions($exception)
+ {
+ $doctrine = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+
+ $doctrine->expects($this->once())
+ ->method('getManagerForClass')
+ ->willThrowException($exception);
+
+ $this->assertNull(
+ SafeDatabaseChecker::getTableName($doctrine, 'Test\Entity')
+ );
+ }
+
+ public function expectedExceptionsForGetTableName()
+ {
+ return [
+ [new \PDOException()],
+ [new DBALException()],
+ [new ORMException()],
+ [new \ReflectionException()],
+ ];
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage unexpected
+ */
+ public function testGetTableNameShouldRethrowUnexpectedException()
+ {
+ $doctrine = $this->getMock('Doctrine\Common\Persistence\ManagerRegistry');
+
+ $doctrine->expects($this->once())
+ ->method('getManagerForClass')
+ ->willThrowException(new \Exception('unexpected'));
+
+ SafeDatabaseChecker::getTableName($doctrine, 'Test\Entity');
+ }
+
+ public function testGetAllMetadata()
+ {
+ $em = $this->getMock('Doctrine\ORM\EntityManagerInterface');
+ $metadataFactory = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadataFactory')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $classMetadata = $this->getMockBuilder('Doctrine\ORM\Mapping\ClassMetadata')
+ ->disableOriginalConstructor()
+ ->getMock();
+
+ $allMetadata = [$classMetadata];
+
+ $em->expects($this->once())
+ ->method('getMetadataFactory')
+ ->willReturn($metadataFactory);
+ $metadataFactory->expects($this->once())
+ ->method('getAllMetadata')
+ ->willReturn($allMetadata);
+
+ $this->assertSame(
+ $allMetadata,
+ SafeDatabaseChecker::getAllMetadata($em)
+ );
+ }
+
+ /**
+ * @dataProvider expectedExceptionsForGetAllMetadata
+ */
+ public function testGetAllMetadataShouldHandleExpectedExceptions($exception)
+ {
+ $em = $this->getMock('Doctrine\ORM\EntityManagerInterface');
+
+ $em->expects($this->once())
+ ->method('getMetadataFactory')
+ ->willThrowException($exception);
+
+ $this->assertSame(
+ [],
+ SafeDatabaseChecker::getAllMetadata($em)
+ );
+ }
+
+ public function expectedExceptionsForGetAllMetadata()
+ {
+ return [
+ [new \PDOException()],
+ [new DBALException()],
+ [new ORMException()],
+ [new \ReflectionException()],
+ ];
+ }
+
+ /**
+ * @expectedException \Exception
+ * @expectedExceptionMessage unexpected
+ */
+ public function testGetAllMetadataShouldRethrowUnexpectedException()
+ {
+ $em = $this->getMock('Doctrine\ORM\EntityManagerInterface');
+
+ $em->expects($this->once())
+ ->method('getMetadataFactory')
+ ->willThrowException(new \Exception('unexpected'));
+
+ SafeDatabaseChecker::getAllMetadata($em);
+ }
+}
diff --git a/src/Oro/Bundle/EntityBundle/Tools/SafeDatabaseChecker.php b/src/Oro/Bundle/EntityBundle/Tools/SafeDatabaseChecker.php
new file mode 100644
index 00000000000..eb0d592757e
--- /dev/null
+++ b/src/Oro/Bundle/EntityBundle/Tools/SafeDatabaseChecker.php
@@ -0,0 +1,90 @@
+connect();
+ $result = $connection->getSchemaManager()->tablesExist($tables);
+ } catch (\PDOException $e) {
+ } catch (DBALException $e) {
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Returns the table name for a given entity.
+ *
+ * @param ManagerRegistry $doctrine
+ * @param string $entityName
+ *
+ * @return string|null the table name or NULL if it cannot be determined
+ */
+ public static function getTableName(ManagerRegistry $doctrine, $entityName)
+ {
+ $result = null;
+
+ if (!empty($entityName)) {
+ try {
+ $em = $doctrine->getManagerForClass($entityName);
+ if ($em instanceof EntityManagerInterface) {
+ $result = $em->getClassMetadata($entityName)->getTableName();
+ }
+ } catch (\PDOException $e) {
+ } catch (DBALException $e) {
+ } catch (ORMException $e) {
+ } catch (\ReflectionException $e) {
+ }
+ }
+
+ return $result;
+ }
+
+ /**
+ * Returns metadata of all entities registered in a given entity manager.
+ *
+ * @param EntityManagerInterface $em
+ *
+ * @return ClassMetadata[]
+ */
+ public static function getAllMetadata(EntityManagerInterface $em)
+ {
+ $allMetadata = [];
+ try {
+ $allMetadata = $em->getMetadataFactory()->getAllMetadata();
+ } catch (\PDOException $e) {
+ } catch (DBALException $e) {
+ } catch (ORMException $e) {
+ } catch (\ReflectionException $e) {
+ }
+
+ return $allMetadata;
+ }
+}
diff --git a/src/Oro/Bundle/EntityConfigBundle/Config/ConfigModelManager.php b/src/Oro/Bundle/EntityConfigBundle/Config/ConfigModelManager.php
index fee0913f2e7..c1890e155e7 100644
--- a/src/Oro/Bundle/EntityConfigBundle/Config/ConfigModelManager.php
+++ b/src/Oro/Bundle/EntityConfigBundle/Config/ConfigModelManager.php
@@ -6,6 +6,7 @@
use Doctrine\ORM\UnitOfWork;
use Oro\Component\DependencyInjection\ServiceLink;
+use Oro\Bundle\EntityBundle\Tools\SafeDatabaseChecker;
use Oro\Bundle\EntityConfigBundle\Entity\ConfigModel;
use Oro\Bundle\EntityConfigBundle\Entity\EntityConfigModel;
use Oro\Bundle\EntityConfigBundle\Entity\FieldConfigModel;
@@ -80,13 +81,10 @@ public function checkDatabase()
return true;
}
- $this->dbCheck = false;
- try {
- $conn = $this->getEntityManager()->getConnection();
- $conn->connect();
- $this->dbCheck = $conn->getSchemaManager()->tablesExist($this->requiredTables);
- } catch (\PDOException $e) {
- }
+ $this->dbCheck = SafeDatabaseChecker::tablesExist(
+ $this->getEntityManager()->getConnection(),
+ $this->requiredTables
+ );
return $this->dbCheck;
}
diff --git a/src/Oro/Bundle/EntityConfigBundle/Resources/config/datagrid.yml b/src/Oro/Bundle/EntityConfigBundle/Resources/config/datagrid.yml
index 9a7a2fa89d7..c23a3d59b07 100644
--- a/src/Oro/Bundle/EntityConfigBundle/Resources/config/datagrid.yml
+++ b/src/Oro/Bundle/EntityConfigBundle/Resources/config/datagrid.yml
@@ -6,8 +6,8 @@ datagrid:
toolbarOptions:
pageSize:
default_per_page: 100
+ acl_resource: oro_entityconfig_manage
source:
- acl_resource: oro_entityconfig_manage
type: orm
query:
select:
@@ -69,9 +69,9 @@ datagrid:
toolbarOptions:
pageSize:
default_per_page: 50
+ # TODO: check oro_entityconfig_view acl (403) right now
+ acl_resource: oro_entityconfig_manage
source:
- # TODO: check oro_entityconfig_view acl (403) right now
- acl_resource: oro_entityconfig_manage
type: orm
query:
select:
@@ -126,8 +126,8 @@ datagrid:
entity-audit-grid:
options:
entityHint: history
+ acl_resource: oro_entityconfig_manage
source:
- acl_resource: oro_entityconfig_manage
type: orm
query:
select:
diff --git a/src/Oro/Bundle/EntityExtendBundle/Entity/Manager/AssociationManager.php b/src/Oro/Bundle/EntityExtendBundle/Entity/Manager/AssociationManager.php
index edce9cfe967..a5a28baacd9 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Entity/Manager/AssociationManager.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Entity/Manager/AssociationManager.php
@@ -180,6 +180,8 @@ public function getMultiOwnerFilter($scope, $attribute)
* function (QueryBuilder $qb, $targetEntityClass)
*
* @return SqlQueryBuilder
+ *
+ * @SuppressWarnings(PHPMD.NPathComplexity)
*/
public function getMultiAssociationsQueryBuilder(
$associationOwnerClass,
@@ -198,6 +200,11 @@ public function getMultiAssociationsQueryBuilder(
$subQueries = [];
foreach ($associationTargets as $entityClass => $fieldName) {
$nameExpr = $this->entityNameResolver->getNameDQL($entityClass, 'target');
+ // Need to forcibly convert expression to string when the title is different type.
+ // Example of error: "UNION types text and integer cannot be matched".
+ if ($nameExpr) {
+ $nameExpr = sprintf('CONCAT(%s,\'\')', $nameExpr);
+ }
$subQb = $em->getRepository($associationOwnerClass)->createQueryBuilder('e')
->select(
sprintf(
diff --git a/src/Oro/Bundle/EntityExtendBundle/Form/Type/AbstractAssociationType.php b/src/Oro/Bundle/EntityExtendBundle/Form/Type/AbstractAssociationType.php
index bddcd0c57c0..9d6d7ca8c9c 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Form/Type/AbstractAssociationType.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Form/Type/AbstractAssociationType.php
@@ -54,14 +54,11 @@ protected function isReadOnly($options)
$configId = $options['config_id'];
$className = $configId->getClassName();
- if (!empty($className)) {
- if ($this->typeHelper->isAssociationOwningSideEntity($className, $options['association_class'])) {
+ if (!empty($className)
+ && $this->typeHelper->isDictionary($className)
+ && !$this->typeHelper->isSupportActivityEnabled($className)
+ ) {
return true;
- }
- if ($this->typeHelper->isDictionary($className)
- && !$this->typeHelper->isSupportActivityEnabled($className)) {
- return true;
- }
}
return parent::isReadOnly($options);
diff --git a/src/Oro/Bundle/EntityExtendBundle/Form/Type/DictionaryFilterType.php b/src/Oro/Bundle/EntityExtendBundle/Form/Type/DictionaryFilterType.php
index fe73b686f96..fb8057e8786 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Form/Type/DictionaryFilterType.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Form/Type/DictionaryFilterType.php
@@ -10,7 +10,6 @@
use Oro\Bundle\EntityExtendBundle\Provider\EnumValueProvider;
use Oro\Bundle\EntityExtendBundle\Entity\AbstractEnumValue;
use Oro\Bundle\EntityExtendBundle\Tools\ExtendHelper;
-use Oro\Bundle\EntityExtendBundle\Form\Type\AbstractMultiChoiceType;
use Oro\Bundle\FilterBundle\Form\Type\Filter\ChoiceFilterType;
@@ -59,7 +58,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
if (empty($options['dictionary_code'])) {
throw new InvalidOptionsException(
- 'Either "class" or "dictionary_code" must option must be set.'
+ 'Either "class" or "dictionary_code" option must be set.'
);
}
diff --git a/src/Oro/Bundle/EntityExtendBundle/Form/Util/AssociationTypeHelper.php b/src/Oro/Bundle/EntityExtendBundle/Form/Util/AssociationTypeHelper.php
index 2370bc52fef..1972fb68963 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Form/Util/AssociationTypeHelper.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Form/Util/AssociationTypeHelper.php
@@ -68,34 +68,6 @@ public function isSupportActivityEnabled($className)
return false;
}
- /**
- * Checks if the given entity is an owning side of association
- *
- * @param string $className
- * @param string $associationClass Represents the owning side entity, can be:
- * - full class name or entity name for single association
- * - a group name for multiple association
- * it is supposed that the group name should not contain \ and : characters
- *
- * @return bool
- */
- public function isAssociationOwningSideEntity($className, $associationClass)
- {
- if (strpos($associationClass, ':') !== false || strpos($associationClass, '\\') !== false) {
- // the association class is full class name or entity name
- if ($className === $this->entityClassResolver->getEntityClass($associationClass)) {
- return true;
- }
- } else {
- // the association class is a group name
- if (!empty($className) && in_array($className, $this->getOwningSideEntities($associationClass))) {
- return true;
- };
- }
-
- return false;
- }
-
/**
* Returns all entities included in the given group
*
diff --git a/src/Oro/Bundle/EntityExtendBundle/Grid/AbstractFieldsExtension.php b/src/Oro/Bundle/EntityExtendBundle/Grid/AbstractFieldsExtension.php
index d53ddf34a7a..070ccca45db 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Grid/AbstractFieldsExtension.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Grid/AbstractFieldsExtension.php
@@ -5,7 +5,6 @@
use Doctrine\ORM\Query\Expr\From;
use Doctrine\ORM\QueryBuilder;
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
use Oro\Bundle\DataGridBundle\Datagrid\DatagridGuesser;
use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface;
@@ -51,7 +50,7 @@ public function __construct(
*/
public function isApplicable(DatagridConfiguration $config)
{
- return $config->offsetGetByPath(Builder::DATASOURCE_TYPE_PATH) == OrmDatasource::TYPE;
+ return $config->getDatasourceType() == OrmDatasource::TYPE;
}
/**
diff --git a/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js b/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
index aa4516c1176..f327a8c02d2 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
+++ b/src/Oro/Bundle/EntityExtendBundle/Resources/public/js/init-entity-extend-apply.js
@@ -33,15 +33,17 @@ require([
progress.show();
$.post(url, function() {
- mediator.once('page:beforeChange', function() {
- modal.close();
- });
- mediator.once('page:afterChange', function() {
- mediator.execute('showFlashMessage', 'success', __('oro.entity_extend.schema_updated'));
- });
- mediator.execute('redirectTo', {
- url: routing.generate('oro_entityconfig_index', {'_enableContentProviders': 'mainMenu'})
- });
+ modal.close();
+ mediator.execute(
+ 'showFlashMessage',
+ 'success',
+ __('oro.entity_extend.schema_updated'),
+ {afterReload: true}
+ );
+ mediator.execute('showMessage', 'info', __('Please wait until page will be reloaded...'));
+ mediator.execute('showLoading');
+ // force reload of the application to make sure 'js/routes' is reloaded
+ window.location.href = routing.generate('oro_entityconfig_index');
}).fail(function() {
modal.close();
mediator.execute('showFlashMessage', 'error', __('oro.entity_extend.schema_update_failed'));
diff --git a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Entity/Manager/AssociationManagerTest.php b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Entity/Manager/AssociationManagerTest.php
index 6c04f037dfa..7cd7482d435 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Entity/Manager/AssociationManagerTest.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Entity/Manager/AssociationManagerTest.php
@@ -406,7 +406,7 @@ function (QueryBuilder $qb) {
. 'FROM ('
. 'SELECT DISTINCT t0_.id AS id_0, t1_.id AS id_1, '
. '\'' . $targetClass1 . '\' AS sclr_2, '
- . 't1_.firstName || \' \' || t1_.lastName AS sclr_3 '
+ . 't1_.firstName || \' \' || t1_.lastName || \'\' AS sclr_3 '
. 'FROM test_owner1 t0_ '
. 'INNER JOIN test_owner1_to_target1 t2_ ON t0_.id = t2_.owner_id '
. 'INNER JOIN test_target1 t1_ ON t1_.id = t2_.target_id '
@@ -415,7 +415,7 @@ function (QueryBuilder $qb) {
. ' UNION ALL '
. 'SELECT DISTINCT t0_.id AS id_0, t1_.id AS id_1, '
. '\'' . $targetClass2 . '\' AS sclr_2, '
- . 't1_.firstName || \' \' || t1_.lastName AS sclr_3 '
+ . 't1_.firstName || \' \' || t1_.lastName || \'\' AS sclr_3 '
. 'FROM test_owner1 t0_ '
. 'INNER JOIN test_owner1_to_target2 t2_ ON t0_.id = t2_.owner_id '
. 'INNER JOIN test_target2 t1_ ON t1_.id = t2_.target_id '
diff --git a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Util/AssociationTypeHelperTest.php b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Util/AssociationTypeHelperTest.php
index 3cb6af2d9d9..cf96a549042 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Util/AssociationTypeHelperTest.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Form/Util/AssociationTypeHelperTest.php
@@ -142,81 +142,6 @@ public function isActivitySupport()
];
}
- public function testIsAssociationOwningSideEntityForNotOwningSideEntity()
- {
- $className = 'Test\Entity1';
- $associationClass = 'Test\Entity';
-
- $this->entityClassResolver->expects($this->once())
- ->method('getEntityClass')
- ->with($associationClass)
- ->will($this->returnValue($associationClass));
-
- $this->assertFalse(
- $this->typeHelper->isAssociationOwningSideEntity($className, $associationClass)
- );
- }
-
- public function testIsAssociationOwningSideEntityWithClassName()
- {
- $className = 'Test\Entity';
- $associationClass = 'Test\Entity';
-
- $this->entityClassResolver->expects($this->once())
- ->method('getEntityClass')
- ->with($associationClass)
- ->will($this->returnValue($className));
-
- $this->assertTrue(
- $this->typeHelper->isAssociationOwningSideEntity($className, $associationClass)
- );
- }
-
- public function testIsAssociationOwningSideEntityWithEntityName()
- {
- $className = 'Test\Entity';
- $associationClass = 'Test:Entity';
-
- $this->entityClassResolver->expects($this->once())
- ->method('getEntityClass')
- ->with($associationClass)
- ->will($this->returnValue($className));
-
- $this->assertTrue(
- $this->typeHelper->isAssociationOwningSideEntity($className, $associationClass)
- );
- }
-
- public function testIsAssociationOwningSideEntityWithGroupName()
- {
- $config1 = new Config(new EntityConfigId('grouping', 'Test\Entity1'));
- $config1->set('groups', ['some_group', 'another_group']);
- $config2 = new Config(new EntityConfigId('grouping', 'Test\Entity2'));
- $config2->set('groups', ['another_group']);
- $config3 = new Config(new EntityConfigId('grouping', 'Test\Entity3'));
-
- $configs = [$config1, $config2, $config3];
-
- $configProvider = $this->getConfigProviderMock();
- $this->configManager->expects($this->once())
- ->method('getProvider')
- ->with('grouping')
- ->will($this->returnValue($configProvider));
- $configProvider->expects($this->once())
- ->method('getConfigs')
- ->will($this->returnValue($configs));
-
- $this->assertTrue(
- $this->typeHelper->isAssociationOwningSideEntity('Test\Entity1', 'some_group')
- );
- $this->assertFalse(
- $this->typeHelper->isAssociationOwningSideEntity('Test\Entity', 'some_group')
- );
- $this->assertFalse(
- $this->typeHelper->isAssociationOwningSideEntity('Test\Entity2', 'some_group')
- );
- }
-
public function testGetOwningSideEntities()
{
$config1 = new Config(new EntityConfigId('grouping', 'Test\Entity1'));
diff --git a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Mapping/ExtendClassMetadataFactoryTest.php b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Mapping/ExtendClassMetadataFactoryTest.php
index d0278d7ef4d..bf34cecfcec 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Mapping/ExtendClassMetadataFactoryTest.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Tests/Unit/Mapping/ExtendClassMetadataFactoryTest.php
@@ -35,12 +35,17 @@ public function testSetMetadataFor()
);
$cacheSalt = '$CLASSMETADATA';
- $this->assertAttributeSame(
- [
- '[Oro\Bundle\UserBundle\Entity\User'.$cacheSalt .'][1]' => $metadata
- ],
- 'data',
- $this->cmf->getCacheDriver()
+ $this->assertTrue(
+ $this->cmf->getCacheDriver()->contains('Oro\Bundle\UserBundle\Entity\User' . $cacheSalt)
+ );
+ }
+
+ public function testSetMetadataForWithoutCacheDriver()
+ {
+ $metadata = new ClassMetadata('Oro\Bundle\UserBundle\Entity\User');
+ $this->cmf->setMetadataFor(
+ 'Oro\Bundle\UserBundle\Entity\User',
+ $metadata
);
}
}
diff --git a/src/Oro/Bundle/EntityExtendBundle/Validator/Constraints/UniqueKeysValidator.php b/src/Oro/Bundle/EntityExtendBundle/Validator/Constraints/UniqueKeysValidator.php
index 05f2944c067..fc25d1aef32 100644
--- a/src/Oro/Bundle/EntityExtendBundle/Validator/Constraints/UniqueKeysValidator.php
+++ b/src/Oro/Bundle/EntityExtendBundle/Validator/Constraints/UniqueKeysValidator.php
@@ -5,7 +5,7 @@
use Symfony\Component\Validator\Constraint;
use Symfony\Component\Validator\ConstraintValidator;
-use Oro\Bundle\UIBundle\Tools\ArrayUtils;
+use Oro\Component\PhpUtils\ArrayUtil;
class UniqueKeysValidator extends ConstraintValidator
{
@@ -15,7 +15,7 @@ class UniqueKeysValidator extends ConstraintValidator
public function validate($value, Constraint $constraint)
{
/** @var UniqueKeys $constraint */
- $names = ArrayUtils::arrayColumn($value, 'name');
+ $names = ArrayUtil::arrayColumn($value, 'name');
if ($names && $names != array_unique($names)) {
$this->context->addViolation(
$constraint->message
@@ -24,7 +24,7 @@ public function validate($value, Constraint $constraint)
return;
}
- $keys = ArrayUtils::arrayColumn($value, 'key');
+ $keys = ArrayUtil::arrayColumn($value, 'key');
if ($keys && $keys != array_unique($keys, SORT_REGULAR)) {
$this->context->addViolation(
$constraint->message
diff --git a/src/Oro/Bundle/EntityMergeBundle/Metadata/MetadataBuilder.php b/src/Oro/Bundle/EntityMergeBundle/Metadata/MetadataBuilder.php
index 158fd4240bb..47458ca9e4f 100644
--- a/src/Oro/Bundle/EntityMergeBundle/Metadata/MetadataBuilder.php
+++ b/src/Oro/Bundle/EntityMergeBundle/Metadata/MetadataBuilder.php
@@ -136,10 +136,16 @@ protected function addDoctrineInverseAssociations(
$associationMapping['mappedBySourceEntity'] = false;
+ $mergeModes = [MergeModes::UNITE];
+ if ($associationMapping['type'] === ClassMetadataInfo::ONE_TO_ONE) {
+ // for fields with ONE_TO_ONE relation Unite strategy is impossible, so Replace is used
+ $mergeModes = [MergeModes::REPLACE];
+ }
+
$fieldMetadata = $this->metadataFactory->createFieldMetadata(
array(
'field_name' => $this->createInverseAssociationFieldName($currentClassName, $fieldName),
- 'merge_modes' => array(MergeModes::UNITE),
+ 'merge_modes' => $mergeModes,
'source_field_name' => $fieldName,
'source_class_name' => $currentClassName,
),
diff --git a/src/Oro/Bundle/EntityMergeBundle/Tests/Unit/Metadata/MetadataBuilderTest.php b/src/Oro/Bundle/EntityMergeBundle/Tests/Unit/Metadata/MetadataBuilderTest.php
index 328ad92988b..00c2b3b51fe 100644
--- a/src/Oro/Bundle/EntityMergeBundle/Tests/Unit/Metadata/MetadataBuilderTest.php
+++ b/src/Oro/Bundle/EntityMergeBundle/Tests/Unit/Metadata/MetadataBuilderTest.php
@@ -79,15 +79,15 @@ public function testCreateEntityMetadataByClass()
$metadataFactoryCallIndex = 0;
$this->metadataFactory->expects($this->at($metadataFactoryCallIndex++))
->method('createEntityMetadata')
- ->with(array(), $this->isType('array'))
+ ->with([], $this->isType('array'))
->will($this->returnValue($entityMetadata));
// Test adding doctrine fields
- $doctrineFieldNames = array('id', 'foo_field', 'bar_field');
- $doctrineFieldNamesWithoutId = array('foo_field', 'bar_field');
+ $doctrineFieldNames = ['id', 'foo_field', 'bar_field'];
+ $doctrineFieldNamesWithoutId = ['foo_field', 'bar_field'];
$classMetadataCallIndex = 0;
- $idFieldNames = array('id');
+ $idFieldNames = ['id'];
$this->classMetadata->expects($this->at($classMetadataCallIndex++))
->method('getIdentifierFieldNames')
->will($this->returnValue($idFieldNames));
@@ -97,7 +97,7 @@ public function testCreateEntityMetadataByClass()
->will($this->returnValue($doctrineFieldNames));
foreach ($doctrineFieldNamesWithoutId as $fieldName) {
- $fieldMapping = array('fieldName' => $fieldName);
+ $fieldMapping = ['fieldName' => $fieldName];
$this->classMetadata->expects($this->at($classMetadataCallIndex++))
->method('getFieldMapping')
@@ -108,7 +108,7 @@ public function testCreateEntityMetadataByClass()
$this->metadataFactory->expects($this->at($metadataFactoryCallIndex++))
->method('createFieldMetadata')
- ->with(array('field_name' => $fieldName), $fieldMapping)
+ ->with(['field_name' => $fieldName], $fieldMapping)
->will($this->returnValue($fieldMetadata));
$entityMetadata->expects($this->at($entityMetadataCallIndex++))
@@ -117,10 +117,10 @@ public function testCreateEntityMetadataByClass()
}
// Test adding doctrine associations
- $associationMappings = array(
- 'foo_association' => array('foo' => 'bar'),
- 'bar_association' => array('bar' => 'baz')
- );
+ $associationMappings = [
+ 'foo_association' => ['foo' => 'bar'],
+ 'bar_association' => ['bar' => 'baz']
+ ];
$this->classMetadata->expects($this->at($classMetadataCallIndex++))
->method('getAssociationMappings')
@@ -131,7 +131,7 @@ public function testCreateEntityMetadataByClass()
$this->metadataFactory->expects($this->at($metadataFactoryCallIndex++))
->method('createFieldMetadata')
- ->with(array('field_name' => $fieldName), $associationMapping)
+ ->with(['field_name' => $fieldName], $associationMapping)
->will($this->returnValue($fieldMetadata));
$entityMetadata->expects($this->at($entityMetadataCallIndex++))
@@ -140,42 +140,56 @@ public function testCreateEntityMetadataByClass()
}
// Test adding doctrine inverse associations
- $allMetadata = array(
+ $allMetadata = [
self::CLASS_NAME => $this->classMetadata,
'Namespace\\FooEntity' => $fooClassMetadata = $this->createClassMetadata(),
'Namespace\\BarEntity' => $barClassMetadata = $this->createClassMetadata(),
- );
-
- $expectedClassesData = array(
- 'Namespace\\FooEntity' => array(
- 'associationMappings' => array(
- 'foo_association' => array('foo' => 'bar'),
- ),
- 'expectedFields' => array(
- 'foo_association' => array(
+ 'Namespace\\FooBarEntity' => $fooBarClassMetadata = $this->createClassMetadata(),
+ ];
+
+ $expectedClassesData = [
+ 'Namespace\\FooEntity' => [
+ 'associationMappings' => [
+ 'foo_association' => ['foo' => 'bar', 'type' => ClassMetadataInfo::ONE_TO_MANY],
+ ],
+ 'expectedFields' => [
+ 'foo_association' => [
'field_name' => 'Namespace_FooEntity_foo_association',
- 'merge_modes' => array(MergeModes::UNITE),
+ 'merge_modes' => [MergeModes::UNITE],
'source_field_name' => 'foo_association',
'source_class_name' => 'Namespace\\FooEntity',
- ),
- )
- ),
- 'Namespace\\BarEntity' => array(
- 'associationMappings' => array(
- 'bar_association' => array('bar' => 'baz'),
- 'skipped_many_to_many' => array('type' => ClassMetadataInfo::MANY_TO_MANY),
- 'skipped_mapped_by' => array('mappedBy' => self::CLASS_NAME),
- ),
- 'expectedFields' => array(
- 'bar_association' => array(
+ ],
+ ]
+ ],
+ 'Namespace\\BarEntity' => [
+ 'associationMappings' => [
+ 'bar_association' => ['bar' => 'baz', 'type' => ClassMetadataInfo::ONE_TO_MANY],
+ 'skipped_many_to_many' => ['type' => ClassMetadataInfo::MANY_TO_MANY],
+ 'skipped_mapped_by' => ['mappedBy' => self::CLASS_NAME],
+ ],
+ 'expectedFields' => [
+ 'bar_association' => [
'field_name' => 'Namespace_BarEntity_bar_association',
- 'merge_modes' => array(MergeModes::UNITE),
+ 'merge_modes' => [MergeModes::UNITE],
'source_field_name' => 'bar_association',
'source_class_name' => 'Namespace\\BarEntity',
- ),
- )
- )
- );
+ ],
+ ]
+ ],
+ 'Namespace\\FooBarEntity' => [
+ 'associationMappings' => [
+ 'bar_association' => ['bar' => 'baz', 'type' => ClassMetadataInfo::ONE_TO_ONE],
+ ],
+ 'expectedFields' => [
+ 'bar_association' => [
+ 'field_name' => 'Namespace_FooBarEntity_bar_association',
+ 'merge_modes' => [MergeModes::REPLACE],
+ 'source_field_name' => 'bar_association',
+ 'source_class_name' => 'Namespace\\FooBarEntity',
+ ],
+ ]
+ ]
+ ];
$this->doctrineHelper->expects($this->once())
->method('getAllMetadata')
diff --git a/src/Oro/Bundle/EntityPaginationBundle/Datagrid/EntityPaginationExtension.php b/src/Oro/Bundle/EntityPaginationBundle/Datagrid/EntityPaginationExtension.php
index 075a86b3371..762df5ca894 100644
--- a/src/Oro/Bundle/EntityPaginationBundle/Datagrid/EntityPaginationExtension.php
+++ b/src/Oro/Bundle/EntityPaginationBundle/Datagrid/EntityPaginationExtension.php
@@ -2,7 +2,6 @@
namespace Oro\Bundle\EntityPaginationBundle\Datagrid;
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
use Oro\Bundle\DataGridBundle\Extension\AbstractExtension;
use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource;
use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
@@ -22,7 +21,7 @@ public function isApplicable(DatagridConfiguration $config)
return false;
}
- return $config->offsetGetByPath(Builder::DATASOURCE_TYPE_PATH) == OrmDatasource::TYPE;
+ return $config->getDatasourceType() == OrmDatasource::TYPE;
}
/**
@@ -36,7 +35,6 @@ public function processConfigs(DatagridConfiguration $config)
throw new \LogicException('Entity pagination is not boolean');
}
- $pagination = $pagination ? true : false;
- $config->offsetSetByPath(self::ENTITY_PAGINATION_PATH, $pagination);
+ $config->offsetSetByPath(self::ENTITY_PAGINATION_PATH, (bool)$pagination);
}
}
diff --git a/src/Oro/Bundle/EntityPaginationBundle/Manager/EntityPaginationManager.php b/src/Oro/Bundle/EntityPaginationBundle/Manager/EntityPaginationManager.php
index 12050a065cb..4b1fcee5575 100644
--- a/src/Oro/Bundle/EntityPaginationBundle/Manager/EntityPaginationManager.php
+++ b/src/Oro/Bundle/EntityPaginationBundle/Manager/EntityPaginationManager.php
@@ -58,15 +58,11 @@ public static function getPermission($scope)
{
switch ($scope) {
case self::VIEW_SCOPE:
- $permission = 'VIEW';
- break;
+ return 'VIEW';
case self::EDIT_SCOPE:
- $permission = 'EDIT';
- break;
- default:
- throw new \LogicException(sprintf('Scope "%s" is not available.', $scope));
+ return 'EDIT';
}
- return $permission;
+ throw new \LogicException(sprintf('Scope "%s" is not available.', $scope));
}
}
diff --git a/src/Oro/Bundle/EntityPaginationBundle/Manager/MessageManager.php b/src/Oro/Bundle/EntityPaginationBundle/Manager/MessageManager.php
index 67c1ec9e014..5e5ec38d5a7 100644
--- a/src/Oro/Bundle/EntityPaginationBundle/Manager/MessageManager.php
+++ b/src/Oro/Bundle/EntityPaginationBundle/Manager/MessageManager.php
@@ -150,19 +150,15 @@ protected function getStatsMessage($scope)
{
switch ($scope) {
case EntityPaginationManager::VIEW_SCOPE:
- $message =
+ return
'oro.entity_pagination.message.' .
'stats_number_view_%count%_record|stats_number_view_%count%_records';
- break;
case EntityPaginationManager::EDIT_SCOPE:
- $message =
+ return
'oro.entity_pagination.message.' .
'stats_number_edit_%count%_record|stats_number_edit_%count%_records';
- break;
- default:
- throw new \LogicException(sprintf('Scope "%s" is not available.', $scope));
}
- return $message;
+ throw new \LogicException(sprintf('Scope "%s" is not available.', $scope));
}
}
diff --git a/src/Oro/Bundle/EntityPaginationBundle/Storage/StorageDataCollector.php b/src/Oro/Bundle/EntityPaginationBundle/Storage/StorageDataCollector.php
index 8ebc7c46e80..67bad490673 100644
--- a/src/Oro/Bundle/EntityPaginationBundle/Storage/StorageDataCollector.php
+++ b/src/Oro/Bundle/EntityPaginationBundle/Storage/StorageDataCollector.php
@@ -83,10 +83,19 @@ public function collect(Request $request, $scope)
$isDataCollected = false;
- $gridNames = array_keys($request->query->get('grid', []));
+ $gridNames = array();
+ if ($request->query->get('grid')) {
+ $gridNames = array_keys((array)$request->query->get('grid', []));
+ }
foreach ($gridNames as $gridName) {
- // datagrid manager automatically extracts all required parameters from request
- $dataGrid = $this->datagridManager->getDatagridByRequestParams($gridName);
+ try {
+ // datagrid manager automatically extracts all required parameters from request
+ $dataGrid = $this->datagridManager->getDatagridByRequestParams($gridName);
+ } catch (\RuntimeException $e) {
+ // processing of invalid grid names
+ continue;
+ }
+
if (!$this->paginationManager->isDatagridApplicable($dataGrid)) {
continue;
}
diff --git a/src/Oro/Bundle/EntityPaginationBundle/Tests/Unit/Storage/StorageDataCollectorTest.php b/src/Oro/Bundle/EntityPaginationBundle/Tests/Unit/Storage/StorageDataCollectorTest.php
index 0e282def516..040bb4e53d7 100644
--- a/src/Oro/Bundle/EntityPaginationBundle/Tests/Unit/Storage/StorageDataCollectorTest.php
+++ b/src/Oro/Bundle/EntityPaginationBundle/Tests/Unit/Storage/StorageDataCollectorTest.php
@@ -96,6 +96,30 @@ public function testCollectWithDisabledPagination()
$this->assertFalse($this->collector->collect($this->getGridRequest(), 'test'));
}
+ public function testCollectWithEmptyGridRequest()
+ {
+ $this->setPaginationEnabled(true);
+ $this->datagridManager->expects($this->never())
+ ->method('getDatagridByRequestParams');
+
+ $this->assertFalse($this->collector->collect(new Request(['grid' => '']), 'test'));
+ }
+
+ public function testCollectWithInvalidGridName()
+ {
+ $invalidGridName = 'invalid';
+
+ $this->setPaginationEnabled(true);
+ $this->datagridManager->expects($this->once())
+ ->method('getDatagridByRequestParams')
+ ->with($invalidGridName)
+ ->willThrowException(new \RuntimeException());
+ $this->storage->expects($this->never())
+ ->method('hasData');
+
+ $this->assertFalse($this->collector->collect(new Request(['grid' => [$invalidGridName => null]]), 'test'));
+ }
+
public function testCollectGridNotApplicable()
{
$this->setPaginationEnabled(true);
diff --git a/src/Oro/Bundle/FilterBundle/Form/EventListener/DateFilterSubscriber.php b/src/Oro/Bundle/FilterBundle/Form/EventListener/DateFilterSubscriber.php
index 94ba5a0c051..3822f505694 100644
--- a/src/Oro/Bundle/FilterBundle/Form/EventListener/DateFilterSubscriber.php
+++ b/src/Oro/Bundle/FilterBundle/Form/EventListener/DateFilterSubscriber.php
@@ -119,9 +119,7 @@ function ($data) {
$this->mapValues($children, $data, $this->getDatePartAccessorClosure('Y'));
$this->replaceValueFields($form->get('value'), array_flip(range(date('Y') - 50, date('Y') + 50)));
break;
- // in case we do not need any value to be mapped(converted), in other words - use as is
case DateModifierInterface::PART_SOURCE:
- return;
case DateModifierInterface::PART_VALUE:
default:
$this->mapValues(
diff --git a/src/Oro/Bundle/FilterBundle/Grid/Extension/OrmFilterExtension.php b/src/Oro/Bundle/FilterBundle/Grid/Extension/OrmFilterExtension.php
index d341e3872a1..f4fb11ba76c 100644
--- a/src/Oro/Bundle/FilterBundle/Grid/Extension/OrmFilterExtension.php
+++ b/src/Oro/Bundle/FilterBundle/Grid/Extension/OrmFilterExtension.php
@@ -2,16 +2,15 @@
namespace Oro\Bundle\FilterBundle\Grid\Extension;
-use Oro\Bundle\DataGridBundle\Extension\Formatter\Property\PropertyInterface;
use Symfony\Component\Translation\TranslatorInterface;
-use Oro\Bundle\DataGridBundle\Datagrid\Builder;
use Oro\Bundle\DataGridBundle\Datagrid\Common\MetadataObject;
use Oro\Bundle\DataGridBundle\Datagrid\Common\DatagridConfiguration;
use Oro\Bundle\DataGridBundle\Datasource\DatasourceInterface;
use Oro\Bundle\DataGridBundle\Datasource\Orm\OrmDatasource;
use Oro\Bundle\DataGridBundle\Extension\AbstractExtension;
use Oro\Bundle\DataGridBundle\Extension\Formatter\Configuration as FormatterConfiguration;
+use Oro\Bundle\DataGridBundle\Extension\Formatter\Property\PropertyInterface;
use Oro\Bundle\FilterBundle\Filter\FilterUtility;
use Oro\Bundle\FilterBundle\Filter\FilterInterface;
use Oro\Bundle\FilterBundle\Datasource\Orm\OrmFilterDatasourceAdapter;
@@ -52,7 +51,7 @@ public function isApplicable(DatagridConfiguration $config)
return false;
}
- return $config->offsetGetByPath(Builder::DATASOURCE_TYPE_PATH) == OrmDatasource::TYPE;
+ return $config->getDatasourceType() == OrmDatasource::TYPE;
}
/**
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less b/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
index 10790938465..100a5dacd8c 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/css/less/oro.filter.less
@@ -69,7 +69,7 @@
padding: 8px 8px 2px 8px;
border: 1px solid #d3d3d3;
display: none;
- z-index: @zindexPopover;
+ z-index: @oroZindexDropdown;
margin-top: 7px;
top: auto;
}
@@ -115,11 +115,14 @@
margin-bottom: 0;
}
.filter-select .select-filter-widget {
- font-weight: bold;
- color: #333333;
- padding: 0 0 2px 0;
- background: none;
- border: none;
+ &, &.ui-multiselect {
+ font-weight: bold;
+ color: #333333;
+ padding: 0 0 2px 0;
+ background: none;
+ border: none;
+ margin-left: 0;
+ }
}
.filter-select .select-filter-widget .ui-icon {
@@ -200,7 +203,8 @@
margin: 0 6px 5px 5px;
}
-.ui-multiselect.filter-list {
+.ui-multiselect.filter-list, .ui-multiselect.select-filter-widget {
+
background: none;
border: none;
font-size: 13px;
@@ -209,15 +213,15 @@
line-height: 1em;
}
-.ui-multiselect.filter-list:hover .add-filter-button span.caret {
+.ui-multiselect.select-filter-widget:hover .add-filter-button span.caret {
border-top-color: #005099; /* @linkColorHover; */
}
-.ui-multiselect.filter-list:hover a {
+.ui-multiselect.select-filter-widget:hover a {
color: #005099; /* @linkColorHover; */
}
-.ui-multiselect.filter-list.select-filter-widget span.caret {
+.ui-multiselect.select-filter-widget span.caret {
margin-top: 5px;
}
@@ -351,9 +355,14 @@ button.ui-multiselect.select-filter-widget.ui-state-hover{
vertical-align: middle;
}
}
-.filter-item.filter-business-unit {
+.filter-item.choice-tree-filter {
margin-right: 0;
margin-bottom: 0;
+ max-width: 300px;
+ min-width: 180px;
+ .choice-tree-filter-search{
+ width: calc(~"100% - 14px");
+ }
.buttons {
margin-bottom: 5px;
span {
@@ -366,7 +375,6 @@ button.ui-multiselect.select-filter-widget.ui-state-hover{
}
}
.list {
- height: 200px;
max-height: 200px;
overflow: auto;
margin-bottom: 10px;
@@ -375,14 +383,17 @@ button.ui-multiselect.select-filter-widget.ui-state-hover{
}
ul {
list-style-type: none;
- margin-right: 25px;
input {
margin-right: 5px;
margin-top: 0;
+ margin-left: -18px;
}
- label.search-result {
- color: #000000;
- font-weight: bold;
+ label {
+ padding-left: 20px;
+ &.search-result {
+ color: #000000;
+ font-weight: bold;
+ }
}
}
}
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
index 06a9c37e4c2..cb0da3b532e 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/datafilter-builder.js
@@ -39,10 +39,12 @@ define([
return;
}
+ var filtersList;
var options = methods.combineOptions.call(this);
options.collection = this.collection;
- var filtersList = new FiltersManager(options);
- this.$el.prepend(filtersList.render().$el);
+ options.el = $('').prependTo(this.$el);
+ filtersList = new FiltersManager(options);
+ filtersList.render();
mediator.trigger('datagrid_filters:rendered', this.collection, this.$el);
this.metadata.state.filters = this.metadata.state.filters || [];
if (this.collection.length === 0 && this.metadata.state.filters.length === 0) {
@@ -74,7 +76,9 @@ define([
filters[options.name] = new Filter();
}
});
- return {filters: filters};
+ return {
+ filters: filters
+ };
}
};
diff --git a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js
index 420945ac201..8dc2244061a 100644
--- a/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js
+++ b/src/Oro/Bundle/FilterBundle/Resources/public/js/filter/abstract-filter.js
@@ -103,6 +103,13 @@ define([
*/
nullLink: '#',
+ /**
+ * Element enclosing a criteria dropdown
+ *
+ * @property {Array.
+ {% for subKey, subFolder in folder.subFolders %}
+ {{ _self.renderFolder(subKey, subFolder, namePrefix ~ '[' ~ key ~ '][subFolders]', maxDepth - 1) }}
+ {% endfor %}
+
+ {% endif %}
+ - Hi World! diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutFormulaLoaderTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutFormulaLoaderTest.php new file mode 100644 index 00000000000..c6841f4874a --- /dev/null +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutFormulaLoaderTest.php @@ -0,0 +1,26 @@ +getMockBuilder('Oro\Bundle\LayoutBundle\Assetic\LayoutResource') + ->disableOriginalConstructor() + ->getMock(); + $layoutResource->expects($this->once()) + ->method('getContent') + ->willReturn($formulae); + + $this->assertEquals($formulae, $loader->load($layoutResource)); + } +} diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutResourceTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutResourceTest.php new file mode 100644 index 00000000000..a708405c068 --- /dev/null +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Assetic/LayoutResourceTest.php @@ -0,0 +1,110 @@ +layoutResource = new LayoutResource($this->getThemeManager()); + } + + protected function tearDown() + { + unset($this->layoutResource, $this->themeManager); + } + + /** + * @return ThemeManager + */ + protected function getThemeManager() + { + if (!$this->themeManager) { + $this->themeManager = new ThemeManager(new ThemeFactory(), $this->getThemes()); + } + return $this->themeManager; + } + + /** + * @return array + */ + protected function getThemes() + { + $asset = [ + 'inputs' => ['styles.css'], + 'filters' => ['filters'], + 'output' => ['output.css'], + ]; + + return [ + 'without_assets' => [], + 'with_empty_assets' => [ + 'data' => ['assets' => []], + ], + 'with_one_asset' => [ + 'data' => [ + 'assets' => [ + 'first' => $asset, + ] + ], + ], + 'with_two_asset' => [ + 'data' => [ + 'assets' => [ + 'first' => $asset, + 'second' => $asset, + ] + ], + ], + ]; + } + + public function testIsFresh() + { + $this->assertTrue($this->layoutResource->isFresh(1)); + } + + public function testToString() + { + $this->assertEquals('layout', (string)$this->layoutResource); + } + + public function testGetContent() + { + $themes = $this->getThemes(); + $formulae = []; + foreach ($themes as $themeName => $theme) { + if (!isset($theme['data']) || !isset($theme['data']['assets']) || empty($theme['data']['assets'])) { + continue; + } + + $assets = $theme['data']['assets']; + foreach ($assets as $assetKey => $asset) { + $name = 'layout_' . $themeName . '_' . $assetKey; + $formulae[$name] = [ + $asset['inputs'], + $asset['filters'], + [ + 'output' => $asset['output'], + 'name' => $name, + ], + ]; + } + } + + $this->assertArrayHasKey('layout_with_one_asset_first', $formulae); + $this->assertArrayHasKey('layout_with_two_asset_first', $formulae); + $this->assertArrayHasKey('layout_with_two_asset_second', $formulae); + $this->assertEquals($formulae, $this->layoutResource->getContent()); + } +} diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php index ea17024cf6a..c97ab53eeb8 100644 --- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/BlockTypeTestCase.php @@ -45,6 +45,7 @@ protected function initializeLayoutFactoryBuilder(LayoutFactoryBuilderInterface ->addType(new Type\ButtonGroupType()) ->addType(new Type\ListType()) ->addType(new Type\OrderedListType()) - ->addType(new Type\ListItemType()); + ->addType(new Type\ListItemType()) + ->addType(new Type\InputType()); } } diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/Compiler/OverrideServiceCompilerPassTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/Compiler/OverrideServiceCompilerPassTest.php new file mode 100644 index 00000000000..0215cbb019a --- /dev/null +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/Compiler/OverrideServiceCompilerPassTest.php @@ -0,0 +1,46 @@ +pass = new OverrideServiceCompilerPass(); + } + + protected function tearDown() + { + unset($this->pass); + } + + public function testProcess() + { + $container = new ContainerBuilder(); + $twigFormEngine = new Definition('\TwigFormEngineClass'); + $container->setDefinition('twig.form.engine', $twigFormEngine); + + $newTwigFormEngine = new Definition('\OroLayoutTwigFormEngineClass'); + $container->setDefinition('oro_layout.twig.form.engine', $newTwigFormEngine); + + $phpFormEngine = new Definition('\PhpFormEngineClass'); + $container->setDefinition('templating.form.engine', $phpFormEngine); + + $newPhpFormEngine = new Definition('\OroLayoutPhpFormEngineClass'); + $container->setDefinition('oro_layout.templating.form.engine', $newPhpFormEngine); + + $this->pass->process($container); + + $this->assertEquals($newTwigFormEngine, $container->getDefinition('twig.form.engine')); + $this->assertEquals($newPhpFormEngine, $container->getDefinition('templating.form.engine')); + } +} diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/OroLayoutExtensionTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/OroLayoutExtensionTest.php index 32b61b50ac4..aa4cdbac954 100644 --- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/OroLayoutExtensionTest.php +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/DependencyInjection/OroLayoutExtensionTest.php @@ -205,9 +205,14 @@ public function testLoadWithBundleThemesConfig() $extension = new OroLayoutExtension(); $extension->load([], $container); - $expectedResult = ['base', 'oro-black']; - $result = $container->get(OroLayoutExtension::THEME_MANAGER_SERVICE_ID)->getThemeNames(); - $this->assertSame(sort($expectedResult), sort($result)); + $expectedThemeNames = ['base', 'oro-black']; + + $themes = $container->get(OroLayoutExtension::THEME_MANAGER_SERVICE_ID)->getAllThemes(); + $themeNames = $container->get(OroLayoutExtension::THEME_MANAGER_SERVICE_ID)->getThemeNames(); + + $this->assertSame(sort($expectedThemeNames), sort($themeNames)); + $this->assertSame('Oro Black theme', $themes['oro-black']->getLabel()); + $this->assertSame('Oro Black theme description', $themes['oro-black']->getDescription()); } public function testLoadingLayoutUpdates() diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/RendererEngineTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/RendererEngineTest.php new file mode 100644 index 00000000000..346999bfa99 --- /dev/null +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/RendererEngineTest.php @@ -0,0 +1,34 @@ +createRendererEngine(); + + $reflectionClass = new \ReflectionClass(get_class($renderingEngine)); + $property = $reflectionClass->getProperty('defaultThemes'); + $property->setAccessible(true); + + $actual = $property->getValue($renderingEngine); + $this->assertNotContains('newThemePath', $actual); + + $renderingEngine->addDefaultThemes('newThemePath'); + $actual = $property->getValue($renderingEngine); + $this->assertContains('newThemePath', $actual); + + $renderingEngine->addDefaultThemes(['newThemePath2', 'newThemePath3']); + $actual = $property->getValue($renderingEngine); + $this->assertContains('newThemePath2', $actual); + $this->assertContains('newThemePath3', $actual); + } + + /** + * @return FormRendererEngineInterface + */ + abstract public function createRendererEngine(); +} diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/TemplatingRendererEngineTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/TemplatingRendererEngineTest.php new file mode 100644 index 00000000000..1797e9de97d --- /dev/null +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/TemplatingRendererEngineTest.php @@ -0,0 +1,19 @@ +getMock('Symfony\Component\Templating\EngineInterface'); + + return new TemplatingRendererEngine($templatingEngine); + } +} diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/TwigRendererEngineTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/TwigRendererEngineTest.php new file mode 100644 index 00000000000..5f47013f90b --- /dev/null +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Form/RendererEngine/TwigRendererEngineTest.php @@ -0,0 +1,16 @@ +expressionAssembler = $this->getMock('Oro\Component\ConfigExpression\AssemblerInterface'); - - $encoderRegistry = $this - ->getMockBuilder('Oro\Bundle\LayoutBundle\Layout\Encoder\ConfigExpressionEncoderRegistry') + $this->processor = $this->getMockBuilder('Oro\Bundle\LayoutBundle\Layout\Processor\ConfigExpressionProcessor') ->disableOriginalConstructor() ->getMock(); - $encoderRegistry->expects($this->any()) - ->method('getEncoder') - ->with('json') - ->will($this->returnValue(new JsonConfigExpressionEncoder())); - $this->extension = new ConfigExpressionExtension( - $this->expressionAssembler, - $encoderRegistry - ); + $this->extension = new ConfigExpressionExtension($this->processor); } public function testGetExtendedType() @@ -48,13 +35,31 @@ public function testGetExtendedType() } /** - * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + * @dataProvider deferredDataProvider + * @param bool $deferred */ - public function testFinishViewEvaluatesAllExpressions() + public function testNormalizeOptions($deferred) { - $context = new LayoutContext(); - $context->set('css_class', 'test_class'); - $data = $this->getMock('Oro\Component\Layout\DataAccessorInterface'); + $context = $this->getContextMock($deferred); + $data = $this->getDataAccessorMock(); + $options = []; + + $this->processor->expects($deferred ? $this->never() : $this->once()) + ->method('processExpressions') + ->with($options, $context, $data, true, 'json'); + + $this->extension->normalizeOptions($options, $context, $data); + } + + /** + * @dataProvider deferredDataProvider + * @param bool $deferred + */ + public function testFinishView($deferred) + { + $context = $this->getContextMock($deferred); + $data = $this->getDataAccessorMock(); + $block = $this->getMock('Oro\Component\Layout\BlockInterface'); $block->expects($this->once()) ->method('getContext') @@ -63,215 +68,45 @@ public function testFinishViewEvaluatesAllExpressions() ->method('getData') ->will($this->returnValue($data)); $view = new BlockView(); + $view->vars = ['test']; - $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface'); - $expr->expects($this->once()) - ->method('evaluate') - ->with(['context' => $context, 'data' => $data]) - ->will($this->returnValue(true)); - - $classExpr = new Func\GetValue(); - $classExpr->initialize([new PropertyPath('context.css_class')]); - $classExpr->setContextAccessor(new ContextAccessor()); - $classAttr = new OptionValueBag(); - $classAttr->add(['@value' => ['$context.css_class']]); - $expectedClassAttr = new OptionValueBag(); - $expectedClassAttr->add('test_class'); + $this->processor->expects($deferred ? $this->once(): $this->never()) + ->method('processExpressions') + ->with($view->vars, $context, $data, true, 'json'); - $view->vars['expr_object'] = $expr; - $view->vars['expr_array'] = ['@true' => null]; - $view->vars['not_expr_array'] = ['\@true' => null]; - $view->vars['scalar'] = 123; - $view->vars['attr']['enabled'] = ['@true' => null]; - $view->vars['attr']['data-scalar'] = 'foo'; - $view->vars['attr']['data-expr'] = ['@true' => null]; - $view->vars['attr']['class'] = $classAttr; - $view->vars['label_attr']['enabled'] = ['@true' => null]; - $view->vars['array_with_expr'] = ['item1' => 'val1', 'item2' => ['@true' => null]]; - - $this->expressionAssembler->expects($this->exactly(6)) - ->method('assemble') - ->will( - $this->returnValueMap( - [ - [['@true' => null], new Condition\True()], - [['@value' => ['$context.css_class']], $classExpr] - ] - ) - ); - - $context['expressions_evaluate'] = true; $this->extension->finishView($view, $block, []); - - $this->assertSame( - true, - $view->vars['expr_object'], - 'Failed asserting that an expression is evaluated' - ); - $this->assertSame( - true, - $view->vars['expr_array'], - 'Failed asserting that an expression is assembled and evaluated' - ); - $this->assertSame( - ['@true' => null], - $view->vars['not_expr_array'], - 'Failed asserting that a backslash at the begin of the array key is removed' - ); - $this->assertSame( - 123, - $view->vars['scalar'], - 'Failed asserting that a scalar value is not changed' - ); - $this->assertSame( - true, - $view->vars['attr']['enabled'], - 'Failed asserting that an expression in "attr" is assembled and evaluated' - ); - $this->assertSame( - 'foo', - $view->vars['attr']['data-scalar'], - 'Failed asserting that "attr.data-scalar" exists' - ); - $this->assertSame( - true, - $view->vars['attr']['data-expr'], - 'Failed asserting that "attr.data-expr" is assembled and evaluated' - ); - $this->assertEquals( - $expectedClassAttr, - $view->vars['attr']['class'], - 'Failed asserting that "attr.class" is assembled and evaluated' - ); - $this->assertSame( - true, - $view->vars['label_attr']['enabled'], - 'Failed asserting that an expression in "label_attr" is assembled and evaluated' - ); - $this->assertSame( - ['item1' => 'val1', 'item2' => true], - $view->vars['array_with_expr'], - 'Failed asserting that an expression is assembled and evaluated in nested array' - ); } - public function testFinishViewDoNothingIfEvaluationOfExpressionsDisabledAndEncodingIsNotSet() + /** + * @return array + */ + public function deferredDataProvider() { - $context = new LayoutContext(); - $block = $this->getMock('Oro\Component\Layout\BlockInterface'); - $block->expects($this->once()) - ->method('getContext') - ->will($this->returnValue($context)); - $block->expects($this->never()) - ->method('getData'); - $view = new BlockView(); - - $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface'); - $expr->expects($this->never()) - ->method('evaluate'); - $expr->expects($this->never()) - ->method('toArray'); - - $view->vars['expr_object'] = $expr; - $view->vars['expr_array'] = ['@true' => null]; - $view->vars['not_expr_array'] = ['\@true' => null]; - $view->vars['scalar'] = 123; - $view->vars['attr']['enabled'] = ['@true' => null]; - $view->vars['label_attr']['enabled'] = ['@true' => null]; - - $this->expressionAssembler->expects($this->never()) - ->method('assemble'); - - $initialVars = $view->vars; - - $context['expressions_evaluate'] = false; - $this->extension->finishView($view, $block, []); - - $this->assertSame($initialVars, $view->vars); + return [ + ['expressions_evaluate_deferred' => true], + ['expressions_evaluate_deferred' => false] + ]; } - public function testFinishViewEncodesAllExpressions() + /** + * @param bool $evaluateDeferred + * @return LayoutContext + */ + protected function getContextMock($evaluateDeferred) { $context = new LayoutContext(); - $data = $this->getMock('Oro\Component\Layout\DataAccessorInterface'); - $block = $this->getMock('Oro\Component\Layout\BlockInterface'); - $block->expects($this->once()) - ->method('getContext') - ->will($this->returnValue($context)); - $block->expects($this->once()) - ->method('getData') - ->will($this->returnValue($data)); - $view = new BlockView(); - - $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface'); - $expr->expects($this->once()) - ->method('toArray') - ->will($this->returnValue(['@true' => null])); - - $classExpr = new Func\GetValue(); - $classExpr->initialize([new PropertyPath('context.css_class')]); - $classAttr = new OptionValueBag(); - $classAttr->add(['@value' => ['$context.css_class']]); - $expectedClassAttr = new OptionValueBag(); - $expectedClassAttr->add('{"@value":{"parameters":["$context.css_class"]}}'); - - $view->vars['expr_object'] = $expr; - $view->vars['expr_array'] = ['@true' => null]; - $view->vars['not_expr_array'] = ['\@true' => null]; - $view->vars['scalar'] = 123; - $view->vars['attr']['enabled'] = ['@true' => null]; - $view->vars['attr']['class'] = $classAttr; - $view->vars['label_attr']['enabled'] = ['@true' => null]; - - $this->expressionAssembler->expects($this->exactly(4)) - ->method('assemble') - ->will( - $this->returnValueMap( - [ - [['@true' => null], new Condition\True()], - [['@value' => ['$context.css_class']], $classExpr] - ] - ) - ); + $context->set('expressions_evaluate_deferred', $evaluateDeferred); + $context->set('expressions_evaluate', true); + $context->set('expressions_encoding', 'json'); - $context['expressions_evaluate'] = false; - $context['expressions_encoding'] = 'json'; - $this->extension->finishView($view, $block, []); + return $context; + } - $this->assertSame( - '{"@true":null}', - $view->vars['expr_object'], - 'Failed asserting that an expression is encoded' - ); - $this->assertSame( - '{"@true":null}', - $view->vars['expr_array'], - 'Failed asserting that an expression is assembled and encoded' - ); - $this->assertSame( - ['@true' => null], - $view->vars['not_expr_array'], - 'Failed asserting that a backslash at the begin of the array key is removed' - ); - $this->assertSame( - 123, - $view->vars['scalar'], - 'Failed asserting that a scalar value is not changed' - ); - $this->assertSame( - '{"@true":null}', - $view->vars['attr']['enabled'], - 'Failed asserting that an expression in "attr" is assembled and encoded' - ); - $this->assertEquals( - $expectedClassAttr, - $view->vars['attr']['class'], - 'Failed asserting that "attr.class" is assembled and encoded' - ); - $this->assertSame( - '{"@true":null}', - $view->vars['label_attr']['enabled'], - 'Failed asserting that an expression in "label_attr" is assembled and encoded' - ); + /** + * @return DataAccessorInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected function getDataAccessorMock() + { + return $this->getMock('Oro\Component\Layout\DataAccessorInterface'); } } diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/FormTypeTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/FormTypeTest.php index d8e2e4d4acf..ce96a10eab9 100644 --- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/FormTypeTest.php +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/FormTypeTest.php @@ -28,6 +28,7 @@ public function optionsDataProvider() 'no options' => [ 'options' => [], 'expected' => [ + 'form' => null, 'form_name' => 'form', 'preferred_fields' => [], 'groups' => [], @@ -41,6 +42,7 @@ public function optionsDataProvider() 'form_name' => 'test' ], 'expected' => [ + 'form' => null, 'form_name' => 'test', 'preferred_fields' => [], 'groups' => [], @@ -55,6 +57,7 @@ public function optionsDataProvider() 'form_prefix' => 'test_prefix' ], 'expected' => [ + 'form' => null, 'form_name' => 'test_form', 'preferred_fields' => [], 'groups' => [], @@ -73,6 +76,7 @@ public function optionsDataProvider() 'form_group_prefix' => 'form_group_prefix_' ], 'expected' => [ + 'form' => null, 'form_name' => 'test', 'preferred_fields' => ['field1'], 'groups' => ['group1' => ['title' => 'TestGroup']], @@ -168,7 +172,7 @@ public function testBuildView() $view = new BlockView(); $block = $this->getMock('Oro\Component\Layout\BlockInterface'); - $formAccessor = $this->getMock('Oro\Bundle\LayoutBundle\Layout\Form\FormAccessorInterface'); + $formAccessor = $this->getMock('Oro\Bundle\LayoutBundle\Layout\Form\ConfigurableFormAccessorInterface'); $context = new LayoutContext(); $formView = new FormView(); diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/InputTypeTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/InputTypeTest.php new file mode 100644 index 00000000000..8fb3adf2904 --- /dev/null +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/InputTypeTest.php @@ -0,0 +1,89 @@ +getBlockType(InputType::NAME); + + $this->assertSame(InputType::NAME, $type->getName()); + } + + public function testGetParent() + { + $type = $this->getBlockType(InputType::NAME); + + $this->assertSame(BaseType::NAME, $type->getParent()); + } + + public function testSetDefaultOptions() + { + $this->assertEquals( + [ + 'type' => 'text', + 'id' => null, + 'name' => null, + 'value' => null, + 'placeholder' => null, + ], + $this->resolveOptions(InputType::NAME, []) + ); + + $options = [ + 'type' => 'password', + 'id' => 'passwordId', + 'name' => 'passwordName', + 'value' => '***', + 'placeholder' => 'Enter password', + ]; + $this->assertEquals($options, $this->resolveOptions(InputType::NAME, $options)); + } + + public function testBuildViewPassword() + { + $view = $this->getBlockView(InputType::NAME, ['type' => 'password']); + + $this->assertEquals('password', $view->vars['type']); + $this->assertEquals( + [ + 'type' => 'password', + 'autocomplete' => 'off', + ], + $view->vars['attr'] + ); + } + + public function testBuildViewWithoutOptions() + { + $view = $this->getBlockView(InputType::NAME); + + $this->assertEquals( + [ + 'type' => 'text', + ], + $view->vars['attr'] + ); + } + + public function testBuildView() + { + $options = [ + 'id' => 'usernameId', + 'name' => 'usernameName', + 'value' => 'username', + 'placeholder' => 'Enter username', + ]; + + $view = $this->getBlockView(InputType::NAME, $options); + + $this->assertEquals('text', $view->vars['type']); + $this->assertEquals(['type' => 'text'] + $options, $view->vars['attr']); + } +} diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/TextTypeTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/TextTypeTest.php index 0bfe2c3711d..47ed79343ed 100644 --- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/TextTypeTest.php +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Block/Type/TextTypeTest.php @@ -32,7 +32,7 @@ public function testBuildView() { $view = $this->getBlockView( TextType::NAME, - ['text' => 'test'] + ['text' => 'test', 'escape'=> false] ); $this->assertEquals('test', $view->vars['text']); diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/ConfigExpressionContextConfiguratorTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/ConfigExpressionContextConfiguratorTest.php index 32db1caeb6c..f11262aa34b 100644 --- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/ConfigExpressionContextConfiguratorTest.php +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/ConfigExpressionContextConfiguratorTest.php @@ -24,6 +24,7 @@ public function testDefaultValuesAfterConfigureContext() $context->resolve(); $this->assertTrue($context['expressions_evaluate']); + $this->assertFalse($context['expressions_evaluate_deferred']); $this->assertFalse(isset($context['expressions_encoding'])); } @@ -32,12 +33,14 @@ public function testConfigureContext() $context = new LayoutContext(); $context['expressions_evaluate'] = false; + $context['expressions_evaluate_deferred'] = true; $context['expressions_encoding'] = 'json'; $this->contextConfigurator->configureContext($context); $context->resolve(); $this->assertFalse($context['expressions_evaluate']); + $this->assertTrue($context['expressions_evaluate_deferred']); $this->assertEquals('json', $context['expressions_encoding']); } } diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/DependencyInjectionFormContextConfiguratorTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/DependencyInjectionFormContextConfiguratorTest.php new file mode 100644 index 00000000000..5fafa2065aa --- /dev/null +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Extension/DependencyInjectionFormContextConfiguratorTest.php @@ -0,0 +1,51 @@ +container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface'); + + $this->contextConfigurator = new DependencyInjectionFormContextConfigurator($this->container); + } + + /** + * @expectedException \Exception + * @expectedExceptionMessage formServiceId should be specified. + */ + public function testConfigureContextWithoutForm() + { + $context = new LayoutContext(); + $this->contextConfigurator->configureContext($context); + } + + public function testConfigureContext() + { + $serviceId = 'test_service_id'; + $contextOptionName = 'test_context_form'; + $this->contextConfigurator->setFormServiceId($serviceId); + $this->contextConfigurator->setContextOptionName($contextOptionName); + + $context = new LayoutContext(); + $this->contextConfigurator->configureContext($context); + $context->resolve(); + + $formAccessor = $context->get($contextOptionName); + $this->assertInstanceOf('Oro\Bundle\LayoutBundle\Layout\Form\DependencyInjectionFormAccessor', $formAccessor); + $this->assertAttributeEquals($serviceId, 'formServiceId', $formAccessor); + } +} diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/DependencyInjectionFormAccessorTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/DependencyInjectionFormAccessorTest.php index 9fc5fccee61..4cd777658ed 100644 --- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/DependencyInjectionFormAccessorTest.php +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/DependencyInjectionFormAccessorTest.php @@ -2,6 +2,7 @@ namespace Oro\Bundle\LayoutBundle\Tests\Unit\Layout\Form; +use Symfony\Component\DependencyInjection\ContainerInterface; use Symfony\Component\Form\FormView; use Oro\Bundle\LayoutBundle\Layout\Form\DependencyInjectionFormAccessor; @@ -11,7 +12,7 @@ class DependencyInjectionFormAccessorTest extends \PHPUnit_Framework_TestCase { const FORM_SERVICE_ID = 'test_service_id'; - /** @var \PHPUnit_Framework_MockObject_MockObject */ + /** @var ContainerInterface|\PHPUnit_Framework_MockObject_MockObject */ protected $container; protected function setUp() @@ -22,6 +23,8 @@ protected function setUp() public function testGetForm() { $form = $this->getMock('Symfony\Component\Form\Test\FormInterface'); + $form->expects($this->once())->method('getName')->willReturn('form_name'); + $this->container->expects($this->once()) ->method('get') ->with(self::FORM_SERVICE_ID) @@ -29,6 +32,7 @@ public function testGetForm() $formAccessor = new DependencyInjectionFormAccessor($this->container, self::FORM_SERVICE_ID); $this->assertSame($form, $formAccessor->getForm()); + $this->assertEquals('form_name', $formAccessor->getName()); } public function testToString() @@ -130,6 +134,7 @@ public function testGetView() // field1 // field2 $formView = new FormView(); + $formView->vars['id'] = self::FORM_SERVICE_ID; $field1View = new FormView($formView); $formView->children['field1'] = $field1View; $field2View = new FormView($field1View); @@ -148,6 +153,7 @@ public function testGetView() $this->assertSame($formView, $formAccessor->getView()); $this->assertSame($field1View, $formAccessor->getView('field1')); $this->assertSame($field2View, $formAccessor->getView('field1.field2')); + $this->assertSame($formView->vars['id'], $formAccessor->getId()); } public function testProcessedFields() @@ -160,4 +166,58 @@ public function testProcessedFields() $formAccessor->setProcessedFields($processedFields); $this->assertSame($processedFields, $formAccessor->getProcessedFields()); } + + public function testSetFormData() + { + $data = ['test']; + + $form = $this->getMock('Symfony\Component\Form\Test\FormInterface'); + $form->expects($this->once())->method('setData')->with($data); + $form->expects($this->once())->method('getData')->willReturn($data); + + $this->container->expects($this->once()) + ->method('get') + ->with(self::FORM_SERVICE_ID) + ->will($this->returnValue($form)); + + $formAccessor = new DependencyInjectionFormAccessor($this->container, self::FORM_SERVICE_ID); + + $formAccessor->setFormData($data); + $this->assertEquals($data, $formAccessor->getForm()->getData()); + } + + public function testSetters() + { + $formConfig = $this->getMock('Symfony\Component\Form\FormConfigInterface'); + $formView = new FormView(); + $formView->vars['multipart'] = true; + + $form = $this->getMock('Symfony\Component\Form\Test\FormInterface'); + $form->expects($this->any()) + ->method('getConfig') + ->will($this->returnValue($formConfig)); + $form->expects($this->once()) + ->method('createView') + ->will($this->returnValue($formView)); + + $this->container->expects($this->once()) + ->method('get') + ->with(self::FORM_SERVICE_ID) + ->will($this->returnValue($form)); + + $formAccessor = new DependencyInjectionFormAccessor($this->container, self::FORM_SERVICE_ID); + + $action = FormAction::createByRoute('test_route', ['foo' => 'bar']); + $formAccessor->setAction($action); + $this->assertEquals($action, $formAccessor->getAction()); + + $formAccessor->setActionRoute('test_route', []); + $this->assertEquals(FormAction::createByRoute('test_route', []), $formAccessor->getAction()); + + $formAccessor->setMethod('post'); + $this->assertEquals('post', $formAccessor->getMethod()); + + $formAccessor->setEnctype('multipart/form-data'); + $this->assertEquals('multipart/form-data', $formAccessor->getEnctype()); + } } diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/FormLayoutBuilderTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/FormLayoutBuilderTest.php index b1af145d9ed..dd49df76bfd 100644 --- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/FormLayoutBuilderTest.php +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/FormLayoutBuilderTest.php @@ -69,7 +69,7 @@ public function testFlatForm() self::FIELD_PREFIX . 'field1', self::ROOT_ID, FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field1'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->at(1)) @@ -78,7 +78,7 @@ public function testFlatForm() self::FIELD_PREFIX . 'field2', self::ROOT_ID, FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field2'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->exactly(2)) @@ -110,7 +110,7 @@ public function testCompoundChildForm() self::FIELD_PREFIX . 'field1:field11', self::ROOT_ID, FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field1.field11'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1.field11'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->at(1)) @@ -119,7 +119,7 @@ public function testCompoundChildForm() self::FIELD_PREFIX . 'field2', self::ROOT_ID, FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field2'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->exactly(2)) @@ -151,7 +151,7 @@ public function testCompoundChildFormWhichMarkedAsSimpleForm() self::FIELD_PREFIX . 'field1', self::ROOT_ID, FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field1'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->at(1)) @@ -160,7 +160,7 @@ public function testCompoundChildFormWhichMarkedAsSimpleForm() self::FIELD_PREFIX . 'field2', self::ROOT_ID, FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field2'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->exactly(2)) @@ -193,7 +193,7 @@ public function testPreferredFields() self::FIELD_PREFIX . 'field2', self::ROOT_ID, FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field2'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->at(1)) @@ -202,7 +202,7 @@ public function testPreferredFields() self::FIELD_PREFIX . 'field1', self::ROOT_ID, FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field1'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->exactly(2)) @@ -236,7 +236,7 @@ public function testPreferredCompoundFields() self::FIELD_PREFIX . 'field2:field21', self::ROOT_ID, FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field2.field21'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2.field21'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->at(1)) @@ -245,7 +245,7 @@ public function testPreferredCompoundFields() self::FIELD_PREFIX . 'field1', self::ROOT_ID, FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field1'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->exactly(2)) @@ -296,6 +296,7 @@ protected function getForm($compound = true, $type = 'form', $name = 'some_form' protected function getOptions() { return [ + 'form' => null, 'form_name' => self::FORM_NAME, 'preferred_fields' => [], 'form_field_prefix' => self::FIELD_PREFIX, diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/GroupingFormLayoutBuilderTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/GroupingFormLayoutBuilderTest.php index e6a4bcffbc2..f3c680d969b 100644 --- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/GroupingFormLayoutBuilderTest.php +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Form/GroupingFormLayoutBuilderTest.php @@ -102,7 +102,7 @@ public function testGrouping() self::FIELD_PREFIX . 'field1', self::GROUP_PREFIX . 'group2', FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field1'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->at(1)) @@ -111,7 +111,7 @@ public function testGrouping() self::FIELD_PREFIX . 'field2:field21', self::GROUP_PREFIX . 'group1', FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field2.field21'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2.field21'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->at(2)) @@ -177,7 +177,7 @@ public function testGroupingWithPreferredFields() self::FIELD_PREFIX . 'field2:field22', self::GROUP_PREFIX . 'group1', FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field2.field22'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2.field22'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->at(1)) @@ -186,7 +186,7 @@ public function testGroupingWithPreferredFields() self::FIELD_PREFIX . 'field1', self::GROUP_PREFIX . 'group2', FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field1'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->at(2)) @@ -195,7 +195,7 @@ public function testGroupingWithPreferredFields() self::FIELD_PREFIX . 'field2:field21', self::GROUP_PREFIX . 'group1', FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field2.field21'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2.field21'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->at(3)) @@ -261,7 +261,7 @@ public function testGroupingByParentFieldPath() self::FIELD_PREFIX . 'field1', self::GROUP_PREFIX . 'group2', FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field1'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field1'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->at(1)) @@ -270,7 +270,7 @@ public function testGroupingByParentFieldPath() self::FIELD_PREFIX . 'field2:field21', self::GROUP_PREFIX . 'group1', FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field2.field21'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2.field21'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->at(2)) @@ -279,7 +279,7 @@ public function testGroupingByParentFieldPath() self::FIELD_PREFIX . 'field2:field22', self::GROUP_PREFIX . 'group1', FormFieldType::NAME, - ['form_name' => self::FORM_NAME, 'field_path' => 'field2.field22'] + ['form' => null, 'form_name' => self::FORM_NAME, 'field_path' => 'field2.field22'] ) ->will($this->returnSelf()); $this->layoutManipulator->expects($this->at(3)) @@ -320,6 +320,7 @@ public function testGroupingByParentFieldPath() protected function getOptions() { return [ + 'form' => null, 'form_name' => self::FORM_NAME, 'preferred_fields' => [], 'groups' => [], diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Processor/ConfigExpressionProcessorTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Processor/ConfigExpressionProcessorTest.php new file mode 100644 index 00000000000..2b05d740d37 --- /dev/null +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/Processor/ConfigExpressionProcessorTest.php @@ -0,0 +1,245 @@ +expressionAssembler = $this->getMock('Oro\Component\ConfigExpression\AssemblerInterface'); + + $encoderRegistry = $this + ->getMockBuilder('Oro\Bundle\LayoutBundle\Layout\Encoder\ConfigExpressionEncoderRegistry') + ->disableOriginalConstructor() + ->getMock(); + $encoderRegistry->expects($this->any()) + ->method('getEncoder') + ->with('json') + ->will($this->returnValue(new JsonConfigExpressionEncoder())); + + $this->processor = new ConfigExpressionProcessor( + $this->expressionAssembler, + $encoderRegistry + ); + } + /** + * @SuppressWarnings(PHPMD.ExcessiveMethodLength) + */ + public function testProcessExpressionsEvaluatesAllExpressions() + { + $context = new LayoutContext(); + $context->set('css_class', 'test_class'); + $data = $this->getMock('Oro\Component\Layout\DataAccessorInterface'); + + $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface'); + $expr->expects($this->once()) + ->method('evaluate') + ->with(['context' => $context, 'data' => $data]) + ->will($this->returnValue(true)); + + $classExpr = new Func\GetValue(); + $classExpr->initialize([new PropertyPath('context.css_class')]); + $classExpr->setContextAccessor(new ContextAccessor()); + $classAttr = new OptionValueBag(); + $classAttr->add(['@value' => ['$context.css_class']]); + $expectedClassAttr = new OptionValueBag(); + $expectedClassAttr->add('test_class'); + + $values['expr_object'] = $expr; + $values['expr_array'] = ['@true' => null]; + $values['not_expr_array'] = ['\@true' => null]; + $values['scalar'] = 123; + $values['attr']['enabled'] = ['@true' => null]; + $values['attr']['data-scalar'] = 'foo'; + $values['attr']['data-expr'] = ['@true' => null]; + $values['attr']['class'] = $classAttr; + $values['label_attr']['enabled'] = ['@true' => null]; + $values['array_with_expr'] = ['item1' => 'val1', 'item2' => ['@true' => null]]; + + $this->expressionAssembler->expects($this->exactly(6)) + ->method('assemble') + ->will( + $this->returnValueMap( + [ + [['@true' => null], new Condition\True()], + [['@value' => ['$context.css_class']], $classExpr] + ] + ) + ); + + $this->processor->processExpressions($values, $context, $data, true, null); + + $this->assertSame( + true, + $values['expr_object'], + 'Failed asserting that an expression is evaluated' + ); + $this->assertSame( + true, + $values['expr_array'], + 'Failed asserting that an expression is assembled and evaluated' + ); + $this->assertSame( + ['@true' => null], + $values['not_expr_array'], + 'Failed asserting that a backslash at the begin of the array key is removed' + ); + $this->assertSame( + 123, + $values['scalar'], + 'Failed asserting that a scalar value is not changed' + ); + $this->assertSame( + true, + $values['attr']['enabled'], + 'Failed asserting that an expression in "attr" is assembled and evaluated' + ); + $this->assertSame( + 'foo', + $values['attr']['data-scalar'], + 'Failed asserting that "attr.data-scalar" exists' + ); + $this->assertSame( + true, + $values['attr']['data-expr'], + 'Failed asserting that "attr.data-expr" is assembled and evaluated' + ); + $this->assertEquals( + $expectedClassAttr, + $values['attr']['class'], + 'Failed asserting that "attr.class" is assembled and evaluated' + ); + $this->assertSame( + true, + $values['label_attr']['enabled'], + 'Failed asserting that an expression in "label_attr" is assembled and evaluated' + ); + $this->assertSame( + ['item1' => 'val1', 'item2' => true], + $values['array_with_expr'], + 'Failed asserting that an expression is assembled and evaluated in nested array' + ); + } + + public function testProcessExpressionsDoNothingIfEvaluationOfExpressionsDisabledAndEncodingIsNotSet() + { + $context = new LayoutContext(); + $data = $this->getMock('Oro\Component\Layout\DataAccessorInterface'); + + $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface'); + $expr->expects($this->never()) + ->method('evaluate'); + $expr->expects($this->never()) + ->method('toArray'); + + $values['expr_object'] = $expr; + $values['expr_array'] = ['@true' => null]; + $values['not_expr_array'] = ['\@true' => null]; + $values['scalar'] = 123; + $values['attr']['enabled'] = ['@true' => null]; + $values['label_attr']['enabled'] = ['@true' => null]; + + $this->expressionAssembler->expects($this->never()) + ->method('assemble'); + + $initialVars = $values; + + $this->processor->processExpressions($values, $context, $data, false, null); + + $this->assertSame($initialVars, $values); + } + + public function testProcessExpressionsEncodesAllExpressions() + { + $context = new LayoutContext(); + $context->set('expressions_evaluate_deferred', true); + $data = $this->getMock('Oro\Component\Layout\DataAccessorInterface'); + + $expr = $this->getMock('Oro\Component\ConfigExpression\ExpressionInterface'); + $expr->expects($this->once()) + ->method('toArray') + ->will($this->returnValue(['@true' => null])); + + $classExpr = new Func\GetValue(); + $classExpr->initialize([new PropertyPath('context.css_class')]); + $classAttr = new OptionValueBag(); + $classAttr->add(['@value' => ['$context.css_class']]); + $expectedClassAttr = new OptionValueBag(); + $expectedClassAttr->add('{"@value":{"parameters":["$context.css_class"]}}'); + + $values['expr_object'] = $expr; + $values['expr_array'] = ['@true' => null]; + $values['not_expr_array'] = ['\@true' => null]; + $values['scalar'] = 123; + $values['attr']['enabled'] = ['@true' => null]; + $values['attr']['class'] = $classAttr; + $values['label_attr']['enabled'] = ['@true' => null]; + + $this->expressionAssembler->expects($this->exactly(4)) + ->method('assemble') + ->will( + $this->returnValueMap( + [ + [['@true' => null], new Condition\True()], + [['@value' => ['$context.css_class']], $classExpr] + ] + ) + ); + + $this->processor->processExpressions($values, $context, $data, false, 'json'); + + $this->assertSame( + '{"@true":null}', + $values['expr_object'], + 'Failed asserting that an expression is encoded' + ); + $this->assertSame( + '{"@true":null}', + $values['expr_array'], + 'Failed asserting that an expression is assembled and encoded' + ); + $this->assertSame( + ['@true' => null], + $values['not_expr_array'], + 'Failed asserting that a backslash at the begin of the array key is removed' + ); + $this->assertSame( + 123, + $values['scalar'], + 'Failed asserting that a scalar value is not changed' + ); + $this->assertSame( + '{"@true":null}', + $values['attr']['enabled'], + 'Failed asserting that an expression in "attr" is assembled and encoded' + ); + $this->assertEquals( + $expectedClassAttr, + $values['attr']['class'], + 'Failed asserting that "attr.class" is assembled and encoded' + ); + $this->assertSame( + '{"@true":null}', + $values['label_attr']['enabled'], + 'Failed asserting that an expression in "label_attr" is assembled and encoded' + ); + } +} diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/TwigLayoutRendererTest.php b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/TwigLayoutRendererTest.php index 146a2a297a2..703c6f9734a 100644 --- a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/TwigLayoutRendererTest.php +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Layout/TwigLayoutRendererTest.php @@ -2,19 +2,26 @@ namespace Oro\Bundle\LayoutBundle\Tests\Unit\Layout; +use Symfony\Bridge\Twig\Form\TwigRendererInterface; + use Oro\Bundle\LayoutBundle\Layout\TwigLayoutRenderer; +use Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface; class TwigLayoutRendererTest extends \PHPUnit_Framework_TestCase { public function testEnvironmentSet() { + /** @var TwigRendererInterface|\PHPUnit_Framework_MockObject_MockObject $innerRenderer */ $innerRenderer = $this->getMock('Symfony\Bridge\Twig\Form\TwigRendererInterface'); + /** @var \Twig_Environment $environment */ $environment = $this->getMockBuilder('\Twig_Environment')->getMock(); $innerRenderer->expects($this->once()) ->method('setEnvironment') ->with($this->identicalTo($environment)); + /** @var FormRendererEngineInterface $formRenderer */ + $formRenderer = $this->getMock('Oro\Component\Layout\Form\RendererEngine\FormRendererEngineInterface'); - new TwigLayoutRenderer($innerRenderer, $environment); + new TwigLayoutRenderer($innerRenderer, $formRenderer, $environment); } } diff --git a/src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/oro-black/theme.yml b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/oro-black/theme.yml new file mode 100644 index 00000000000..8ea6f7f8f7c --- /dev/null +++ b/src/Oro/Bundle/LayoutBundle/Tests/Unit/Stubs/Bundles/TestBundle/Resources/views/layouts/oro-black/theme.yml @@ -0,0 +1 @@ +description: Oro Black theme description diff --git a/src/Oro/Bundle/LocaleBundle/Formatter/DateTimeFormatter.php b/src/Oro/Bundle/LocaleBundle/Formatter/DateTimeFormatter.php index 348becd9051..a5a35624f19 100644 --- a/src/Oro/Bundle/LocaleBundle/Formatter/DateTimeFormatter.php +++ b/src/Oro/Bundle/LocaleBundle/Formatter/DateTimeFormatter.php @@ -100,12 +100,14 @@ public function formatTime($date, $timeType = null, $locale = null, $timeZone = /** * Get the pattern used for the IntlDateFormatter * - * @param int|string $dateType Constant of IntlDateFormatter (NONE, FULL, LONG, MEDIUM, SHORT) or it's string name - * @param int|string $timeType Constant IntlDateFormatter (NONE, FULL, LONG, MEDIUM, SHORT) or it's string name + * @param int|string $dateType Constant of IntlDateFormatter (NONE, FULL, LONG, MEDIUM, SHORT) or it's string name + * @param int|string $timeType Constant IntlDateFormatter (NONE, FULL, LONG, MEDIUM, SHORT) or it's string name * @param string|null $locale + * @param string|null $value + * * @return string */ - public function getPattern($dateType, $timeType, $locale = null) + public function getPattern($dateType, $timeType, $locale = null, $value = null) { if (!$locale) { $locale = $this->localeSettings->getLocale(); @@ -131,15 +133,17 @@ public function getPattern($dateType, $timeType, $locale = null) * * @param string|int|null $dateType * @param string|int|null $timeType - * @param string|null $locale - * @param string|null $timeZone - * @param string|null $pattern + * @param string|null $locale + * @param string|null $timeZone + * @param string|null $pattern + * @param string|null $value + * * @return \IntlDateFormatter */ - protected function getFormatter($dateType, $timeType, $locale, $timeZone, $pattern) + protected function getFormatter($dateType, $timeType, $locale, $timeZone, $pattern, $value = null) { if (!$pattern) { - $pattern = $this->getPattern($dateType, $timeType, $locale); + $pattern = $this->getPattern($dateType, $timeType, $locale, $value); } return new \IntlDateFormatter( $this->localeSettings->getLanguage(), diff --git a/src/Oro/Bundle/LocaleBundle/Resources/public/js/formatter/address.js b/src/Oro/Bundle/LocaleBundle/Resources/public/js/formatter/address.js index 2466806e2e6..e4ec84de5fd 100644 --- a/src/Oro/Bundle/LocaleBundle/Resources/public/js/formatter/address.js +++ b/src/Oro/Bundle/LocaleBundle/Resources/public/js/formatter/address.js @@ -1,5 +1,5 @@ -define(['../locale-settings', './name' - ], function(localeSettings, nameFormatter) { +define(['jquery', '../locale-settings', './name' + ], function($, localeSettings, nameFormatter) { 'use strict'; /** @@ -50,8 +50,10 @@ define(['../locale-settings', './name' }); var addressLines = formatted - .replace(/ *(\\n)+/g, '\\n') .split('\\n'); + addressLines = addressLines.filter(function(element) { + return $.trim(element) !== ''; + }); if (typeof newLine === 'function') { for (var i = 0; i < addressLines.length; i++) { addressLines[i] = newLine(addressLines[i]); diff --git a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/AbstractFormatConverterTestCase.php b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/AbstractFormatConverterTestCase.php index 8c53f87618f..9190ba3c756 100644 --- a/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/AbstractFormatConverterTestCase.php +++ b/src/Oro/Bundle/LocaleBundle/Tests/Unit/Converter/AbstractFormatConverterTestCase.php @@ -30,27 +30,27 @@ abstract class AbstractFormatConverterTestCase extends \PHPUnit_Framework_TestCa /** * @var array */ - protected $localFormatMap = array( - array(null, null, self::LOCALE_EN, "MMM d, y h:mm a"), - array(\IntlDateFormatter::LONG, \IntlDateFormatter::MEDIUM, self::LOCALE_EN, "MMMM d, y h:mm:ss a"), - array(\IntlDateFormatter::LONG, \IntlDateFormatter::NONE, self::LOCALE_EN, "MMMM d, y"), - array(\IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT, self::LOCALE_EN, "MMM d, y h:mm a"), - array(\IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE, self::LOCALE_EN, "MMM d, y"), - array(null, \IntlDateFormatter::NONE, self::LOCALE_EN, "MMM d, y"), - array(\IntlDateFormatter::NONE, \IntlDateFormatter::MEDIUM, self::LOCALE_EN, "h:mm:ss a"), - array(\IntlDateFormatter::NONE, \IntlDateFormatter::SHORT, self::LOCALE_EN, "h:mm a"), - array(\IntlDateFormatter::NONE, null, self::LOCALE_EN, "h:mm a"), - - array(null, null, self::LOCALE_RU, "dd.MM.yyyy H:mm"), - array(\IntlDateFormatter::LONG, \IntlDateFormatter::MEDIUM, self::LOCALE_RU, "d MMMM y 'г.' H:mm:ss"), - array(\IntlDateFormatter::LONG, \IntlDateFormatter::NONE, self::LOCALE_RU, "d MMMM y 'г.'"), - array(\IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT, self::LOCALE_RU, "dd.MM.yyyy H:mm"), - array(\IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE, self::LOCALE_RU, "dd.MM.yyyy"), - array(null, \IntlDateFormatter::NONE, self::LOCALE_RU, "dd.MM.yyyy"), - array(\IntlDateFormatter::NONE, \IntlDateFormatter::MEDIUM, self::LOCALE_RU, "H:mm:ss"), - array(\IntlDateFormatter::NONE, \IntlDateFormatter::SHORT, self::LOCALE_RU, "H:mm"), - array(\IntlDateFormatter::NONE, null, self::LOCALE_RU, "H:mm"), - ); + protected $localFormatMap = [ + [null, null, self::LOCALE_EN, null, "MMM d, y h:mm a"], + [\IntlDateFormatter::LONG, \IntlDateFormatter::MEDIUM, self::LOCALE_EN, null, "MMMM d, y h:mm:ss a"], + [\IntlDateFormatter::LONG, \IntlDateFormatter::NONE, self::LOCALE_EN, null, "MMMM d, y"], + [\IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT, self::LOCALE_EN, null, "MMM d, y h:mm a"], + [\IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE, self::LOCALE_EN, null, "MMM d, y"], + [null, \IntlDateFormatter::NONE, self::LOCALE_EN, null, "MMM d, y"], + [\IntlDateFormatter::NONE, \IntlDateFormatter::MEDIUM, self::LOCALE_EN, null, "h:mm:ss a"], + [\IntlDateFormatter::NONE, \IntlDateFormatter::SHORT, self::LOCALE_EN, null, "h:mm a"], + [\IntlDateFormatter::NONE, null, self::LOCALE_EN, null, "h:mm a"], + + [null, null, self::LOCALE_RU, null, "dd.MM.yyyy H:mm"], + [\IntlDateFormatter::LONG, \IntlDateFormatter::MEDIUM, self::LOCALE_RU, null, "d MMMM y 'г.' H:mm:ss"], + [\IntlDateFormatter::LONG, \IntlDateFormatter::NONE, self::LOCALE_RU, null, "d MMMM y 'г.'"], + [\IntlDateFormatter::MEDIUM, \IntlDateFormatter::SHORT, self::LOCALE_RU, null, "dd.MM.yyyy H:mm"], + [\IntlDateFormatter::MEDIUM, \IntlDateFormatter::NONE, self::LOCALE_RU, null, "dd.MM.yyyy"], + [null, \IntlDateFormatter::NONE, self::LOCALE_RU, null, "dd.MM.yyyy"], + [\IntlDateFormatter::NONE, \IntlDateFormatter::MEDIUM, self::LOCALE_RU, null, "H:mm:ss"], + [\IntlDateFormatter::NONE, \IntlDateFormatter::SHORT, self::LOCALE_RU, null, "H:mm"], + [\IntlDateFormatter::NONE, null, self::LOCALE_RU, null, "H:mm"], + ]; /** * @SuppressWarnings(PHPMD.UnusedLocalVariable) @@ -59,7 +59,7 @@ protected function setUp() { $this->formatter = $this->getMockBuilder('Oro\Bundle\LocaleBundle\Formatter\DateTimeFormatter') ->disableOriginalConstructor() - ->setMethods(array('getPattern')) + ->setMethods(['getPattern']) ->getMock(); $this->formatter->expects($this->any()) @@ -103,8 +103,9 @@ abstract protected function createFormatConverter(); /** * @param string $expected - * @param int $dateFormat + * @param int $dateFormat * @param string $locale + * * @dataProvider getDateFormatDataProvider */ public function testGetDateFormat($expected, $dateFormat, $locale) @@ -119,8 +120,9 @@ abstract public function getDateFormatDataProvider(); /** * @param string $expected - * @param int $timeFormat + * @param int $timeFormat * @param string $locale + * * @dataProvider getTimeFormatDataProvider */ public function testGetTimeFormat($expected, $timeFormat, $locale) @@ -135,9 +137,10 @@ abstract public function getTimeFormatDataProvider(); /** * @param string $expected - * @param int $dateFormat - * @param int $timeFormat + * @param int $dateFormat + * @param int $timeFormat * @param string $locale + * * @dataProvider getDateTimeFormatDataProvider */ public function testGetDateTimeFormat($expected, $dateFormat, $timeFormat, $locale) @@ -153,6 +156,7 @@ abstract public function getDateTimeFormatDataProvider(); /** * @param string $expected * @param string $locale + * * @dataProvider getDateFormatDayProvider */ public function testGetDayFormat($expected, $locale) diff --git a/src/Oro/Bundle/MigrationBundle/Event/MigrationEvent.php b/src/Oro/Bundle/MigrationBundle/Event/MigrationEvent.php index 24f0c34a237..4933452936e 100644 --- a/src/Oro/Bundle/MigrationBundle/Event/MigrationEvent.php +++ b/src/Oro/Bundle/MigrationBundle/Event/MigrationEvent.php @@ -3,7 +3,10 @@ namespace Oro\Bundle\MigrationBundle\Event; use Doctrine\DBAL\Connection; + use Symfony\Component\EventDispatcher\Event; + +use Oro\Bundle\EntityBundle\Tools\SafeDatabaseChecker; use Oro\Bundle\MigrationBundle\Migration\Migration; class MigrationEvent extends Event @@ -61,7 +64,7 @@ public function getMigrations() */ public function getData($sql, array $params = array(), $types = array()) { - $this->ensureConnected(); + $this->connection->connect(); return $this->connection->fetchAll($sql, $params, $types); } @@ -74,28 +77,6 @@ public function getData($sql, array $params = array(), $types = array()) */ public function isTableExist($tableName) { - $result = false; - try { - $this->ensureConnected(); - - $result = $this->connection->isConnected() - && (bool)array_intersect( - [$tableName], - $this->connection->getSchemaManager()->listTableNames() - ); - } catch (\PDOException $e) { - } - - return $result; - } - - /** - * Makes sure that the connection is open - */ - protected function ensureConnected() - { - if (!$this->connection->isConnected()) { - $this->connection->connect(); - } + return SafeDatabaseChecker::tablesExist($this->connection, $tableName); } } diff --git a/src/Oro/Bundle/NavigationBundle/Event/JsRoutingDumpListener.php b/src/Oro/Bundle/NavigationBundle/Event/JsRoutingDumpListener.php new file mode 100644 index 00000000000..e0ce0c7ac24 --- /dev/null +++ b/src/Oro/Bundle/NavigationBundle/Event/JsRoutingDumpListener.php @@ -0,0 +1,31 @@ +assetVersionManager = $assetVersionManager; + } + + /** + * @param ConsoleCommandEvent $event + */ + public function onConsoleCommand(ConsoleCommandEvent $event) + { + if ('fos:js-routing:dump' === $event->getCommand()->getName()) { + $this->assetVersionManager->updateAssetVersion('routing'); + } + } +} diff --git a/src/Oro/Bundle/NavigationBundle/OroNavigationBundle.php b/src/Oro/Bundle/NavigationBundle/OroNavigationBundle.php index 650f573ae67..817c28a6192 100644 --- a/src/Oro/Bundle/NavigationBundle/OroNavigationBundle.php +++ b/src/Oro/Bundle/NavigationBundle/OroNavigationBundle.php @@ -8,6 +8,7 @@ use Oro\Bundle\NavigationBundle\DependencyInjection\Compiler\TagGeneratorPass; use Oro\Bundle\NavigationBundle\DependencyInjection\Compiler\MenuBuilderChainPass; use Oro\Bundle\NavigationBundle\DependencyInjection\Compiler\ChainBreadcrumbManagerPass; +use Oro\Bundle\UIBundle\DependencyInjection\Compiler\DynamicAssetVersionPass; class OroNavigationBundle extends Bundle { @@ -21,5 +22,6 @@ public function build(ContainerBuilder $container) $container->addCompilerPass(new MenuBuilderChainPass()); $container->addCompilerPass(new TagGeneratorPass()); $container->addCompilerPass(new ChainBreadcrumbManagerPass()); + $container->addCompilerPass(new DynamicAssetVersionPass('routing')); } } diff --git a/src/Oro/Bundle/NavigationBundle/Resources/config/oro/app.yml b/src/Oro/Bundle/NavigationBundle/Resources/config/oro/app.yml new file mode 100644 index 00000000000..4f665b6449e --- /dev/null +++ b/src/Oro/Bundle/NavigationBundle/Resources/config/oro/app.yml @@ -0,0 +1,10 @@ +framework: + templating: + packages: + routing: + version: %assets_version% + version_format: %%s?dynamic_version=%%s + # the default format cannot be used due the problem with urlArgs in require js + # in case if both static and dynamic versions exist we have duplicate of asset version parameter, + # something like this: routes.js?version=v123&version=v123-1 + # version_format: ~ # use the default format diff --git a/src/Oro/Bundle/NavigationBundle/Resources/config/services.yml b/src/Oro/Bundle/NavigationBundle/Resources/config/services.yml index 8a954840038..24bfc914cf9 100644 --- a/src/Oro/Bundle/NavigationBundle/Resources/config/services.yml +++ b/src/Oro/Bundle/NavigationBundle/Resources/config/services.yml @@ -244,6 +244,13 @@ services: tags: - { name: kernel.event_listener, event: kernel.request, method: onKernelRequest } + oro_navigation.event.js_routing_dump_listener: + class: Oro\Bundle\NavigationBundle\Event\JsRoutingDumpListener + arguments: + - @oro_ui.dynamic_asset_version_manager + tags: + - { name: kernel.event_listener, event: console.command, method: onConsoleCommand } + oro_navigation.content.topic_sender: class: %oro_navigation.content.topic_sender.class% arguments: diff --git a/src/Oro/Bundle/NavigationBundle/Resources/public/images/pinbar-location.jpg b/src/Oro/Bundle/NavigationBundle/Resources/public/images/pinbar-location.jpg new file mode 100644 index 00000000000..f7796c9b918 Binary files /dev/null and b/src/Oro/Bundle/NavigationBundle/Resources/public/images/pinbar-location.jpg differ diff --git a/src/Oro/Bundle/NavigationBundle/Resources/public/js/content-manager.js b/src/Oro/Bundle/NavigationBundle/Resources/public/js/content-manager.js index 0ed7e33c6a0..6ef9692e6e5 100644 --- a/src/Oro/Bundle/NavigationBundle/Resources/public/js/content-manager.js +++ b/src/Oro/Bundle/NavigationBundle/Resources/public/js/content-manager.js @@ -292,9 +292,6 @@ define([ */ add: function() { var path; - if (current.path[0] !== '/') { - current.path = '/' + current.path; - } path = current.path; pagesCache[path] = current; }, @@ -327,7 +324,7 @@ define([ * @param {string=} hash */ saveState: function(key, value, hash) { - if (value !== null) { + if (value !== null && value !== void 0) { current.state[key] = value; } else { delete current.state[key]; @@ -408,7 +405,7 @@ define([ checkState: function(key, hash) { var query; query = Chaplin.utils.queryParams.parse(current.query); - return query[key] === hash; + return query[key] === hash || query[key] === void 0 && hash === null; }, /** diff --git a/src/Oro/Bundle/NavigationBundle/Resources/translations/messages.en.yml b/src/Oro/Bundle/NavigationBundle/Resources/translations/messages.en.yml index b2b654e9b8f..d214e595db6 100644 --- a/src/Oro/Bundle/NavigationBundle/Resources/translations/messages.en.yml +++ b/src/Oro/Bundle/NavigationBundle/Resources/translations/messages.en.yml @@ -2,8 +2,7 @@ oro: navigation: help: title: How To Use Pinbar - save: Use the Pin Bar to “pin” documents and pages you want to continuously work on by clicking on the minimize button while on a specific page. - restore: To restore a page simply click on the title of the page you want to work on so that it is maximized back to your working area. + message: Use pin icon on the right top corner of page to create fast access link in the pinbar. menu: pinbar.label: Pinbar history.label: History diff --git a/src/Oro/Bundle/NavigationBundle/Resources/views/Js/requirejs.config.js.twig b/src/Oro/Bundle/NavigationBundle/Resources/views/Js/requirejs.config.js.twig index e6134340824..ec5202e0c99 100644 --- a/src/Oro/Bundle/NavigationBundle/Resources/views/Js/requirejs.config.js.twig +++ b/src/Oro/Bundle/NavigationBundle/Resources/views/Js/requirejs.config.js.twig @@ -26,7 +26,7 @@ require({ {% if app.debug %} 'oro/routes': '{{ path('fos_js_routing_js', {"callback": "fos.Router.setData"}) }}' {% else %} - 'oro/routes': '../js/routes' + 'oro/routes': {{ asset('../js/routes.js', 'routing')|json_encode|raw }} {% endif %} } }); diff --git a/src/Oro/Bundle/NavigationBundle/Resources/views/Pinbar/help.html.twig b/src/Oro/Bundle/NavigationBundle/Resources/views/Pinbar/help.html.twig index fcf952c682d..5a1fe633356 100644 --- a/src/Oro/Bundle/NavigationBundle/Resources/views/Pinbar/help.html.twig +++ b/src/Oro/Bundle/NavigationBundle/Resources/views/Pinbar/help.html.twig @@ -6,9 +6,11 @@
{{ 'oro.navigation.help.title'|trans }}
- {{ 'oro.navigation.help.save'|trans }}
-
- {{ 'oro.navigation.help.restore'|trans }}
+ {{ 'oro.navigation.help.message'|trans }}
+
+ 