Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

EZP-28598: Fixes no filtering langauge on create content UI #226

Merged
merged 1 commit into from
Dec 20, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/bundle/Resources/config/services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ imports:
- { 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 }
- { resource: services/dashboard.yml }
- { resource: services/modules/subitems.yml }
- { resource: services/form_processors.yml }
- { resource: services/form_types.yml }

parameters:

Expand Down Expand Up @@ -44,9 +44,6 @@ services:
tags:
- {name: kernel.event_subscriber}

EzSystems\EzPlatformAdminUi\Form\Type\:
resource: '../../../lib/Form/Type'

EzSystems\EzPlatformAdminUi\Form\DataMapper\:
resource: '../../../lib/Form/DataMapper'

Expand Down
13 changes: 13 additions & 0 deletions src/bundle/Resources/config/services/form_types.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
services:
_defaults:
autowire: true
autoconfigure: true
public: false


EzSystems\EzPlatformAdminUi\Form\Type\:
resource: '../../../lib/Form/Type'

EzSystems\EzPlatformAdminUi\Form\Type\Language\LimitedLanguageChoiceType:
arguments:
$siteaccessLanguages: '$languages$'
5 changes: 0 additions & 5 deletions src/bundle/Resources/config/services/type_extensions.yml

This file was deleted.

4 changes: 2 additions & 2 deletions src/lib/Form/Type/Content/Draft/ContentCreateType.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
use EzSystems\EzPlatformAdminUi\Form\Data\Content\Draft\ContentCreateData;
use EzSystems\EzPlatformAdminUi\Form\Type\Content\LocationType;
use EzSystems\EzPlatformAdminUi\Form\Type\ContentType\ContentTypeChoiceType;
use EzSystems\EzPlatformAdminUi\Form\Type\Language\LanguageChoiceType;
use EzSystems\EzPlatformAdminUi\Form\Type\Language\LimitedLanguageChoiceType;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\FormBuilderInterface;
Expand Down Expand Up @@ -50,7 +50,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
)
->add(
'language',
LanguageChoiceType::class,
LimitedLanguageChoiceType::class,
[
'label' => false,
'multiple' => false,
Expand Down
88 changes: 88 additions & 0 deletions src/lib/Form/Type/Language/LimitedLanguageChoiceType.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
<?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\EzPlatformAdminUi\Form\Type\Language;

use eZ\Publish\API\Repository\LanguageService;
use eZ\Publish\API\Repository\PermissionResolver;
use eZ\Publish\API\Repository\Values\Content\Language;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\ChoiceList\Loader\CallbackChoiceLoader;
use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
use Symfony\Component\OptionsResolver\OptionsResolver;

/**
* Form Type allowing to select Language.
*
* @todo: This can replace LanguageType in the future but it'd require some changes in the frontend as well.
*/
class LimitedLanguageChoiceType extends AbstractType
{
/** @var LanguageService */
protected $languageService;

/** @var string[] */
protected $siteaccessLanguages;

/** @var PermissionResolver */
protected $permissionResolver;

/**
* @param LanguageService $languageService
* @param string[] $siteaccessLanguages
* @param PermissionResolver $permissionResolver
*/
public function __construct(
LanguageService $languageService,
array $siteaccessLanguages,
PermissionResolver $permissionResolver
) {
$this->languageService = $languageService;
$this->siteaccessLanguages = $siteaccessLanguages;
$this->permissionResolver = $permissionResolver;
}

public function getParent()
{
return ChoiceType::class;
}

public function configureOptions(OptionsResolver $resolver)
{
$resolver
->setDefaults([
'choice_loader' => $this->getChoiceLoader(),
'choice_label' => 'name',
'choice_name' => 'languageCode',
'choice_value' => 'languageCode',
]);
}

/**
* @return CallbackChoiceLoader
*/
private function getChoiceLoader(): CallbackChoiceLoader
{
return new CallbackChoiceLoader(
function () {
$systemLanguages = $this->languageService->loadLanguages();
$siteaccessLanguages = $this->siteaccessLanguages;
$availableLanguageCodes = array_intersect(
array_column($systemLanguages, 'languageCode'),
$siteaccessLanguages
);

$languages = array_filter($systemLanguages, function (Language $language) use ($availableLanguageCodes) {
return $language->enabled && in_array($language->languageCode, $availableLanguageCodes, true);
});

return $languages;
}
);
}
}