Skip to content
This repository has been archived by the owner on Jul 27, 2022. It is now read-only.

ISAICP-6521: Longer glossary terms conflict with substrings. #2513

Merged
merged 5 commits into from
Jul 13, 2021
Merged

ISAICP-6521: Longer glossary terms conflict with substrings. #2513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2358990
ISAICP-6521: Update the test for the similar glossary terms.
idimopoulos Jul 5, 2021
8f6f540
ISAICP-6521: Sort terms so that longer terms come first.
idimopoulos Jul 5, 2021
38fc512
ISAICP-6521: Write a test that does fail without a solution.
idimopoulos Jul 11, 2021
1355f88
Merge remote-tracking branch 'origin/develop' into ISAICP-6521
pfrenssen Jul 12, 2021
6b549b4
ISAICP-6521: Align tables.
pfrenssen Jul 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions tests/features/glossary/glossary.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,16 +258,17 @@ Feature: As a moderator or group facilitator I want to be able to add, edit and
| mod | moderator |
| fac1 | |
And the following collections:
| title | description | state |
| Collection With Glossary | The Battle of Evermore of the battle and the BATTLE. Call it everMore or EVERmore | validated |
| The Other Collection | desc | validated |
| title | description | state |
| Collection With Glossary | The Battle of Evermore of the batTle and the BATTLE. Call it everMore or EVERmore. Also, battle again. | validated |
| The Other Collection | desc | validated |
And the following collection user membership:
| collection | user | roles |
| Collection With Glossary | fac | facilitator |
| The Other Collection | fac1 | facilitator |
And glossary content:
| title | synonyms | definition | collection |
| battle | evermore | def | Collection With Glossary |
| title | synonyms | definition | collection |
| battle | evermore | def | Collection With Glossary |
| battle again | | Not to be confused with a battle of sheep | Collection With Glossary |

Given I am an anonymous user
When I go to the "Collection With Glossary" collection
Expand Down Expand Up @@ -304,7 +305,10 @@ Feature: As a moderator or group facilitator I want to be able to add, edit and
# Only the first occurrence should be highlighted.
And I should see the link "Battle"
And I should see the link "Evermore"
But I should not see the link "battle"
And I should see the link "battle again"
And the response should contain "<a href=\"/collection/collection-glossary/glossary/term/battle\" class=\"glossary-term\" title=\"def\">Battle</a>"
And the response should contain "<a href=\"/collection/collection-glossary/glossary/term/battle-again\" class=\"glossary-term\" title=\"Not to be confused with a battle of sheep\">battle again</a>"
But I should not see the link "batTle"
And I should not see the link "BATTLE"
And I should not see the link "everMore"
And I should not see the link "EVERmore"
Expand All @@ -315,11 +319,12 @@ Feature: As a moderator or group facilitator I want to be able to add, edit and

# All terms should be highlighted.
Then I should see the link "Battle"
And I should see the link "battle"
And I should see the link "batTle"
And I should see the link "BATTLE"
And I should see the link "Evermore"
And I should see the link "everMore"
And I should see the link "EVERmore"
And I should see the link "battle again"

When I click "Glossary"
Then I should see the link "Glossary settings"
Expand Down
6 changes: 6 additions & 0 deletions web/modules/custom/collection/src/Plugin/Filter/Glossary.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,12 @@ public function process($text, $langcode): FilterProcessResult {
/** @var \Drupal\Core\Cache\RefinableCacheableDependencyInterface $cache_metadata */
[$replacements, $cache_metadata] = $this->getReplacementsMap($collection);

// The reverse ksort will ensure that when, for any reason, there are terms
// that overlap together, like "exchange", "exchange currency" and "exchange
// platform", it is ensured, that terms with longer terms, are replaced
// first and the shorter terms are coming last.
krsort($replacements);

// This collection has no glossary term entries.
if (empty($replacements)) {
return $result->addCacheableDependency($cache_metadata);
Expand Down