Merge pull request 'fixes #5255 Revisar ticket/boxing' (!49) from 5255-revisar-ticketBoxing into dev

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

src/boot/axios.js

@@ -58,9 +58,12 @@ const onResponseError = (error) => {
             break;
     }
 
-    if (session.isLoggedIn && response.status === 401) {
+    if (session.isLoggedIn() && response.status === 401) {
         session.destroy();
         Router.push({ path: '/login' });
+    } else if(!session.isLoggedIn())
+    {
+        message = 'login.loginError';
     }
 
     Notify.create({

src/components/UserPanel.vue

@@ -70,7 +70,7 @@ async function saveDarkMode(value) {
 }
 
 async function saveLanguage(value) {
-    const query = `/Accounts/${user.value.id}`;
+    const query = `/VnUsers/${user.value.id}`;
     await axios.patch(query, {
         lang: value,
     });

src/composables/useRole.js

@@ -5,7 +5,7 @@ export function useRole() {
     const state = useState();
 
     async function fetch() {
-        const { data } = await axios.get('Accounts/acl');
+        const { data } = await axios.get('VnUsers/acl');
         const roles = data.roles.map((userRoles) => userRoles.role.name);
 
         const userData = {

src/pages/Login/LoginMain.vue

@@ -48,25 +48,29 @@ const password = ref('');
 const keepLogin = ref(true);
 
 async function onSubmit() {
-    const { data } = await axios.post('Accounts/login', {
+    try {
-        user: username.value,
+        const { data } = await axios.post('Accounts/login', {
-        password: password.value,
+            user: username.value,
-    });
+            password: password.value,
+        });
 
-    if (!data) return;
+        if (!data) return;
 
-    await session.login(data.token, keepLogin.value);
+        await session.login(data.token, keepLogin.value);
 
-    quasar.notify({
+        quasar.notify({
-        message: t('login.loginSuccess'),
+            message: t('login.loginSuccess'),
-        type: 'positive',
+            type: 'positive',
-    });
+        });
 
-    const currentRoute = router.currentRoute.value;
+        const currentRoute = router.currentRoute.value;
-    if (currentRoute.query && currentRoute.query.redirect) {
+        if (currentRoute.query && currentRoute.query.redirect) {
-        router.push(currentRoute.query.redirect);
+            router.push(currentRoute.query.redirect);
-    } else {
+        } else {
-        router.push({ name: 'Dashboard' });
+            router.push({ name: 'Dashboard' });
+        }
+    } catch (e) {
+        //
     }
 }
 </script>

src/pages/Ticket/Card/TicketBoxing.vue

@@ -1,9 +1,9 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-import { computed, ref, onMounted } from 'vue';
-import { useRouter } from 'vue-router';
 import axios from 'axios';
 import { date, useQuasar } from 'quasar';
+import { computed, onMounted, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
 
 const router = useRouter();
 const { t } = useI18n();
@@ -21,22 +21,25 @@ const expeditions = ref({});
 const lastExpedition = ref();
 const slide = ref(null);
 const videoList = ref([]);
-const time = ref({
+const time = reactive({
     min: 0,
     max: 24,
 });
-
 async function fetch() {
-    const filter = {
+    try {
-        where: {
+        const filter = {
-            ticketFk: entityId.value,
+            where: {
-        },
+                ticketFk: entityId.value,
-    };
+            },
-    const { data } = await axios.get(`/Expeditions/filter`, {
+        };
-        params: { filter },
+        const { data } = await axios.get(`/Expeditions/filter`, {
-    });
+            params: { filter },
+        });
 
-    if (data) expeditions.value = data;
+        if (data) expeditions.value = data;
+    } catch (e) {
+        //
+    }
 }
 
 async function getVideoList(expeditionId, timed) {
@@ -46,115 +49,108 @@ async function getVideoList(expeditionId, timed) {
     };
 
     if (timed) {
+        if (timed.max == timed.min) {
+            if (timed.max != 24) timed.max += 1;
+            else timed.min -= 1;
+        }
         Object.assign(params, { from: timed.min, to: timed.max });
     }
-    const { data } = await axios.get(`/Boxings/getVideoList`, { params: params });
+    await axios.get(`/Boxings/getVideoList`, { params: params }).then((res) => {
+        const data = res.data;
+        if (!data.length) {
+            return quasar.notify({
+                message: t('ticket.boxing.notFound'),
+                type: 'negative',
+            });
+        }
+        const list = [];
+        for (const video of data) {
+            const videoName = video.split('.')[0].split('T')[1].replace(/-/g, ':');
+            list.push({
+                label: videoName,
+                value: video,
+                url: `api/Boxings/getVideo?id=${expeditionId}&filename=${video}`,
+            });
+        }
 
-    const list = [];
+        videoList.value = list.reverse();
-    for (const video of data) {
+        if (list[0]) {
-        const videName = video.split('.')[0].split('T')[1].replaceAll('-', ':');
+            slide.value = list[0].value;
-        list.push({
+            time.min = parseInt(list[0].label.split(':')[0]);
-            label: videName,
+            time.max = parseInt(list[list.length - 1].label.split(':')[0]) + 1;
-            value: video,
+        }
-            url: `api/Boxings/getVideo?id=${expeditionId}&filename=${video}`,
+    });
-        });
-    }
-
-    videoList.value = list.reverse();
-    if (list[0]) {
-        slide.value = list[0].value;
-        time.value = {
-            min: parseInt(list[0].label.split(':')[0]),
-            max: parseInt(list[list.length - 1].label.split(':')[0]),
-        };
-    }
-
-    if (!data.length) {
-        return quasar.notify({
-            message: t('ticket.boxing.notFound'),
-            type: 'negative',
-        });
-    }
 }
 </script>
 
 <template>
-    <teleport to=".q-layout">
+    <QDrawer show-if-above side="right">
-        <QDrawer show-if-above side="right">
+        <QScrollArea class="fit">
-            <QScrollArea class="fit">
+            <QList bordered separator style="max-width: 318px">
-                <QList bordered separator style="max-width: 318px">
+                <QItem v-if="lastExpedition && videoList.length">
-                    <QItem v-if="lastExpedition && videoList.length">
+                    <QItemSection>
-                        <QItemSection>
+                        <QItemLabel class="text-h6">
-                            <QItemLabel class="text-h6">
+                            {{ t('ticket.boxing.selectTime') }} ({{ time.min }}-{{
-                                {{ t('ticket.boxing.selectTime') }} ({{ time.min }}-{{
+                                time.max
-                                    time.max
+                            }})
-                                }})
+                        </QItemLabel>
-                            </QItemLabel>
+                        <QRange
-                            <QRange
+                            v-model="time"
-                                v-model="time"
+                            @change="getVideoList(lastExpedition, time)"
-                                @change="getVideoList(lastExpedition, time)"
+                            :min="0"
-                                :min="0"
+                            :max="24"
-                                :max="24"
+                            :step="1"
-                                :step="1"
+                            :left-label-value="time.min + ':00'"
-                                :left-label-value="time.min + ':00'"
+                            :right-label-value="time.max + ':00'"
-                                :right-label-value="time.max + ':00'"
+                            label
-                                label
+                            markers
-                                markers
+                            snap
-                                snap
+                            color="orange"
-                                color="orange"
+                        />
-                            />
+                    </QItemSection>
-                        </QItemSection>
+                </QItem>
-                    </QItem>
+                <QItem v-if="lastExpedition && videoList.length">
-                    <QItem v-if="lastExpedition && videoList.length">
+                    <QItemSection>
-                        <QItemSection>
+                        <QSelect
-                            <QSelect
+                            color="orange"
-                                color="orange"
+                            v-model="slide"
-                                v-model="slide"
+                            :options="videoList"
-                                :options="videoList"
+                            :label="t('ticket.boxing.selectVideo')"
-                                :label="t('ticket.boxing.selectVideo')"
+                            emit-value
-                                emit-value
+                            map-options
-                                map-options
+                        >
-                            >
+                            <template #prepend>
-                                <template #prepend>
+                                <QIcon name="schedule" />
-                                    <QIcon name="schedule" />
+                            </template>
-                                </template>
+                        </QSelect>
-                            </QSelect>
+                    </QItemSection>
-                        </QItemSection>
+                </QItem>
-                    </QItem>
+                <QItem
-                    <QItem
+                    v-for="expedition in expeditions"
-                        v-for="expedition in expeditions"
+                    :key="expedition.id"
-                        :key="expedition.id"
+                    @click="getVideoList(expedition.id)"
-                        @click="getVideoList(expedition.id)"
+                    clickable
-                        clickable
+                    v-ripple
-                        v-ripple
+                >
-                    >
+                    <QItemSection>
-                        <QItemSection>
+                        <QItemLabel class="text-h6">#{{ expedition.id }}</QItemLabel>
-                            <QItemLabel class="text-h6">#{{ expedition.id }}</QItemLabel>
+                    </QItemSection>
-                        </QItemSection>
+                    <QItemSection>
-                        <QItemSection>
+                        <QItemLabel caption>{{ t('ticket.boxing.created') }}</QItemLabel>
-                            <QItemLabel caption>{{
+                        <QItemLabel>
-                                t('ticket.boxing.created')
+                            {{
-                            }}</QItemLabel>
+                                date.formatDate(expedition.created, 'YYYY-MM-DD HH:mm:ss')
-                            <QItemLabel>
+                            }}
-                                {{
+                        </QItemLabel>
-                                    date.formatDate(
+                        <QItemLabel caption>{{ t('ticket.boxing.item') }}</QItemLabel>
-                                        expedition.created,
+                        <QItemLabel>{{ expedition.packagingItemFk }}</QItemLabel>
-                                        'YYYY-MM-DD HH:mm:ss'
+                        <QItemLabel caption>{{ t('ticket.boxing.worker') }}</QItemLabel>
-                                    )
+                        <QItemLabel>{{ expedition.userName }}</QItemLabel>
-                                }}
+                    </QItemSection>
-                            </QItemLabel>
+                </QItem>
-                            <QItemLabel caption>{{ t('ticket.boxing.item') }}</QItemLabel>
+            </QList>
-                            <QItemLabel>{{ expedition.packagingItemFk }}</QItemLabel>
+        </QScrollArea>
-                            <QItemLabel caption>{{
+    </QDrawer>
-                                t('ticket.boxing.worker')
-                            }}</QItemLabel>
-                            <QItemLabel>{{ expedition.userName }}</QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </QList>
-            </QScrollArea>
-        </QDrawer>
-    </teleport>
 
     <QCard>
         <QCarousel animated v-model="slide" height="max-content">

test/cypress/integration/claimPhoto.spec.js

@@ -43,13 +43,13 @@ describe('ClaimPhoto', () => {
         cy.get(
             '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
         ).click();
-        cy.get('.q-btn--standard > .q-btn__content > .block').click();
+        cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
         cy.get('.q-notification__message').should('have.text', 'Data deleted');
 
         cy.get(
             '.multimediaParent > :nth-child(3) > .q-btn > .q-btn__content > .q-icon'
         ).click();
-        cy.get('.q-btn--standard > .q-btn__content > .block').click();
+        cy.get('.q-btn--unelevated > .q-btn__content > .block').click();
         cy.get('.q-notification__message').should('have.text', 'Data deleted');
     });
 });

test/cypress/integration/ticketBoxing.spec.js

@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-xdescribe('TicketBoxing', () => {
+describe('TicketBoxing', () => {
     beforeEach(() => {
         const ticketId = 1;
         cy.viewport(1280, 720);
@@ -26,9 +26,9 @@ xdescribe('TicketBoxing', () => {
             },
             ['2022-01-01T01-01-00.mp4', '2022-02-02T02-02-00.mp4', '2022-03-03T03-03-00.mp4']
         ).as('getVideoList');
-        cy.get('.q-list > :nth-child(3)').click();
+        cy.get('.q-list').eq(3).find('.q-item').eq(2).click();
 
-        cy.get('.q-list > :nth-child(1)').should('be.visible');
+        cy.get('.q-list').eq(3).find('.q-item').eq(0).find('.q-range');
-        cy.get('.q-list > :nth-child(2)').should('be.visible');
+        cy.get('.q-list').eq(3).find('.q-item').eq(1).find('.q-select');
     });
 });

test/cypress/integration/workerList.spec.js

@@ -12,7 +12,10 @@ describe('WorkerList', () => {
     });
 
     it('should open the worker summary', () => {
-        cy.get('div[class="q-item__section column q-item__section--side justify-center q-pa-md"]').eq(0).click();
+        cy.get('div.text-h6')
+            .parentsUntil('div.q-card')
+            .find('div.q-card__actions')
+            .find('button').first().click();
         cy.get('div[class="header bg-primary q-pa-sm q-mb-md"').should('have.text', '1110 - Jessica Jones');
         cy.get('div[class="q-item__label q-item__label--header text-h6"]').eq(0).should('have.text', 'Basic data');
         cy.get('div[class="q-item__label q-item__label--header text-h6"]').eq(1).should('have.text', 'User data');

test/cypress/integration/workerSummary.spec.js

@@ -6,10 +6,10 @@ describe('WorkerSummary', () => {
     });
 
     it('should load worker summary', () => {
-        cy.get('div[class="header bg-primary q-pa-sm q-mb-md"').should('have.text', '19 - salesBoss');
+        cy.get('div[class="header bg-primary q-pa-sm q-mb-md"').should('have.text', '19 - salesBoss salesBoss');
         cy.get('div[class="q-item__label q-item__label--header text-h6"]').eq(0).should('have.text', 'Basic data');
         cy.get('div[class="q-item__label q-item__label--header text-h6"]').eq(1).should('have.text', 'User data');
         cy.get('div[class="q-item__section column q-item__section--main justify-center"]').eq(0).should('have.text', 'NamesalesBossNick');
     });
 
-});
+});

test/vitest/__tests__/boot/axios.spec.js

@@ -1,15 +1,15 @@
-import { vi, describe, expect, it } from 'vitest';
+import { Notify } from 'quasar';
 import { onRequest, onResponseError } from 'src/boot/axios';
-import { Notify } from 'quasar'
+import { describe, expect, it, vi } from 'vitest';
 
 vi.mock('src/composables/useSession', () => ({
     useSession: () => ({
-        getToken: () => 'DEFAULT_TOKEN'
+        getToken: () => 'DEFAULT_TOKEN',
-    }),
+        isLoggedIn: () => vi.fn(),
+        destroy: () => vi.fn(),
+    })
 }));
 
-vi.mock('src/router', () => ({}));
-
 describe('Axios boot', () => {
 
     describe('onRequest()', async () => {

test/vitest/__tests__/pages/Tickets/TicketBoxing.spec.js

@@ -4,7 +4,7 @@ import TicketBoxing from 'pages/Ticket/Card/TicketBoxing.vue';
 
 // #4836 - Investigate how to test q-drawer outside
 // q-layout or how to teleport q-drawer inside
-describe.skip('TicketBoxing', () => {
+describe('TicketBoxing', () => {
     let vm;
     beforeAll(() => {
         vm = createWrapper(TicketBoxing).vm;