Fix search pagination

Author: danniel

api/paul_api/api/serializers/tables.py

@@ -238,4 +238,4 @@ def get_current_user_permissions(self, obj: Table) -> List[str]:
 
 class TableSearchCountSerializer(serializers.Serializer):
     table = serializers.IntegerField()
-    total = serializers.IntegerField()
+    count = serializers.IntegerField()

api/paul_api/api/views.py

@@ -299,7 +299,7 @@ def search(self, request):
 
         queryset = models.Entry.objects.filter(
             table__id__in=table_ids, data__icontains=needle
-        ).all().values("table").annotate(total=Count("table")).order_by("table")
+        ).all().values("table").annotate(count=Count("table")).order_by("table")
 
         serializer = serializers.tables.TableSearchCountSerializer(queryset, many=True)
         return Response(serializer.data)

client/src/views/Dashboard.vue

@@ -55,15 +55,17 @@
         </div>
       </ValidationObserver>
 
-      <BaseCard v-for="searchTable in searchTables" :title="searchTable.name" :key="'searchResultCard'+searchTable.id">
-        <BaseTableAsync
-          :key="'searchResultTable'+searchTable.id"
-          :table="searchTable"
-          :tableEntries="searchTableResults[searchTable.id] || {}"
-          @update="updateTableEntries(searchTable.id)"
-          tableActionsComponent="ActionsTableSearch"
-        />
-      </BaseCard>
+      <template v-if="searchTables">
+        <BaseCard v-for="searchTable in searchTables" :title="searchTable.name" :key="`searchResultCard${searchTable.id}`">
+          <BaseTableAsync
+            :key="'searchResultTable'+searchTable.id"
+            :table="searchTable"
+            :tableEntries="searchTableResults[searchTable.id] || {}"
+            @update="updateTableEntries(searchTable.id, $event)"
+            tableActionsComponent="ActionsTableSearch"
+          />
+        </BaseCard>
+      </template>
 
     </BaseCard>
 
@@ -189,8 +191,15 @@ export default {
         })
       })
     },
-    updateTableEntries(tableId) {
-      TableService.getEntries(tableId, {search: this.searchTerm}).then(response => {
+    updateTableEntries(tableId, queryPagination) {
+      let query = {}
+      if (queryPagination) {
+        query = {search: this.searchTerm, page: queryPagination.page}
+      } else {
+        query = {search: this.searchTerm}
+      }
+
+      TableService.getEntries(tableId, query).then(response => {
         this.$set(this.searchTableResults, tableId, response)
       })
     },