From d1b4fa2c18cee0e8a913b0868f82cf62a99544a0 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 23 Sep 2024 14:04:01 +0200
Subject: [PATCH] More gui improvements

---
 dev/Sieve/Commands/Tests.js                        |  1 -
 dev/Sieve/Extensions/rfc5235.js                    |  2 +-
 .../0.0.0/app/templates/Views/Sieve/AllOfTest.html | 10 ++++------
 .../0.0.0/app/templates/Views/Sieve/AnyOfTest.html | 14 ++++++--------
 .../0.0.0/app/templates/Views/Sieve/BodyTest.html  |  5 +++++
 .../app/templates/Views/Sieve/CurrentDateTest.html |  5 +++++
 .../0.0.0/app/templates/Views/Sieve/DateTest.html  |  5 +++++
 .../app/templates/Views/Sieve/EnvironmentTest.html |  5 +++++
 .../app/templates/Views/Sieve/HasFlagTest.html     |  5 +++++
 .../app/templates/Views/Sieve/HeaderTest.html      |  2 +-
 .../app/templates/Views/Sieve/MetadataTest.html    |  5 +++++
 .../Views/Sieve/NotifyMethodCapabilityTest.html    |  5 +++++
 .../templates/Views/Sieve/ServerMetadataTest.html  |  5 +++++
 .../app/templates/Views/Sieve/SpamTestTest.html    |  5 +++++
 .../app/templates/Views/Sieve/StringTest.html      |  5 +++++
 .../app/templates/Views/Sieve/VirusTestTest.html   |  5 +++++
 16 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/dev/Sieve/Commands/Tests.js b/dev/Sieve/Commands/Tests.js
index f566fadae..e5eb4a341 100644
--- a/dev/Sieve/Commands/Tests.js
+++ b/dev/Sieve/Commands/Tests.js
@@ -230,7 +230,6 @@ export class HeaderTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.match_type = ':is';
 		this.address_part = ':all';
 		this.header_names = new GrammarStringList;
 		this.key_list     = new GrammarStringList;
diff --git a/dev/Sieve/Extensions/rfc5235.js b/dev/Sieve/Extensions/rfc5235.js
index bfec1bb57..1c8bc46b2 100644
--- a/dev/Sieve/Extensions/rfc5235.js
+++ b/dev/Sieve/Extensions/rfc5235.js
@@ -51,7 +51,7 @@ export class VirusTestTest extends TestCommand
 		this._value = new GrammarQuotedString; // 1 - 5
 	}
 
-	get require() { return /:value|:count/.test(this.match_type) ? ['virustest','relational'] : 'virustest'; }
+	get require() { return /:value/.test(this.match_type) ? ['virustest','relational'] : 'virustest'; }
 
 	get value() { return this._value.value; }
 	set value(v) { this._value.value = v; }
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/AllOfTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/AllOfTest.html
index af8d2dc8c..8b60bb2f5 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/AllOfTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/AllOfTest.html
@@ -1,9 +1,7 @@
 <!-- rfc5228 -->
 <div data-bind="foreach: tests">
-	<div class="sieve-block">
-		<details>
-			<summary data-bind="text: $data"></summary>
-			<div data-bind="template: {name: $root.templateName($data)}"></div>
-		</details>
-	</div>
+	<details class="sieve-block">
+		<summary data-bind="text: $data"></summary>
+		<div data-bind="template: {name: $root.templateName($data)}"></div>
+	</details>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/AnyOfTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/AnyOfTest.html
index af8d2dc8c..56f8549ea 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/AnyOfTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/AnyOfTest.html
@@ -1,9 +1,7 @@
 <!-- rfc5228 -->
-<div data-bind="foreach: tests">
-	<div class="sieve-block">
-		<details>
-			<summary data-bind="text: $data"></summary>
-			<div data-bind="template: {name: $root.templateName($data)}"></div>
-		</details>
-	</div>
-</div>
+<!-- ko foreach: tests -->
+	<details class="sieve-block">
+		<summary data-bind="text: $data"></summary>
+		<div data-bind="template: {name: $root.templateName($data)}"></div>
+	</details>
+<!-- /ko -->
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/BodyTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/BodyTest.html
index c0e4783a1..47a8fe1c9 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/BodyTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/BodyTest.html
@@ -1,3 +1,8 @@
 <!-- rfc5173 -->
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 body_transform = ''; // :raw, :content <string-list>, :text
 <input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/CurrentDateTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/CurrentDateTest.html
