Skip to content
Snippets Groups Projects
Verified Commit f9b363c0 authored by Lauri Timmanee's avatar Lauri Timmanee
Browse files

Issue #3375887 by srishtiiee, Berdir, Utkarsh_33: Add a weight for the options...

Issue #3375887 by srishtiiee, Berdir, Utkarsh_33: Add a weight for the options within a field category
parent 39cf4d22
No related branches found
No related tags found
41 merge requests!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4594Applying patch for Views Global Text area field to allow extra HTML tags. As video, source and iframe tag is not rendering. Due to which Media embedded video and remote-video not rendering in Views Global Text area field.,!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.,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
......@@ -57,6 +57,13 @@ class FieldType extends DataType {
*/
public $category = '';
/**
* The weight of the field type.
*
* @var int
*/
public $weight = 0;
/**
* The plugin_id of the default widget for this field type.
*
......
......@@ -20,6 +20,7 @@
* @Translation("For example, 12.34 km or € when used for further detailed calculations (such as summing many of these)"),
* },
* category = "number",
* weight = -30,
* default_widget = "number",
* default_formatter = "number_decimal"
* )
......
......@@ -19,6 +19,7 @@
* @Translation("For example, 123.4 km when used in imprecise contexts such as a walking trail distance"),
* },
* category = "number",
* weight = -10,
* default_widget = "number",
* default_formatter = "number_decimal"
* )
......
......@@ -18,6 +18,7 @@
* @Translation("For example, 123"),
* },
* category = "number",
* weight = -50,
* default_widget = "number",
* default_formatter = "number_integer"
* )
......
......@@ -292,6 +292,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t
'#items' => $unique_definitions[$selected_field_type][$option_key]['description'],
],
'#id' => $option['unique_identifier'],
'#weight' => $option['weight'],
'#parents' => ['group_field_options_wrapper'],
'#attributes' => [
'class' => ['field-option-radio'],
......@@ -307,8 +308,10 @@ public function buildForm(array $form, FormStateInterface $form_state, $entity_t
$radio_element['#title'] = 'Other';
$radio_element['#weight'] = 10;
}
$form['group_field_options_wrapper']['fields'][$option['unique_identifier']] = $radio_element;
$group_field_options[$option['unique_identifier']] = $radio_element;
}
uasort($group_field_options, [SortArray::class, 'sortByWeightProperty']);
$form['group_field_options_wrapper']['fields'] += $group_field_options;
}
}
$field_prefix = $this->config('field_ui.settings')->get('field_prefix');
......
......@@ -25,6 +25,7 @@ class ManageFieldsTest extends WebDriverTestBase {
'field_ui',
'field_test',
'block',
'options',
];
/**
......@@ -242,4 +243,41 @@ public function testAddField() {
$this->assertEquals('test_field', $field_storage->getType());
}
/**
* Tests the order in which the field types appear in the form.
*/
public function testFieldTypeOrder() {
$this->drupalget('admin/structure/types/manage/article/fields/add-field');
$page = $this->getSession()->getPage();
$field_type_categories = [
'selection_list',
'number',
];
foreach ($field_type_categories as $field_type_category) {
// Select the group card.
$group_field_card = $page->find('css', "[name='new_storage_type'][value='$field_type_category']");
$group_field_card->click();
$this->assertSession()->assertWaitOnAjaxRequest();
$field_types = $page->findAll('css', '.subfield-option .option');
$field_type_labels = [];
foreach ($field_types as $field_type) {
$field_type_labels[] = $field_type->getText();
}
$expected_field_types = match ($field_type_category) {
'selection_list' => [
'List (text)',
'List (integer)',
'List (float)',
],
'number' => [
'Number (integer)',
'Number (decimal)',
'Number (float)',
],
};
// Assert that the field type options are displayed as per their weights.
$this->assertSame($expected_field_types, $field_type_labels);
}
}
}
......@@ -20,6 +20,7 @@
* @Translation("For example, 'Fraction': 0 => 0, .25 => 1/4, .75 => 3/4, 1 => 1"),
* },
* category = "selection_list",
* weight = -10,
* default_widget = "options_select",
* default_formatter = "list_default",
* )
......
......@@ -20,6 +20,7 @@
* @Translation("For example, 'Lifetime in days': 1 => 1 day, 7 => 1 week, 31 => 1 month"),
* },
* category = "selection_list",
* weight = -30,
* default_widget = "options_select",
* default_formatter = "list_default",
* )
......
......@@ -20,6 +20,7 @@
* @Translation("For example, 'US States': IL => Illinois, IA => Iowa, IN => Indiana"),
* },
* category = "selection_list",
* weight = -50,
* default_widget = "options_select",
* default_formatter = "list_default",
* )
......
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