Upgraded batch edit form for groups.

Author: Daniel Berthereau

Module.php

@@ -187,11 +187,6 @@ public function attachListeners(SharedEventManagerInterface $sharedEventManager)
             'form.add_elements',
             [$this, 'formAddElementsResourceBatchUpdateForm']
         );
-        $sharedEventManager->attach(
-            \Omeka\Form\ResourceBatchUpdateForm::class,
-            'form.add_input_filters',
-            [$this, 'formAddInputFiltersResourceBatchUpdateForm']
-        );
 
         // TODO The conversion to coordinates can be done for other resources but the module Mapping doesn't manage them.
         $sharedEventManager->attach(
@@ -403,35 +398,21 @@ public function formAddElementsResourceBatchUpdateForm(Event $event): void
         $formElementManager = $services->get('FormElementManager');
         // $resourceType = $form->getOption('resource_type');
 
+        /** @var \DataTypeGeometry\Form\BatchEditFieldset $fieldset */
         $fieldset = $formElementManager->get(BatchEditFieldset::class);
         $form->add($fieldset);
 
+        $groups = $form->getOption('element_groups');
+        $groups['geometry'] = 'Geometry and geography'; // @translate
+        $form->setOption('element_groups', $groups);
+
         if (!$this->isModuleActive('Mapping')) {
             $fieldset->remove('manage_coordinates_features');
             $fieldset->get('from_properties')->setLabel('Properties to convert from literal to geometric data'); // @translate
             $fieldset->remove('to_property');
         }
     }
 
-    public function formAddInputFiltersResourceBatchUpdateForm(Event $event): void
-    {
-        /** @var \Laminas\InputFilter\InputFilterInterface $inputFilter */
-        $inputFilter = $event->getParam('inputFilter');
-        $inputFilter->get('geometry')
-            ->add([
-                'name' => 'manage_coordinates_features',
-                'required' => false,
-            ])
-            ->add([
-                'name' => 'from_properties',
-                'required' => false,
-            ])
-            ->add([
-                'name' => 'to_property',
-                'required' => false,
-            ]);
-    }
-
     /**
      * Clean params for batch update.
      */

asset/js/data-type-geometry.js

@@ -202,13 +202,6 @@
 
     $(document).ready(function() {
 
-        // Batch edit form.
-
-        $('#geometry_manage_coordinates_features, #geometry_convert_literal_to_coordinates, #geometry_convert_literal_order, #geometry_convert_literal_strict, #geometry_from_property, #geometry_to_property').closest('.field')
-            .wrapAll('<fieldset id="geometry" class="field-container">');
-        $('#geometry')
-            .prepend('<legend>' + Omeka.jsTranslate('Geographic coordinates') + '</legend>');
-
         // Resource form.
 
         $(document).on('keyup change', '.geography-coordinates', function(e) {

src/Form/BatchEditFieldset.php

@@ -5,7 +5,6 @@
 use Common\Form\Element as CommonElement;
 use Laminas\Form\Element;
 use Laminas\Form\Fieldset;
-use Omeka\Form\Element\PropertySelect;
 
 class BatchEditFieldset extends Fieldset
 {
@@ -14,8 +13,9 @@ public function init(): void
         $this
             ->setName('geometry')
             ->setOptions([
-                    'label' => 'Geometry and geography', // @translate
-                ])
+                'element_group' => 'geometry',
+                'label' => 'Geometry and geography', // @translate
+            ])
             ->setAttributes([
                 'id' => 'geometry',
                 'class' => 'field-container',
@@ -27,6 +27,7 @@ public function init(): void
                 'name' => 'convert_literal_to_coordinates',
                 'type' => Element\Checkbox::class,
                 'options' => [
+                    'element_group' => 'geometry',
                     'label' => 'Convert literal values to coordinates', // @translate
                 ],
                 'attributes' => [
@@ -39,6 +40,7 @@ public function init(): void
                 'name' => 'convert_literal_order',
                 'type' => CommonElement\OptionalRadio::class,
                 'options' => [
+                    'element_group' => 'geometry',
                     'label' => 'Order of literal value', // @translate
                     'value_options' => [
                         'latitude_longitude' => 'Latitude then longitude (most frequent)', // @translate
@@ -56,6 +58,7 @@ public function init(): void
                 'name' => 'convert_literal_strict',
                 'type' => Element\Checkbox::class,
                 'options' => [
+                    'element_group' => 'geometry',
                     'label' => 'Check format strictly ("," as separator)', // @translate
                 ],
                 'attributes' => [
@@ -67,9 +70,10 @@ public function init(): void
             ])
             ->add([
                 'name' => 'manage_coordinates_features',
-                'type' => Element\Select::class,
+                'type' => CommonElement\OptionalSelect::class,
                 'options' => [
-                    'label' => 'Manage geographic coordinates', // @translate
+                    'element_group' => 'geometry',
+                    'label' => 'Manage geographic coordinates for module Mapping', // @translate
                     'value_options' => [
                         'sync' => 'Synchronize coordinates and mapping markers', // @translate
                         'coordinates_to_features' => 'Copy coordinates to mapping markers', // @translate
@@ -86,8 +90,9 @@ public function init(): void
             ])
             ->add([
                 'name' => 'from_properties',
-                'type' => PropertySelect::class,
+                'type' => CommonElement\OptionalPropertySelect::class,
                 'options' => [
+                    'element_group' => 'geometry',
                     'label' => 'Source properties to create markers or to convert from literal', // @translate
                     'term_as_value' => true,
                     'prepend_value_options' => [
@@ -108,8 +113,9 @@ public function init(): void
             ])
             ->add([
                 'name' => 'to_property',
-                'type' => PropertySelect::class,
+                'type' => CommonElement\OptionalPropertySelect::class,
                 'options' => [
+                    'element_group' => 'geometry',
                     'label' => 'Property where to copy markers', // @translate
                     'term_as_value' => true,
                     'empty_option' => '',