index 6188f53c9..0aa49db22 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/CurrentDateTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/CurrentDateTest.html
@@ -1,5 +1,10 @@
 <!-- rfc5260 -->
 currentdate
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: zone">
 	<input type="text" data-bind="textInput: date_part">
 	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/DateTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/DateTest.html
index c53b5aa96..d626484c0 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/DateTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/DateTest.html
@@ -1,5 +1,10 @@
 <!-- rfc5260 -->
 date
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: zone">
 	<label><input type="checkbox" data-bind="checked: originalzone"> originalzone</label>
 	<input type="text" data-bind="textInput: header_name">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/EnvironmentTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/EnvironmentTest.html
index 9b2ab6085..97a721abe 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/EnvironmentTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/EnvironmentTest.html
@@ -1,4 +1,9 @@
 <!-- rfc5183 -->
 environment
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: name">
 	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/HasFlagTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/HasFlagTest.html
index 1d3791960..0f1c02bb3 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/HasFlagTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/HasFlagTest.html
@@ -1,4 +1,9 @@
 <!-- rfc5232 -->
 hasflag
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: variable_list" pattern='".+"|\[".+"(,".+")*\]'>
 	<input type="text" data-bind="textInput: list_of_flags" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/HeaderTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/HeaderTest.html
index 2e39c2163..d8dddbe7f 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/HeaderTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/HeaderTest.html
@@ -13,8 +13,8 @@
 	<option>:domain</option>
 	<option>:all</option>
 </select>
--->
 <br/>
+-->
 <input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
 <br/>
 <input type="number" data-bind="textInput: index">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/MetadataTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/MetadataTest.html
index dd7824d99..f38f4b8fa 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/MetadataTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/MetadataTest.html
@@ -1,5 +1,10 @@
 <!-- rfc5490 -->
 metadata
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: mailbox">
 	<input type="text" data-bind="textInput: annotation_name">
 	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/NotifyMethodCapabilityTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/NotifyMethodCapabilityTest.html
index 19338a107..d85dec557 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/NotifyMethodCapabilityTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/NotifyMethodCapabilityTest.html
@@ -1,5 +1,10 @@
 <!-- rfc5435 -->
 notifymethodcapability
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: notification_uri">
 	<input type="text" data-bind="textInput: notification_capability">
 	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/ServerMetadataTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/ServerMetadataTest.html
index bb3d86a09..f1ab26a8a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/ServerMetadataTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/ServerMetadataTest.html
@@ -1,4 +1,9 @@
 <!-- rfc5490 -->
 servermetadata
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: annotation_name">
 	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/SpamTestTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/SpamTestTest.html
index 861e647f3..74c4c1146 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/SpamTestTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/SpamTestTest.html
@@ -1,4 +1,9 @@
 <!-- rfc5235 -->
 spamtest
 	<input type="number">
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: value">
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/StringTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/StringTest.html
index fb3d85e34..3eb7a90e6 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/StringTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/StringTest.html
@@ -1,4 +1,9 @@
 <!-- rfc5229 -->
 string
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: source" pattern='".+"|\[".+"(,".+")*\]'>
 	<input type="text" data-bind="textInput: key_list" pattern='".+"|\[".+"(,".+")*\]'>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Sieve/VirusTestTest.html b/snappymail/v/0.0.0/app/templates/Views/Sieve/VirusTestTest.html
index 316964fb9..1b78bd417 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Sieve/VirusTestTest.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Sieve/VirusTestTest.html
@@ -1,3 +1,8 @@
 <!-- rfc5235 -->
 virustest
+<select data-bind="value: match_type">
+	<option>:is</option>
+	<option>:contains</option>
+	<option>:matches</option>
+</select>
 	<input type="text" data-bind="textInput: value"> // 1 - 5