dotnet 10, synapse admin room list improvements HEAD master

1 files changed, 53 insertions, 29 deletions

diff --git a/MatrixUtils.Web/Pages/HSAdmin/Synapse/Components/RoomQuery/SynapseRoomQueryFilter.razor b/MatrixUtils.Web/Pages/HSAdmin/Synapse/Components/RoomQuery/SynapseRoomQueryFilter.razor

index eb168f4..f1c5907 100644
--- a/MatrixUtils.Web/Pages/HSAdmin/Synapse/Components/RoomQuery/SynapseRoomQueryFilter.razor
+++ b/MatrixUtils.Web/Pages/HSAdmin/Synapse/Components/RoomQuery/SynapseRoomQueryFilter.razor
@@ -1,46 +1,70 @@
 @using LibMatrix.Homeservers.ImplementationDetails.Synapse.Models.Filters
+@using MatrixUtils.Web.Shared.FilterComponents
 <div style="margin-left: 8px; margin-bottom: 8px;">
     <u style="display: block;">String contains</u>
-    <span class="tile tile280">Room ID: <FancyTextBox @bind-Value="@Filter.RoomIdContains"></FancyTextBox></span>
-    <span class="tile tile280">Room name: <FancyTextBox @bind-Value="@Filter.NameContains"></FancyTextBox></span>
-    <span class="tile tile280">Canonical alias: <FancyTextBox @bind-Value="@Filter.CanonicalAliasContains"></FancyTextBox></span>
-    <span class="tile tile280">Creator: <FancyTextBox @bind-Value="@Filter.CreatorContains"></FancyTextBox></span>
-    <span class="tile tile280">Room version: <FancyTextBox @bind-Value="@Filter.VersionContains"></FancyTextBox></span>
-    <span class="tile tile280">Encryption algorithm: <FancyTextBox @bind-Value="@Filter.EncryptionContains"></FancyTextBox></span>
-    <span class="tile tile280">Join rules: <FancyTextBox @bind-Value="@Filter.JoinRulesContains"></FancyTextBox></span>
-    <span class="tile tile280">Guest access: <FancyTextBox @bind-Value="@Filter.GuestAccessContains"></FancyTextBox></span>
-    <span class="tile tile280">History visibility: <FancyTextBox @bind-Value="@Filter.HistoryVisibilityContains"></FancyTextBox></span>
+    <span class="tile tile280"><StringFilterComponent Filter="@Filter.RoomId" Label="Room ID"/></span>
+    <span class="tile tile280"><StringFilterComponent Filter="@Filter.Name" Label="Room name"/></span>
+    <span class="tile tile280"><StringFilterComponent Filter="@Filter.CanonicalAlias" Label="Canonical alias"/></span>
+    <span class="tile tile280"><StringFilterComponent Filter="@Filter.Creator" Label="Creator"/></span>
+    <span class="tile tile280"><StringFilterComponent Filter="@Filter.Version" Label="Room version"/></span>
+    <span class="tile tile280"><StringFilterComponent Filter="@Filter.Encryption" Label="Encryption algorithm"/></span>
+    <span class="tile tile280"><StringFilterComponent Filter="@Filter.JoinRules" Label="Join rules"/></span>
+    <span class="tile tile280"><StringFilterComponent Filter="@Filter.GuestAccess" Label="Guest access"/></span>
+    <span class="tile tile280"><StringFilterComponent Filter="@Filter.HistoryVisibility" Label="History visibility"/></span>
+    <span class="tile tile280"><StringFilterComponent Filter="@Filter.Topic" Label="Topic"/></span>
 
     <u style="display: block;">Optional checks</u>
-    <span class="tile tile150">
-        <InputCheckbox @bind-Value="@Filter.CheckFederation"></InputCheckbox> Is federated:
-        @if (Filter.CheckFederation) {
-            <InputCheckbox @bind-Value="@Filter.Federatable"></InputCheckbox>
-        }
-    </span>
-    <span class="tile tile150">
-        <InputCheckbox @bind-Value="@Filter.CheckPublic"></InputCheckbox> Is public:
-        @if (Filter.CheckPublic) {
-            <InputCheckbox @bind-Value="@Filter.Public"></InputCheckbox>
-        }
-    </span>
+    <span class="tile tile150"><BooleanFilterComponent Filter="@Filter.Federation" Label="Is federated"/></span>
+    <span class="tile tile150"><BooleanFilterComponent Filter="@Filter.Public" Label="Is public"/></span>
+    <span class="tile tile150"><BooleanFilterComponent Filter="@Filter.Tombstone" Label="Is tombstoned"/></span>
 
     <u style="display: block;">Ranges</u>
     <span class="tile center-children">
