Skip to content

Commit

Permalink
Updated files after move to Common and made it a dependency.
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Berthereau authored and Daniel Berthereau committed Jan 8, 2024
1 parent fae955d commit fda82b3
Show file tree
Hide file tree
Showing 15 changed files with 94 additions and 81 deletions.
15 changes: 10 additions & 5 deletions Module.php
View file
Expand Up @@ -34,14 +34,13 @@
*/
namespace AdvancedSearch;

if (!class_exists(\Generic\AbstractModule::class)) {
require file_exists(dirname(__DIR__) . '/Generic/AbstractModule.php')
? dirname(__DIR__) . '/Generic/AbstractModule.php'
: __DIR__ . '/src/Generic/AbstractModule.php';
if (!class_exists(\Common\TraitModule::class)) {
require_once dirname(__DIR__) . '/Common/TraitModule.php';
}

use AdvancedSearch\Api\Representation\SearchEngineRepresentation;
use Generic\AbstractModule;
use Common\TraitModule;
use Omeka\Module\AbstractModule;
use Laminas\EventManager\Event;
use Laminas\EventManager\SharedEventManagerInterface;
use Laminas\ModuleManager\ModuleManager;
Expand All @@ -53,6 +52,12 @@ class Module extends AbstractModule
{
const NAMESPACE = __NAMESPACE__;

use TraitModule;

protected $dependencies = [
'Common',
];

/**
* @var bool
*/
Expand Down
31 changes: 16 additions & 15 deletions src/Form/Admin/ApiFormConfigFieldset.php
View file
Expand Up @@ -2,15 +2,16 @@

namespace AdvancedSearch\Form\Admin;

use AdvancedSearch\Form\Element as AdvancedSearchElement;
use Common\Form\Element as CommonElement;
use Common\Stdlib\EasyMeta;
use Laminas\Form\Element;
use Laminas\Form\Fieldset;
use Omeka\Form\Element as OmekaElement;

class ApiFormConfigFieldset extends Fieldset
{
/**
* @var \AdvancedSearch\View\Helper\EasyMeta
* @var \Common\Stdlib\EasyMeta
*/
protected $easyMeta;

Expand Down Expand Up @@ -65,7 +66,7 @@ public function init(): void
->get('metadata')
->add([
'name' => 'id',
'type' => AdvancedSearchElement\OptionalSelect::class,
'type' => CommonElement\OptionalSelect::class,
'options' => [
'label' => 'Internal id', // @translate
'value_options' => $availableFields,
Expand All @@ -79,7 +80,7 @@ public function init(): void
])
->add([
'name' => 'is_public',
'type' => AdvancedSearchElement\OptionalSelect::class,
'type' => CommonElement\OptionalSelect::class,
'options' => [
'label' => 'Is Public', // @translate
'value_options' => $availableFields,
Expand All @@ -93,7 +94,7 @@ public function init(): void
])
->add([
'name' => 'owner_id',
'type' => AdvancedSearchElement\OptionalSelect::class,
'type' => CommonElement\OptionalSelect::class,
'options' => [
'label' => 'Owner id', // @translate
'value_options' => $availableFields,
Expand All @@ -107,7 +108,7 @@ public function init(): void
])
->add([
'name' => 'site_id',
'type' => AdvancedSearchElement\OptionalSelect::class,
'type' => CommonElement\OptionalSelect::class,
'options' => [
'label' => 'Site id', // @translate
'value_options' => $availableFields,
Expand All @@ -121,7 +122,7 @@ public function init(): void
])
->add([
'name' => 'created',
'type' => AdvancedSearchElement\OptionalSelect::class,
'type' => CommonElement\OptionalSelect::class,
'options' => [
'label' => 'Created', // @translate
'value_options' => $availableFields,
Expand All @@ -135,7 +136,7 @@ public function init(): void
])
->add([
'name' => 'modified',
'type' => AdvancedSearchElement\OptionalSelect::class,
'type' => CommonElement\OptionalSelect::class,
'options' => [
'label' => 'Modified', // @translate
'value_options' => $availableFields,
Expand All @@ -149,7 +150,7 @@ public function init(): void
])
->add([
'name' => 'resource_class_label',
'type' => AdvancedSearchElement\OptionalSelect::class,
'type' => CommonElement\OptionalSelect::class,
'options' => [
'label' => 'Resource class label', // @translate
'value_options' => $availableFields,
Expand All @@ -163,7 +164,7 @@ public function init(): void
])
->add([
'name' => 'resource_class_id',
'type' => AdvancedSearchElement\OptionalSelect::class,
'type' => CommonElement\OptionalSelect::class,
'options' => [
'label' => 'Resource class id', // @translate
'value_options' => $availableFields,
Expand All @@ -177,7 +178,7 @@ public function init(): void
])
->add([
'name' => 'resource_template_id',
'type' => AdvancedSearchElement\OptionalSelect::class,
'type' => CommonElement\OptionalSelect::class,
'options' => [
'label' => 'Resource template id', // @translate
'value_options' => $availableFields,
Expand All @@ -191,7 +192,7 @@ public function init(): void
])
->add([
'name' => 'item_set_id',
'type' => AdvancedSearchElement\OptionalSelect::class,
'type' => CommonElement\OptionalSelect::class,
'options' => [
'label' => 'Item set id', // @translate
'value_options' => $availableFields,
Expand All @@ -205,7 +206,7 @@ public function init(): void
])
->add([
'name' => 'is_open',
'type' => AdvancedSearchElement\OptionalSelect::class,
'type' => CommonElement\OptionalSelect::class,
'options' => [
'label' => 'Is open', // @translate
'value_options' => $availableFields,
Expand All @@ -219,7 +220,7 @@ public function init(): void
])
->add([
'name' => 'is_open',
'type' => AdvancedSearchElement\OptionalSelect::class,
'type' => CommonElement\OptionalSelect::class,
'options' => [
'label' => 'Is open', // @translate
'value_options' => $availableFields,
Expand Down Expand Up @@ -381,7 +382,7 @@ protected function getAvailableSortFields(): array
return $options;
}

public function setEasyMeta($easyMeta): self
public function setEasyMeta(EasyMeta $easyMeta): self
{
$this->easyMeta = $easyMeta;
return $this;
Expand Down
33 changes: 17 additions & 16 deletions src/Form/Admin/SearchConfigConfigureForm.php
View file
Expand Up @@ -31,6 +31,7 @@
namespace AdvancedSearch\Form\Admin;

use AdvancedSearch\Form\Element as AdvancedSearchElement;
use Common\Form\Element as CommonElement;
use Laminas\Form\Element;
use Laminas\Form\Fieldset;
use Laminas\Form\Form;
Expand Down Expand Up @@ -118,7 +119,7 @@ public function init(): void
])
->add([
'name' => 'hidden_query_filters',
'type' => AdvancedSearchElement\UrlQuery::class,
'type' => CommonElement\UrlQuery::class,
'options' => [
'label' => 'Hidden query filter to limit results', // @translate
'info' => 'These args are appended to all queries. The format of the query depends on the search form and the search engine.', // @translated
Expand All @@ -140,7 +141,7 @@ public function init(): void
->get('autosuggest')
->add([
'name' => 'suggester',
'type' => AdvancedSearchElement\OptionalSelect::class,
'type' => CommonElement\OptionalSelect::class,
'options' => [
'label' => 'Suggester', // @translate
'value_options' => $this->suggesters,
Expand All @@ -155,7 +156,7 @@ public function init(): void
])
->add([
'name' => 'url',
'type' => AdvancedSearchElement\OptionalUrl::class,
'type' => CommonElement\OptionalUrl::class,
'options' => [
'label' => 'Direct endpoint', // @translate
// @see https://solr.apache.org/guide/suggester.html#suggest-request-handler-parameters
Expand Down Expand Up @@ -378,7 +379,7 @@ public function init(): void
->get('display')
->add([
'name' => 'search_filters',
'type' => AdvancedSearchElement\OptionalRadio::class,
'type' => CommonElement\OptionalRadio::class,
'options' => [
'label' => 'List of query filters', // @translate
'value_options' => [
Expand All @@ -395,7 +396,7 @@ public function init(): void
])
->add([
'name' => 'active_facets',
'type' => AdvancedSearchElement\OptionalRadio::class,
'type' => CommonElement\OptionalRadio::class,
'options' => [
'label' => 'List of active facets', // @translate
'value_options' => [
Expand All @@ -412,7 +413,7 @@ public function init(): void
])
->add([
'name' => 'total_results',
'type' => AdvancedSearchElement\OptionalRadio::class,
'type' => CommonElement\OptionalRadio::class,
'options' => [
'label' => 'Total results', // @translate
'value_options' => [
Expand All @@ -429,7 +430,7 @@ public function init(): void
])
->add([
'name' => 'paginator',
'type' => AdvancedSearchElement\OptionalRadio::class,
'type' => CommonElement\OptionalRadio::class,
'options' => [
'label' => 'Paginator', // @translate
'value_options' => [
Expand All @@ -446,7 +447,7 @@ public function init(): void
])
->add([
'name' => 'per_pages',
'type' => AdvancedSearchElement\OptionalRadio::class,
'type' => CommonElement\OptionalRadio::class,
'options' => [
'label' => 'Pagination per page', // @translate
'value_options' => [
Expand All @@ -463,7 +464,7 @@ public function init(): void
])
->add([
'name' => 'sort',
'type' => AdvancedSearchElement\OptionalRadio::class,
'type' => CommonElement\OptionalRadio::class,
'options' => [
'label' => 'Sort', // @translate
'value_options' => [
Expand All @@ -480,7 +481,7 @@ public function init(): void
])
->add([
'name' => 'grid_list',
'type' => AdvancedSearchElement\OptionalRadio::class,
'type' => CommonElement\OptionalRadio::class,
'options' => [
'label' => 'Grid / list', // @translate
'value_options' => [
Expand All @@ -497,7 +498,7 @@ public function init(): void
])
->add([
'name' => 'grid_list_mode',
'type' => AdvancedSearchElement\OptionalRadio::class,
'type' => CommonElement\OptionalRadio::class,
'options' => [
'label' => 'Grid / list default mode', // @translate
'value_options' => [
Expand Down Expand Up @@ -678,7 +679,7 @@ public function init(): void
])
->add([
'name' => 'order',
'type' => AdvancedSearchElement\OptionalRadio::class,
'type' => CommonElement\OptionalRadio::class,
'options' => [
'label' => 'Order of facet items', // @translate
'value_options' => [
Expand Down Expand Up @@ -709,7 +710,7 @@ public function init(): void
])
->add([
'name' => 'display_list',
'type' => AdvancedSearchElement\OptionalRadio::class,
'type' => CommonElement\OptionalRadio::class,
'options' => [
'label' => 'Display list of facets', // @translate
'value_options' => [
Expand All @@ -725,7 +726,7 @@ public function init(): void
])
->add([
'name' => 'mode',
'type' => AdvancedSearchElement\OptionalRadio::class,
'type' => CommonElement\OptionalRadio::class,
'options' => [
'label' => 'Facet mode', // @translate
'value_options' => [
Expand All @@ -741,7 +742,7 @@ public function init(): void
])
->add([
'name' => 'display_submit',
'type' => AdvancedSearchElement\OptionalRadio::class,
'type' => CommonElement\OptionalRadio::class,
'options' => [
'label' => 'Position of the button "Apply filters"', // @translate
'value_options' => [
Expand All @@ -759,7 +760,7 @@ public function init(): void
])
->add([
'name' => 'display_reset',
'type' => AdvancedSearchElement\OptionalRadio::class,
'type' => CommonElement\OptionalRadio::class,
'options' => [
'label' => 'Position of the button "Reset facets"', // @translate
'value_options' => [
Expand Down
8 changes: 4 additions & 4 deletions src/Form/Admin/SearchConfigForm.php
View file
Expand Up @@ -30,12 +30,12 @@

namespace AdvancedSearch\Form\Admin;

use AdvancedSearch\Form\Element\OptionalRadio;
use AdvancedSearch\FormAdapter\Manager as SearchFormAdapterManager;
use Common\Form\Element as CommonElement;
use Laminas\Form\Element;
use Laminas\Form\Form;
use Omeka\Api\Manager as ApiManager;
use Omeka\Form\Element\SiteSelect;
use Omeka\Form\Element as OmekaElement;

class SearchConfigForm extends Form
{
Expand Down Expand Up @@ -108,7 +108,7 @@ public function init(): void

->add([
'name' => 'manage_config_default',
'type' => SiteSelect::class,
'type' => OmekaElement\SiteSelect::class,
'options' => [
'label' => 'Set as default search page for sites', // @translate
'empty_option' => '[No change]', // @translate
Expand All @@ -127,7 +127,7 @@ public function init(): void
])
->add([
'name' => 'manage_config_availability',
'type' => OptionalRadio::class,
'type' => CommonElement\OptionalRadio::class,
'options' => [
'label' => 'Availability on sites', // @translate
'info' => 'The admin settings are not modified.', // @translate
Expand Down

0 comments on commit fda82b3

Please sign in to comment.