Merge pull request #8 from xima-media/release-11.0.4

release 11.0.4
xima-media · Dec 3, 2023 · 6f1133e · 6f1133e
2 parents 406b3af + 16c489f
commit 6f1133e
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 6 deletions.
diff --git a/Classes/Widgets/LineChartWidget.php b/Classes/Widgets/LineChartWidget.php
@@ -18,6 +18,7 @@
 namespace Xima\XmGoaccess\Widgets;
 
 use TYPO3\CMS\Core\Page\JavaScriptModuleInstruction;
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Dashboard\Widgets\AdditionalCssInterface;
 use TYPO3\CMS\Dashboard\Widgets\ButtonProviderInterface;
 use TYPO3\CMS\Dashboard\Widgets\ChartDataProviderInterface;
@@ -59,6 +60,11 @@ class LineChartWidget implements WidgetInterface, EventDataInterface, Additional
      */
     private $options;
 
+    /**
+     * @var int
+     */
+    private $typo3Version;
+
     public function __construct(
         WidgetConfigurationInterface $configuration,
         LineChartDataProvider $dataProvider,
@@ -69,11 +75,13 @@ public function __construct(
         $this->dataProvider = $dataProvider;
         $this->view = $view;
         $this->options = $options;
+
+        $this->dataProvider->setGoaccessType($this->options['goaccessType']);
+        $this->typo3Version = (int)VersionNumberUtility::convertVersionStringToArray(VersionNumberUtility::getCurrentTypo3Version())['version_main'];
     }
 
     public function renderWidgetContent(): string
     {
-        $this->dataProvider->setGoaccessType($this->options['goaccessType']);
         $this->view->setTemplate('Widget/ChartWidget');
         $this->view->assignMultiple([
             'options' => $this->options,
@@ -84,7 +92,7 @@ public function renderWidgetContent(): string
 
     public function getEventData(): array
     {
-        return [
+        $data = [
             'graphConfig' => [
                 'type' => 'line',
                 'options' => [
@@ -123,15 +131,41 @@ public function getEventData(): array
                 'data' => $this->dataProvider->getChartData(),
             ],
         ];
+
+        if ($this->typo3Version >= 12) {
+            $data['graphConfig']['options']['scales'] = [
+                'y' => [
+                    'id' => 'right',
+                    'position' => 'right',
+                    'display' => 'auto',
+                    'ticks' => [
+                        'beginAtZero' => true,
+                        'sampleSize' => 4,
+                        'autoSkip' => true,
+                    ],
+                ],
+            ];
+        }
+
+        return $data;
     }
 
     public function getCssFiles(): array
     {
+        if ($this->typo3Version >= 12) {
+            return [];
+        }
         return ['EXT:dashboard/Resources/Public/Css/Contrib/chart.css'];
     }
 
     public function getJavaScriptModuleInstructions(): array
     {
+        if ($this->typo3Version >= 12) {
+            return [
+                JavaScriptModuleInstruction::create('@typo3/dashboard/contrib/chartjs.js'),
+                JavaScriptModuleInstruction::create('@typo3/dashboard/chart-initializer.js'),
+            ];
+        }
         return [
             JavaScriptModuleInstruction::forRequireJS('TYPO3/CMS/Dashboard/Contrib/chartjs'),
             JavaScriptModuleInstruction::forRequireJS('TYPO3/CMS/Dashboard/ChartInitializer'),

diff --git a/Classes/Widgets/Provider/LineChartDataProvider.php b/Classes/Widgets/Provider/LineChartDataProvider.php
@@ -2,13 +2,13 @@
 
 namespace Xima\XmGoaccess\Widgets\Provider;
 
+use TYPO3\CMS\Core\Utility\VersionNumberUtility;
 use TYPO3\CMS\Dashboard\WidgetApi;
 use TYPO3\CMS\Dashboard\Widgets\ChartDataProviderInterface;
 
 class LineChartDataProvider extends AbstractGoaccessDataProvider implements ChartDataProviderInterface
 {
     /**
-     * @param string $type
      * @param int $days
      * @return array{labels: string[], hits: int[], visitors: int[], bytes: int[]}
      * @throws \Exception
@@ -65,7 +65,7 @@ public function getChartData(): array
     {
         $data = $this->getGoaccessChartData();
 
-        return [
+        $data = [
             'labels' => $data['labels'],
             'datasets' => [
                 [
@@ -86,5 +86,13 @@ public function getChartData(): array
                 ],
             ],
         ];
+
+        $typo3Version = (int)VersionNumberUtility::convertVersionStringToArray(VersionNumberUtility::getCurrentTypo3Version())['version_main'];
+        if ($typo3Version >= 12) {
+            $data['datasets'][0]['fill'] = 'origin';
+            $data['datasets'][1]['fill'] = 'origin';
+        }
+
+        return $data;
     }
 }
diff --git a/composer.json b/composer.json
@@ -21,7 +21,8 @@
 		"squizlabs/php_codesniffer": "^3.4",
 		"friendsofphp/php-cs-fixer": "^3.3",
 		"vimeo/psalm": "^4.0",
-		"phpstan/phpstan": "^1.6"
+		"phpstan/phpstan": "^1.6",
+		"helhum/typo3-console": "^8.1"
 	},
 	"extra": {
 		"typo3/cms": {

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -10,7 +10,7 @@
     'state' => 'stable',
     'internal' => '',
     'uploadfolder' => '0',
-    'version' => '11.0.3',
+    'version' => '11.0.4',
     'constraints' => [
         'depends' => [
             'typo3' => '11.0.0-12.99.99',