Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use Leaflet 2.2 #59

Merged
merged 5 commits into from
Jun 6, 2022
Merged

Use Leaflet 2.2 #59

merged 5 commits into from
Jun 6, 2022

Conversation

stephen-cox
Copy link
Member

Updates composer.json to allow the latest version of the Drupal Leaflet module and updates schema for this.

Fixes #48

@stephen-cox stephen-cox mentioned this pull request May 31, 2022
Closed
@andybroomfield
Copy link
Contributor

So what disappears is the full screen configuration, until the new configuration is updated.
Fresh install is fine, but others are going to have to updates there maps manully.

Screenshot 2022-06-01 at 11 53 58 am

Screenshot 2022-06-01 at 11 55 51 am

@andybroomfield
Copy link
Contributor

This is the error from running the full test suite locally

Local Gov Update (Drupal\Tests\localgov\Functional\LocalGovUpdate)
 ✘ Update
   ┐
   ├ There should be no errors in configuration 'core.entity_view_display.localgov_geo.address.default'. Errors:                              
   ├ Schema key core.entity_view_display.localgov_geo.address.default:content.location.settings.fullscreen_control failed with: missing schema
   ├                                                                                                                                          
   ├ Failed asserting that Array &0 (                                                                                                         
   ├     'core.entity_view_display.localgov_geo.address.default:content.location.settings.fullscreen_control' => 'missing schema'             
   ├ ) is true.                                                                                                                               
   │
   ╵ /app/vendor/phpunit/phpunit/src/Framework/Constraint/Constraint.php:121
   ╵ /app/vendor/phpunit/phpunit/src/Framework/Constraint/Constraint.php:55
   ╵ /app/web/core/tests/Drupal/Tests/SchemaCheckTestTrait.php:38
   ╵ /app/web/core/tests/Drupal/Tests/UpdatePathTestTrait.php:141
   ╵ /app/web/core/tests/Drupal/FunctionalTests/Update/UpdatePathTestBase.php:270
   ╵ /app/web/profiles/contrib/localgov/tests/src/Functional/LocalGovUpdateTest.php:32
   ╵ /app/vendor/phpunit/phpunit/src/Framework/TestResult.php:726
   ┴

@andybroomfield
Copy link
Contributor

And some more errors
(I let the full test suite run locally!)

Directory Org (Drupal\Tests\localgov_directories_org\Functional\DirectoryOrg)
 ✘ Directory venue fields
   ┐
   ├ Drupal\Core\Config\Schema\SchemaIncompleteException: Schema errors for views.view.localgov_directory_channel with the following errors: views.view.localgov_directory_channel:display.embed_map.display_options.style.options.data_source variable type is string but applied schema class is Drupal\Core\Config\Schema\Sequence, views.view.localgov_directory_channel:display.embed_map.display_options.style.options.fullscreen_control missing schema
   │
   ╵ /app/web/core/lib/Drupal/Core/Config/Development/ConfigSchemaChecker.php:94
   ╵ /app/web/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php:142
   ╵ /app/web/core/lib/Drupal/Core/Config/Config.php:229
   ╵ /app/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php:274
   ╵ /app/web/core/lib/Drupal/Core/Entity/EntityStorageBase.php:524
   ╵ /app/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php:253
   ╵ /app/web/core/lib/Drupal/Core/Entity/EntityBase.php:339
   ╵ /app/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php:607
   ╵ /app/web/modules/contrib/localgov_directories/modules/localgov_directories_location/localgov_directories_location.install:23
   ╵ /app/web/core/lib/Drupal/Core/Extension/ModuleHandler.php:392
   ╵ /app/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php:362
   ╵ /app/web/core/lib/Drupal/Core/ProxyClass/Extension/ModuleInstaller.php:83
   ╵ /app/web/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php:474
   ╵ /app/web/core/tests/Drupal/Tests/BrowserTestBase.php:559
   ╵ /app/web/core/tests/Drupal/Tests/BrowserTestBase.php:378
   ╵ /app/web/modules/contrib/localgov_directories/modules/localgov_directories_org/tests/Functional/DirectoryOrgTest.php:59
   ╵ /app/vendor/phpunit/phpunit/src/Framework/TestResult.php:726
   ┴

Directory Venue (Drupal\Tests\localgov_directories_venue\Functional\DirectoryVenue)
 ✘ Directory venue fields
   ┐
   ├ Drupal\Core\Config\Schema\SchemaIncompleteException: Schema errors for views.view.localgov_directory_channel with the following errors: views.view.localgov_directory_channel:display.embed_map.display_options.style.options.data_source variable type is string but applied schema class is Drupal\Core\Config\Schema\Sequence, views.view.localgov_directory_channel:display.embed_map.display_options.style.options.fullscreen_control missing schema
   │
   ╵ /app/web/core/lib/Drupal/Core/Config/Development/ConfigSchemaChecker.php:94
   ╵ /app/web/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php:142
   ╵ /app/web/core/lib/Drupal/Core/Config/Config.php:229
   ╵ /app/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php:274
   ╵ /app/web/core/lib/Drupal/Core/Entity/EntityStorageBase.php:524
   ╵ /app/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php:253
   ╵ /app/web/core/lib/Drupal/Core/Entity/EntityBase.php:339
   ╵ /app/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php:607
   ╵ /app/web/modules/contrib/localgov_directories/modules/localgov_directories_location/localgov_directories_location.install:23
   ╵ /app/web/core/lib/Drupal/Core/Extension/ModuleHandler.php:392
   ╵ /app/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php:362
   ╵ /app/web/core/lib/Drupal/Core/ProxyClass/Extension/ModuleInstaller.php:83
   ╵ /app/web/core/lib/Drupal/Core/Test/FunctionalTestSetupTrait.php:474
   ╵ /app/web/core/tests/Drupal/Tests/BrowserTestBase.php:559
   ╵ /app/web/core/tests/Drupal/Tests/BrowserTestBase.php:378
   ╵ /app/web/modules/contrib/localgov_directories/modules/localgov_directories_venue/tests/src/Functional/DirectoryVenueTest.php:63
   ╵ /app/vendor/phpunit/phpunit/src/Framework/TestResult.php:726
   ┴

