Merge pull request #849 from dodona-edu/fix/search-pairs

Fix search in file pairs table

Author: maartenvn

web/src/components/PairsTable.vue

@@ -6,7 +6,7 @@
     :sort-by="'similarity'"
     :sort-desc="true"
     :items-per-page="15"
-    :search="search"
+    :search="searchValue"
     :footer-props="footerProps"
     :hide-default-footer="props.pairs.length <= props.itemsPerPage"
     @click:row="rowClicked"
@@ -20,20 +20,24 @@
 <script lang="ts" setup>
 import { shallowRef, onMounted } from "vue";
 import { useRouter, useRoute } from "@/composables";
+import { useVModel } from "@vueuse/core";
 import { Pair } from "@/api/models";
 import { DataTableHeader } from "vuetify";
 import SimilarityDisplay from "@/components/pair/SimilarityDisplay.vue";
 
 interface Props {
   pairs: Pair[];
-  itemsPerPage: number;
+  itemsPerPage?: number;
+  search?: string;
 }
 
 const props = withDefaults(defineProps<Props>(), {
   itemsPerPage: 15,
 });
+const emit = defineEmits(["update:search"]);
 const router = useRouter();
 const route = useRoute();
+const searchValue = useVModel(props, "search", emit);
 
 // Table headers
 const headers: DataTableHeader[] = [
@@ -51,17 +55,14 @@ const footerProps = {
   showFirstLastPage: true,
 };
 
-// Search value.
-const search = shallowRef("");
-
 // Items in the format for the the data-table.
 const items = shallowRef<any[]>([]);
 
 // Calculate the items for the table.
 const calculateItems = (): void => {
   const str = route.value.query.showIds as string | null;
 
-  items.value = Object.values(props.pairs)
+  items.value = props.pairs
     .map((pair) => ({
       pair,
       left: pair.leftFile.shortPath,

web/src/views/Pairs.vue

@@ -25,14 +25,16 @@
     </v-row>
 
     <v-card>
-      <PairsTable :pairs="pairStore.pairs" />
+      <PairsTable :search.sync="search" :pairs="pairStore.pairsList" />
     </v-card>
   </v-container>
 </template>
 
 <script lang="ts" setup>
+import { shallowRef } from "vue";
 import { usePairStore } from "@/api/stores";
 import PairsTable from "@/components/PairsTable.vue";
 
 const pairStore = usePairStore();
+const search = shallowRef("");
 </script>