Browse Source

fixed solr configs after massive update broke it all

Bachir Soussi Chiadmi 4 years ago
parent
commit
a95d44c92b

+ 4 - 2
composer.json

@@ -33,7 +33,7 @@
         "drupal/computed_field": "^2.0@beta",
         "drupal/config_split": "^1.4",
         "drupal/console": "^1.0.2",
-        "drupal/consumer_image_styles": "3.x-dev",
+        "drupal/consumer_image_styles": "3.0-rc1",
         "drupal/core": "^8.7.1",
         "drupal/entity_clone": "^1.0",
         "drupal/error_log": "^1.0",
@@ -63,6 +63,7 @@
         "drupal/ultimate_cron": "2.x-dev",
         "drupal/views_conditional": "1.x-dev",
         "drush/drush": "^9.0.0",
+        "symfony/event-dispatcher": "4.3.4 as 3.4.99",
         "vlucas/phpdotenv": "^2.4",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",
@@ -126,7 +127,8 @@
         },
         "patches": {
             "drupal/core": {
-              "migrate_drupal getsetting on null" : "https://www.drupal.org/files/issues/2019-02-13/migrate_drupal-getsetting_on_null.patch"
+              "migrate_drupal getsetting on null" : "https://www.drupal.org/files/issues/2019-02-13/migrate_drupal-getsetting_on_null.patch",
+              "Allow symfony/event-dispatcher 4+ to be installed in Drupal 8":"https://www.drupal.org/files/issues/2019-09-17/2876675-48.Fix-symfony-version-requirements-for-symfonyeventdispatcher.patch"
             },
             "drupal/email_registration": {
               "allow email login through REST https://www.drupal.org/project/email_registration/issues/2856542": "https://www.drupal.org/files/issues/allow_authentication-2856542-3.patch"

+ 99 - 328
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": "f804b4bfb2e3e90a94f599ef4cad5221",
+    "content-hash": "3748f59c07c35ab5aabaa7132281c7f3",
     "packages": [
         {
             "name": "alchemy/zippy",
@@ -5364,6 +5364,7 @@
                 },
                 "patches_applied": {
                     "migrate_drupal getsetting on null": "https://www.drupal.org/files/issues/2019-02-13/migrate_drupal-getsetting_on_null.patch",
+                    "Allow symfony/event-dispatcher 4+ to be installed in Drupal 8": "https://www.drupal.org/files/issues/2019-09-17/2876675-48.Fix-symfony-version-requirements-for-symfonyeventdispatcher.patch",
                     "https://www.drupal.org/project/drupal/issues/2943172": "https://www.drupal.org/files/issues/2018-07-05/2943172-kernel-test-base-3.patch"
                 }
             },
@@ -12795,52 +12796,6 @@
             ],
             "time": "2016-01-26T13:27:02+00:00"
         },
-        {
-            "name": "psr/cache",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/cache.git",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Cache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for caching libraries",
-            "keywords": [
-                "cache",
-                "psr",
-                "psr-6"
-            ],
-            "time": "2016-08-06T20:24:11+00:00"
-        },
         {
             "name": "psr/container",
             "version": "1.0.0",
@@ -13204,25 +13159,25 @@
         },
         {
             "name": "solarium/solarium",
-            "version": "5.0.3",
+            "version": "5.1.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/solariumphp/solarium.git",
-                "reference": "fcec6d7fa9d6704e45afed0d050ff069f3e0e86f"
+                "reference": "9e073cc32c0144fc23215fe205cd0cb44e68b6ad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/solariumphp/solarium/zipball/fcec6d7fa9d6704e45afed0d050ff069f3e0e86f",
-                "reference": "fcec6d7fa9d6704e45afed0d050ff069f3e0e86f",
+                "url": "https://api.github.com/repos/solariumphp/solarium/zipball/9e073cc32c0144fc23215fe205cd0cb44e68b6ad",
+                "reference": "9e073cc32c0144fc23215fe205cd0cb44e68b6ad",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "php": "^7.1",
-                "symfony/cache": "^3.1 || ^4.0",
-                "symfony/event-dispatcher": "^3.1 || ^4.0"
+                "php": "^7.1.3",
+                "symfony/event-dispatcher": "^4.3 || ^5.0"
             },
             "require-dev": {
+                "friendsofphp/php-cs-fixer": "^2.16",
                 "guzzlehttp/guzzle": "^3.8 || ^6.2",
                 "php-coveralls/php-coveralls": "^2.1",
                 "phpunit/phpunit": "^8.0",
@@ -13233,11 +13188,6 @@
                 "minimalcode/search": "Query builder compatible with Solarium, allows simplified solr-query handling"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.1.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Solarium\\": "src/"
@@ -13260,7 +13210,7 @@
                 "search",
                 "solr"
             ],