Roles Integration (Drupal\Tests\localgov_directories_venue\Kernel\RolesIntegration)
 ✘ Enabling roles module
   ┐
   ├ Drupal\Core\Config\Schema\SchemaIncompleteException: Schema errors for views.view.localgov_directory_channel with the following errors: views.view.localgov_directory_channel:display.embed_map.display_options.style.options.data_source variable type is string but applied schema class is Drupal\Core\Config\Schema\Sequence, views.view.localgov_directory_channel:display.embed_map.display_options.style.options.fullscreen_control missing schema
   │
   ╵ /app/web/core/lib/Drupal/Core/Config/Development/ConfigSchemaChecker.php:94
   ╵ /app/web/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php:142
   ╵ /app/web/core/lib/Drupal/Core/Config/Config.php:229
   ╵ /app/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php:274
   ╵ /app/web/core/lib/Drupal/Core/Entity/EntityStorageBase.php:524
   ╵ /app/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php:253
   ╵ /app/web/core/lib/Drupal/Core/Entity/EntityBase.php:339
   ╵ /app/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php:607
   ╵ /app/web/modules/contrib/localgov_directories/modules/localgov_directories_location/localgov_directories_location.install:23
   ╵ /app/web/core/lib/Drupal/Core/Extension/ModuleHandler.php:392
   ╵ /app/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php:362
   ╵ /app/web/core/lib/Drupal/Core/ProxyClass/Extension/ModuleInstaller.php:83
   ╵ /app/web/modules/contrib/localgov_directories/modules/localgov_directories_venue/tests/src/Kernel/RolesIntegrationTest.php:39
   ╵ /app/vendor/phpunit/phpunit/src/Framework/TestResult.php:726
   ┴

Event Page (Drupal\Tests\localgov_events\Functional\EventPage)
 ✘ Event fields
   ┐
   ├ Drupal\Core\Config\Schema\SchemaIncompleteException: Schema errors for views.view.localgov_directory_channel with the following errors: views.view.localgov_directory_channel:display.embed_map.display_options.style.options.data_source variable type is string but applied schema class is Drupal\Core\Config\Schema\Sequence, views.view.localgov_directory_channel:display.embed_map.display_options.style.options.fullscreen_control missing schema
   │
   ╵ /app/web/core/lib/Drupal/Core/Config/Development/ConfigSchemaChecker.php:94
   ╵ /app/web/core/lib/Drupal/Component/EventDispatcher/ContainerAwareEventDispatcher.php:142
   ╵ /app/web/core/lib/Drupal/Core/Config/Config.php:229
   ╵ /app/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php:274
   ╵ /app/web/core/lib/Drupal/Core/Entity/EntityStorageBase.php:524
   ╵ /app/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php:253
   ╵ /app/web/core/lib/Drupal/Core/Entity/EntityBase.php:339
   ╵ /app/web/core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php:607
   ╵ /app/web/modules/contrib/localgov_directories/modules/localgov_directories_location/localgov_directories_location.install:23
   ╵ /app/web/core/lib/Drupal/Core/Extension/ModuleHandler.php:392
   ╵ /app/web/core/lib/Drupal/Core/Extension/ModuleInstaller.php:362
   ╵ /app/web/core/lib/Drupal/Core/ProxyClass/Extension/ModuleInstaller.php:83
   ╵ /app/web/modules/contrib/localgov_events/tests/src/Functional/EventPageTest.php:84
   ╵ /app/vendor/phpunit/phpunit/src/Framework/TestResult.php:726

@ekes
Copy link
Member

ekes commented Jun 6, 2022

I'm just installing and exporting the config. It does update as well. Just have to make sure we don't pick up any other unnecessary changes/dependencies.

ekes added a commit to localgovdrupal/localgov_directories that referenced this pull request Jun 6, 2022
@ekes
Reexport embedded map view with leaflet 2.2
5400aea 
For localgovdrupal/localgov_geo#59
@ekes ekes mentioned this pull request Jun 6, 2022
Merged
@stephen-cox
Copy link
Member Author

So what disappears is the full screen configuration, until the new configuration is updated.
Fresh install is fine, but others are going to have to updates there maps manully.

The full screen control disappears for me even on a fresh install. Looks related to the schema errors being thrown by the directories module

@ekes
Copy link
Member

ekes commented Jun 6, 2022

In re-exporting (also on localgovdrupal/localgov_directories#191 ) I don't think I enabled full screen mode. Do we want to do that for new installs? It requires additional (json) configuration. There is some default in there.

@ekes
Copy link
Member

ekes commented Jun 6, 2022

In re-exporting (also on localgovdrupal/localgov_directories#191 ) I don't think I enabled full screen mode. Do we want to do that for new installs? It requires additional (json) configuration. There is some default in there.

And that requires enabling pulling javascript from jsdelivr.net which no doubt is not the default desirable. I say we don't enable fullscreen option by default.

@finnlewis finnlewis merged commit 55e5cac into 1.x Jun 6, 2022
@stephen-cox stephen-cox deleted the feature/24-leaflet-2 branch June 6, 2022 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andybroomfield andybroomfield andybroomfield approved these changes

@ekes ekes Awaiting requested review from ekes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

New missing schema errors
4 participants
@stephen-cox @andybroomfield @ekes @finnlewis