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

GraphQl 0.2.17.3 - sorting, filtering fix

Browse Source
This commit is contained in:
jokob-sk
2024-11-17 21:29:58 +11:00
parent 202baab409
commit 410becfe21
18 changed files with 60 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/graphql_server/graphql_schema.py
View File

@@ -99,7 +99,6 @@ class Query(ObjectType):
# Apply sorting if options are provided
if options:
# Define status-specific filtering
if options.status:
status = options.status
@@ -142,7 +141,7 @@ class Query(ObjectType):
for sort_option in options.sort:
devices_data = sorted(
devices_data,
key=lambda x: x.get(sort_option.field),
key=lambda x: mixed_type_sort_key(x.get(sort_option.field)),
reverse=(sort_option.order.lower() == "desc")
)
@@ -176,7 +175,14 @@ class Query(ObjectType):
return DeviceResult(devices=devices, count=total_count)
# helps sorting inconsistent dataset mixed integers and strings
def mixed_type_sort_key(value):
if value is None or value == "":
return (2, '') # Place None or empty strings last
try:
return (0, int(value)) # Integers get priority
except (ValueError, TypeError):
return (1, str(value)) # Strings come next
# Schema Definition
devicesSchema = graphene.Schema(query=Query)

2
server/initialise.py
View File

@@ -324,7 +324,7 @@ def importConfigs (db, all_plugins):
# Log the value being passed
# ccd(key, default, config_dir, name, inputtype, options, group, events=None, desc="", regex="", setJsonMetadata=None, overrideTemplate=None, forceDefault=False)
mylog('debug', [f"[Config] Setting override {setting_name} with value: {value}"])
mylog('verbose', [f"[Config] Setting override {setting_name} with value: {value}"])
ccd(setting_name, value, c_d, '_KEEP_', '_KEEP_', '_KEEP_', '_KEEP_', None, "_KEEP_", "", None, None, True, 1)
except json.JSONDecodeError: