From 4febea92db7c4cb42eb976e5cbb72b63745b5966 Mon Sep 17 00:00:00 2001
From: Kazhnuz <kazhnuz@kobold.cafe>
Date: Sun, 19 Feb 2023 21:29:00 +0100
Subject: [PATCH] fix: Correction recherche et page

---
 src/components/tableaux/TableRenderer.vue  | 16 +++++++---------
 src/utils/tables/FilteredHtmlTable.ts      | 14 ++++++++++++++
 src/utils/tables/PaginatedFilteredTable.ts | 20 +++++++++++++++++++-
 3 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/src/components/tableaux/TableRenderer.vue b/src/components/tableaux/TableRenderer.vue
index e202a8e..6bc938d 100644
--- a/src/components/tableaux/TableRenderer.vue
+++ b/src/components/tableaux/TableRenderer.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, reactive, onMounted, ref } from "vue";
+import { computed, reactive, onMounted } from "vue";
 import PaginatedFilteredTable from "@/utils/tables/PaginatedFilteredTable";
 import type { TableField, TableItem } from "@/utils/tables/types";
 import type { PropType } from "vue";
@@ -21,8 +21,6 @@ const DEFAULT_MAX_ITEM_BY_PAGE = 10;
 
 const table = reactive(new PaginatedFilteredTable(DEFAULT_MAX_ITEM_BY_PAGE));
 
-const textSearch = ref("");
-
 const filtersFieldMap = computed(() => {
   return table?.filteredTable?.filtersFieldMap;
 });
@@ -32,11 +30,7 @@ const displayedFieldKeys = computed(() => {
 });
 
 const paginatedList = computed(() => {
-  if (textSearch.value !== "") {
-    return table?.search(textSearch.value);
-  } else {
-    return table?.items;
-  }
+  return table?.items;
 });
 
 onMounted(() => {
@@ -69,7 +63,11 @@ function goTo(page: number) {
 <template>
   <div class="d-flex f-between">
     <div>
-      <input v-model="textSearch" class="btn-small" placeholder="Rechercher" />
+      <input
+        v-model="table.textSearch"
+        class="btn-small"
+        placeholder="Rechercher"
+      />
     </div>
     <div class="d-flex f-end">
       <TagList
diff --git a/src/utils/tables/FilteredHtmlTable.ts b/src/utils/tables/FilteredHtmlTable.ts
index 5c8c56d..9654e07 100644
--- a/src/utils/tables/FilteredHtmlTable.ts
+++ b/src/utils/tables/FilteredHtmlTable.ts
@@ -5,6 +5,7 @@ import type { FilterFieldsMap, Filters, TableField, TableItem } from "./types";
 export default class FilteredHtmlTable {
   table: SimpleHtmlTable;
   filtersFieldMap: FilterFieldsMap = {};
+  textSearch = "";
 
   constructor() {
     this.table = new SimpleHtmlTable();
@@ -48,6 +49,19 @@ export default class FilteredHtmlTable {
       }
     }
 
+    if (this.textSearch !== "") {
+      filteredItem = filteredItem.filter((row) => {
+        for (const field of this.table.fields) {
+          if (field.canBeSearched) {
+            if ((row[field.key] as string).includes(this.textSearch)) {
+              return true;
+            }
+          }
+        }
+        return false;
+      });
+    }
+
     return filteredItem;
   }
 
diff --git a/src/utils/tables/PaginatedFilteredTable.ts b/src/utils/tables/PaginatedFilteredTable.ts
index 28eea1c..e4cfeb3 100644
--- a/src/utils/tables/PaginatedFilteredTable.ts
+++ b/src/utils/tables/PaginatedFilteredTable.ts
@@ -1,7 +1,16 @@
 import FilteredHtmlTable from "./FilteredHtmlTable";
 import type { TableField, TableItem } from "./types";
 
-export default class PaginatedFilteredTable {
+export interface PaginatedTable {
+  filteredTable: FilteredHtmlTable;
+  pageLenght: number;
+  currentPage: number;
+  pageNumber: number;
+  items: TableItem[];
+  textSearch: string;
+}
+
+export default class PaginatedFilteredTable implements PaginatedTable {
   filteredTable: FilteredHtmlTable;
   pageLenght: number;
   currentPage = 0;
@@ -30,6 +39,15 @@ export default class PaginatedFilteredTable {
     this.filteredTable.fields = fields;
   }
 
+  set textSearch(textSearch: string) {
+    this.currentPage = 0;
+    this.filteredTable.textSearch = textSearch;
+  }
+
+  get textSearch() {
+    return this.filteredTable.textSearch;
+  }
+
   public addItems(items: TableItem[]) {
     this.filteredTable.addItems(items);
   }