Widget: Stocks and Currencies use maxItemsPerPage instead of itemsPer…

…Page. Also improve error responses from AlphaVantageConnector. (#2462) fixes xibosignage/xibo#3368
xibosignage · Apr 4, 2024 · a467a2a · a467a2a
1 parent 8026510
commit a467a2a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/Connector/AlphaVantageConnector.php b/lib/Connector/AlphaVantageConnector.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (C) 2023 Xibo Signage Ltd
+ * Copyright (C) 2024 Xibo Signage Ltd
  *
  * Xibo - Digital Signage - https://xibosignage.com
  *
@@ -117,7 +117,11 @@ public function onDataRequest(WidgetDataRequestEvent $event)
                 $event->getDataProvider()->setCacheTtl($this->getSetting('cachePeriod', 3600));
             } catch (\Exception $exception) {
                 $this->getLogger()->error('onDataRequest: Failed to get results. e = ' . $exception->getMessage());
-                $dataProvider->addError(__('Unable to contact the AlphaVantage API'));
+                if ($exception instanceof InvalidArgumentException) {
+                    $dataProvider->addError($exception->getMessage());
+                } else {
+                    $dataProvider->addError(__('Unable to contact the AlphaVantage API'));
+                }
             }
         }
     }
@@ -231,7 +235,7 @@ private function getStockResults(DataProviderInterface $dataProvider): void
 
         if ($items == '') {
             $this->getLogger()->error('Missing Items for Stocks Module with WidgetId ' . $dataProvider->getWidgetId());
-            throw new InvalidArgumentException(__('Missing Items for Stocks Module'), 'items');
+            throw new InvalidArgumentException(__('Add some stock symbols'), 'items');
         }
 
         // Parse items out into an array

diff --git a/lib/Widget/CurrenciesAndStocksProvider.php b/lib/Widget/CurrenciesAndStocksProvider.php
@@ -74,7 +74,7 @@ public function fetchDuration(DurationProviderInterface $durationProvider): Widg
 
         if ($numItems > 1) {
             // If we have paging involved then work out the page count.
-            $itemsPerPage = $durationProvider->getWidget()->getOptionValue('itemsPerPage', 0);
+            $itemsPerPage = $durationProvider->getWidget()->getOptionValue('maxItemsPerPage', 0);
             if ($itemsPerPage > 0) {
                 $numItems = ceil($numItems / $itemsPerPage);
             }