From f6e53e478fcc51b6c4f07c5de3c9ae2741f05a4d Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 7 Feb 2025 07:27:36 +0100
Subject: [PATCH 1/2] fix: refs #7318 fixed claim summary warnings

---
 src/components/ui/VnNotes.vue            | 7 ++++++-
 src/components/ui/VnSearchbar.vue        | 4 ++--
 src/pages/Claim/Card/ClaimDescriptor.vue | 5 ++---
 src/pages/Claim/Card/ClaimNotes.vue      | 3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 5b1d6e726..ec6289a67 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -18,7 +18,12 @@ import VnInput from 'components/common/VnInput.vue';
 
 const emit = defineEmits(['onFetch']);
 
-const $attrs = useAttrs();
+const originalAttrs = useAttrs();
+
+const $attrs = computed(() => {
+    const { style, ...rest } = originalAttrs;
+    return rest;
+});
 
 const isRequired = computed(() => {
     return Object.keys($attrs).includes('required')
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 30e4135e2..df1dc522f 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -42,8 +42,8 @@ const props = defineProps({
         default: null,
     },
     order: {
-        type: String,
-        default: '',
+        type: Array,
+        default: [],
     },
     limit: {
         type: Number,
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index f55b0c48b..1a437de7d 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -86,7 +86,7 @@ onMounted(async () => {
                     />
                 </template>
             </VnLv>
-            <VnLv :label="t('claim.zone')">
+            <VnLv v-if="entity.ticket?.zone" :label="t('claim.zone')">
                 <template #value>
                     <span class="link">
                         {{ entity.ticket?.zone?.name }}
@@ -98,11 +98,10 @@ onMounted(async () => {
                 :label="t('claim.province')"
                 :value="entity.ticket?.address?.province?.name"
             />
-            <VnLv :label="t('claim.ticketId')">
+            <VnLv v-if="entity.ticketFk" :label="t('claim.ticketId')">
                 <template #value>
                     <span class="link">
                         {{ entity.ticketFk }}
-
                         <TicketDescriptorProxy :id="entity.ticketFk" />
                     </span>
                 </template>
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index 134ee33ab..cc6e33779 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, useAttrs } from 'vue';
 import { useRoute } from 'vue-router';
 import { useState } from 'src/composables/useState';
 import VnNotes from 'src/components/ui/VnNotes.vue';
@@ -7,6 +7,7 @@ import VnNotes from 'src/components/ui/VnNotes.vue';
 const route = useRoute();
 const state = useState();
 const user = state.getUser();
+const $attrs = useAttrs();
 
 const $props = defineProps({
     id: { type: [Number, String], default: null },
-- 
2.40.1


From 1f1fa1e2b66df3e142855749d9a22c295b924749 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 7 Feb 2025 08:32:33 +0100
Subject: [PATCH 2/2] refactor: refs #7318 update order prop type to string and
 improve conditional rendering for zone

---
 src/components/ui/VnSearchbar.vue        | 4 ++--
 src/pages/Claim/Card/ClaimDescriptor.vue | 2 +-
 src/pages/Claim/ClaimList.vue            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index df1dc522f..30e4135e2 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -42,8 +42,8 @@ const props = defineProps({
         default: null,
     },
     order: {
-        type: Array,
-        default: [],
+        type: String,
+        default: '',
     },
     limit: {
         type: Number,
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 1a437de7d..3749b0c7c 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -86,7 +86,7 @@ onMounted(async () => {
                     />
                 </template>
             </VnLv>
-            <VnLv v-if="entity.ticket?.zone" :label="t('claim.zone')">
+            <VnLv v-if="entity.ticket?.zone?.id" :label="t('claim.zone')">
                 <template #value>
                     <span class="link">
                         {{ entity.ticket?.zone?.name }}
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index ba74ba212..c05583314 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -131,7 +131,7 @@ const STATE_COLOR = {
         prefix="claim"
         :array-data-props="{
             url: 'Claims/filter',
-            order: ['cs.priority ASC', 'created ASC'],
+            order: 'cs.priority ASC, created ASC',
         }"
     >
         <template #advanced-menu>
-- 
2.40.1