fix multiple applying, empty strings

codemonauts · Dec 14, 2022 · d650ba5 · d650ba5
1 parent c872cba
commit d650ba5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Release Notes for Glossary Plugin
 
+## 2.0.1 - 2022-12-15
+
+### Fixed
+
+- Missing definitions when applying the glossary multiple times. (#5)
+- Remove empty strings from terms breaking the frontend. (#7)
+
 ## 2.0.0 - 2022-05-04
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "codemonauts/craft-glossary",
   "description": "Add glossaries with tooltips to Craft CMS.",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "type": "craft-plugin",
   "keywords": [
     "craft",

diff --git a/src/elements/Term.php b/src/elements/Term.php
@@ -287,6 +287,7 @@ public function defineRules(): array
         $rules = parent::defineRules();
 
         $rules[] = [['term'], 'required', 'on' => self::SCENARIO_LIVE];
+        $rules[] = [['term', 'synonyms'], 'trim'];
         $rules[] = [['glossaryId'], 'integer'];
         $rules[] = [['caseSensitive', 'matchSubstring'], 'boolean'];
 

diff --git a/src/services/Terms.php b/src/services/Terms.php
@@ -5,6 +5,7 @@
 use codemonauts\glossary\elements\Glossary;
 use codemonauts\glossary\elements\Term;
 use Craft;
+use craft\helpers\ArrayHelper;
 use craft\helpers\Html;
 use Exception;
 use Twig\Error\SyntaxError;
@@ -13,8 +14,9 @@
 
 class Terms extends Component
 {
-    protected $renderedTerms = '';
-    private $usedTerms = [];
+    protected string $renderedTerms = '';
+
+    protected array $usedTerms = [];
 
     /**
      * Returns all terms to search for.
@@ -29,12 +31,12 @@ public function parseTerms(Term $term): array
             $term->term,
         ];
 
-        if ($term->synonyms !== '') {
+        if (!empty($term->synonyms)) {
             $synonyms = explode(',', $term->synonyms);
             $terms = array_merge($terms, $synonyms);
         }
 
-        return $terms;
+        return ArrayHelper::filterEmptyStringsFromArray($terms);
     }
 
     /**
@@ -51,7 +53,7 @@ public function renderTerms(string $text, Glossary $glossary): string
         $originalText = $text;
 
         try {
-            $termTemplate = $glossary->termTemplate !== '' ? $glossary->termTemplate : '<span>{{ text }}</span>';
+            $termTemplate = !empty($glossary->termTemplate) ? $glossary->termTemplate : '<span>{{ text }}</span>';
             $replacements = [];
             $terms = Term::find()->glossary($glossary)->all();