Merge pull request #3897 from reduxframework/update-extendify-ztkpwpy

Update Extendify Library

Author: kprovance

extendify-sdk/public/build/extendify-onboarding.js

@@ -3,7 +3,7 @@ Contributors: extendify, richtabor, kbat82, clubkert, arturgrabo
 Tags: templates, patterns, layouts, blocks, gutenberg
 Requires at least: 5.4
 Tested up to: 6.0
-Stable tag: 0.9.3
+Stable tag: 0.9.4
 Requires PHP: 5.6
 License: GPLv2
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -124,6 +124,9 @@ Nope! Extendify imports lightweight block-based content that is served directly
 
 == Changelog ==
 
+= 0.9.4 - 2022-08-12 =
+- Fix server error issues
+
 = 0.9.3 - 2022-08-11 =
 - Various bug fixes and performance improvements
 

extendify-sdk/public/build/extendify.js

@@ -8,14 +8,10 @@ import '@library/utility-control'
 import { useTaxonomyStore } from './state/Taxonomies'
 
 export default function ExtendifyLibrary({ show = false }) {
-    const open = useGlobalStore((state) => state.open)
-    const setReady = useGlobalStore((state) => state.setReady)
-    const setOpen = useGlobalStore((state) => state.setOpen)
+    const { open, setReady, setOpen } = useGlobalStore()
     const showLibrary = useCallback(() => setOpen(true), [setOpen])
     const hideLibrary = useCallback(() => setOpen(false), [setOpen])
-    const initTemplateData = useTemplatesStore(
-        (state) => state.initTemplateData,
-    )
+    const { initTemplateData } = useTemplatesStore()
     const fetchTaxonomies = useTaxonomyStore((state) => state.fetchTaxonomies)
 
     // When the uuid of the user comes back from the database, we can

extendify-sdk/readme.txt

@@ -66,7 +66,15 @@ Axios.interceptors.response.use(
 )
 
 Axios.interceptors.request.use(
-    (request) => checkDevMode(addDefaults(request)),
+    (request) => {
+        const q = new URLSearchParams(window.location.search)
+        if (['onboarding'].includes(q.get('extendify'))) {
+            throw new axios.Cancel(
+                'Library is not available while running Launch',
+            )
+        }
+        return checkDevMode(addDefaults(request))
+    },
     (error) => error,
 )
 

extendify-sdk/src/Library/ExtendifyLibrary.js

@@ -64,7 +64,7 @@ export const SiteTypeSelector = ({ value, setValue, terms }) => {
     }, [examples, tempValue, termsSorted, showExamples])
 
     useEffect(() => {
-        expanded && searchRef.current.focus()
+        expanded && searchRef.current?.focus()
     }, [expanded])
 
     useEffect(() => {

extendify-sdk/src/Library/api/axios.js

@@ -92,10 +92,11 @@ export const Onboarding = () => {
                     }
                     if (retrying) return
 
-                    if (retryCount >= 5) {
-                        console.error('Encountered unrecoverable error', error)
-                        throw new Error(error?.message ?? 'Unknown error')
-                    }
+                    // TODO: Add back when we have something to show here
+                    // if (retryCount >= 5) {
+                    //     console.error('Encountered unrecoverable error', error)
+                    //     throw new Error(error?.message ?? 'Unknown error')
+                    // }
                     console.error(key, error)
                     Sentry.captureException(
                         new Error(error?.message ?? 'Unknown error'),

extendify-sdk/src/Library/components/SiteTypeSelector.js

@@ -8,7 +8,13 @@ import { usePagesStore } from '@onboarding/state/Pages'
 import { useUserSelectionStore } from '@onboarding/state/UserSelections'
 import { pageState } from '@onboarding/state/factory'
 
-export const fetcher = () => getGoals()
+export const fetcher = async () => {
+    const goals = await getGoals()
+    if (!Array.isArray(goals?.data)) {
+        throw new Error('Goals data is not an array', goals)
+    }
+    return goals
+}
 export const fetchData = () => ({ key: 'goals' })
 export const state = pageState('Goals', () => ({
     title: __('Goals', 'extendify'),
@@ -69,25 +75,20 @@ export const Goals = () => {
                         className="w-full grid lg:grid-cols-2 gap-3 goal-select">
                         {/* Added so forms can be submitted by pressing Enter */}
                         <input type="submit" className="hidden" />
-                        {/* Seems excessive but this keeps failing and crashing randomly */}
-                        {goals && goals?.length > 0
-                            ? goals?.map((goal, index) => (
-                                  <div
-                                      key={goal.id}
-                                      className="border border-gray-800 rounded-lg p-4"
-                                      ref={
-                                          index === 0 ? initialFocus : undefined
-                                      }>
-                                      <CheckboxInput
-                                          label={goal.title}
-                                          checked={has('goals', goal)}
-                                          onChange={() => {
-                                              toggle('goals', goal)
-                                          }}
-                                      />
-                                  </div>
-                              ))
-                            : null}
+                        {goals?.map((goal, index) => (
+                            <div
+                                key={goal.id}
+                                className="border border-gray-800 rounded-lg p-4"
+                                ref={index === 0 ? initialFocus : undefined}>
+                                <CheckboxInput
+                                    label={goal.title}
+                                    checked={has('goals', goal)}
+                                    onChange={() => {
+                                        toggle('goals', goal)
+                                    }}
+                                />
+                            </div>
+                        ))}
                     </form>
                 )}
                 {!loading && (

extendify-sdk/src/Onboarding/Onboarding.js

@@ -40,7 +40,7 @@ export const SiteTypeSelect = () => {
     }, [loading])
 
     useEffect(() => {
-        const raf = requestAnimationFrame(() => searchRef.current.focus())
+        const raf = requestAnimationFrame(() => searchRef.current?.focus())
         return () => cancelAnimationFrame(raf)
     }, [searchRef])
 
@@ -137,7 +137,7 @@ export const SiteTypeSelect = () => {
                                 className="bg-transparent hover:text-partner-primary-bg p-0 text-partner-primary-bg text-xs underline cursor-pointer"
                                 onClick={() => {
                                     setShowExamples((show) => !show)
-                                    searchRef.current.focus()
+                                    searchRef.current?.focus()
                                 }}>
                                 {showExamples
                                     ? sprintf(
@@ -181,7 +181,7 @@ export const SiteTypeSelect = () => {
                                 className="bg-transparent hover:text-partner-primary-bg p-0 text-partner-primary-bg text-xs underline cursor-pointer"
                                 onClick={() => {
                                     setSearch('')
-                                    searchRef.current.focus()
+                                    searchRef.current?.focus()
                                 }}>
                                 {sprintf(
                                     __('Show all %s', 'extendify'),

extendify-sdk/src/Onboarding/pages/Goals.js

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit92e735dec43466ee97563476db4d53f7::getLoader();
+return ComposerAutoloaderInit4e0f5802ef0effb2ec743f16e450281e::getLoader();

extendify-sdk/src/Onboarding/pages/SiteTypeSelect.js

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit92e735dec43466ee97563476db4d53f7
+class ComposerAutoloaderInit4e0f5802ef0effb2ec743f16e450281e
 {
     private static $loader;
 
@@ -22,15 +22,15 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit92e735dec43466ee97563476db4d53f7', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit4e0f5802ef0effb2ec743f16e450281e', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit92e735dec43466ee97563476db4d53f7', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit4e0f5802ef0effb2ec743f16e450281e', 'loadClassLoader'));
 
         $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
         if ($useStaticLoader) {
             require_once __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInit92e735dec43466ee97563476db4d53f7::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit4e0f5802ef0effb2ec743f16e450281e::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {

extendify-sdk/vendor/autoload.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit92e735dec43466ee97563476db4d53f7
+class ComposerStaticInit4e0f5802ef0effb2ec743f16e450281e
 {
     public static $prefixLengthsPsr4 = array (
         'E' => 
@@ -23,8 +23,8 @@ class ComposerStaticInit92e735dec43466ee97563476db4d53f7
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit92e735dec43466ee97563476db4d53f7::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit92e735dec43466ee97563476db4d53f7::$prefixDirsPsr4;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit4e0f5802ef0effb2ec743f16e450281e::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit4e0f5802ef0effb2ec743f16e450281e::$prefixDirsPsr4;
 
         }, null, ClassLoader::class);
     }