From b1876efa70702b5180abe2f1384a68a4fb8aaed0 Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 21 Nov 2022 11:41:10 +0100 Subject: [PATCH] better user admin view #1999 --- composer.json | 3 + composer.lock | 2 +- config/sync/core.extension.yml | 1 - config/sync/views.settings.yml | 3 +- config/sync/views.view.admin_users.yml | 214 ++++++++++++++----------- web/profiles/d8-starterkit-profile | 2 +- 6 files changed, 126 insertions(+), 99 deletions(-) diff --git a/composer.json b/composer.json index 01c45e24..8d55f268 100644 --- a/composer.json +++ b/composer.json @@ -309,6 +309,9 @@ }, "drupal/user_history": { "init batch : field_storage_values misses type https://www.drupal.org/project/user_history/issues/3311360": "https://www.drupal.org/files/issues/2022-09-23/user_history__field_storage_values__miss__type.patch" + }, + "drupal/views_ef_fieldset": { + "Exposed operators are not included in fieldsets https://www.drupal.org/project/views_ef_fieldset/issues/3173822": "https://git.drupalcode.org/project/views_ef_fieldset/-/merge_requests/1/diffs.patch" } }, "drupal-scaffold": { diff --git a/composer.lock b/composer.lock index 20d1a9c6..70641986 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "60f22fbc76b88ad24980e72abba5617d", + "content-hash": "2a85a66616e58421277ffea0dcc6e732", "packages": [ { "name": "alchemy/zippy", diff --git a/config/sync/core.extension.yml b/config/sync/core.extension.yml index 9e4b8181..71261f9b 100644 --- a/config/sync/core.extension.yml +++ b/config/sync/core.extension.yml @@ -231,7 +231,6 @@ module: views_bulk_operations: 0 views_conditional: 0 views_data_export: 0 - views_ef_fieldset: 0 views_field_view: 0 vue_link_formatter: 0 webform: 0 diff --git a/config/sync/views.settings.yml b/config/sync/views.settings.yml index 98b24b58..d243e023 100644 --- a/config/sync/views.settings.yml +++ b/config/sync/views.settings.yml @@ -1,7 +1,6 @@ _core: default_config_hash: RaRd9EIcwA4u3qCSRLL8EnCicbda1kV__ASmVbyehvQ -display_extenders: - - views_ef_fieldset +display_extenders: { } skip_cache: false sql_signature: false ui: diff --git a/config/sync/views.view.admin_users.yml b/config/sync/views.view.admin_users.yml index 5e7de1e5..bd279beb 100644 --- a/config/sync/views.view.admin_users.yml +++ b/config/sync/views.view.admin_users.yml @@ -29,6 +29,7 @@ dependencies: - user.role.unverified module: - address + - better_exposed_filters - commerce_license - commerce_tax - csv_serialization @@ -45,7 +46,6 @@ dependencies: - user - user_email_verification - views_bulk_operations - - views_conditional - views_data_export id: admin_users label: 'Admin Users' @@ -2765,73 +2765,6 @@ display: format_plural_string: !!binary MQNAY291bnQ= prefix: '' suffix: '' - access: - id: access - table: users_field_data - field: access - relationship: none - group_type: group - admin_label: '' - entity_type: user - entity_field: access - plugin_id: field - label: 'Last access' - exclude: true - alter: - alter_text: false - text: '' - make_link: false - path: '' - absolute: false - external: false - replace_spaces: false - path_case: none - trim_whitespace: false - alt: '' - rel: '' - link_class: '' - prefix: '' - suffix: '' - target: '' - nl2br: false - max_length: 0 - word_boundary: true - ellipsis: true - more_link: false - more_link_text: '' - more_link_path: '' - strip_tags: false - trim: false - preserve_tags: '' - html: false - element_type: '' - element_class: '' - element_label_type: '' - element_label_class: '' - element_label_colon: true - element_wrapper_type: '' - element_wrapper_class: '' - element_default_classes: true - empty: '' - hide_empty: true - empty_zero: true - hide_alter_empty: true - click_sort_column: value - type: commerce_license_expiration - settings: - date_format: html_date - custom_date_format: d-m-Y - timezone: '' - group_column: value - group_columns: { } - group_rows: true - delta_limit: 0 - delta_offset: 0 - delta_reversed: false - delta_first_last: false - multi_type: separator - separator: ', ' - field_api_classes: false access_1: id: access_1 table: users_field_data @@ -2899,19 +2832,21 @@ display: multi_type: separator separator: ', ' field_api_classes: false - views_conditional_field: - id: views_conditional_field - table: views_conditional - field: views_conditional_field + access: + id: access + table: users_field_data + field: access relationship: none group_type: group admin_label: '' - plugin_id: views_conditional_field - label: 'Last access ' + entity_type: user + entity_field: access + plugin_id: field + label: 'Last access' exclude: false alter: - alter_text: false - text: '' + alter_text: true + text: "{% if access_1 == '1970' %}\r\n never\r\n{% else %}\r\n {{ access }}\r\n{% endif %}" make_link: false path: '' absolute: false @@ -2940,22 +2875,30 @@ display: element_class: '' element_label_type: '' element_label_class: '' - element_label_colon: false + element_label_colon: true element_wrapper_type: '' element_wrapper_class: '' element_default_classes: true empty: '' - hide_empty: false - empty_zero: false + hide_empty: true + empty_zero: true hide_alter_empty: true - if: access_1 - condition: eq - equalto: '1970' - then: never - then_translate: 1 - or: '{{ access }}' - or_translate: 1 - strip_tags: 0 + click_sort_column: value + type: commerce_license_expiration + settings: + date_format: html_date + custom_date_format: d-m-Y + timezone: '' + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false role_expire_expiry_data: id: role_expire_expiry_data table: users @@ -3325,7 +3268,7 @@ display: separator: ', ' field_api_classes: false exposed_form: - type: basic + type: bef options: submit_button: Apply reset_button: true @@ -3334,6 +3277,71 @@ display: expose_sort_order: true sort_asc_label: Asc sort_desc_label: Desc + text_input_required: 'Sélectionnez n''importe quel filtre et cliquez sur Appliquer pour voir les résultats' + text_input_required_format: wysiwyg + bef: + general: + autosubmit: false + autosubmit_exclude_textfield: false + autosubmit_textfield_delay: 500 + autosubmit_hide: false + input_required: false + allow_secondary: false + secondary_label: 'Options avancées' + secondary_open: false + reset_button_always_show: true + filter: + status: + plugin_id: default + advanced: + sort_options: false + rewrite: + filter_rewrite_values: '' + collapsible: false + is_secondary: false + roles_target_id: + plugin_id: default + advanced: + sort_options: false + rewrite: + filter_rewrite_values: '' + collapsible: false + is_secondary: false + mail: + plugin_id: default + advanced: + placeholder_text: '' + collapsible: false + is_secondary: false + uid: + plugin_id: default + advanced: + placeholder_text: '' + rewrite: + filter_rewrite_values: '' + collapsible: false + is_secondary: false + field_company_target_id: + plugin_id: default + advanced: + placeholder_text: '' + rewrite: + filter_rewrite_values: '' + collapsible: false + is_secondary: false + field_showroom_target_id: + plugin_id: default + advanced: + placeholder_text: '' + rewrite: + filter_rewrite_values: '' + collapsible: false + is_secondary: false + field_memo_value: + plugin_id: default + advanced: + collapsible: false + is_secondary: false filters: status: id: status @@ -3679,10 +3687,12 @@ display: operator_id: field_memo_value_op label: Memo description: '' - use_operator: false + use_operator: true operator: field_memo_value_op - operator_limit_selection: false - operator_list: { } + operator_limit_selection: true + operator_list: + contains: contains + not: not identifier: field_memo_value required: false remember: false @@ -3781,7 +3791,7 @@ display: default_sort_order: asc align: '' separator: '' - empty_column: false + empty_column: true responsive: '' field_company: sortable: false @@ -3805,7 +3815,7 @@ display: empty_column: false responsive: '' record_id: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' @@ -3979,6 +3989,12 @@ display: pid: container-0 depth: '2' type: filter + field_memo_value_op: + weight: '-18' + id: field_memo_value_op + pid: root + depth: '1' + type: filter container-4: container_type: container title: '' @@ -3990,7 +4006,7 @@ display: depth: '1' type: container submit: - weight: '-19' + weight: '0' id: submit pid: container-4 depth: '2' @@ -4055,6 +4071,16 @@ display: pid: root depth: '1' type: container + container-8: + container_type: details + title: 'Container 8' + description: '' + weight: '-8' + open: 0 + id: container-8 + pid: root + depth: '1' + type: container path: admin/people/users menu: type: tab diff --git a/web/profiles/d8-starterkit-profile b/web/profiles/d8-starterkit-profile index fba104de..b06c8e53 160000 --- a/web/profiles/d8-starterkit-profile +++ b/web/profiles/d8-starterkit-profile @@ -1 +1 @@ -Subproject commit fba104debf477ae481ef009894b10836b5c7866e +Subproject commit b06c8e53e2733a193329c2e318a6186d0a405c2e