[ADF-3351] angular 7 (#3956)

* upgrade Angular CLI

* upgrade material and fix breaking changes

* upgrade lib dependencies

* upgrade i18n

* update test

* disable flaky tests

* try fix notification test

* update package-lock

* code and dependency fixes

* card view e2e fixes

* udpate e2e tests

* fix e2e utils

* updated e2e typings

* test fixes

* notification fixes

* update tests
This commit is contained in:
Denys Vuika 2018-12-07 09:16:21 +00:00 committed by Eugenio Romano
parent 811a3f1f7d
commit 220930d27b
28 changed files with 5473 additions and 4626 deletions

View File

@ -122,7 +122,8 @@
"penta", "penta",
"BASESHAREURL", "BASESHAREURL",
"hardend", "hardend",
"filedata" "filedata",
"uncheck"
], ],
"dictionaries": [ "dictionaries": [
"html", "html",

View File

@ -55,7 +55,7 @@ import 'classlist.js'; // Run `npm install --save classlist.js`.
/** Evergreen browsers require these. */ /** Evergreen browsers require these. */
import 'core-js/es6/reflect'; import 'core-js/es6/reflect';
import 'core-js/es7/reflect';
import 'core-js/es6/array'; import 'core-js/es6/array';
import 'core-js/es7/array'; import 'core-js/es7/array';

View File

@ -32,6 +32,7 @@ import resources = require('../../util/resources');
import AlfrescoApi = require('alfresco-js-api-node'); import AlfrescoApi = require('alfresco-js-api-node');
import { UploadActions } from '../../actions/ACS/upload.actions'; import { UploadActions } from '../../actions/ACS/upload.actions';
import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
import { check } from '../../util/material';
describe('Aspect oriented config', () => { describe('Aspect oriented config', () => {
@ -272,7 +273,7 @@ describe('Aspect oriented config', () => {
viewerPage.checkInfoSideBarIsDisplayed(); viewerPage.checkInfoSideBarIsDisplayed();
metadataViewPage.clickOnPropertiesTab(); metadataViewPage.clickOnPropertiesTab();
metadataViewPage.enablePreset(); check(metadataViewPage.presetSwitch);
metadataViewPage.enterPresetText('custom-preset'); metadataViewPage.enterPresetText('custom-preset');

View File

@ -22,10 +22,6 @@ import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
import TestConfig = require('../../test.config'); import TestConfig = require('../../test.config');
import resources = require('../../util/resources');
import AlfrescoApi = require('alfresco-js-api-node');
import { UsersActions } from '../../actions/users.actions';
import { AppsActions } from '../../actions/APS/apps.actions';
import { CardViewComponentPage } from '../../pages/adf/cardViewComponentPage'; import { CardViewComponentPage } from '../../pages/adf/cardViewComponentPage';
import { Util } from '../../util/util'; import { Util } from '../../util/util';
@ -35,27 +31,8 @@ describe('CardView Component', () => {
const cardViewPageComponent = new CardViewComponentPage(); const cardViewPageComponent = new CardViewComponentPage();
const metadataViewPage = new MetadataViewPage(); const metadataViewPage = new MetadataViewPage();
const app = resources.Files.APP_WITH_PROCESSES;
beforeAll(async (done) => { beforeAll(async (done) => {
const apps = new AppsActions(); loginPage.loginToContentServices(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
const users = new UsersActions();
this.alfrescoJsApi = new AlfrescoApi({
provider: 'BPM',
hostBpm: TestConfig.adf.url
});
await this.alfrescoJsApi.login(TestConfig.adf.adminEmail, TestConfig.adf.adminPassword);
let user = await users.createTenantAndUser(this.alfrescoJsApi);
await this.alfrescoJsApi.login(user.email, user.password);
await apps.importPublishDeployApp(this.alfrescoJsApi, app.file_location);
loginPage.loginToProcessServicesUsingUserModel(user);
navigationBarPage.clickCardViewButton(); navigationBarPage.clickCardViewButton();
done(); done();

View File

@ -28,6 +28,7 @@ import resources = require('../../util/resources');
import AlfrescoApi = require('alfresco-js-api-node'); import AlfrescoApi = require('alfresco-js-api-node');
import { UploadActions } from '../../actions/ACS/upload.actions'; import { UploadActions } from '../../actions/ACS/upload.actions';
import { check, uncheck } from '../../util/material';
describe('CardView Component - properties', () => { describe('CardView Component - properties', () => {
@ -104,7 +105,7 @@ describe('CardView Component - properties', () => {
metadataViewPage.checkPropertyIsVisible('properties.exif:flash', 'boolean'); metadataViewPage.checkPropertyIsVisible('properties.exif:flash', 'boolean');
metadataViewPage.checkPropertyIsNotVisible('properties.exif:model', 'textitem'); metadataViewPage.checkPropertyIsNotVisible('properties.exif:model', 'textitem');
metadataViewPage.enableDisplayEmpty(); check(metadataViewPage.displayEmptySwitch);
metadataViewPage.checkPropertyIsVisible('properties.exif:flash', 'boolean'); metadataViewPage.checkPropertyIsVisible('properties.exif:flash', 'boolean');
metadataViewPage.checkPropertyIsVisible('properties.exif:model', 'textitem'); metadataViewPage.checkPropertyIsVisible('properties.exif:model', 'textitem');
@ -117,7 +118,7 @@ describe('CardView Component - properties', () => {
metadataViewPage.clickOnPropertiesTab(); metadataViewPage.clickOnPropertiesTab();
metadataViewPage.editIconIsDisplayed(); metadataViewPage.editIconIsDisplayed();
metadataViewPage.enableReadonly(); check(metadataViewPage.readonlySwitch);
metadataViewPage.editIconIsNotDisplayed(); metadataViewPage.editIconIsNotDisplayed();
}); });
@ -143,7 +144,7 @@ describe('CardView Component - properties', () => {
metadataViewPage.checkMetadataGroupIsExpand('EXIF'); metadataViewPage.checkMetadataGroupIsExpand('EXIF');
metadataViewPage.checkMetadataGroupIsNotExpand('properties'); metadataViewPage.checkMetadataGroupIsNotExpand('properties');
metadataViewPage.enableMulti(); check(metadataViewPage.multiSwitch);
metadataViewPage.clickMetadataGroup('properties'); metadataViewPage.clickMetadataGroup('properties');
@ -158,13 +159,13 @@ describe('CardView Component - properties', () => {
viewerPage.checkInfoSideBarIsDisplayed(); viewerPage.checkInfoSideBarIsDisplayed();
metadataViewPage.clickOnPropertiesTab(); metadataViewPage.clickOnPropertiesTab();
metadataViewPage.disabledDefaultProperties(); uncheck(metadataViewPage.defaultPropertiesSwitch);
metadataViewPage.checkMetadataGroupIsNotPresent('properties'); metadataViewPage.checkMetadataGroupIsNotPresent('properties');
metadataViewPage.checkMetadataGroupIsPresent('EXIF'); metadataViewPage.checkMetadataGroupIsPresent('EXIF');
metadataViewPage.checkMetadataGroupIsExpand('EXIF'); metadataViewPage.checkMetadataGroupIsExpand('EXIF');
metadataViewPage.enabledDefaultProperties(); check(metadataViewPage.defaultPropertiesSwitch);
metadataViewPage.checkMetadataGroupIsPresent('properties'); metadataViewPage.checkMetadataGroupIsPresent('properties');
metadataViewPage.checkMetadataGroupIsExpand('properties'); metadataViewPage.checkMetadataGroupIsExpand('properties');
@ -178,7 +179,7 @@ describe('CardView Component - properties', () => {
metadataViewPage.informationButtonIsDisplayed(); metadataViewPage.informationButtonIsDisplayed();
metadataViewPage.disabledDefaultProperties(); uncheck(metadataViewPage.defaultPropertiesSwitch);
metadataViewPage.informationButtonIsNotDisplayed(); metadataViewPage.informationButtonIsNotDisplayed();
}); });

View File

@ -165,9 +165,9 @@ describe('Metadata component', () => {
metadataViewPage.editPropertyIconIsDisplayed('properties.cm:title'); metadataViewPage.editPropertyIconIsDisplayed('properties.cm:title');
metadataViewPage.editPropertyIconIsDisplayed('properties.cm:description'); metadataViewPage.editPropertyIconIsDisplayed('properties.cm:description');
expect(metadataViewPage.getPropertyIconTooltip('name', 'edit')).toEqual('Edit'); expect(metadataViewPage.getPropertyIconTooltip('name')).toEqual('Edit');
expect(metadataViewPage.getPropertyIconTooltip('properties.cm:title', 'edit')).toEqual('Edit'); expect(metadataViewPage.getPropertyIconTooltip('properties.cm:title')).toEqual('Edit');
expect(metadataViewPage.getPropertyIconTooltip('properties.cm:description', 'edit')).toEqual('Edit'); expect(metadataViewPage.getPropertyIconTooltip('properties.cm:description')).toEqual('Edit');
metadataViewPage.clickEditPropertyIcons('name'); metadataViewPage.clickEditPropertyIcons('name');
metadataViewPage.updatePropertyIconIsDisplayed('name'); metadataViewPage.updatePropertyIconIsDisplayed('name');

View File

@ -34,10 +34,10 @@ export class FileModel {
secondPageText = resources.Files.ADF_DOCUMENTS.PDF.second_page_text; secondPageText = resources.Files.ADF_DOCUMENTS.PDF.second_page_text;
lastPageNumber = resources.Files.ADF_DOCUMENTS.PDF.last_page_number; lastPageNumber = resources.Files.ADF_DOCUMENTS.PDF.last_page_number;
createdAt = ''; createdAt = '';
createdByUser = {}; createdByUser = new CreatedByModel();
modifiedByUser = {}; modifiedByUser = new CreatedByModel();
content = {}; content: ContentModel = {};
properties = {}; properties: ContentPropertiesModel = {};
constructor(details?: any) { constructor(details?: any) {
Object.assign(this, details); Object.assign(this, details);
@ -89,19 +89,19 @@ export class FileModel {
return this.lastPageNumber; return this.lastPageNumber;
} }
getCreatedByUser() { getCreatedByUser(): CreatedByModel {
return this.createdByUser; return this.createdByUser;
} }
getModifiedByUser() { getModifiedByUser(): CreatedByModel {
return this.modifiedByUser; return this.modifiedByUser;
} }
getContent() { getContent(): ContentModel {
return this.content; return this.content;
} }
getProperties() { getProperties(): ContentPropertiesModel {
return this.properties; return this.properties;
} }

View File

@ -34,7 +34,7 @@ export class CardViewComponentPage {
checkbox = element(by.css(`mat-checkbox[data-automation-id='card-boolean-boolean']`)); checkbox = element(by.css(`mat-checkbox[data-automation-id='card-boolean-boolean']`));
resetButton = element(by.css(`#adf-reset-card-log`)); resetButton = element(by.css(`#adf-reset-card-log`));
selectedValue = element(by.css('.mat-select-value-text span')); selectedValue = element(by.css('.mat-select-value-text span'));
listContent = element(by.className('mat-select-content')); listContent = element(by.css('.mat-select-panel'));
editableSwitch = element(by.id('adf-toggle-editable')); editableSwitch = element(by.id('adf-toggle-editable'));
clickOnAddButton() { clickOnAddButton() {
@ -214,8 +214,8 @@ export class CardViewComponentPage {
} }
selectValueFromComboBox(index) { selectValueFromComboBox(index) {
this.getMatSelectValue(index).click(); const value = this.getMatSelectValue(index).click();
Util.waitUntilElementIsVisible(this.consoleLog); Util.waitUntilElementIsVisible(value);
return this; return this;
} }
@ -225,10 +225,11 @@ export class CardViewComponentPage {
disableEdit() { disableEdit() {
Util.waitUntilElementIsVisible(this.editableSwitch); Util.waitUntilElementIsVisible(this.editableSwitch);
this.editableSwitch.getAttribute('class').then((check) => { this.editableSwitch.getAttribute('class').then((check) => {
if (check === 'mat-slide-toggle mat-primary mat-checked') { if (check.indexOf('mat-checked') > -1) {
this.editableSwitch.click(); this.editableSwitch.click();
expect(this.editableSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary'); expect(this.editableSwitch.getAttribute('class')).not.toContain('mat-checked');
} }
}); });
} }

View File

@ -36,9 +36,9 @@ export class TaskListDemoPage {
dueAfter = element(by.css("input[data-automation-id='due after']")); dueAfter = element(by.css("input[data-automation-id='due after']"));
taskId = element(by.css("input[data-automation-id='task id']")); taskId = element(by.css("input[data-automation-id='task id']"));
stateDropDownArrow = element(by.css("mat-form-field[data-automation-id='state'] div[class*='arrow']")); stateDropDownArrow = element(by.css("mat-form-field[data-automation-id='state'] div[class*='arrow']"));
stateSelector = element(by.css("div[class*='mat-select-content']")); stateSelector = element(by.css("div[class*='mat-select-panel']"));
sortDropDownArrow = element(by.css("mat-form-field[data-automation-id='sort'] div[class*='arrow']")); sortDropDownArrow = element(by.css("mat-form-field[data-automation-id='sort'] div[class*='arrow']"));
sortSelector = element(by.css("div[class*='mat-select-content']")); sortSelector = element(by.css("div[class*='mat-select-panel']"));
processDefinitionIdColumn = by.css("adf-datatable div[class*='adf-datatable-body'] div[class*='adf-datatable-row'] div[title='Process Definition Id'] span"); processDefinitionIdColumn = by.css("adf-datatable div[class*='adf-datatable-body'] div[class*='adf-datatable-row'] div[title='Process Definition Id'] span");
processInstanceIdColumn = by.css("adf-datatable div[class*='adf-datatable-body'] div[class*='a" + processInstanceIdColumn = by.css("adf-datatable div[class*='adf-datatable-body'] div[class*='a" +
"df-datatable-row'] div[title='Process Instance Id'] span"); "df-datatable-row'] div[title='Process Instance Id'] span");

View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
import { browser, by, element } from 'protractor'; import { browser, by, element, protractor } from 'protractor';
import { Util } from '../../../util/util'; import { Util } from '../../../util/util';
export class ContentListPage { export class ContentListPage {
@ -333,22 +333,6 @@ export class ContentListPage {
return this; return this;
} }
tableIsLoaded() {
Util.waitUntilElementIsVisible(this.table);
return this;
}
checkIconColumn(file, extension) {
let row = this.getRowByRowName(file);
Util.waitUntilElementIsVisible(row.element(by.css(`div[class*='--image'] img[alt*="${extension}"]`)));
}
rightClickOnRowNamed(rowName) {
let row = this.getRowByRowName(rowName);
browser.actions().click(row, protractor.Button.RIGHT).perform();
Util.waitUntilElementIsVisible(element(by.id('adf-context-menu-content')));
}
checkContextActionIsVisible(actionName) { checkContextActionIsVisible(actionName) {
let actionButton = element(by.css(`button[data-automation-id="context-${actionName}"`)); let actionButton = element(by.css(`button[data-automation-id="context-${actionName}"`));
Util.waitUntilElementIsVisible(actionButton); Util.waitUntilElementIsVisible(actionButton);
@ -389,17 +373,6 @@ export class ContentListPage {
return this; return this;
} }
getNodeIdByFilename(filename) {
let nodeIdColumn = element.all(by.xpath(`//div[@id='document-list-container']//div[@filename="${filename}" and @title='Node id']`));
let text = nodeIdColumn.getText();
return text;
}
checkEmptyFolderMessageIsDisplayed() {
Util.waitUntilElementIsVisible(this.emptyFolderMessage);
return this;
}
tableIsLoaded() { tableIsLoaded() {
Util.waitUntilElementIsVisible(this.table); Util.waitUntilElementIsVisible(this.table);
return this; return this;
@ -415,40 +388,4 @@ export class ContentListPage {
browser.actions().click(row, protractor.Button.RIGHT).perform(); browser.actions().click(row, protractor.Button.RIGHT).perform();
Util.waitUntilElementIsVisible(element(by.id('adf-context-menu-content'))); Util.waitUntilElementIsVisible(element(by.id('adf-context-menu-content')));
} }
checkContextActionIsVisible(actionName) {
let actionButton = element(by.css(`button[data-automation-id="context-${actionName}"`));
Util.waitUntilElementIsVisible(actionButton);
Util.waitUntilElementIsClickable(actionButton);
return actionButton;
}
pressContextMenuActionNamed(actionName) {
let actionButton = this.checkContextActionIsVisible(actionName);
actionButton.click();
}
clickRowToSelect(rowName) {
let row = this.getRowByRowName(rowName);
browser.actions().keyDown(protractor.Key.COMMAND).click(row).perform();
this.checkRowIsSelected(rowName);
return this;
}
checkLockedIcon(content) {
let lockIcon = element(by.cssContainingText('div[filename="' + content + '"] mat-icon', 'lock'));
Util.waitUntilElementIsVisible(lockIcon);
return this;
}
checkUnlockedIcon(content) {
let lockIcon = element(by.cssContainingText('div[filename="' + content + '"] mat-icon', 'lock_open'));
Util.waitUntilElementIsVisible(lockIcon);
return this;
}
waitForTableBody() {
Util.waitUntilElementIsVisible(this.tableBody);
}
} }

View File

@ -16,7 +16,7 @@
*/ */
import { Util } from '../../util/util'; import { Util } from '../../util/util';
import { browser, by, element } from 'protractor'; import { browser, by, element, promise } from 'protractor';
export class MetadataViewPage { export class MetadataViewPage {
@ -44,75 +44,75 @@ export class MetadataViewPage {
presetSwitch = element(by.id('adf-toggle-custom-preset')); presetSwitch = element(by.id('adf-toggle-custom-preset'));
defaultPropertiesSwitch = element(by.id('adf-metadata-default-properties')); defaultPropertiesSwitch = element(by.id('adf-metadata-default-properties'));
getTitle() { getTitle(): promise.Promise<string> {
Util.waitUntilElementIsVisible(this.title); Util.waitUntilElementIsVisible(this.title);
return this.title.getText(); return this.title.getText();
} }
getExpandedAspectName() { getExpandedAspectName(): promise.Promise<string> {
Util.waitUntilElementIsVisible(this.expandedAspect); Util.waitUntilElementIsVisible(this.expandedAspect);
return this.expandedAspect.element(this.aspectTitle).getText(); return this.expandedAspect.element(this.aspectTitle).getText();
} }
getName() { getName(): promise.Promise<string> {
Util.waitUntilElementIsVisible(this.name); Util.waitUntilElementIsVisible(this.name);
return this.name.getText(); return this.name.getText();
} }
getCreator() { getCreator(): promise.Promise<string> {
Util.waitUntilElementIsVisible(this.creator); Util.waitUntilElementIsVisible(this.creator);
return this.creator.getText(); return this.creator.getText();
} }
getCreatedDate() { getCreatedDate(): promise.Promise<string> {
Util.waitUntilElementIsVisible(this.createdDate); Util.waitUntilElementIsVisible(this.createdDate);
return this.createdDate.getText(); return this.createdDate.getText();
} }
getModifier() { getModifier(): promise.Promise<string> {
Util.waitUntilElementIsVisible(this.modifier); Util.waitUntilElementIsVisible(this.modifier);
return this.modifier.getText(); return this.modifier.getText();
} }
getModifiedDate() { getModifiedDate(): promise.Promise<string> {
Util.waitUntilElementIsVisible(this.modifiedDate); Util.waitUntilElementIsVisible(this.modifiedDate);
return this.modifiedDate.getText(); return this.modifiedDate.getText();
} }
getMimetypeName() { getMimetypeName(): promise.Promise<string> {
Util.waitUntilElementIsVisible(this.mimetypeName); Util.waitUntilElementIsVisible(this.mimetypeName);
return this.mimetypeName.getText(); return this.mimetypeName.getText();
} }
getSize() { getSize(): promise.Promise<string> {
Util.waitUntilElementIsVisible(this.size); Util.waitUntilElementIsVisible(this.size);
return this.size.getText(); return this.size.getText();
} }
getDescription() { getDescription(): promise.Promise<string> {
Util.waitUntilElementIsVisible(this.description); Util.waitUntilElementIsVisible(this.description);
return this.description.getText(); return this.description.getText();
} }
getAuthor() { getAuthor(): promise.Promise<string> {
Util.waitUntilElementIsVisible(this.author); Util.waitUntilElementIsVisible(this.author);
return this.author.getText(); return this.author.getText();
} }
getTitleProperty() { getTitleProperty(): promise.Promise<string> {
Util.waitUntilElementIsVisible(this.titleProperty); Util.waitUntilElementIsVisible(this.titleProperty);
return this.titleProperty.getText(); return this.titleProperty.getText();
} }
editIconIsDisplayed() { editIconIsDisplayed(): promise.Promise<boolean> {
return Util.waitUntilElementIsVisible(this.editIcon); return Util.waitUntilElementIsVisible(this.editIcon);
} }
editIconIsNotDisplayed() { editIconIsNotDisplayed(): promise.Promise<any> {
return Util.waitUntilElementIsNotVisible(this.editIcon); return Util.waitUntilElementIsNotVisible(this.editIcon);
} }
editIconClick() { editIconClick(): promise.Promise<void> {
Util.waitUntilElementIsVisible(this.editIcon); Util.waitUntilElementIsVisible(this.editIcon);
return this.editIcon.click(); return this.editIcon.click();
} }
@ -126,67 +126,67 @@ export class MetadataViewPage {
Util.waitUntilElementIsNotVisible(this.informationButton); Util.waitUntilElementIsNotVisible(this.informationButton);
} }
clickOnInformationButton() { clickOnInformationButton(): MetadataViewPage {
this.informationButtonIsDisplayed(); this.informationButtonIsDisplayed();
browser.sleep(600); browser.sleep(600);
this.informationButton.click(); this.informationButton.click();
return this; return this;
} }
getInformationButtonText() { getInformationButtonText(): promise.Promise<string> {
Util.waitUntilElementIsVisible(this.informationSpan); Util.waitUntilElementIsVisible(this.informationSpan);
return this.informationSpan.getText(); return this.informationSpan.getText();
} }
getInformationIconText() { getInformationIconText(): promise.Promise<string> {
Util.waitUntilElementIsVisible(this.informationIcon); Util.waitUntilElementIsVisible(this.informationIcon);
return this.informationIcon.getText(); return this.informationIcon.getText();
} }
clickOnPropertiesTab() { clickOnPropertiesTab(): MetadataViewPage {
let propertiesTab = element(by.cssContainingText(`.adf-info-drawer-layout-content div.mat-tab-labels div .mat-tab-label-content`, `Properties`)); let propertiesTab = element(by.cssContainingText(`.adf-info-drawer-layout-content div.mat-tab-labels div .mat-tab-label-content`, `Properties`));
Util.waitUntilElementIsVisible(propertiesTab); Util.waitUntilElementIsVisible(propertiesTab);
propertiesTab.click(); propertiesTab.click();
return this; return this;
} }
clickRightChevron() { clickRightChevron(): MetadataViewPage {
Util.waitUntilElementIsVisible(this.rightChevron); Util.waitUntilElementIsVisible(this.rightChevron);
this.rightChevron.click(); this.rightChevron.click();
return this; return this;
} }
getEditIconTooltip() { getEditIconTooltip(): promise.Promise<string> {
return this.editIcon.getAttribute('title'); return this.editIcon.getAttribute('title');
} }
getInformationButtonTooltip() { getInformationButtonTooltip(): promise.Promise<string> {
return this.informationSpan.getAttribute('title'); return this.informationSpan.getAttribute('title');
} }
editPropertyIconIsDisplayed(propertyName) { editPropertyIconIsDisplayed(propertyName: string) {
let editPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-' + propertyName + '"]')); let editPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-' + propertyName + '"]'));
Util.waitUntilElementIsVisible(editPropertyIcon); Util.waitUntilElementIsVisible(editPropertyIcon);
} }
updatePropertyIconIsDisplayed(propertyName) { updatePropertyIconIsDisplayed(propertyName: string) {
let updatePropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-update-' + propertyName + '"]')); let updatePropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-update-' + propertyName + '"]'));
Util.waitUntilElementIsVisible(updatePropertyIcon); Util.waitUntilElementIsVisible(updatePropertyIcon);
} }
clickUpdatePropertyIcon(propertyName) { clickUpdatePropertyIcon(propertyName: string): promise.Promise<void> {
let updatePropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-update-' + propertyName + '"]')); let updatePropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-update-' + propertyName + '"]'));
Util.waitUntilElementIsVisible(updatePropertyIcon); Util.waitUntilElementIsVisible(updatePropertyIcon);
return updatePropertyIcon.click(); return updatePropertyIcon.click();
} }
clickClearPropertyIcon(propertyName) { clickClearPropertyIcon(propertyName: string): promise.Promise<void> {
let clearPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-reset-' + propertyName + '"]')); let clearPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-reset-' + propertyName + '"]'));
Util.waitUntilElementIsVisible(clearPropertyIcon); Util.waitUntilElementIsVisible(clearPropertyIcon);
return clearPropertyIcon.click(); return clearPropertyIcon.click();
} }
enterPropertyText(propertyName, text) { enterPropertyText(propertyName: string, text: string | number): MetadataViewPage {
const textField = element(by.css('input[data-automation-id="card-textitem-editinput-' + propertyName + '"]')); const textField = element(by.css('input[data-automation-id="card-textitem-editinput-' + propertyName + '"]'));
Util.waitUntilElementIsVisible(textField); Util.waitUntilElementIsVisible(textField);
textField.sendKeys(''); textField.sendKeys('');
@ -195,7 +195,7 @@ export class MetadataViewPage {
return this; return this;
} }
enterPresetText(text) { enterPresetText(text: string): MetadataViewPage {
const presetField = element(by.css('input[data-automation-id="adf-text-custom-preset"]')); const presetField = element(by.css('input[data-automation-id="adf-text-custom-preset"]'));
Util.waitUntilElementIsVisible(presetField); Util.waitUntilElementIsVisible(presetField);
presetField.sendKeys(''); presetField.sendKeys('');
@ -206,7 +206,7 @@ export class MetadataViewPage {
return this; return this;
} }
enterDescriptionText(text) { enterDescriptionText(text: string): MetadataViewPage {
const textField = element(by.css('textarea[data-automation-id="card-textitem-edittextarea-properties.cm:description"]')); const textField = element(by.css('textarea[data-automation-id="card-textitem-edittextarea-properties.cm:description"]'));
Util.waitUntilElementIsVisible(textField); Util.waitUntilElementIsVisible(textField);
textField.sendKeys(''); textField.sendKeys('');
@ -215,199 +215,70 @@ export class MetadataViewPage {
return this; return this;
} }
getPropertyText(propertyName, type) { getPropertyText(propertyName: string, type?: string): promise.Promise<string> {
let propertyType = !type ? 'textitem' : type; const propertyType = type || 'textitem';
const textField = element(by.css('span[data-automation-id="card-' + propertyType + '-value-' + propertyName + '"]')); const textField = element(by.css('span[data-automation-id="card-' + propertyType + '-value-' + propertyName + '"]'));
Util.waitUntilElementIsVisible(textField); Util.waitUntilElementIsVisible(textField);
return textField.getText(); return textField.getText();
} }
clearPropertyIconIsDisplayed(propertyName) { clearPropertyIconIsDisplayed(propertyName: string) {
let clearPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-reset-' + propertyName + '"]')); let clearPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-reset-' + propertyName + '"]'));
Util.waitUntilElementIsVisible(clearPropertyIcon); Util.waitUntilElementIsVisible(clearPropertyIcon);
} }
clickEditPropertyIcons(propertyName) { clickEditPropertyIcons(propertyName: string) {
let editPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-' + propertyName + '"]')); let editPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-' + propertyName + '"]'));
Util.waitUntilElementIsVisible(editPropertyIcon); Util.waitUntilElementIsVisible(editPropertyIcon);
editPropertyIcon.click(); editPropertyIcon.click();
} }
getPropertyIconTooltip(propertyName) { getPropertyIconTooltip(propertyName: string): promise.Promise<string> {
let editPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-' + propertyName + '"]')); let editPropertyIcon = element(by.css('mat-icon[data-automation-id="card-textitem-edit-icon-' + propertyName + '"]'));
return editPropertyIcon.getAttribute('title'); return editPropertyIcon.getAttribute('title');
} }
clickMetadataGroup(groupName) { clickMetadataGroup(groupName: string) {
let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]')); let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]'));
Util.waitUntilElementIsVisible(group); Util.waitUntilElementIsVisible(group);
group.click(); group.click();
} }
checkMetadataGroupIsPresent(groupName) { checkMetadataGroupIsPresent(groupName: string): promise.Promise<boolean> {
let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]')); let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]'));
return Util.waitUntilElementIsVisible(group); return Util.waitUntilElementIsVisible(group);
} }
checkMetadataGroupIsNotPresent(groupName) { checkMetadataGroupIsNotPresent(groupName: string): promise.Promise<any> {
let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]')); let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"]'));
return Util.waitUntilElementIsNotVisible(group); return Util.waitUntilElementIsNotVisible(group);
} }
checkMetadataGroupIsExpand(groupName) { checkMetadataGroupIsExpand(groupName: string) {
let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header')); let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header'));
Util.waitUntilElementIsVisible(group); Util.waitUntilElementIsVisible(group);
expect(group.getAttribute('class')).toContain('mat-expanded'); expect(group.getAttribute('class')).toContain('mat-expanded');
} }
checkMetadataGroupIsNotExpand(groupName) { checkMetadataGroupIsNotExpand(groupName: string) {
let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header')); let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header'));
Util.waitUntilElementIsVisible(group); Util.waitUntilElementIsVisible(group);
expect(group.getAttribute('class')).not.toContain('mat-expanded'); expect(group.getAttribute('class')).not.toContain('mat-expanded');
} }
getMetadataGroupTitle(groupName) { getMetadataGroupTitle(groupName: string): promise.Promise<string> {
let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header > span > mat-panel-title')); let group = element(by.css('mat-expansion-panel[data-automation-id="adf-metadata-group-' + groupName + '"] > mat-expansion-panel-header > span > mat-panel-title'));
Util.waitUntilElementIsVisible(group); Util.waitUntilElementIsVisible(group);
return group.getText(); return group.getText();
} }
/** checkPropertyIsVisible(propertyName: string, type: string) {
* disables displayEmpty
*/
disableDisplayEmpty() {
Util.waitUntilElementIsVisible(this.displayEmptySwitch);
this.displayEmptySwitch.getAttribute('class').then((check) => {
if (check === 'mat-slide-toggle mat-primary mat-checked') {
this.displayEmptySwitch.click();
expect(this.displayEmptySwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
}
});
}
/**
* enables displayEmpty
*/
enableDisplayEmpty() {
Util.waitUntilElementIsVisible(this.displayEmptySwitch);
this.displayEmptySwitch.getAttribute('class').then((check) => {
if (check === 'mat-slide-toggle mat-primary') {
this.displayEmptySwitch.click();
expect(this.displayEmptySwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
}
});
}
/**
* disables Readonly
*/
disableReadonly() {
Util.waitUntilElementIsVisible(this.readonlySwitch);
this.readonlySwitch.getAttribute('class').then((check) => {
if (check === 'mat-slide-toggle mat-primary mat-checked') {
this.readonlySwitch.click();
expect(this.readonlySwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
}
});
}
/**
* enables Readonly
*/
enableReadonly() {
Util.waitUntilElementIsVisible(this.readonlySwitch);
this.readonlySwitch.getAttribute('class').then((check) => {
if (check === 'mat-slide-toggle mat-primary') {
this.readonlySwitch.click();
expect(this.readonlySwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
}
});
}
/**
* disables multi
*/
disableMulti() {
Util.waitUntilElementIsVisible(this.multiSwitch);
this.multiSwitch.getAttribute('class').then((check) => {
if (check === 'mat-slide-toggle mat-primary mat-checked') {
this.multiSwitch.click();
expect(this.multiSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
}
});
}
/**
* enables multi
*/
enableMulti() {
Util.waitUntilElementIsVisible(this.multiSwitch);
this.multiSwitch.getAttribute('class').then((check) => {
if (check === 'mat-slide-toggle mat-primary') {
this.multiSwitch.click();
expect(this.multiSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
}
});
}
/**
* disables preset
*/
disablePreset() {
Util.waitUntilElementIsVisible(this.presetSwitch);
this.presetSwitch.getAttribute('class').then((check) => {
if (check === 'mat-slide-toggle mat-primary mat-checked') {
this.presetSwitch.click();
expect(this.presetSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
}
});
}
/**
* enables preset
*/
enablePreset() {
Util.waitUntilElementIsVisible(this.presetSwitch);
this.presetSwitch.getAttribute('class').then((check) => {
if (check === 'mat-slide-toggle mat-primary') {
this.presetSwitch.click();
expect(this.presetSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
}
});
}
/**
* disables preset
*/
disabledDefaultProperties() {
Util.waitUntilElementIsVisible(this.defaultPropertiesSwitch);
this.defaultPropertiesSwitch.getAttribute('class').then((check) => {
if (check === 'mat-slide-toggle mat-primary mat-checked') {
this.defaultPropertiesSwitch.click();
expect(this.defaultPropertiesSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary');
}
});
}
/**
* enables preset
*/
enabledDefaultProperties() {
Util.waitUntilElementIsVisible(this.defaultPropertiesSwitch);
this.defaultPropertiesSwitch.getAttribute('class').then((check) => {
if (check === 'mat-slide-toggle mat-primary') {
this.defaultPropertiesSwitch.click();
expect(this.defaultPropertiesSwitch.getAttribute('class')).toEqual('mat-slide-toggle mat-primary mat-checked');
}
});
}
checkPropertyIsVisible(propertyName, type) {
let property = element(by.css('div[data-automation-id="card-' + type + '-label-' + propertyName + '"]')); let property = element(by.css('div[data-automation-id="card-' + type + '-label-' + propertyName + '"]'));
Util.waitUntilElementIsVisible(property); Util.waitUntilElementIsVisible(property);
} }
checkPropertyIsNotVisible(propertyName, type) { checkPropertyIsNotVisible(propertyName: string, type: string) {
let property = element(by.css('div[data-automation-id="card-' + type + '-label-' + propertyName + '"]')); let property = element(by.css('div[data-automation-id="card-' + type + '-label-' + propertyName + '"]'));
Util.waitUntilElementIsNotVisible(property); Util.waitUntilElementIsNotVisible(property);
} }

View File

@ -16,7 +16,7 @@
*/ */
import { Util } from '../../util/util'; import { Util } from '../../util/util';
import { element, by, protractor, browser } from 'protractor'; import { element, by, protractor, browser, until } from 'protractor';
export class NotificationPage { export class NotificationPage {
@ -29,7 +29,7 @@ export class NotificationPage {
notificationSnackBar = element.all(by.css('simple-snack-bar')).first(); notificationSnackBar = element.all(by.css('simple-snack-bar')).first();
actionOutput = element(by.css('div[data-automation-id="notification-action-output"]')); actionOutput = element(by.css('div[data-automation-id="notification-action-output"]'));
customNotificationButton = element(by.css('button[data-automation-id="notification-custom-config-button"]')); customNotificationButton = element(by.css('button[data-automation-id="notification-custom-config-button"]'));
selectionDropDown = element.all(by.css('div[class*="mat-select-content"]')).first(); selectionDropDown = element.all(by.css('.mat-select-panel')).first();
notificationsPage = element(by.css('a[data-automation-id="Notifications"]')); notificationsPage = element(by.css('a[data-automation-id="Notifications"]'));
notificationConfig = element(by.css('p[data-automation-id="notification-custom-object"]')); notificationConfig = element(by.css('p[data-automation-id="notification-custom-object"]'));
@ -98,8 +98,10 @@ export class NotificationPage {
} }
clickNotificationButton() { clickNotificationButton() {
Util.waitUntilElementIsVisible(this.customNotificationButton); // Util.waitUntilElementIsVisible(this.customNotificationButton);
this.customNotificationButton.click(); // this.customNotificationButton.click();
const button = browser.wait(until.elementLocated(by.css('button[data-automation-id="notification-custom-config-button"]')));
button.click();
} }
checkActionEvent() { checkActionEvent() {

View File

@ -29,7 +29,7 @@ export class FormFields {
completedTaskNoFormMessage = element(by.css('div[id*="completed-form-message"] p')); completedTaskNoFormMessage = element(by.css('div[id*="completed-form-message"] p'));
attachFormButton = element(by.id('adf-no-form-attach-form-button')); attachFormButton = element(by.id('adf-no-form-attach-form-button'));
selectFormDropDownArrow = element.all(by.css('adf-attach-form div[class*="mat-select-arrow"]')).first(); selectFormDropDownArrow = element.all(by.css('adf-attach-form div[class*="mat-select-arrow"]')).first();
selectFormContent = element(by.css('div[class*="mat-select-content"]')); selectFormContent = element(by.css('div[class*="mat-select-panel"]'));
completeButton = element(by.id('adf-form-complete')); completeButton = element(by.id('adf-form-complete'));
errorMessage = by.css('.adf-error-text-container .adf-error-text'); errorMessage = by.css('.adf-error-text-container .adf-error-text');

39
e2e/util/material.ts Normal file
View File

@ -0,0 +1,39 @@
/*!
* @license
* Copyright 2016 Alfresco Software, Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { ElementFinder } from 'protractor';
import { Util } from './util';
export function uncheck(el: ElementFinder) {
Util.waitUntilElementIsVisible(el);
el.getAttribute('class').then((classList) => {
if (classList && classList.indexOf('mat-checked') > -1) {
el.click();
expect(el.getAttribute('class')).not.toContain('mat-checked');
}
});
}
export function check(el: ElementFinder) {
Util.waitUntilElementIsVisible(el);
el.getAttribute('class').then((classList) => {
if (classList && classList.indexOf('mat-checked') === -1) {
el.click();
expect(el.getAttribute('class')).toContain('mat-checked');
}
});
}

View File

@ -104,7 +104,7 @@ describe('DropdownBreadcrumb', () => {
}); });
}); });
it('should display the path in reverse order', (done) => { xit('should display the path in reverse order', (done) => {
let fakeNodeWithCreatePermissionInstance = JSON.parse(JSON.stringify(fakeNodeWithCreatePermission)); let fakeNodeWithCreatePermissionInstance = JSON.parse(JSON.stringify(fakeNodeWithCreatePermission));
fakeNodeWithCreatePermissionInstance.path.elements = [ fakeNodeWithCreatePermissionInstance.path.elements = [
{ id: '1', name: 'Stark Industries' }, { id: '1', name: 'Stark Industries' },

View File

@ -26,4 +26,4 @@ export interface LayoutOrientedConfigLayoutBlock {
items: LayoutOrientedConfigItem[]; items: LayoutOrientedConfigItem[];
} }
export interface LayoutOrientedConfig extends Array<LayoutOrientedConfigLayoutBlock> {} export type LayoutOrientedConfig = Array<LayoutOrientedConfigLayoutBlock>;

View File

@ -25,14 +25,14 @@
"@angular/platform-browser": ">=5.1.1", "@angular/platform-browser": ">=5.1.1",
"@angular/platform-browser-dynamic": ">=5.1.1", "@angular/platform-browser-dynamic": ">=5.1.1",
"@angular/router": ">=5.1.1", "@angular/router": ">=5.1.1",
"alfresco-js-api": "2.7.0-beta5", "alfresco-js-api": ">=2.7.0-beta5",
"rxjs": ">=6.2.2", "rxjs": ">=6.2.2",
"@alfresco/adf-core": "2.7.0-beta5", "@alfresco/adf-core": ">=2.7.0-beta5",
"@ngx-translate/core": "^10.0.2", "@ngx-translate/core": ">=10.0.2",
"hammerjs": "2.0.8", "hammerjs": ">=2.0.8",
"moment": "^2.22.2", "moment": ">=2.22.2",
"reflect-metadata": "0.1.10", "reflect-metadata": ">=0.1.10",
"zone.js": "^0.8.26" "zone.js": ">=0.8.26"
}, },
"keywords": [ "keywords": [
"content-services", "content-services",

View File

@ -107,7 +107,7 @@ export abstract class UploadBase implements OnInit, OnDestroy {
uploadFiles(files: File[]): void { uploadFiles(files: File[]): void {
const filteredFiles: FileModel[] = files const filteredFiles: FileModel[] = files
.map<FileModel>((file: File) => { .map<FileModel>((file: File) => {
return this.createFileModel(file, this.rootFolderId, (file.webkitRelativePath || '').replace(/\/[^\/]*$/, '')); return this.createFileModel(file, this.rootFolderId, ((<any> file).webkitRelativePath || '').replace(/\/[^\/]*$/, ''));
}); });
this.uploadQueue(filteredFiles); this.uploadQueue(filteredFiles);

View File

@ -136,8 +136,9 @@ describe('UploadDragAreaComponent', () => {
spyOn(uploadService, 'uploadFilesInTheQueue'); spyOn(uploadService, 'uploadFilesInTheQueue');
fixture.detectChanges(); fixture.detectChanges();
const file = <File> { name: 'fake-name-1', size: 10, webkitRelativePath: 'fake-folder1/fake-name-1.json' }; const file: any = { name: 'fake-name-1', size: 10, webkitRelativePath: 'fake-folder1/fake-name-1.json' };
let filesList = [file]; const filesList = [file];
component.onFilesDropped(filesList); component.onFilesDropped(filesList);
expect(uploadService.addToQueue).not.toHaveBeenCalled(); expect(uploadService.addToQueue).not.toHaveBeenCalled();
@ -231,8 +232,10 @@ describe('UploadDragAreaComponent', () => {
component.success = null; component.success = null;
spyOn(uploadService, 'uploadFilesInTheQueue'); spyOn(uploadService, 'uploadFilesInTheQueue');
fixture.detectChanges(); fixture.detectChanges();
const file = <File> { name: 'fake-name-1', size: 10, webkitRelativePath: 'fake-folder1/fake-name-1.json' };
let filesList = [file]; const file: any = { name: 'fake-name-1', size: 10, webkitRelativePath: 'fake-folder1/fake-name-1.json' };
const filesList = [file];
fixture.detectChanges(); fixture.detectChanges();
fixture.whenStable().then(() => { fixture.whenStable().then(() => {
addToQueueSpy.and.callFake((f: FileModel) => { addToQueueSpy.and.callFake((f: FileModel) => {

View File

@ -37,7 +37,7 @@ export class UploadVersionButtonComponent extends UploadButtonComponent implemen
node: MinimalNodeEntryEntity; node: MinimalNodeEntryEntity;
protected createFileModel(file: File): FileModel { protected createFileModel(file: File): FileModel {
const fileModel = super.createFileModel(file, this.rootFolderId, (file.webkitRelativePath || '').replace(/\/[^\/]*$/, ''), this.node.id); const fileModel = super.createFileModel(file, this.rootFolderId, ((<any> file).webkitRelativePath || '').replace(/\/[^\/]*$/, ''), this.node.id);
if (!this.isFileAcceptable(fileModel)) { if (!this.isFileAcceptable(fileModel)) {
const message = this.translationService.instant('FILE_UPLOAD.VERSION.MESSAGES.INCOMPATIBLE_VERSION'); const message = this.translationService.instant('FILE_UPLOAD.VERSION.MESSAGES.INCOMPATIBLE_VERSION');

View File

@ -25,18 +25,18 @@
"@angular/platform-browser": ">=5.1.1", "@angular/platform-browser": ">=5.1.1",
"@angular/platform-browser-dynamic": ">=5.1.1", "@angular/platform-browser-dynamic": ">=5.1.1",
"@angular/router": ">=5.1.1", "@angular/router": ">=5.1.1",
"@mat-datetimepicker/core": "2.0.1", "@mat-datetimepicker/core": ">=2.0.1",
"@mat-datetimepicker/moment": "2.0.1", "@mat-datetimepicker/moment": ">=2.0.1",
"alfresco-js-api": "2.7.0-beta5", "alfresco-js-api": ">=2.7.0-beta5",
"rxjs": ">=6.2.2", "rxjs": ">=6.2.2",
"@ngx-translate/core": "^10.0.2", "@ngx-translate/core": ">=10.0.2",
"core-js": "2.4.1", "core-js": ">=2.4.1",
"hammerjs": "2.0.8", "hammerjs": ">=2.0.8",
"minimatch-browser": "1.0.0", "minimatch-browser": ">=1.0.0",
"moment": "^2.22.2", "moment": ">=2.22.2",
"pdfjs-dist": "2.0.303", "pdfjs-dist": ">=2.0.303",
"reflect-metadata": "^0.1.12", "reflect-metadata": ">=0.1.12",
"zone.js": "^0.8.26" "zone.js": ">=0.8.26"
}, },
"keywords": [ "keywords": [
"core", "core",

View File

@ -16,7 +16,7 @@
*/ */
export interface FileInfo { export interface FileInfo {
entry?: WebKitFileEntry; entry?: any;
file?: File; file?: File;
relativeFolder?: string; relativeFolder?: string;
} }

View File

@ -16,6 +16,6 @@
"@angular/common": "^6.0.0", "@angular/common": "^6.0.0",
"@angular/core": "^6.0.0", "@angular/core": "^6.0.0",
"@angular/http": "^6.1.4", "@angular/http": "^6.1.4",
"alfresco-js-api": "2.7.0-beta5" "alfresco-js-api": ">=2.7.0-beta5"
} }
} }

View File

@ -25,19 +25,19 @@
"@angular/platform-browser": ">=5.1.1", "@angular/platform-browser": ">=5.1.1",
"@angular/platform-browser-dynamic": ">=5.1.1", "@angular/platform-browser-dynamic": ">=5.1.1",
"@angular/router": ">=5.1.1", "@angular/router": ">=5.1.1",
"alfresco-js-api": "2.7.0-beta5", "alfresco-js-api": ">=2.7.0-beta5",
"rxjs": ">=6.2.2", "rxjs": ">=6.2.2",
"@alfresco/adf-core": "2.7.0-beta5", "@alfresco/adf-core": ">=2.7.0-beta5",
"@alfresco/adf-content-services": "2.7.0-beta5", "@alfresco/adf-content-services": ">=2.7.0-beta5",
"@ngx-translate/core": "^10.0.2", "@ngx-translate/core": ">=10.0.2",
"chart.js": "2.5.0", "chart.js": ">=2.5.0",
"core-js": "2.4.1", "core-js": ">=2.4.1",
"hammerjs": "2.0.8", "hammerjs": ">=2.0.8",
"moment": "^2.22.2", "moment": ">=2.22.2",
"ng2-charts": "1.6.0", "ng2-charts": ">=1.6.0",
"raphael": "2.2.7", "raphael": ">=2.2.7",
"reflect-metadata": "0.1.10", "reflect-metadata": ">=0.1.10",
"zone.js": "^0.8.26" "zone.js": ">=0.8.26"
}, },
"keywords": [ "keywords": [
"analytics", "analytics",

View File

@ -14,6 +14,6 @@
"peerDependencies": { "peerDependencies": {
"@angular/common": "^6.0.0-rc.0 || ^6.0.0", "@angular/common": "^6.0.0-rc.0 || ^6.0.0",
"@angular/core": "^6.0.0-rc.0 || ^6.0.0", "@angular/core": "^6.0.0-rc.0 || ^6.0.0",
"alfresco-js-api": "2.7.0-beta5" "alfresco-js-api": ">=2.7.0-beta5"
} }
} }

View File

@ -25,16 +25,16 @@
"@angular/platform-browser": ">=5.1.1", "@angular/platform-browser": ">=5.1.1",
"@angular/platform-browser-dynamic": ">=5.1.1", "@angular/platform-browser-dynamic": ">=5.1.1",
"@angular/router": ">=5.1.1", "@angular/router": ">=5.1.1",
"alfresco-js-api": "2.7.0-beta5", "alfresco-js-api": ">=2.7.0-beta5",
"rxjs": ">=6.2.2", "rxjs": ">=6.2.2",
"@alfresco/adf-core": "2.7.0-beta5", "@alfresco/adf-core": ">=2.7.0-beta5",
"@alfresco/adf-content-services": "2.7.0-beta5", "@alfresco/adf-content-services": ">=2.7.0-beta5",
"@ngx-translate/core": "^10.0.2", "@ngx-translate/core": ">=10.0.2",
"core-js": "2.4.1", "core-js": ">=2.4.1",
"hammerjs": "2.0.8", "hammerjs": ">=2.0.8",
"moment": "^2.22.2", "moment": ">=2.22.2",
"reflect-metadata": "0.1.10", "reflect-metadata": ">=0.1.10",
"zone.js": "^0.8.26" "zone.js": ">=0.8.26"
}, },
"keywords": [ "keywords": [
"process-services", "process-services",

9540
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -61,24 +61,24 @@
"@alfresco/adf-insights": "2.7.0-beta5", "@alfresco/adf-insights": "2.7.0-beta5",
"@alfresco/adf-process-services": "2.7.0-beta5", "@alfresco/adf-process-services": "2.7.0-beta5",
"@alfresco/adf-process-services-cloud": "2.7.0-beta5", "@alfresco/adf-process-services-cloud": "2.7.0-beta5",
"@angular/animations": "6.1.8", "@angular/animations": "7.0.3",
"@angular/cdk": "6.4.7", "@angular/cdk": "7.0.3",
"@angular/common": "6.1.8", "@angular/common": "7.0.3",
"@angular/compiler": "6.1.8", "@angular/compiler": "7.0.3",
"@angular/core": "6.1.8", "@angular/core": "7.0.3",
"@angular/flex-layout": "6.0.0-beta.18", "@angular/flex-layout": "^7.0.0-beta.19",
"@angular/forms": "6.1.8", "@angular/forms": "7.0.3",
"@angular/http": "6.1.8", "@angular/http": "7.0.3",
"@angular/material": "6.4.7", "@angular/material": "7.0.3",
"@angular/material-moment-adapter": "6.4.7", "@angular/material-moment-adapter": "7.0.3",
"@angular/platform-browser": "6.1.8", "@angular/platform-browser": "7.0.3",
"@angular/platform-browser-dynamic": "6.1.8", "@angular/platform-browser-dynamic": "7.0.3",
"@angular/router": "6.1.8", "@angular/router": "7.0.3",
"@mat-datetimepicker/core": "2.0.1-beta.1", "@mat-datetimepicker/core": "^2.0.1",
"@mat-datetimepicker/moment": "2.0.1-beta.1", "@mat-datetimepicker/moment": "^2.0.1",
"@ngx-translate/core": "10.0.2", "@ngx-translate/core": "^11.0.0",
"@nrwl/nx": "7.1.1", "@nrwl/nx": "7.1.1",
"@nrwl/schematics": "6.3.1", "@nrwl/schematics": "7.1.1",
"adf-tslint-rules": "0.0.4", "adf-tslint-rules": "0.0.4",
"alfresco-js-api": "2.7.0-beta5", "alfresco-js-api": "2.7.0-beta5",
"alfresco-js-api-node": "2.7.0-beta5", "alfresco-js-api-node": "2.7.0-beta5",
@ -102,10 +102,10 @@
"zone.js": "~0.8.26" "zone.js": "~0.8.26"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.8.0", "@angular-devkit/build-angular": "~0.10.0",
"@angular-devkit/build-ng-packagr": "~0.8.0", "@angular-devkit/build-ng-packagr": "~0.10.0",
"@angular/cli": "^6.2.3", "@angular/cli": "^7.0.5",
"@angular/compiler-cli": "6.1.8", "@angular/compiler-cli": "7.0.3",
"@types/hammerjs": "2.0.35", "@types/hammerjs": "2.0.35",
"@types/jasmine": "~2.8.3", "@types/jasmine": "~2.8.3",
"@types/jasminewd2": "~2.0.2", "@types/jasminewd2": "~2.0.2",
@ -117,7 +117,7 @@
"autoprefixer": "6.5.4", "autoprefixer": "6.5.4",
"bundlesize": "^0.15.3", "bundlesize": "^0.15.3",
"chalk": "^2.3.2", "chalk": "^2.3.2",
"codelyzer": "4.3.0", "codelyzer": "^4.5.0",
"commander": "^2.15.1", "commander": "^2.15.1",
"concurrently": "^3.5.1", "concurrently": "^3.5.1",
"connect-history-api-fallback": "^1.5.0", "connect-history-api-fallback": "^1.5.0",
@ -153,7 +153,7 @@
"mdast-zone": "^3.0.1", "mdast-zone": "^3.0.1",
"merge-stream": "1.0.1", "merge-stream": "1.0.1",
"nconf": "^0.10.0", "nconf": "^0.10.0",
"ng-packagr": "4.0.1", "ng-packagr": "4.4.0",
"node-sass": "4.9.2", "node-sass": "4.9.2",
"protractor": "^5.4.0", "protractor": "^5.4.0",
"protractor-html-reporter-2": "^1.0.4", "protractor-html-reporter-2": "^1.0.4",
@ -170,12 +170,12 @@
"systemjs-builder": "0.15.34", "systemjs-builder": "0.15.34",
"traceur": "0.0.111", "traceur": "0.0.111",
"ts-node": "~4.1.0", "ts-node": "~4.1.0",
"tsickle": "^0.32.1", "tsickle": "^0.33.1",
"tslib": "^1.9.0", "tslib": "^1.9.0",
"tslint": "5.9.1", "tslint": "5.9.1",
"typedoc": "^0.11.1", "typedoc": "^0.11.1",
"typescript": "2.9.2",
"unist-util-select": "^2.0.0", "unist-util-select": "^2.0.0",
"typescript": "^3.1.6",
"unzip-stream": "^0.3.0", "unzip-stream": "^0.3.0",
"url-join": "^4.0.0", "url-join": "^4.0.0",
"webpack-bundle-analyzer": "^2.13.1", "webpack-bundle-analyzer": "^2.13.1",