Added new tab MicroData for pages and models. Remove wmMicroData component

Author: webmaxx

Plugin.php

@@ -95,7 +95,6 @@ public function registerComponents(): array
             'Webmaxx\Seo\Components\Tags'        => 'wmSeoTags',
             'Webmaxx\Seo\Components\GtmHead'     => 'wmSeoGtmHead',
             'Webmaxx\Seo\Components\GtmNoScript' => 'wmSeoGtmNoScript',
-            'Webmaxx\Seo\Components\MicroData'   => 'wmMicroData',
         ];
     }
 

components/MicroData.php

@@ -23,6 +23,7 @@ class Tags extends ComponentBase
     protected $metaTagManager;
     protected $contentTagManager;
     protected $seoTaggableModelTags = [];
+    protected $microdata;
 
     public function componentDetails()
     {
@@ -50,29 +51,23 @@ public function defineProperties()
         ];
     }
 
-    public function init()
-    {
-        $this->metaTagManager = app(MetaTagManager::class);
-        $this->contentTagManager = app(ContentTagManager::class);
-    }
-
     public function onRun()
     {
         Event::listen('webmaxx.seo.component.tags.loadSeoTaggableModel', function($model) {
             $this->seoTaggableModelTags = data_get($model, $model->seoTaggableRelationField() . '.tags');
             $this->seoTaggableModelTags['page_title'] = $model->seoPageTitle();
+            $this->modelMicrodataContent = data_get($model, $model->seoTaggableRelationField() . '.tags.microdata_content');
             app('wmSeoComponentTagsContentTagsPreset')->addTags($model->extendedSeoContentTags());
         });
     }
 
     public function tags(): string
     {
-        $this->contentTagManager
-            ->addTags(app('wmSeoComponentTagsContentTagsPreset'));
+        $contentTagManager = $this->getContentTagManager();
 
         $context = new MetaTagContext($this->page, $this->seoTaggableModelTags);
 
-        return $this->metaTagManager
+        return $this->getMetaTagManager()
             ->addTags([
                 new TitleTag($context),
                 new MetaDescriptionTag($context),
@@ -93,6 +88,38 @@ public function tags(): string
             ->addTagIf($this->property('show_global_custom_og'), new RawTag(Settings::get('custom_og_tags')))
             ->addTag(new RawTag($this->page->og_custom_tags))
             ->addTag(new RawTag(data_get($this->seoTaggableModelTags, 'og_custom_tags', '')))
-            ->renderWithContentTags($this->contentTagManager);
+            ->renderWithContentTags($contentTagManager);
+    }
+
+    public function microdata(): string
+    {
+        if ($this->microdata === null) {
+            $this->microdata = $this->getContentTagManager()
+                ->render(implode("\n", [
+                    Settings::get('custom_microdata_content'),
+                    data_get($this->seoTaggableModelTags, 'microdata_content', $this->page->microdata_content),
+                ]));
+        }
+
+        return $this->microdata;
+    }
+
+    protected function getMetaTagManager()
+    {
+        if ($this->metaTagManager === null) {
+            $this->metaTagManager = app(MetaTagManager::class);
+        }
+
+        return $this->metaTagManager;
+    }
+
+    protected function getContentTagManager()
+    {
+        if ($this->contentTagManager === null) {
+            $this->contentTagManager = app(ContentTagManager::class);
+            $this->contentTagManager->addTags(app('wmSeoComponentTagsContentTagsPreset'));
+        }
+
+        return $this->contentTagManager;
     }
 }

components/Tags.php

@@ -1 +1,7 @@
 {{ __SELF__.tags|raw }}
+
+{% if __SELF__.microdata %}
+    {% put wm_microdata %}
+        {{ __SELF__.microdata|raw }}
+    {% endput %}
+{% endif %}

components/microdata/default.htm

@@ -64,7 +64,7 @@
                     'comment' => 'Click or drag these in to the content area',
                 ],
                 'microdata_content' => [
-                    'label' => 'MicroData content',
+                    'label' => 'Custom MicroData',
                 ],
             ],
         ],
@@ -75,6 +75,7 @@
                 'site' => 'General site settings',
                 'meta_tags' => 'Meta tags',
                 'og_tags' => 'Open Graph',
+                'microdata' => 'MicroData',
                 'counters' => 'Counters',
                 'robots_txt' => 'Robots.txt',
                 'humans_txt' => 'Humans.txt',
@@ -120,6 +121,9 @@
                 'custom_og_tags' => [
                     'label' => 'Custom Open Graph tags',
                 ],
+                'custom_microdata_content' => [
+                    'label' => 'Custom MicroData',
+                ],
                 'gtm_code' => [
                     'label' => 'Google Tag Manager ID',
                 ],
@@ -331,10 +335,6 @@
                 ],
             ],
         ],
-        'microdata' => [
-            'name' => 'Microdata',
-            'description' => 'Custom microdata to display',
-        ],
     ],
     'contentTags' => [
         'domain' => 'Domain',

components/tags/default.htm

@@ -64,7 +64,7 @@
                     'comment' => 'Щелкните или перетащите их в область содержимого',
                 ],
                 'microdata_content' => [
-                    'label' => 'Микроразметка',
+                    'label' => 'Пользовательская микроразметка',
                 ],
             ],
         ],
@@ -75,6 +75,7 @@
                 'site' => 'Общие настройки сайта',
                 'meta_tags' => 'META-теги',
                 'og_tags' => 'Open Graph',
+                'microdata' => 'Микроразметка',
                 'counters' => 'Счётчики',
                 'robots_txt' => 'Robots.txt',
                 'humans_txt' => 'Humans.txt',
@@ -120,6 +121,9 @@
                 'custom_og_tags' => [
                     'label' => 'Пользовательские OpenGraph теги',
                 ],
+                'custom_microdata_content' => [
+                    'label' => 'Пользовательская микроразметка',
+                ],
                 'gtm_code' => [
                     'label' => 'Google Tag Manager ID',
                 ],
@@ -327,10 +331,6 @@
                 ],
             ],
         ],
-        'microdata' => [
-            'name' => 'Микроразметка',
-            'description' => 'Отображение пользовательской микроразметки',
-        ],
     ],
     'contentTags' => [
         'domain' => 'Домен сайта',

lang/en/lang.php

@@ -63,7 +63,7 @@ fields:
         size: large
         span: full
 
-    meta_available_tags:
+    _meta_available_tags:
         tab: webmaxx.seo::lang.models.meta.tabs.seo_meta
         type: partial
         path: $/webmaxx/seo/models/meta/_field_available_tags.htm
@@ -113,7 +113,7 @@ fields:
         size: large
         span: full
 
-    og_available_tags:
+    _og_available_tags:
         tab: webmaxx.seo::lang.models.meta.tabs.seo_og
         type: partial
         path: $/webmaxx/seo/models/meta/_field_available_tags.htm
@@ -129,3 +129,9 @@ fields:
         language: html
         size: giant
         span: full
+
+    _microdata_available_tags:
+        tab: webmaxx.seo::lang.models.meta.tabs.seo_microdata
+        type: partial
+        path: $/webmaxx/seo/models/meta/_field_available_tags.htm
+        span: full