Merge pull request '8322-Wagon' (!1569) from 8322-Wagon into dev

Reviewed-on: verdnatura/salix-front#1569

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,97 +77,106 @@ function navigate(id) {
 }
 
 async function remove(row) {
-    try {
+    await axios.delete(`Wagons/${row.id}`).then(async () => {
-        await axios.delete(`Wagons/${row.id}`).then(async () => {
+        quasar.notify({
-            quasar.notify({
+            message: t('wagon.list.removeItem'),
-                message: t('wagon.list.removeItem'),
+            type: 'positive',
-                type: 'positive',
-            });
-            store.data.splice(store.data.indexOf(row), 1);
-            window.location.reload();
         });
-    } catch (error) {
+        store.data.splice(store.data.indexOf(row), 1);
-        //
+        window.location.reload();
-    }
+    });
 }
 </script>
-
 <template>
     <QPage class="column items-center q-pa-md">
-        <VnTable
+        <VnSection
-            ref="tableRef"
+            :data-key="dataKey"
-            data-key="WagonList"
-            url="Wagons"
-            :filter="filter"
             :columns="columns"
-            order="id DESC"
+            prefix="card"
-            :column-search="false"
+            :array-data-props="{
-            :default-mode="'card'"
+                url: 'Wagons',
-            :disable-option="{ table: true }"
+                exprBuilder,
-            :create="{
+                order: 'id DESC',
-                urlCreate: 'Wagons',
-                title: t('Create new wagon'),
-                onDataSaved: () => tableRef.reload(),
-                formInitialData: {},
             }"
         >
-            <template #more-create-dialog="{ data }">
+            <template #body>
-                <VnInput
+                <VnTable
-                    filled
+                    ref="tableRef"
-                    v-model="data.label"
+                    :data-key="dataKey"
-                    :label="t('wagon.create.label')"
+                    :create="{
-                    type="number"
+                        urlCreate: 'Wagons',
-                    min="0"
+                        title: t('Create new wagon'),
-                    :rules="[(val) => !!val || t('wagon.warnings.labelNotEmpty')]"
+                        onDataSaved: () => tableRef.reload(),
-                />
+                        formInitialData: {},
-                <VnInput
+                    }"
-                    filled
+                    :filter="filter"
-                    v-model="data.plate"
+                    :columns="columns"
-                    :label="t('wagon.list.plate')"
+                    :column-search="false"
-                    :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
+                    :default-mode="'card'"
-                />
+                    :disable-option="{ table: true }"
-                <VnInput
+                    :right-search="false"
-                    filled
-                    v-model="data.volume"
-                    :label="t('wagon.list.volume')"
-                    type="number"
-                    min="0"
-                    :rules="[(val) => !!val || t('wagon.warnings.volumeNotEmpty')]"
-                />
-                <VnSelect
-                    url="WagonTypes"
-                    filled
-                    v-model="data.typeFk"
-                    use-input
-                    fill-input
-                    hide-selected
-                    input-debounce="0"
-                    option-label="name"
-                    option-value="id"
-                    emit-value
-                    map-options
-                    :label="t('globals.type')"
-                    :options="filteredWagonTypes"
-                    :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
-                    @filter="filterType"
                 >
-                    <template v-if="data.typeFk" #append>
+                    <template #more-create-dialog="{ data }">
-                        <QIcon
+                        <VnInput
-                            name="cancel"
+                            filled
-                            @click.stop.prevent="data.typeFk = null"
+                            v-model="data.label"
-                            class="cursor-pointer"
+                            :label="t('wagon.create.label')"
+                            type="number"
+                            min="0"
+                            :rules="[(val) => !!val || t('wagon.warnings.labelNotEmpty')]"
                         />
+                        <VnInput
+                            filled
+                            v-model="data.plate"
+                            :label="t('wagon.list.plate')"
+                            :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
+                        />
+                        <VnInput
+                            filled
+                            v-model="data.volume"
+                            :label="t('wagon.list.volume')"
+                            type="number"
+                            min="0"
+                            :rules="[
+                                (val) => !!val || t('wagon.warnings.volumeNotEmpty'),
+                            ]"
+                        />
+                        <VnSelect
+                            url="WagonTypes"
+                            filled
+                            v-model="data.typeFk"
+                            use-input
+                            fill-input
+                            hide-selected
+                            input-debounce="0"
+                            option-label="name"
+                            option-value="id"
+                            emit-value
+                            map-options
+                            :label="t('globals.type')"
+                            :options="filteredWagonTypes"
+                            :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
+                            @filter="filterType"
+                        >
+                            <template v-if="data.typeFk" #append>
+                                <QIcon
+                                    name="cancel"
+                                    @click.stop.prevent="data.typeFk = null"
+                                    class="cursor-pointer"
+                                />
+                            </template>
+                            <template #no-option>
+                                <QItem>
+                                    <QItemSection class="text-grey">
+                                        {{ t('wagon.warnings.noData') }}
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
                     </template>
-                    <template #no-option>
+                </VnTable>
-                        <QItem>
-                            <QItemSection class="text-grey">
-                                {{ t('wagon.warnings.noData') }}
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
             </template>
-        </VnTable>
+        </VnSection>
     </QPage>
 </template>
 

src/router/modules/wagon.js

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

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);
     });