diff --git a/src/Plugin/views/argument/SearchApiStandard.php b/src/Plugin/views/argument/SearchApiStandard.php index 6bba4e92..bf6a33fb 100644 --- a/src/Plugin/views/argument/SearchApiStandard.php +++ b/src/Plugin/views/argument/SearchApiStandard.php @@ -93,18 +93,22 @@ public function validateOptionsForm(&$form, FormStateInterface $form_state) { } // Let the plugins do validation. - $default_id = $option_values['default_argument_type']; - $plugin = $this->getPlugin('argument_default', $default_id); - if ($plugin) { - $plugin->validateOptionsForm($form['argument_default'][$default_id], $form_state, $option_values['argument_default'][$default_id]); + if (!empty($option_values['default_argument_type'])) { + $default_id = $option_values['default_argument_type']; + $plugin = $this->getPlugin('argument_default', $default_id); + if ($plugin) { + $plugin->validateOptionsForm($form['argument_default'][$default_id], $form_state, $option_values['argument_default'][$default_id]); + } } - $sanitized_id = $option_values['validate']['type']; - // Correct ID for js sanitized version. - $validate_id = static::decodeValidatorId($sanitized_id); - $plugin = $this->getPlugin('argument_validator', $validate_id); - if ($plugin) { - $plugin->validateOptionsForm($form['validate']['options'][$default_id], $form_state, $option_values['validate']['options'][$sanitized_id]); + if (!empty($option_values['validate']['type'])) { + $sanitized_id = $option_values['validate']['type']; + // Correct ID for js sanitized version. + $validate_id = static::decodeValidatorId($sanitized_id); + $plugin = $this->getPlugin('argument_validator', $validate_id); + if ($plugin) { + $plugin->validateOptionsForm($form['validate']['options'][$sanitized_id], $form_state, $option_values['validate']['options'][$sanitized_id]); + } } } @@ -118,13 +122,15 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) { } // Let the plugins make submit modifications if necessary. - $default_id = $option_values['default_argument_type']; - $plugin = $this->getPlugin('argument_default', $default_id); - if ($plugin) { - $options = &$option_values['argument_default'][$default_id]; - $plugin->submitOptionsForm($form['argument_default'][$default_id], $form_state, $options); - // Copy the now submitted options to their final resting place so they get saved. - $option_values['default_argument_options'] = $options; + if (!empty($option_values['default_argument_type'])) { + $default_id = $option_values['default_argument_type']; + $plugin = $this->getPlugin('argument_default', $default_id); + if ($plugin) { + $options = &$option_values['argument_default'][$default_id]; + $plugin->submitOptionsForm($form['argument_default'][$default_id], $form_state, $options); + // Copy the now submitted options to their final resting place so they get saved. + $option_values['default_argument_options'] = $options; + } } // If the 'Specify validation criteria' checkbox is not checked, reset the @@ -137,15 +143,17 @@ public function submitOptionsForm(&$form, FormStateInterface $form_state) { $option_values['validate']['fail'] = 'not found'; } - $sanitized_id = $option_values['validate']['type']; - // Correct ID for js sanitized version. - $option_values['validate']['type'] = $validate_id = static::decodeValidatorId($sanitized_id); - $plugin = $this->getPlugin('argument_validator', $validate_id); - if ($plugin) { - $options = &$option_values['validate']['options'][$sanitized_id]; - $plugin->submitOptionsForm($form['validate']['options'][$sanitized_id], $form_state, $options); - // Copy the now submitted options to their final resting place so they get saved. - $option_values['validate_options'] = $options; + if (!empty($option_values['validate']['type'])) { + $sanitized_id = $option_values['validate']['type']; + // Correct ID for js sanitized version. + $option_values['validate']['type'] = $validate_id = static::decodeValidatorId($sanitized_id); + $plugin = $this->getPlugin('argument_validator', $validate_id); + if ($plugin) { + $options = &$option_values['validate']['options'][$sanitized_id]; + $plugin->submitOptionsForm($form['validate']['options'][$sanitized_id], $form_state, $options); + // Copy the now submitted options to their final resting place so they get saved. + $option_values['validate_options'] = $options; + } } // Clear out the content of title if it's not enabled. diff --git a/tests/src/Functional/ViewsTest.php b/tests/src/Functional/ViewsTest.php index 0a54d539..3bbbb080 100644 --- a/tests/src/Functional/ViewsTest.php +++ b/tests/src/Functional/ViewsTest.php @@ -438,7 +438,7 @@ protected function checkResults(array $query, array $expected_results = NULL, $l } /** - * Test Views admin UI and field handlers. + * Tests the Views admin UI and field handlers. */ public function testViewsAdmin() { // Add a field from a related entity to the index to test whether it gets @@ -737,6 +737,10 @@ public function testViewsAdmin() { $this->drupalGet('search-api-test'); $this->assertSession()->statusCodeEquals(200); $this->assertSession()->pageTextNotContains('[name] [EMPTY]'); + + // Run regression tests. + $this->drupalLogin($admin_user); + $this->adminUiRegressionTests(); } /** @@ -826,6 +830,28 @@ protected function submitPluginForm(array $edit) { } /** + * Contains regression tests for previous, fixed bugs in the Views UI. + */ + protected function adminUiRegressionTests() { + $this->regressionTest2883807(); + } + + /** + * Verifies that adding a contextual filter doesn't trigger a notice. + * + * @see https://www.drupal.org/node/2883807 + */ + protected function regressionTest2883807() { + $this->drupalGet('admin/structure/views/nojs/add-handler/search_api_test_view/page_1/argument'); + $edit = [ + 'name[search_api_index_database_search_index.author]' => TRUE, + ]; + $this->submitForm($edit, 'Add and configure contextual filters'); + $this->submitForm([], 'Apply'); + $this->submitForm([], 'Save'); + } + + /** * {@inheritdoc} */ protected function initConfig(ContainerInterface $container) {