Merge branch 'dev' into 8664-refactorCmrList

src/components/ui/CardDescriptor.vue

@@ -5,7 +5,7 @@ import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useClipboard } from 'src/composables/useClipboard';
 import VnMoreOptions from './VnMoreOptions.vue';
 
@@ -42,6 +42,7 @@ const $props = defineProps({
 
 const state = useState();
 const route = useRoute();
+const router = useRouter();
 const { t } = useI18n();
 const { copyText } = useClipboard();
 const { viewSummary } = useSummaryDialog();
@@ -50,6 +51,9 @@ let store;
 let entity;
 const isLoading = ref(false);
 const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
+const DESCRIPTOR_PROXY = 'DescriptorProxy';
+const moduleName = ref();
+const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
 defineExpose({ getData });
 
 onBeforeMount(async () => {
@@ -76,15 +80,18 @@ onBeforeMount(async () => {
     );
 });
 
-const routeName = computed(() => {
-    const DESCRIPTOR_PROXY = 'DescriptorProxy';
-
+function getName() {
     let name = $props.dataKey;
     if ($props.dataKey.includes(DESCRIPTOR_PROXY)) {
         name = name.split(DESCRIPTOR_PROXY)[0];
     }
-    return `${name}Summary`;
+    return name;
+}
+const routeName = computed(() => {
+    let routeName = getName();
+    return `${routeName}Summary`;
 });
+
 async function getData() {
     store.url = $props.url;
     store.filter = $props.filter ?? {};
@@ -120,20 +127,35 @@ function copyIdText(id) {
 
 const emit = defineEmits(['onFetch']);
 
-const iconModule = computed(() => route.matched[1].meta.icon);
-const toModule = computed(() =>
-    route.matched[1].path.split('/').length > 2
+const iconModule = computed(() => {
+    moduleName.value = getName();
+    if (isSameModuleName) {
+        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
+            ?.meta?.icon;
+    } else {
+        return route.matched[1].meta.icon;
+    }
+});
+
+const toModule = computed(() => {
+    moduleName.value = getName();
+    if (isSameModuleName) {
+        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
+            ?.children[0]?.redirect;
+    } else {
+        return route.matched[1].path.split('/').length > 2
             ? route.matched[1].redirect
-        : route.matched[1].children[0].redirect,
-);
+            : route.matched[1].children[0].redirect;
+    }
+});
 </script>
 
 <template>
     <div class="descriptor">
         <template v-if="entity && !isLoading">
             <div class="header bg-primary q-pa-sm justify-between">
-                <slot name="header-extra-action"
-                    ><QBtn
+                <slot name="header-extra-action">
+                    <QBtn
                         round
                         flat
                         dense
@@ -141,13 +163,13 @@ const toModule = computed(() =>
                         :icon="iconModule"
                         color="white"
                         class="link"
-                        :to="$attrs['to-module'] ?? toModule"
+                        :to="toModule"
                     >
                         <QTooltip>
                             {{ t('globals.goToModuleIndex') }}
                         </QTooltip>
-                    </QBtn></slot
-                >
+                    </QBtn>
+                </slot>
                 <QBtn
                     @click.stop="viewSummary(entity.id, $props.summary, $props.width)"
                     round
@@ -230,7 +252,6 @@ const toModule = computed(() =>
             </div>
             <slot name="after" />
         </template>
-        <!-- Skeleton -->
         <SkeletonDescriptor v-if="!entity || isLoading" />
     </div>
     <QInnerLoading

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"
-            url="Wagons"
-            :filter="filter"
-            :columns="columns"
-            order="id DESC"
-            :column-search="false"
-            :default-mode="'card'"
-            :disable-option="{ table: true }"
+                    :data-key="dataKey"
                     :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/router/modules/wagon.js

@@ -1,46 +1,16 @@
 import { RouterView } from 'vue-router';
 
-export default {
-    path: '/wagon',
-    name: 'Wagon',
+const wagonCard = {
+    name: 'WagonCard',
+    path: ':id',
+    component: () => import('src/pages/Wagon/Card/WagonCard.vue'),
+    redirect: { name: 'WagonEdit' },
     meta: {
-        title: 'wagons',
-        icon: 'vn:trolley',
-        moduleName: 'Wagon',
-    },
-    component: RouterView,
-    redirect: { name: 'WagonMain' },
-    menus: {
-        main: ['WagonList', 'WagonTypeList', 'WagonCounter', 'WagonTray'],
-        card: [],
+        menu: ['WagonEdit'],
     },
     children: [
         {
-            path: '/wagon',
-            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',
+            path: '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'),
-                },
-                {
-                    path: 'create',
-                    name: 'WagonTypeCreate',
-                    meta: {
-                        title: 'typeCreate',
-                        icon: 'create',
-                    },
-                    component: () => import('src/pages/Wagon/Type/WagonTypeList.vue'),
+                            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/route/routeExtendedList.spec.js

@@ -1,4 +1,4 @@
-describe('Route extended list', () => {
+describe.skip('Route extended list', () => {
     const getSelector = (colField) => `tr:last-child > [data-col-field="${colField}"]`;
 
     const selectors = {

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