-            "time": "2019-07-05T14:34:48+00:00"
+            "time": "2020-02-14T15:18:59+00:00"
         },
         {
             "name": "stack/builder",
@@ -13416,142 +13366,6 @@
             ],
             "time": "2017-05-09T08:10:41+00:00"
         },
-        {
-            "name": "symfony/cache",
-            "version": "v4.3.11",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/cache.git",
-                "reference": "8794ccf68ac341fc19311919d2287f7557bfccba"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/8794ccf68ac341fc19311919d2287f7557bfccba",
-                "reference": "8794ccf68ac341fc19311919d2287f7557bfccba",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "psr/cache": "~1.0",
-                "psr/log": "~1.0",
-                "symfony/cache-contracts": "^1.1",
-                "symfony/service-contracts": "^1.1",
-                "symfony/var-exporter": "^4.2"
-            },
-            "conflict": {
-                "doctrine/dbal": "<2.5",
-                "symfony/dependency-injection": "<3.4",
-                "symfony/var-dumper": "<3.4"
-            },
-            "provide": {
-                "psr/cache-implementation": "1.0",
-                "psr/simple-cache-implementation": "1.0",
-                "symfony/cache-implementation": "1.0"
-            },
-            "require-dev": {
-                "cache/integration-tests": "dev-master",
-                "doctrine/cache": "~1.6",
-                "doctrine/dbal": "~2.5",
-                "predis/predis": "~1.1",
-                "psr/simple-cache": "^1.0",
-                "symfony/config": "~4.2",
-                "symfony/dependency-injection": "~3.4|~4.1",
-                "symfony/var-dumper": "^4.1.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Cache\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Cache component with PSR-6, PSR-16, and tags",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "caching",
-                "psr6"
-            ],
-            "time": "2020-01-27T09:15:09+00:00"
-        },
-        {
-            "name": "symfony/cache-contracts",
-            "version": "v1.1.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/cache-contracts.git",
-                "reference": "af50d14ada9e4e82cfabfabdc502d144f89be0a1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/af50d14ada9e4e82cfabfabdc502d144f89be0a1",
-                "reference": "af50d14ada9e4e82cfabfabdc502d144f89be0a1",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "psr/cache": "^1.0"
-            },
-            "suggest": {
-                "symfony/cache-implementation": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\Cache\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to caching",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "time": "2019-10-04T21:43:27+00:00"
-        },
         {
             "name": "symfony/class-loader",
             "version": "v3.4.37",
@@ -13983,30 +13797,37 @@
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v3.4.37",
+            "version": "v4.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "79ede8f2836e5ec910ebb325bde40f987244baa8"
+                "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/79ede8f2836e5ec910ebb325bde40f987244baa8",
-                "reference": "79ede8f2836e5ec910ebb325bde40f987244baa8",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/429d0a1451d4c9c4abe1959b2986b88794b9b7d2",
+                "reference": "429d0a1451d4c9c4abe1959b2986b88794b9b7d2",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9|>=7.0.8"
+                "php": "^7.1.3",
+                "symfony/event-dispatcher-contracts": "^1.1"
             },
             "conflict": {
-                "symfony/dependency-injection": "<3.3"
+                "symfony/dependency-injection": "<3.4"
+            },
+            "provide": {
+                "psr/event-dispatcher-implementation": "1.0",
+                "symfony/event-dispatcher-implementation": "1.1"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0|~4.0",
-                "symfony/dependency-injection": "~3.3|~4.0",
-                "symfony/expression-language": "~2.8|~3.0|~4.0",
-                "symfony/stopwatch": "~2.8|~3.0|~4.0"
+                "symfony/config": "~3.4|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/expression-language": "~3.4|~4.0",
+                "symfony/http-foundation": "^3.4|^4.0",
+                "symfony/service-contracts": "^1.1",
+                "symfony/stopwatch": "~3.4|~4.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -14015,7 +13836,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.4-dev"
+                    "dev-master": "4.3-dev"
                 }
             },
             "autoload": {
@@ -14042,7 +13863,65 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2020-01-04T12:05:51+00:00"
+            "time": "2019-08-26T08:55:16+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher-contracts",
+            "version": "v1.1.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
+                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
+                "reference": "c43ab685673fb6c8d84220c77897b1d6cdbe1d18",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1.3"
+            },
+            "suggest": {
+                "psr/event-dispatcher": "",
+                "symfony/event-dispatcher-implementation": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\EventDispatcher\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to dispatching event",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "time": "2019-09-17T09:54:03+00:00"
         },
         {
             "name": "symfony/filesystem",
@@ -15070,64 +14949,6 @@
             "homepage": "https://symfony.com",
             "time": "2020-01-01T11:03:25+00:00"
         },
