From cf4a6098f49e353232540f128452233fc5b7d6d7 Mon Sep 17 00:00:00 2001 From: catch Date: Mon, 16 Nov 2020 19:34:26 +0000 Subject: [PATCH] Issue #2409413 by cafuego, longwave, lokapujya, alexpott, alvar0hurtad0, SivaprasadC, snehi, vipul.patil7888, ayushmishra206, dawehner, xjm, mradcliffe: Remove fields that do nothing from the "RSS publishing" settings form --- .../src/Functional/AggregatorTestBase.php | 5 ++--- .../ConfigTranslationListUiTest.php | 2 -- .../Functional/ConfigTranslationUiTest.php | 5 ----- .../tests/src/Unit/ConfigNamesMapperTest.php | 1 - .../system/config/install/system.rss.yml | 4 ---- .../system/config/schema/system.schema.yml | 10 ---------- core/modules/system/migrations/system_rss.yml | 2 -- core/modules/system/src/Form/RssFeedsForm.php | 19 +------------------ core/modules/system/system.post_update.php | 11 +++++++++++ .../d6/MigrateSystemConfigurationTest.php | 7 ------- .../d7/MigrateSystemConfigurationTest.php | 5 ----- 11 files changed, 14 insertions(+), 57 deletions(-) diff --git a/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php b/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php index 360aae5d0c..61b25893f9 100644 --- a/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php +++ b/core/modules/aggregator/tests/src/Functional/AggregatorTestBase.php @@ -161,14 +161,13 @@ public function getFeedEditObject($feed_url = NULL, array $values = []) { public function getDefaultFeedItemCount() { // Our tests are based off of rss.xml, so let's find out how many elements // should be related. - $feed_count = \Drupal::entityQuery('node') + return \Drupal::entityQuery('node') ->condition('promote', NodeInterface::PROMOTED) ->condition('status', NodeInterface::PUBLISHED) ->accessCheck(FALSE) - ->range(0, $this->config('system.rss')->get('items.limit')) + ->range(0, 10) ->count() ->execute(); - return min($feed_count, 10); } /** diff --git a/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php index af664351a8..ae798fd1c3 100644 --- a/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php +++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationListUiTest.php @@ -502,8 +502,6 @@ public function testTranslateOperationInListUi() { $this->doSettingsPageTest('admin/config/system/site-information'); // Test the account settings page. $this->doSettingsPageTest('admin/config/people/accounts'); - // Test the RSS settings page. - $this->doSettingsPageTest('admin/config/services/rss-publishing'); } } diff --git a/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php index 69afb28211..55da47b4ef 100644 --- a/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php +++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationUiTest.php @@ -888,11 +888,6 @@ public function testAlterInfo() { $this->container->get('state')->set('config_translation_test_config_translation_info_alter', TRUE); $this->container->get('plugin.manager.config_translation.mapper')->clearCachedDefinitions(); - // Check out if the translation page has the altered in settings. - $this->drupalGet('admin/config/system/site-information/translate/fr/add'); - $this->assertText('Feed channel'); - $this->assertText('Feed description'); - // Check if the translation page does not have the altered out settings. $this->drupalGet('admin/config/people/accounts/translate/fr/add'); $this->assertText('Name'); diff --git a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php index 6c9dc0115f..ffa970cc97 100644 --- a/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php +++ b/core/modules/config_translation/tests/src/Unit/ConfigNamesMapperTest.php @@ -469,7 +469,6 @@ public function testGetConfigData() { ], 'system.rss' => [ 'items' => [ - 'limit' => 10, 'view_mode' => 'rss', ], ], diff --git a/core/modules/system/config/install/system.rss.yml b/core/modules/system/config/install/system.rss.yml index 994f55cffb..bb7c0c040a 100644 --- a/core/modules/system/config/install/system.rss.yml +++ b/core/modules/system/config/install/system.rss.yml @@ -1,6 +1,2 @@ -channel: - description: '' items: - limit: 10 view_mode: rss -langcode: en diff --git a/core/modules/system/config/schema/system.schema.yml b/core/modules/system/config/schema/system.schema.yml index e68bbae5a8..3a96ffecbe 100644 --- a/core/modules/system/config/schema/system.schema.yml +++ b/core/modules/system/config/schema/system.schema.yml @@ -196,20 +196,10 @@ system.rss: type: config_object label: 'Feed settings' mapping: - channel: - type: mapping - label: 'Feed channel' - mapping: - description: - type: text - label: 'Feed description' items: type: mapping label: 'Feed items' mapping: - limit: - type: integer - label: 'Feed item limit' view_mode: type: string label: 'Feed content' diff --git a/core/modules/system/migrations/system_rss.yml b/core/modules/system/migrations/system_rss.yml index c6ac037bfc..8a74ac6c84 100644 --- a/core/modules/system/migrations/system_rss.yml +++ b/core/modules/system/migrations/system_rss.yml @@ -7,11 +7,9 @@ migration_tags: source: plugin: variable variables: - - feed_default_items - feed_item_length source_module: system process: - 'items/limit': feed_default_items 'items/view_mode': feed_item_length destination: plugin: config diff --git a/core/modules/system/src/Form/RssFeedsForm.php b/core/modules/system/src/Form/RssFeedsForm.php index 95c7b42d66..bf323881a9 100644 --- a/core/modules/system/src/Form/RssFeedsForm.php +++ b/core/modules/system/src/Form/RssFeedsForm.php @@ -30,25 +30,10 @@ protected function getEditableConfigNames() { * {@inheritdoc} */ public function buildForm(array $form, FormStateInterface $form_state) { - $rss_config = $this->config('system.rss'); - $form['feed_description'] = [ - '#type' => 'textarea', - '#title' => t('Feed description'), - '#default_value' => $rss_config->get('channel.description'), - '#description' => t('Description of your site, included in each feed.'), - ]; - $options = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30]; - $form['feed_default_items'] = [ - '#type' => 'select', - '#title' => t('Number of items in each feed'), - '#default_value' => $rss_config->get('items.limit'), - '#options' => array_combine($options, $options), - '#description' => t('Default number of items to include in each feed.'), - ]; $form['feed_view_mode'] = [ '#type' => 'select', '#title' => t('Feed content'), - '#default_value' => $rss_config->get('items.view_mode'), + '#default_value' => $this->config('system.rss')->get('items.view_mode'), '#options' => [ 'title' => t('Titles only'), 'teaser' => t('Titles plus teaser'), @@ -65,8 +50,6 @@ public function buildForm(array $form, FormStateInterface $form_state) { */ public function submitForm(array &$form, FormStateInterface $form_state) { $this->config('system.rss') - ->set('channel.description', $form_state->getValue('feed_description')) - ->set('items.limit', $form_state->getValue('feed_default_items')) ->set('items.view_mode', $form_state->getValue('feed_view_mode')) ->save(); diff --git a/core/modules/system/system.post_update.php b/core/modules/system/system.post_update.php index 803f362dac..14391c15e9 100644 --- a/core/modules/system/system.post_update.php +++ b/core/modules/system/system.post_update.php @@ -168,3 +168,14 @@ function system_post_update_schema_version_int() { } } } + +/** + * Remove obsolete system.rss configuration. + */ +function system_post_update_delete_rss_settings() { + \Drupal::configFactory()->getEditable('system.rss') + ->clear('channel') + ->clear('items.limit') + ->clear('langcode') + ->save(); +} diff --git a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php index 77dba8e29b..7f1543393c 100644 --- a/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php +++ b/core/modules/system/tests/src/Kernel/Migrate/d6/MigrateSystemConfigurationTest.php @@ -91,16 +91,9 @@ class MigrateSystemConfigurationTest extends MigrateDrupal6TestBase { 'stale_file_threshold' => 2592000, ], 'system.rss' => [ - // channel is not handled by the migration. - 'channel' => [ - 'description' => '', - ], 'items' => [ - 'limit' => 10, 'view_mode' => 'title', ], - // langcode is not handled by the migration. - 'langcode' => 'en', ], 'system.site' => [ // uuid is not handled by the migration. diff --git a/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php index f8d37e494c..56953852c2 100644 --- a/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php +++ b/core/modules/system/tests/src/Kernel/Migrate/d7/MigrateSystemConfigurationTest.php @@ -94,14 +94,9 @@ class MigrateSystemConfigurationTest extends MigrateDrupal7TestBase { 'stale_file_threshold' => 2592000, ], 'system.rss' => [ - 'channel' => [ - 'description' => '', - ], 'items' => [ - 'limit' => 27, 'view_mode' => 'fulltext', ], - 'langcode' => 'en', ], 'system.site' => [ // uuid is not handled by the migration. -- GitLab