Skip to content

Commit

Permalink
EZP-28636: Universal Discovery Widget should have configurable root l…
Browse files Browse the repository at this point in the history
…ocation ID (#255)

* EZP-28636: Universal Discovery Widget should have configurable root location ID

* EZP-28624: Recompiled JavaScript components
  • Loading branch information
webhdx authored and Łukasz Serwatka committed Dec 21, 2017
1 parent 216eab1 commit e3597cf
Show file tree
Hide file tree
Showing 116 changed files with 272 additions and 135 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/
declare(strict_types=1);

namespace EzSystems\EzPlatformAdminUiBundle\DependencyInjection\Configuration\Parser;
namespace EzSystems\EzPlatformAdminUiBundle\DependencyInjection\Configuration\Parser\Module;

use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\AbstractParser;
use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\ContextualizerInterface;
Expand All @@ -24,7 +24,7 @@
* limit: 10
* ```
*/
class SubitemsModule extends AbstractParser
class Subitems extends AbstractParser
{
/**
* Adds semantic configuration definition.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?php

/**
* @copyright Copyright (C) eZ Systems AS. All rights reserved.
* @license For full copyright and license information view LICENSE file distributed with this source code.
*/
declare(strict_types=1);

namespace EzSystems\EzPlatformAdminUiBundle\DependencyInjection\Configuration\Parser\Module;

use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\AbstractParser;
use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Configuration\SiteAccessAware\ContextualizerInterface;
use Symfony\Component\Config\Definition\Builder\NodeBuilder;

/**
* Configuration parser for UDW module.
*/
class UniversalDiscoveryWidget extends AbstractParser
{
/**
* Adds semantic configuration definition.
*
* @param NodeBuilder $nodeBuilder Node just under ezpublish.system.<siteaccess>
*/
public function addSemanticConfig(NodeBuilder $nodeBuilder)
{
$nodeBuilder
->arrayNode('universal_discovery_widget_module')
->info('UDW module configuration')
->children()
->scalarNode('default_location_id')->isRequired()->end()
->end()
->end();
}

/**
* {@inheritdoc}
*/
public function mapConfig(array &$scopeSettings, $currentScope, ContextualizerInterface $contextualizer): void
{
if (empty($scopeSettings['universal_discovery_widget_module'])) {
return;
}

$settings = $scopeSettings['universal_discovery_widget_module'];

if (!isset($settings['default_location_id']) || empty($settings['default_location_id'])) {
return;
}

$contextualizer->setContextualParameter(
'universal_discovery_widget_module.default_location_id',
$currentScope,
$settings['default_location_id']
);
}
}
5 changes: 3 additions & 2 deletions src/bundle/EzPlatformAdminUiBundle.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
use EzSystems\EzPlatformAdminUiBundle\DependencyInjection\Compiler\UiConfigProviderPass;
use EzSystems\EzPlatformAdminUiBundle\DependencyInjection\Compiler\ValueObjectVisitorPass;
use EzSystems\EzPlatformAdminUiBundle\DependencyInjection\Configuration\Parser\LocationIds;
use EzSystems\EzPlatformAdminUiBundle\DependencyInjection\Configuration\Parser\Module;
use EzSystems\EzPlatformAdminUiBundle\DependencyInjection\Configuration\Parser\Pagination;
use EzSystems\EzPlatformAdminUiBundle\DependencyInjection\Configuration\Parser\SubitemsModule;
use Symfony\Component\DependencyInjection\ContainerBuilder;
use Symfony\Component\HttpKernel\Bundle\Bundle;

Expand All @@ -27,7 +27,8 @@ public function build(ContainerBuilder $container)
/** @var EzPublishCoreExtension $core */
$core = $container->getExtension('ezpublish');
$core->addConfigParser(new LocationIds());
$core->addConfigParser(new SubitemsModule());
$core->addConfigParser(new Module\Subitems());
$core->addConfigParser(new Module\UniversalDiscoveryWidget());
$core->addConfigParser(new Pagination());
$core->addDefaultSettings(__DIR__ . '/Resources/config', ['ezplatform_default_settings.yml']);

Expand Down
3 changes: 3 additions & 0 deletions src/bundle/Resources/config/ezplatform_default_settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,6 @@ parameters:

# Subitems Module
ezsettings.default.subitems_module.limit: 10

# Universal Discovery Widget Module
ezsettings.default.universal_discovery_widget_module.default_location_id: 1
2 changes: 0 additions & 2 deletions src/bundle/Resources/config/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ imports:
- { resource: services/controllers.yml }
- { resource: services/tabs.yml }
- { resource: services/menu.yml }
- { resource: services/application_config.yml }
- { resource: services/type_extensions.yml }
- { resource: services/pagination.yml }
- { resource: services/ui_config.yml }
- { resource: services/components.yml }
Expand Down
8 changes: 0 additions & 8 deletions src/bundle/Resources/config/services/application_config.yml

This file was deleted.

5 changes: 0 additions & 5 deletions src/bundle/Resources/config/services/type_extensions.yml

This file was deleted.

10 changes: 10 additions & 0 deletions src/bundle/Resources/config/services/ui_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ services:
autoconfigure: true
public: false

EzSystems\EzPlatformAdminUiBundle\Templating\Twig\UiConfigExtension:
public: true

EzSystems\EzPlatformAdminUi\UI\Config\Aggregator:
public: true

EzSystems\EzPlatformAdminUi\UI\Config\Provider\ContentTypeMappings:
arguments:
$locationMappings: '%ezplatform.multifile_upload.location.mappings%'
Expand All @@ -23,3 +29,7 @@ services:
EzSystems\EzPlatformAdminUi\UI\Config\Provider\User:
tags:
- { name: ezplatform.admin_ui.config_provider, key: 'user' }

EzSystems\EzPlatformAdminUi\UI\Config\Provider\Module\UniversalDiscoveryWidget:
tags:
- { name: ezplatform.admin_ui.config_provider, key: 'universalDiscoveryWidget' }

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/bundle/Resources/public/js/alloyeditor/dist/ezBtnEmbed.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/bundle/Resources/public/js/alloyeditor/dist/ezBtnImage.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Loading

0 comments on commit e3597cf

Please sign in to comment.