-        {
-            "name": "symfony/service-contracts",
-            "version": "v1.1.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/ffc7f5692092df31515df2a5ecf3b7302b3ddacf",
-                "reference": "ffc7f5692092df31515df2a5ecf3b7302b3ddacf",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3",
-                "psr/container": "^1.0"
-            },
-            "suggest": {
-                "symfony/service-implementation": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\Service\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to writing services",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "time": "2019-10-14T12:27:06+00:00"
-        },
         {
             "name": "symfony/translation",
             "version": "v3.4.37",
@@ -15360,66 +15181,6 @@
             ],
             "time": "2020-01-25T12:44:29+00:00"
         },
-        {
-            "name": "symfony/var-exporter",
-            "version": "v4.4.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "1a76a943f2af334da13bc9f33f49392fa530eec9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/1a76a943f2af334da13bc9f33f49392fa530eec9",
-                "reference": "1a76a943f2af334da13bc9f33f49392fa530eec9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1.3"
-            },
-            "require-dev": {
-                "symfony/var-dumper": "^4.1.1|^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\VarExporter\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "A blend of var_export() + serialize() to turn any serializable data structure to plain PHP code",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "clone",
-                "construct",
-                "export",
-                "hydrate",
-                "instantiate",
-                "serialize"
-            ],
-            "time": "2020-01-04T13:00:46+00:00"
-        },
         {
             "name": "symfony/yaml",
             "version": "v3.4.37",
@@ -18611,7 +18372,14 @@
             "time": "2020-02-13T08:32:00+00:00"
         }
     ],
-    "aliases": [],
+    "aliases": [
+        {
+            "alias": "3.4.99",
+            "alias_normalized": "3.4.99.0",
+            "version": "4.3.4.0",
+            "package": "symfony/event-dispatcher"
+        }
+    ],
     "minimum-stability": "dev",
     "stability-flags": {
         "drupal/auto_entitylabel": 20,
@@ -18670,5 +18438,8 @@
     "platform": {
         "php": ">=7.3"
     },
-    "platform-dev": []
+    "platform-dev": [],
+    "platform-overrides": {
+        "php": "7.3"
+    }
 }

+ 0 - 30
config/devel/webprofiler.config.yml

@@ -1,30 +0,0 @@
-purge_on_cache_clear: true
-storage: profiler.database_storage
-exclude: "/contextual/*\r\n/toolbar/*\r\n/edit/*\r\n*.js\r\n*.css"
-ide_link: 'txmt://open?url=file://@file&line=@line'
-ide_link_remote: ''
-ide_link_local: ''
-active_toolbar_items:
-  devel: devel
-  assets: assets
-  blocks: blocks
-  cache: cache
-  database: database
-  drupal_extension: drupal_extension
-  forms: forms
-  performance_timing: performance_timing
-  php_config: php_config
-  request: request
-  time: time
-  user: user
-  views: views
-  config: '0'
-  events: '0'
-  http: '0'
-  routing: '0'
-  services: '0'
-  state: '0'
-query_sort: source
-query_highlight: 5
-_core:
-  default_config_hash: w1Hg1sJmlqc38y_J-HQH8kLDLRH3wuEhx-Fkwz7m-SI

+ 1 - 0
config/sync/jsonapi_extras.jsonapi_resource_config.node--materiau.yml

@@ -211,6 +211,7 @@ resourceFields:
           refine: true
           custom_selection:
             - card_medium
+            - card_big
     disabled: false
   field_memo:
     disabled: true

+ 35 - 23
config/sync/search_api.index.autocomplete.yml

@@ -1,21 +1,21 @@
-uuid: 89507e1b-4a2c-4e27-9e90-e3278f805e3b
+uuid: a4dced3e-3c63-4624-910b-1e94eb068e08
 langcode: en
 status: true
 dependencies:
   module:
     - search_api_solr
     - taxonomy
