Merge branch 'dev' into 8683-vnSelectSortByOptionLabel

Jenkinsfile

@@ -123,7 +123,7 @@ pipeline {
                             sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
 
                             image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
-                                sh 'sh test/cypress/cypressParallel.sh 3'
+                                sh 'sh test/cypress/cypressParallel.sh 2'
                             }
                         }
                     }

src/components/VnTable/VnTable.vue

@@ -1136,9 +1136,13 @@ es:
 
 .grid-create {
     display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
+    grid-template-columns: 1fr 1fr;
+    max-width: 100%;
     grid-gap: 20px;
     margin: 0 auto;
+    .col-span-2 {
+        grid-column: span 2;
+    }
 }
 
 .flex-one {

src/pages/Account/AccountList.vue

@@ -149,14 +149,12 @@ const columns = computed(() => [
                 :right-search="false"
             >
                 <template #more-create-dialog="{ data }">
-                    <QCardSection>
                         <VnInputPassword
                             :label="t('Password')"
                             v-model="data.password"
                             :required="true"
                             autocomplete="new-password"
                         />
-                    </QCardSection>
                 </template>
             </VnTable>
         </template>

src/pages/Customer/Card/CustomerMandates.vue

@@ -16,7 +16,6 @@ const filter = {
         { relation: 'mandateType', scope: { fields: ['id', 'code'] } },
         { relation: 'company', scope: { fields: ['id', 'code'] } },
     ],
-    where: { clientFk: route.params.id },
     order: ['created DESC'],
     limit: 20,
 };
@@ -65,7 +64,8 @@ const columns = computed(() => [
         <VnTable
             data-key="Mandates"
             url="Mandates"
-            :filter="filter"
+            :user-filter="filter"
+            :filter="{ where: { clientFk: route.params.id } }"
             auto-load
             :columns="columns"
             class="full-width q-mt-md"

src/pages/Entry/Card/EntryDescriptor.vue

@@ -146,9 +146,8 @@ async function deleteEntry() {
 
 <template>
     <CardDescriptor
-        ref="entryDescriptorRef"
         :url="`Entries/${entityId}`"
-        :userFilter="entryFilter"
+        :filter="entryFilter"
         title="supplier.nickname"
         data-key="Entry"
         width="lg-width"

src/pages/Entry/EntryList.vue

@@ -283,7 +283,11 @@ onBeforeMount(async () => {
 </script>
 
 <template>
-    <VnSection :data-key="dataKey" prefix="entry">
+    <VnSection
+        :data-key="dataKey"
+        prefix="entry"
+        :array-data-props="{ url: 'Entries/filter' }"
+    >
         <template #advanced-menu>
             <EntryFilter :data-key="dataKey" />
         </template>

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -230,7 +230,7 @@ watchEffect(selectedRows);
                     </span>
                 </template>
                 <template #more-create-dialog="{ data }">
-                    <div class="row q-col-gutter-xs">
+                    <div class="row q-col-gutter-xs col-span-2">
                         <div class="col-12">
                             <div class="q-col-gutter-xs">
                                 <VnRow fixed>

src/pages/Order/OrderList.vue

@@ -156,9 +156,7 @@ const columns = computed(() => [
 onMounted(async () => {
     if (!route.query) return;
     if (route.query?.createForm) {
-        const query = JSON.parse(route.query?.createForm);
+        await onClientSelected(JSON.parse(route.query?.createForm));
-        formInitialData.value = query;
-        await onClientSelected({ ...formInitialData.value, clientFk: query?.clientFk });
     } else if (route.query?.table) {
         const query = JSON.parse(route.query?.table);
         const clientFk = query?.clientFk;
@@ -177,7 +175,6 @@ watch(
                 tableRef.value.create.formInitialData = formInitialData.value;
         }
     },
-    { immediate: true },
 );
 
 async function onClientSelected({ clientFk }, formData = {}) {
@@ -191,13 +188,17 @@ async function onClientSelected({ clientFk }, formData = {}) {
     addressOptions.value = data;
     formData.defaultAddressFk = data[0].client.defaultAddressFk;
     formData.addressId = formData.defaultAddressFk;
-
+    formInitialData.value = { ...formData, clientFk };
-    formInitialData.value = { addressId: formData.addressId, clientFk };
     await fetchAgencies(formData);
 }
 
-async function fetchAgencies({ landed, addressId }) {
+async function fetchAgencies(formData) {
-    if (!landed || !addressId) return (agencyList.value = []);
+    const { landed, addressId } = formData;
+    if (!landed || !addressId) {
+        formData.defaultAddressFk = formInitialData.value.defaultAddressFk;
+
+        return (agencyList.value = []);
+    }
 
     const { data } = await axios.get('Agencies/landsThatDay', {
         params: {
@@ -220,6 +221,11 @@ const getDateColor = (date) => {
     if (difference == 0) return 'bg-warning';
     if (difference < 0) return 'bg-success';
 };
+
+const isDefaultAddress = (opt, data) => {
+    const addressId = data.defaultAddressFk ?? data.addressId;
+    return addressId === opt.id && opt.isActive;
+};
 </script>
 
 <template>
@@ -310,10 +316,7 @@ const getDateColor = (date) => {
                             >
                                 <QItemSection style="min-width: min-content" avatar>
                                     <QIcon
-                                        v-if="
+                                        v-if="isDefaultAddress(scope.opt, data)"
-                                            scope.opt.isActive &&
-                                            data.defaultAddressFk === scope.opt.id
-                                        "
                                         size="sm"
                                         color="grey"
                                         name="star"

src/pages/Supplier/SupplierList.vue

@@ -172,6 +172,7 @@ const filterColumns = computed(() => {
             >
                 <template #more-create-dialog="{ data }">
                     <VnInput
+                        class="col-span-2"
                         :label="t('globals.name')"
                         v-model="data.socialName"
                         :uppercase="true"

src/pages/Ticket/TicketList.vue

@@ -54,8 +54,7 @@ onBeforeMount(() => {
 onMounted(async () => {
     if (!route.query) return;
     if (route.query?.createForm) {
-        formInitialData.value = JSON.parse(route.query?.createForm);
+        await onClientSelected(JSON.parse(route.query?.createForm));
-        await onClientSelected(formInitialData.value);
     } else if (route.query?.table) {
         const query = route.query?.table;
         const clientId = +JSON.parse(query)?.clientFk;
@@ -273,12 +272,18 @@ const fetchAddresses = async (formData) => {
         return;
     }
     const { data } = await getAddresses(formData.clientId);
+
+    if (!data) {
         formInitialData.value = { clientId: formData.clientId };
-    if (!data) return;
+        return;
+    }
     addressesOptions.value = data;
     selectedClient.value = data[0].client;
     formData.addressId = selectedClient.value.defaultAddressFk;
-    formInitialData.value.addressId = formData.addressId;
+    formInitialData.value = {
+        clientId: formData.clientId,
+        addressId: formData.addressId,
+    };
 };
 watch(
     () => route.query.table,

src/pages/Wagon/Card/WagonCard.vue

@@ -1,6 +1,6 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'src/components/common/VnCardBeta.vue';
 </script>
 <template>
-    <VnCard data-key="Wagon" url="Wagons" />
+    <VnCardBeta data-key="Wagon" url="Wagons" :descriptor="{}" />
 </template>

src/pages/Wagon/WagonList.vue

@@ -8,6 +8,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
 import { computed, ref } from 'vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const quasar = useQuasar();
 const arrayData = useArrayData('WagonList');
@@ -15,6 +16,7 @@ const store = arrayData.store;
 const router = useRouter();
 const { t } = useI18n();
 const tableRef = ref();
+const dataKey = 'WagonList';
 const filter = {
     include: {
         relation: 'type',
@@ -75,7 +77,6 @@ function navigate(id) {
 }
 
 async function remove(row) {
-    try {
     await axios.delete(`Wagons/${row.id}`).then(async () => {
         quasar.notify({
             message: t('wagon.list.removeItem'),
@@ -84,30 +85,36 @@ async function remove(row) {
         store.data.splice(store.data.indexOf(row), 1);
         window.location.reload();
     });
-    } catch (error) {
-        //
-    }
 }
 </script>
-
 <template>
     <QPage class="column items-center q-pa-md">
+        <VnSection
+            :data-key="dataKey"
+            :columns="columns"
+            prefix="card"
+            :array-data-props="{
+                url: 'Wagons',
+                exprBuilder,
+                order: 'id DESC',
+            }"
+        >
+            <template #body>
                 <VnTable
                     ref="tableRef"
-            data-key="WagonList"
+                    :data-key="dataKey"
-            url="Wagons"
-            :filter="filter"
-            :columns="columns"
-            order="id DESC"
-            :column-search="false"
-            :default-mode="'card'"
-            :disable-option="{ table: true }"
                     :create="{
                         urlCreate: 'Wagons',
                         title: t('Create new wagon'),
                         onDataSaved: () => tableRef.reload(),
                         formInitialData: {},
                     }"
+                    :filter="filter"
+                    :columns="columns"
+                    :column-search="false"
+                    :default-mode="'card'"
+                    :disable-option="{ table: true }"
+                    :right-search="false"
                 >
                     <template #more-create-dialog="{ data }">
                         <VnInput
@@ -130,7 +137,9 @@ async function remove(row) {
                             :label="t('wagon.list.volume')"
                             type="number"
                             min="0"
-                    :rules="[(val) => !!val || t('wagon.warnings.volumeNotEmpty')]"
+                            :rules="[
+                                (val) => !!val || t('wagon.warnings.volumeNotEmpty'),
+                            ]"
                         />
                         <VnSelect
                             url="WagonTypes"
@@ -166,6 +175,8 @@ async function remove(row) {
                         </VnSelect>
                     </template>
                 </VnTable>
+            </template>
+        </VnSection>
     </QPage>
 </template>
 

src/pages/Worker/WorkerList.vue

@@ -223,7 +223,7 @@ async function autofillBic(worker) {
                 :right-search="false"
             >
                 <template #more-create-dialog="{ data }">
-                    <div class="q-pa-lg full-width">
+                    <div class="col-span-2">
                         <VnRadio
                             v-model="data.isFreelance"
                             :val="false"

src/router/modules/wagon.js

@@ -1,46 +1,16 @@
 import { RouterView } from 'vue-router';
 
-export default {
+const wagonCard = {
-    path: '/wagon',
+    name: 'WagonCard',
-    name: 'Wagon',
+    path: ':id',
+    component: () => import('src/pages/Wagon/Card/WagonCard.vue'),
+    redirect: { name: 'WagonEdit' },
     meta: {
-        title: 'wagons',
+        menu: ['WagonEdit'],
-        icon: 'vn:trolley',
-        moduleName: 'Wagon',
-    },
-    component: RouterView,
-    redirect: { name: 'WagonMain' },
-    menus: {
-        main: ['WagonList', 'WagonTypeList', 'WagonCounter', 'WagonTray'],
-        card: [],
     },
     children: [
         {
-            path: '/wagon',
+            path: 'edit',
-            name: 'WagonMain',
-            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'WagonList' },
-            children: [
-                {
-                    path: 'list',
-                    name: 'WagonList',
-                    meta: {
-                        title: 'list',
-                        icon: 'vn:trolley',
-                    },
-                    component: () => import('src/pages/Wagon/WagonList.vue'),
-                },
-                {
-                    path: 'create',
-                    name: 'WagonCreate',
-                    meta: {
-                        title: 'wagonCreate',
-                        icon: 'create',
-                    },
-                    component: () => import('src/pages/Wagon/WagonCreate.vue'),
-                },
-                {
-                    path: ':id/edit',
             name: 'WagonEdit',
             meta: {
                 title: 'wagonEdit',
@@ -48,6 +18,44 @@ export default {
             },
             component: () => import('src/pages/Wagon/WagonCreate.vue'),
         },
+    ],
+};
+
+export default {
+    name: 'Wagon',
+    path: '/wagon',
+    meta: {
+        title: 'wagons',
+        icon: 'vn:trolley',
+        moduleName: 'Wagon',
+        menu: ['WagonList', 'WagonTypeList', 'WagonCounter'],
+    },
+    component: RouterView,
+    redirect: { name: 'WagonMain' },
+    children: [
+        {
+            path: '',
+            name: 'WagonMain',
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'WagonIndexMain' },
+            children: [
+                {
+                    path: '',
+                    name: 'WagonIndexMain',
+                    redirect: { name: 'WagonList' },
+                    component: () => import('src/pages/Wagon/WagonList.vue'),
+                    children: [
+                        {
+                            name: 'WagonList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        wagonCard,
+                    ],
+                },
                 {
                     path: 'counter',
                     name: 'WagonCounter',
@@ -57,12 +65,9 @@ export default {
                     },
                     component: () => import('src/pages/Wagon/WagonCounter.vue'),
                 },
-            ],
-        },
                 {
-            path: '/wagon/type',
+                    path: 'type',
                     name: 'WagonTypeMain',
-            component: () => import('src/components/common/VnModule.vue'),
                     redirect: { name: 'WagonTypeList' },
                     children: [
                         {
@@ -72,16 +77,8 @@ export default {
                                 title: 'typesList',
                                 icon: 'view_list',
                             },
-                    component: () => import('src/pages/Wagon/Type/WagonTypeList.vue'),
+                            component: () =>
-                },
+                                import('src/pages/Wagon/Type/WagonTypeList.vue'),
-                {
-                    path: 'create',
-                    name: 'WagonTypeCreate',
-                    meta: {
-                        title: 'typeCreate',
-                        icon: 'create',
-                    },
-                    component: () => import('src/pages/Wagon/Type/WagonTypeList.vue'),
                         },
                         {
                             path: ':id/edit',
@@ -90,7 +87,10 @@ export default {
                                 title: 'typeEdit',
                                 icon: 'edit',
                             },
-                    component: () => import('src/pages/Wagon/Type/WagonTypeEdit.vue'),
+                            component: () =>
+                                import('src/pages/Wagon/Type/WagonTypeEdit.vue'),
+                        },
+                    ],
                 },
             ],
         },

test/cypress/integration/ticket/negative/TicketLackDetail.spec.js

@@ -139,7 +139,7 @@ describe.skip('Ticket Lack detail', () => {
             cy.wait('@getItemGetSimilar');
         });
         describe('Replace item if', () => {
-            it('Quantity is less than available', () => {
+            it.skip('Quantity is less than available', () => {
                 cy.get(':nth-child(1) > .text-right  > .q-btn').click();
             });
         });

test/cypress/integration/ticket/ticketList.spec.js

@@ -38,8 +38,8 @@ describe('TicketList', () => {
     it('filter client and create ticket', () => {
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketSearchbar');
         searchResults();
+        cy.wait('@ticketSearchbar');
 
-        cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
         cy.dataCy('Customer ID_input').clear('1');
         cy.dataCy('Customer ID_input').type('1101{enter}');
 

test/cypress/integration/wagon/wagonCreate.spec.js

@@ -1,4 +1,4 @@
-describe.skip('WagonCreate', () => {
+describe('WagonCreate', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
@@ -17,7 +17,7 @@ describe.skip('WagonCreate', () => {
             '.grid-create > [label="Volume"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Volume_input"]',
         ).type('100');
         cy.selectOption('[data-cy="Type_select"]', '1');
-
+        cy.dataCy('FormModelPopup_save').click();
         cy.get('[title="Remove"] > .q-btn__content > .q-icon').first().click();
     });
 });

test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js

@@ -2,7 +2,7 @@ describe('WagonTypeCreate', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
-        cy.visit('/#/wagon/type/create');
+        cy.visit('/#/wagon/type/list');
         cy.waitForElement('.q-page', 6000);
     });