Merge branch 'dev' into 7065-testUserPanel

src/components/LeftMenu.vue

@@ -10,13 +10,12 @@ import routes from 'src/router/modules';
 import LeftMenuItem from './LeftMenuItem.vue';
 import LeftMenuItemGroup from './LeftMenuItemGroup.vue';
 import VnInput from './common/VnInput.vue';
-import { useRouter } from 'vue-router';
 
 const { t } = useI18n();
 const route = useRoute();
 const quasar = useQuasar();
 const navigation = useNavigationStore();
-const router = useRouter();
+
 const props = defineProps({
     source: {
         type: String,
@@ -175,10 +174,6 @@ function normalize(text) {
         .replace(/[\u0300-\u036f]/g, '')
         .toLowerCase();
 }
-const searchModule = () => {
-    const [item] = filteredItems.value;
-    if (item) router.push({ name: item.name });
-};
 </script>
 
 <template>
@@ -193,11 +188,10 @@ const searchModule = () => {
                         filled
                         dense
                         autofocus
-                        @keyup.enter.stop="searchModule()"
                     />
                 </QItem>
                 <QSeparator />
-                <template v-if="filteredPinnedModules.size && !search">
+                <template v-if="filteredPinnedModules.size">
                     <LeftMenuItem
                         v-for="[key, pinnedModule] of filteredPinnedModules"
                         :key="key"
@@ -221,11 +215,11 @@ const searchModule = () => {
                     </LeftMenuItem>
                     <QSeparator />
                 </template>
-                <template v-for="(item, index) in filteredItems" :key="item.name">
+                <template v-for="item in filteredItems" :key="item.name">
                     <template
-                        v-if="search ||item.children && !filteredPinnedModules.has(item.name)"
+                        v-if="item.children && !filteredPinnedModules.has(item.name)"
                     >
-                        <LeftMenuItem :item="item" group="modules" :class="search && index === 0 ? 'searched' : ''">
+                        <LeftMenuItem :item="item" group="modules">
                             <template #side>
                                 <QBtn
                                     v-if="item.isPinned === true"
@@ -342,9 +336,6 @@ const searchModule = () => {
 .header {
     color: var(--vn-label-color);
 }
-.searched{
-    background-color: var(--vn-section-hover-color);
-}
 </style>
 <i18n>
     es:

src/components/__tests__/UserPanel.spec.js

@@ -0,0 +1,63 @@
+import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import UserPanel from 'src/components/UserPanel.vue';
+import axios from 'axios';
+import { useState } from 'src/composables/useState';
+
+vi.mock('axios');
+
+describe('UserPanel', () => {
+    let wrapper;
+    let vm;
+    let state;
+
+    beforeEach(() => {
+        wrapper = createWrapper(UserPanel, {});
+        state = useState();
+        state.setUser({
+            id: 115,
+            name: 'itmanagement',
+            nickname: 'itManagementNick',
+            lang: 'en',
+            darkMode: false,
+            companyFk: 442,
+            warehouseFk: 1,
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should fetch warehouses data on mounted', async () => {
+        const fetchData = wrapper.findComponent({ name: 'FetchData' });
+        expect(fetchData.props('url')).toBe('Warehouses');
+        expect(fetchData.props('autoLoad')).toBe(true);
+    });
+
+    it('should toggle dark mode correctly and update preferences', async () => {
+        await vm.saveDarkMode(true);
+        expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
+        expect(vm.user.darkMode).toBe(true);
+        vm.updatePreferences();
+        expect(vm.darkMode).toBe(true);
+    });
+
+    it('should change user language and update preferences', async () => {
+        const userLanguage = 'es';
+        await vm.saveLanguage(userLanguage);
+        expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
+        expect(vm.user.lang).toBe(userLanguage);
+        vm.updatePreferences();
+        expect(vm.locale).toBe(userLanguage);
+    });
+
+    it('should update user data', async () => {
+        const key = 'name';
+        const value = 'itboss';
+        await vm.saveUserData(key, value);
+        expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
+    });
+});

src/components/common/VnSelectWorker.vue

@@ -53,7 +53,6 @@ const url = computed(() => {
         :fields="['id', 'name', 'nickname', 'code']"
         :filter-options="['id', 'name', 'nickname', 'code']"
         sort-by="nickname ASC"
-        data-cy="vnWorkerSelect"
     >
         <template #prepend v-if="$props.hasAvatar">
             <VnAvatar :worker-id="value" color="primary" v-bind="$attrs" />

src/components/ui/VnPaginate.vue

@@ -123,7 +123,7 @@ watch(
     () => props.data,
     () => {
         store.data = props.data;
-    },
+    }
 );
 
 watch(
@@ -132,12 +132,12 @@ watch(
         if (!mounted.value) return;
         emit('onChange', data);
     },
-    { immediate: true },
+    { immediate: true }
 );
 
 watch(
     () => [props.url, props.filter],
-    ([url, filter]) => mounted.value && fetch({ url, filter }),
+    ([url, filter]) => mounted.value && fetch({ url, filter })
 );
 const addFilter = async (filter, params) => {
     await arrayData.addFilter({ filter, params });
@@ -198,7 +198,7 @@ function endPagination() {
 async function onLoad(index, done) {
     if (!store.data || !mounted.value) return done();
 
-    if (store.data.length === 0 || !arrayData.store.url) return done(false);
+    if (store.data.length === 0 || !props.url) return done(false);
 
     pagination.value.page = pagination.value.page + 1;
 

src/i18n/locale/en.yml

@@ -326,7 +326,6 @@ globals:
         ticketsMonitor: Tickets monitor
         clientsActionsMonitor: Clients and actions
         serial: Serial
-        business: Business
         medical: Mutual
         pit: IRPF
         wasteRecalc: Waste recaclulate
@@ -510,24 +509,6 @@ department:
     hasToSendMail: Send check-ins by email
     departmentRemoved: Department removed
 worker:
-    pageTitles:
-        workers: Workers
-        list: List
-        basicData: Basic data
-        summary: Summary
-        notifications: Notifications
-        workerCreate: New worker
-        department: Department
-        pda: PDA
-        notes: Notas
-        dms: My documentation
-        pbx: Private Branch Exchange
-        log: Log
-        calendar: Calendar
-        timeControl: Time control
-        locker: Locker
-        balance: Balance
-        medical: Medical
     list:
         department: Department
         schedule: Schedule
@@ -543,24 +524,15 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
-        fiDueDate: DNI expiration date
+        fiDueDate: FI due date
         sex: Sex
-        seniority: Antiquity
+        seniority: Seniority
         fi: DNI/NIE/NIF
         birth: Birth
         isFreelance: Freelance
         isSsDiscounted: SS Bonification
         hasMachineryAuthorized: Machinery authorized
         isDisable: Disable
-        business: Business
-        started: Started
-        ended: Ended
-        reasonEnd: Reason End
-        department: Departament
-        workerBusinessCategory: Worker Business Category
-        notes: Notes
-        workCenter: Center
-        professionalCategory: Professional Category
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications
@@ -619,23 +591,6 @@ worker:
         sizeLimit: Size limit
         isOnReservationMode: Reservation mode
         machine: Machine
-    business:
-        tableVisibleColumns:
-            started: Start Date
-            ended: End Date
-            company: Company
-            reasonEnd: Reason for Termination
-            department: Department
-            professionalCategory: Professional Category
-            calendarType: Work Calendar
-            workCenter: Work Center
-            payrollCategories: Contract Category
-            occupationCode: Contribution Code
-            rate: Rate
-            businessType: Contract Type
-            amount: Salary
-            basicSalary: Transport Workers Salary
-            notes: Notes
 wagon:
     type:
         submit: Submit

src/i18n/locale/es.yml

@@ -326,7 +326,6 @@ globals:
         ticketsMonitor: Monitor de tickets
         clientsActionsMonitor: Clientes y acciones
         serial: Facturas por serie
-        business: Contratos
         medical: Mutua
         pit: IRPF
         wasteRecalc: Recalcular mermas
@@ -482,26 +481,6 @@ department:
     hasToSendMail: Enviar fichadas por mail
     departmentRemoved: Departamento eliminado
 worker:
-    pageTitles:
-        workers: Trabajadores
-        list: Listado
-        basicData: Datos básicos
-        summary: Resumen
-        notifications: Notificaciones
-        workerCreate: Nuevo trabajador
-        department: Departamentos
-        pda: PDA
-        notes: Notas
-        dms: Mi documentación
-        pbx: Centralita
-        log: Historial
-        calendar: Calendario
-        timeControl: Control de horario
-        locker: Taquilla
-        balance: Balance
-        business: Contrato
-        formation: Formación
-        medical: Mutua
     list:
         department: Departamento
         schedule: Horario
@@ -526,15 +505,6 @@ worker:
         isSsDiscounted: Bonificación SS
         hasMachineryAuthorized: Autorizado para maquinaria
         isDisable: Deshabilitado
-        business: Contrato
-        started: Antigüedad
-        ended: Fin
-        reasonEnd: Motivo finalización
-        department: Departamento
-        workerBusinessCategory: Categoria profesional
-        notes: Notas
-        workCenter: Centro
-        professionalCategory: Categoria profesional
     notificationsManager:
         activeNotifications: Notificaciones activas
         availableNotifications: Notificaciones disponibles
@@ -581,23 +551,6 @@ worker:
             debit: Debe
             credit: Haber
             concept: Concepto
-    business:
-        tableVisibleColumns:
-            started: Fecha inicio
-            ended: Fecha fin
-            company: Empresa
-            reasonEnd: Motivo finalización
-            department: Departamento
-            professionalCategory: Categoria profesional
-            calendarType: Calendario laboral
-            workCenter: Centro
-            payrollCategories: Categoria contrato
-            occupationCode: Cotización
-            rate: Tarifa
-            businessType: Contrato
-            amount: Salario
-            basicSalary: Salario transportistas
-            notes: Notas
     operator:
         numberOfWagons: Número de vagones
         train: tren
@@ -610,6 +563,7 @@ worker:
         sizeLimit: Tamaño límite
         isOnReservationMode: Modo de reserva
         machine: Máquina
+
 wagon:
     type:
         submit: Guardar

src/pages/Item/ItemTypeList.vue

@@ -5,9 +5,6 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import VnSection from 'src/components/common/VnSection.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -63,17 +60,20 @@ const columns = computed(() => [
         label: t('code'),
         isTitle: true,
         cardVisible: true,
+        create: true,
     },
     {
         align: 'left',
         name: 'name',
         label: t('globals.name'),
         cardVisible: true,
+        create: true,
     },
     {
         align: 'left',
         label: t('worker'),
         name: 'workerFk',
+        create: true,
         component: 'select',
         attrs: {
             url: 'Workers/search',
@@ -100,6 +100,7 @@ const columns = computed(() => [
         align: 'left',
         name: 'categoryFk',
         label: t('ItemCategory'),
+        create: true,
         component: 'select',
         attrs: {
             options: itemCategoriesOptions.value,
@@ -111,6 +112,7 @@ const columns = computed(() => [
         align: 'left',
         name: 'Temperature',
         label: t('Temperature'),
+        create: true,
         component: 'select',
         attrs: {
             options: temperatureOptions.value,
@@ -178,29 +180,6 @@ const columns = computed(() => [
                         <WorkerDescriptorProxy :id="row.workerFk" />
                     </span>
                 </template>
-                <template #more-create-dialog="{ data }">
-                    <VnInput v-model="data.code" :label="t('code')" data-cy="codeInput" />
-                    <VnInput
-                        v-model="data.name"
-                        :label="t('globals.name')"
-                        data-cy="nameInput"
-                    />
-                    <VnSelectWorker v-model="data.workerFk" />
-                    <VnSelect
-                        :label="t('ItemCategory')"
-                        v-model="data.categoryFk"
-                        :options="itemCategoriesOptions"
-                        hide-selected
-                        data-cy="itemCategorySelect"
-                    />
-                    <VnSelect
-                        :label="t('Temperature')"
-                        v-model="data.temperatureFk"
-                        :options="temperatureOptions"
-                        hide-selected
-                        data-cy="temperatureSelect"
-                    />
-                </template>
             </VnTable>
         </template>
     </VnSection>

src/pages/Order/Card/OrderCatalog.vue

@@ -22,6 +22,7 @@ const catalogParams = {
 };
 const arrayData = useArrayData(dataKey, {
     url: 'Orders/CatalogFilter',
+    limit: 50,
     userParams: catalogParams,
 });
 const store = arrayData.store;
@@ -65,7 +66,7 @@ function extractValueTags(items) {
             .filter((k) => /^value\d+$/.test(k))
             .map((v) => x[v])
             .filter((v) => v)
-            .sort(),
+            .sort()
     );
     tagValue.value = resultValueTags;
 }
@@ -75,7 +76,7 @@ watch(
     (val) => {
         extractTags(val);
     },
-    { immediate: true },
+    { immediate: true }
 );
 </script>
 

src/pages/Worker/Card/WorkerBusiness.vue

@@ -1,234 +0,0 @@
-<script setup>
-import { ref, computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-import VnTable from 'components/VnTable/VnTable.vue';
-import { toDate } from 'src/filters';
-import { useQuasar } from 'quasar';
-import axios from 'axios';
-
-const { t } = useI18n();
-const route = useRoute();
-const tableRef = ref();
-const entityId = computed(() => route.params.id);
-const quasar = useQuasar();
-
-async function reactivateWorker() {
-    const hasToReactive = tableRef.value.CrudModelRef.formData.find(
-        (data) => !data.ended
-    );
-    if (hasToReactive) {
-        quasar
-            .dialog({
-                message: t('Do you want to reactivate the user?'),
-                ok: {
-                    push: true,
-                    color: 'primary',
-                },
-                cancel: true,
-            })
-            .onOk(async () => {
-                await axios.patch(`Workers/${entityId.value}`, {
-                    isDisable: false,
-                });
-            });
-    }
-}
-const columns = computed(() => [
-    {
-        name: 'started',
-        label: t('worker.business.tableVisibleColumns.started'),
-        align: 'left',
-        format: ({ started }) => toDate(started),
-        component: 'date',
-        cardVisible: true,
-        create: true,
-    },
-
-    {
-        name: 'ended',
-        label: t('worker.business.tableVisibleColumns.ended'),
-        align: 'left',
-        format: ({ ended }) => toDate(ended),
-        component: 'date',
-        cardVisible: true,
-        create: true,
-    },
-    {
-        label: t('worker.business.tableVisibleColumns.company'),
-        align: 'left',
-        name: 'companyCodeFk',
-        component: 'select',
-        attrs: {
-            url: 'Companies',
-            fields: ['code'],
-            optionLabel: 'code',
-            optionValue: 'code',
-        },
-        cardVisible: true,
-        create: true,
-    },
-    {
-        align: 'left',
-        name: 'reasonEndFk',
-        component: 'select',
-        label: t('worker.business.tableVisibleColumns.reasonEnd'),
-        attrs: {
-            url: 'BusinessReasonEnds',
-            fields: ['id', 'reason'],
-            optionLabel: 'reason',
-        },
-        cardVisible: true,
-    },
-    {
-        align: 'left',
-        name: 'departmentFk',
-        component: 'select',
-        label: t('worker.business.tableVisibleColumns.department'),
-        attrs: {
-            url: 'Departments',
-            fields: ['id', 'name'],
-            optionLabel: 'name',
-        },
-        cardVisible: true,
-        create: true,
-    },
-    {
-        align: 'left',
-        name: 'workerBusinessProfessionalCategoryFk',
-        component: 'select',
-        label: t('worker.business.tableVisibleColumns.professionalCategory'),
-        attrs: {
-            url: 'WorkerBusinessProfessionalCategories',
-            fields: ['id', 'description', 'code'],
-            optionLabel: 'description',
-        },
-        cardVisible: true,
-        create: true,
-    },
-    {
-        align: 'left',
-        name: 'calendarTypeFk',
-        component: 'select',
-        label: t('worker.business.tableVisibleColumns.calendarType'),
-        attrs: {
-            url: 'CalendarTypes',
-            fields: ['id', 'description'],
-            optionLabel: 'description',
-        },
-        cardVisible: true,
-        create: true,
-    },
-    {
-        align: 'left',
-        name: 'workcenterFk',
-        component: 'select',
-        label: t('worker.business.tableVisibleColumns.workCenter'),
-        attrs: {
-            url: 'WorkCenters',
-            fields: ['id', 'name'],
-            optionLabel: 'name',
-        },
-        cardVisible: true,
-        create: true,
-    },
-    {
-        align: 'left',
-        name: 'workerBusinessCategoryFk',
-        component: 'select',
-        label: t('worker.business.tableVisibleColumns.payrollCategories'),
-        attrs: {
-            url: 'payrollCategories',
-            fields: ['id', 'description'],
-            optionLabel: 'description',
-        },
-        cardVisible: true,
-        create: true,
-    },
-    {
-        align: 'left',
-        name: 'occupationCodeFk',
-        component: 'select',
-        label: t('worker.business.tableVisibleColumns.occupationCode'),
-        attrs: {
-            url: 'OccupationCodes',
-            fields: ['code', 'name'],
-            optionValue: 'code',
-        },
-        cardVisible: true,
-        create: true,
-    },
-    {
-        align: 'left',
-        name: 'rate',
-        label: t('worker.business.tableVisibleColumns.rate'),
-        component: 'input',
-        cardVisible: true,
-        create: true,
-    },
-    {
-        align: 'left',
-        name: 'workerBusinessTypeFk',
-        component: 'select',
-        label: t('worker.business.tableVisibleColumns.businessType'),
-        attrs: {
-            url: 'WorkerBusinessTypes',
-            fields: ['id', 'name'],
-        },
-        cardVisible: true,
-        create: true,
-    },
-    {
-        align: 'left',
-        label: t('worker.business.tableVisibleColumns.amount'),
-        name: 'amount',
-        component: 'input',
-        cardVisible: true,
-        create: true,
-    },
-    {
-        align: 'left',
-        label: t('worker.business.tableVisibleColumns.basicSalary'),
-        name: 'basicSalary',
-        component: 'input',
-        cardVisible: true,
-        create: true,
-    },
-    {
-        name: 'notes',
-        label: t('worker.business.tableVisibleColumns.notes'),
-        align: 'left',
-        component: 'input',
-        cardVisible: true,
-    },
-]);
-</script>
-
-<template>
-    <VnTable
-        ref="tableRef"
-        data-key="WorkerBusiness"
-        :url="`Workers/${entityId}/Business`"
-        save-url="/Businesses/crud"
-        :create="{
-            urlCreate: `Workers/${entityId}/Business`,
-            title: 'Create business',
-            onDataSaved: () => tableRef.reload(),
-            formInitialData: {},
-        }"
-        order="id DESC"
-        :columns="columns"
-        default-mode="card"
-        auto-load
-        :disable-option="{ table: true }"
-        :right-search="false"
-        card-class="grid-two q-gutter-x-xl q-gutter-y-md q-pr-lg q-py-lg"
-        :is-editable="true"
-        :use-model="true"
-        @save-changes="(data) => reactivateWorker(data)"
-    />
-</template>
-<i18n>
-es:
-    Do you want to reactivate the user?: desea reactivar el usuario?
-</i18n>

src/pages/Worker/Card/WorkerSummary.vue

@@ -12,7 +12,6 @@ import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
 import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
-import axios from 'axios';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -28,76 +27,6 @@ const entityId = computed(() => $props.id || route.params.id);
 const basicDataUrl = ref(null);
 const advancedSummary = ref();
 
-const filter = {
-    include: [
-        {
-            relation: 'user',
-            scope: {
-                fields: ['name', 'nickname', 'roleFk'],
-
-                include: [
-                    {
-                        relation: 'role',
-                        scope: {
-                            fields: ['name'],
-                        },
-                    },
-                    {
-                        relation: 'emailUser',
-                        scope: {
-                            fields: ['email'],
-                        },
-                    },
-                ],
-            },
-        },
-        {
-            relation: 'department',
-            scope: {
-                include: {
-                    relation: 'department',
-                    scope: {
-                        fields: ['name'],
-                    },
-                },
-            },
-        },
-        {
-            relation: 'boss',
-        },
-        {
-            relation: 'client',
-        },
-        {
-            relation: 'sip',
-        },
-        {
-            relation: 'business',
-            scope: {
-                include: [
-                    {
-                        relation: 'department',
-                        scope: {
-                            fields: ['id', 'name'],
-                        },
-                    },
-                    {
-                        relation: 'reasonEnd',
-                        scope: {
-                            fields: ['id', 'reason'],
-                        },
-                    },
-                    {
-                        relation: 'workerBusinessProfessionalCategory',
-                        scope: {
-                            fields: ['id', 'description'],
-                        },
-                    },
-                ],
-            },
-        },
-    ],
-};
 onBeforeMount(async () => {
     advancedSummary.value = await useAdvancedSummary('Workers', entityId.value);
     basicDataUrl.value = `#/worker/${entityId.value}/basic-data`;
@@ -108,7 +37,7 @@ onBeforeMount(async () => {
     <CardSummary
         ref="summary"
         :url="`Workers/summary`"
-        :user-filter="{ where: { id: entityId }, filter }"
+        :filter="{ where: { id: entityId } }"
         data-key="Worker"
     >
         <template #header="{ entity }">
@@ -214,29 +143,6 @@ onBeforeMount(async () => {
                 </VnLv>
                 <VnLv :label="t('queue')" :value="worker.sip?.queueMember?.queue" />
             </QCard>
-            <QCard class="vn-one" v-if="advancedSummary">
-                <VnTitle
-                    :url="`#/worker/${entityId}/business`"
-                    :text="t('worker.summary.business')"
-                />
-                <VnLv
-                    :label="t('worker.summary.started')"
-                    :value="toDate(advancedSummary.currentBusiness?.started)"
-                />
-                <VnLv
-                    :label="t('worker.summary.ended')"
-                    :value="toDate(advancedSummary.currentBusiness?.ended)"
-                />
-
-                <VnLv
-                    :label="t('worker.summary.reasonEnd')"
-                    :value="advancedSummary.currentBusiness?.reasonEnd?.reason"
-                />
-                <VnLv
-                    :label="t('worker.summary.notes')"
-                    :value="advancedSummary.currentBusiness?.notes"
-                />
-            </QCard>
         </template>
     </CardSummary>
 </template>

src/router/modules/worker.js

@@ -8,7 +8,6 @@ const workerCard = {
     meta: {
         menu: [
             'WorkerBasicData',
-            'WorkerBusiness',
             'WorkerNotes',
             'WorkerPda',
             'WorkerNotificationsManager',
@@ -51,15 +50,6 @@ const workerCard = {
             },
             component: () => import('src/pages/Worker/Card/WorkerBasicData.vue'),
         },
-        {
-            path: 'business',
-            name: 'WorkerBusiness',
-            meta: {
-                title: 'business',
-                icon: 'handshake',
-            },
-            component: () => import('src/pages/Worker/Card/WorkerBusiness.vue'),
-        },
         {
             path: 'notes',
             name: 'NotesCard',

test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js

@@ -1,7 +1,7 @@
 describe('InvoiceInDescriptor', () => {
-    const book = '.summaryHeader > .no-wrap > .q-btn';
-    const firstDescritorOpt = '.q-menu > .q-list > :nth-child(5) > .q-item__section';
-    const checkbox = ':nth-child(5) > .q-checkbox';
+    const dialogBtns = '.q-card__actions button';
+    const firstDescritorOpt = '.q-menu > .q-list > :nth-child(1) > .q-item__section';
+    const isBookedField = '.q-card:nth-child(3) .vn-label-value:nth-child(5) .q-checkbox';
 
     it('should booking and unbooking the invoice properly', () => {
         cy.viewport(1280, 720);
@@ -9,13 +9,13 @@ describe('InvoiceInDescriptor', () => {
         cy.visit('/#/invoice-in/1/summary');
         cy.waitForElement('.q-page');
 
-        cy.get(book).click();
-        cy.dataCy('VnConfirm_confirm').click();
-        cy.get(checkbox).invoke('attr', 'aria-checked').should('eq', 'true');
-
-        cy.dataCy('descriptor-more-opts').first().click();
+        cy.openActionsDescriptor();
         cy.get(firstDescritorOpt).click();
-        cy.dataCy('VnConfirm_confirm').click();
-        cy.get(checkbox).invoke('attr', 'aria-checked').should('eq', 'false');
+        cy.get(dialogBtns).eq(1).click();
+        cy.get(isBookedField).should('have.attr', 'aria-checked', 'true');
+
+        cy.get(firstDescritorOpt).click();
+        cy.get(dialogBtns).eq(1).click();
+        cy.get(isBookedField).should('have.attr', 'aria-checked', 'false');
     });
 });

test/cypress/integration/item/itemBarcodes.spec.js

@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('ItemBarcodes', () => {
+describe('Item shelving', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');

test/cypress/integration/item/itemType.spec.js

@@ -1,10 +1,5 @@
 /// <reference types="cypress" />
 describe('Item type', () => {
-    const workerError = 'employeeNick';
-    const worker = 'buyerNick';
-    const category = 'Artificial';
-    const type = 'Flower';
-
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
@@ -13,24 +8,32 @@ describe('Item type', () => {
 
     it('should throw an error if the code already exists', () => {
         cy.dataCy('vnTableCreateBtn').click();
-        cy.dataCy('codeInput').type('ALS');
-        cy.dataCy('nameInput').type('Alstroemeria');
-        cy.dataCy('vnWorkerSelect').type(workerError);
-        cy.get('.q-menu .q-item').contains(workerError).click();
-        cy.dataCy('itemCategorySelect').type(category);
-        cy.get('.q-menu .q-item').contains(category).click();
+        cy.get(
+            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Code_input"]'
+        ).type('ALS');
+        cy.get(
+            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Name_input"]'
+        ).type('Alstroemeria');
+        cy.dataCy('Worker_select').type('employeeNick');
+        cy.get('.q-menu .q-item').contains('employeeNick').click();
+        cy.dataCy('ItemCategory_select').type('Artificial');
+        cy.get('.q-menu .q-item').contains('Artificial').click();
         cy.dataCy('FormModelPopup_save').click();
         cy.checkNotification('An item type with the same code already exists');
     });
 
     it('should create a new type', () => {
         cy.dataCy('vnTableCreateBtn').click();
-        cy.dataCy('codeInput').type('LIL');
-        cy.dataCy('nameInput').type('Lilium');
-        cy.dataCy('vnWorkerSelect').type(worker);
-        cy.get('.q-menu .q-item').contains(worker).click();
-        cy.dataCy('itemCategorySelect').type(type);
-        cy.get('.q-menu .q-item').contains(type).click();
+        cy.get(
+            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Code_input"]'
+        ).type('LIL');
+        cy.get(
+            'div.fit > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Name_input"]'
+        ).type('Lilium');
+        cy.dataCy('Worker_select').type('buyerNick');
+        cy.get('.q-menu .q-item').contains('buyerNick').click();
+        cy.dataCy('ItemCategory_select').type('Flower');
+        cy.get('.q-menu .q-item').contains('Flower').click();
         cy.dataCy('FormModelPopup_save').click();
         cy.checkNotification('Data created');
     });