Merge pull request #3930 from reduxframework/update-extendify-3dia7hm

Update Extendify Library

Author: kprovance

extendify-sdk/app/AdminPageRouter.php

@@ -133,7 +133,7 @@ public function addAdminMenu()
         $badgeCount = $remainingTasks > 9 ? '9' : strval($remainingTasks);
         $menuLabel = Config::$launchCompleted ? __('Site Assistant', 'extendify') : __('Site Launcher', 'extendify');
         $menuLabel = Config::$showOnboarding ? $menuLabel : 'Extendify';
-        $menuLabel = sprintf('%1$s <span class="extendify-assist-badge-count"></span>', $menuLabel);
+        $menuLabel = sprintf('%1$s <span class="extendify-assist-badge-count" data-test="assist-badge-count"></span>', $menuLabel);
 
         \add_menu_page(
             'Extendify',

extendify-sdk/app/Assist/Admin.php

@@ -65,25 +65,14 @@ function () {
                     return;
                 }
 
+                $partnerData = $this->checkPartnerDataSources();
+
+                $logo = isset($partnerData['logo']) ? $partnerData['logo'] : null;
+                $name = isset($partnerData['name']) ? $partnerData['name'] : \__('Partner logo', 'extendify');
+
                 $version = Config::$environment === 'PRODUCTION' ? Config::$version : uniqid();
-                $scriptAssetPath = EXTENDIFY_PATH . 'public/build/extendify-assist.asset.php';
-                $fallback = [
-                    'dependencies' => [],
-                    'version' => $version,
-                ];
-                $scriptAsset = file_exists($scriptAssetPath) ? require $scriptAssetPath : $fallback;
-                wp_enqueue_media();
-                foreach ($scriptAsset['dependencies'] as $style) {
-                    wp_enqueue_style($style);
-                }
 
-                \wp_enqueue_script(
-                    Config::$slug . '-assist-scripts',
-                    EXTENDIFY_BASE_URL . 'public/build/extendify-assist.js',
-                    $scriptAsset['dependencies'],
-                    $scriptAsset['version'],
-                    true
-                );
+                $this->enqueueGutenbergAssets();
 
                 $assistState = get_option('extendify_assist_globals');
                 $dismissed = isset($assistState['state']['dismissedNotices']) ? $assistState['state']['dismissedNotices'] : [];
@@ -101,6 +90,8 @@ function () {
                         'asset_path' => \esc_url(EXTENDIFY_URL . 'public/assets'),
                         'launchCompleted' => Config::$launchCompleted,
                         'dismissedNotices' => $dismissed,
+                        'partnerLogo' => $logo,
+                        'partnerName' => $name,
                     ]),
                     'before'
                 );
@@ -114,7 +105,74 @@ function () {
                     $version,
                     'all'
                 );
+
+                if (isset($partnerData['bgColor']) && isset($partnerData['fgColor'])) {
+                    \wp_add_inline_style(Config::$slug . '-assist-styles', ":root {
+                        --ext-partner-theme-primary-bg: {$partnerData['bgColor']};
+                        --ext-partner-theme-primary-text: {$partnerData['fgColor']};
+                    }");
+                }
             }
         );
     }