+    - synonyms
     - search_api
   config:
-    - field.storage.taxonomy_term.field_synonyms
-    - search_api.server.materio
+    - search_api.server.database_search_autocomplete
 third_party_settings:
   search_api_solr:
     finalize: false
     commit_before_finalize: false
     commit_after_finalize: false
     multilingual:
-      limit_to_content_language: true
+      limit_to_content_language: false
       include_language_independent: true
     highlighter:
       maxAnalyzedChars: 51200
@@ -32,29 +32,26 @@ third_party_settings:
         requireFieldMatch: false
         snippets: 3
         fragsize: 0
+    mlt:
+      mintf: 1
+      mindf: 1
+      maxdf: 0
+      maxdfpct: 0
+      minwl: 0
+      maxwl: 0
+      maxqt: 100
+      maxntp: 2000
+      boost: false
+      interestingTerms: none
     advanced:
       index_prefix: ''
+      collection: ''
+      timezone: ''
 id: autocomplete
-name: autocomplete
+name: 'autocomplete taxonomy'
 description: ''
 read_only: false
 field_settings:
-  field_synonyms:
-    label: Synonyms
-    datasource_id: 'entity:taxonomy_term'
-    property_path: field_synonyms
-    type: 'solr_text_custom:ngram'
-    dependencies:
-      config:
-        - field.storage.taxonomy_term.field_synonyms
-  langcode:
-    label: Language
-    datasource_id: 'entity:taxonomy_term'
-    property_path: langcode
-    type: string
-    dependencies:
-      module:
-        - taxonomy
   name:
     label: Name
     datasource_id: 'entity:taxonomy_term'
@@ -71,6 +68,14 @@ field_settings:
     dependencies:
       module:
         - taxonomy
+  synonyms:
+    label: 'Entity synonyms'
+    datasource_id: 'entity:taxonomy_term'
+    property_path: synonyms
+    type: 'solr_text_custom:ngram'
+    dependencies:
+      module:
+        - synonyms
   tid:
     label: 'Term ID'
     datasource_id: 'entity:taxonomy_term'
@@ -95,14 +100,21 @@ processor_settings:
   add_url: {  }
   aggregated_field: {  }
   entity_status: {  }
+  language_with_fallback: {  }
   rendered_item: {  }
   solr_date_range:
     weights:
       preprocess_index: 0
+  type_boost:
+    boosts:
+      'entity:taxonomy_term':
+        datasource_boost: !!float 1
+    weights:
+      preprocess_index: 0
 tracker_settings:
   default:
-    indexing_order: fifo
+    indexing_order: lifo
 options:
   index_directly: true
   cron_limit: 50
-server: materio
+server: database_search_autocomplete

+ 2 - 2
config/sync/search_api.index.database.yml

@@ -7,10 +7,9 @@ dependencies:
     - node
     - taxonomy
     - search_api
-    - materio_sapi
   config:
-    - field.storage.node.field_famille
     - field.storage.node.body
+    - field.storage.node.field_famille
     - field.storage.node.field_tags
     - field.storage.taxonomy_term.field_synonyms
     - field.storage.node.field_thesaurus
@@ -246,6 +245,7 @@ processor_settings:
     weights:
       preprocess_index: -15
       preprocess_query: -49
+  language_with_fallback: {  }
   rendered_item: {  }
   solr_date_range:
     weights:

+ 68 - 0
config/sync/search_api.server.database_search_autocomplete.yml

