From ef6ed6c97db12e90eae48f138ec7dfc019b3c70d Mon Sep 17 00:00:00 2001 From: Jtubau Date: Thu, 12 Dec 2024 08:51:03 +0100 Subject: [PATCH 1/8] refactor: refs #8266 8266 change expedition item name --- src/pages/Ticket/Card/TicketExpedition.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue index 38010a997..9de0103f6 100644 --- a/src/pages/Ticket/Card/TicketExpedition.vue +++ b/src/pages/Ticket/Card/TicketExpedition.vue @@ -58,7 +58,7 @@ const columns = computed(() => [ }, { label: t('basicData.item'), - name: 'packagingItemFk', + name: 'longName', align: 'left', cardVisible: true, columnFilter: { @@ -75,7 +75,7 @@ const columns = computed(() => [ }, }, { - label: t('expedition.packageType'), + label: t('expedition.longName'), name: 'freightItemName', align: 'left', columnFilter: { @@ -308,9 +308,9 @@ onMounted(async () => { " order="created DESC" > - + Date: Sun, 29 Dec 2024 10:05:56 +0100 Subject: [PATCH 5/8] refactor: refs #7052 move EditTableCellValueForm tests to a new location and enhance test coverage --- .../__tests__}/EditTableCellValueForm.spec.js | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) rename {test/vitest/__tests__/components => src/components/__tests__}/EditTableCellValueForm.spec.js (66%) diff --git a/test/vitest/__tests__/components/EditTableCellValueForm.spec.js b/src/components/__tests__/EditTableCellValueForm.spec.js similarity index 66% rename from test/vitest/__tests__/components/EditTableCellValueForm.spec.js rename to src/components/__tests__/EditTableCellValueForm.spec.js index a0a4142fa..8cd8140ef 100644 --- a/test/vitest/__tests__/components/EditTableCellValueForm.spec.js +++ b/src/components/__tests__/EditTableCellValueForm.spec.js @@ -2,15 +2,18 @@ import { createWrapper, axios } from 'app/test/vitest/helper'; import EditForm from 'components/EditTableCellValueForm.vue'; import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest'; -describe('EditForm', () => { +const fieldA = 'fieldA'; +const fieldB = 'fieldB'; + +describe.only('EditForm', () => { let vm; const mockRows = [ { id: 1, itemFk: 101 }, { id: 2, itemFk: 102 }, ]; const mockFieldsOptions = [ - { label: 'Field A', field: 'fieldA', component: 'input', attrs: {} }, - { label: 'Field B', field: 'fieldB', component: 'date', attrs: {} }, + { label: 'Field A', field: fieldA, component: 'input', attrs: {} }, + { label: 'Field B', field: fieldB, component: 'date', attrs: {} }, ]; const editUrl = '/api/edit'; @@ -31,7 +34,7 @@ describe('EditForm', () => { describe('onSubmit()', () => { it('should call axios.post with the correct parameters in the payload', async () => { - const selectedField = { field: 'fieldA', component: 'input', attrs: {} }; + const selectedField = { field: fieldA, component: 'input', attrs: {} }; const newValue = 'Test Value'; vm.selectedField = selectedField; @@ -42,12 +45,12 @@ describe('EditForm', () => { const payload = axios.post.mock.calls[0][1]; expect(axios.post).toHaveBeenCalledWith(editUrl, expect.any(Object)); - expect(payload.field).toEqual('fieldA'); - expect(payload.newValue).toEqual('Test Value'); + expect(payload.field).toEqual(fieldA); + expect(payload.newValue).toEqual(newValue); - expect(payload.lines).toContainEqual( - expect.objectContaining({ id: 1, itemFk: 101 }) - ); + expect(payload.lines).toEqual(expect.arrayContaining(mockRows)); + console.log('payload.lines', payload.lines); + console.log('mockRows', expect.arrayContaining(mockRows)); expect(vm.isLoading).toEqual(false); }); From 1e0d444e85a59c5e3a892fc77bff47d8f0317b53 Mon Sep 17 00:00:00 2001 From: jgallego Date: Sun, 29 Dec 2024 10:06:30 +0100 Subject: [PATCH 6/8] refactor: refs #7052 remove unnecessary console logs from EditTableCellValueForm tests --- src/components/__tests__/EditTableCellValueForm.spec.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/__tests__/EditTableCellValueForm.spec.js b/src/components/__tests__/EditTableCellValueForm.spec.js index 8cd8140ef..54f4c0a1a 100644 --- a/src/components/__tests__/EditTableCellValueForm.spec.js +++ b/src/components/__tests__/EditTableCellValueForm.spec.js @@ -49,8 +49,6 @@ describe.only('EditForm', () => { expect(payload.newValue).toEqual(newValue); expect(payload.lines).toEqual(expect.arrayContaining(mockRows)); - console.log('payload.lines', payload.lines); - console.log('mockRows', expect.arrayContaining(mockRows)); expect(vm.isLoading).toEqual(false); }); From 55ab9fea3e2f10f05df78aa12f133af9bc5bf013 Mon Sep 17 00:00:00 2001 From: jgallego Date: Mon, 30 Dec 2024 08:55:00 +0100 Subject: [PATCH 7/8] test: refs #7052 remove .only from EditTableCellValueForm test suite --- src/components/__tests__/EditTableCellValueForm.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/__tests__/EditTableCellValueForm.spec.js b/src/components/__tests__/EditTableCellValueForm.spec.js index 54f4c0a1a..fa47d8f73 100644 --- a/src/components/__tests__/EditTableCellValueForm.spec.js +++ b/src/components/__tests__/EditTableCellValueForm.spec.js @@ -5,7 +5,7 @@ import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest'; const fieldA = 'fieldA'; const fieldB = 'fieldB'; -describe.only('EditForm', () => { +describe('EditForm', () => { let vm; const mockRows = [ { id: 1, itemFk: 101 }, From d67ae3cafb06b09876a65b7e8083e43a456377c9 Mon Sep 17 00:00:00 2001 From: jgallego Date: Mon, 30 Dec 2024 14:53:08 +0100 Subject: [PATCH 8/8] style: update CustomerBalance.vue to set label color --- src/pages/Customer/Card/CustomerBalance.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue index 712be5e09..04ef5f882 100644 --- a/src/pages/Customer/Card/CustomerBalance.vue +++ b/src/pages/Customer/Card/CustomerBalance.vue @@ -84,6 +84,7 @@ const columns = computed(() => [ label: t('Creation date'), format: ({ created }) => toDateHourMin(created), cardVisible: true, + style: 'color: var(--vn-label-color)', }, { align: 'left',