From 49b452590a74336ab9ae5cbed1671bd73dc723a7 Mon Sep 17 00:00:00 2001
From: Markus Klein <markus.klein@reelworx.at>
Date: Fri, 7 Jul 2023 14:12:15 +0200
Subject: [PATCH] [BUGFIX] Initialize API manually

---
 .../ValuePickerItemDataProvider.php              | 16 ++++++++++++----
 composer.json                                    |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Classes/FormDataProvider/ValuePickerItemDataProvider.php b/Classes/FormDataProvider/ValuePickerItemDataProvider.php
index 27e647b..92785cd 100644
--- a/Classes/FormDataProvider/ValuePickerItemDataProvider.php
+++ b/Classes/FormDataProvider/ValuePickerItemDataProvider.php
@@ -17,19 +17,23 @@ declare(strict_types=1);
 
 namespace SkillDisplay\SkilldisplayContent\FormDataProvider;
 
+use GuzzleHttp\Client;
 use SkillDisplay\PHPToolKit\Api\SkillSet;
+use SkillDisplay\SkilldisplayContent\SettingsFactory;
 use TYPO3\CMS\Backend\Form\FormDataProviderInterface;
+use TYPO3\CMS\Core\Site\SiteFinder;
+use TYPO3\CMS\Core\Utility\GeneralUtility;
 
 /**
  * Inject available skill sets a valuepicker form
  */
 class ValuePickerItemDataProvider implements FormDataProviderInterface
 {
-    private SkillSet $skillSetApi;
+    protected SiteFinder $siteFinder;
 
-    public function __construct(SkillSet $skillSetApi)
+    public function __construct(SiteFinder $siteFinder = null)
     {
-        $this->skillSetApi = $skillSetApi;
+        $this->siteFinder = $siteFinder ?? GeneralUtility::makeInstance(SiteFinder::class);
     }
 
     /**
@@ -41,7 +45,11 @@ class ValuePickerItemDataProvider implements FormDataProviderInterface
     public function addData(array $result): array
     {
         if ($result['tableName'] === 'tt_content' && isset($result['processedTca']['columns']['skilldisplay_skillset'])) {
-            $skillSets = $this->skillSetApi->getAll();
+            $api = new SkillSet(
+                (new SettingsFactory($this->siteFinder))->createFromPageUid($result['parentPageRow']['uid']),
+                GeneralUtility::makeInstance(Client::class)
+            );
+            $skillSets = $api->getAll();
             foreach ($skillSets as $skillSet) {
                 $result['processedTca']['columns']['skilldisplay_skillset']['config']['valuePicker']['items'][] =
                     [
diff --git a/composer.json b/composer.json
index 56b68c6..6f91102 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
     },
     "require": {
         "php": "^7.4 || ^8.1 || ^8.2",
-        "skilldisplay/phptoolkit": "^2.1",
+        "skilldisplay/phptoolkit": "^2.1.1",
         "typo3/cms-backend": "^11.5 || ^12.4",
         "typo3/cms-frontend": "^11.5 || ^12.4"
     },