Merge pull request '#8606: Zone module to VnCardBeta' (!1462) from 8606-FixZoneModuleV2 into dev

Reviewed-on: #1462
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

src/components/TransferInvoiceForm.vue

@@ -87,7 +87,7 @@ const makeInvoice = async () => {
             (data) => (
                 (rectificativeTypeOptions = data),
                 (transferInvoiceParams.cplusRectificationTypeFk = data.filter(
-                    (type) => type.description == 'I – Por diferencias'
+                    (type) => type.description == 'I – Por diferencias',
                 )[0].id)
             )
         "
@@ -100,7 +100,7 @@ const makeInvoice = async () => {
             (data) => (
                 (siiTypeInvoiceOutsOptions = data),
                 (transferInvoiceParams.siiTypeInvoiceOutFk = data.filter(
-                    (type) => type.code == 'R4'
+                    (type) => type.code == 'R4',
                 )[0].id)
             )
         "
@@ -122,7 +122,6 @@ const makeInvoice = async () => {
                 <VnRow>
                     <VnSelect
                         :label="t('Client')"
-                        :options="clientsOptions"
                         hide-selected
                         option-label="name"
                         option-value="id"

src/components/ui/VnSearchbar.vue

@@ -33,6 +33,10 @@ const props = defineProps({
         type: String,
         default: '',
     },
+    userFilter: {
+        type: Object,
+        default: null,
+    },
     filter: {
         type: Object,
         default: null,

src/composables/useArrayData.js

@@ -148,8 +148,7 @@ export function useArrayData(key, userOptions) {
     }
 
     async function applyFilter({ filter, params }, fetchOptions = {}) {
-        if (filter) store.userFilter = filter;
+        if (filter) store.filter = filter;
-        store.filter = {};
         if (params) store.userParams = { ...params };
 
         const response = await fetch(fetchOptions);

src/css/app.scss

@@ -337,5 +337,5 @@ input::-webkit-inner-spin-button {
 }
 
 .containerShrinked {
-    width: 80%;
+    width: 70%;
 }

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -185,7 +185,7 @@ watchEffect(selectedRows);
         prefix="invoiceOut"
         :array-data-props="{
             url: 'InvoiceOuts/filter',
-            order: ['id DESC'],
+            order: 'id DESC',
         }"
     >
         <template #advanced-menu>
@@ -396,7 +396,6 @@ watchEffect(selectedRows);
                                     :label="
                                         t('invoiceOutList.tableVisibleColumns.taxArea')
                                     "
-                                    :options="taxAreasOptions"
                                     option-label="code"
                                     option-value="code"
                                 />

src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue

@@ -20,7 +20,7 @@ const props = defineProps({
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
-        :un-removable-params="['from', 'to']"
+        :unremovable-params="['from', 'to']"
         :hidden-tags="['from', 'to']"
     >
         <template #tags="{ tag, formatFn }">

src/pages/Zone/Card/ZoneCard.vue

@@ -1,38 +1,7 @@
 <script setup>
-import { useRoute } from 'vue-router';
+import VnCardBeta from 'src/components/common/VnCardBeta.vue';
-import { computed } from 'vue';
-
-import VnCard from 'components/common/VnCard.vue';
 import ZoneDescriptor from './ZoneDescriptor.vue';
-import ZoneFilterPanel from '../ZoneFilterPanel.vue';
-import filter from './ZoneFilter.js';
-
-const route = useRoute();
-const routeName = computed(() => route.name);
-
-function notIsLocations(ifIsFalse, ifIsTrue) {
-    if (routeName.value != 'ZoneLocations') return ifIsFalse;
-    return ifIsTrue;
-}
 </script>
-
 <template>
-    <VnCard
+    <VnCardBeta data-key="Zone" url="Zones" :descriptor="ZoneDescriptor" />
-        data-key="Zone"
-        :url="notIsLocations('Zones', undefined)"
-        :descriptor="ZoneDescriptor"
-        :filter="filter"
-        :filter-panel="notIsLocations(ZoneFilterPanel, undefined)"
-        :search-data-key="notIsLocations('ZoneList', undefined)"
-        :searchbar-props="{
-            url: notIsLocations('Zones', 'ZoneLocations'),
-            label: notIsLocations($t('list.searchZone'), $t('list.searchLocation')),
-            info: $t('list.searchInfo'),
-            whereFilter: notIsLocations((value) => {
-                return /^\d+$/.test(value)
-                    ? { id: value }
-                    : { name: { like: `%${value}%` } };
-            }),
-        }"
-    />
 </template>

src/pages/Zone/Card/ZoneEventExclusionForm.vue

@@ -171,9 +171,10 @@ onMounted(() => {
                     openConfirmationModal(
                         t('eventsPanel.deleteTitle'),
                         t('eventsPanel.deleteSubtitle'),
-                        () => deleteEvent()
+                        () => deleteEvent(),
                     )
                 "
+                data-cy="ZoneEventExclusionDeleteBtn"
             />
             <QBtn
                 :label="isNew ? t('globals.add') : t('globals.save')"

src/pages/Zone/Card/ZoneEventInclusionForm.vue

@@ -18,7 +18,6 @@ import axios from 'axios';
 const props = defineProps({
     date: {
         type: Date,
-        required: true,
         default: null,
     },
     event: {
@@ -159,12 +158,10 @@ onMounted(() => {
                 <VnInputDate
                     :label="t('eventsInclusionForm.from')"
                     v-model="eventInclusionFormData.started"
-                    data-cy="ZoneEventsFromDate"
                 />
                 <VnInputDate
                     :label="t('eventsInclusionForm.to')"
                     v-model="eventInclusionFormData.ended"
-                    data-cy="ZoneEventsToDate"
                 />
             </VnRow>
             <VnRow>

src/pages/Zone/Card/ZoneEvents.vue

@@ -1,18 +1,14 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import ZoneEventsPanel from './ZoneEventsPanel.vue';
 import ZoneCalendarGrid from '../ZoneCalendarGrid.vue';
 import ZoneEventInclusionForm from './ZoneEventInclusionForm.vue';
 import ZoneEventExclusionForm from './ZoneEventExclusionForm.vue';
-
+import RightMenu from 'src/components/common/RightMenu.vue';
-import { useStateStore } from 'stores/useStateStore';
-import { reactive } from 'vue';
 
 const { t } = useI18n();
-const stateStore = useStateStore();
-
 const firstDay = ref();
 const lastDay = ref();
 
@@ -43,14 +39,16 @@ const onZoneEventFormClose = () => {
 </script>
 
 <template>
-    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
+    <RightMenu>
-        <ZoneEventsPanel
+        <template #right-panel>
-            :first-day="firstDay"
+            <ZoneEventsPanel
-            :last-day="lastDay"
+                :first-day="firstDay"
-            :events="events"
+                :last-day="lastDay"
-            v-model:formModeName="formModeName"
+                :events="events"
-        />
+                v-model:formModeName="formModeName"
-    </Teleport>
+            />
+        </template>
+    </RightMenu>
     <QPage class="q-pa-md flex justify-center">
         <ZoneCalendarGrid
             v-model:events="events"

src/pages/Zone/Card/ZoneEventsPanel.vue

@@ -14,12 +14,10 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 const props = defineProps({
     firstDay: {
         type: Date,
-        required: true,
         default: null,
     },
     lastDay: {
         type: Date,
-        required: true,
         default: null,
     },
     events: {
@@ -67,7 +65,7 @@ watch(
     async () => {
         await fetchData();
     },
-    { immediate: true, deep: true }
+    { immediate: true, deep: true },
 );
 
 const formatWdays = (event) => {
@@ -178,9 +176,10 @@ onMounted(async () => {
                             openConfirmationModal(
                                 t('zone.deleteTitle'),
                                 t('zone.deleteSubtitle'),
-                                () => deleteEvent(event.id)
+                                () => deleteEvent(event.id),
                             )
                         "
+                        data-cy="ZoneEventsPanelDeleteBtn"
                     >
                         <QTooltip>{{ t('eventsPanel.delete') }}</QTooltip>
                     </QBtn>

src/pages/Zone/Card/ZoneLocationsTree.vue

@@ -1,6 +1,7 @@
 <script setup>
 import { onMounted, ref, computed, watch, onUnmounted } from 'vue';
 import { useRoute } from 'vue-router';
+import { useStateStore } from 'stores/useStateStore';
 import VnInput from 'src/components/common/VnInput.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
@@ -30,7 +31,7 @@ const emit = defineEmits(['update:tickedNodes']);
 
 const route = useRoute();
 const state = useState();
-
+const stateStore = useStateStore();
 const treeRef = ref();
 const expanded = ref([]);
 
@@ -82,7 +83,7 @@ const onNodeExpanded = async (nodeKeysArray) => {
         await fetchNodeLeaves(lastNodeKey, true);
     } else {
         const difference = new Set(
-            [...previousExpandedNodes.value].filter((x) => !nodeKeysSet.has(x))
+            [...previousExpandedNodes.value].filter((x) => !nodeKeysSet.has(x)),
         );
         const collapsedNode = Array.from(difference).pop();
         const node = treeRef.value?.getNodeByKey(collapsedNode);
@@ -135,7 +136,7 @@ watch(
         }
         previousExpandedNodes.value = new Set(expanded.value);
     },
-    { immediate: true }
+    { immediate: true },
 );
 
 const reFetch = async () => {
@@ -153,6 +154,17 @@ onUnmounted(() => {
 </script>
 
 <template>
+    <Teleport to="#section-searchbar" v-if="stateStore.isHeaderMounted()">
+        <VnSearchbar
+            v-if="!showSearchBar"
+            :data-key="datakey"
+            :url="url"
+            :redirect="false"
+            :search-remove-params="false"
+            :label="$t('zone.searchLocations')"
+            :info="$t('zone.searchLocationsInfo')"
+        />
+    </Teleport>
     <VnInput
         v-if="showSearchBar"
         v-model="store.userParams.search"
@@ -163,13 +175,6 @@ onUnmounted(() => {
             <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
         </template>
     </VnInput>
-    <VnSearchbar
-        v-if="!showSearchBar"
-        :data-key="datakey"
-        :url="url"
-        :redirect="false"
-        :search-remove-params="false"
-    />
     <QTree
         ref="treeRef"
         :nodes="nodes"

src/pages/Zone/Card/ZoneLog.vue

@@ -2,5 +2,5 @@
 import VnLog from 'src/components/common/VnLog.vue';
 </script>
 <template>
-    <VnLog model="Zone" url="/ZoneLogs"></VnLog>
+    <VnLog model="Zone" />
 </template>

src/pages/Zone/Card/ZoneSearchbar.vue

@@ -1,74 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-
-const { t } = useI18n();
-
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return {
-                name: { like: `%${value}%` },
-            };
-        case 'code':
-            return {
-                code: { like: `%${value}%` },
-            };
-        case 'agencyModeFk':
-            return {
-                agencyModeFk: value,
-            };
-        case 'search':
-            return /^\d+$/.test(value) ? { id: value } : { name: { like: `%${value}%` } };
-    }
-};
-
-const tableFilter = {
-    include: [
-        {
-            relation: 'agencyMode',
-            scope: {
-                fields: ['id', 'name'],
-            },
-        },
-        {
-            relation: 'address',
-            scope: {
-                fields: ['id', 'nickname', 'provinceFk', 'postalCode'],
-                include: [
-                    {
-                        relation: 'province',
-                        scope: {
-                            fields: ['id', 'name'],
-                        },
-                    },
-                    {
-                        relation: 'postcode',
-                        scope: {
-                            fields: ['code', 'townFk'],
-                            include: {
-                                relation: 'town',
-                                scope: {
-                                    fields: ['id', 'name'],
-                                },
-                            },
-                        },
-                    },
-                ],
-            },
-        },
-    ],
-};
-</script>
-
-<template>
-    <VnSearchbar
-        data-key="ZonesList"
-        url="Zones"
-        :filter="tableFilter"
-        :expr-builder="exprBuilder"
-        :label="t('list.searchZone')"
-        :info="t('list.searchInfo')"
-        custom-route-redirect-name="ZoneSummary"
-    />
-</template>

src/pages/Zone/Card/ZoneSummary.vue

@@ -60,10 +60,11 @@ onMounted(async () => {
 
 <template>
     <CardSummary
-        data-key="Zone"
+        data-key="ZoneSummary"
         ref="summary"
         :url="`Zones/${entityId}`"
         :filter="filter"
+        :entity-id="entityId"
     >
         <template #header="{ entity }">
             <div>#{{ entity.id }} - {{ entity.name }}</div>

src/pages/Zone/ZoneDeliveryDays.vue

@@ -3,7 +3,6 @@ import { ref } from 'vue';
 import ZoneDeliveryPanel from './ZoneDeliveryPanel.vue';
 import ZoneCalendarGrid from './ZoneCalendarGrid.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
-import ZoneSearchbar from './Card/ZoneSearchbar.vue';
 
 const firstDay = ref(null);
 const lastDay = ref(null);
@@ -11,7 +10,6 @@ const events = ref([]);
 </script>
 
 <template>
-    <ZoneSearchbar />
     <RightMenu>
         <template #right-panel>
             <ZoneDeliveryPanel />

src/pages/Zone/ZoneDeliveryPanel.vue

@@ -89,7 +89,7 @@ watch(
                 v-model="formData.geoFk"
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
-                :sort-by="['code ASC']"
+                :sort-by="'code ASC'"
                 option-value="geoFk"
                 option-label="code"
                 :filter-options="['code']"

src/pages/Zone/ZoneFilterPanel.vue

@@ -1,69 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import VnInput from 'components/common/VnInput.vue';
-import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import order from 'src/router/modules/order';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-    exprBuilder: {
-        type: Function,
-        default: null,
-    },
-});
-
-const agencies = ref([]);
-</script>
-
-<template>
-    <FetchData
-        url="AgencyModes"
-        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
-        @on-fetch="(data) => (agencies = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
-        <template #tags="{ tag }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`filterPanel.${tag.label}`) }}: </strong>
-                <span>{{ tag.value }}</span>
-            </div>
-        </template>
-        <template #body="{ params, searchFn }">
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('list.name')"
-                        v-model="params.name"
-                        is-outlined
-                        data-cy="zoneFilterPanelNameInput"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        :label="t('filterPanel.agencyModeFk')"
-                        v-model="params.agencyModeFk"
-                        :options="agencies"
-                        option-value="id"
-                        option-label="name"
-                        @update:model-value="searchFn()"
-                        dense
-                        outlined
-                        rounded
-                        data-cy="zoneFilterPanelAgencySelect"
-                    >
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>

src/pages/Zone/ZoneList.vue

@@ -14,9 +14,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputTime from 'src/components/common/VnInputTime.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnSection from 'src/components/common/VnSection.vue';
-import ZoneFilterPanel from './ZoneFilterPanel.vue';
-import ZoneSearchbar from './Card/ZoneSearchbar.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -25,7 +23,7 @@ const { viewSummary } = useSummaryDialog();
 const { openConfirmationModal } = useVnConfirm();
 const tableRef = ref();
 const warehouseOptions = ref([]);
-
+const dataKey = 'ZoneList';
 const tableFilter = {
     include: [
         {
@@ -114,6 +112,7 @@ const columns = computed(() => [
         columnFilter: {
             inWhere: true,
         },
+        columnClass: 'shrink-column',
     },
     {
         align: 'left',
@@ -169,77 +168,128 @@ function formatRow(row) {
     return dashIfEmpty(`${row?.address?.nickname},
             ${row?.address?.postcode?.town?.name} (${row?.address?.province?.name})`);
 }
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return {
+                name: { like: `%${value}%` },
+            };
+        case 'code':
+            return {
+                code: { like: `%${value}%` },
+            };
+        case 'agencyModeFk':
+            return {
+                agencyModeFk: value,
+            };
+        case 'search':
+            return /^\d+$/.test(value) ? { id: value } : { name: { like: `%${value}%` } };
+        case 'price':
+            return {
+                price: value,
+            };
+    }
+};
 </script>
 
 <template>
-    <ZoneSearchbar />
+    <VnSection
-    <RightMenu>
+        :data-key="dataKey"
-        <template #right-panel>
-            <ZoneFilterPanel data-key="ZonesList" />
-        </template>
-    </RightMenu>
-    <VnTable
-        ref="tableRef"
-        data-key="ZonesList"
-        url="Zones"
-        :create="{
-            urlCreate: 'Zones',
-            title: t('list.createZone'),
-            onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
-            formInitialData: {},
-        }"
-        :user-filter="tableFilter"
         :columns="columns"
-        redirect="zone"
+        prefix="zone"
-        :right-search="false"
+        :array-data-props="{
+            url: 'Zones',
+            order: ['id ASC'],
+            userFilter: tableFilter,
+            exprBuilder,
+        }"
     >
-        <template #column-addressFk="{ row }">
+        <template #body>
-            {{ dashIfEmpty(formatRow(row)) }}
+            <div class="table-container">
+                <div class="column items-center">
+                    <VnTable
+                        ref="tableRef"
+                        :data-key="dataKey"
+                        :columns="columns"
+                        redirect="Zone"
+                        :create="{
+                            urlCreate: 'Zones',
+                            title: t('list.createZone'),
+                            onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
+                            formInitialData: {},
+                        }"
+                        table-height="85vh"
+                    >
+                        <template #column-addressFk="{ row }">
+                            {{ dashIfEmpty(formatRow(row)) }}
+                        </template>
+                        <template #more-create-dialog="{ data }">
+                            <VnSelect
+                                url="AgencyModes"
+                                v-model="data.agencyModeFk"
+                                option-value="id"
+                                option-label="name"
+                                :label="t('list.agency')"
+                            />
+                            <VnInput
+                                v-model="data.price"
+                                :label="t('list.price')"
+                                min="0"
+                                type="number"
+                                required="true"
+                            />
+                            <VnInput
+                                v-model="data.bonus"
+                                :label="t('zone.bonus')"
+                                min="0"
+                                type="number"
+                            />
+                            <VnInput
+                                v-model="data.travelingDays"
+                                :label="t('zone.travelingDays')"
+                                type="number"
+                                min="0"
+                            />
+                            <VnInputTime v-model="data.hour" :label="t('list.close')" />
+                            <VnSelect
+                                url="Warehouses"
+                                v-model="data.warehouseFK"
+                                option-value="id"
+                                option-label="name"
+                                :label="t('list.warehouse')"
+                                :options="warehouseOptions"
+                            />
+                            <QCheckbox
+                                v-model="data.isVolumetric"
+                                :label="t('list.isVolumetric')"
+                                :toggle-indeterminate="false"
+                            />
+                        </template>
+                    </VnTable>
+                </div>
+            </div>
         </template>
-        <template #more-create-dialog="{ data }">
+    </VnSection>
-            <VnSelect
-                url="AgencyModes"
-                sort-by="name ASC"
-                v-model="data.agencyModeFk"
-                :label="t('list.agency')"
-            />
-            <VnInput
-                v-model="data.price"
-                :label="t('list.price')"
-                min="0"
-                type="number"
-                required="true"
-            />
-            <VnInput
-                v-model="data.bonus"
-                :label="t('zone.bonus')"
-                min="0"
-                type="number"
-            />
-            <VnInput
-                v-model="data.travelingDays"
-                :label="t('zone.travelingDays')"
-                type="number"
-                min="0"
-            />
-            <VnInputTime v-model="data.hour" :label="t('list.close')" />
-            <VnSelect
-                url="Warehouses"
-                v-model="data.warehouseFK"
-                option-value="id"
-                option-label="name"
-                :label="t('list.warehouse')"
-                :options="warehouseOptions"
-            />
-            <QCheckbox
-                v-model="data.isVolumetric"
-                :label="t('list.isVolumetric')"
-                :toggle-indeterminate="false"
-            />
-        </template>
-    </VnTable>
 </template>
 
+<style lang="scss" scoped>
+.table-container {
+    display: flex;
+    justify-content: center;
+}
+.column {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    min-width: 70%;
+}
+
+:deep(.shrink-column) {
+    width: 8%;
+}
+</style>
+
 <i18n>
 es:
     Search zone: Buscar zona

src/pages/Zone/ZoneUpcoming.vue

@@ -7,7 +7,6 @@ import FetchData from 'components/FetchData.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
-import ZoneSearchbar from './Card/ZoneSearchbar.vue';
 
 const { t } = useI18n();
 const weekdayStore = useWeekdayStore();
@@ -31,7 +30,7 @@ const columns = computed(() => [
         label: t('list.id'),
         name: 'id',
         field: 'zoneFk',
-        align: 'left',
+        align: 'center',
     },
 ]);
 
@@ -53,7 +52,6 @@ onMounted(() => weekdayStore.initStore());
         @on-fetch="(data) => (details = data)"
         auto-load
     />
-    <ZoneSearchbar />
     <VnSubToolbar />
     <QPage class="column items-center q-pa-md">
         <QCard class="containerShrinked q-pa-md">

src/pages/Zone/locale/en.yml

@@ -11,10 +11,13 @@ zone:
     m3Max: Max m³
     deleteTitle: This item will be deleted
     deleteSubtitle: Are you sure you want to continue?
-    volumetric: Volumetric
     bonus: Bonus
     closing: Closing
     travelingDays: Traveling days
+    search: Search zone
+    searchInfo: Search zone by id or name
+    searchLocations: Search locations
+    searchLocationsInfo: Search locations by post code
 list:
     clone: Clone
     id: Id
@@ -30,6 +33,7 @@ list:
     confirmCloneTitle: All it's properties will be copied
     confirmCloneSubtitle: Do you want to clone this zone?
     warehouse: Warehouse
+    isVolumetric: Volumetric
     createZone: Create zone
     zoneSummary: Summary
     addressFk: Address

src/pages/Zone/locale/es.yml

@@ -15,6 +15,10 @@ zone:
     bonus: Bonificación
     closing: Cierre
     travelingDays: Días de viaje
+    search: Buscar zona
+    searchInfo: Buscar zona por Id o nombre
+    searchLocations: Buscar localización
+    searchLocationsInfo: Buscar localización por código postal
 list:
     clone: Clonar
     id: Id

src/router/modules/zone.js

@@ -1,24 +1,12 @@
 import { RouterView } from 'vue-router';
 
-export default {
+const zoneCard = {
-    path: '/zone',
+    name: 'ZoneCard',
-    name: 'Zone',
+    path: ':id',
+    component: () => import('src/pages/Zone/Card/ZoneCard.vue'),
+    redirect: { name: 'ZoneSummary' },
     meta: {
-        title: 'zones',
+        menu: [
-        icon: 'vn:zone',
-        moduleName: 'Zone',
-        keyBinding: 'z',
-    },
-    component: RouterView,
-    redirect: { name: 'ZoneMain' },
-    menus: {
-        main: [
-            'ZoneList',
-            'ZoneDeliveryDays',
-            'ZoneUpcomingList',
-            'ZoneUpcomingDeliveries',
-        ],
-        card: [
             'ZoneBasicData',
             'ZoneWarehouses',
             'ZoneHistory',
@@ -28,19 +16,102 @@ export default {
     },
     children: [
         {
-            path: '/zone',
+            name: 'ZoneSummary',
+            path: 'summary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Zone/Card/ZoneSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'ZoneBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Zone/Card/ZoneBasicData.vue'),
+        },
+        {
+            path: 'location',
+            name: 'ZoneLocations',
+            meta: {
+                title: 'locations',
+                icon: 'my_location',
+            },
+            component: () => import('src/pages/Zone/Card/ZoneLocations.vue'),
+        },
+        {
+            path: 'warehouses',
+            name: 'ZoneWarehouses',
+            meta: {
+                title: 'warehouses',
+                icon: 'home',
+            },
+            component: () => import('src/pages/Zone/Card/ZoneWarehouses.vue'),
+        },
+        {
+            path: 'log',
+            name: 'ZoneHistory',
+            meta: {
+                title: 'log',
+                icon: 'history',
+            },
+            component: () => import('src/pages/Zone/Card/ZoneLog.vue'),
+        },
+        {
+            path: 'events',
+            name: 'ZoneEvents',
+            meta: {
+                title: 'calendar',
+                icon: 'vn:calendar',
+            },
+            component: () => import('src/pages/Zone/Card/ZoneEvents.vue'),
+        },
+    ],
+};
+
+export default {
+    name: 'Zone',
+    path: '/zone',
+    meta: {
+        title: 'zones',
+        icon: 'vn:zone',
+        moduleName: 'Zone',
+        keyBinding: 'z',
+        menu: [
+            'ZoneList',
+            'ZoneDeliveryDays',
+            'ZoneUpcomingList',
+            'ZoneUpcomingDeliveries',
+        ],
+    },
+    component: RouterView,
+    redirect: { name: 'ZoneMain' },
+    children: [
+        {
             name: 'ZoneMain',
+            path: '',
             component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'ZoneList' },
+            redirect: { name: 'ZoneIndexMain' },
             children: [
                 {
-                    path: 'list',
+                    path: '',
-                    name: 'ZoneList',
+                    name: 'ZoneIndexMain',
-                    meta: {
+                    redirect: { name: 'ZoneList' },
-                        title: 'zonesList',
-                        icon: 'view_list',
-                    },
                     component: () => import('src/pages/Zone/ZoneList.vue'),
+                    children: [
+                        {
+                            name: 'ZoneList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        zoneCard,
+                    ],
                 },
                 {
                     path: 'delivery-days',
@@ -62,67 +133,5 @@ export default {
                 },
             ],
         },
-        {
-            name: 'ZoneCard',
-            path: ':id',
-            component: () => import('src/pages/Zone/Card/ZoneCard.vue'),
-            redirect: { name: 'ZoneSummary' },
-            children: [
-                {
-                    name: 'ZoneSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () => import('src/pages/Zone/Card/ZoneSummary.vue'),
-                },
-                {
-                    name: 'ZoneBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('src/pages/Zone/Card/ZoneBasicData.vue'),
-                },
-                {
-                    name: 'ZoneLocations',
-                    path: 'location',
-                    meta: {
-                        title: 'locations',
-                        icon: 'my_location',
-                    },
-                    component: () => import('src/pages/Zone/Card/ZoneLocations.vue'),
-                },
-                {
-                    name: 'ZoneWarehouses',
-                    path: 'warehouses',
-                    meta: {
-                        title: 'warehouses',
-                        icon: 'home',
-                    },
-                    component: () => import('src/pages/Zone/Card/ZoneWarehouses.vue'),
-                },
-                {
-                    name: 'ZoneHistory',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/Zone/Card/ZoneLog.vue'),
-                },
-                {
-                    name: 'ZoneEvents',
-                    path: 'events',
-                    meta: {
-                        title: 'calendar',
-                        icon: 'vn:calendar',
-                    },
-                    component: () => import('src/pages/Zone/Card/ZoneEvents.vue'),
-                },
-            ],
-        },
     ],
 };

test/cypress/integration/zone/zoneCalendar.spec.js

@@ -1,20 +1,18 @@
 describe('ZoneCalendar', () => {
     const addEventBtn = '.q-page-sticky > div > .q-btn';
     const submitBtn = '.q-mt-lg > .q-btn--standard';
-    const deleteBtn = '.q-item__section--side > .q-btn';
+    const deleteBtn = '[data-cy="ZoneEventsPanelDeleteBtn"]';
-    const from = '.q-field__control-container > [data-cy="ZoneEventsFromDate"]';
-    const to = '.q-field__control-container > [data-cy="ZoneEventsToDate"]';
 
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
-        cy.visit(`/#/zone/11/events`);
+        cy.visit(`/#/zone/13/events`);
     });
 
     it('should include a one day event, then delete it', () => {
         cy.get(addEventBtn).click();
         cy.dataCy('ZoneEventInclusionDayRadio').click();
-        cy.get('.q-card > :nth-child(5)').type('02/04/2001');
+        cy.get('.q-card > :nth-child(5)').type('01/01/2001');
         cy.get(submitBtn).click();
         cy.get(deleteBtn).click();
         cy.dataCy('VnConfirm_confirm').click();
@@ -47,7 +45,7 @@ describe('ZoneCalendar', () => {
         cy.get(
             '.q-current-day > .q-calendar-month__day--content > [data-cy="ZoneCalendarDay"]',
         ).click();
-        cy.get('.q-mt-lg > :nth-child(2)').click();
+        cy.dataCy('ZoneEventExclusionDeleteBtn').click();
         cy.dataCy('VnConfirm_confirm').click();
     });
 });

test/cypress/integration/zone/zoneCreate.spec.js

@@ -1,4 +1,4 @@
-describe.skip('ZoneCreate', () => {
+describe('ZoneCreate', () => {
     const data = {
         Name: { val: 'Zone pickup D' },
         Price: { val: '3' },

test/cypress/integration/zone/zoneList.spec.js

@@ -1,26 +1,18 @@
 describe('ZoneList', () => {
     const agency = 'inhouse pickup';
+    const firstSummaryIcon =
+        ':nth-child(1) > .q-table--col-auto-width > [data-cy="tableAction-0"]';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit('/#/zone/list');
-    });
+        cy.typeSearchbar('{enter}');
-
-    it('should filter by agency', () => {
-        cy.dataCy('zoneFilterPanelAgencySelect').type(agency);
-        cy.get('.q-menu .q-item').contains(agency).click();
-        cy.get(':nth-child(1) > [data-col-field="agencyModeFk"]').should(
-            'include.text',
-            agency,
-        );
     });
 
     it('should open the zone summary', () => {
-        cy.dataCy('zoneFilterPanelAgencySelect').type(agency);
+        cy.get(firstSummaryIcon).click();
-        cy.get('.q-menu .q-item').contains(agency).click();
-        cy.dataCy('tableAction-0').eq(1).click();
         cy.get('.header > .q-icon').click();
-        cy.url().should('include', 'zone/2/summary');
+        cy.url().should('include', 'zone/1/summary');
     });
 
     it('should clone the zone', () => {
@@ -29,7 +21,5 @@ describe('ZoneList', () => {
         cy.dataCy('VnConfirm_confirm').click();
         cy.url().should('not.include', 'zone/2/');
         cy.url().should('match', /zone\/\d+\/basic-data/);
-        cy.get('.list-box > :nth-child(1)').should('include.text', agency);
-        cy.get('.title > span').should('include.text', 'Zone pickup B');
     });
 });

test/cypress/integration/zone/zoneLocations.spec.js

@@ -3,7 +3,8 @@ describe('ZoneLocations', () => {
         Warehouse: { val: 'Warehouse One', type: 'select' },
     };
 
-    const postalCode = '[style=""] > :nth-child(1) > :nth-child(1) > :nth-child(2) > :nth-child(1) > :nth-child(1) > :nth-child(2) > :nth-child(1) > .q-tree__node--parent > .q-tree__node-collapsible > .q-tree__children'
+    const postalCode =
+        '[style=""] > :nth-child(1) > :nth-child(1) > :nth-child(2) > :nth-child(1) > :nth-child(1) > :nth-child(2) > :nth-child(1) > .q-tree__node--parent > .q-tree__node-collapsible > .q-tree__children';
 
     beforeEach(() => {
         cy.viewport(1280, 720);
@@ -12,12 +13,14 @@ describe('ZoneLocations', () => {
     });
 
     it('should show all locations on entry', () => {
-        cy.get('.q-tree > :nth-child(1) > :nth-child(2) > :nth-child(1)').children().should('have.length', 9);
+        cy.get('.q-tree > :nth-child(1) > :nth-child(2) > :nth-child(1)')
+            .children()
+            .should('have.length', 9);
     });
 
     it('should be able to search by postal code', () => {
         cy.get('#searchbarForm').type('46680');
         cy.get('.router-link-active > .q-icon').click();
-        cy.get(postalCode).should('include.text', '46680')
+        cy.get(postalCode).should('include.text', '46680');
     });
 });

test/cypress/integration/zone/zoneWarehouse.spec.js

@@ -1,4 +1,4 @@
-describe.skip('ZoneWarehouse', () => {
+describe('ZoneWarehouse', () => {
     const data = {
         Warehouse: { val: 'Warehouse Two', type: 'select' },
     };