ADF 3.7.0-bab49 (#1324)

* adf 3.7.0-1754

* fix header name selector

* fix  more / less state

* click correct button

* check correct button

* remove Thumbnail column from headers list

* 3.7.0-0256a update

* remove Thumbnail. from headers list

* remove Thumbnail

* header cell value selector

* adf 3.7.0-bab49

* change selector after accessibility fixes

Co-authored-by: Adina Parpalita <adina.parpalita@ness.com>
This commit is contained in:
Cilibiu Bogdan
2020-02-06 15:31:27 +02:00
committed by GitHub
parent 9f5d73a4d7
commit d4f04323b3
12 changed files with 41 additions and 45 deletions

View File

@@ -34,11 +34,11 @@ export class DataTable extends Component {
root: 'adf-datatable', root: 'adf-datatable',
head: '.adf-datatable-header', head: '.adf-datatable-header',
columnHeader: '.adf-datatable-row .adf-datatable-cell-header', columnHeader: '.adf-datatable-row .adf-datatable-cell-header .adf-datatable-cell-value',
sortedColumnHeader: ` sortedColumnHeader: `
.adf-datatable__header--sorted-asc, .adf-datatable__header--sorted-asc .adf-datatable-cell-value,
.adf-datatable__header--sorted-desc .adf-datatable__header--sorted-desc .adf-datatable-cell-value
`, `,
body: '.adf-datatable-body', body: '.adf-datatable-body',
row: '.adf-datatable-row[role]', row: '.adf-datatable-row[role]',
@@ -125,7 +125,7 @@ export class DataTable extends Component {
} }
async getSortingOrder(): Promise<string> { async getSortingOrder(): Promise<string> {
const str = await this.getSortedColumnHeader().getAttribute('class'); const str = await this.getSortedColumnHeader().element(by.xpath('..')).getAttribute('class');
if (str.includes('asc')) { if (str.includes('asc')) {
return 'asc'; return 'asc';
} }

View File

@@ -38,10 +38,6 @@ describe('Extensions - DocumentList presets', () => {
id: 'app.files.name', id: 'app.files.name',
label: 'Name' label: 'Name'
}, },
{
id: 'app.files.thumbnail',
label: 'Thumbnail'
},
{ {
id: 'app.files.size', id: 'app.files.size',
label: 'Size', label: 'Size',

View File

@@ -140,7 +140,7 @@ describe('File / Folder properties', () => {
expect(await propertiesTab.getVisiblePropertiesLabels()).toEqual(expectedPropLabels, 'Incorrect properties displayed'); expect(await propertiesTab.getVisiblePropertiesLabels()).toEqual(expectedPropLabels, 'Incorrect properties displayed');
expect(await propertiesTab.getVisiblePropertiesValues()).toEqual(expectedPropValues, 'Incorrect properties values'); expect(await propertiesTab.getVisiblePropertiesValues()).toEqual(expectedPropValues, 'Incorrect properties values');
expect(await propertiesTab.isEditPropertiesButtonEnabled()).toBe(true, 'Edit button not enabled'); expect(await propertiesTab.isEditPropertiesButtonEnabled()).toBe(true, 'Edit button not enabled');
expect(await propertiesTab.isLessInfoButtonEnabled()).toBe(true, 'Less information button not enabled'); expect(await propertiesTab.isMoreInfoButtonEnabled()).toBe(true, 'More information button not enabled');
}); });
it('Folder properties - [C307106]', async () => { it('Folder properties - [C307106]', async () => {
@@ -174,7 +174,7 @@ describe('File / Folder properties', () => {
expect(await propertiesTab.getVisiblePropertiesLabels()).toEqual(expectedPropLabels, 'Incorrect properties displayed'); expect(await propertiesTab.getVisiblePropertiesLabels()).toEqual(expectedPropLabels, 'Incorrect properties displayed');
expect(await propertiesTab.getVisiblePropertiesValues()).toEqual(expectedPropValues, 'Incorrect properties values'); expect(await propertiesTab.getVisiblePropertiesValues()).toEqual(expectedPropValues, 'Incorrect properties values');
expect(await propertiesTab.isEditPropertiesButtonEnabled()).toBe(true, 'Edit button not enabled'); expect(await propertiesTab.isEditPropertiesButtonEnabled()).toBe(true, 'Edit button not enabled');
expect(await propertiesTab.isLessInfoButtonEnabled()).toBe(true, 'Less information button not enabled'); expect(await propertiesTab.isMoreInfoButtonEnabled()).toBe(true, 'More information button not enabled');
}); });
it('Less / More information buttons - [C269004]', async () => { it('Less / More information buttons - [C269004]', async () => {
@@ -182,19 +182,19 @@ describe('File / Folder properties', () => {
await page.toolbar.clickViewDetails(); await page.toolbar.clickViewDetails();
await infoDrawer.waitForInfoDrawerToOpen(); await infoDrawer.waitForInfoDrawerToOpen();
expect(await propertiesTab.isLessInfoButtonEnabled()).toBe(true, 'Less information button not enabled');
expect(await propertiesTab.isPropertiesListExpanded()).toBe(true, 'Properties list not expanded');
await propertiesTab.clickLessInformationButton();
expect(await propertiesTab.isLessInfoButtonDisplayed()).toBe(false, 'Less information button displayed');
expect(await propertiesTab.isMoreInfoButtonEnabled()).toBe(true, 'More information button not enabled'); expect(await propertiesTab.isMoreInfoButtonEnabled()).toBe(true, 'More information button not enabled');
expect(await propertiesTab.isPropertiesListExpanded()).toBe(false, 'Properties list expanded'); expect(await propertiesTab.isPropertiesListExpanded()).toBe(true, 'Properties list not expanded');
await propertiesTab.clickMoreInformationButton(); await propertiesTab.clickMoreInformationButton();
expect(await propertiesTab.isMoreInfoButtonDisplayed()).toBe(false, 'More information button displayed'); expect(await propertiesTab.isMoreInfoButtonDisplayed()).toBe(false, 'More information button displayed');
expect(await propertiesTab.isLessInfoButtonEnabled()).toBe(true, 'Less information button not enabled'); expect(await propertiesTab.isLessInfoButtonEnabled()).toBe(true, 'Less information button not enabled');
expect(await propertiesTab.isPropertiesListExpanded()).toBe(false, 'Properties list expanded');
await propertiesTab.clickLessInformationButton();
expect(await propertiesTab.isMoreInfoButtonDisplayed()).toBe(true, 'More information button not displayed');
expect(await propertiesTab.isLessInfoButtonEnabled()).toBe(false, 'Less information button enabled');
expect(await propertiesTab.isPropertiesListExpanded()).toBe(true, 'Properties list not expanded'); expect(await propertiesTab.isPropertiesListExpanded()).toBe(true, 'Properties list not expanded');
}); });
@@ -234,7 +234,7 @@ describe('File / Folder properties', () => {
await page.toolbar.clickViewDetails(); await page.toolbar.clickViewDetails();
await infoDrawer.waitForInfoDrawerToOpen(); await infoDrawer.waitForInfoDrawerToOpen();
await propertiesTab.clickLessInformationButton(); await propertiesTab.clickMoreInformationButton();
await propertiesTab.clickImagePropertiesPanel(); await propertiesTab.clickImagePropertiesPanel();
await propertiesTab.waitForImagePropertiesPanelToExpand(); await propertiesTab.waitForImagePropertiesPanelToExpand();
@@ -242,7 +242,7 @@ describe('File / Folder properties', () => {
expect(await propertiesTab.getVisiblePropertiesLabels()).toEqual(expectedPropLabels, 'Incorrect properties displayed'); expect(await propertiesTab.getVisiblePropertiesLabels()).toEqual(expectedPropLabels, 'Incorrect properties displayed');
expect(await propertiesTab.getVisiblePropertiesValues()).toEqual(expectedPropValues, 'Incorrect properties values'); expect(await propertiesTab.getVisiblePropertiesValues()).toEqual(expectedPropValues, 'Incorrect properties values');
expect(await propertiesTab.isEditPropertiesButtonEnabled()).toBe(true, 'Edit button not enabled'); expect(await propertiesTab.isEditPropertiesButtonEnabled()).toBe(true, 'Edit button not enabled');
expect(await propertiesTab.isMoreInfoButtonEnabled()).toBe(true, 'More information button not enabled'); expect(await propertiesTab.isLessInfoButtonEnabled()).toBe(true, 'Less information button not enabled');
}); });
}); });

View File

@@ -88,7 +88,7 @@ describe('Favorites', () => {
}); });
it('has the correct columns - [C280482]', async () => { it('has the correct columns - [C280482]', async () => {
const expectedColumns = [ 'Thumbnail', 'Name', 'Location', 'Size', 'Modified', 'Modified by' ]; const expectedColumns = [ 'Name', 'Location', 'Size', 'Modified', 'Modified by' ];
const actualColumns = await dataTable.getColumnHeadersText(); const actualColumns = await dataTable.getColumnHeadersText();
expect(actualColumns).toEqual(expectedColumns); expect(actualColumns).toEqual(expectedColumns);

View File

@@ -103,7 +103,7 @@ describe('File Libraries', () => {
}); });
it('has the correct columns - [C217095]', async () => { it('has the correct columns - [C217095]', async () => {
const expectedColumns = [ 'Thumbnail', 'Name', 'My Role', 'Visibility' ]; const expectedColumns = [ 'Name', 'My Role', 'Visibility' ];
const actualColumns = await dataTable.getColumnHeadersText(); const actualColumns = await dataTable.getColumnHeadersText();
expect(actualColumns).toEqual(expectedColumns); expect(actualColumns).toEqual(expectedColumns);
@@ -172,7 +172,7 @@ describe('File Libraries', () => {
}); });
it('has the correct columns - [C289893]', async () => { it('has the correct columns - [C289893]', async () => {
const expectedColumns = [ 'Thumbnail', 'Name', 'My Role', 'Visibility' ]; const expectedColumns = [ 'Name', 'My Role', 'Visibility' ];
const actualColumns = await dataTable.getColumnHeadersText(); const actualColumns = await dataTable.getColumnHeadersText();
expect(actualColumns).toEqual(expectedColumns); expect(actualColumns).toEqual(expectedColumns);

View File

@@ -94,7 +94,7 @@ describe('Personal Files', () => {
}); });
it('has the correct columns - [C217142]', async () => { it('has the correct columns - [C217142]', async () => {
const expectedColumns = [ 'Thumbnail', 'Name', 'Size', 'Modified', 'Modified by' ]; const expectedColumns = [ 'Name', 'Size', 'Modified', 'Modified by' ];
const actualColumns = await dataTable.getColumnHeadersText(); const actualColumns = await dataTable.getColumnHeadersText();
expect(actualColumns).toEqual(expectedColumns); expect(actualColumns).toEqual(expectedColumns);

View File

@@ -81,7 +81,7 @@ describe('Recent Files', () => {
}); });
it('has the correct columns - [C213168]', async () => { it('has the correct columns - [C213168]', async () => {
const expectedColumns = [ 'Thumbnail', 'Name', 'Location', 'Size', 'Modified' ]; const expectedColumns = [ 'Name', 'Location', 'Size', 'Modified' ];
const actualColumns = await dataTable.getColumnHeadersText(); const actualColumns = await dataTable.getColumnHeadersText();
expect(actualColumns).toEqual(expectedColumns); expect(actualColumns).toEqual(expectedColumns);

View File

@@ -87,7 +87,7 @@ describe('Shared Files', () => {
}); });
it('has the correct columns - [C213113]', async () => { it('has the correct columns - [C213113]', async () => {
const expectedColumns = [ 'Thumbnail', 'Name', 'Location', 'Size', 'Modified', 'Modified by', 'Shared by' ]; const expectedColumns = [ 'Name', 'Location', 'Size', 'Modified', 'Modified by', 'Shared by' ];
const actualColumns = await dataTable.getColumnHeadersText(); const actualColumns = await dataTable.getColumnHeadersText();
expect(actualColumns).toEqual(expectedColumns); expect(actualColumns).toEqual(expectedColumns);

View File

@@ -99,7 +99,7 @@ describe('Trash', () => {
}); });
it('has the correct columns - [C213217]', async () => { it('has the correct columns - [C213217]', async () => {
const expectedColumns = [ 'Thumbnail', 'Name', 'Location', 'Size', 'Deleted', 'Deleted by' ]; const expectedColumns = [ 'Name', 'Location', 'Size', 'Deleted', 'Deleted by' ];
const actualColumns = await dataTable.getColumnHeadersText(); const actualColumns = await dataTable.getColumnHeadersText();
expect(actualColumns).toEqual(expectedColumns); expect(actualColumns).toEqual(expectedColumns);
@@ -128,7 +128,7 @@ describe('Trash', () => {
}); });
it('has the correct columns - [C280494]', async () => { it('has the correct columns - [C280494]', async () => {
const expectedColumns = [ 'Thumbnail', 'Name', 'Location', 'Size', 'Deleted']; const expectedColumns = [ 'Name', 'Location', 'Size', 'Deleted'];
const actualColumns = await dataTable.getColumnHeadersText(); const actualColumns = await dataTable.getColumnHeadersText();
expect(actualColumns).toEqual(expectedColumns); expect(actualColumns).toEqual(expectedColumns);

View File

@@ -172,7 +172,7 @@ describe('Search results - libraries', () => {
await searchInput.searchFor(site1.name); await searchInput.searchFor(site1.name);
await dataTable.waitForBody(); await dataTable.waitForBody();
const expectedColumns = [ 'Thumbnail', 'Name', 'My Role', 'Visibility' ]; const expectedColumns = [ 'Name', 'My Role', 'Visibility' ];
const actualColumns = await dataTable.getColumnHeadersText(); const actualColumns = await dataTable.getColumnHeadersText();
expect(actualColumns).toEqual(expectedColumns); expect(actualColumns).toEqual(expectedColumns);

24
package-lock.json generated
View File

@@ -5,33 +5,33 @@
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": { "@alfresco/adf-content-services": {
"version": "3.7.0-deb2a0082f254b19d4980d89095a3535976fa606", "version": "3.7.0-bab490663216664f7d5f4cc0bff7726fca7f9950",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.7.0-deb2a0082f254b19d4980d89095a3535976fa606.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.7.0-bab490663216664f7d5f4cc0bff7726fca7f9950.tgz",
"integrity": "sha512-rixkyhLSv+xJdRMKjdiePOif/CftRCdbpH157F+teR2CoBN7CQbJG3d2HpS0r16sB5zMACiv0UFre8Z6Z3mA3w==", "integrity": "sha512-VuCu4NBFBQXjoFlXP7csj0Y6AxmNgbcGhbXe+2wVEZHKBMaoyU41ys0CHbSnPxb1LdeEOdsTR4zuqiOkY4DQPg==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-core": { "@alfresco/adf-core": {
"version": "3.7.0-deb2a0082f254b19d4980d89095a3535976fa606", "version": "3.7.0-bab490663216664f7d5f4cc0bff7726fca7f9950",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.7.0-deb2a0082f254b19d4980d89095a3535976fa606.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.7.0-bab490663216664f7d5f4cc0bff7726fca7f9950.tgz",
"integrity": "sha512-cYNRFeqLcc5DPVqlunKZjQ+yygm8JuXqk/B0vY1B8bNUukrbGB1c08ePiBa5phXuUqw6ivUq3DSAcOmayS6saw==", "integrity": "sha512-Xu0wxe4I3FxYVrFkAO27qYiQ07AJLBm0cL6AIDbiuQzTmUAGBBoXuc4ePCdajFDOmDgrty2fcoxpUNuNH3PYzg==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-extensions": { "@alfresco/adf-extensions": {
"version": "3.7.0-deb2a0082f254b19d4980d89095a3535976fa606", "version": "3.7.0-bab490663216664f7d5f4cc0bff7726fca7f9950",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.7.0-deb2a0082f254b19d4980d89095a3535976fa606.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.7.0-bab490663216664f7d5f4cc0bff7726fca7f9950.tgz",
"integrity": "sha512-BcNNRCD0odNkMfAiU4sCUz5h4ZUWy8wsKVQvAaq/3X1ekqDp1+p/iSPHqjWWbCUX8ptQ+4haoEep5+KP7LgL9g==", "integrity": "sha512-X88LSdwP7MeaATGiAMC0JwaHzbsIaUKHaaoKj9QqxKfOmhyFymZMiEHgDNpJt85ecRm5mv4tf0REz0D3f1IF3Q==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/js-api": { "@alfresco/js-api": {
"version": "3.7.0-2d9ba39ba3d09965bf711c615b1985a06a97b195", "version": "3.7.0-6da900b2340825533ad43e86422faccc3d2195d1",
"resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.7.0-2d9ba39ba3d09965bf711c615b1985a06a97b195.tgz", "resolved": "https://registry.npmjs.org/@alfresco/js-api/-/js-api-3.7.0-6da900b2340825533ad43e86422faccc3d2195d1.tgz",
"integrity": "sha512-wupSj6MzhjvhqrD/s95EC0CgCOiLbD6LD45xnafpZcSVAXV6ltJCaiGI8WkF+Tbx3EuICZzTKNfygXpIjlY82w==", "integrity": "sha512-K8vjqek1YFyUCHzKnVwowh4EcODwnbGBhH5eDh/crUo5AsAu7JzSWf7U6VBOPWKgZSKLFAN8GLa3EeQdyAqDsQ==",
"requires": { "requires": {
"event-emitter": "^0.3.5", "event-emitter": "^0.3.5",
"minimatch": "3.0.4", "minimatch": "3.0.4",

View File

@@ -40,10 +40,10 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": "3.7.0-deb2a0082f254b19d4980d89095a3535976fa606", "@alfresco/adf-content-services": "3.7.0-bab490663216664f7d5f4cc0bff7726fca7f9950",
"@alfresco/adf-core": "3.7.0-deb2a0082f254b19d4980d89095a3535976fa606", "@alfresco/adf-core": "3.7.0-bab490663216664f7d5f4cc0bff7726fca7f9950",
"@alfresco/adf-extensions": "3.7.0-deb2a0082f254b19d4980d89095a3535976fa606", "@alfresco/adf-extensions": "3.7.0-bab490663216664f7d5f4cc0bff7726fca7f9950",
"@alfresco/js-api": "3.7.0-2d9ba39ba3d09965bf711c615b1985a06a97b195", "@alfresco/js-api": "3.7.0-6da900b2340825533ad43e86422faccc3d2195d1",
"@angular/animations": "7.2.15", "@angular/animations": "7.2.15",
"@angular/cdk": "^7.3.7", "@angular/cdk": "^7.3.7",
"@angular/common": "7.2.15", "@angular/common": "7.2.15",