From bf4883a0f05b4b213b2dbc45b39fa71e2f3919d7 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 16 Feb 2024 17:29:15 -0500 Subject: [PATCH] Fixed incorrect API url. Now loads ARE rules and displays titles. --- .../media/javascript/ui/panel/AutoRunTab.js | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/extensions/admin_ui/media/javascript/ui/panel/AutoRunTab.js b/extensions/admin_ui/media/javascript/ui/panel/AutoRunTab.js index 547c916ea..75409ad13 100644 --- a/extensions/admin_ui/media/javascript/ui/panel/AutoRunTab.js +++ b/extensions/admin_ui/media/javascript/ui/panel/AutoRunTab.js @@ -8,19 +8,26 @@ getCurrentRules = async function(token) { console.log(`token = ${token}`); try { - var res = await fetch(`/api/autorun/rule/list/all?token=${token}`) - console.log(res.body); - console.log("Successfully retrieved active rules."); - if (res.body.success === true && Array.isArray(res.body.rules)) { - console.log(res.body.rules); - return res.body.rules; - } else { - console.log("No active rules."); - return []; + var res = await fetch(`/api/autorun/rules?token=${token}`); + if (!res.ok) { + throw new Error(`Getting auto run rules failed with status ${res.status}`); } + const data = await res.json(); + console.log("Successfully retrieved active rules."); + console.log(data); + const rules = JSON.parse(data.rules); + + if (data.success === true && Array.isArray(rules)) { + console.log(rules); + return rules; + } + + console.log("No active auto run rules."); + return []; + } catch(error) { console.error(error); - console.error("Failed to get rules."); + console.error("Failed to get auto run rules."); return null; } } @@ -47,9 +54,11 @@ AutoRunTab = function() { console.log(`

Number of Auto Run rules enabled: ${rules.length}.

`); container.update(`

Number of Auto Run rules enabled: ${rules.length}.

`); - //ruleTitle = document.createElement('h4'); - //ruleTitle.innerHTML = "Rule title 1"; - //container.appendChild(ruleTitle); + for (let i = 0; i < rules.length; i++) { + ruleTitle = document.createElement('h4'); + ruleTitle.innerHTML = rules[i].name ? rules[i].name : `Rule ${i + 1}`; + container.getEl().appendChild(ruleTitle); + } } else { container.update("

Failed to load Auto Run rules.

"); }