Skip to content

GitLab

Commit 0adc91af authored by alexpott's avatar alexpott
Browse files

Issue #1987660 by dougvann, ygerasimov, vijaycs85, marcingy: Convert... 

Issue #1987660 by dougvann, ygerasimov, vijaycs85, marcingy: Convert config_sync() to a new style controller.
parent 11495979
Hide whitespace changes
Inline Side-by-side
core/modules/config/config.admin.inc deleted 100644 → 0
View file @ 11495979
<?php
/**
* @file
* Admin page callbacks for the config module.
*/
use Drupal\Core\Ajax\AjaxResponse;
use Drupal\Core\Ajax\OpenModalDialogCommand;
use Drupal\Core\Config\ConfigException;
use Drupal\Core\Config\ConfigImporter;
use Drupal\Core\Config\StorageComparer;
use Drupal\Core\Config\StorageInterface;
/**
* Helper function to construct the storage changes in a configuration synchronization form.
*
* @param array $form
* The form structure to add to. Passed by reference.
* @param array $form_state
* The current state of the form. Passed by reference.
* @param \Drupal\Core\Config\StorageInterface $source_storage
* The source storage to retrieve differences from.
*
* @return array
* The form with the configuration storage changes.
*/
function config_admin_sync_form(array &$form, array &$form_state, StorageInterface $source_storage) {
$source_list = $source_storage->listAll();
$config_comparer = new StorageComparer(Drupal::service('config.storage.staging'), Drupal::service('config.storage'));
if (empty($source_list) || !$config_comparer->createChangelist()->hasChanges()) {
$form['no_changes'] = array(
'#markup' => t('There are no configuration changes.'),
);
$form['actions']['#access'] = FALSE;
return $form;
}
else {
// Store the comparer for use in the submit.
$form_state['storage_comparer'] = $config_comparer;
}
// Add the AJAX library to the form for dialog support.
$form['#attached']['library'][] = array('system', 'drupal.ajax');
foreach ($config_comparer->getChangelist() as $config_change_type => $config_files) {
if (empty($config_files)) {
continue;
}
// @todo A table caption would be more appropriate, but does not have the
// visual importance of a heading.
$form[$config_change_type]['heading'] = array(
'#type' => 'html_tag',
'#tag' => 'h3',
);
switch ($config_change_type) {
case 'create':
$form[$config_change_type]['heading']['#value'] = format_plural(count($config_files), '@count new', '@count new');
break;
case 'update':
$form[$config_change_type]['heading']['#value'] = format_plural(count($config_files), '@count changed', '@count changed');
break;
case 'delete':
$form[$config_change_type]['heading']['#value'] = format_plural(count($config_files), '@count removed', '@count removed');
break;
}
$form[$config_change_type]['list'] = array(
'#theme' => 'table',
'#header' => array('Name', 'Operations'),
);
foreach ($config_files as $config_file) {
$links['view_diff'] = array(
'title' => t('View differences'),
'href' => 'admin/config/development/sync/diff/' . $config_file,
'attributes' => array(
'class' => array('use-ajax'),
'data-accepts' => 'application/vnd.drupal-modal',
'data-dialog-options' => json_encode(array(
'width' => 700
)),
),
);
$form[$config_change_type]['list']['#rows'][] = array(
'name' => $config_file,
'operations' => array(
'data' => array(
'#type' => 'operations',
'#links' => $links,
),
),
);
}
}
}
/**
* Form constructor for configuration import form.
*
* @see config_admin_import_form_submit()
* @see config_import()
*/
function config_admin_import_form($form, &$form_state) {
// Retrieve a list of differences between last known state and active store.
$source_storage = Drupal::service('config.storage.staging');
$target_storage = Drupal::service('config.storage');
$form['actions'] = array('#type' => 'actions');
$form['actions']['submit'] = array(
'#type' => 'submit',
'#value' => t('Import all'),
);
config_admin_sync_form($form, $form_state, $source_storage, $target_storage);
return $form;
}
/**
* Form submission handler for config_admin_import_form().
*/
function config_admin_import_form_submit($form, &$form_state) {
$config_importer = new ConfigImporter(
$form_state['storage_comparer'],
Drupal::service('event_dispatcher'),
Drupal::service('config.factory'),
Drupal::entityManager(),
Drupal::lock()
);
if ($config_importer->alreadyImporting()) {
drupal_set_message(t('Another request may be synchronizing configuration already.'));
}
else{
try {
$config_importer->import();
drupal_flush_all_caches();
drupal_set_message(t('The configuration was imported successfully.'));
}
catch (ConfigException $e) {
// Return a negative result for UI purposes. We do not differentiate between
// an actual synchronization error and a failed lock, because concurrent
// synchronizations are an edge-case happening only when multiple developers
// or site builders attempt to do it without coordinating.
watchdog_exception('config_import', $e);
drupal_set_message(t('The import failed due to an error. Any errors have been logged.'), 'error');
}
}
}
core/modules/config/config.module
View file @ 0adc91af
......@@ -64,10 +64,7 @@ function config_menu() {
$items['admin/config/development/sync'] = array(
'title' => 'Synchronize configuration',
'description' => 'Synchronize configuration changes.',
'page callback' => 'drupal_get_form',
'page arguments' => array('config_admin_import_form'),
'access arguments' => array('synchronize configuration'),
'file' => 'config.admin.inc',
'route_name' => 'config_sync',
);
$items['admin/config/development/export'] = array(
'title' => 'Configuration export',
......@@ -81,7 +78,7 @@ function config_menu() {
);
$items['admin/config/development/sync/diff/%'] = array(
'title' => 'Configuration file diff',
'description' => 'Diff between active and staged configuraiton.',
'description' => 'Diff between active and staged configuration.',
'route_name' => 'config_diff',
);
$items['admin/config/development/sync/import'] = array(
......
core/modules/config/config.routing.yml
View file @ 0adc91af
......@@ -22,3 +22,9 @@ config_import:
_form: '\Drupal\config\Form\ConfigImportForm'
requirements:
_permission: 'import configuration'
config_sync:
pattern: '/admin/config/development/sync'
defaults:
_form: '\Drupal\config\Form\ConfigSync'
requirements:
_permission: 'synchronize configuration'
core/modules/config/lib/Drupal/config/Form/ConfigSync.php 0 → 100644
View file @ 0adc91af
<?php
/**
* @file
* Contains \Drupal\config\Form\ConfigSync.
*/
namespace Drupal\config\Form;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Controller\ControllerInterface;
use Drupal\Core\Form\FormInterface;
use Drupal\Core\Config\StorageInterface;
use Drupal\Core\Lock\LockBackendInterface;
use Drupal\Core\Config\StorageComparer;
use Drupal\Core\Config\ConfigImporter;
use Drupal\Core\Config\ConfigException;
use Drupal\Core\Config\ConfigFactory;
use Drupal\Core\StringTranslation\Translator\TranslatorInterface;
use Drupal\Core\Routing\PathBasedGeneratorInterface;
use \Drupal\Core\Entity\EntityManager;
/**
* Construct the storage changes in a configuration synchronization form.
*/
class ConfigSync implements ControllerInterface, FormInterface {
/**
* The database lock object.
*
* @var \Drupal\Core\Lock\LockBackendInterface
*/
protected $lock;
/**
* The source configuration object.
*
* @var \Drupal\Core\Config\StorageInterface
*/
protected $sourceStorage;
/**
* The target configuration object.
*
* @var \Drupal\Core\Config\StorageInterface
*/
protected $targetStorage;
/**
* Event dispatcher.
*
* @var \Symfony\Component\EventDispatcher\EventDispatcherInterface
*/
protected $eventDispatcher;
/**
* @var \Drupal\Core\Config\ConfigFactory;
*/
protected $configFactory;
/**
* @var \Drupal\Core\Entity\EntityManager;
*/
protected $entity_manager;
/**
* The translation manager service.
*
* @var \Drupal\Core\StringTranslation\Translator\TranslatorInterface
*/
protected $translationManager;
/**
* URL generator service.
*
* @var \Drupal\Core\Routing\PathBasedGeneratorInterface
*/
protected $urlGenerator;
/**
* Constructs the object.
*
* @param \Drupal\Core\Database\Connection; $database
* The database object.
* @param \Drupal\Core\Config\StorageInterface $sourceStorage
* The source storage object.
* @param \Drupal\Core\Config\StorageInterface $targetStorage
* The target storage manager.
* @param \Drupal\Core\Lock\LockBackendInterface $lock
* The lock object.
* @param \Symfony\Component\EventDispatcher\EventDispatcherInterface $event_dispatcher
* Event dispatcher.
* @param \Drupal\Core\Config\ConfigFactory $config_factory
* Configuration object factory.
* @param \Drupal\Core\Entity\EntityManager
* Entity manager.
* @param \Drupal\Core\StringTranslation\Translator\TranslatorInterface $translation_manager
* The translation manager.
* @param \Drupal\Core\Routing\PathBasedGeneratorInterface $url_generator
* The url generator service.
*/
public function __construct(StorageInterface $sourceStorage, StorageInterface $targetStorage, LockBackendInterface $lock, EventDispatcherInterface $event_dispatcher, ConfigFactory $config_factory, EntityManager $entity_manger, TranslatorInterface $translation_manager, PathBasedGeneratorInterface $url_generator) {
$this->sourceStorage = $sourceStorage;
$this->targetStorage = $targetStorage;
$this->lock = $lock;
$this->eventDispatcher = $event_dispatcher;
$this->configFactory = $config_factory;
$this->entity_manager = $entity_manger;
$this->translationManager = $translation_manager;
$this->urlGenerator = $url_generator;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('config.storage.staging'),
$container->get('config.storage'),
$container->get('lock'),
$container->get('event_dispatcher'),
$container->get('config.factory'),
$container->get('plugin.manager.entity'),
$container->get('string_translation'),
$container->get('url_generator')
);
}
/**
* {@inheritdoc}
*/
public function getFormID() {
return 'config_admin_import_form';
}
/**
* {@inheritdoc}
*/
public function buildForm(array $form, array &$form_state) {
$form['actions'] = array('#type' => 'actions');
$form['actions']['submit'] = array(
'#type' => 'submit',
'#value' => $this->translationManager->translate('Import all'),
);
$source_list = $this->sourceStorage->listAll();
$config_comparer = new StorageComparer($this->sourceStorage, $this->targetStorage);
if (empty($source_list) || !$config_comparer->createChangelist()->hasChanges()) {
$form['no_changes'] = array(
'#markup' => $this->translationManager->translate('There are no configuration changes.'),
);
$form['actions']['#access'] = FALSE;
return $form;
}
else {
// Store the comparer for use in the submit.
$form_state['storage_comparer'] = $config_comparer;
}
// Add the AJAX library to the form for dialog support.
$form['#attached']['library'][] = array('system', 'drupal.ajax');
foreach ($config_comparer->getChangelist() as $config_change_type => $config_files) {
if (empty($config_files)) {
continue;
}
// @todo A table caption would be more appropriate, but does not have the
// visual importance of a heading.
$form[$config_change_type]['heading'] = array(
'#type' => 'html_tag',
'#tag' => 'h3',
);
switch ($config_change_type) {
case 'create':
$form[$config_change_type]['heading']['#value'] = format_plural(count($config_files), '@count new', '@count new');
break;
case 'update':
$form[$config_change_type]['heading']['#value'] = format_plural(count($config_files), '@count changed', '@count changed');
break;
case 'delete':
$form[$config_change_type]['heading']['#value'] = format_plural(count($config_files), '@count removed', '@count removed');
break;
}
$form[$config_change_type]['list'] = array(
'#theme' => 'table',
'#header' => array('Name', 'Operations'),
);
foreach ($config_files as $config_file) {
$links['view_diff'] = array(
'title' => $this->translationManager->translate('View differences'),
'href' => $this->urlGenerator->getPathFromRoute('config_diff', array('config_file' => $config_file)),
'attributes' => array(
'class' => array('use-ajax'),
'data-accepts' => 'application/vnd.drupal-modal',
'data-dialog-options' => json_encode(array(
'width' => 700
)),
),
);
$form[$config_change_type]['list']['#rows'][] = array(
'name' => $config_file,
'operations' => array(
'data' => array(
'#type' => 'operations',
'#links' => $links,
),
),
);
}
}
return $form;
}
/**
* {@inheritdoc}
*/
public function validateForm(array &$form, array &$form_state) {
}
/**
* {@inheritdoc}
*/
public function submitForm(array &$form, array &$form_state) {
$config_importer = new ConfigImporter(
$form_state['storage_comparer'],
$this->eventDispatcher,
$this->configFactory,
$this->entity_manager,
$this->lock
);
if ($config_importer->alreadyImporting()) {
drupal_set_message($this->translationManager->translate('Another request may be synchronizing configuration already.'));
}
else{
try {
$config_importer->import();
drupal_flush_all_caches();
drupal_set_message($this->translationManager->translate('The configuration was imported successfully.'));
}
catch (ConfigException $e) {
// Return a negative result for UI purposes. We do not differentiate
// between an actual synchronization error and a failed lock, because
// concurrent synchronizations are an edge-case happening only when
// multiple developers or site builders attempt to do it without
// coordinating.
watchdog_exception('config_import', $e);
drupal_set_message($this->translationManager->translate('The import failed due to an error. Any errors have been logged.'), 'error');
}
}
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment