Skip to content
Snippets Groups Projects
Verified Commit 82b5bc08 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3376692 by lauriii, mstrelan, quietone, acbramley, larowlan,...

Issue #3376692 by lauriii, mstrelan, quietone, acbramley, larowlan, smustgrave: Removed values in multi-value fields reappear
parent 772ba905
No related branches found
No related tags found
42 merge requests!8528Issue #3456871 by Tim Bozeman: Support NULL services,!8323Fix source code editing and in place front page site studio editing.,!6278Issue #3187770 by godotislate, smustgrave, catch, quietone: Views Rendered...,!54479.5.x SF update,!5022Issue #3394406: FileUploadHandler::handleExtensionValidation does not have fallback for sites still using file_validate_extensions,!3878Removed unused condition head title for views,!38582585169-10.1.x,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3668Resolve #3347842 "Deprecate the trusted",!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3546refactored dialog.pcss file,!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3502Issue #3335308: Confusing behavior with FormState::setFormState and FormState::setMethod,!3452Issue #3332701: Refactor Claro's tablesort-indicator stylesheet,!3451Issue #2410579: Allows setting the current language programmatically.,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3226Issue #2987537: Custom menu link entity type should not declare "bundle" entity key,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3147Issue #3328457: Replace most substr($a, $i) where $i is negative with str_ends_with(),!3146Issue #3328456: Replace substr($a, 0, $i) with str_starts_with(),!3133core/modules/system/css/components/hidden.module.css,!31312878513-10.1.x,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2614Issue #2981326: Replace non-test usages of \Drupal::logger() with IoC injection,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2062Issue #3246454: Add weekly granularity to views date sort,!1591Issue #3199697: Add JSON:API Translation experimental module,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!877Issue #2708101: Default value for link text is not saved,!844Resolve #3036010 "Updaters",!673Issue #3214208: FinishResponseSubscriber could create duplicate headers,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!23Issue #2879087: Use comment access handler instead of hardcoding permissions
Pipeline #34025 passed
+1
......@@ -68,8 +68,7 @@ public function form(FieldItemListInterface $items, array &$form, FormStateInter
$field_name = $this->fieldDefinition->getName();
$parents = $form['#parents'];
// Store field information in $form_state.
if (!static::getWidgetState($parents, $field_name, $form_state)) {
if (!$field_state = static::getWidgetState($parents, $field_name, $form_state)) {
$field_state = [
'items_count' => count($items),
'array_parents' => [],
......@@ -77,6 +76,13 @@ public function form(FieldItemListInterface $items, array &$form, FormStateInter
static::setWidgetState($parents, $field_name, $form_state, $field_state);
}
// Remove deleted items from the field item list.
if (isset($field_state['deleted_item']) && $items->get($field_state['deleted_item'])) {
$items->removeItem($field_state['deleted_item']);
unset($field_state['deleted_item']);
static::setWidgetState($parents, $field_name, $form_state, $field_state);
}
// Collect widget elements.
$elements = [];
......@@ -384,6 +390,8 @@ public static function deleteSubmit(&$form, FormStateInterface $form_state) {
$form_state->setUserInput($user_input);
}
$field_state['deleted_item'] = $delta;
unset($parent_element[$delta]);
NestedArray::setValue($form, $array_parents, $parent_element);
......
......@@ -150,6 +150,21 @@ public function testFieldMultipleValueWidget() {
// Assert that the wrapper exists and isn't nested.
$this->assertSession()->elementsCount('css', '[data-drupal-selector="edit-field-unlimited-wrapper"]', 1);
// Test removing items/values on saved entities resets to initial value.
$this->submitForm([], 'Save');
$field_2_remove_button->click();
$this->assertSession()->assertWaitOnAjaxRequest();
$field_1_remove_button->click();
$this->assertSession()->assertWaitOnAjaxRequest();
$field_0_remove_button->click();
$this->assertSession()->assertWaitOnAjaxRequest();
$add_more_button->click();
$this->assertSession()->assertWaitOnAjaxRequest();
$this->assertSame('', $field_0->getValue());
$add_more_button->click();
$this->assertSession()->assertWaitOnAjaxRequest();
$this->assertSame('', $field_1->getValue());
}
}
......@@ -77,10 +77,10 @@ protected function setUp(): void {
* Tests the correct user input mapping on complex fields.
*/
public function testCorrectUserInputMappingOnComplexFields() {
/** @var ContentEntityStorageInterface $storage */
/** @var \Drupal\Core\Entity\ContentEntityStorageInterface $storage */
$storage = $this->container->get('entity_type.manager')->getStorage($this->entityTypeId);
/** @var ContentEntityInterface $entity */
/** @var \Drupal\Core\Entity\ContentEntityInterface $entity */
$entity = $storage->create([
$this->fieldName => [
['shape' => 'rectangle', 'color' => 'green'],
......@@ -118,6 +118,24 @@ public function testCorrectUserInputMappingOnComplexFields() {
['shape' => 'circle', 'color' => 'blue'],
['shape' => 'rectangle', 'color' => 'green'],
], $entity->get($this->fieldName)->getValue());
$this->drupalGet($this->entityTypeId . '/manage/' . $entity->id() . '/edit');
// Delete one of the field items and ensure that the user input is mapped on
// the correct delta field items.
$edit = [
"$this->fieldName[0][_weight]" => 0,
"$this->fieldName[1][_weight]" => -1,
];
$this->submitForm($edit, "{$this->fieldName}_0_remove_button");
$this->submitForm([], 'Save');
$storage->resetCache([$entity->id()]);
$entity = $storage->load($entity->id());
$this->assertEquals([
['shape' => 'rectangle', 'color' => 'green'],
], $entity->get($this->fieldName)->getValue());
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment