From 299b3208e6ebc603e86fe1700fa2556a58b250fc Mon Sep 17 00:00:00 2001
From: "ivan.hrytsai" <ivan.hrytsai@magefan.com>
Date: Tue, 18 Feb 2025 17:29:22 +0200
Subject: [PATCH 1/2] 11873-Move-All-Form-Options-From-Plus-And-Extra-To-Basic

---
 Block/Adminhtml/Post/RelatedProductsRule.php  | 200 ++++++++++++
 Model/Config/Source/Authors.php               |  73 +++++
 Model/Config/Source/CustomerGroups.php        |  60 ++++
 Model/Config/Source/NoYes.php                 |  40 +++
 Model/Config/Source/PostsSortBy.php           |  12 +
 etc/di.xml                                    | 154 +++++++++
 view/adminhtml/layout/blog_category_edit.xml  |   3 +
 view/adminhtml/layout/blog_post_edit.xml      |   3 +
 view/adminhtml/layout/blog_tag_edit.xml       |   3 +
 .../templates/form/versionsManager.phtml      | 146 +++++++++
 .../ui_component/blog_category_form.xml       | 297 ++++++++++++++++++
 .../adminhtml/ui_component/blog_post_form.xml | 244 ++++++++++++++
 view/adminhtml/ui_component/blog_tag_form.xml |  60 ++++
 .../js/components/url-key-handle-changes.js   |  44 +++
 14 files changed, 1339 insertions(+)
 create mode 100644 Block/Adminhtml/Post/RelatedProductsRule.php
 create mode 100755 Model/Config/Source/Authors.php
 create mode 100644 Model/Config/Source/CustomerGroups.php
 create mode 100644 Model/Config/Source/NoYes.php
 create mode 100644 view/adminhtml/templates/form/versionsManager.phtml
 create mode 100644 view/adminhtml/web/js/components/url-key-handle-changes.js

