vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔃 Node sync v0.2

Browse Source
This commit is contained in:
jokob-sk
2024-06-03 22:24:06 +10:00
parent e3557ad7d2
commit 8a8df3c7b8
12 changed files with 749 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
front/js/common.js
View File

@@ -144,7 +144,16 @@ function cacheSettings()
if(options_params != [])
{
// handles only strings of length == 1
resolvedOptions = `["${resolveParams(options_params, resolvedOptions[0])}"]`
resolved = resolveParams(options_params, resolvedOptions[0])
if(resolved.includes('"')) // check if list of strings
{
resolvedOptions = `[${resolved}]`
} else // one value only
{
resolvedOptions = `["${resolved}"]`
}
}
}
}
@@ -1027,8 +1036,18 @@ function resolveParams(params, template) {
// If the parameter type is 'setting', retrieve setting value
if (param.type == "setting") {
var value = getSetting(param.value);
// Remove brackets and single quotes, replace them with double quotes
value = value.replace('[','').replace(']','').replace(/'/g, '"');
// Split the string into an array, remove empty elements
const arr = value.split(',').filter(Boolean);
// Join the array elements with commas
const result = arr.join(', ');
// Replace placeholder with setting value
template = template.replace("{" + param.name + "}", value);
template = template.replace("{" + param.name + "}", result);
} else {
// If the parameter type is not 'setting', use the provided value
template = template.replace("{" + param.name + "}", param.value);

1
front/js/settings_utils.js
View File

@@ -539,6 +539,7 @@ function getParam(targetId, key, skipCache = false) {
// optionsArray = getSettingOptions(set['Code_Name'] )
valuesArray = createArray(set['Value']);
// create unique ID
var targetLocation = set['Code_Name'] + "_initSettingDropdown";

20
front/js/ui_components.js
View File

@@ -95,9 +95,29 @@ function initSettingDropdown(settingKey, // Identifier for the setting
{
var optionsHtml = ""
if(settingKey == 'SYNC_plugins' || settingKey == 'VNDRPDT_WATCH')
{
console.log('getSettingOptions(settingKey)');
console.log(getSettingOptions(settingKey));
}
optionsArray = createArray(getSettingOptions(settingKey))
if(settingKey == 'SYNC_plugins' || settingKey == 'VNDRPDT_WATCH')
{
console.log('settingKey');
console.log(settingKey);
console.log('valuesArray');
console.log(valuesArray);
console.log('optionsArray');
console.log(optionsArray);
}
// check if the result is a SQL query
if(isSQLQuery(optionsArray[0]))
{