From c47cb05cbd22b8547aa64345f3daac8dab21f7f1 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 9 Apr 2025 08:23:38 +0200
Subject: [PATCH] fix(VnLog): update filter to include originFk and improve
 sorting in VnLogFilter

---
 src/components/common/VnLog.vue       | 9 +--------
 src/components/common/VnLogFilter.vue | 2 +-
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index e2f18866a..7020c8489 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -68,7 +68,6 @@ const filter = {
             },
         },
     ],
-    where: { and: [{ originFk: route.params.id }] },
 };
 
 const paginate = ref();
@@ -267,13 +266,6 @@ onMounted(() => {
 onUnmounted(() => {
     stateStore.rightDrawer = false;
 });
-
-watch(
-    () => router.currentRoute.value.params.id,
-    () => {
-        applyFilter();
-    },
-);
 </script>
 <template>
     <VnPaginate
@@ -281,6 +273,7 @@ watch(
         :data-key
         :url="dataKey + 's'"
         :user-filter="filter"
+        :filter="{ where: { and: [{ originFk: route.params.id }] } }"
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
diff --git a/src/components/common/VnLogFilter.vue b/src/components/common/VnLogFilter.vue
index c7be68e9e..606da0182 100644
--- a/src/components/common/VnLogFilter.vue
+++ b/src/components/common/VnLogFilter.vue
@@ -39,7 +39,7 @@ const checkboxOptions = ref([
     { name: 'select', label: 'Accesses', selected: false },
 ]);
 const columns = computed(() => [
-    { name: 'changedModelValue' },
+    { name: 'changedModelValue', orderBy: 'id' },
     { name: 'changedModel' },
     { name: 'userType', orderBy: false },
     { name: 'userFk' },