+
+    /**
+     * Enqueues Gutenberg stuff on a non-Gutenberg page.
+     *
+     * @return void
+     */
+    public function enqueueGutenbergAssets()
+    {
+        $version = Config::$environment === 'PRODUCTION' ? Config::$version : uniqid();
+        $scriptAssetPath = EXTENDIFY_PATH . 'public/build/extendify-assist.asset.php';
+        $fallback = [
+            'dependencies' => [],
+            'version' => $version,
+        ];
+        $scriptAsset = file_exists($scriptAssetPath) ? require $scriptAssetPath : $fallback;
+        wp_enqueue_media();
+        foreach ($scriptAsset['dependencies'] as $style) {
+            wp_enqueue_style($style);
+        }
+
+        \wp_enqueue_script(
+            Config::$slug . '-assist-scripts',
+            EXTENDIFY_BASE_URL . 'public/build/extendify-assist.js',
+            $scriptAsset['dependencies'],
+            $scriptAsset['version'],
+            true
+        );
+    }
+
+    /**
+     * Check if partner data is available.
+     *
+     * @return array
+     */
+    public function checkPartnerDataSources()
+    {
+        $return = [];
+
+        try {
+            if (defined('EXTENDIFY_ONBOARDING_BG')) {
+                $return['bgColor'] = constant('EXTENDIFY_ONBOARDING_BG');
+                $return['fgColor'] = constant('EXTENDIFY_ONBOARDING_TXT');
+                $return['logo'] = constant('EXTENDIFY_PARTNER_LOGO');
+            }
+
+            $data = get_option('extendify_partner_data');
+            if ($data) {
+                $return['bgColor'] = $data['backgroundColor'];
+                $return['fgColor'] = $data['foregroundColor'];
+                // Need this check to avoid errors if no partner logo is set in Airtable.
+                $return['logo'] = $data['logo'] ? $data['logo'][0]['thumbnails']['large']['url'] : null;
+                $return['name'] = isset($data['name']) ? $data['name'] : '';
+            }
+        } catch (\Exception $e) {
+            // Do nothing here, set variables below. Coding Standards require something to be in the catch.
+            $e;
+        }//end try
+
+        return $return;
+    }
 }

extendify-sdk/app/Assist/AdminPage.php

@@ -53,7 +53,7 @@ public function pageContent()
             id="extendify-assist-landing-page"
             class="extendify-assist"
             data-test="assist-landing">
-        ></div>
+        </div>
         <?php
     }
 }

extendify-sdk/app/Assist/Controllers/QuickLinksController.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Controls Quick Links
+ */
+
+namespace Extendify\Assist\Controllers;
+
+use Extendify\Http;
+
+if (!defined('ABSPATH')) {
+    die('No direct access.');
+}
+
+/**
+ * The controller for fetching quick links
+ */
+class QuickLinksController
+{
+    /**
+     * Return quick links from source.
+     *
+     * @return \WP_REST_Response
+     */
+    public static function fetchQuickLinks()
+    {
+        $response = Http::get('/quicklinks');
+        return new \WP_REST_Response(
+            $response,
+            wp_remote_retrieve_response_code($response)
+        );
+    }
+}

extendify-sdk/app/Assist/Controllers/RecommendationsController.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Controls Recommendations
+ */
+
+namespace Extendify\Assist\Controllers;
+
+use Extendify\Http;
+
+if (!defined('ABSPATH')) {
+    die('No direct access.');
+}
+
+/**
+ * The controller for fetching recommendations
+ */
+class RecommendationsController
+{
+    /**
+     * Return recommendations from source.
+     *
+     * @return \WP_REST_Response
+     */
+    public static function fetchRecommendations()
+    {
+        $response = Http::get('/recommendations');
+        return new \WP_REST_Response(
+            $response,
+            wp_remote_retrieve_response_code($response)
+        );
+    }
+}

extendify-sdk/app/Onboarding/Admin.php

@@ -223,7 +223,7 @@ public function addScopedScriptsAndStyles()
             $version
         );
 
-        \wp_add_inline_style(Config::$slug . '-onboarding-styles', "body {
+        \wp_add_inline_style(Config::$slug . '-onboarding-styles', ":root {
             --ext-partner-theme-primary-bg: {$bgColor};
             --ext-partner-theme-primary-text: {$fgColor};
         }");

extendify-sdk/app/Onboarding/Controllers/DataController.php

@@ -30,6 +30,20 @@ public static function getSiteTypes()
         );
     }
 
+    /**
+     * Get Site type information.
+     *
+     * @return \WP_REST_Response
+     */
+    public static function getStylesList()
+    {
+        $response = Http::get('/styles-list');
+        return new \WP_REST_Response(
+            $response,
+            wp_remote_retrieve_response_code($response)
+        );
+    }
+
     /**
      * Get styles with code template.
      *