-        <InputNumber max="@int.MaxValue" class="int-input" TValue="int" @bind-Value="@Filter.StateEventsGreaterThan"/>
-        <span class="range-sep">state events</span>
-        <InputNumber max="@int.MaxValue" class="int-input" TValue="int" @bind-Value="@Filter.StateEventsLessThan"/>
+        <InputCheckbox @bind-Value="@Filter.StateEvents.Enabled"/>
+        @if (!Filter.StateEvents.Enabled) {
+            <span>State events</span>
+        }
+        else {
+            <InputCheckbox @bind-Value="@Filter.StateEvents.CheckGreaterThan"/>
+            <span> </span>
+            <InputNumber max="@int.MaxValue" class="int-input" TValue="int" @bind-Value="@Filter.StateEvents.GreaterThan"/>
+            <span class="range-sep">state events</span>
+            <InputCheckbox @bind-Value="@Filter.StateEvents.CheckLessThan"/>
+            <InputNumber max="@int.MaxValue" class="int-input" TValue="int" @bind-Value="@Filter.StateEvents.LessThan"/>
+        }
     </span>
     <span class="tile center-children">
-        <InputNumber max="@int.MaxValue" class="int-input" TValue="int" @bind-Value="@Filter.JoinedMembersGreaterThan"></InputNumber><span class="range-sep">members</span><InputNumber
-            max="@int.MaxValue" class="int-input" TValue="int" @bind-Value="@Filter.JoinedMembersLessThan"></InputNumber>
+        <InputCheckbox @bind-Value="@Filter.JoinedMembers.Enabled"/>
+        @if (!Filter.JoinedMembers.Enabled) {
+            <span>Joined members</span>
+        }
+        else {
+            <InputCheckbox @bind-Value="@Filter.JoinedMembers.CheckGreaterThan"/>
+            <span> </span>
+            <InputNumber max="@int.MaxValue" class="int-input" TValue="int" @bind-Value="@Filter.JoinedMembers.GreaterThan"/>
+            <span class="range-sep">members</span>
+            <InputCheckbox @bind-Value="@Filter.JoinedMembers.CheckLessThan"/>
+            <InputNumber max="@int.MaxValue" class="int-input" TValue="int" @bind-Value="@Filter.JoinedMembers.LessThan"/>
+        }
     </span>
     <span class="tile center-children">
-        <InputNumber max="@int.MaxValue" class="int-input" TValue="int" @bind-Value="@Filter.JoinedLocalMembersGreaterThan"></InputNumber><span
-            class="range-sep">local members</span><InputNumber max="@int.MaxValue" class="int-input" TValue="int"
-                                                               @bind-Value="@Filter.JoinedLocalMembersLessThan"></InputNumber>
+        <InputCheckbox @bind-Value="@Filter.JoinedLocalMembers.Enabled"/>
+        <span> </span>
+        @if (!Filter.JoinedLocalMembers.Enabled) {
+            <span>Joined local members</span>
+        }
+        else {
+            <InputCheckbox @bind-Value="@Filter.JoinedLocalMembers.CheckGreaterThan"/>
+            <InputNumber max="@int.MaxValue" class="int-input" TValue="int" @bind-Value="@Filter.JoinedLocalMembers.GreaterThan"/>
+            <span class="range-sep">local members</span>
+            <InputCheckbox @bind-Value="@Filter.JoinedLocalMembers.CheckLessThan"/>
+            <InputNumber max="@int.MaxValue" class="int-input" TValue="int" @bind-Value="@Filter.JoinedLocalMembers.LessThan"/>
+        }
     </span>
 </div>
+@* @{ *@
+@*     Console.WriteLine($"Rendered SynapseRoomQueryFilter with filter: {Filter.ToJson()}"); *@
+@* } *@
 
 @code {