@@ -0,0 +1,68 @@
+uuid: 4bbd1d33-514a-4b9d-95ab-c9bc91539335
+langcode: en
+status: true
+dependencies:
+  config:
+    - search_api_solr.solr_cache.cache_document_default_7_0_0
+    - search_api_solr.solr_cache.cache_fieldvalue_default_7_0_0
+    - search_api_solr.solr_cache.cache_filter_default_7_0_0
+    - search_api_solr.solr_cache.cache_persegfilter_default_7_0_0
+    - search_api_solr.solr_cache.cache_queryresult_default_7_0_0
+    - search_api_solr.solr_field_type.text_edge_und_7_0_0
+    - search_api_solr.solr_field_type.text_edgestring_und_6_0_0
+    - search_api_solr.solr_field_type.text_en_7_0_0
+    - search_api_solr.solr_field_type.text_fr_7_0_0
+    - search_api_solr.solr_field_type.text_ngram_und_7_0_0
+    - search_api_solr.solr_field_type.text_ngramstring_und_6_0_0
+    - search_api_solr.solr_field_type.text_phonetic_en_7_0_0
+    - search_api_solr.solr_field_type.text_phonetic_fr_7_0_0
+    - search_api_solr.solr_field_type.text_phonetic_und_7_0_0
+    - search_api_solr.solr_field_type.text_und_7_0_0
+    - search_api_solr.solr_request_dispatcher.request_dispatcher_httpcachingnever_default_7_0_0
+    - search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0
+    - search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0
+    - search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0
+    - search_api_solr.solr_request_handler.request_handler_select_default_7_0_0
+    - search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0
+    - search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0
+    - search_api_solr.solr_request_handler.request_handler_tvrh_default_7_0_0
+  module:
+    - search_api_solr
+id: database_search_autocomplete
+name: 'Database Search Autocomplete'
+description: ''
+backend: search_api_solr
+backend_config:
+  connector: standard
+  connector_config:
+    scheme: http
+    host: solr-new
+    port: 8985
+    path: /
+    core: materio_autocomplete
+    timeout: 5
+    index_timeout: 5
+    optimize_timeout: 10
+    finalize_timeout: 30
+    commit_within: 1000
+    solr_version: '8'
+    http_method: AUTO
+    jmx: false
+    solr_install_dir: ../../..
+  disabled_field_types: {  }
+  disabled_caches: {  }
+  disabled_request_handlers:
+    - request_handler_elevate_default_7_0_0
+    - request_handler_replicationmaster_default_7_0_0
+    - request_handler_replicationslave_default_7_0_0
+  disabled_request_dispatchers:
+    - request_dispatcher_httpcaching_default_7_0_0
+  rows: 10
+  retrieve_data: true
+  highlight_data: false
+  skip_schema_check: false
+  server_prefix: ''
+  domain: generic
+  environment: default
+  optimize: false
+  site_hash: true

+ 29 - 9
config/sync/search_api.server.materio.yml

@@ -3,6 +3,11 @@ langcode: en
 status: true
 dependencies:
   config:
+    - search_api_solr.solr_cache.cache_document_default_7_0_0
+    - search_api_solr.solr_cache.cache_fieldvalue_default_7_0_0
+    - search_api_solr.solr_cache.cache_filter_default_7_0_0
+    - search_api_solr.solr_cache.cache_persegfilter_default_7_0_0
+    - search_api_solr.solr_cache.cache_queryresult_default_7_0_0
     - search_api_solr.solr_field_type.text_edge_und_7_0_0
     - search_api_solr.solr_field_type.text_edgestring_und_6_0_0
     - search_api_solr.solr_field_type.text_en_7_0_0
@@ -13,10 +18,18 @@ dependencies:
     - search_api_solr.solr_field_type.text_phonetic_fr_7_0_0
     - search_api_solr.solr_field_type.text_phonetic_und_7_0_0
     - search_api_solr.solr_field_type.text_und_7_0_0
+    - search_api_solr.solr_request_dispatcher.request_dispatcher_httpcachingnever_default_7_0_0
+    - search_api_solr.solr_request_handler.request_handler_autocomplete_default_7_0_0
+    - search_api_solr.solr_request_handler.request_handler_extract_default_7_0_0
+    - search_api_solr.solr_request_handler.request_handler_mlt_default_7_0_0
+    - search_api_solr.solr_request_handler.request_handler_select_default_7_0_0
+    - search_api_solr.solr_request_handler.request_handler_spell_default_7_0_0
+    - search_api_solr.solr_request_handler.request_handler_suggest_default_7_0_0
+    - search_api_solr.solr_request_handler.request_handler_tvrh_default_7_0_0
   module:
     - search_api_solr
 id: materio
-name: 'materio solr'
+name: 'materio base'
 description: ''
 backend: search_api_solr
 backend_config:
@@ -24,9 +37,9 @@ backend_config:
   connector_config:
     scheme: http
     host: solr-new
-    port: '8983'
+    port: 8983
     path: /
-    core: materio
+    core: materio_base
     timeout: 5
     index_timeout: 5
     optimize_timeout: 10
@@ -35,14 +48,21 @@ backend_config:
     solr_version: '8'
     http_method: AUTO
     jmx: false
