refactor: refs #6919 replace userFilter prop with filter in multiple components
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Jorge Penadés 2025-01-30 16:25:43 +01:00
parent 19fd0ee71b
commit b083dada83
11 changed files with 8 additions and 43 deletions

View File

@ -12,7 +12,6 @@ const props = defineProps({
url: { type: String, default: undefined },
idInWhere: { type: Boolean, default: false },
filter: { type: Object, default: () => {} },
userFilter: { type: Object, default: () => {} },
descriptor: { type: Object, required: true },
filterPanel: { type: Object, default: undefined },
searchDataKey: { type: String, default: undefined },
@ -24,7 +23,7 @@ const stateStore = useStateStore();
const router = useRouter();
const arrayData = useArrayData(props.dataKey, {
url: props.url,
userFilter: props.userFilter,
userFilter: props.filter,
oneRecord: true,
});

View File

@ -8,7 +8,6 @@ import filter from './ClaimFilter.js';
data-key="Claim"
url="Claims"
:descriptor="ClaimDescriptor"
:filter-panel="ClaimFilter"
search-data-key="ClaimList"
:filter="filter"
/>

View File

@ -8,6 +8,6 @@ import filter from './EntryFilter.js';
data-key="Entry"
url="Entries"
:descriptor="EntryDescriptor"
:user-filter="filter"
:filter="filter"
/>
</template>

View File

@ -13,6 +13,6 @@ onBeforeRouteUpdate(async (to) => await setRectificative(to));
data-key="InvoiceIn"
url="InvoiceIns"
:descriptor="InvoiceInDescriptor"
:user-filter="filter"
:filter="filter"
/>
</template>

View File

@ -1,7 +1,6 @@
<script setup>
import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
import VnCardBeta from 'components/common/VnCardBeta.vue';
import InvoiceOutFilter from '../InvoiceOutFilter.vue';
import filter from './InvoiceOutFilter.js';
</script>
<template>

View File

@ -1,6 +1,7 @@
<script setup>
import VnCardBeta from 'components/common/VnCardBeta.vue';
import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
import filter from './OrderFilter.js';
</script>
<template>

View File

@ -3,5 +3,5 @@ import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
import VnCardBeta from 'src/components/common/VnCardBeta.vue';
</script>
<template>
<VnCardBeta data-key="Agency" base-url="Agencies" :descriptor="AgencyDescriptor" />
<VnCardBeta data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" />
</template>

View File

@ -3,5 +3,5 @@ import VnCardBeta from 'components/common/VnCardBeta.vue';
import RoadmapDescriptor from 'pages/Route/Roadmap/RoadmapDescriptor.vue';
</script>
<template>
<VnCardBeta data-key="Roadmap" base-url="Roadmaps" :descriptor="RoadmapDescriptor" />
<VnCardBeta data-key="Roadmap" url="Roadmaps" :descriptor="RoadmapDescriptor" />
</template>

View File

@ -1,7 +1,6 @@
<script setup>
import VnCardBeta from 'components/common/VnCardBeta.vue';
import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
import ShelvingFilter from './ShelvingFilter.vue';
import filter from './ShelvingFilter.js';
</script>

View File

@ -1,7 +1,6 @@
<script setup>
import VnCard from 'components/common/VnCard.vue';
import SupplierDescriptor from './SupplierDescriptor.vue';
import SupplierListFilter from '../SupplierListFilter.vue';
import filter from './SupplierFilter.js';
</script>
<template>
@ -10,7 +9,6 @@ import filter from './SupplierFilter.js';
url="Suppliers"
:filter="filter"
:descriptor="SupplierDescriptor"
:filter-panel="SupplierListFilter"
search-data-key="SupplierList"
:searchbar-props="{
url: 'Suppliers/filter',

View File

@ -1,43 +1,13 @@
<script setup>
import TravelDescriptor from './TravelDescriptor.vue';
import VnCardBeta from 'src/components/common/VnCardBeta.vue';
const userFilter = {
fields: [
'id',
'ref',
'shipped',
'landed',
'totalEntries',
'warehouseInFk',
'warehouseOutFk',
'cargoSupplierFk',
'agencyModeFk',
'isRaid',
'isDelivered',
'isReceived',
],
include: [
{
relation: 'warehouseIn',
scope: {
fields: ['name'],
},
},
{
relation: 'warehouseOut',
scope: {
fields: ['name'],
},
},
],
};
import filter from './TravelFilter.js';
</script>
<template>
<VnCardBeta
data-key="Travel"
url="Travels"
:descriptor="TravelDescriptor"
:user-filter="userFilter"
:filter="filter"
/>
</template>