Remove the former search form, filters and SlimSelect (F2)

- materio_sapi: MaterioSapiSearchForm, AjaxSearchForm and the
  /materio_sapi/search_form route removed, with the fieldset legend hook
  they needed. The search block is only the place where the Vue field
  mounts (placement and access unchanged).
- materiotheme: filters removed from the search store and Base.vue (the
  parameter of former URLs is ignored), formhtml removed from main.js and
  SearchBlock.vue, filter styles and SlimSelect import removed.
- slim-select uninstalled, with its postinstall patch step.
- Production build.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01ShDspHaZGwHoRZCsPBJzsM
This commit is contained in:
2026-11-17 21:11:18 +01:00
co-authored by Claude Opus 5.5
parent b73057f453
commit fca4be3155
29 changed files with 26 additions and 406 deletions
@@ -8,7 +8,6 @@
use Drupal\Core\Routing\RouteMatchInterface;
use Solarium\QueryType\Select\Query\Query;
use Drupal\search_api\Query\QueryInterface;
use Drupal\Core\Template\Attribute;
/**
* Implements hook_help().
@@ -51,24 +50,6 @@ function materio_sapi_search_api_solr_query_alter(Query $solarium_query, QueryI
}
/**
* Prepares variables for fieldset element templates.
*
* Default template: fieldset.html.twig.
*
* @param array $variables
* An associative array containing:
* - element: An associative array containing the properties of the element.
* Properties used: #attributes, #children, #description, #id, #title,
* #value.
*/
function materio_sapi_preprocess_fieldset(&$variables) {
if (isset($variables['element']['#legend_attributes'])) {
$variables['legend']['attributes'] = new Attribute($variables['element']['#legend_attributes']);
}
}
// ? https://happyculture.coop/blog/drupal-8-declarer-un-champ-extrafield-calcule-computed-field
// ? https://fivejars.com/blog/entity-basefielddefinitions-fields-examples-drupal-8
/**
@@ -6,22 +6,6 @@ materio_sapi.search_autocomplete:
requirements:
_permission: 'access materio search'
materio_sapi.search_form:
path: '/materio_sapi/search_form'
defaults:
_controller: '\Drupal\materio_sapi\Controller\AjaxSearchForm::getForm'
_format: json
requirements:
_permission: 'access materio search'
# materio_sapi.materio_sapi_search_form:
# path: '/materio_sapi/form/materio_sapi_search'
# defaults:
# _form: '\Drupal\materio_sapi\Form\MaterioSapiSearchForm'
# _title: 'MaterioSapiSearchForm'
# requirements:
# _access: 'TRUE'
materio_sapi.getresults:
path: '/materio_sapi/getresults'
defaults:
@@ -1,92 +0,0 @@
<?php
// https://www.qed42.com/blog/autocomplete-drupal-8
// https://www.drupal.org/docs/8/modules/search-api/developer-documentation/executing-a-search-in-code
namespace Drupal\materio_sapi\Controller;
use Drupal\Core\Controller\ControllerBase;
use Symfony\Component\DependencyInjection\ContainerInterface;
use Drupal\Core\Form\FormBuilder;
use Drupal\Core\Form\FormState;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\Request;
use Drupal\Core\Cache\CacheableJsonResponse;
use Drupal\Core\Cache\CacheableMetadata;
use Drupal\core\render\RenderContext;
/**
* Defines a route controller for entity autocomplete form elements.
*/
class AjaxSearchForm extends ControllerBase {
/**
* The built form array.
*
* @var array
*/
protected $form_builded;
/**
* The form builder.
*
* @var \Drupal\Core\Form\FormBuilder
*/
protected $formBuilder;
/**
* Construct.
*/
public function __construct(FormBuilder $formBuilder) {
$this->formBuilder = $formBuilder;
}
/**
* {@inheritdoc}
*/
public static function create(ContainerInterface $container) {
return new static(
$container->get('form_builder')
);
}
private function getFormDefinition(){
$language = \Drupal::languageManager()->getCurrentLanguage()->getId();
\Drupal::logger('materio_sapi')->notice($language);
// $form_state = new FormState();
$this->form_builded = $this->formBuilder->getForm('Drupal\materio_sapi\Form\MaterioSapiSearchForm', $language);
}
/**
* Handler for getform request.
*/
public function getForm(Request $request) {
$this->getFormDefinition();
// $rendered = render($this->form_builded);
$rendered = \Drupal::service('renderer')->render($this->form_builded);
// $form_builded = $this->form_builded;
// $rendered = \Drupal::service('renderer')->executeInRenderContext(new RenderContext(), function () use ($form_builded) {
// return render($form_builded);
// });
$data = [
'rendered' => $rendered,
// '#cache' => [
// 'max-age' => \Drupal\Core\Cache\Cache::PERMANENT,
// 'tags' => [
// 'materio_sapi-search_form-cache',
// ]
// ]
];
$response = new JsonResponse();
$response->setData($data);
// $response = new CacheableJsonResponse($data);
// $response->addCacheableDependency(CacheableMetadata::createFromRenderArray($data));
return $response;
}
}
@@ -1,151 +0,0 @@
<?php
namespace Drupal\materio_sapi\Form;
use Drupal\Core\Form\FormBase;
use Drupal\Core\Form\FormStateInterface;
/**
* Class MaterioSapiSearchForm.
*/
class MaterioSapiSearchForm extends FormBase {
/**
* {@inheritdoc}
*/
public function getFormId() {
return 'materio_sapi_search_form';
}
/**
* {@inheritdoc}
*/
public function buildForm(array $form, FormStateInterface $form_state) {
$lang = \Drupal::languageManager()->getCurrentLanguage()->getId();
$keys = \Drupal::request()->get('keys');
$term = \Drupal::request()->get('term');
$filters = \Drupal::request()->get('filters');
$form['#cache'] = array(
'contexts' => array(
'url.query_args:keys',
'url.query_args:term',
'url.query_args:filters',
),
);
$form['search'] = [
'#type' => 'textfield',
// '#title' => $this->t('Search'),
'#maxlength' => 150,
'#size' => 25,
'#weight' => '0',
'#attributes' => [
"placeholder" => $this->t('Search'),
// "@keyup" => "keyup",
// "@keyup.enter" => "submit",
"v-model" => "typed",
"v-focus" => "",
// "v-on:select" => "typed",
],
'#autocomplete_route_name' => 'materio_sapi.search_autocomplete',
];
$form['searchautocomplete'] = [
'#type' => 'hidden',
'#attributes' => [
"v-model" => "autocomplete"
],
];
// $filters_array = [];
$filters_classes = [];
if($filters){
$filters_array = explode(',',$filters);
$filters_classes[] = 'open';
}
$form['filters'] = [
'#type' => 'fieldset',
'#title' => t('filters'),
'#legend_attributes' => [
"class" => ["test-attribute"],
'@click.prevent' => "onClickFilters",
],
'#attributes' => [
"class" => $filters_classes
]
];
// $form['filters']['switch'] = [
// '#type' => "label",
//
// ]
$query = \Drupal::entityQuery('taxonomy_term')
->condition('vid', "assisted_research")
->accessCheck(TRUE)
->sort('field_weight', 'ASC');
$tids = $query->execute();
$terms = \Drupal\taxonomy\Entity\Term::loadMultiple($tids);
foreach ($terms as $tid => $term) {
if($term->hasTranslation($lang)){
$term = \Drupal::service('entity.repository')->getTranslationFromContext($term, $lang);
}
$options = array($term->getName());
$childs = $term->get('field_terms')->getValue();
$selected = null;
foreach ($childs as $child) {
$child_term = \Drupal\taxonomy\Entity\Term::load($child['target_id']);
if($child_term->hasTranslation($lang)){
$child_term = \Drupal::service('entity.repository')->getTranslationFromContext($child_term, $lang);
}
$options[$child_term->id()] = $child_term->getName();
if (isset($filters_array) && in_array($child_term->id(), $filters_array)) {
$selected = $child_term->id();
}
}
$form['filters']['filter-'.$tid] = array(
'#type' => 'select',
// '#title' => $term->getName(),
// '#multiple' => true,
'#options' => $options,
'#value' => $selected
);
}
$form['submit'] = array(
'#type' => 'button',
// '#src' => '',//drupal_get_path('module', 'materio_search_api') . '/images/search.png',
'#value' => t('Search'),
// '#prefix' => '<div class="search-btn-wrapper">',
// '#suffix'=> '</div>',
'#attributes' => [
'title' => t('Search'),
'@click.prevent' => "submit",
]
);
return $form;
}
/**
* {@inheritdoc}
*/
public function validateForm(array &$form, FormStateInterface $form_state) {
parent::validateForm($form, $form_state);
}
/**
* {@inheritdoc}
*/
public function submitForm(array &$form, FormStateInterface $form_state) {
// Display result.
foreach ($form_state->getValues() as $key => $value) {
\Drupal::messenger()->addStatus($key . ': ' . $value);
}
}
}
@@ -20,11 +20,16 @@ class MaterioSapiSearchBlock extends BlockBase {
* {@inheritdoc}
*/
public function build() {
$build = [];
// $build['materio_sapi_search_block']['#markup'] = 'Implement MaterioSapiSearchBlock.';
$form = \Drupal::formBuilder()->getForm('Drupal\materio_sapi\Form\MaterioSapiSearchForm');
$build['materio_sapi_search_block'] = $form;
return $build;
// Only a place in the page: the search field is a Vue component
// (materiotheme SearchForm.vue, F1) mounted on this block. Not empty,
// otherwise Drupal would not render the block.
return [
'placeholder' => [
'#type' => 'html_tag',
'#tag' => 'div',
'#attributes' => ['class' => ['materio-sapi-search-placeholder']],
],
];
}
/**