getSubNavigation returns empty array, parse_link_picker_json when set…

…ting mail content and allow nullable content in parseVariables
codedor · Dec 5, 2023 · 89f2131 · 89f2131
1 parent 5475832
commit 89f2131
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Filament/Resources/MailTemplateResource/Pages/PreviewMailTemplate.php b/src/Filament/Resources/MailTemplateResource/Pages/PreviewMailTemplate.php
@@ -88,4 +88,9 @@ protected function resolveRecord($key): Model
 
         return $record;
     }
+
+    public function getSubNavigation(): array
+    {
+        return [];
+    }
 }
diff --git a/src/Mail/MailableTemplate.php b/src/Mail/MailableTemplate.php
@@ -57,7 +57,7 @@ public function content(): Content
             view: $this->builder->getView(),
             with: [
                 'item' => $this->item,
-                'body' => new HtmlString($body),
+                'body' => new HtmlString(parse_link_picker_json($body)),
             ],
         );
     }
@@ -88,7 +88,7 @@ public function send($mailer)
         return $mail;
     }
 
-    public function parseVariables(string $content): string
+    public function parseVariables(?string $content): string
     {
         // Don't parse variables if we're previewing, because we have no data
         if ($this->isPreview) {