Add fix to data widget fetching and parsing

xibosignage · Jan 23, 2025 · b8e1162 · b8e1162
1 parent 09d8a98
commit b8e1162
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/lib/Widget/Render/WidgetHtmlRenderer.php b/lib/Widget/Render/WidgetHtmlRenderer.php
@@ -362,7 +362,7 @@ public function decorateForPlayer(
     ): string {
         // Do we need to add a URL prefix to the requests?
         $auth = $display->isPwa()
-            ? '&v=7&serverKey=' . $this->config->getSetting('serverKey') . '&hardwareKey=' . $display->license
+            ? '&v=7&serverKey=' . $this->config->getSetting('SERVER_KEY') . '&hardwareKey=' . $display->license
             : null;
         $encryptionKey = $this->config->getApiKeyDetails()['encryptionKey'];
 

diff --git a/modules/src/xibo-player.js b/modules/src/xibo-player.js
@@ -55,15 +55,22 @@ const XiboPlayer = function() {
         $.ajax({
           method: 'GET',
           url: currentWidget.url,
+          dataType: 'json',
         }).done(function(data) {
           // The contents of the JSON file will be an object with data and meta
           // add in local data.
           if (localData) {
             data.data = localData;
           }
 
+          let widgetData = data;
+
+          if (typeof widgetData === 'string') {
+            widgetData = JSON.parse(data);
+          }
+
           resolve({
-            ...data,
+            ...widgetData,
             isDataReady: true,
           });
         }).fail(function(jqXHR, textStatus, errorThrown) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -65,7 +65,7 @@
     "@mapbox/leaflet-pip": "^1.1.0",
     "@popperjs/core": "^2.11.8",
     "@ssddanbrown/codemirror-lang-twig": "^1.0.0",
-    "@xibosignage/xibo-layout-renderer": "^1.0.6",
+    "@xibosignage/xibo-layout-renderer": "^1.0.10",
     "@xiechao/codemirror-lang-handlebars": "^1.0.4",
     "ajax-bootstrap-select": "^1.4.5",
     "blueimp-file-upload": "^10.32.0",