From 3b3332f15cd6ec6431f01f31fc2f4655353e5676 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 15 Feb 2025 23:59:22 +0100
Subject: [PATCH] feat: use clientFK in dialog

---
 .../Customer/composables/getAddresses.js      |  8 +++----
 src/pages/Ticket/TicketList.vue               | 22 ++++++++++++++++---
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/pages/Customer/composables/getAddresses.js b/src/pages/Customer/composables/getAddresses.js
index e65e64455..5f18530e7 100644
--- a/src/pages/Customer/composables/getAddresses.js
+++ b/src/pages/Customer/composables/getAddresses.js
@@ -1,15 +1,15 @@
 import axios from 'axios';
 
-export async function getAddresses(clientId, _filter = {}) {   
+export async function getAddresses(clientId, _filter = {}) {
     if (!clientId) return;
     const filter = {
         ..._filter,
-        fields: ['nickname', 'street', 'city', 'id'],
+        fields: ['nickname', 'street', 'city', 'id', 'isActive'],
         where: { isActive: true },
-        order: 'nickname ASC',
+        order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
     };
     const params = { filter: JSON.stringify(filter) };
     return await axios.get(`Clients/${clientId}/addresses`, {
         params,
     });
-};
\ No newline at end of file
+}
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index b16472764..6490f3b8e 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, onBeforeMount } from 'vue';
+import { computed, ref, onBeforeMount, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
@@ -425,6 +425,23 @@ function setReference(data) {
 
     dialogData.value.value.description = newDescription;
 }
+
+const formInitialData = ref({});
+watch(
+    () => route.query.table,
+    (newValue) => {
+        if (newValue) {
+            const clientId = +JSON.parse(newValue)?.clientFk;
+            if (!clientFk) return;
+            formInitialData.value = {
+                clientId,
+            };
+            if (tableRef.value) tableRef.value.create.formInitialData = { clientId };
+            onClientSelected({ clientId });
+        }
+    },
+    { immediate: true },
+);
 </script>
 
 <template>
@@ -462,11 +479,10 @@ function setReference(data) {
                     urlCreate: 'Tickets/new',
                     title: t('ticketList.createTicket'),
                     onDataSaved: ({ id }) => tableRef.redirect(id),
-                    formInitialData: { clientId: null },
+                    formInitialData,
                 }"
                 default-mode="table"
                 :columns="columns"
-                :user-params="userParams"
                 :right-search="false"
                 redirect="ticket"
                 v-model:selected="selectedRows"