From f49b9b7f019ebd99a40552b67c929a94c4e16d4a Mon Sep 17 00:00:00 2001
From: marlon-erler <viridian035@gmail.com>
Date: Mon, 15 Jul 2024 17:15:52 +0200
Subject: [PATCH] show results in filter modal, support regex in search

---
 dist/index.js                    | 17 ++++++++++++-----
 src/Views/Objects/objectPane.tsx | 20 +++++++++++++++-----
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/dist/index.js b/dist/index.js
index 2d0fbbad..6581f1e5 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -2095,9 +2095,11 @@
     }
     function updateObjects() {
       const allObjects = [...chat.objects.value.entries()];
-      const matchingObjects = allObjects.filter(
-        (entry) => entry[1].title.indexOf(appliedFilter.value) != -1
-      );
+      const matchingObjects = allObjects.filter((entry) => {
+        let objectTitle = entry[1].title || translation.untitledObject;
+        const regex = new RegExp(appliedFilter.value.toLowerCase());
+        return regex.test(objectTitle.toLowerCase());
+      });
       resultCount.value = matchingObjects.length;
       messageObjects.clear();
       matchingObjects.forEach((entry) => messageObjects.set(...entry));
@@ -2159,7 +2161,7 @@
         class: "object-content width-100 height-100 flex scroll-no",
         "children:set": mainView
       }
-    ), /* @__PURE__ */ createElement("div", { "children:set": objectModal }), /* @__PURE__ */ createElement("div", { class: "modal", "toggle:open": isShowingFilterModel }, /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, translation.filterObjects), /* @__PURE__ */ createElement("div", { class: "flex-column" }, /* @__PURE__ */ createElement("label", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "search"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translation.searchByTitle), /* @__PURE__ */ createElement(
+    ), /* @__PURE__ */ createElement("div", { class: "modal", "toggle:open": isShowingFilterModel }, /* @__PURE__ */ createElement("div", { style: "max-width: unset; width: 100%" }, /* @__PURE__ */ createElement("main", null, /* @__PURE__ */ createElement("h2", null, translation.filterObjects), /* @__PURE__ */ createElement("div", { class: "flex-column" }, /* @__PURE__ */ createElement("label", { class: "tile" }, /* @__PURE__ */ createElement("span", { class: "icon" }, "search"), /* @__PURE__ */ createElement("div", null, /* @__PURE__ */ createElement("span", null, translation.searchByTitle), /* @__PURE__ */ createElement(
       "input",
       {
         "bind:value": filterInput,
@@ -2174,7 +2176,12 @@
         "toggle:disabled": cannotReset
       },
       translation.reset
-    ), /* @__PURE__ */ createElement("button", { class: "width-50 flex primary", "on:click": applyFilter }, translation.search, /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_forward"))), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("span", { class: "secondary", "subscribe:innerText": resultText })), /* @__PURE__ */ createElement("button", { "on:click": closeFilters }, translation.close, /* @__PURE__ */ createElement("span", { class: "icon" }, "close")))));
+    ), /* @__PURE__ */ createElement("button", { class: "width-50 flex primary", "on:click": applyFilter }, translation.search, /* @__PURE__ */ createElement("span", { class: "icon" }, "arrow_forward"))), /* @__PURE__ */ createElement("hr", null), /* @__PURE__ */ createElement("span", { class: "secondary", "subscribe:innerText": resultText }), ObjectGridView(
+      chat,
+      messageObjects,
+      selectedObject,
+      isShowingObjectModal
+    )), /* @__PURE__ */ createElement("button", { "on:click": closeFilters }, translation.close, /* @__PURE__ */ createElement("span", { class: "icon" }, "close")))), /* @__PURE__ */ createElement("div", { "children:set": objectModal }));
   }
   function ViewTypeToggle(key, selection) {
     const [label, icon] = viewTypes[key];
diff --git a/src/Views/Objects/objectPane.tsx b/src/Views/Objects/objectPane.tsx
index e1724ea9..0c270668 100644
--- a/src/Views/Objects/objectPane.tsx
+++ b/src/Views/Objects/objectPane.tsx
@@ -6,6 +6,7 @@ import { AllObjectsView } from "./allObjectsView";
 import { KanbanView } from "./kanbanView";
 import { NoteObjectsView } from "./noteObjectsView";
 import { ObjectDetailModal } from "./objectDetailModal";
+import { ObjectGridView } from "./objectGridView";
 import { StatusView } from "./statusView";
 import { icons } from "../../icons";
 import { translation } from "../../translations";
@@ -63,9 +64,11 @@ export function ObjectPane(chat: Chat) {
 
   function updateObjects() {
     const allObjects = [...chat.objects.value.entries()];
-    const matchingObjects = allObjects.filter(
-      (entry) => entry[1].title.indexOf(appliedFilter.value) != -1
-    );
+    const matchingObjects = allObjects.filter((entry) => {
+      let objectTitle = entry[1].title || translation.untitledObject;
+      const regex = new RegExp(appliedFilter.value.toLowerCase());
+      return regex.test(objectTitle.toLowerCase());
+    });
     resultCount.value = matchingObjects.length;
     messageObjects.clear();
     matchingObjects.forEach((entry) => messageObjects.set(...entry));
@@ -140,9 +143,8 @@ export function ObjectPane(chat: Chat) {
         children:set={mainView}
       ></div>
 
-      <div children:set={objectModal}></div>
       <div class="modal" toggle:open={isShowingFilterModel}>
-        <div>
+        <div style="max-width: unset; width: 100%">
           <main>
             <h2>{translation.filterObjects}</h2>
 
@@ -176,6 +178,13 @@ export function ObjectPane(chat: Chat) {
             <hr></hr>
 
             <span class="secondary" subscribe:innerText={resultText}></span>
+
+            {ObjectGridView(
+              chat,
+              messageObjects,
+              selectedObject,
+              isShowingObjectModal
+            )}
           </main>
           <button on:click={closeFilters}>
             {translation.close}
@@ -183,6 +192,7 @@ export function ObjectPane(chat: Chat) {
           </button>
         </div>
       </div>
+      <div children:set={objectModal}></div>
     </div>
   );
 }