From: Jo-Philipp Wich <jo@mein.io>
Date: Tue, 13 Dec 2022 22:49:11 +0000 (+0100)
Subject: luci-mid-status: nftables.js: minor cleanups and enhancements
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=bad783a6d2484489ea07ac786a03e729f089c244;p=project%2Fluci.git

luci-mid-status: nftables.js: minor cleanups and enhancements

 - Recognize `log` expression as action
 - Recognize `meta time` expression
 - Remove debug tooltip from `reject` targets

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js
index 82660c1595..de2f3d4daa 100644
--- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js
+++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/nftables.js
@@ -25,6 +25,7 @@ var expr_translations = {
 
 	'meta.mark': _('Packet mark', 'nft meta mark'),
 
+	'meta.time': _('Packet receive time', 'nft meta time'),
 	'meta.hour': _('Current time', 'nft meta hour'),
 	'meta.day': _('Current weekday', 'nft meta day'),
 
@@ -95,6 +96,7 @@ var action_translations = {
 	'accept': _('Accept packet', 'nft accept action'),
 	'drop': _('Drop packet', 'nft drop action'),
 	'jump': _('Continue in <strong><a href="#%q.%q">%h</a></strong>', 'nft jump action'),
+	'log': _('Log event "<strong>%h</strong>…"', 'nft log action'),
 
 	'reject.tcp reset': _('Reject packet with <strong>TCP reset</strong>', 'nft reject with tcp reset'),
 	'reject.icmp': _('Reject IPv4 packet with <strong>ICMP type %h</strong>', 'nft reject with icmp type'),
@@ -154,6 +156,7 @@ return view.extend({
 				case 'masquerade':
 				case 'return':
 				case 'flow':
+				case 'log':
 					return true;
 				}
 			}
@@ -355,8 +358,7 @@ return view.extend({
 			var k = 'reject.%s'.format(spec.type);
 
 			return E('span', {
-				'class': 'ifacebadge',
-				'data-tooltip': JSON.stringify(spec)
+				'class': 'ifacebadge'
 			}, (action_translations[k] || k).format(this.exprToString(spec.expr)));
 
 		case 'accept':
@@ -445,6 +447,11 @@ return view.extend({
 				'class': 'ifacebadge'
 			}, action_translations.flow.format(spec.flowtable.replace(/^@/, '')));
 
+		case 'log':
+			return E('span', {
+				'class': 'ifacebadge'
+			}, action_translations.log.format(spec.prefix));
+
 		default:
 			return E('span', {
 				'class': 'ifacebadge',