diff --git a/dashboard/src/components/access/RevokeUserAccess.vue b/dashboard/src/components/access/RevokeUserAccess.vue index b40f572f9f..cb54b7c2bc 100644 --- a/dashboard/src/components/access/RevokeUserAccess.vue +++ b/dashboard/src/components/access/RevokeUserAccess.vue @@ -84,17 +84,7 @@ limitations under the License. fields: [ { key: 'userId', - label: 'User Id', - sortable: true, - }, - { - key: 'firstName', - label: 'First Name', - sortable: true, - }, - { - key: 'lastName', - label: 'Last Name', + label: 'User', sortable: true, }, ], @@ -179,16 +169,21 @@ limitations under the License. getUserDisplay(props) { const userDisplay = props.userIdForDisplay ? props.userIdForDisplay : props.userId; const { oAuthProviders } = this.$store.getters.config; + let userName = ''; + console.log(props); + if (props.firstName && props.lastName) { + userName = `(${props.lastName}, ${props.firstName})`; + } if (oAuthProviders) { const indexOfDash = userDisplay.lastIndexOf('-'); if (indexOfDash > 0) { const provider = userDisplay.substr(indexOfDash + 1); if (oAuthProviders.includes(provider)) { - return userDisplay.substr(0, indexOfDash); + return `${userDisplay.substr(0, indexOfDash)} ${userName}`; } } } - return userDisplay; + return `${userDisplay} ${userName}`; }, }, }; diff --git a/dashboard/src/components/users/UserIdForDisplayMixin.vue b/dashboard/src/components/users/UserIdForDisplayMixin.vue index 386ecc1a62..e400ed945b 100644 --- a/dashboard/src/components/users/UserIdForDisplayMixin.vue +++ b/dashboard/src/components/users/UserIdForDisplayMixin.vue @@ -18,18 +18,23 @@ limitations under the License. name: 'UserIdForDisplayMixin', methods: { getUserDisplay(props) { + console.log(props); const userDisplay = props.userIdForDisplay ? props.userIdForDisplay : props.userId; const { oAuthProviders } = this.$store.getters.config; + let userName = ''; + if (props.firstName && props.lastName) { + userName = `(${props.lastName}, ${props.firstName})`; + } if (oAuthProviders) { const indexOfDash = userDisplay.lastIndexOf('-'); if (indexOfDash > 0) { const provider = userDisplay.substr(indexOfDash + 1); if (oAuthProviders.includes(provider)) { - return userDisplay.substr(0, indexOfDash); + return `${userDisplay.substr(0, indexOfDash)} ${userName}`; } } } - return userDisplay; + return `${userDisplay} ${userName}`; }, }, }; diff --git a/dashboard/src/components/users/UsersTable.vue b/dashboard/src/components/users/UsersTable.vue index 5d3b765eae..d971afa441 100644 --- a/dashboard/src/components/users/UsersTable.vue +++ b/dashboard/src/components/users/UsersTable.vue @@ -156,17 +156,7 @@ limitations under the License. fields: [ { key: 'userId', - label: 'User Id', - sortable: true, - }, - { - key: 'firstName', - label: 'First Name', - sortable: true, - }, - { - key: 'lastName', - label: 'Last Name', + label: 'User', sortable: true, }, { diff --git a/e2e-tests/cypress/e2e/selfReport_spec.js b/e2e-tests/cypress/e2e/selfReport_spec.js index a0a912ce70..f84f5f07a0 100644 --- a/e2e-tests/cypress/e2e/selfReport_spec.js +++ b/e2e-tests/cypress/e2e/selfReport_spec.js @@ -1068,35 +1068,35 @@ describe('Self Report Skills Management Tests', () => { colIndex: 0, value: 'user0' }, { - colIndex: 4, + colIndex: 2, value: '100' }], [{ colIndex: 0, value: 'user1' }, { - colIndex: 4, + colIndex: 2, value: '100' }], [{ colIndex: 0, value: 'user2' }, { - colIndex: 4, + colIndex: 2, value: '100' }], [{ colIndex: 0, value: 'user3' }, { - colIndex: 4, + colIndex: 2, value: '100' }], [{ colIndex: 0, value: 'user4' }, { - colIndex: 4, + colIndex: 2, value: '100' }], ]); diff --git a/e2e-tests/cypress/e2e/users_spec.js b/e2e-tests/cypress/e2e/users_spec.js index 4929e49cee..ede9862b8e 100644 --- a/e2e-tests/cypress/e2e/users_spec.js +++ b/e2e-tests/cypress/e2e/users_spec.js @@ -53,62 +53,62 @@ describe('Users Tests', () => { // default sort order is 'Points Last Earned' desc cy.validateTable(tableSelector, [ - [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(7, 'day')) }], - [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(6, 'day')) }], - [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(5, 'day')) }], - [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(4, 'day')) }], - [{ colIndex: 0, value: 'user1@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(3, 'day')) }], - [{ colIndex: 0, value: 'user0@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(2, 'day')) }], + [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(7, 'day')) }], + [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(6, 'day')) }], + [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(5, 'day')) }], + [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(4, 'day')) }], + [{ colIndex: 0, value: 'user1@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(3, 'day')) }], + [{ colIndex: 0, value: 'user0@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(2, 'day')) }], ], 5); cy.get(`${tableSelector}`).contains('Points Last Earned').click(); cy.validateTable(tableSelector, [ - [{ colIndex: 0, value: 'user0@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(2, 'day')) }], - [{ colIndex: 0, value: 'user1@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(3, 'day')) }], - [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(4, 'day')) }], - [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(5, 'day')) }], - [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(6, 'day')) }], - [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(7, 'day')) }], + [{ colIndex: 0, value: 'user0@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(2, 'day')) }], + [{ colIndex: 0, value: 'user1@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(3, 'day')) }], + [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(4, 'day')) }], + [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(5, 'day')) }], + [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(6, 'day')) }], + [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(7, 'day')) }], ], 5); - cy.get(`${tableSelector}`).contains('User Id').click(); + cy.get(`${tableSelector}`).contains('User').click(); cy.validateTable(tableSelector, [ - [{ colIndex: 0, value: 'user0@skills.org' }, { colIndex: 4, value: '4,500' }], - [{ colIndex: 0, value: 'user1@skills.org' }, { colIndex: 4, value: '6,000' }], - [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 4, value: '7,500' }], - [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 4, value: '9,000' }], - [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 4, value: '10,500' }], - [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 4, value: '12,000' }], + [{ colIndex: 0, value: 'user0@skills.org' }, { colIndex: 2, value: '4,500' }], + [{ colIndex: 0, value: 'user1@skills.org' }, { colIndex: 2, value: '6,000' }], + [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 2, value: '7,500' }], + [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 2, value: '9,000' }], + [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 2, value: '10,500' }], + [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 2, value: '12,000' }], ], 5); - cy.get(`${tableSelector}`).contains('User Id').click(); + cy.get(`${tableSelector}`).contains('User').click(); cy.validateTable(tableSelector, [ - [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 4, value: '12,000' }], - [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 4, value: '10,500' }], - [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 4, value: '9,000' }], - [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 4, value: '7,500' }], - [{ colIndex: 0, value: 'user1@skills.org' }, { colIndex: 4, value: '6,000' }], - [{ colIndex: 0, value: 'user0@skills.org' }, { colIndex: 4, value: '4,500' }], + [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 2, value: '12,000' }], + [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 2, value: '10,500' }], + [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 2, value: '9,000' }], + [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 2, value: '7,500' }], + [{ colIndex: 0, value: 'user1@skills.org' }, { colIndex: 2, value: '6,000' }], + [{ colIndex: 0, value: 'user0@skills.org' }, { colIndex: 2, value: '4,500' }], ], 5); cy.get(`${tableSelector}`).contains('Progress').click(); cy.validateTable(tableSelector, [ - [{ colIndex: 0, value: 'user0@skills.org' }, { colIndex: 4, value: '4,500' }], - [{ colIndex: 0, value: 'user1@skills.org' }, { colIndex: 4, value: '6,000' }], - [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 4, value: '7,500' }], - [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 4, value: '9,000' }], - [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 4, value: '10,500' }], - [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 4, value: '12,000' }], + [{ colIndex: 0, value: 'user0@skills.org' }, { colIndex: 2, value: '4,500' }], + [{ colIndex: 0, value: 'user1@skills.org' }, { colIndex: 2, value: '6,000' }], + [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 2, value: '7,500' }], + [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 2, value: '9,000' }], + [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 2, value: '10,500' }], + [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 2, value: '12,000' }], ], 5); cy.get(`${tableSelector}`).contains('Progress').click(); cy.validateTable(tableSelector, [ - [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 4, value: '12,000' }], - [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 4, value: '10,500' }], - [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 4, value: '9,000' }], - [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 4, value: '7,500' }], - [{ colIndex: 0, value: 'user1@skills.org' }, { colIndex: 4, value: '6,000' }], - [{ colIndex: 0, value: 'user0@skills.org' }, { colIndex: 4, value: '4,500' }], + [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 2, value: '12,000' }], + [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 2, value: '10,500' }], + [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 2, value: '9,000' }], + [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 2, value: '7,500' }], + [{ colIndex: 0, value: 'user1@skills.org' }, { colIndex: 2, value: '6,000' }], + [{ colIndex: 0, value: 'user0@skills.org' }, { colIndex: 2, value: '4,500' }], ], 5); }); @@ -125,7 +125,7 @@ describe('Users Tests', () => { cy.clickNav('Users'); cy.get('[data-cy="skillsBTableTotalRows"]').should('have.text', '12') - cy.get(`${tableSelector}`).contains('User Id').click(); + cy.get(`${tableSelector}`).contains('User').click(); cy.validateTable(tableSelector, [ [{ colIndex: 0, value: 'usera@skills.org' }], [{ colIndex: 0, value: 'userb@skills.org' }], @@ -180,7 +180,7 @@ describe('Users Tests', () => { cy.clickNav('Users'); cy.wait('@getUsers') - cy.get(`${tableSelector}`).contains('User Id').click(); + cy.get(`${tableSelector}`).contains('User').click(); cy.validateTable(tableSelector, [ [{ colIndex: 0, value: 'usera0@skills.org' }], [{ colIndex: 0, value: 'usera1@skills.org' }], @@ -252,15 +252,15 @@ describe('Users Tests', () => { cy.clickNav('Users'); cy.wait('@getUsers') - cy.get(`${tableSelector}`).contains('User Id').click(); + cy.get(`${tableSelector}`).contains('User').click(); const rowSelector = `${tableSelector} tbody tr` cy.get(rowSelector).should('have.length', 2).as('cyRows'); cy.get('@cyRows').eq(0).find('td').as('row1'); - cy.get('@row1').eq(5).should('not.contain', 'Today'); + cy.get('@row1').eq(3).should('not.contain', 'Today'); cy.get('@cyRows').eq(1).find('td').as('row2'); - cy.get('@row2').eq(5).should('contain', 'Today'); + cy.get('@row2').eq(3).should('contain', 'Today'); }); it('strip the oauth provider from the userId if present', () => { @@ -311,7 +311,7 @@ describe('Users Tests', () => { cy.visit('/administrator/projects/proj1/users'); cy.wait('@getUsers') - cy.get(`${tableSelector}`).contains('User Id').click(); + cy.get(`${tableSelector}`).contains('User').click(); cy.get('[data-cy="skillsBTablePaging"]').contains('2').click(); cy.wait('@getUsers') @@ -356,7 +356,7 @@ describe('Users Tests', () => { cy.visit('/administrator/projects/proj1/users'); cy.wait('@getProjectUsers') - cy.get(`${tableSelector}`).contains('User Id').click(); + cy.get(`${tableSelector}`).contains('User').click(); cy.validateTable(tableSelector, [ [{ colIndex: 0, value: 'usera@skills.org' }], [{ colIndex: 0, value: 'userb@skills.org' }], @@ -576,7 +576,7 @@ describe('Users Tests', () => { cy.wait('@getUsers') cy.get('[data-cy="skillsBTablePageSize"]').select('10'); cy.wait('@getUsers') - cy.get(`${tableSelector}`).contains('User Id').click(); + cy.get(`${tableSelector}`).contains('User').click(); cy.wait('@getUsers') cy.get('[data-cy="usr_progress-user0@skills.org"] [data-cy="progressPercent"]').should('have.text', '12%') @@ -599,7 +599,7 @@ describe('Users Tests', () => { cy.wait('@getSubjUsers'); cy.get('[data-cy="skillsBTablePageSize"]').select('20'); cy.wait('@getSubjUsers'); - cy.get(`${tableSelector}`).contains('User Id').click(); + cy.get(`${tableSelector}`).contains('User').click(); cy.wait('@getSubjUsers'); cy.get('[data-cy="usr_progress-user0@skills.org"] [data-cy="progressPercent"]').should('have.text', '38%') @@ -619,7 +619,7 @@ describe('Users Tests', () => { cy.wait('@getSkill1Users') cy.get('[data-cy="skillsBTablePageSize"]').select('10'); cy.wait('@getSkill1Users') - cy.get(`${tableSelector}`).contains('User Id').click(); + cy.get(`${tableSelector}`).contains('User').click(); cy.wait('@getSkill1Users') cy.get('[data-cy="usr_progress-user0@skills.org"] [data-cy="progressPercent"]').should('have.text', '100%') @@ -637,7 +637,7 @@ describe('Users Tests', () => { cy.wait('@getBadgeUsers'); cy.get('[data-cy="skillsBTablePageSize"]').select('20'); cy.wait('@getBadgeUsers'); - cy.get(`${tableSelector}`).contains('User Id').click(); + cy.get(`${tableSelector}`).contains('User').click(); cy.wait('@getBadgeUsers'); cy.get('[data-cy="usr_progress-user0@skills.org"] [data-cy="progressPercent"]').should('have.text', '20%') @@ -686,7 +686,7 @@ describe('Users Tests', () => { cy.clickNav('Users'); cy.wait('@getUsers') - cy.get(`${tableSelector} th`).should('have.length', 6) + cy.get(`${tableSelector} th`).should('have.length', 4) cy.get(`${tableSelector}`).should('contain', 'Org'); cy.validateTable(tableSelector, [ [{colIndex: 1, value: 'tagA'}], @@ -729,7 +729,7 @@ describe('Users Tests', () => { cy.wait('@loadConfig') cy.clickNav('Users'); cy.wait('@getUsers') - cy.get(`${tableSelector} th`).should('have.length', 5) + cy.get(`${tableSelector} th`).should('have.length', 3) cy.get(`${tableSelector}`).should('not.contain', 'Org'); }); @@ -772,7 +772,7 @@ describe('Users Tests', () => { cy.clickNav('Users'); cy.wait('@getUsers') - cy.get(`${tableSelector} th`).should('have.length', 6) + cy.get(`${tableSelector} th`).should('have.length', 4) cy.get(`${tableSelector} [data-cy="usersTable_viewDetailsBtn"]`).first().click(); cy.wait('@getUserTags') @@ -809,7 +809,7 @@ describe('Users Tests', () => { cy.clickNav('Users'); cy.wait('@getUsers') - cy.get(`${tableSelector} th`).should('have.length', 6) + cy.get(`${tableSelector} th`).should('have.length', 4) cy.get(`${tableSelector} [data-cy="usersTable_viewDetailsBtn"]`).first().click(); cy.contains("Client Display"); @@ -828,12 +828,12 @@ describe('Users Tests', () => { // default sort order is 'Points Last Earned' desc cy.validateTable(tableSelector, [ - [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(7, 'day')) }], - [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(6, 'day')) }], - [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(5, 'day')) }], - [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(4, 'day')) }], - [{ colIndex: 0, value: 'user1@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(3, 'day')) }], - [{ colIndex: 0, value: 'user0@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(2, 'day')) }], + [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(7, 'day')) }], + [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(6, 'day')) }], + [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(5, 'day')) }], + [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(4, 'day')) }], + [{ colIndex: 0, value: 'user1@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(3, 'day')) }], + [{ colIndex: 0, value: 'user0@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(2, 'day')) }], ], 5); cy.get('[data-cy=users-progress-input]').type('{selectall}50') @@ -841,10 +841,10 @@ describe('Users Tests', () => { // users-progress-input cy.validateTable(tableSelector, [ - [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(7, 'day')) }], - [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(6, 'day')) }], - [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(5, 'day')) }], - [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(4, 'day')) }], + [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(7, 'day')) }], + [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(6, 'day')) }], + [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(5, 'day')) }], + [{ colIndex: 0, value: 'user2@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(4, 'day')) }], ], 5); cy.get('[data-cy=users-progress-input]').type('{selectall}60') @@ -852,9 +852,9 @@ describe('Users Tests', () => { // users-progress-input cy.validateTable(tableSelector, [ - [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(7, 'day')) }], - [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(6, 'day')) }], - [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(5, 'day')) }], + [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(7, 'day')) }], + [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(6, 'day')) }], + [{ colIndex: 0, value: 'user3@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(5, 'day')) }], ], 5); cy.get('[data-cy=users-progress-input]').type('{selectall}70') @@ -862,8 +862,8 @@ describe('Users Tests', () => { // users-progress-input cy.validateTable(tableSelector, [ - [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(7, 'day')) }], - [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(6, 'day')) }], + [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(7, 'day')) }], + [{ colIndex: 0, value: 'user4@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(6, 'day')) }], ], 5); cy.get('[data-cy=users-progress-input]').type('{selectall}80') @@ -871,7 +871,7 @@ describe('Users Tests', () => { // users-progress-input cy.validateTable(tableSelector, [ - [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 5, value: dateFormatter(m.clone().add(7, 'day')) }], + [{ colIndex: 0, value: 'user5@skills.org' }, { colIndex: 3, value: dateFormatter(m.clone().add(7, 'day')) }], ], 5); cy.get('[data-cy=users-progress-input]').type('{selectall}90')