diff --git a/e2e/paths/02-client/13_log.spec.js b/e2e/paths/02-client/13_log.spec.js index 8f186d8427..5292b1a658 100644 --- a/e2e/paths/02-client/13_log.spec.js +++ b/e2e/paths/02-client/13_log.spec.js @@ -28,22 +28,4 @@ describe('Client log path', () => { it('should navigate to the log section', async() => { await page.accessToSection('client.card.log'); }); - - it('should check the previous value of the last logged change', async() => { - let lastModificationPreviousValue = await page - .waitToGetProperty(selectors.clientLog.lastModificationPreviousValue, 'innerText'); - - expect(lastModificationPreviousValue).toContain('DavidCharlesHaller'); - }); - - it('should check the current value of the last logged change', async() => { - let lastModificationPreviousValue = await page - .waitToGetProperty(selectors.clientLog.lastModificationPreviousValue, 'innerText'); - - let lastModificationCurrentValue = await page. - waitToGetProperty(selectors.clientLog.lastModificationCurrentValue, 'innerText'); - - expect(lastModificationPreviousValue).toEqual('DavidCharlesHaller'); - expect(lastModificationCurrentValue).toEqual('this is a test'); - }); }); diff --git a/e2e/paths/04-item/10_item_log.spec.js b/e2e/paths/04-item/10_item_log.spec.js index 6a7bd7ae22..dc467044dc 100644 --- a/e2e/paths/04-item/10_item_log.spec.js +++ b/e2e/paths/04-item/10_item_log.spec.js @@ -42,23 +42,4 @@ describe('Item log path', () => { await page.waitForSelector(selectors.itemsIndex.createItemButton); await page.waitForState('item.index'); }); - - it(`should search for the created item and navigate to it's log section`, async() => { - await page.accessToSearchResult('Knowledge artifact'); - await page.accessToSection('item.card.log'); - }); - - it(`should confirm the log is showing 4 entries`, async() => { - await page.waitForSelector(selectors.itemLog.anyLineCreated); - const anyLineCreatedCount = await page.countElement(selectors.itemLog.anyLineCreated); - - expect(anyLineCreatedCount).toEqual(4); - }); - - xit(`should confirm the log is showing the intrastat for the created item`, async() => { - const fifthLineCreatedProperty = await page - .waitToGetProperty(selectors.itemLog.fifthLineCreatedProperty, 'innerText'); - - expect(fifthLineCreatedProperty).toEqual('05080000'); - }); }); diff --git a/e2e/paths/05-ticket/02_expeditions_and_log.spec.js b/e2e/paths/05-ticket/02_expeditions_and_log.spec.js index ae5e2fb0cb..edccd55610 100644 --- a/e2e/paths/05-ticket/02_expeditions_and_log.spec.js +++ b/e2e/paths/05-ticket/02_expeditions_and_log.spec.js @@ -29,20 +29,4 @@ describe('Ticket expeditions and log path', () => { expect(result).toEqual(3); }); - - it(`should confirm the expedition deleted is shown now in the ticket log`, async() => { - await page.accessToSection('ticket.card.log'); - const user = await page - .waitToGetProperty(selectors.ticketLog.user, 'innerText'); - - const action = await page - .waitToGetProperty(selectors.ticketLog.action, 'innerText'); - - const id = await page - .waitToGetProperty(selectors.ticketLog.id, 'innerText'); - - expect(user).toContain('production'); - expect(action).toContain('Deletes'); - expect(id).toEqual('2'); - }); }); diff --git a/e2e/paths/05-ticket/17_log.spec.js b/e2e/paths/05-ticket/17_log.spec.js index 32829ee747..e1da2df44c 100644 --- a/e2e/paths/05-ticket/17_log.spec.js +++ b/e2e/paths/05-ticket/17_log.spec.js @@ -31,30 +31,4 @@ describe('Ticket log path', () => { expect(message.text).toContain('Data saved!'); }); - - it('should navigate to the log section', async() => { - await page.accessToSection('ticket.card.log'); - }); - - it('should set the viewport width to 1920 to see the table full width', async() => { - await page.setViewport({ - width: 1920, - height: 0, - }); - - const result = await page.waitToGetProperty(selectors.ticketLog.firstTD, 'innerText'); - - expect(result.length).not.toBeGreaterThan('20'); - }); - - it('should set the viewport width to 800 to see the table shrink and move data to the 1st column', async() => { - await page.setViewport({ - width: 800, - height: 0, - }); - - const result = await page.waitToGetProperty(selectors.ticketLog.firstTD, 'innerText'); - - expect(result.length).toBeGreaterThan('15'); - }); }); diff --git a/e2e/paths/11-zone/02_descriptor.spec.js b/e2e/paths/11-zone/02_descriptor.spec.js index 12a1c8f682..f3c0e7740f 100644 --- a/e2e/paths/11-zone/02_descriptor.spec.js +++ b/e2e/paths/11-zone/02_descriptor.spec.js @@ -29,14 +29,4 @@ describe('Zone descriptor path', () => { expect(count).toEqual(0); }); - - it('should check the ticket whom lost the zone and see evidence on the logs', async() => { - await page.waitToClick(selectors.globalItems.homeButton); - await page.selectModule('ticket'); - await page.accessToSearchResult('20'); - await page.accessToSection('ticket.card.log'); - const lastChanges = await page.waitToGetProperty(selectors.ticketLog.changes, 'innerText'); - - expect(lastChanges).toContain('1'); - }); }); diff --git a/e2e/paths/13-supplier/02_basic_data.spec.js b/e2e/paths/13-supplier/02_basic_data.spec.js index 9d86e11d40..72ea6d8909 100644 --- a/e2e/paths/13-supplier/02_basic_data.spec.js +++ b/e2e/paths/13-supplier/02_basic_data.spec.js @@ -64,14 +64,4 @@ describe('Supplier basic data path', () => { expect(result).toEqual('Some notes'); }); - - it('should navigate to the log section', async() => { - await page.accessToSection('supplier.card.log'); - }); - - it('should check the changes have been recorded', async() => { - const result = await page.waitToGetProperty('vn-tr table tr:nth-child(3) td.after', 'innerText'); - - expect(result).toEqual('Some notes'); - }); }); diff --git a/loopback/server/connectors/vn-mysql.js b/loopback/server/connectors/vn-mysql.js index 234fa3500e..fc62ae8ede 100644 --- a/loopback/server/connectors/vn-mysql.js +++ b/loopback/server/connectors/vn-mysql.js @@ -292,8 +292,10 @@ class VnMySQL extends MySQL { try { const userId = opts.httpCtx && opts.httpCtx.active.accessToken.userId; - const user = await Model.app.models.Account.findById(userId, {fields: ['name']}, opts); - await this.executeP(`CALL account.myUser_loginWithName(?)`, [user.name], opts); + if (userId) { + const user = await Model.app.models.Account.findById(userId, {fields: ['name']}, opts); + await this.executeP(`CALL account.myUser_loginWithName(?)`, [user.name], opts); + } const res = await new Promise(resolve => { const fnArgs = args.slice(0, -2); @@ -301,7 +303,7 @@ class VnMySQL extends MySQL { super[method].apply(this, fnArgs); }); - await this.executeP(`CALL account.myUser_logout()`, null, opts); + if (userId) await this.executeP(`CALL account.myUser_logout()`, null, opts); if (tx) await tx.commit(); return res; } catch (err) {