From 570058226c69dc20ad8d132ba356795bdf8dbd8c Mon Sep 17 00:00:00 2001 From: Kelsey Bentham Date: Mon, 20 Aug 2018 08:51:08 -0500 Subject: [PATCH 1/7] Update search_api_federated_solr setting to conform to the schema. --- .../search_api_federated_solr.search_app.settings.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/conf/drupal/config/search_api_federated_solr.search_app.settings.yml b/conf/drupal/config/search_api_federated_solr.search_app.settings.yml index bc0f219..492b6c7 100644 --- a/conf/drupal/config/search_api_federated_solr.search_app.settings.yml +++ b/conf/drupal/config/search_api_federated_solr.search_app.settings.yml @@ -1,15 +1,17 @@ facet: site_name: - set_default: 0 + set_default: false index: id: federated_search has_site_name_property: true server_url: 'http://federated-search-demo.local:8983/solr/drupal8/select' + username: '' + password: '' content: no_results: '' search_prompt: '' results: - rows: '' + rows: null pagination: - buttons: '' + buttons: null path: /search-app From c1d3ddfdeac53161e18a6256c2f541b26074fe9d Mon Sep 17 00:00:00 2001 From: Avi Schwab Date: Mon, 27 Aug 2018 16:24:33 -0500 Subject: [PATCH 2/7] Add config inspector (because this is a demo site and it's ok) --- composer.json | 6 +- composer.lock | 81 ++++++++++++++++++++++++--- conf/drupal/config/core.extension.yml | 1 + 3 files changed, 78 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index d60126d..d68d98a 100644 --- a/composer.json +++ b/composer.json @@ -36,9 +36,10 @@ "drupal-composer/drupal-scaffold": "^2.3", "drupal/admin_toolbar": "^1.24", "drupal/coder": "^8.0", + "drupal/config_inspector": "^1.0@beta", "drupal/config_installer": "^1.7", "drupal/core": "^8.5", - "palantirnet/search_api_federated_solr": "dev-master" + "palantirnet/search_api_federated_solr": "dev-PL-34-schema-settings" }, "require-dev": { "behat/behat": "^3.1", @@ -68,6 +69,9 @@ "patches": { "drupal/config_installer": { "Allow config installer to find themes.": "https://www.drupal.org/files/issues/2018-05-28/2975675-2.patch" + }, + "drupal/config_inspector": { + "2843729: Filter entities with schema errors": "https://www.drupal.org/files/issues/filter_entities_with-2843729-7.patch" } } } diff --git a/composer.lock b/composer.lock index 30f8a5c..00ae740 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "c1b6b5cbae17920b10827b2a52b294a1", + "content-hash": "9b05db75f4f29dfeb3e51d7672f56db6", "packages": [ { "name": "asm89/stack-cors", @@ -837,6 +837,68 @@ ], "time": "2017-03-18T10:28:49+00:00" }, + { + "name": "drupal/config_inspector", + "version": "1.0.0-beta1", + "source": { + "type": "git", + "url": "https://git.drupal.org/project/config_inspector", + "reference": "8.x-1.0-beta1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/config_inspector-8.x-1.0-beta1.zip", + "reference": "8.x-1.0-beta1", + "shasum": "3ba3a31ea02323203ceae7ef7f80c091ced2e2f3" + }, + "require": { + "drupal/core": "*" + }, + "type": "drupal-module", + "extra": { + "branch-alias": { + "dev-1.x": "1.x-dev" + }, + "drupal": { + "version": "8.x-1.0-beta1", + "datestamp": "1448357340", + "security-coverage": { + "status": "not-covered", + "message": "Beta releases are not covered by Drupal security advisories." + } + }, + "patches_applied": { + "2843729: Filter entities with schema errors": "https://www.drupal.org/files/issues/filter_entities_with-2843729-7.patch" + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Gábor Hojtsy", + "homepage": "https://www.drupal.org/user/4166" + }, + { + "name": "Jose Reyero", + "homepage": "https://www.drupal.org/user/4299" + }, + { + "name": "aspilicious", + "homepage": "https://www.drupal.org/user/172527" + }, + { + "name": "vijaycs85", + "homepage": "https://www.drupal.org/user/93488" + } + ], + "description": "Provides a configuration data and structure inspector tool.", + "homepage": "https://www.drupal.org/project/config_inspector", + "support": { + "source": "http://cgit.drupalcode.org/config_inspector" + } + }, { "name": "drupal/config_installer", "version": "1.8.0", @@ -1224,7 +1286,7 @@ }, "drupal": { "version": "8.x-1.2", - "datestamp": "1529312013", + "datestamp": "1523090287", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -1698,16 +1760,16 @@ }, { "name": "palantirnet/search_api_federated_solr", - "version": "dev-master", + "version": "dev-PL-34-schema-settings", "source": { "type": "git", "url": "git@github.com:palantirnet/search_api_federated_solr.git", - "reference": "054b1fd81e35e3965a6a844592da2e3b92ffb928" + "reference": "5f690b20b2bf558dc7d0907acae1434beeb8faba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/palantirnet/search_api_federated_solr/zipball/054b1fd81e35e3965a6a844592da2e3b92ffb928", - "reference": "054b1fd81e35e3965a6a844592da2e3b92ffb928", + "url": "https://api.github.com/repos/palantirnet/search_api_federated_solr/zipball/5f690b20b2bf558dc7d0907acae1434beeb8faba", + "reference": "5f690b20b2bf558dc7d0907acae1434beeb8faba", "shasum": "" }, "require": { @@ -1724,9 +1786,9 @@ "Drupal" ], "support": { - "source": "https://github.com/palantirnet/search_api_federated_solr/tree/master" + "source": "https://github.com/palantirnet/search_api_federated_solr/tree/PL-34-schema-settings" }, - "time": "2018-08-13T22:47:11+00:00" + "time": "2018-08-20T13:47:26+00:00" }, { "name": "paragonie/random_compat", @@ -6460,6 +6522,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { + "drupal/config_inspector": 10, "palantirnet/search_api_federated_solr": 20 }, "prefer-stable": true, diff --git a/conf/drupal/config/core.extension.yml b/conf/drupal/config/core.extension.yml index f368388..b0833e9 100644 --- a/conf/drupal/config/core.extension.yml +++ b/conf/drupal/config/core.extension.yml @@ -9,6 +9,7 @@ module: ckeditor: 0 color: 0 config: 0 + config_inspector: 0 contact: 0 contextual: 0 datetime: 0 From 2162e28c33c585a92f352dd1b3c8ea2fd33671b0 Mon Sep 17 00:00:00 2001 From: Kelsey Bentham Date: Thu, 30 Aug 2018 11:48:31 -0500 Subject: [PATCH 3/7] Update value type from tring to int. --- .../field.storage.taxonomy_term.field_federated_terms.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/drupal/config/field.storage.taxonomy_term.field_federated_terms.yml b/conf/drupal/config/field.storage.taxonomy_term.field_federated_terms.yml index 58ac0a2..8ad7d0f 100644 --- a/conf/drupal/config/field.storage.taxonomy_term.field_federated_terms.yml +++ b/conf/drupal/config/field.storage.taxonomy_term.field_federated_terms.yml @@ -10,7 +10,7 @@ field_name: field_federated_terms entity_type: taxonomy_term type: federated_terms settings: - max_length: '255' + max_length: 255 is_ascii: false module: search_api_federated_solr locked: false From ac187a1263c35483ef32085e17e30c9c0f16592b Mon Sep 17 00:00:00 2001 From: Avi Schwab Date: Thu, 20 Sep 2018 11:30:38 -0500 Subject: [PATCH 4/7] Update composer.lock --- composer.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.lock b/composer.lock index 50bfb96..940e473 100644 --- a/composer.lock +++ b/composer.lock @@ -1764,12 +1764,12 @@ "source": { "type": "git", "url": "git@github.com:palantirnet/search_api_federated_solr.git", - "reference": "5f690b20b2bf558dc7d0907acae1434beeb8faba" + "reference": "7f6085453595aaa238e59194d028ae97271fbfad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/palantirnet/search_api_federated_solr/zipball/5f690b20b2bf558dc7d0907acae1434beeb8faba", - "reference": "5f690b20b2bf558dc7d0907acae1434beeb8faba", + "url": "https://api.github.com/repos/palantirnet/search_api_federated_solr/zipball/7f6085453595aaa238e59194d028ae97271fbfad", + "reference": "7f6085453595aaa238e59194d028ae97271fbfad", "shasum": "" }, "require": { @@ -1788,7 +1788,7 @@ "support": { "source": "https://github.com/palantirnet/search_api_federated_solr/tree/PL-34-schema-settings" }, - "time": "2018-08-20T13:47:26+00:00" + "time": "2018-09-20T16:22:36+00:00" }, { "name": "paragonie/random_compat", From 1162a5b588c7af16797efbad2c670f38cb7f4d19 Mon Sep 17 00:00:00 2001 From: Avi Schwab Date: Thu, 20 Sep 2018 11:54:34 -0500 Subject: [PATCH 5/7] And again --- composer.lock | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/composer.lock b/composer.lock index 940e473..9df239c 100644 --- a/composer.lock +++ b/composer.lock @@ -5351,6 +5351,39 @@ ], "time": "2018-06-03T11:33:10+00:00" }, + { + "name": "palantirnet/search_api_field_map", + "version": "dev-master", + "source": { + "type": "git", + "url": "git@github.com:palantirnet/search_api_field_map.git", + "reference": "fd943685e2885396b5956908ea25a0a03dc199ae" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/palantirnet/search_api_field_map/zipball/fd943685e2885396b5956908ea25a0a03dc199ae", + "reference": "fd943685e2885396b5956908ea25a0a03dc199ae", + "shasum": "" + }, + "require": { + "drupal/core": "^8.0", + "drupal/search_api_solr": "^1.2", + "drupal/token": "^1.1" + }, + "type": "drupal-module", + "license": [ + "GPL-2.0+" + ], + "description": "Allows indexing multiple Drupal sites into a single Solr search index by field.", + "keywords": [ + "Drupal" + ], + "support": { + "source": "https://github.com/palantirnet/search_api_field_map/tree/master", + "issues": "https://github.com/palantirnet/search_api_field_map/issues" + }, + "time": "2018-08-28T18:40:53+00:00" + }, { "name": "palantirnet/the-build", "version": "1.7.0", From 4ecb8373ffc1cc6d379dde958d69960add7ea49c Mon Sep 17 00:00:00 2001 From: Avi Schwab Date: Fri, 21 Sep 2018 10:38:06 -0500 Subject: [PATCH 6/7] Reset dependencies back to master. --- composer.json | 2 +- composer.lock | 87 ++++++++++++++++++++++++++------------------------- 2 files changed, 45 insertions(+), 44 deletions(-) diff --git a/composer.json b/composer.json index 4c1af16..9a7f7ec 100644 --- a/composer.json +++ b/composer.json @@ -43,7 +43,7 @@ "drupal/config_inspector": "^1.0@beta", "drupal/config_installer": "^1.7", "drupal/core": "^8.5", - "palantirnet/search_api_federated_solr": "dev-PL-34-schema-settings" + "palantirnet/search_api_federated_solr": "dev-master" }, "require-dev": { "behat/behat": "^3.1", diff --git a/composer.lock b/composer.lock index 9df239c..378e60e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "db1e903cf000677862e450f8385a2cf1", + "content-hash": "19f17ed4977bcd2a98c560ed1783e515", "packages": [ { "name": "asm89/stack-cors", @@ -1211,7 +1211,7 @@ }, "drupal": { "version": "8.x-1.9", - "datestamp": "1531985581", + "datestamp": "1537175280", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -1355,7 +1355,7 @@ }, "drupal": { "version": "8.x-1.3", - "datestamp": "1527232684", + "datestamp": "1536408480", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -1760,22 +1760,23 @@ }, { "name": "palantirnet/search_api_federated_solr", - "version": "dev-PL-34-schema-settings", + "version": "dev-master", "source": { "type": "git", "url": "git@github.com:palantirnet/search_api_federated_solr.git", - "reference": "7f6085453595aaa238e59194d028ae97271fbfad" + "reference": "1183cc161ec49fea014c16d183a3a1aaee08d286" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/palantirnet/search_api_federated_solr/zipball/7f6085453595aaa238e59194d028ae97271fbfad", - "reference": "7f6085453595aaa238e59194d028ae97271fbfad", + "url": "https://api.github.com/repos/palantirnet/search_api_federated_solr/zipball/1183cc161ec49fea014c16d183a3a1aaee08d286", + "reference": "1183cc161ec49fea014c16d183a3a1aaee08d286", "shasum": "" }, "require": { "drupal/core": "^8.0", "drupal/search_api_solr": "^1.2", - "drupal/token": "^1.1" + "drupal/token": "^1.1", + "palantirnet/search_api_field_map": "dev-master" }, "type": "drupal-module", "license": [ @@ -1786,9 +1787,42 @@ "Drupal" ], "support": { - "source": "https://github.com/palantirnet/search_api_federated_solr/tree/PL-34-schema-settings" + "source": "https://github.com/palantirnet/search_api_federated_solr/tree/master" + }, + "time": "2018-09-21T15:17:14+00:00" + }, + { + "name": "palantirnet/search_api_field_map", + "version": "dev-master", + "source": { + "type": "git", + "url": "git@github.com:palantirnet/search_api_field_map.git", + "reference": "5c251765c56624409f57fe806b4354620ff495a8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/palantirnet/search_api_field_map/zipball/5c251765c56624409f57fe806b4354620ff495a8", + "reference": "5c251765c56624409f57fe806b4354620ff495a8", + "shasum": "" + }, + "require": { + "drupal/core": "^8.0", + "drupal/search_api_solr": "^1.2", + "drupal/token": "^1.1" + }, + "type": "drupal-module", + "license": [ + "GPL-2.0+" + ], + "description": "Allows indexing multiple Drupal sites into a single Solr search index by field.", + "keywords": [ + "Drupal" + ], + "support": { + "source": "https://github.com/palantirnet/search_api_field_map/tree/master", + "issues": "https://github.com/palantirnet/search_api_field_map/issues" }, - "time": "2018-09-20T16:22:36+00:00" + "time": "2018-09-21T15:11:30+00:00" }, { "name": "paragonie/random_compat", @@ -5351,39 +5385,6 @@ ], "time": "2018-06-03T11:33:10+00:00" }, - { - "name": "palantirnet/search_api_field_map", - "version": "dev-master", - "source": { - "type": "git", - "url": "git@github.com:palantirnet/search_api_field_map.git", - "reference": "fd943685e2885396b5956908ea25a0a03dc199ae" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/palantirnet/search_api_field_map/zipball/fd943685e2885396b5956908ea25a0a03dc199ae", - "reference": "fd943685e2885396b5956908ea25a0a03dc199ae", - "shasum": "" - }, - "require": { - "drupal/core": "^8.0", - "drupal/search_api_solr": "^1.2", - "drupal/token": "^1.1" - }, - "type": "drupal-module", - "license": [ - "GPL-2.0+" - ], - "description": "Allows indexing multiple Drupal sites into a single Solr search index by field.", - "keywords": [ - "Drupal" - ], - "support": { - "source": "https://github.com/palantirnet/search_api_field_map/tree/master", - "issues": "https://github.com/palantirnet/search_api_field_map/issues" - }, - "time": "2018-08-28T18:40:53+00:00" - }, { "name": "palantirnet/the-build", "version": "1.7.0", From b0a69371e26590b9ba3315276005d83b86835fc3 Mon Sep 17 00:00:00 2001 From: Avi Schwab Date: Mon, 24 Sep 2018 15:33:33 -0500 Subject: [PATCH 7/7] Update patch and lock --- composer.json | 2 +- composer.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 9a7f7ec..e01a0b2 100644 --- a/composer.json +++ b/composer.json @@ -75,7 +75,7 @@ "Allow config installer to find themes.": "https://www.drupal.org/files/issues/2018-05-28/2975675-2.patch" }, "drupal/config_inspector": { - "2843729: Filter entities with schema errors": "https://www.drupal.org/files/issues/filter_entities_with-2843729-7.patch" + "2843729: Filter entities with schema errors": "https://www.drupal.org/files/issues/2018-09-24/filter_entities_with-2843729-17.patch" } } } diff --git a/composer.lock b/composer.lock index 378e60e..e73e480 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "19f17ed4977bcd2a98c560ed1783e515", + "content-hash": "d6d0636b27398c166cc61eb5205356f2", "packages": [ { "name": "asm89/stack-cors", @@ -868,7 +868,7 @@ } }, "patches_applied": { - "2843729: Filter entities with schema errors": "https://www.drupal.org/files/issues/filter_entities_with-2843729-7.patch" + "2843729: Filter entities with schema errors": "https://www.drupal.org/files/issues/2018-09-24/filter_entities_with-2843729-17.patch" } }, "notification-url": "https://packages.drupal.org/8/downloads",