+ {% if content %}
+ {{ content|without('name', 'created', 'uid') }}
+
+ {% endif %}
+
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_one.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_one.default.yml
new file mode 100644
index 0000000..212daf8
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_one.default.yml
@@ -0,0 +1,43 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.field.media.type_one.field_media_test
+ - media.type.type_one
+id: media.type_one.default
+targetEntityType: media
+bundle: type_one
+mode: default
+content:
+ created:
+ type: datetime_timestamp
+ weight: 10
+ region: content
+ settings: { }
+ third_party_settings: { }
+ field_media_test:
+ settings:
+ size: 60
+ placeholder: ''
+ third_party_settings: { }
+ type: string_textfield
+ weight: 11
+ region: content
+ name:
+ type: string_textfield
+ weight: -5
+ region: content
+ settings:
+ size: 60
+ placeholder: ''
+ third_party_settings: { }
+ uid:
+ type: entity_reference_autocomplete
+ weight: 5
+ settings:
+ match_operator: CONTAINS
+ size: 60
+ placeholder: ''
+ region: content
+ third_party_settings: { }
+hidden: { }
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_two.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_two.default.yml
new file mode 100644
index 0000000..fabd13b
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.media.type_two.default.yml
@@ -0,0 +1,43 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.field.media.type_two.field_media_test_1
+ - media.type.type_two
+id: media.type_two.default
+targetEntityType: media
+bundle: type_two
+mode: default
+content:
+ created:
+ type: datetime_timestamp
+ weight: 10
+ region: content
+ settings: { }
+ third_party_settings: { }
+ field_media_test_1:
+ settings:
+ size: 60
+ placeholder: ''
+ third_party_settings: { }
+ type: string_textfield
+ weight: 11
+ region: content
+ name:
+ type: string_textfield
+ weight: -5
+ region: content
+ settings:
+ size: 60
+ placeholder: ''
+ third_party_settings: { }
+ uid:
+ type: entity_reference_autocomplete
+ weight: 5
+ settings:
+ match_operator: CONTAINS
+ size: 60
+ placeholder: ''
+ region: content
+ third_party_settings: { }
+hidden: { }
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.node.media_library_test.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.node.media_library_test.default.yml
new file mode 100644
index 0000000..775319d
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_form_display.node.media_library_test.default.yml
@@ -0,0 +1,71 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.field.node.media_library_test.field_media
+ - field.field.node.media_library_test.field_multivalue_media
+ - node.type.media_library_test
+ module:
+ - media_library
+ - path
+id: node.media_library_test.default
+targetEntityType: node
+bundle: media_library_test
+mode: default
+content:
+ created:
+ type: datetime_timestamp
+ weight: 10
+ region: content
+ settings: { }
+ third_party_settings: { }
+ field_media:
+ weight: 31
+ settings: { }
+ third_party_settings: { }
+ type: media_library_widget
+ region: content
+ field_multivalue_media:
+ weight: 32
+ settings: { }
+ third_party_settings: { }
+ type: media_library_widget
+ region: content
+ path:
+ type: path
+ weight: 30
+ region: content
+ settings: { }
+ third_party_settings: { }
+ promote:
+ type: boolean_checkbox
+ settings:
+ display_label: true
+ weight: 15
+ region: content
+ third_party_settings: { }
+ sticky:
+ type: boolean_checkbox
+ settings:
+ display_label: true
+ weight: 16
+ region: content
+ third_party_settings: { }
+ title:
+ type: string_textfield
+ weight: -5
+ region: content
+ settings:
+ size: 60
+ placeholder: ''
+ third_party_settings: { }
+ uid:
+ type: entity_reference_autocomplete
+ weight: 5
+ settings:
+ match_operator: CONTAINS
+ size: 60
+ placeholder: ''
+ region: content
+ third_party_settings: { }
+hidden: { }
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_one.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_one.default.yml
new file mode 100644
index 0000000..8f5f22a
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_one.default.yml
@@ -0,0 +1,50 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.field.media.type_one.field_media_test
+ - image.style.thumbnail
+ - media.type.type_one
+ module:
+ - image
+ - user
+id: media.type_one.default
+targetEntityType: media
+bundle: type_one
+mode: default
+content:
+ created:
+ label: hidden
+ type: timestamp
+ weight: 0
+ region: content
+ settings:
+ date_format: medium
+ custom_date_format: ''
+ timezone: ''
+ third_party_settings: { }
+ field_media_test:
+ label: above
+ settings:
+ link_to_entity: false
+ third_party_settings: { }
+ type: string
+ weight: 6
+ region: content
+ thumbnail:
+ type: image
+ weight: 5
+ label: hidden
+ settings:
+ image_style: thumbnail
+ image_link: ''
+ region: content
+ third_party_settings: { }
+ uid:
+ label: hidden
+ type: author
+ weight: 0
+ region: content
+ settings: { }
+ third_party_settings: { }
+hidden: { }
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_two.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_two.default.yml
new file mode 100644
index 0000000..a884fee
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.media.type_two.default.yml
@@ -0,0 +1,50 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.field.media.type_two.field_media_test_1
+ - image.style.thumbnail
+ - media.type.type_two
+ module:
+ - image
+ - user
+id: media.type_two.default
+targetEntityType: media
+bundle: type_two
+mode: default
+content:
+ created:
+ label: hidden
+ type: timestamp
+ weight: 0
+ region: content
+ settings:
+ date_format: medium
+ custom_date_format: ''
+ timezone: ''
+ third_party_settings: { }
+ field_media_test_1:
+ label: above
+ settings:
+ link_to_entity: false
+ third_party_settings: { }
+ type: string
+ weight: 6
+ region: content
+ thumbnail:
+ type: image
+ weight: 5
+ label: hidden
+ settings:
+ image_style: thumbnail
+ image_link: ''
+ region: content
+ third_party_settings: { }
+ uid:
+ label: hidden
+ type: author
+ weight: 0
+ region: content
+ settings: { }
+ third_party_settings: { }
+hidden: { }
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.node.media_library_test.default.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.node.media_library_test.default.yml
new file mode 100644
index 0000000..3650d3b
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/core.entity_view_display.node.media_library_test.default.yml
@@ -0,0 +1,34 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.field.node.media_library_test.field_media
+ - field.field.node.media_library_test.field_multivalue_media
+ - node.type.media_library_test
+ module:
+ - user
+id: node.media_library_test.default
+targetEntityType: node
+bundle: media_library_test
+mode: default
+content:
+ field_media:
+ weight: 101
+ label: above
+ settings:
+ link: true
+ third_party_settings: { }
+ type: entity_reference_label
+ region: content
+ field_multivalue_media:
+ weight: 102
+ label: above
+ settings:
+ link: true
+ third_party_settings: { }
+ type: entity_reference_label
+ region: content
+ links:
+ weight: 100
+ region: content
+hidden: { }
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_one.field_media_test.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_one.field_media_test.yml
new file mode 100644
index 0000000..f19207c
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_one.field_media_test.yml
@@ -0,0 +1,18 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.storage.media.field_media_test
+ - media.type.type_one
+id: media.type_one.field_media_test
+field_name: field_media_test
+entity_type: media
+bundle: type_one
+label: field_media_test
+description: ''
+required: false
+translatable: true
+default_value: { }
+default_value_callback: ''
+settings: { }
+field_type: string
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_two.field_media_test_1.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_two.field_media_test_1.yml
new file mode 100644
index 0000000..5b093ca
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.media.type_two.field_media_test_1.yml
@@ -0,0 +1,18 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.storage.media.field_media_test_1
+ - media.type.type_two
+id: media.type_two.field_media_test_1
+field_name: field_media_test_1
+entity_type: media
+bundle: type_two
+label: field_media_test_1
+description: ''
+required: false
+translatable: true
+default_value: { }
+default_value_callback: ''
+settings: { }
+field_type: string
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.node.media_library_test.field_media.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.node.media_library_test.field_media.yml
new file mode 100644
index 0000000..e5773ab
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.node.media_library_test.field_media.yml
@@ -0,0 +1,29 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.storage.node.field_media
+ - media.type.type_one
+ - media.type.type_two
+ - node.type.media_library_test
+id: node.media_library_test.field_media
+field_name: field_media
+entity_type: node
+bundle: media_library_test
+label: Media
+description: ''
+required: false
+translatable: false
+default_value: { }
+default_value_callback: ''
+settings:
+ handler: 'default:media'
+ handler_settings:
+ target_bundles:
+ type_one: type_one
+ type_two: type_two
+ sort:
+ field: _none
+ auto_create: false
+ auto_create_bundle: type_one
+field_type: entity_reference
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.node.media_library_test.field_multivalue_media.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.node.media_library_test.field_multivalue_media.yml
new file mode 100644
index 0000000..f92f30f
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.field.node.media_library_test.field_multivalue_media.yml
@@ -0,0 +1,29 @@
+langcode: en
+status: true
+dependencies:
+ config:
+ - field.storage.node.field_multivalue_media
+ - media.type.type_one
+ - media.type.type_two
+ - node.type.media_library_test
+id: node.media_library_test.field_multivalue_media
+field_name: field_multivalue_media
+entity_type: node
+bundle: media_library_test
+label: 'Multivalue Media'
+description: ''
+required: false
+translatable: false
+default_value: { }
+default_value_callback: ''
+settings:
+ handler: 'default:media'
+ handler_settings:
+ target_bundles:
+ type_one: type_one
+ type_two: type_two
+ sort:
+ field: _none
+ auto_create: false
+ auto_create_bundle: type_one
+field_type: entity_reference
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test.yml
new file mode 100644
index 0000000..40a7791
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test.yml
@@ -0,0 +1,20 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - media
+id: media.field_media_test
+field_name: field_media_test
+entity_type: media
+type: string
+settings:
+ max_length: 255
+ is_ascii: false
+ case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: { }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_1.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_1.yml
new file mode 100644
index 0000000..73b1105
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.media.field_media_test_1.yml
@@ -0,0 +1,20 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - media
+id: media.field_media_test_1
+field_name: field_media_test_1
+entity_type: media
+type: string
+settings:
+ max_length: 255
+ is_ascii: false
+ case_sensitive: false
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: { }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.node.field_media.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.node.field_media.yml
new file mode 100644
index 0000000..bbec21d
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.node.field_media.yml
@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - media
+ - node
+id: node.field_media
+field_name: field_media
+entity_type: node
+type: entity_reference
+settings:
+ target_type: media
+module: core
+locked: false
+cardinality: 1
+translatable: true
+indexes: { }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.node.field_multivalue_media.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.node.field_multivalue_media.yml
new file mode 100644
index 0000000..9937919
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/field.storage.node.field_multivalue_media.yml
@@ -0,0 +1,19 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - media
+ - node
+id: node.field_multivalue_media
+field_name: field_multivalue_media
+entity_type: node
+type: entity_reference
+settings:
+ target_type: media
+module: core
+locked: false
+cardinality: 5
+translatable: true
+indexes: { }
+persist_with_no_fields: false
+custom_storage: false
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/media.type.type_one.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/media.type.type_one.yml
new file mode 100644
index 0000000..1f72b8b
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/media.type.type_one.yml
@@ -0,0 +1,16 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - media
+ - media_test_source
+id: type_one
+label: 'Type One'
+description: ''
+source: test
+queue_thumbnail_downloads: false
+new_revision: false
+source_configuration:
+ source_field: field_media_test
+ test_config_value: 'This is default value.'
+field_map: { }
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/media.type.type_two.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/media.type.type_two.yml
new file mode 100644
index 0000000..13b549c
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/media.type.type_two.yml
@@ -0,0 +1,16 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - media
+ - media_test_source
+id: type_two
+label: 'Type Two'
+description: ''
+source: test
+queue_thumbnail_downloads: false
+new_revision: false
+source_configuration:
+ source_field: field_media_test_1
+ test_config_value: 'This is default value.'
+field_map: { }
diff --git a/core/modules/media_library/tests/modules/media_library_test/config/install/node.type.media_library_test.yml b/core/modules/media_library/tests/modules/media_library_test/config/install/node.type.media_library_test.yml
new file mode 100644
index 0000000..2c3ba17
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/config/install/node.type.media_library_test.yml
@@ -0,0 +1,17 @@
+langcode: en
+status: true
+dependencies:
+ module:
+ - menu_ui
+third_party_settings:
+ menu_ui:
+ available_menus:
+ - main
+ parent: 'main:'
+name: 'Media Library Test'
+type: media_library_test
+description: ''
+help: ''
+new_revision: true
+preview_mode: 1
+display_submitted: true
diff --git a/core/modules/media_library/tests/modules/media_library_test/media_library_test.info.yml b/core/modules/media_library/tests/modules/media_library_test/media_library_test.info.yml
new file mode 100644
index 0000000..77629a6
--- /dev/null
+++ b/core/modules/media_library/tests/modules/media_library_test/media_library_test.info.yml
@@ -0,0 +1,11 @@
+name: 'Media library test'
+type: module
+description: 'Test module for Media Library.'
+package: Testing
+core: 8.x
+dependencies:
+ - drupal:media_library
+ - drupal:media_test_source
+ - drupal:menu_ui
+ - drupal:node
+ - drupal:path
diff --git a/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php b/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php
new file mode 100644
index 0000000..72ca4a7
--- /dev/null
+++ b/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php
@@ -0,0 +1,86 @@
+ [
+ 'media_1',
+ 'media_2',
+ ],
+ 'type_two' => [
+ 'media_3',
+ 'media_4',
+ ],
+ ];
+
+ foreach ($media as $type => $names) {
+ foreach ($names as $name) {
+ Media::create(['name' => $name, 'bundle' => $type])->save();
+ }
+ }
+
+ // Create a user who can use the Media Library.
+ $user = $this->drupalCreateUser([
+ 'access content',
+ 'access content overview',
+ 'access administration pages',
+ 'administer media',
+ 'create media_library_test content',
+ 'edit own media_library_test content',
+ 'delete any media',
+ 'delete own media_library_test content',
+ 'view media',
+ ]);
+ $this->drupalLogin($user);
+ $this->drupalPlaceBlock('local_tasks_block');
+ }
+
+ /**
+ * Tests that the Media Library's administration page works as expected.
+ */
+ public function testAdministrationPage() {
+ // Visit the administration page.
+ $this->drupalGet('admin/content/media');
+
+ // Verify that media from two separate types is present.
+ $this->assertSession()->pageTextContains('media_1');
+ $this->assertSession()->pageTextContains('media_3');
+
+ // Test the tabs that allow users to filter by type.
+ $this->clickLink('Type One');
+ $this->assertSession()->pageTextContains('media_2');
+ $this->assertSession()->pageTextNotContains('media_4');
+ $this->clickLink('Type Two');
+ $this->assertSession()->pageTextNotContains('media_2');
+ $this->assertSession()->pageTextContains('media_4');
+
+ // Test that selecting elements as a part of bulk operations works.
+ $this->clickLink('All categories');
+ $this->getSession()->executeScript('jQuery(".media-library-item").click()');
+ $this->submitForm([], 'Apply to selected items', 'views-form-media-library-page');
+ $this->assertSession()->pageTextContains('media_1');
+ }
+
+}
diff --git a/core/modules/views/src/Plugin/views/field/BulkForm.php b/core/modules/views/src/Plugin/views/field/BulkForm.php
index a253fc3..8f6df30 100644
--- a/core/modules/views/src/Plugin/views/field/BulkForm.php
+++ b/core/modules/views/src/Plugin/views/field/BulkForm.php
@@ -2,15 +2,12 @@
namespace Drupal\views\Plugin\views\field;
-use Drupal\Core\Cache\CacheableDependencyInterface;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityManagerInterface;
use Drupal\Core\Entity\RevisionableInterface;
use Drupal\Core\Form\FormStateInterface;
use Drupal\Core\Language\LanguageManagerInterface;
-use Drupal\Core\Routing\RedirectDestinationTrait;
use Drupal\Core\TypedData\TranslatableInterface;
-use Drupal\views\Entity\Render\EntityTranslationRenderTrait;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\style\Table;
use Drupal\views\ResultRow;
@@ -22,18 +19,7 @@
*
* @ViewsField("bulk_form")
*/
-class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
-
- use RedirectDestinationTrait;
- use UncacheableFieldHandlerTrait;
- use EntityTranslationRenderTrait;
-
- /**
- * The entity manager.
- *
- * @var \Drupal\Core\Entity\EntityManagerInterface
- */
- protected $entityManager;
+class BulkForm extends SelectFormBase {
/**
* The action storage.
@@ -50,13 +36,6 @@ class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
protected $actions = [];
/**
- * The language manager.
- *
- * @var \Drupal\Core\Language\LanguageManagerInterface
- */
- protected $languageManager;
-
- /**
* Constructs a new BulkForm object.
*
* @param array $configuration
@@ -71,11 +50,8 @@ class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
* The language manager.
*/
public function __construct(array $configuration, $plugin_id, $plugin_definition, EntityManagerInterface $entity_manager, LanguageManagerInterface $language_manager) {
- parent::__construct($configuration, $plugin_id, $plugin_definition);
-
- $this->entityManager = $entity_manager;
+ parent::__construct($configuration, $plugin_id, $plugin_definition, $entity_manager, $language_manager);
$this->actionStorage = $entity_manager->getStorage('action');
- $this->languageManager = $language_manager;
}
/**
diff --git a/core/modules/views/src/Plugin/views/field/BulkForm.php b/core/modules/views/src/Plugin/views/field/SelectFormBase.php
similarity index 55%
copy from core/modules/views/src/Plugin/views/field/BulkForm.php
copy to core/modules/views/src/Plugin/views/field/SelectFormBase.php
index a253fc3..abf66e9 100644
--- a/core/modules/views/src/Plugin/views/field/BulkForm.php
+++ b/core/modules/views/src/Plugin/views/field/SelectFormBase.php
@@ -11,18 +11,14 @@
use Drupal\Core\Routing\RedirectDestinationTrait;
use Drupal\Core\TypedData\TranslatableInterface;
use Drupal\views\Entity\Render\EntityTranslationRenderTrait;
-use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Plugin\views\style\Table;
use Drupal\views\ResultRow;
-use Drupal\views\ViewExecutable;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
- * Defines a actions-based bulk operation form element.
- *
- * @ViewsField("bulk_form")
+ * Defines a base class select forms.
*/
-class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
+abstract class SelectFormBase extends FieldPluginBase implements CacheableDependencyInterface {
use RedirectDestinationTrait;
use UncacheableFieldHandlerTrait;
@@ -36,20 +32,6 @@ class BulkForm extends FieldPluginBase implements CacheableDependencyInterface {
protected $entityManager;
/**
- * The action storage.
- *
- * @var \Drupal\Core\Entity\EntityStorageInterface
- */
- protected $actionStorage;
-
- /**
- * An array of actions that can be executed.
- *
- * @var \Drupal\system\ActionConfigEntityInterface[]
- */
- protected $actions = [];
-
- /**
* The language manager.
*
* @var \Drupal\Core\Language\LanguageManagerInterface
@@ -74,7 +56,6 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition
parent::__construct($configuration, $plugin_id, $plugin_definition);
$this->entityManager = $entity_manager;
- $this->actionStorage = $entity_manager->getStorage('action');
$this->languageManager = $language_manager;
}
@@ -94,19 +75,6 @@ public static function create(ContainerInterface $container, array $configuratio
/**
* {@inheritdoc}
*/
- public function init(ViewExecutable $view, DisplayPluginBase $display, array &$options = NULL) {
- parent::init($view, $display, $options);
-
- $entity_type = $this->getEntityType();
- // Filter the actions to only include those for this entity type.
- $this->actions = array_filter($this->actionStorage->loadMultiple(), function ($action) use ($entity_type) {
- return $action->getType() == $entity_type;
- });
- }
-
- /**
- * {@inheritdoc}
- */
public function getCacheMaxAge() {
// @todo Consider making the bulk operation form cacheable. See
// https://www.drupal.org/node/2503009.
@@ -158,61 +126,6 @@ protected function getView() {
/**
* {@inheritdoc}
*/
- protected function defineOptions() {
- $options = parent::defineOptions();
- $options['action_title'] = ['default' => $this->t('Action')];
- $options['include_exclude'] = [
- 'default' => 'exclude',
- ];
- $options['selected_actions'] = [
- 'default' => [],
- ];
- return $options;
- }
-
- /**
- * {@inheritdoc}
- */
- public function buildOptionsForm(&$form, FormStateInterface $form_state) {
- $form['action_title'] = [
- '#type' => 'textfield',
- '#title' => $this->t('Action title'),
- '#default_value' => $this->options['action_title'],
- '#description' => $this->t('The title shown above the actions dropdown.'),
- ];
-
- $form['include_exclude'] = [
- '#type' => 'radios',
- '#title' => $this->t('Available actions'),
- '#options' => [
- 'exclude' => $this->t('All actions, except selected'),
- 'include' => $this->t('Only selected actions'),
- ],
- '#default_value' => $this->options['include_exclude'],
- ];
- $form['selected_actions'] = [
- '#type' => 'checkboxes',
- '#title' => $this->t('Selected actions'),
- '#options' => $this->getBulkOptions(FALSE),
- '#default_value' => $this->options['selected_actions'],
- ];
-
- parent::buildOptionsForm($form, $form_state);
- }
-
- /**
- * {@inheritdoc}
- */
- public function validateOptionsForm(&$form, FormStateInterface $form_state) {
- parent::validateOptionsForm($form, $form_state);
-
- $selected_actions = $form_state->getValue(['options', 'selected_actions']);
- $form_state->setValue(['options', 'selected_actions'], array_values(array_filter($selected_actions)));
- }
-
- /**
- * {@inheritdoc}
- */
public function preRender(&$values) {
parent::preRender($values);
@@ -261,7 +174,7 @@ public function viewsForm(&$form, FormStateInterface $form_state) {
'#type' => 'checkbox',
// We are not able to determine a main "title" for each row, so we can
// only output a generic label.
- '#title' => $this->t('Update this item'),
+ '#title' => $this->t('Select this item'),
'#title_display' => 'invisible',
'#default_value' => !empty($form_state->getValue($this->options['id'])[$row_index]) ? 1 : NULL,
'#return_value' => $this->calculateEntityBulkFormKey($entity, $use_revision),
@@ -269,27 +182,7 @@ public function viewsForm(&$form, FormStateInterface $form_state) {
}
// Replace the form submit button label.
- $form['actions']['submit']['#value'] = $this->t('Apply to selected items');
-
- // Ensure a consistent container for filters/operations in the view header.
- $form['header'] = [
- '#type' => 'container',
- '#weight' => -100,
- ];
-
- // Build the bulk operations action widget for the header.
- // Allow themes to apply .container-inline on this separate container.
- $form['header'][$this->options['id']] = [
- '#type' => 'container',
- ];
- $form['header'][$this->options['id']]['action'] = [
- '#type' => 'select',
- '#title' => $this->options['action_title'],
- '#options' => $this->getBulkOptions(),
- ];
-
- // Duplicate the form actions into the action container in the header.
- $form['header'][$this->options['id']]['actions'] = $form['actions'];
+ $form['actions']['submit']['#value'] = $this->t('Selected items');
}
else {
// Remove the default actions build array.
@@ -298,99 +191,6 @@ public function viewsForm(&$form, FormStateInterface $form_state) {
}
/**
- * Returns the available operations for this form.
- *
- * @param bool $filtered
- * (optional) Whether to filter actions to selected actions.
- * @return array
- * An associative array of operations, suitable for a select element.
- */
- protected function getBulkOptions($filtered = TRUE) {
- $options = [];
- // Filter the action list.
- foreach ($this->actions as $id => $action) {
- if ($filtered) {
- $in_selected = in_array($id, $this->options['selected_actions']);
- // If the field is configured to include only the selected actions,
- // skip actions that were not selected.
- if (($this->options['include_exclude'] == 'include') && !$in_selected) {
- continue;
- }
- // Otherwise, if the field is configured to exclude the selected
- // actions, skip actions that were selected.
- elseif (($this->options['include_exclude'] == 'exclude') && $in_selected) {
- continue;
- }
- }
-
- $options[$id] = $action->label();
- }
-
- return $options;
- }
-
- /**
- * Submit handler for the bulk form.
- *
- * @param array $form
- * An associative array containing the structure of the form.
- * @param \Drupal\Core\Form\FormStateInterface $form_state
- * The current state of the form.
- *
- * @throws \Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException
- * Thrown when the user tried to access an action without access to it.
- */
- public function viewsFormSubmit(&$form, FormStateInterface $form_state) {
- if ($form_state->get('step') == 'views_form_views_form') {
- // Filter only selected checkboxes. Use the actual user input rather than
- // the raw form values array, since the site data may change before the
- // bulk form is submitted, which can lead to data loss.
- $user_input = $form_state->getUserInput();
- $selected = array_filter($user_input[$this->options['id']]);
- $entities = [];
- $action = $this->actions[$form_state->getValue('action')];
- $count = 0;
-
- foreach ($selected as $bulk_form_key) {
- $entity = $this->loadEntityFromBulkFormKey($bulk_form_key);
-
- // Skip execution if the user did not have access.
- if (!$action->getPlugin()->access($entity, $this->view->getUser())) {
- $this->drupalSetMessage($this->t('No access to execute %action on the @entity_type_label %entity_label.', [
- '%action' => $action->label(),
- '@entity_type_label' => $entity->getEntityType()->getLabel(),
- '%entity_label' => $entity->label()
- ]), 'error');
- continue;
- }
-
- $count++;
-
- $entities[$bulk_form_key] = $entity;
- }
-
- $action->execute($entities);
-
- $operation_definition = $action->getPluginDefinition();
- if (!empty($operation_definition['confirm_form_route_name'])) {
- $options = [
- 'query' => $this->getDestinationArray(),
- ];
- $form_state->setRedirect($operation_definition['confirm_form_route_name'], [], $options);
- }
- else {
- // Don't display the message unless there are some elements affected and
- // there is no confirmation form.
- if ($count) {
- drupal_set_message($this->formatPlural($count, '%action was applied to @count item.', '%action was applied to @count items.', [
- '%action' => $action->label(),
- ]));
- }
- }
- }
- }
-
- /**
* Returns the message to be displayed when there are no selected items.
*
* @return string