Merge pull request #69 from mooore-digital/develop

Develop
mooore-digital · Jan 24, 2022 · 59ebb7f · 59ebb7f
2 parents c7c1cbd + 524fa66
commit 59ebb7f
Show file tree

Hide file tree

Showing 16 changed files with 248 additions and 177 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.8.8] - 2022-01-24
+### Added
+- noindex and nocookie pages now support WPCI pages and style
+
+### Fixed
+- Cleanup code by improving formatting
+
 ## [0.8.7] - 2022-01-11
 ### Fixed
 - Resolved wrongly fixed merge conflict

diff --git a/Observer/LayoutLoadBefore.php b/Observer/LayoutLoadBefore.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Mooore\WordpressIntegrationCms\Observer;
 
 use Magento\Cms\Model\Page;
@@ -12,6 +14,16 @@
 
 class LayoutLoadBefore implements ObserverInterface
 {
+    // TODO: check if contact_index_index is used with CMS pages, if so, add the following code
+    const DISALLOWED_PAGES = [
+        'cms_page_view',
+        'cms_index_index',
+    ];
+
+    const ALLOWED_PAGES = [
+        'cms_index_noroute',
+        'cms_index_nocookies',
+    ];
     /**
      * @var Http
      */
@@ -40,7 +52,7 @@ public function execute(Observer $observer)
     {
         $action = $observer->getData('full_action_name');
 
-        if ($action !== 'cms_page_view' && $action !== 'cms_index_index') {
+        if (!in_array($action, self::DISALLOWED_PAGES) && in_array($action, self::ALLOWED_PAGES)) {
             return;
         }
 

diff --git a/etc/adminhtml/di.xml b/etc/adminhtml/di.xml
@@ -1,16 +1,26 @@
 <?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+<config
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Cms\Model\PageRepository">
-        <plugin sortOrder="1" name="moooreWordpressIntegrationCmsPostUrlToWordpress"
-                type="Mooore\WordpressIntegrationCms\Plugin\Model\SavePlugin"/>
+        <plugin
+            sortOrder="1"
+            name="moooreWordpressIntegrationCmsPostUrlToWordpress"
+            type="Mooore\WordpressIntegrationCms\Plugin\Model\SavePlugin"
+        />
     </type>
     <type name="Magento\Cms\Controller\Adminhtml\Page\Delete">
-        <plugin sortOrder="1" name="moooreWordpressIntegrationCmsDeleteUrlToWordpress"
-                type="Mooore\WordpressIntegrationCms\Plugin\Controller\Adminhtml\Page\DeletePlugin"/>
+        <plugin
+            sortOrder="1"
+            name="moooreWordpressIntegrationCmsDeleteUrlToWordpress"
+            type="Mooore\WordpressIntegrationCms\Plugin\Controller\Adminhtml\Page\DeletePlugin"
+        />
     </type>
     <type name="Magento\Cms\Controller\Adminhtml\Page\MassDelete">
-        <plugin sortOrder="1" name="moooreWordpressIntegrationCmsMassDeleteUrlToWordpress"
-                type="Mooore\WordpressIntegrationCms\Plugin\Controller\Adminhtml\Page\MassDeletePlugin"/>
+        <plugin
+            sortOrder="1"
+            name="moooreWordpressIntegrationCmsMassDeleteUrlToWordpress"
+            type="Mooore\WordpressIntegrationCms\Plugin\Controller\Adminhtml\Page\MassDeletePlugin"
+        />
     </type>
 </config>
diff --git a/etc/adminhtml/events.xml b/etc/adminhtml/events.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+<config
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="cms_page_prepare_save">
-        <observer instance="Mooore\WordpressIntegrationCms\Observer\Adminhtml\PageDetacher"
-                  name="mooore_pagedetacher"/>
+        <observer
+            instance="Mooore\WordpressIntegrationCms\Observer\Adminhtml\PageDetacher"
+            name="mooore_pagedetacher"
+        />
     </event>
 </config>
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
@@ -1,30 +1,35 @@
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
+<?xml version="1.0"?>
+<config
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Config:etc/system_file.xsd">
     <system>
         <section id="cms">
-            <group id="wordpress_integration"
-                   translate="label"
-                   sortOrder="100"
-                   showInDefault="1"
-                   showInWebsite="0"
-                   showInStore="0">
+            <group
+                id="wordpress_integration"
+                translate="label"
+                sortOrder="100"
+                showInDefault="1"
+                showInWebsite="0"
+                showInStore="0">
                 <label>Wordpress Integration</label>
-                <field id="baseurls"
-                       translate="label"
-                       type="textarea"
-                       showInDefault="1"
-                       showInWebsite="0"
-                       showInStore="0">
+                <field
+                    id="baseurls"
+                    translate="label"
+                    type="textarea"
+                    showInDefault="1"
+                    showInWebsite="0"
+                    showInStore="0">
                     <label>Base URLs</label>
                 </field>
-                <field id="magento_url_push_back"
-                       type="select"
-                       translate="label"
-                       canRestore="1"
-                       showInDefault="1"
-                       showInWebsite="1"
-                       showInStore="0"
-                       sortOrder="0">
+                <field
+                    id="magento_url_push_back"
+                    type="select"
+                    translate="label"
+                    canRestore="1"
+                    showInDefault="1"
+                    showInWebsite="1"
+                    showInStore="0"
+                    sortOrder="0">
                     <label>Push Magento page-url back to Wordpress</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>

diff --git a/etc/config.xml b/etc/config.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+<config
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
         <cms>
             <wordpress_integration>

diff --git a/etc/db_schema.xml b/etc/db_schema.xml
@@ -1,7 +1,14 @@
-<?xml version="1.0" ?>
-<schema xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
+<?xml version="1.0"?>
+<schema
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:framework:Setup/Declaration/Schema/etc/schema.xsd">
     <table name="cms_page">
-        <column name="wordpress_page_id" comment="Wordpress Page Id" nullable="true" xsi:type="varchar" length="64"/>
+        <column
+            name="wordpress_page_id"
+            comment="Wordpress Page Id"
+            nullable="true"
+            xsi:type="varchar"
+            length="64"
+        />
     </table>
 </schema>
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+<config
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Cms\Model\Page">
-        <plugin sortOrder="1" name="moooreWordpressIntegrationCmsPage"
-                type="Mooore\WordpressIntegrationCms\Plugin\Model\PagePlugin"/>
+        <plugin
+            sortOrder="1"
+            name="moooreWordpressIntegrationCmsPage"
+            type="Mooore\WordpressIntegrationCms\Plugin\Model\PagePlugin"
+        />
     </type>
 </config>
diff --git a/etc/frontend/events.xml b/etc/frontend/events.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+<config
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
     <event name="layout_load_before">
-        <observer instance="Mooore\WordpressIntegrationCms\Observer\LayoutLoadBefore"
-                  name="mooore_wordpressintegrationcms"/>
+        <observer
+            instance="Mooore\WordpressIntegrationCms\Observer\LayoutLoadBefore"
+            name="mooore_wordpressintegrationcms"
+        />
     </event>
 </config>
diff --git a/etc/module.xml b/etc/module.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+<config
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Mooore_WordpressIntegrationCms" setup_version="1.0.0">
         <sequence>
             <module name="Magento_Cms"/>
             <module name="Mooore_WordpressIntegration"/>
         </sequence>
     </module>
-</config>
+</config>
diff --git a/registration.php b/registration.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Magento\Framework\Component\ComponentRegistrar;

diff --git a/view/adminhtml/ui_component/cms_page_form.xml b/view/adminhtml/ui_component/cms_page_form.xml
@@ -1,7 +1,12 @@
-<form xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+<form
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
     <fieldset name="general">
-        <field name="wordpress_page" component="Mooore_WordpressIntegrationCms/js/components/select-site" sortOrder="100" formElement="select">
+        <field
+            name="wordpress_page"
+            component="Mooore_WordpressIntegrationCms/js/components/select-site"
+            sortOrder="100"
+            formElement="select">
             <argument name="data" xsi:type="array">
                 <item name="config" xsi:type="array">
                     <item name="filterOptions" xsi:type="boolean">true</item>

diff --git a/view/adminhtml/web/js/components/select-site.js b/view/adminhtml/web/js/components/select-site.js
@@ -1,7 +1,5 @@
-define([
-    'Magento_Ui/js/form/element/ui-select'
-], function (Select) {
-    'use strict';
+define(["Magento_Ui/js/form/element/ui-select"], function (Select) {
+    "use strict";
     return Select.extend({
         /**
          * Parse data and set it to options.
@@ -16,8 +14,9 @@ define([
             }
             this.options([]);
             this.setOption(option);
-            this.set('newOption', option);
+            this.set("newOption", option);
         },
+
         /**
          * Normalize option object.
          *
@@ -27,8 +26,8 @@ define([
         parseData: function (data) {
             return {
                 value: data.customer.entity_id,
-                label: data.customer.name
+                label: data.customer.name,
             };
-        }
+        },
     });
 });