-    solr_install_dir: /opt/solr/
-  retrieve_data: false
+    solr_install_dir: ../../..
+  disabled_field_types: {  }
+  disabled_caches: {  }
+  disabled_request_handlers:
+    - request_handler_elevate_default_7_0_0
+    - request_handler_replicationmaster_default_7_0_0
+    - request_handler_replicationslave_default_7_0_0
+  disabled_request_dispatchers:
+    - request_dispatcher_httpcaching_default_7_0_0
+  rows: 10
+  retrieve_data: true
   highlight_data: false
   skip_schema_check: false
   server_prefix: ''
   domain: generic
-  optimize: false
-  site_hash: false
-  disabled_field_types: {  }
-  rows: 10
   environment: default
+  optimize: false
+  site_hash: true

BIN
web/materio-solr-conf


+ 3 - 3
web/modules/custom/materio_sapi/src/Controller/Base.php

@@ -95,8 +95,8 @@ class Base extends ControllerBase {
         "@count" => $resp['count'],
         "@keys" => $this->keys
       ));
-      
-      
+
+
       $resp['options'] = $this->query->getOptions();
 
       // $items = [];
@@ -140,9 +140,9 @@ class Base extends ControllerBase {
       $node_view_builder = \Drupal::entityTypeManager()->getViewBuilder('node');
 
       $items = $this->results->getResultItems();
-
       $this->items = [];
       foreach ($items as $item) {
+        // \Drupal::logger('materio_sapi')->notice(print_r($item, true));
         try {
           /** @var \Drupal\Core\Entity\EntityInterface $entity */
           $entity = $item->getOriginalObject()->getValue();

+ 5 - 4
web/modules/custom/materio_sapi/src/Controller/FormAutocomplete.php

@@ -38,11 +38,11 @@ class FormAutocomplete extends ControllerBase {
 
       // Set fulltext search keywords and fields.
       $query->keys($typed_string);
-      $query->setFulltextFields(['name']);
+      $query->setFulltextFields(['name', 'synonyms']);
 
       // Set additional conditions.
-      // $query->addCondition('status', 1)
-      //   ->addCondition('author', 1, '<>');
+      $query->addCondition('status', 1);
+        // ->addCondition('author', 1, '<>');
 
       // Restrict the search to specific languages.
       // $query->setLanguages(['de', 'it']);
@@ -60,14 +60,15 @@ class FormAutocomplete extends ControllerBase {
 
       $results = $query->execute();
 
+      \Drupal::logger('materio_sapi')->notice($results->getResultCount());
       // $items = $results->getResultItems();
-      // \Drupal::logger('materio_sapi')->notice($results->getResultCount());
       // \Drupal::logger('materio_sapi')->notice(implode(', ', array_keys($items)));
 
       $response = [];
       foreach ($results as $result) {
         // \Drupal::logger('materio_sapi')->notice(print_r($result->getField('tid')->getValues(),true));
         // \Drupal::logger('materio_sapi')->notice(print_r($result->getField('name')->getValues(),true));
+        // \Drupal::logger('materio_sapi')->notice(implode(', ', array_keys($result)));
         $tid = $result->getField('tid')->getValues()[0];
         $term_name = $result->getField('name')->getValues()[0]->getText();
         $response[] = [

File diff suppressed because it is too large
+ 0 - 0
web/themes/custom/materiotheme/assets/dist/main.js


+ 7 - 0
web/themes/custom/materiotheme/vuejs/store/modules/search.js

@@ -134,6 +134,9 @@ export default {
         let uuid = uuids[i]
         // https://stackoverflow.com/questions/11258077/how-to-find-index-of-an-object-by-key-and-value-in-an-javascript-array
         let item_index = data.findIndex(p => p.id == uuid)
+        // console.log('item_index', item_index);
+        if(item_index == -1) continue;
+
         let item_src = data[item_index]
         let attrs = item_src.attributes
         let relations = item_src.relationships
@@ -149,11 +152,15 @@ export default {
 
         // get images included values
         let img_src = relations.images.data
+        console.log('img_src', img_src);
+        // this is a temporary deactivation of images
+        img_src = [];
         item.images = []
         for (var j = 0; j < img_src.length; j++) {
           item.images.push({
             title: img_src[j].meta.title,
             // meta.imageDerivatives.style.href link is provided by drupal consumers_image_styles module
+            // BUG: meta.imageDerivatives does not exists
             url: img_src[j].meta.imageDerivatives.links.card_medium.href
           })
         }

Some files were not shown because too many files changed in this diff