UI: Alphabetically sort actions and limits menus, and tweak limit dialog.

Author: jhuckaby

htdocs/js/pages/PageUtils.class.js

@@ -1461,13 +1461,13 @@ Page.PageUtils = class PageUtils extends Page.Base {
 		var btn = (idx > -1) ? ['check-circle', "Accept"] : ['plus-circle', "Add Limit"];
 
 		if (!limit) {
-			if (!find_object(this.limits, { type: 'time' })) limit = { type: 'time' };
-			else if (!find_object(this.limits, { type: 'job' })) limit = { type: 'job' };
+			if (!find_object(this.limits, { type: 'job' })) limit = { type: 'job' };
+			else if (!find_object(this.limits, { type: 'queue' })) limit = { type: 'queue' };
+			else if (!find_object(this.limits, { type: 'retry' })) limit = { type: 'retry' };
+			else if (!find_object(this.limits, { type: 'time' })) limit = { type: 'time' };
 			else if (!find_object(this.limits, { type: 'log' })) limit = { type: 'log' };
 			else if (!find_object(this.limits, { type: 'mem' })) limit = { type: 'mem' };
 			else if (!find_object(this.limits, { type: 'cpu' })) limit = { type: 'cpu' };
-			else if (!find_object(this.limits, { type: 'retry' })) limit = { type: 'retry' };
-			else if (!find_object(this.limits, { type: 'queue' })) limit = { type: 'queue' };
 			else if (!find_object(this.limits, { type: 'file' })) limit = { type: 'file' };
 			else limit = { type: 'day' };
 			limit.enabled = true;

internal/ui.json

@@ -1223,32 +1223,32 @@
 		{ "id": "alert_cleared", "title": "Alert Cleared", "icon": "check-circle-outline" }
 	],
 
-	"action_type_menu": [ 
-		{ "id": "email", "title": "Send Email", "icon": "email-arrow-right-outline" },
-		{ "id": "web_hook", "title": "Web Hook", "icon": "webhook" },
-		{ "id": "run_event", "title": "Run Event", "icon": "calendar-clock" },
+	"action_type_menu": [
+		{ "id": "tag", "title": "Apply Tags", "icon": "tag-plus-outline" },
+		{ "id": "ticket", "title": "Create Ticket", "icon": "text-box-plus-outline" },
+		{ "id": "delete", "title": "Delete Event", "icon": "trash-can-outline" },
+		{ "id": "disable", "title": "Disable Event", "icon": "cancel" },
+		{ "id": "fetch", "title": "Fetch Bucket", "icon": "export" },
 		{ "id": "channel", "title": "Notify Channel", "icon": "bullhorn-outline" },
-		{ "id": "snapshot", "title": "Take Snapshot", "icon": "monitor-screenshot" },
+		{ "id": "plugin", "title": "Plugin", "icon": "power-plug" },
+		{ "id": "run_event", "title": "Run Event", "icon": "calendar-clock" },
+		{ "id": "email", "title": "Send Email", "icon": "email-arrow-right-outline" },
 		{ "id": "store", "title": "Store Bucket", "icon": "import" },
-		{ "id": "fetch", "title": "Fetch Bucket", "icon": "export" },
-		{ "id": "ticket", "title": "Create Ticket", "icon": "text-box-plus-outline" },
 		{ "id": "suspend", "title": "Suspend Job", "icon": "motion-pause-outline" },
-		{ "id": "tag", "title": "Apply Tags", "icon": "tag-plus-outline" },
-		{ "id": "disable", "title": "Disable Event", "icon": "cancel" },
-		{ "id": "delete", "title": "Delete Event", "icon": "trash-can-outline" },
-		{ "id": "plugin", "title": "Plugin", "icon": "power-plug" }
+		{ "id": "snapshot", "title": "Take Snapshot", "icon": "monitor-screenshot" },
+		{ "id": "web_hook", "title": "Web Hook", "icon": "webhook" }
 	],
 
-	"limit_type_menu": [ 
-		{ "id": "time", "title": "Max Run Time", "icon": "timer-remove-outline" },
+	"limit_type_menu": [
 		{ "id": "job", "title": "Max Concurrent Jobs", "icon": "traffic-light-outline" },
-		{ "id": "log", "title": "Max Output Size", "icon": "file-remove-outline" },
-		{ "id": "mem", "title": "Max Memory Limit", "icon": "memory" },
 		{ "id": "cpu", "title": "Max CPU % Limit", "icon": "chip" },
-		{ "id": "retry", "title": "Max Retry Limit", "icon": "redo-variant" },
-		{ "id": "queue", "title": "Max Queue Limit", "icon": "tray-full" },
+		{ "id": "day", "title": "Max Daily Limit", "icon": "calendar-cursor-outline" },
 		{ "id": "file", "title": "Max File Limit", "icon": "file-multiple-outline" },
-		{ "id": "day", "title": "Max Daily Limit", "icon": "calendar-cursor-outline" }
+		{ "id": "mem", "title": "Max Memory Limit", "icon": "memory" },
+		{ "id": "log", "title": "Max Output Size", "icon": "file-remove-outline" },
+		{ "id": "queue", "title": "Max Queue Limit", "icon": "tray-full" },
+		{ "id": "retry", "title": "Max Retry Limit", "icon": "redo-variant" },
+		{ "id": "time", "title": "Max Run Time", "icon": "timer-remove-outline" }
 	],
 
 	"workflow_node_types": [