Improved tag sorting code to simply sort the original list of available tags instead of trying to sort them later.

This commit is contained in:
Jamie Greunbaum 2024-05-31 15:01:55 -04:00
parent b1c2451c3e
commit 512658b0e5

View File

@ -94,43 +94,23 @@ func __prepare_form_thread(callback:Callable) -> void:
var component_prefix : String = ProjectSettings.get_setting("bugbot/reporting/gitea/status_labels/component_label_prefix", DEFAULT_COMPONENT_LABEL_PREFIX)
var priority_prefix : String = ProjectSettings.get_setting("bugbot/reporting/gitea/status_labels/priority_label_prefix", DEFAULT_PRIORITY_LABEL_PREFIX)
var version_tag_list : Array = []
var hardware_tag_list : Array = []
var os_tag_list : Array = []
var component_tag_list : Array = []
var priority_tag_list : Array = []
response_data.sort_custom(func(a,b):return a["id"] < b["id"])
for label_in:Dictionary in response_data:
if version_prefix and label_in["name"].begins_with(version_prefix):
label_in["name"] = (label_in["name"] as String).replace(version_prefix, "")
version_tag_list.append(label_in)
tag_lists[BugbotTagArray.VERSION].append(label_in["name"])
if hardware_prefix and label_in["name"].begins_with(hardware_prefix):
label_in["name"] = (label_in["name"] as String).replace(hardware_prefix, "")
hardware_tag_list.append(label_in)
tag_lists[BugbotTagArray.HARDWARE].append(label_in["name"])
if os_prefix and label_in["name"].begins_with(os_prefix):
label_in["name"] = (label_in["name"] as String).replace(os_prefix, "")
os_tag_list.append(label_in)
tag_lists[BugbotTagArray.OS].append(label_in["name"])
if component_prefix and label_in["name"].begins_with(component_prefix):
label_in["name"] = (label_in["name"] as String).replace(component_prefix, "")
component_tag_list.append(label_in)
tag_lists[BugbotTagArray.COMPONENT].append(label_in["name"])
if priority_prefix and label_in["name"].begins_with(priority_prefix):
label_in["name"] = (label_in["name"] as String).replace(priority_prefix, "")
priority_tag_list.append(label_in)
version_tag_list.sort_custom(func(a,b):return a["id"] < b["id"])
hardware_tag_list.sort_custom(func(a,b):return a["id"] < b["id"])
os_tag_list.sort_custom(func(a,b):return a["id"] < b["id"])
component_tag_list.sort_custom(func(a,b):return a["id"] < b["id"])
priority_tag_list.sort_custom(func(a,b): return a["id"] < b["id"])
for tag:Dictionary in version_tag_list:
tag_lists[BugbotTagArray.VERSION].append(tag["name"])
for tag:Dictionary in hardware_tag_list:
tag_lists[BugbotTagArray.HARDWARE].append(tag["name"])
for tag:Dictionary in os_tag_list:
tag_lists[BugbotTagArray.OS].append(tag["name"])
for tag:Dictionary in component_tag_list:
tag_lists[BugbotTagArray.COMPONENT].append(tag["name"])
for tag:Dictionary in priority_tag_list:
tag_lists[BugbotTagArray.SEVERITY].append(tag["name"])
tag_lists[BugbotTagArray.SEVERITY].append(label_in["name"])
callback.call_deferred(tag_lists)
__bugbot_server_thread.call_deferred("wait_to_finish")