diff --git a/Block/Adminhtml/Post/RelatedProductsRule.php b/Block/Adminhtml/Post/RelatedProductsRule.php
new file mode 100644
index 00000000..ffc4decd
--- /dev/null
+++ b/Block/Adminhtml/Post/RelatedProductsRule.php
@@ -0,0 +1,200 @@
+<?php
+/**
+ * Copyright © Magefan (support@magefan.com). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ */
+
+namespace Magefan\Blog\Block\Adminhtml\Post;
+
+class RelatedProductsRule extends \Magento\Backend\Block\Widget\Form\Generic implements
+    \Magento\Ui\Component\Layout\Tabs\TabInterface
+{
+    /**
+     * Core registry
+     *
+     * @var \Magento\Backend\Block\Widget\Form\Renderer\Fieldset
+     */
+    protected $rendererFieldset;
+
+    /**
+     * @var \Magento\Rule\Block\Conditions
+     */
+    protected $conditions;
+
+    /**
+     * @var string
+     */
+    protected $_nameInLayout = 'conditions_apply_to';
+
+    protected $ruleFactory;
+
+    public function __construct(
+        \Magento\Backend\Block\Template\Context $context,
+        \Magento\Framework\Registry $registry,
+        \Magento\Framework\Data\FormFactory $formFactory,
+        \Magento\Rule\Block\Conditions $conditions,
+        \Magento\Backend\Block\Widget\Form\Renderer\Fieldset $rendererFieldset,
+        \Magento\CatalogRule\Model\RuleFactory $ruleFactory,
+        array $data = []
+    ) {
+        $this->rendererFieldset = $rendererFieldset;
+        $this->conditions = $conditions;
+        $this->ruleFactory = $ruleFactory;
+        parent::__construct($context, $registry, $formFactory, $data);
+    }
+
+    /**
+     * {@inheritdoc}
+     * @codeCoverageIgnore
+     */
+    public function getTabClass()
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabUrl()
+    {
+        return null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isAjaxLoaded()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabLabel()
+    {
+        return __('Conditions');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getTabTitle()
+    {
+        return __('Conditions');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function canShowTab()
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isHidden()
+    {
+        return false;
+    }
+
+    /**
+     * Prepare form before rendering HTML
+     *
+     * @return $this
+     */
+    protected function _prepareForm()
+    {
+        $model = $this->_coreRegistry->registry(\Magento\SalesRule\Model\RegistryConstants::CURRENT_SALES_RULE);
+        $form = $this->addTabToForm($model);
+        $this->setForm($form);
+
+        return parent::_prepareForm();
+    }
+
+    /**
+     * Handles addition of conditions tab to supplied form.
+     *
+     * @param \Magento\SalesRule\Model\Rule $model
+     * @param string $fieldsetId
+     * @param string $formName
+     * @return \Magento\Framework\Data\Form
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    protected function addTabToForm($model, $fieldsetId = 'rp_conditions_serialized_fieldset', $formName = 'blog_post_form')
+    {
+
+        $model   = $this->_coreRegistry->registry('current_model');
+        $rule = $this->ruleFactory->create();
+        $rule->setData('conditions_serialized', $model->getData('rp_conditions_serialized'));
+        $model = $rule;
+        $conditionsFieldSetId = $model->getConditionsFieldSetId($formName);
+        $newChildUrl = $this->getUrl(
+            'sales_rule/promo_quote/newConditionHtml/form/' . $conditionsFieldSetId,
+            ['form_namespace' => $formName]
+        );
+
+        /** @var \Magento\Framework\Data\Form $form */
+        $form = $this->_formFactory->create();
+        $form->setHtmlIdPrefix('rule_');
+        $renderer = $this->rendererFieldset->setTemplate(
+            'Magento_CatalogRule::promo/fieldset.phtml'
+        )->setNameInLayout(
+            'rp_condition_block'
+        )->setNewChildUrl(
+            $newChildUrl
+        )->setFieldSetId(
+            $conditionsFieldSetId
+        );
+
+        $fieldset = $form->addFieldset(
+            $fieldsetId,
+            [
+                'legend' => __(
+                    'Apply the rule only if the following conditions are met (leave blank to disable rule conditions).'
+                )
+            ]
+        )->setRenderer(
+            $renderer
+        );
+        $fieldset->addField(
+            'rp_conditions_serialized',
+            'text',
+            [
+                'name'           => 'rp_conditions_serialized',
+                'label'          => __('Conditions'),
+                'title'          => __('Conditions'),
+                'required'       => true,
+                'data-form-part' => $formName
+            ]
+        )->setRule(
+            $model
+        )->setRenderer(
+            $this->conditions
+        );
+
+        $form->setValues($model->getData());
+        $this->setConditionFormName($model->getConditions(), $formName);
+
+        return $form;
+    }
+
+    /**
+     * Handles addition of form name to condition and its conditions.
+     *
+     * @param \Magento\Rule\Model\Condition\AbstractCondition $conditions
+     * @param string $formName
+     * @return void
+     */
+    private function setConditionFormName(\Magento\Rule\Model\Condition\AbstractCondition $conditions, $formName)
+    {
+        $conditions->setFormName($formName);
+        if ($conditions->getConditions() && is_array($conditions->getConditions())) {
+            foreach ($conditions->getConditions() as $condition) {
+                $this->setConditionFormName($condition, $formName);
+            }
+        }
+    }
+}
diff --git a/Model/Config/Source/Authors.php b/Model/Config/Source/Authors.php
new file mode 100755
index 00000000..234abe7d
--- /dev/null
+++ b/Model/Config/Source/Authors.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * Copyright © Magefan (support@magefan.com). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ *
+ * Glory to Ukraine! Glory to the heroes!
+ */
+
+namespace Magefan\Blog\Model\Config\Source;
+
+/**
+ * Authors list
+ *
+ */
+class Authors implements \Magento\Framework\Option\ArrayInterface
+{
+    /**
+     * @var \Magento\User\Model\ResourceModel\User\CollectionFactory
+     */
+    protected $authorCollectionFactory;
+
+    /**
+     * @var array
+     */
+    protected $options;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param \Magefan\Blog\Api\AuthorCollectionInterfaceFactory $authorCollectionFactory
+     * @param void
+     */
+    public function __construct(
+        \Magefan\Blog\Api\AuthorCollectionInterfaceFactory  $authorCollectionFactory
+    ) {
+        $this->authorCollectionFactory = $authorCollectionFactory;
+    }
+
+    /**
+     * Options getter
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        if ($this->options === null) {
+            $collection = $this->authorCollectionFactory->create();
+
+            foreach ($collection as $item) {
+                $this->options[] = [
+                    'label' => $item->getName(),
+                    'value' => $item->getId(),
+                ];
+            }
+        }
+
+        return $this->options;
+    }
+
+    /**
+     * Get options in "key-value" format
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        $array = [];
+        foreach ($this->toOptionArray() as $item) {
+            $array[$item['value']] = $item['label'];
+        }
+        return $array;
+    }
+}
diff --git a/Model/Config/Source/CustomerGroups.php b/Model/Config/Source/CustomerGroups.php
new file mode 100644
index 00000000..5bf45dc3
--- /dev/null
+++ b/Model/Config/Source/CustomerGroups.php
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Copyright © Magefan (support@magefan.com). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ */
+
+namespace Magefan\Blog\Model\Config\Source;
+
+/**
+ * Class CustomerGroup
+ */
+class CustomerGroups implements \Magento\Framework\Data\OptionSourceInterface
+{
+    /**
+     * @var \Magento\Customer\Api\GroupRepositoryInterface
+     */
+    private $groupRepository;
+
+    /**
+     * @var \Magento\Framework\Api\SearchCriteriaBuilder
+     */
+    private $searchCriteriaBuilder;
+
+    /**
+     * @var \Magento\Framework\Convert\DataObject
+     */
+    private $objectConverter;
+
+    /**
+     * @param \Magento\Customer\Api\GroupRepositoryInterface $groupRepository
+     * @param \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param \Magento\Framework\Convert\DataObject $objectConverter
+     */
+    public function __construct(
+        \Magento\Customer\Api\GroupRepositoryInterface $groupRepository,
+        \Magento\Framework\Api\SearchCriteriaBuilder $searchCriteriaBuilder,
+        \Magento\Framework\Convert\DataObject $objectConverter
+    ) {
+        $this->groupRepository = $groupRepository;
+        $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->objectConverter = $objectConverter;
+    }
+
+    /**
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        $customerGroups = $this->groupRepository->getList($this->searchCriteriaBuilder->create())->getItems();
+        $options = $this->objectConverter->toOptionArray($customerGroups, 'id', 'code');
+        foreach ($options as $key => $option) {
+            if (!$option['value']) {
+                $options[$key]['label'] = __('All Groups');
+                break;
+            }
+        }
+
+        return $options;
+    }
+}
diff --git a/Model/Config/Source/NoYes.php b/Model/Config/Source/NoYes.php
new file mode 100644
index 00000000..2ce4a859
--- /dev/null
+++ b/Model/Config/Source/NoYes.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright © Magefan (support@magefan.com). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ */
+
+namespace Magefan\Blog\Model\Config\Source;
+
+class NoYes implements \Magento\Framework\Option\ArrayInterface
+{
+    const ENABLED = 0;
+    const DISABLED = 1;
+
+    /**
+     * Options getter
+     *
+     * @return array
+     */
+    public function toOptionArray()
+    {
+        return [
+            ['value' => self::DISABLED, 'label' => __('No')],
+            ['value' => self::ENABLED, 'label' => __('Yes')],
+        ];
+    }
+
+    /**
+     * Get options in "key-value" format
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        $array = [];
+        foreach ($this->toOptionArray() as $item) {
+            $array[$item['value']] = $item['label'];
+        }
+        return $array;
+    }
+}
diff --git a/Model/Config/Source/PostsSortBy.php b/Model/Config/Source/PostsSortBy.php
index 8efb1bd6..ce960be2 100644
--- a/Model/Config/Source/PostsSortBy.php
+++ b/Model/Config/Source/PostsSortBy.php
@@ -28,6 +28,16 @@ class PostsSortBy implements \Magento\Framework\Option\ArrayInterface
      */
     const TITLE = 2;
 
+    /**
+     * @const int
+     */
+    const END_DATE_ASC = 100;
+
+    /**
+     * @const int
+     */
+    const END_DATE_DESC = 101;
+
     /**
      * Options int
      *
@@ -39,6 +49,8 @@ public function toOptionArray()
             ['value' => self::PUBLISH_DATE, 'label' => __('Publish Date (default)')],
             ['value' => self::POSITION, 'label' => __('Position')],
             ['value' => self::TITLE, 'label' => __('Title')],
+            ['value' => self::END_DATE_ASC, 'label' => __('End Date - Ascending orde - Blog Extra')],
+            ['value' => self::END_DATE_DESC, 'label' => __('End Date - Descending order - Blog Extra')]
         ];
     }
 
diff --git a/etc/di.xml b/etc/di.xml
index 9f1610d2..3ceb1e74 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -88,6 +88,133 @@
                         <item name="value" xsi:type="string">list-modern</item>
                         <item name="template" xsi:type="string">Magefan_Blog::post/list-modern.phtml</item>
                     </item>
+                    <item name="block-0-1-full" xsi:type="array">
+                        <item name="label" xsi:type="string">block-0-1-full - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-0-1-full</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-0-1-full.phtml</item>
+                    </item>
+                    <item name="block-0-2-full" xsi:type="array">
+                        <item name="label" xsi:type="string">block-0-2-full - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-0-2-full</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-0-2-full.phtml</item>
+                    </item>
+                    <item name="block-0-4-full" xsi:type="array">
+                        <item name="label" xsi:type="string">block-0-4-row-full - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-0-4-row-full</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-0-4-row-full.phtml</item>
+                    </item>
+                    <item name="block-0-5-full" xsi:type="array">
+                        <item name="label" xsi:type="string">block-0-5-full - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-0-5-full</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-0-5-full.phtml</item>
+                    </item>
+                    <item name="block-0-6-full" xsi:type="array">
+                        <item name="label" xsi:type="string">block-0-6-full - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-0-6-full</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-0-6-full.phtml</item>
+                    </item>
+                    <item name="block-1-1-full" xsi:type="array">
+                        <item name="label" xsi:type="string">block-1-1-full - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-1-1-full</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-1-1-full.phtml</item>
+                    </item>
+                    <item name="block-1-2-full" xsi:type="array">
+                        <item name="label" xsi:type="string">block-1-2-full - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-1-2-full</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-1-2-full.phtml</item>
+                    </item>
+                    <item name="block-1-3-full" xsi:type="array">
+                        <item name="label" xsi:type="string">block-1-3-full - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-1-3-full</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-1-3-full.phtml</item>
+                    </item>
+                    <item name="block-2-1-full" xsi:type="array">
+                        <item name="label" xsi:type="string">block-2-1-full - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-2-1-full</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-2-1-full.phtml</item>
+                    </item>
+                    <item name="block-2-2-full" xsi:type="array">
+                        <item name="label" xsi:type="string">block-2-2-full - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-2-2-full</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-2-2-full.phtml</item>
+                    </item>
+                    <item name="block-2-3" xsi:type="array">
+                        <item name="label" xsi:type="string">block-2-3 - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-2-3</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-2-3.phtml</item>
+                    </item>
+
+                    <item name="block-2-1-shortcontent" xsi:type="array">
+                        <item name="label" xsi:type="string">block-2-1-shortcontent - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-2-1-shortcontent</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-2-1-shortcontent.phtml</item>
+                    </item>
+                    <item name="block-2-2-shortcontent" xsi:type="array">
+                        <item name="label" xsi:type="string">block-2-2-shortcontent - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-2-2-shortcontent</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-2-2-shortcontent.phtml</item>
+                    </item>
+                    <item name="block-2-3-shortcontent" xsi:type="array">
+                        <item name="label" xsi:type="string">block-2-3-shortcontent - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-2-3-shortcontent</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-2-3-shortcontent.phtml</item>
+                    </item>
+
+                    <item name="block-3-1-full" xsi:type="array">
+                        <item name="label" xsi:type="string">block-3-1-full - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-3-1-full</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-3-1-full.phtml</item>
+                    </item>
+                    <item name="block-3-2" xsi:type="array">
+                        <item name="label" xsi:type="string">block-3-2 - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-3-2</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-3-2.phtml</item>
+                    </item>
+                    <item name="block-3-3" xsi:type="array">
+                        <item name="label" xsi:type="string">block-3-3 - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-3-3</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-3-3.phtml</item>
+                    </item>
+                    <item name="block-3-4" xsi:type="array">
+                        <item name="label" xsi:type="string">block-3-4 - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-3-4</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-3-4-full.phtml</item>
+                    </item>
+                    <item name="block-3-5" xsi:type="array">
+                        <item name="label" xsi:type="string">block-3-5 - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-3-5</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-3-5-full.phtml</item>
+                    </item>
+                    <item name="block-3-6" xsi:type="array">
+                        <item name="label" xsi:type="string">block-3-6 - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-3-6</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-3-6.phtml</item>
+                    </item>
+                    <item name="block-4-1" xsi:type="array">
+                        <item name="label" xsi:type="string">block-4-1 - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-4-1</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-4-1.phtml</item>
+                    </item>
+                    <item name="block-4-2-full" xsi:type="array">
+                        <item name="label" xsi:type="string">block-4-2-full - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-4-2-full</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-4-2-full.phtml</item>
+                    </item>
+                    <item name="block-5-1-full" xsi:type="array">
+                        <item name="label" xsi:type="string">block-5-1-full - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-5-1-full</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-5-1-full.phtml</item>
+                    </item>
+                    <item name="block-5-2" xsi:type="array">
+                        <item name="label" xsi:type="string">block-5-2 - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-5-2</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-5-2.phtml</item>
+                    </item>
+                    <item name="block-5-3" xsi:type="array">
+                        <item name="label" xsi:type="string">block-5-3 - Blog Extra</item>
+                        <item name="value" xsi:type="string">block-5-3</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/block-5-3.phtml</item>
+                    </item>
                 </item>
                 <item name="blog_post_view" xsi:type="array">
                     <item name="default" xsi:type="array">
@@ -119,6 +246,11 @@
                         <item name="value" xsi:type="string"></item>
                         <item name="template" xsi:type="string"></item>
                     </item>
+                    <item name="modern" xsi:type="array">
+                        <item name="label" xsi:type="string">Modern - Blog Extra</item>
+                        <item name="value" xsi:type="string">modern</item>
+                    <item name="template" xsi:type="string">Magefan_BlogExtra::post/view/relatedposts-modern.phtml</item>
+                </item>
                 </item>
                 <item name="blog_post_sidebar_posts" xsi:type="array">
                     <item name="default" xsi:type="array">
@@ -126,6 +258,28 @@
                         <item name="value" xsi:type="string"></item>
                         <item name="template" xsi:type="string"></item>
                     </item>
+                    <item name="carousel" xsi:type="array">
+                        <item name="label" xsi:type="string">Carousel Slider - Blog Extra</item>
+                        <item name="value" xsi:type="string">carousel</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/list/carousel-slider.phtml</item>
+                    </item>
+                    <item name="modern" xsi:type="array">
+                        <item name="label" xsi:type="string">Modern - Blog Extra</item>
+                        <item name="value" xsi:type="string">modern</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::sidebar/recent-modern.phtml</item>
+                    </item>
+                </item>
+                <item name="blog_post_view_latest_from_category" xsi:type="array">
+                    <item name="default" xsi:type="array">
+                        <item name="label" xsi:type="string">Use System Settings</item>
+                        <item name="value" xsi:type="string"></item>
+                        <item name="template" xsi:type="string"></item>
+                    </item>
+                    <item name="modern" xsi:type="array">
+                        <item name="label" xsi:type="string">Modern - Blog Extra</item>
+                        <item name="value" xsi:type="string">modern</item>
+                        <item name="template" xsi:type="string">Magefan_BlogExtra::post/view/categoryposts-modern.phtml</item>
+                    </item>
                 </item>
             </argument>
         </arguments>
diff --git a/view/adminhtml/layout/blog_category_edit.xml b/view/adminhtml/layout/blog_category_edit.xml
index 417cce40..a3fa0432 100644
--- a/view/adminhtml/layout/blog_category_edit.xml
+++ b/view/adminhtml/layout/blog_category_edit.xml
@@ -12,6 +12,9 @@
     <update handle="editor"/>
     <update handle="blog_update_info"/>
     <body>
+        <referenceContainer name="after.body.start">
+            <block name="mf_versions" template="Magefan_Blog::form/versionsManager.phtml"/>
+        </referenceContainer>
         <referenceContainer name="content">
             <uiComponent name="blog_category_form"/>
             <block name="mfblog.tmp.fix" template="Magefan_Blog::admin_grid_issue.phtml" />
diff --git a/view/adminhtml/layout/blog_post_edit.xml b/view/adminhtml/layout/blog_post_edit.xml
index bd59d1a2..da6078ad 100644
--- a/view/adminhtml/layout/blog_post_edit.xml
+++ b/view/adminhtml/layout/blog_post_edit.xml
@@ -16,6 +16,9 @@
     <update handle="editor"/>
     <update handle="blog_update_info"/>
     <body>
+        <referenceContainer name="after.body.start">
+            <block name="mf_versions" template="Magefan_Blog::form/versionsManager.phtml"/>
+        </referenceContainer>
         <referenceContainer name="content">
             <uiComponent name="blog_post_form"/>
             <block class="Magefan\Blog\Block\Adminhtml\Post\Tag\Autocomplete" name="post.tag.autocomplete" template="Magefan_Blog::post/tag/autocomplete.phtml" />
diff --git a/view/adminhtml/layout/blog_tag_edit.xml b/view/adminhtml/layout/blog_tag_edit.xml
index 93ecaca1..6697199a 100644
--- a/view/adminhtml/layout/blog_tag_edit.xml
+++ b/view/adminhtml/layout/blog_tag_edit.xml
@@ -12,6 +12,9 @@
     <update handle="editor"/>
     <update handle="blog_update_info"/>
     <body>
+        <referenceContainer name="after.body.start">
+            <block name="mf_versions" template="Magefan_Blog::form/versionsManager.phtml"/>
+        </referenceContainer>
         <referenceContainer name="content">
             <uiComponent name="blog_tag_form"/>
         </referenceContainer>
diff --git a/view/adminhtml/templates/form/versionsManager.phtml b/view/adminhtml/templates/form/versionsManager.phtml
new file mode 100644
index 00000000..981effc3
--- /dev/null
+++ b/view/adminhtml/templates/form/versionsManager.phtml
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Copyright © Magefan (support@magefan.com). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ */
+
+/**
+ * @var \Magento\Framework\Escaper $escaper
+ *  @var $mfSecureRenderer \Magefan\Community\Api\SecureHtmlRendererInterface
+ */
+?>
+<?php $script = ''; ?>
+
+<?php
+$objectManager = \Magento\Framework\App\ObjectManager::getInstance();
+$getModuleVersion = $objectManager->get(\Magefan\Community\Api\GetModuleVersionInterface::class);
+
+$currentPlan = 'Basic';
+
+if ($getModuleVersion->execute('Magefan_BlogExtra')) {
+    return;
+} elseif ($getModuleVersion->execute('Magefan_BlogPlus')) {
+    $currentPlan = 'Plus';
+}
+?>
+
+<?php
+$script .= "
+    var versionsManager = {
+        _currentPlan: '" . $currentPlan . "',
+        _selector: {
+            'Extra': [
+                '[name=\"end_time\"]',
+                '[data-index=\"coauthors\"]',
+                '[name=\"posts_sort_by\"]',
+                '[name=\"posts_list_template\"]'
+            ],";
+
+if ($currentPlan != 'Plus') {
+    $script .= "
+            'Plus': [
+                '[name=\"publish_time\"]',
+                '[data-index=\"groups\"]',//
+                '[name=\"featured_list_img_alt\"]',
+                '[data-index=\"enable_comments\"]',//
+                '[name=\"url_key_create_redirect\"]',
+                '[upload-area-id=\"featured_list_img\"]',
+                '#blog_post_formrule_conditions_fieldset_',
+                '[data-index=\"display_on_product\"]',
+                '[data-index=\"display_on_post\"]',
+                '[data-index=\"auto_related\"]',
+                '[data-index=\"related_by_rule\"]',
+                '[data-index=\"bottom_content\"]',
+                '.admin__fieldset-section.category',
+                '[upload-area-id=\"category_img\"]',
+                '[upload-area-id=\"tag_img\"]',
+                '[name=\"category_img_alt\"]',
+                '[name=\"tag_img_alt\"]'
+            ]";
+}
+
+$script .= "
+        },
+
+        initListener: function () {
+            var uploadElements = [
+                '[upload-area-id=\"featured_list_img\"]',
+                '[upload-area-id=\"category_img\"]',
+                '[upload-area-id=\"tag_img\"]'
+            ];
+            const observer = new MutationObserver(mutations => {
+                mutations.forEach(mutation => {
+                    for (let plan in versionsManager._selector) {
+                        let planFeatures = versionsManager._selector[plan];
+
+                        planFeatures.forEach(selector => {
+                            var elements = document.querySelectorAll(selector);
+                            if (elements.length > 0) {
+                                elements.forEach(element => {
+
+                                    if (uploadElements.includes(selector)) {
+                                        const clonedElement = element.cloneNode(true);
+                                        element.parentNode.replaceChild(clonedElement, element);
+                                        element = clonedElement;
+                                    }
+                                    const handleEvent = function (event) {
+                                        event.preventDefault();
+                                        event.stopPropagation();
+                                        if (element.tagName === 'SELECT') {
+                                            var selectedOptionText = this.options[this.selectedIndex].text;
+                                            if (selectedOptionText.includes('Blog '+ plan)) {
+                                                versionsManager.showAlert(plan);
+                                                this.selectedIndex = 0;
+                                                this.dispatchEvent(new Event('change', { bubbles: true }));
+                                            }
+                                        } else {
+                                            this.value = '';
+                                            if (versionsManager._currentPlan !== plan) {
+                                                versionsManager.showAlert(plan);
+                                            }
+                                        }
+                                    };
+
+                                    if (element.tagName === 'SELECT') {
+                                        element.addEventListener('change', handleEvent);
+                                    } else {
+                                        element.addEventListener('click', handleEvent);
+                                    }
+                                });
+
+                                versionsManager._selector[plan] = versionsManager._selector[plan].filter(item => item !== selector);
+                            }
+                        });
+                    }
+                });
+            });
+
+            observer.observe(document.body, { childList: true, subtree: true });
+        },
+
+        showAlert: function (extensionPlan) {
+            require(['jquery', 'Magento_Ui/js/modal/alert'], function($, alert) {
+                if (extensionPlan === 'Plus') {
+                    extensionPlan = 'Plus or Extra';
+                }
+                alert({
+                    title: 'You cannot use this option.',
+                    content: 'This feature is available in' + ' <strong>' + extensionPlan + '</strong> plan only.',
+                    buttons: [{
+                        text: 'Upgrade Plan Now',
+                        class: 'action primary accept',
+                        click: function () {
+                            window.open('https://magefan.com');
+                        }
+                    }]
+                });
+            });
+        }
+    };
+
+    versionsManager.initListener();
+
+   ";
+?>
+
+<?= /* @noEscape */ $mfSecureRenderer->renderTag('script', [], $script, false) ?>
\ No newline at end of file
diff --git a/view/adminhtml/ui_component/blog_category_form.xml b/view/adminhtml/ui_component/blog_category_form.xml
index 102a9cfd..a0490f9e 100644
--- a/view/adminhtml/ui_component/blog_category_form.xml
+++ b/view/adminhtml/ui_component/blog_category_form.xml
@@ -322,6 +322,87 @@
                 </item>
             </argument>
         </field>
+        <field name="groups">
+            <argument name="data" xsi:type="array">
+                <item name="options" xsi:type="object">Magefan\Blog\Model\Config\Source\CustomerGroups</item>
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string" translate="true">Visible For Customer Groups (Blog Plus)</item>
+                    <item name="dataType" xsi:type="string">number</item>
+                    <item name="formElement" xsi:type="string">multiselect</item>
+                    <item name="validation" xsi:type="array">
+                        <item name="required-entry" xsi:type="boolean">true</item>
+                    </item>
+                    <item name="source" xsi:type="string">post</item>
+                    <item name="dataScope" xsi:type="string">groups</item>
+                    <item name="default" xsi:type="number">0</item>
+                </item>
+            </argument>
+        </field>
+        <field name="category_img" sortOrder="10" formElement="imageUploader">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="collapsible" xsi:type="boolean">true</item>
+                    <item name="label" xsi:type="string" translate="true">Category Image (Blog Plus)</item>
+                    <item name="sortOrder" xsi:type="number">10</item>
+                    <item name="source" xsi:type="string">magefan_blog_category</item>
+                </item>
+            </argument>
+            <settings>
+                <elementTmpl>ui/form/element/uploader/image</elementTmpl>
+                <dataType>string</dataType>
+                <label translate="true">Category Image (Blog Plus)</label>
+                <visible>true</visible>
+                <required>false</required>
+            </settings>
+            <formElements>
+                <imageUploader>
+                    <settings>
+                        <required>false</required>
+                        <uploaderConfig>
+                            <param xsi:type="url" name="url" path="blogplus/category_upload/categoryImg"/>
+                        </uploaderConfig>
+                        <previewTmpl>Magento_Catalog/image-preview</previewTmpl>
+                        <openDialogTitle>Category Image</openDialogTitle>
+                        <initialMediaGalleryOpenSubpath>magefan_blog</initialMediaGalleryOpenSubpath>
+                        <allowedExtensions>jpg jpeg png</allowedExtensions>
+                        <maxFileSize>4194304</maxFileSize>
+                    </settings>
+                </imageUploader>
+            </formElements>
+        </field>
+        <field name="category_img_alt">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="label" xsi:type="string" translate="true">Category Image Alt (Blog Plus)</item>
+                    <item name="formElement" xsi:type="string">input</item>
+                    <item name="source" xsi:type="string">post</item>
+                    <item name="dataScope" xsi:type="string">category_img_alt</item>
+                    <item name="sortOrder" xsi:type="number">15</item>
+                </item>
+            </argument>
+        </field>
+    </fieldset>
+    <fieldset name="bottom_content">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="collapsible" xsi:type="boolean">true</item>
+                <item name="label" xsi:type="string" translate="true">Bottom Content (Blog Plus)</item>
+                <item name="sortOrder" xsi:type="number">30</item>
+            </item>
+        </argument>
+        <field name="bottom_content">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string"/>
+                    <item name="formElement" xsi:type="string">wysiwyg</item>
+                    <item name="source" xsi:type="string">category</item>
+                    <item name="wysiwyg" xsi:type="boolean">true</item>
+                    <item name="dataScope" xsi:type="string">bottom_content</item>
+                    <item name="additionalClasses" xsi:type="string">admin__field-wide</item>
+                </item>
+            </argument>
+        </field>
     </fieldset>
     <fieldset name="search_engine_optimization">
         <argument name="data" xsi:type="array">
@@ -351,6 +432,22 @@
                     </item>
                 </argument>
             </field>
+            <field name="url_key_create_redirect" component="Magefan_Blog/js/components/url-key-handle-changes" formElement="checkbox">
+                <settings>
+                    <dataType>boolean</dataType>
+                </settings>
+                <formElements>
+                    <checkbox>
+                        <settings>
+                            <description translate="true">Create Permanent Redirect for old URL (Blog Plus)</description>
+                            <valueMap>
+                                <map name="false" xsi:type="number">0</map>
+                                <map name="true" xsi:type="number">1</map>
+                            </valueMap>
+                        </settings>
+                    </checkbox>
+                </formElements>
+            </field>
         </container>
         <field name="meta_title">
             <argument name="data" xsi:type="array">
@@ -524,4 +621,204 @@
             </argument>
         </field>
     </fieldset>
+    <fieldset name="related">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="collapsible" xsi:type="boolean">true</item>
+                <item name="label" xsi:type="string" translate="true">Posts in Category (Blog Extra)</item>
+                <item name="sortOrder" xsi:type="number">45</item>
+            </item>
+        </argument>
+
+        <fieldset name="product">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="collapsible" xsi:type="boolean">false</item>
+                    <item name="label" xsi:type="string" translate="true">Posts</item>
+                    <item name="additionalClasses" xsi:type="string">admin__fieldset-section category</item>
+                    <item name="sortOrder" xsi:type="number">20</item>
+                </item>
+            </argument>
+
+            <container name="button_set">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="label" xsi:type="boolean">false</item>
+                        <item name="content" xsi:type="string" translate="true">Assign posts to the blog category.</item>
+                        <item name="template" xsi:type="string">ui/form/components/complex</item>
+                    </item>
+                </argument>
+                <container name="button_product">
+                    <argument name="data" xsi:type="array">
+                        <item name="config" xsi:type="array">
+                            <item name="title" xsi:type="string" translate="true">Add Posts</item>
+                            <item name="component" xsi:type="string">Magento_Ui/js/form/components/button</item>
+                            <item name="actions" xsi:type="array">
+                                <item name="0" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">blog_category_form.blog_category_form.related.product.modal</item>
+                                    <item name="actionName" xsi:type="string">toggleModal</item>
+                                </item>
+                                <item name="1" xsi:type="array">
+                                    <item name="targetName" xsi:type="string">blog_category_form.blog_category_form.related.product.modal.blog_related_category_listing</item>
+                                    <item name="actionName" xsi:type="string">render</item>
+                                </item>
+                            </item>
+                            <item name="provider" xsi:type="boolean">false</item>
+                        </item>
+                    </argument>
+                </container>
+            </container>
+
+            <modal name="modal">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="dataScope" xsi:type="string"></item>
+                        <item name="component" xsi:type="string">Magento_Ui/js/modal/modal-component</item>
+                        <item name="options" xsi:type="array">
+                            <item name="title" xsi:type="string" translate="true">Add Related Posts</item>
+                            <item name="buttons" xsi:type="array">
+                                <item name="0" xsi:type="array">
+                                    <item name="text" xsi:type="string" translate="true">Cancel</item>
+                                    <item name="actions" xsi:type="array">
+                                        <item name="0" xsi:type="string">closeModal</item>
+                                    </item>
+                                </item>
+                                <item name="1" xsi:type="array">
+                                    <item name="text" xsi:type="string" translate="true">Add Selected Posts</item>
+                                    <item name="class" xsi:type="string">action-primary</item>
+                                    <item name="actions" xsi:type="array">
+                                        <item name="0" xsi:type="array">
+                                            <item name="targetName" xsi:type="string">index=blog_related_category_listing</item>
+                                            <item name="actionName" xsi:type="string">save</item>
+                                        </item>
+                                        <item name="1" xsi:type="string">closeModal</item>
+                                    </item>
+                                </item>
+                            </item>
+                        </item>
+                    </item>
+                </argument>
+                <insertListing name="blog_related_category_listing">
+                    <argument name="data" xsi:type="array">
+                        <item name="config" xsi:type="array">
+                            <item name="autoRender" xsi:type="boolean">false</item>
+                            <item name="dataScope" xsi:type="string">blog_related_post_listing</item>
+                            <item name="externalProvider" xsi:type="string">blog_related_post_listing.blog_related_post_listing_data_source</item>
+                            <item name="selectionsProvider" xsi:type="string">blog_related_post_listing.blog_related_post_listing.post_columns.ids</item>
+                            <item name="ns" xsi:type="string">blog_related_post_listing</item>
+                            <item name="render_url" xsi:type="url" path="mui/index/render" />
+                            <item name="realTimeLink" xsi:type="boolean">true</item>
+                            <item name="dataLinks" xsi:type="array">
+                                <item name="imports" xsi:type="boolean">false</item>
+                                <item name="exports" xsi:type="boolean">true</item>
+                            </item>
+                            <item name="behaviourType" xsi:type="string">simple</item>
+                            <item name="externalFilterMode" xsi:type="boolean">true</item>
+                            <item name="imports" xsi:type="array">
+                                <item name="postId" xsi:type="string">${ $.provider }:data.post.current_post_id</item>
+                            </item>
+                            <item name="exports" xsi:type="array">
+                                <item name="postId" xsi:type="string">${ $.externalProvider }:data.post.current_post_id</item>
+                            </item>
+                            <item name="component" xsi:type="string">Magento_Ui/js/form/components/insert-listing</item>
+                        </item>
+                    </argument>
+                </insertListing>
+            </modal>
+
+            <dynamicRows name="post">
+                <argument name="data" xsi:type="array">
+                    <item name="config" xsi:type="array">
+                        <item name="additionalClasses" xsi:type="string">admin__field-wide</item>
+                        <item name="componentType" xsi:type="string">dynamicRows</item>
+
+                        <item name="label" xsi:type="boolean">false</item>
+                        <item name="columnsHeader" xsi:type="boolean">false</item>
+                        <item name="columnsHeaderAfterRender" xsi:type="boolean">true</item>
+                        <item name="renderDefaultRecord" xsi:type="boolean">false</item>
+                        <item name="template" xsi:type="string">ui/dynamic-rows/templates/grid</item>
+                        <item name="component" xsi:type="string">Magento_Ui/js/dynamic-rows/dynamic-rows-grid</item>
+                        <item name="addButton" xsi:type="boolean">false</item>
+                        <item name="recordTemplate" xsi:type="string">record</item>
+                        <item name="dataScope" xsi:type="string">data.links</item>
+                        <item name="deleteButtonLabel" xsi:type="string" translate="true">Remove</item>
+                        <item name="dataProvider" xsi:type="string">data.blog_related_post_listing</item>
+                        <item name="map" xsi:type="array">
+                            <item name="id" xsi:type="string">post_id</item>
+                            <item name="title" xsi:type="string">title</item>
+                            <item name="status" xsi:type="string">status</item>
+                        </item>
+                        <item name="links" xsi:type="array">
+                            <item name="insertData" xsi:type="string">${ $.provider }:${ $.dataProvider }</item>
+                        </item>
+
+                        <item name="sortOrder" xsi:type="string">2</item>
+                    </item>
+                </argument>
+                <container name="record">
+                    <argument name="data" xsi:type="array">
+                        <item name="config" xsi:type="array">
+                            <item name="isTemplate" xsi:type="boolean">true</item>
+                            <item name="is_collection" xsi:type="boolean">true</item>
+                            <item name="component" xsi:type="string">Magento_Ui/js/dynamic-rows/record</item>
+                            <item name="componentType" xsi:type="string">container</item>
+                            <item name="dataScope" xsi:type="string"></item>
+                        </item>
+                    </argument>
+                    <field name="id">
+                        <argument name="data" xsi:type="array">
+                            <item name="config" xsi:type="array">
+                                <item name="formElement" xsi:type="string">input</item>
+                                <item name="elementTmpl" xsi:type="string">ui/dynamic-rows/cells/text</item>
+                                <item name="component" xsi:type="string">Magento_Ui/js/form/element/text</item>
+                                <item name="dataType" xsi:type="string">text</item>
+                                <item name="dataScope" xsi:type="string">id</item>
+                                <item name="fit" xsi:type="boolean">false</item>
+                                <item name="label" xsi:type="string" translate="true">ID</item>
+                                <item name="sortOrder" xsi:type="string">10</item>
+                            </item>
+                        </argument>
+                    </field>
+                    <field name="title">
+                        <argument name="data" xsi:type="array">
+                            <item name="config" xsi:type="array">
+                                <item name="formElement" xsi:type="string">input</item>
+                                <item name="elementTmpl" xsi:type="string">ui/dynamic-rows/cells/text</item>
+                                <item name="component" xsi:type="string">Magento_Ui/js/form/element/text</item>
+                                <item name="dataType" xsi:type="string">text</item>
+                                <item name="dataScope" xsi:type="string">title</item>
+                                <item name="fit" xsi:type="boolean">false</item>
+                                <item name="label" xsi:type="string" translate="true">Title</item>
+                                <item name="sortOrder" xsi:type="string">20</item>
+                            </item>
+                        </argument>
+                    </field>
+                    <actionDelete name="actionDelete">
+                        <argument name="data" xsi:type="array">
+                            <item name="config" xsi:type="array">
+                                <item name="actionDelete" xsi:type="string">data-grid-actions-cell</item>
+                                <item name="dataType" xsi:type="string">text</item>
+                                <item name="label" xsi:type="string" translate="true">Actions</item>
+                                <item name="fit" xsi:type="boolean">true</item>
+                                <item name="sortOrder" xsi:type="string">80</item>
+                            </item>
+                        </argument>
+                    </actionDelete>
+                    <field name="position">
+                        <argument name="data" xsi:type="array">
+                            <item name="config" xsi:type="array">
+                                <item name="formElement" xsi:type="string">input</item>
+                                <item name="dataType" xsi:type="string">number</item>
+                                <item name="dataScope" xsi:type="string">position</item>
+                                <item name="fit" xsi:type="boolean">true</item>
+                                <item name="label" xsi:type="string" translate="true">Thumbnail</item>
+                                <item name="sortOrder" xsi:type="string">90</item>
+                                <item name="visible" xsi:type="boolean">false</item>
+                            </item>
+                        </argument>
+                    </field>
+                </container>
+            </dynamicRows>
+        </fieldset>
+    </fieldset>
 </form>
diff --git a/view/adminhtml/ui_component/blog_post_form.xml b/view/adminhtml/ui_component/blog_post_form.xml
index 29cb9601..f088ded3 100755
--- a/view/adminhtml/ui_component/blog_post_form.xml
+++ b/view/adminhtml/ui_component/blog_post_form.xml
@@ -287,6 +287,150 @@
                 </item>
             </argument>
         </field>
+        <field name="featured_list_img" formElement="imageUploader">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="collapsible" xsi:type="boolean">true</item>
+                    <item name="label" xsi:type="string" translate="true">Featured List Image (Blog Plus)</item>
+                    <item name="sortOrder" xsi:type="number">16</item>
+                    <item name="source" xsi:type="string">magefan_blog_post</item>
+                </item>
+            </argument>
+            <settings>
+                <elementTmpl>ui/form/element/uploader/image</elementTmpl>
+                <dataType>string</dataType>
+                <label translate="true">Media Gallery (Blog Plus)</label>
+                <visible>true</visible>
+                <required>false</required>
+            </settings>
+            <formElements>
+                <imageUploader>
+                    <settings>
+                        <required>false</required>
+                        <uploaderConfig>
+                            <param xsi:type="url" name="url" path="blogplus/post_upload/featuredListImg"/>
+                        </uploaderConfig>
+                        <previewTmpl>Magento_Catalog/image-preview</previewTmpl>
+                        <openDialogTitle>Featured List Image (Blog Plus)</openDialogTitle>
+                        <initialMediaGalleryOpenSubpath>magefan_blog</initialMediaGalleryOpenSubpath>
+                        <allowedExtensions>jpg jpeg png</allowedExtensions>
+                        <maxFileSize>4194304</maxFileSize>
+                    </settings>
+                </imageUploader>
+            </formElements>
+        </field>
+        <field name="featured_list_img_alt">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="label" xsi:type="string" translate="true">Featured List Image Alt (Blog Plus)</item>
+                    <item name="formElement" xsi:type="string">input</item>
+                    <item name="source" xsi:type="string">post</item>
+                    <item name="dataScope" xsi:type="string">featured_list_img_alt</item>
+                    <item name="sortOrder" xsi:type="number">17</item>
+                </item>
+            </argument>
+        </field>
+        <field name="publish_time">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string" translate="true">Publish Date (Blog Plus)</item>
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="formElement" xsi:type="string">date</item>
+                    <item name="source" xsi:type="string">post</item>
+                    <item name="dataScope" xsi:type="string">publish_time</item>
+                    <item name="sortOrder" xsi:type="number">20</item>
+                    <item name="options" xsi:type="array">
+                        <!--
+                        <item name="dateFormat" xsi:type="string">yyyy-MM-dd</item>
+                        <item name="timeFormat" xsi:type="string">HH:mm:ss</item>
+                        -->
+                        <item name="showsTime" xsi:type="boolean">true</item>
+                    </item>
+                </item>
+            </argument>
+        </field>
+        <field name="groups">
+            <argument name="data" xsi:type="array">
+                <item name="options" xsi:type="object">Magefan\Blog\Model\Config\Source\CustomerGroups</item>
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string" translate="true">Visible For Customer Groups (Blog Plus)</item>
+                    <item name="dataType" xsi:type="string">number</item>
+                    <item name="formElement" xsi:type="string">multiselect</item>
+                    <item name="validation" xsi:type="array">
+                        <item name="required-entry" xsi:type="boolean">true</item>
+                    </item>
+                    <item name="source" xsi:type="string">post</item>
+                    <item name="dataScope" xsi:type="string">groups</item>
+                    <item name="default" xsi:type="number">0</item>
+                </item>
+            </argument>
+        </field>
+        <field name="enable_comments">
+            <argument name="data" xsi:type="array">
+                <item name="options" xsi:type="object">Magento\Config\Model\Config\Source\Yesno</item>
+                <item name="config" xsi:type="array">
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="label" xsi:type="string" translate="true">Enable Comments (Blog Plus)</item>
+                    <item name="formElement" xsi:type="string">select</item>
+                    <item name="dataScope" xsi:type="string">enable_comments</item>
+                    <item name="fit" xsi:type="boolean">true</item>
+                    <item name="default" xsi:type="string">1</item>
+                    <item name="sortOrder" xsi:type="string">65</item>
+                </item>
+            </argument>
+        </field>
+        <field name="end_time">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="label" xsi:type="string" translate="true">End Date (Blog Extra)</item>
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="formElement" xsi:type="string">date</item>
+                    <item name="source" xsi:type="string">post</item>
+                    <item name="dataScope" xsi:type="string">end_time</item>
+                    <item name="sortOrder" xsi:type="number">25</item>
+                    <item name="notice"  xsi:type="string" translate="true">You can set an end date of the publication. The post will not be available for reading after this date.</item>
+                    <item name="options" xsi:type="array">
+                        <item name="showsTime" xsi:type="boolean">true</item>
+                    </item>
+                </item>
+            </argument>
+        </field>
+        <container name="container_coauthors">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="dataScope" xsi:type="string"></item>
+                    <item name="breakLine" xsi:type="boolean">false</item>
+                    <item name="formElement" xsi:type="string">container</item>
+                    <item name="component" xsi:type="string">Magento_Ui/js/form/components/group</item>
+                    <item name="sortOrder" xsi:type="number">34</item>
+                </item>
+            </argument>
+            <field name="coauthors">
+                <argument name="data" xsi:type="array">
+                    <item name="options" xsi:type="object">Magefan\Blog\Model\Config\Source\Authors</item>
+                    <item name="config" xsi:type="array">
+                        <item name="label" xsi:type="string" translate="true">Co-Authors (Blog Extra)</item>
+                        <item name="formElement" xsi:type="string">select</item>
+                        <item name="component" xsi:type="string">Magefan_Blog/js/components/new-category</item>
+                        <item name="elementTmpl" xsi:type="string">ui/grid/filters/elements/ui-select</item>
+                        <item name="dataScope" xsi:type="string">coauthors</item>
+                        <item name="filterOptions" xsi:type="boolean">true</item>
+                        <item name="chipsEnabled" xsi:type="boolean">true</item>
+                        <item name="showCheckbox" xsi:type="boolean">true</item>
+                        <item name="disableLabel" xsi:type="boolean">true</item>
+                        <item name="multiple" xsi:type="boolean">true</item>
+                        <item name="levelsVisibility" xsi:type="number">1</item>
+                        <item name="sortOrder" xsi:type="number">35</item>
+                        <item name="required" xsi:type="boolean">false</item>
+                        <item name="listens" xsi:type="array">
+                            <item name="index=create_category:responseData" xsi:type="string">setParsed</item>
+                            <item name="newOption" xsi:type="string">toggleOptionSelected</item>
+                        </item>
+                    </item>
+                </argument>
+            </field>
+        </container>
         <!--
         <container name="container_tags">
             <argument name="data" xsi:type="array">
@@ -470,6 +614,22 @@
                     </item>
                 </argument>
             </field>
+            <field name="url_key_create_redirect" component="Magefan_Blog/js/components/url-key-handle-changes" formElement="checkbox">
+                <settings>
+                    <dataType>boolean</dataType>
+                </settings>
+                <formElements>
+                    <checkbox>
+                        <settings>
+                            <description translate="true">Create Permanent Redirect for old URL (Blog Plus)</description>
+                            <valueMap>
+                                <map name="false" xsi:type="number">0</map>
+                                <map name="true" xsi:type="number">1</map>
+                            </valueMap>
+                        </settings>
+                    </checkbox>
+                </formElements>
+            </field>
         </container>
         <field name="meta_title">
             <argument name="data" xsi:type="array">
@@ -848,6 +1008,20 @@
                             </item>
                         </argument>
                     </field>
+                    <field name="auto_related">
+                        <argument name="data" xsi:type="array">
+                            <item name="options" xsi:type="object">Magento\Config\Model\Config\Source\Yesno</item>
+                            <item name="config" xsi:type="array">
+                                <item name="dataType" xsi:type="string">text</item>
+                                <item name="label" xsi:type="string" translate="true">Auto Related (Blog Plus)</item>
+                                <item name="formElement" xsi:type="string">select</item>
+                                <item name="dataScope" xsi:type="string">auto_related</item>
+                                <item name="fit" xsi:type="boolean">true</item>
+                                <item name="default" xsi:type="string">0</item>
+                                <item name="sortOrder" xsi:type="string">33</item>
+                            </item>
+                        </argument>
+                    </field>
                 </container>
             </dynamicRows>
         </fieldset>
@@ -1039,10 +1213,80 @@
                             </item>
                         </argument>
                     </field>
+                    <field name="display_on_product">
+                        <argument name="data" xsi:type="array">
+                            <item name="options" xsi:type="object">Magefan\Blog\Model\Config\Source\NoYes</item>
+                            <item name="config" xsi:type="array">
+                                <item name="dataType" xsi:type="string">text</item>
+                                <item name="label" xsi:type="string" translate="true">Display Post On Product Page (Blog Plus)</item>
+                                <item name="formElement" xsi:type="string">select</item>
+                                <item name="dataScope" xsi:type="string">display_on_product</item>
+                                <item name="fit" xsi:type="boolean">true</item>
+                                <item name="default" xsi:type="string">0</item>
+                                <item name="sortOrder" xsi:type="string">31</item>
+                            </item>
+                        </argument>
+                    </field>
+                    <field name="display_on_post">
+                        <argument name="data" xsi:type="array">
+                            <item name="options" xsi:type="object">Magefan\Blog\Model\Config\Source\NoYes</item>
+                            <item name="config" xsi:type="array">
+                                <item name="dataType" xsi:type="string">text</item>
+                                <item name="label" xsi:type="string" translate="true">Display Product On Post Page (Blog Plus)</item>
+                                <item name="formElement" xsi:type="string">select</item>
+                                <item name="dataScope" xsi:type="string">display_on_post</item>
+                                <item name="fit" xsi:type="boolean">true</item>
+                                <item name="default" xsi:type="string">0</item>
+                                <item name="sortOrder" xsi:type="string">32</item>
+                            </item>
+                        </argument>
+                    </field>
+                    <field name="auto_related">
+                        <argument name="data" xsi:type="array">
+                            <item name="options" xsi:type="object">Magento\Config\Model\Config\Source\Yesno</item>
+                            <item name="config" xsi:type="array">
+                                <item name="dataType" xsi:type="string">text</item>
+                                <item name="label" xsi:type="string" translate="true">Auto Related (Blog Plus)</item>
+                                <item name="formElement" xsi:type="string">select</item>
+                                <item name="dataScope" xsi:type="string">auto_related</item>
+                                <item name="fit" xsi:type="boolean">true</item>
+                                <item name="default" xsi:type="string">0</item>
+                                <item name="sortOrder" xsi:type="string">33</item>
+                            </item>
+                        </argument>
+                    </field>
+                    <field name="related_by_rule">
+                        <argument name="data" xsi:type="array">
+                            <item name="options" xsi:type="object">Magento\Config\Model\Config\Source\Yesno</item>
+                            <item name="config" xsi:type="array">
+                                <item name="dataType" xsi:type="string">text</item>
+                                <item name="label" xsi:type="string" translate="true">Related By Rule (Blog Plus)</item>
+                                <item name="formElement" xsi:type="string">select</item>
+                                <item name="dataScope" xsi:type="string">related_by_rule</item>
+                                <item name="fit" xsi:type="boolean">true</item>
+                                <item name="default" xsi:type="string">0</item>
+                                <item name="sortOrder" xsi:type="string">34</item>
+                            </item>
+                        </argument>
+                    </field>
                 </container>
             </dynamicRows>
         </fieldset>
     </fieldset>
+    <fieldset name="rp_conditions_serialized" sortOrder="60">
+        <argument name="data" xsi:type="array">
+            <item name="config" xsi:type="array">
+                <item name="label" xsi:type="string" translate="true">Related Product Rules (Blog Plus)</item>
+                <item name="collapsible" xsi:type="boolean">true</item>
+                <item name="sortOrder" xsi:type="number">59</item>
+            </item>
+        </argument>
+        <container name="conditions_apply_to" sortOrder="10">
+            <htmlContent name="html_content">
+                <argument name="block" xsi:type="object">Magefan\Blog\Block\Adminhtml\Post\RelatedProductsRule</argument>
+            </htmlContent>
+        </container>
+    </fieldset>
     <fieldset name="design">
         <argument name="data" xsi:type="array">
             <item name="config" xsi:type="array">
diff --git a/view/adminhtml/ui_component/blog_tag_form.xml b/view/adminhtml/ui_component/blog_tag_form.xml
index dabfe9b8..58d567e8 100644
--- a/view/adminhtml/ui_component/blog_tag_form.xml
+++ b/view/adminhtml/ui_component/blog_tag_form.xml
@@ -142,6 +142,50 @@
                 </item>
             </argument>
         </field>
+        <field name="tag_img" sortOrder="10" formElement="imageUploader">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="collapsible" xsi:type="boolean">true</item>
+                    <item name="label" xsi:type="string" translate="true">Tag Image (Blog+)</item>
+                    <item name="sortOrder" xsi:type="number">10</item>
+                    <item name="source" xsi:type="string">magefan_blog_tag</item>
+                </item>
+            </argument>
+            <settings>
+                <elementTmpl>ui/form/element/uploader/image</elementTmpl>
+                <dataType>string</dataType>
+                <label translate="true">Tag Image (Blog+)</label>
+                <visible>true</visible>
+                <required>false</required>
+            </settings>
+            <formElements>
+                <imageUploader>
+                    <settings>
+                        <required>false</required>
+                        <uploaderConfig>
+                            <param xsi:type="url" name="url" path="blogplus/tag_upload/tagImg"/>
+                        </uploaderConfig>
+                        <previewTmpl>Magento_Catalog/image-preview</previewTmpl>
+                        <openDialogTitle>Tag Image</openDialogTitle>
+                        <initialMediaGalleryOpenSubpath>magefan_blog</initialMediaGalleryOpenSubpath>
+                        <allowedExtensions>jpg jpeg png</allowedExtensions>
+                        <maxFileSize>4194304</maxFileSize>
+                    </settings>
+                </imageUploader>
+            </formElements>
+        </field>
+        <field name="tag_img_alt">
+            <argument name="data" xsi:type="array">
+                <item name="config" xsi:type="array">
+                    <item name="dataType" xsi:type="string">text</item>
+                    <item name="label" xsi:type="string" translate="true">Tag Image Alt (Blog+)</item>
+                    <item name="formElement" xsi:type="string">input</item>
+                    <item name="source" xsi:type="string">post</item>
+                    <item name="dataScope" xsi:type="string">tag_img_alt</item>
+                    <item name="sortOrder" xsi:type="number">15</item>
+                </item>
+            </argument>
+        </field>
     </fieldset>
     <fieldset name="search_engine_optimization">
         <argument name="data" xsi:type="array">
@@ -171,6 +215,22 @@
                     </item>
                 </argument>
             </field>
+            <field name="url_key_create_redirect" component="Magefan_Blog/js/components/url-key-handle-changes" formElement="checkbox">
+                <settings>
+                    <dataType>boolean</dataType>
+                </settings>
+                <formElements>
+                    <checkbox>
+                        <settings>
+                            <description translate="true">Create Permanent Redirect for old URL (Blog Plus)</description>
+                            <valueMap>
+                                <map name="false" xsi:type="number">0</map>
+                                <map name="true" xsi:type="number">1</map>
+                            </valueMap>
+                        </settings>
+                    </checkbox>
+                </formElements>
+            </field>
         </container>
         <field name="meta_title">
             <argument name="data" xsi:type="array">
diff --git a/view/adminhtml/web/js/components/url-key-handle-changes.js b/view/adminhtml/web/js/components/url-key-handle-changes.js
new file mode 100644
index 00000000..fdf85961
--- /dev/null
+++ b/view/adminhtml/web/js/components/url-key-handle-changes.js
@@ -0,0 +1,44 @@
+/**
+ * Copyright © Magefan (support@magefan.com). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ */
+
+/**
+ * @api
+ */
+define([
+    'Magento_Ui/js/form/element/single-checkbox'
+], function (Checkbox) {
+    'use strict';
+
+    return Checkbox.extend({
+        defaults: {
+            imports: {
+                identifier: '${ $.provider }:data.identifier'
+            },
+            listens: {
+                identifier: 'handleChanges'
+            },
+        },
+
+        /**
+         * Disable checkbox field, when 'identifier' field without changes or 'use default' field is checked
+         */
+        handleChanges: function (newValue) {
+            if (!this.initValue) {
+                this.initValue = newValue;
+                this.disabled(1);
+            } else {
+                var disabled = (newValue === this.initValue);
+                this.disabled(disabled);
+                if (disabled) {
+                    this.checked(false);
+                    this.value("0");
+                } /* else {
+                    this.checked(1);
+                    this.value("1");
+                } */
+            }
+        },
+    });
+});

From 2d3626852aa20c8efdd105ddc5feacfb6329e21d Mon Sep 17 00:00:00 2001
From: "ivan.hrytsai" <ivan.hrytsai@magefan.com>
Date: Wed, 19 Feb 2025 09:28:38 +0200
Subject: [PATCH 2/2] 11873-Move-All-Form-Options-From-Plus-And-Extra-To-Basic

---
 view/adminhtml/templates/form/versionsManager.phtml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/view/adminhtml/templates/form/versionsManager.phtml b/view/adminhtml/templates/form/versionsManager.phtml
index 981effc3..8d3d9fd2 100644
--- a/view/adminhtml/templates/form/versionsManager.phtml
+++ b/view/adminhtml/templates/form/versionsManager.phtml
@@ -33,7 +33,8 @@ $script .= "
                 '[name=\"end_time\"]',
                 '[data-index=\"coauthors\"]',
                 '[name=\"posts_sort_by\"]',
-                '[name=\"posts_list_template\"]'
+                '[name=\"posts_list_template\"]',
+                '.admin__fieldset-section.category [data-index=\"button_product\"]'
             ],";
 
 if ($currentPlan != 'Plus') {
@@ -50,8 +51,7 @@ if ($currentPlan != 'Plus') {
                 '[data-index=\"display_on_post\"]',
                 '[data-index=\"auto_related\"]',
                 '[data-index=\"related_by_rule\"]',
-                '[data-index=\"bottom_content\"]',
-                '.admin__fieldset-section.category',
+                '[data-index=\"bottom_content\"]'
                 '[upload-area-id=\"category_img\"]',
                 '[upload-area-id=\"tag_img\"]',
                 '[name=\"category_img_alt\"]',
@@ -66,7 +66,8 @@ $script .= "
             var uploadElements = [
                 '[upload-area-id=\"featured_list_img\"]',
                 '[upload-area-id=\"category_img\"]',
-                '[upload-area-id=\"tag_img\"]'
+                '[upload-area-id=\"tag_img\"]',
+                '.admin__fieldset-section.category [data-index=\"button_product\"]'
             ];
             const observer = new MutationObserver(mutations => {
                 mutations.forEach(mutation => {