Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
graphql_compose
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
graphql_compose
Commits
d2b65a66
Commit
d2b65a66
authored
1 year ago
by
Al Munnings
Browse files
Options
Downloads
Patches
Plain Diff
Set language on Link url to match field language.
parent
f8909f53
Branches
Branches containing commit
Tags
2.1.0
2.1.0-beta8
Tags containing commit
1 merge request
!76
Set language on Link url to match field language.
Pipeline
#171524
passed
1 year ago
Stage: build
Stage: validate
Stage: test
Changes
2
Pipelines
5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Plugin/GraphQLCompose/FieldType/LinkItem.php
+3
-0
3 additions, 0 deletions
src/Plugin/GraphQLCompose/FieldType/LinkItem.php
tests/src/Functional/Core/EntityLanguageTest.php
+173
-0
173 additions, 0 deletions
tests/src/Functional/Core/EntityLanguageTest.php
with
176 additions
and
0 deletions
src/Plugin/GraphQLCompose/FieldType/LinkItem.php
+
3
−
0
View file @
d2b65a66
...
...
@@ -38,6 +38,9 @@ class LinkItem extends GraphQLComposeFieldTypeBase implements FieldProducerItemI
?
$this
->
getUrlFromLink
(
$item
)
:
$this
->
getUrlFromOther
(
$item
);
// Match the Url language to the field item language.
$url
->
setOption
(
'language'
,
$this
->
languageManager
->
getLanguage
(
$item
->
getLangcode
()));
$link
=
$url
->
toString
(
TRUE
);
$context
->
addCacheableDependency
(
$link
);
...
...
This diff is collapsed.
Click to expand it.
tests/src/Functional/Core/EntityLanguageTest.php
+
173
−
0
View file @
d2b65a66
...
...
@@ -4,7 +4,11 @@ declare(strict_types=1);
namespace
Drupal\Tests\graphql_compose\Functional\Core
;
use
Drupal\field\Entity\FieldConfig
;
use
Drupal\field\Entity\FieldStorageConfig
;
use
Drupal\link\LinkItemInterface
;
use
Drupal\menu_link_content
\Entity\MenuLinkContent
;
use
Drupal\node\Entity\Node
;
use
Drupal\node\NodeInterface
;
use
Drupal\system\Entity\Menu
;
use
Drupal\system\MenuInterface
;
...
...
@@ -428,4 +432,173 @@ class EntityLanguageTest extends GraphQLComposeBrowserTestBase {
$this
->
assertEquals
(
'de'
,
$content
[
'data'
][
'menu'
][
'items'
][
0
][
'langcode'
][
'id'
]);
}
/**
* Test that a link field in a node is translated as expected.
*/
public
function
testNodeLinkFieldUrlTranslated
():
void
{
// Create a field with settings to validate.
FieldStorageConfig
::
create
([
'field_name'
=>
'field_internal_link'
,
'type'
=>
'link'
,
'entity_type'
=>
'node'
,
])
->
save
();
FieldConfig
::
create
([
'field_name'
=>
'field_internal_link'
,
'entity_type'
=>
'node'
,
'bundle'
=>
'test'
,
'settings'
=>
[
'title'
=>
DRUPAL_OPTIONAL
,
'link_type'
=>
LinkItemInterface
::
LINK_INTERNAL
,
],
])
->
save
();
// Create a field with settings to validate.
FieldStorageConfig
::
create
([
'field_name'
=>
'field_external_link'
,
'type'
=>
'link'
,
'entity_type'
=>
'node'
,
])
->
save
();
FieldConfig
::
create
([
'field_name'
=>
'field_external_link'
,
'entity_type'
=>
'node'
,
'bundle'
=>
'test'
,
'settings'
=>
[
'title'
=>
DRUPAL_OPTIONAL
,
'link_type'
=>
LinkItemInterface
::
LINK_EXTERNAL
,
],
])
->
save
();
// Enable the new fields.
$this
->
setFieldConfig
(
'node'
,
'test'
,
'field_internal_link'
,
[
'enabled'
=>
TRUE
,
]);
$this
->
setFieldConfig
(
'node'
,
'test'
,
'field_external_link'
,
[
'enabled'
=>
TRUE
,
]);
// Reload the node.
$this
->
node
=
Node
::
load
(
$this
->
node
->
id
());
$deNode
=
$this
->
node
->
getTranslation
(
'de'
);
$jaNode
=
$this
->
node
->
getTranslation
(
'ja'
);
// Baseline link back to itself.
$this
->
node
->
set
(
'field_internal_link'
,
[
'uri'
=>
'internal:/test'
,
'title'
=>
'Link title'
,
])
->
set
(
'field_external_link'
,
[
'uri'
=>
'https://example.com'
,
'title'
=>
'External en link'
,
])
->
save
();
// Link to the translated URL.
// Expecting this to stay as /en/test.
$deNode
->
set
(
'field_internal_link'
,
[
'uri'
=>
'internal:/en/test'
,
'title'
=>
'Link back to EN'
,
])
->
set
(
'field_external_link'
,
[
'uri'
=>
'https://example.de'
,
'title'
=>
'External de link'
,
])
->
save
();
// Link to the non translated URL.
// Expecting this to become /ja/test.
$jaNode
->
set
(
'field_internal_link'
,
[
'uri'
=>
'internal:/test'
,
'title'
=>
'Link title (JA)'
,
])
->
set
(
'field_external_link'
,
[
'uri'
=>
'https://example.ja'
,
'title'
=>
'External ja link'
,
])
->
save
();
$query
=
<<<GQL
query {
en: node(id: "{$this->node->uuid()}", langcode: "en") {
... on NodeTest {
internalLink {
title
url
internal
}
externalLink {
title
url
internal
}
}
}
de: node(id: "{$this->node->uuid()}", langcode: "de") {
... on NodeTest {
internalLink {
title
url
internal
}
externalLink {
title
url
internal
}
}
}
ja: node(id: "{$this->node->uuid()}", langcode: "ja") {
... on NodeTest {
internalLink {
title
url
internal
}
externalLink {
title
url
internal
}
}
}
}
GQL;
$content
=
$this
->
executeQuery
(
$query
);
// Check internal links.
$this
->
assertEquals
(
'Link title'
,
$content
[
'data'
][
'en'
][
'internalLink'
][
'title'
]);
$this
->
assertEquals
(
'Link back to EN'
,
$content
[
'data'
][
'de'
][
'internalLink'
][
'title'
]);
$this
->
assertEquals
(
'Link title (JA)'
,
$content
[
'data'
][
'ja'
][
'internalLink'
][
'title'
]);
$this
->
assertEquals
(
base_path
()
.
'test'
,
$content
[
'data'
][
'en'
][
'internalLink'
][
'url'
]);
$this
->
assertEquals
(
base_path
()
.
'en/test'
,
$content
[
'data'
][
'de'
][
'internalLink'
][
'url'
]);
$this
->
assertEquals
(
base_path
()
.
'ja/test'
,
$content
[
'data'
][
'ja'
][
'internalLink'
][
'url'
]);
$this
->
assertTrue
(
$content
[
'data'
][
'en'
][
'internalLink'
][
'internal'
]);
$this
->
assertTrue
(
$content
[
'data'
][
'de'
][
'internalLink'
][
'internal'
]);
$this
->
assertTrue
(
$content
[
'data'
][
'ja'
][
'internalLink'
][
'internal'
]);
// Check external links.
$this
->
assertEquals
(
'External en link'
,
$content
[
'data'
][
'en'
][
'externalLink'
][
'title'
]);
$this
->
assertEquals
(
'External de link'
,
$content
[
'data'
][
'de'
][
'externalLink'
][
'title'
]);
$this
->
assertEquals
(
'External ja link'
,
$content
[
'data'
][
'ja'
][
'externalLink'
][
'title'
]);
$this
->
assertEquals
(
'https://example.com'
,
$content
[
'data'
][
'en'
][
'externalLink'
][
'url'
]);
$this
->
assertEquals
(
'https://example.de'
,
$content
[
'data'
][
'de'
][
'externalLink'
][
'url'
]);
$this
->
assertEquals
(
'https://example.ja'
,
$content
[
'data'
][
'ja'
][
'externalLink'
][
'url'
]);
$this
->
assertFalse
(
$content
[
'data'
][
'en'
][
'externalLink'
][
'internal'
]);
$this
->
assertFalse
(
$content
[
'data'
][
'de'
][
'externalLink'
][
'internal'
]);
$this
->
assertFalse
(
$content
[
'data'
][
'ja'
][
'externalLink'
][
'internal'
]);
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment