fix: missing acf fields (#742)

* fix: load local acf fields on init * fix: posts from api initialized too early
helsingborg-stad · Nov 8, 2023 · cf5061b · cf5061b
1 parent 10ad307
commit cf5061b
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/library/App.php b/library/App.php
@@ -66,7 +66,7 @@ public function __construct()
         $resourcePostType->addHooks();
 
         $resourceRegistry = new \Municipio\Content\ResourceFromApi\ResourceRegistry();
-        $resourceRegistry->initialize();
+        $resourceRegistry->addHooks();
 
         $postTypeQueriesModifier = new \Municipio\Content\ResourceFromApi\PostType\PostTypeQueriesModifier($resourceRegistry);
         $postTypeQueriesModifier->addHooks();

diff --git a/library/Bootstrap.php b/library/Bootstrap.php
@@ -31,7 +31,7 @@
 /**
  * Acf auto import and export
  */
-add_action('acf/init', function () {
+add_action('init', function () {
     $acfExportManager = new \AcfExportManager\AcfExportManager();
     $acfExportManager->setTextdomain('municipio');
     $acfExportManager->setExportFolder(MUNICIPIO_PATH . 'library/AcfFields');

diff --git a/library/Content/ResourceFromApi/ResourcePostType.php b/library/Content/ResourceFromApi/ResourcePostType.php
@@ -10,7 +10,7 @@ class ResourcePostType
     public function addHooks(): void
     {
         add_action('init', [$this, 'addPostType']);
-        add_action('acf/init', [$this, 'addOptionsPage']);
+        add_action('init', [$this, 'addOptionsPage']);
         add_filter('acf/load_field/name=post_type_source', [$this, 'loadPostTypeSourceOptions']);
         add_filter('acf/load_field/name=taxonomy_source', [$this, 'loadTaxonomySourceOptions']);
         add_action('acf/save_post', [$this, 'setPostTypeResourcePostTitleFromAcf'], 10);
@@ -63,7 +63,7 @@ public function loadPostTypeSourceOptions($field)
 
         $endpoints = get_field('api_resources_apis', 'options');
 
-        if (empty($endpoints)) {
+        if (!is_array($endpoints) || empty($endpoints)) {
             return $field;
         }
 
@@ -118,7 +118,7 @@ public function loadTaxonomySourceOptions($field)
 
         $endpoints = get_field('api_resources_apis', 'options');
 
-        if (empty($endpoints)) {
+        if (!is_array($endpoints) || empty($endpoints)) {
             return $field;
         }
 

diff --git a/library/Content/ResourceFromApi/ResourceRegistry.php b/library/Content/ResourceFromApi/ResourceRegistry.php
@@ -11,21 +11,30 @@ class ResourceRegistry implements ResourceRegistryInterface
     public static ?object $registry = null;
     private string $resourcePostTypeName = 'api-resource';
 
-    public function initialize()
+    public function __construct()
     {
-        if (is_object(self::$registry)) {
-            // Already initialized.
+        if ($this->isInitialized()) {
             return;
         }
 
         self::$registry = new stdClass();
         self::$registry->postTypes = [];
         self::$registry->taxonomies = [];
-        self::$registry->attachments = [];
+        self::$registry->attachments = [];   
+    }
 
-        $this->registerPostTypes();
-        $this->registerPostTypesRewriteRules();
-        $this->registerTaxonomies();
+    public function addHooks()
+    {
+        add_action('init', function () {
+            $this->registerPostTypes();
+            $this->registerPostTypesRewriteRules();
+            $this->registerTaxonomies();
+        });
+    }
+
+    private function isInitialized(): bool
+    {
+        return is_object(self::$registry);
     }
 
     public function getRegisteredPostTypes(): array

diff --git a/library/Content/ResourceFromApi/ResourceRegistryInterface.php b/library/Content/ResourceFromApi/ResourceRegistryInterface.php
@@ -3,7 +3,7 @@
 namespace Municipio\Content\ResourceFromApi;
 
 interface ResourceRegistryInterface {
-    public function initialize();
+    public function addHooks();
     public function getRegisteredPostTypes(): array;
     public function getRegisteredPostType(string $postTypeName): ?object;
     public function getRegisteredTaxonomies(): array;