closes #150

LederCards · Aug 30, 2024 · 47ca207 · 47ca207
1 parent 7cf55b4
commit 47ca207
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/src/app/_shared/components/card-text/card-text.component.html b/src/app/_shared/components/card-text/card-text.component.html
@@ -1 +1 @@
-<p [innerHtml]="html">{{ text() }}</p>
+<p [innerHtml]="html | faq:product() | markdown">{{ text() }}</p>
diff --git a/src/app/_shared/components/card-text/card-text.component.ts b/src/app/_shared/components/card-text/card-text.component.ts
@@ -9,6 +9,7 @@ import { environment } from '../../../../environments/environment';
 })
 export class CardTextComponent {
   public text = input.required<string>();
+  public product = input<string>();
 
   public html = '';
 

diff --git a/src/app/_shared/pipes/faq.pipe.ts b/src/app/_shared/pipes/faq.pipe.ts
@@ -9,8 +9,9 @@ export class FaqPipe implements PipeTransform {
   private metaService = inject(MetaService);
   private cardsService = inject(CardsService);
 
-  transform(value: string, ...args: string[]): string {
+  transform(value: string, ...args: (string | undefined)[]): string {
     const [productId] = args;
+    if (!productId) return value ?? '';
 
     const ruleRegex = /\$rule:([\d.]+)\$/gm;
     value = value.replace(ruleRegex, (match, p1) => {

diff --git a/src/app/card/card.page.html b/src/app/card/card.page.html
@@ -114,7 +114,8 @@ <h3 itemprop="name" [innerHTML]="'Q: ' + (entry.q | faq:cardData.game | markdown
                 @for(entry of errata(); track $index) {
                 <ion-item>
                   <ion-label text-wrap>
-                    <p [innerHTML]="'&bull; ' + entry.text | faq:cardData.game | markdown"></p>
+
+                    <app-card-text [text]="'&bull; ' + entry.text" [product]="cardData.game"></app-card-text>
                   </ion-label>
                 </ion-item>
                 }

diff --git a/src/app/errata/errata.page.html b/src/app/errata/errata.page.html
@@ -32,7 +32,7 @@
               @for(errataEntry of entry.errata; track $index) {
               <ion-item>
                 <ion-label text-wrap>
-                  <p [innerHTML]="errataEntry.text | faq:productId() | markdown"></p>
+                  <app-card-text [text]="errataEntry.text" [product]="productId()"></app-card-text>
                 </ion-label>
               </ion-item>
               }