Skip to content

Commit

Permalink
Merge branch '7.3.x' into fix/search-api-on-graphql-caching
Browse files Browse the repository at this point in the history
  • Loading branch information
dbosen authored Dec 10, 2024
2 parents d9bb3eb + 206a448 commit 4f98108
Show file tree
Hide file tree
Showing 9 changed files with 153 additions and 12 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Changelog

## [7.3.9](https://github.com/thunder/thunder-distribution/tree/7.3.9) 2024-11-25

[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.8...7.3.9)

* Remove Drupal core patch [#3487031](https://www.drupal.org/i/3487031), because it was merged upstream.

## [7.3.8](https://github.com/thunder/thunder-distribution/tree/7.3.8) 2024-11-20

[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.7...7.3.8)

* Pin autosave_form to 1.7 and apply patch from issue [#3487459](https://www.drupal.org/i/3487459)
* Add a node Graphql query to fetch a single node by its UUID
* Make private methods in SearchApiResponse protected.
* Add Drupal core patch from issue [#3487031](https://www.drupal.org/i/3487031) because of a performance regression.

## [7.3.7](https://github.com/thunder/thunder-distribution/tree/7.3.7) 2024-10-14

[Full Changelog](https://github.com/thunder/thunder-distribution/compare/7.3.6...7.3.7)
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@
"drupal/diff": {
"Back button for comparison page": "https://www.drupal.org/files/issues/back_button_for-2853193-4.patch"
},
"drupal/focal_point": {
"Issue #3462165: Preview results in Error: Call to a member function getDefinitions() on null": "https://www.drupal.org/files/issues/2024-07-18/Preview-results-in-Error-3462165.patch"
},
"drupal/gin": {
"Issue #3455558: There is no visible change to a toggle when pressed (but it does trigger conditional fields, value is saved, etc)": "https://www.drupal.org/files/issues/2024-08-06/3455558-Refactor-toggle-styles-mr438.patch"
},
"drupal/autosave_form": {
"Issue #3487459: Deprecation error on user edit form": "https://git.drupalcode.org/project/autosave_form/-/merge_requests/19.diff"
}
}
},
Expand All @@ -55,7 +55,7 @@
"drupal/access_unpublished": "^1.5",
"drupal/admin_toolbar": "^3.4",
"drupal/autofill": "^1.1",
"drupal/autosave_form": "^1.6",
"drupal/autosave_form": "1.7",
"drupal/blazy": "^2.14",
"drupal/checklistapi": "^2.1",
"drupal/core-recommended": "~10.3.0@stable",
Expand All @@ -70,7 +70,7 @@
"drupal/entity_reference_actions": "^1.1.1",
"drupal/entity_reference_revisions": "^1.3",
"drupal/field_group": "^3.4",
"drupal/focal_point": "2.1.1",
"drupal/focal_point": "^2.1.2",
"drupal/facets": "^2.0.6",
"drupal/gin": "3.0-rc11",
"drupal/gin_toolbar": "^1.0-rc6",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ extend type Query {
channel(uuid: String!): Channel
user(uuid: String!): User
page(path: String!): Page
node(uuid: String!): Page
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ protected function resolveFields(): void {
$this->fromRoute($this->builder->fromArgument('path'))
);

$this->resolvePageInterfaceQueryFields('node', 'node');

// Teaser.
$this->addSimpleCallbackFields('Teaser', ['image', 'text']);

Expand Down
12 changes: 6 additions & 6 deletions modules/thunder_gqls/src/Wrappers/SearchApiResponse.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public static function create(ContainerInterface $container): self {
* @param \Drupal\search_api\Query\QueryInterface $query
* The query.
*/
public function setQuery(QueryInterface $query): SearchApiResponse {
public function setQuery(QueryInterface $query): static {
$this->query = $query;
return $this;
}
Expand All @@ -91,7 +91,7 @@ public function setQuery(QueryInterface $query): SearchApiResponse {
* @param array $facetMapping
* The facet mapping.
*/
public function setFacetMapping(array $facetMapping): SearchApiResponse {
public function setFacetMapping(array $facetMapping): static {
$this->facetMapping = $facetMapping;
return $this;
}
Expand All @@ -102,7 +102,7 @@ public function setFacetMapping(array $facetMapping): SearchApiResponse {
* @param string $bundle
* The bundle.
*/
public function setBundle(string $bundle): SearchApiResponse {
public function setBundle(string $bundle): static {
$this->bundle = $bundle;
return $this;
}
Expand All @@ -113,7 +113,7 @@ public function setBundle(string $bundle): SearchApiResponse {
* @param array $facets
* The facets.
*/
public function setFacets(array $facets): SearchApiResponse {
public function setFacets(array $facets): static {
$this->facets = $facets;
return $this;
}
Expand Down Expand Up @@ -205,7 +205,7 @@ public function total(): int {
* @return array
* The processed facet results.
*/
private function processFacetResults(
protected function processFacetResults(
Facet $facet,
array $facetResults,
): array {
Expand Down Expand Up @@ -238,7 +238,7 @@ private function processFacetResults(
* @return array
* The processed facet results.
*/
private function processFacetResultsFromFieldConfig(
protected function processFacetResultsFromFieldConfig(
Facet $facet,
array $facetResults,
): array {
Expand Down
51 changes: 51 additions & 0 deletions modules/thunder_gqls/tests/examples/node.query.graphql
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
query ($uuid: String!) {
node(uuid: $uuid) {
uuid
url
name
entity
language
entityLinks {
canonical
}
... on Article {
published
author {
uuid
name
mail
entity
language
}
channel {
uuid
published
name
url
parent {
name
id
url
}
}
tags {
uuid
name
url
}
seoTitle
content {
__typename
}
teaser {
text
image {
uuid
derivative(style: "medium") {
width
}
}
}
}
}
}
69 changes: 69 additions & 0 deletions modules/thunder_gqls/tests/examples/node.response.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"data": {
"node": {
"uuid": "36b2e2b2-3df0-43eb-a282-d792b0999c07",
"url": "/come-drupalcon-new-orleans",
"name": "Come to DrupalCon New Orleans",
"entity": "node",
"language": "en",
"entityLinks": {
"canonical": "/come-drupalcon-new-orleans"
},
"published": true,
"author": {
"uuid": "be8e7a25-8a41-4bda-a854-b4b9bb1b0a02",
"name": "test-seo",
"mail": null,
"entity": "user",
"language": "en"
},
"channel": {
"uuid": "0bb70443-8172-4d8e-9335-2876bc32e356",
"published": true,
"name": "Events",
"url": "/events",
"parent": null
},
"tags": [
{
"uuid": "35bdba6e-9b45-472a-8fda-11e7e69de71b",
"name": "Drupal",
"url": "/drupal"
}
],
"seoTitle": "Come to DrupalCon New Orleans",
"content": [
{
"__typename": "ParagraphGallery"
},
{
"__typename": "ParagraphText"
},
{
"__typename": "ParagraphTwitter"
},
{
"__typename": "ParagraphLink"
},
{
"__typename": "ParagraphQuote"
},
{
"__typename": "ParagraphVideo"
},
{
"__typename": "ParagraphPinterest"
}
],
"teaser": {
"text": "The Drupal community is one of the largest open source communities in the world. We're developers, designers, strategists, coordinators, editors, translators, and more. Each year, we meet at DrupalCamps, meetups, and other events in more than 200 countries. But once a year, our community comes together at the biggest Drupal event in the world: DrupalCon North America. This year, from May 9-13, we'll be in New Orleans.",
"image": {
"uuid": "a4c1035a-5b27-4713-8ba3-40ba5942486d",
"derivative": {
"width": 220
}
}
}
}
}
}
3 changes: 3 additions & 0 deletions modules/thunder_gqls/tests/examples/node.variables.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"uuid": "36b2e2b2-3df0-43eb-a282-d792b0999c07"
}
2 changes: 1 addition & 1 deletion thunder.info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ type: profile
description: 'The Drupal based CMS for professional publishing.'
project: thunder
core_version_requirement: ~10.3.0
version: '7.3.7'
version: '7.3.9'

distribution:
name: Thunder
Expand Down

0 comments on commit 4f98108

Please sign in to comment.