[ADF-4997] no-duplicate-imports rule (#5256)

* no-duplicate-imports rule

* no-duplicate-imports rule

demo-shell/src/app/app.module.ts

@@ -17,7 +17,7 @@
 
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
-import { FormsModule } from '@angular/forms';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { ChartsModule } from 'ng2-charts';
 import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
@@ -51,7 +51,6 @@ import { MetadataDialogAdapterComponent } from './components/files/metadata-dial
 import { ThemePickerModule } from './components/theme-picker/theme-picker';
 
 import { routing } from './app.routes';
-import { ReactiveFormsModule } from '@angular/forms';
 import { TaskAttachmentsComponent } from './components/process-service/task-attachments.component';
 import { ProcessAttachmentsComponent } from './components/process-service/process-attachments.component';
 import { SharedLinkViewComponent } from './components/shared-link-view/shared-link-view.component';
@@ -63,7 +62,6 @@ import { ContentModule } from '@alfresco/adf-content-services';
 import { InsightsModule } from '@alfresco/adf-insights';
 import { ProcessModule } from '@alfresco/adf-process-services';
 import { AuthBearerInterceptor } from './services';
-import { ProcessServicesCloudModule } from '@alfresco/adf-process-services-cloud';
 import { AppExtensionsModule } from './app-extension.module';
 import { TreeViewSampleComponent } from './components/tree-view/tree-view-sample.component';
 import { CloudLayoutComponent } from './components/cloud/cloud-layout.component';
@@ -85,8 +83,8 @@ import { FormCloudDemoComponent } from './components/app-layout/cloud/form-demo/
 import { environment } from '../environments/environment';
 import { AppCloudSharedModule } from './components/cloud/shared/cloud.shared.module';
 import { DemoErrorComponent } from './components/error/demo-error.component';
-
 import {
+    ProcessServicesCloudModule,
     UserPreferenceCloudService,
     PROCESS_FILTERS_SERVICE_TOKEN,
     TASK_FILTERS_SERVICE_TOKEN

demo-shell/src/app/components/datatable/copy-content/datatable.component.ts

@@ -16,8 +16,7 @@
  */
 
 import { Component, Input } from '@angular/core';
-import { DataColumn, DataRow } from '@alfresco/adf-core';
+import { DataColumn, DataRow, ObjectDataTableAdapter } from '@alfresco/adf-core';
-import { ObjectDataTableAdapter } from '@alfresco/adf-core';
 
 export class FilteredDataAdapter extends ObjectDataTableAdapter {
 

demo-shell/src/app/components/document-list/extension-presets/name-column/name-column.component.ts

@@ -24,10 +24,9 @@ import {
     ElementRef,
     OnDestroy
 } from '@angular/core';
-import { NodeEntry } from '@alfresco/js-api';
+import { NodeEntry, Node } from '@alfresco/js-api';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { AlfrescoApiService } from '@alfresco/adf-core';
-import { Node } from '@alfresco/js-api';
 import { takeUntil } from 'rxjs/operators';
 
 @Component({

demo-shell/src/app/components/files/files.component.ts

@@ -23,7 +23,7 @@ import { Location } from '@angular/common';
 
 import { MatDialog } from '@angular/material';
 import { ActivatedRoute, Params, Router } from '@angular/router';
-import { MinimalNodeEntity, NodePaging, Pagination, MinimalNodeEntryEntity, SiteEntry } from '@alfresco/js-api';
+import { MinimalNodeEntity, NodePaging, Pagination, MinimalNodeEntryEntity, SiteEntry, SearchEntry } from '@alfresco/js-api';
 import {
     AlfrescoApiService, AuthenticationService, AppConfigService, AppConfigValues, ContentService, TranslationService,
     FileUploadEvent, FolderCreatedEvent, LogService, NotificationService,
@@ -48,7 +48,6 @@ import { MetadataDialogAdapterComponent } from './metadata-dialog-adapter.compon
 import { Subject } from 'rxjs';
 import { PreviewService } from '../../services/preview.service';
 import { debounceTime, takeUntil } from 'rxjs/operators';
-import { SearchEntry } from '@alfresco/js-api';
 
 const DEFAULT_FOLDER_TO_SHOW = '-my-';
 

demo-shell/src/app/components/files/version-manager-dialog-adapter.component.ts

@@ -16,9 +16,9 @@
  */
 
 import { Component, Inject, ViewEncapsulation } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { MinimalNodeEntryEntity } from '@alfresco/js-api';
-import { MatSnackBar } from '@angular/material';
+import { MatSnackBar } from '@angular/material/snack-bar';
 
 @Component({
     templateUrl: './version-manager-dialog-adapter.component.html',

demo-shell/src/app/components/form/fake-form.service.ts

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { Observable, of } from 'rxjs';
+import { Observable, of, Subject } from 'rxjs';
 import { Injectable } from '@angular/core';
 import {
     AlfrescoApiService,
@@ -24,7 +24,6 @@ import {
     FormService,
     FormOutcomeEvent
 } from '@alfresco/adf-core';
-import { Subject } from 'rxjs';
 
 @Injectable()
 export class FakeFormService extends FormService {

demo-shell/src/app/components/process-service/process-attachments.component.ts

@@ -18,9 +18,7 @@
 import { Component, Input, OnChanges, OnInit, ViewChild, OnDestroy } from '@angular/core';
 import { ProcessInstance, ProcessService ,
     ProcessAttachmentListComponent, ProcessUploadService } from '@alfresco/adf-process-services';
-import { UploadService } from '@alfresco/adf-core';
+import { UploadService, AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
-import { AlfrescoApiService } from '@alfresco/adf-core';
-import { AppConfigService } from '@alfresco/adf-core';
 import { PreviewService } from '../../services/preview.service';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';

demo-shell/src/app/components/process-service/process-service.component.ts

@@ -35,7 +35,8 @@ import {
 } from '@alfresco/js-api';
 import {
     FORM_FIELD_VALIDATORS, FormRenderingService, FormService,
-    DynamicTableRow, ValidateDynamicTableRowEvent, AppConfigService, PaginationComponent, UserPreferenceValues
+    DynamicTableRow, ValidateDynamicTableRowEvent, AppConfigService, PaginationComponent, UserPreferenceValues,
+    AlfrescoApiService, UserPreferencesService, LogService
 } from '@alfresco/adf-core';
 
 import { AnalyticsReportListComponent } from '@alfresco/adf-insights';
@@ -45,9 +46,7 @@ import {
     ProcessInstance,
     ProcessInstanceDetailsComponent,
     ProcessInstanceListComponent,
-    StartProcessInstanceComponent
+    StartProcessInstanceComponent,
-} from '@alfresco/adf-process-services';
-import {
     AppsListComponent,
     FilterRepresentationModel,
     TaskDetailsComponent,
@@ -55,8 +54,6 @@ import {
     TaskFiltersComponent,
     TaskListComponent
 } from '@alfresco/adf-process-services';
-import { LogService } from '@alfresco/adf-core';
-import { AlfrescoApiService, UserPreferencesService } from '@alfresco/adf-core';
 import { Subject } from 'rxjs';
 import { /*CustomEditorComponent*/ CustomStencil01 } from './custom-editor/custom-editor.component';
 import { DemoFieldValidator } from './demo-field-validator';

demo-shell/src/app/components/search/search-extended.component.ts

@@ -18,8 +18,7 @@
 import { Component, ViewChild, ViewEncapsulation } from '@angular/core';
 import { Pagination, QueryBody, MinimalNodeEntity } from '@alfresco/js-api';
 import { SearchComponent } from '@alfresco/adf-content-services';
-import { ThumbnailService } from '@alfresco/adf-core';
+import { ThumbnailService, SearchService, SearchConfigurationService } from '@alfresco/adf-core';
-import { SearchService, SearchConfigurationService } from '@alfresco/adf-core';
 import { TestSearchConfigurationService } from './search-config-test.service';
 
 @Component({

demo-shell/src/polyfills.ts

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

e2e/content-services/directives/create-library-directive.e2e.ts

@@ -15,15 +15,13 @@
  * limitations under the License.
  */
 
-import { LoginPage, BrowserActions } from '@alfresco/adf-testing';
+import { LoginPage, BrowserActions, StringUtil } from '@alfresco/adf-testing';
 import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
 import { CreateLibraryDialog } from '../../pages/adf/dialog/createLibraryDialog';
 import { CustomSources } from '../../pages/adf/demo-shell/customSourcesPage';
-
 import { AcsUserModel } from '../../models/ACS/acsUserModel';
 import { browser } from 'protractor';
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
-import { StringUtil } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 
 describe('Create library directive', () => {

e2e/content-services/trashcan-pagination.e2e.ts

@@ -15,21 +15,15 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '@alfresco/adf-testing';
+import { LoginPage, PaginationPage, UploadActions } from '@alfresco/adf-testing';
-import { TrashcanPage } from '../pages/adf/trashcanPage';
+import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
-
+import { browser } from 'protractor';
-import { PaginationPage } from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-
 import { AcsUserModel } from '../models/ACS/acsUserModel';
 import { FolderModel } from '../models/ACS/folderModel';
-
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { TrashcanPage } from '../pages/adf/trashcanPage';
 import { Util } from '../util/util';
 
-import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
-import { UploadActions } from '@alfresco/adf-testing';
-import { browser } from 'protractor';
-
 describe('Trashcan - Pagination', () => {
     const pagination = {
         base: 'newFile',

e2e/content-services/version/version-actions.e2e.ts

@@ -15,17 +15,15 @@
  * limitations under the License.
  */
 
+import { BrowserActions, BrowserVisibility, FileBrowserUtil, LoginPage, UploadActions } from '@alfresco/adf-testing';
+import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
 import { browser, by, element } from 'protractor';
-import { LoginPage } from '@alfresco/adf-testing';
-import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import { VersionManagePage } from '../../pages/adf/versionManagerPage';
 import { AcsUserModel } from '../../models/ACS/acsUserModel';
 import { FileModel } from '../../models/ACS/fileModel';
-import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
+import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import { UploadActions } from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
-import { BrowserVisibility, FileBrowserUtil, BrowserActions } from '@alfresco/adf-testing';
 import { UploadDialog } from '../../pages/adf/dialog/uploadDialog';
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
+import { VersionManagePage } from '../../pages/adf/versionManagerPage';
 
 describe('Version component actions', () => {
 

e2e/core/card-view/card-view-component.e2e.ts

@@ -15,14 +15,11 @@
  * limitations under the License.
  */
 
-import { element, by, browser } from 'protractor';
+import { BrowserVisibility, LoginPage } from '@alfresco/adf-testing';
-
+import { browser, by, element } from 'protractor';
-import { LoginPage } from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
-import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
-
 import { CardViewComponentPage } from '../../pages/adf/cardViewComponentPage';
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { MetadataViewPage } from '../../pages/adf/metadataViewPage';
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 
 describe('CardView Component', () => {
     const loginPage = new LoginPage();

e2e/core/datatable/data-table-component-selection.e2e.ts

@@ -15,13 +15,11 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '@alfresco/adf-testing';
+import { DataTableComponentPage, LoginPage } from '@alfresco/adf-testing';
-import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage';
-import { DataTableComponentPage } from '@alfresco/adf-testing';
-import { browser } from 'protractor';
-
-import { AcsUserModel } from '../../models/ACS/acsUserModel';
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
+import { browser } from 'protractor';
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage';
 import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 
 describe('Datatable component - selection', () => {

e2e/core/datatable/data-table-component.e2e.ts

@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 
-import { LoginPage, NotificationHistoryPage } from '@alfresco/adf-testing';
+import { DataTableComponentPage, LoginPage, NotificationHistoryPage } from '@alfresco/adf-testing';
-import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage';
-import { DataTableComponentPage } from '@alfresco/adf-testing';
-import { AcsUserModel } from '../../models/ACS/acsUserModel';
-import { browser } from 'protractor';
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
-import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
+import { browser } from 'protractor';
 import { DropActions } from '../../actions/drop.actions';
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
 import { FileModel } from '../../models/ACS/fileModel';
+import { DataTablePage } from '../../pages/adf/demo-shell/dataTablePage';
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 
 describe('Datatable component', () => {
 

e2e/core/header-component.e2e.ts

@@ -14,14 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { LoginPage } from '@alfresco/adf-testing';
+import { HeaderPage, LoginPage, SettingsPage } from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-
-import { HeaderPage, SettingsPage } from '@alfresco/adf-testing';
-import { browser } from 'protractor';
-
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
+import { browser } from 'protractor';
 import { UsersActions } from '../actions/users.actions';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 describe('Header Component', () => {
 

e2e/core/infinite-scrolling.e2e.ts

@@ -15,20 +15,16 @@
  * limitations under the License.
  */
 
-import { LoginPage, LocalStorageUtil } from '@alfresco/adf-testing';
+import { LocalStorageUtil, LoginPage, UploadActions } from '@alfresco/adf-testing';
+import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
+import { browser } from 'protractor';
+import { AcsUserModel } from '../models/ACS/acsUserModel';
+import { FolderModel } from '../models/ACS/folderModel';
 import { ContentServicesPage } from '../pages/adf/contentServicesPage';
 import { InfinitePaginationPage } from '../pages/adf/core/infinitePaginationPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-
-import { AcsUserModel } from '../models/ACS/acsUserModel';
-import { FolderModel } from '../models/ACS/folderModel';
-
-import { browser } from 'protractor';
 import { Util } from '../util/util';
 
-import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
-import { UploadActions } from '@alfresco/adf-testing';
-
 describe('Enable infinite scrolling', () => {
 
     const loginPage = new LoginPage();

e2e/core/login/login-component.e2e.ts

@@ -15,19 +15,13 @@
  * limitations under the License.
  */
 
-import { browser } from 'protractor';
+import { BrowserActions, ErrorPage, LoginPage, SettingsPage, UserInfoPage } from '@alfresco/adf-testing';
-
-import { LoginPage, SettingsPage, ErrorPage, BrowserActions } from '@alfresco/adf-testing';
-import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
-import { ProcessServicesPage } from '../../pages/adf/process-services/processServicesPage';
-import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
-
-import { UserInfoPage } from '@alfresco/adf-testing';
-
-import { AcsUserModel } from '../../models/ACS/acsUserModel';
-
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
-
+import { browser } from 'protractor';
+import { AcsUserModel } from '../../models/ACS/acsUserModel';
+import { ContentServicesPage } from '../../pages/adf/contentServicesPage';
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
+import { ProcessServicesPage } from '../../pages/adf/process-services/processServicesPage';
 import { Util } from '../../util/util';
 
 describe('Login component', () => {

e2e/core/pagination-empty-current-page.e2e.ts

@@ -15,16 +15,14 @@
  * limitations under the License.
  */
 
-import { LoginPage, ViewerPage } from '@alfresco/adf-testing';
+import { LoginPage, PaginationPage, UploadActions, ViewerPage } from '@alfresco/adf-testing';
-import { ContentServicesPage } from '../pages/adf/contentServicesPage';
-import { PaginationPage } from '@alfresco/adf-testing';
-import { AcsUserModel } from '../models/ACS/acsUserModel';
-import { FolderModel } from '../models/ACS/folderModel';
-import { FileModel } from '../models/ACS/fileModel';
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
-import { UploadActions } from '@alfresco/adf-testing';
-import { Util } from '../util/util';
 import { browser } from 'protractor';
+import { AcsUserModel } from '../models/ACS/acsUserModel';
+import { FileModel } from '../models/ACS/fileModel';
+import { FolderModel } from '../models/ACS/folderModel';
+import { ContentServicesPage } from '../pages/adf/contentServicesPage';
+import { Util } from '../util/util';
 
 describe('Pagination - returns to previous page when current is empty', () => {
 

e2e/core/settings-component.e2e.ts

@@ -15,13 +15,12 @@
  * limitations under the License.
  */
 
-import { LoginPage, SettingsPage, BrowserActions } from '@alfresco/adf-testing';
+import { BrowserActions, LoginPage, SettingsPage } from '@alfresco/adf-testing';
-import { protractor } from 'protractor';
+import { browser, protractor } from 'protractor';
 import { AcsUserModel } from '../models/ACS/acsUserModel';
+import { ContentServicesPage } from '../pages/adf/contentServicesPage';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage';
-import { ContentServicesPage } from '../pages/adf/contentServicesPage';
-import { browser } from 'protractor';
 
 describe('Settings component', () => {
 

e2e/core/user-info-component-cloud.e2e.ts

@@ -15,10 +15,8 @@
  * limitations under the License.
  */
 
-import { LoginSSOPage, SettingsPage } from '@alfresco/adf-testing';
+import { ApiService, IdentityService, LoginSSOPage, SettingsPage, UserInfoPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
-import { UserInfoPage } from '@alfresco/adf-testing';
-import { IdentityService, ApiService } from '@alfresco/adf-testing';
 
 describe('User Info - SSO', () => {
 

e2e/core/user-info-component.e2e.ts

@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '@alfresco/adf-testing';
+import { LoginPage, UserInfoPage } from '@alfresco/adf-testing';
-import { UserInfoPage } from '@alfresco/adf-testing';
+import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
+import { browser } from 'protractor';
+import { UsersActions } from '../actions/users.actions';
 import { AcsUserModel } from '../models/ACS/acsUserModel';
 import { FileModel } from '../models/ACS/fileModel';
-import PeopleAPI = require('../restAPI/ACS/PeopleAPI');
-import { browser } from 'protractor';
-import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
-import { UsersActions } from '../actions/users.actions';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import PeopleAPI = require('../restAPI/ACS/PeopleAPI');
 
 describe('User Info component', () => {
 

e2e/pages/adf/commentsPage.ts

@@ -15,10 +15,8 @@
  * limitations under the License.
  */
 
-import { element, by, ElementFinder, ElementArrayFinder } from 'protractor';
+import { BrowserActions, BrowserVisibility, TabsPage } from '@alfresco/adf-testing';
-
+import { by, element, ElementArrayFinder, ElementFinder } from 'protractor';
-import { TabsPage } from '@alfresco/adf-testing';
-import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
 
 export class CommentsPage {
 

e2e/pages/adf/contentServicesPage.ts

@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 
-import { FolderDialog } from './dialog/folderDialog';
+import { BrowserActions, BrowserVisibility, DateUtil, DocumentListPage, FormControllersPage } from '@alfresco/adf-testing';
-import { CreateLibraryDialog } from './dialog/createLibraryDialog';
+import { $$, browser, by, element, ElementFinder, protractor } from 'protractor';
-import { FormControllersPage } from '@alfresco/adf-testing';
 import { DropActions } from '../../actions/drop.actions';
-import { by, element, protractor, $$, browser, ElementFinder } from 'protractor';
+import { CreateLibraryDialog } from './dialog/createLibraryDialog';
+import { FolderDialog } from './dialog/folderDialog';
+import { NavigationBarPage } from './navigationBarPage';
 
 import path = require('path');
-import { BrowserVisibility, DocumentListPage, BrowserActions, DateUtil } from '@alfresco/adf-testing';
-import { NavigationBarPage } from './navigationBarPage';
 
 export class ContentServicesPage {
 

e2e/pages/adf/demo-shell/customSourcesPage.ts

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserActions, BrowserVisibility, DataTableComponentPage } from '@alfresco/adf-testing';
-import { element, by, ElementFinder } from 'protractor';
+import { by, element, ElementFinder } from 'protractor';
-import { DataTableComponentPage, BrowserActions } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../navigationBarPage';
 
 const source = {

e2e/pages/adf/demo-shell/dataTablePage.ts

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
+import { BrowserActions, BrowserVisibility, DataTableComponentPage } from '@alfresco/adf-testing';
 import { browser, by, element, ElementArrayFinder, ElementFinder, protractor } from 'protractor';
-import { DataTableComponentPage } from '@alfresco/adf-testing';
-import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
 
 export class DataTablePage {
 

e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts

@@ -15,14 +15,8 @@
  * limitations under the License.
  */
 
-import { element, by, ElementFinder } from 'protractor';
+import { BrowserActions, BrowserVisibility, EditProcessFilterCloudComponentPage, ProcessFiltersCloudComponentPage, ProcessListCloudComponentPage } from '@alfresco/adf-testing';
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { by, element, ElementFinder } from 'protractor';
-import {
-    ProcessFiltersCloudComponentPage,
-    EditProcessFilterCloudComponentPage,
-    ProcessListCloudComponentPage,
-    BrowserActions
-} from '@alfresco/adf-testing';
 
 export class ProcessCloudDemoPage {
 

e2e/pages/adf/demo-shell/process-services/processListDemoPage.ts

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-import { BrowserVisibility } from '@alfresco/adf-testing';
+import { BrowserActions, BrowserVisibility, DataTableComponentPage } from '@alfresco/adf-testing';
-import { DataTableComponentPage, BrowserActions } from '@alfresco/adf-testing';
+import { by, element, ElementFinder, protractor } from 'protractor';
-import { element, by, protractor, ElementFinder } from 'protractor';
 
 export class ProcessListDemoPage {
 

e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts

@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
+import { BrowserActions, BrowserVisibility, PaginationPage } from '@alfresco/adf-testing';
+import { by, element, ElementFinder } from 'protractor';
 import { TasksListPage } from '../../process-services/tasksListPage';
-import { PaginationPage } from '@alfresco/adf-testing';
-import { element, by, ElementFinder } from 'protractor';
-import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
 
 export class TaskListDemoPage {
 

e2e/pages/adf/navigationBarPage.ts

@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
+import { AppListCloudPage, BrowserActions, BrowserVisibility } from '@alfresco/adf-testing';
 import { browser, by, element, ElementFinder } from 'protractor';
-import { ProcessServicesPage } from './process-services/processServicesPage';
-import { AppListCloudPage } from '@alfresco/adf-testing';
 import { PeopleGroupCloudComponentPage } from './demo-shell/process-services/peopleGroupCloudComponentPage';
-import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
+import { ProcessServicesPage } from './process-services/processServicesPage';
 
 export class NavigationBarPage {
 

e2e/pages/adf/permissionsPage.ts

@@ -15,10 +15,8 @@
  * limitations under the License.
  */
 
-import { element, by, ElementFinder } from 'protractor';
+import { BrowserActions, BrowserVisibility, DataTableComponentPage } from '@alfresco/adf-testing';
-
+import { by, element, ElementFinder } from 'protractor';
-import { DataTableComponentPage } from '@alfresco/adf-testing';
-import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
 
 const column = {
     role: 'Role'

e2e/pages/adf/process-services/filtersPage.ts

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
+import { BrowserActions, DataTableComponentPage } from '@alfresco/adf-testing';
 import { by, element, ElementFinder } from 'protractor';
-import { DataTableComponentPage } from '@alfresco/adf-testing';
-import { BrowserActions } from '@alfresco/adf-testing';
 
 export class FiltersPage {
 

e2e/pages/adf/process-services/processFiltersPage.ts

@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-import { element, by, ElementFinder, Locator } from 'protractor';
+import { BrowserActions, BrowserVisibility, DataTableComponentPage } from '@alfresco/adf-testing';
+import { by, element, ElementFinder, Locator } from 'protractor';
 import { StartProcessPage } from './startProcessPage';
-import { DataTableComponentPage } from '@alfresco/adf-testing';
-import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
 
 export class ProcessFiltersPage {
 

e2e/pages/adf/process-services/taskDetailsPage.ts

@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
+import { BrowserActions, BrowserVisibility, TabsPage } from '@alfresco/adf-testing';
+import { browser, by, element, ElementFinder } from 'protractor';
 import { AppSettingsToggles } from './dialog/appSettingsToggles';
-import { element, by, browser, ElementFinder } from 'protractor';
-import { TabsPage } from '@alfresco/adf-testing';
-import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
 
 export class TaskDetailsPage {
 

e2e/pages/adf/process-services/tasksListPage.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
+import { BrowserActions, BrowserVisibility, DataTableComponentPage } from '@alfresco/adf-testing';
-import { DataTableComponentPage } from '@alfresco/adf-testing';
 import { by, element, ElementFinder } from 'protractor';
 
 export class TasksListPage {

e2e/pages/adf/searchFiltersPage.ts

@@ -15,16 +15,8 @@
  * limitations under the License.
  */
 
-import { element, by, ElementFinder } from 'protractor';
+import { BrowserVisibility, DateRangeFilterPage, NumberRangeFilterPage, SearchCategoriesPage, SearchCheckListPage, SearchRadioPage, SearchSliderPage, SearchTextPage } from '@alfresco/adf-testing';
-import { BrowserVisibility, SearchCategoriesPage } from '@alfresco/adf-testing';
+import { by, element, ElementFinder } from 'protractor';
-import {
-    SearchCheckListPage,
-    SearchTextPage,
-    NumberRangeFilterPage,
-    DateRangeFilterPage,
-    SearchSliderPage,
-    SearchRadioPage
-} from '@alfresco/adf-testing';
 
 export class SearchFiltersPage {
 

e2e/pages/adf/searchResultsPage.ts

@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-import { DataTableComponentPage } from '@alfresco/adf-testing';
+import { BrowserVisibility, DataTableComponentPage, SearchSortingPickerPage } from '@alfresco/adf-testing';
-import { element, by, ElementFinder } from 'protractor';
+import { by, element, ElementFinder } from 'protractor';
 import { ContentServicesPage } from './contentServicesPage';
-import { BrowserVisibility, SearchSortingPickerPage } from '@alfresco/adf-testing';
 
 export class SearchResultsPage {
 

e2e/pages/adf/versionManagerPage.ts

@@ -16,9 +16,8 @@
  */
 
 import path = require('path');
+import { BrowserActions, BrowserVisibility, FormControllersPage } from '@alfresco/adf-testing';
 import { browser, by, element, ElementFinder } from 'protractor';
-import { FormControllersPage } from '@alfresco/adf-testing';
-import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing';
 
 export class VersionManagePage {
 

e2e/process-services-cloud/apps-section-cloud.e2e.ts

@@ -15,15 +15,8 @@
  * limitations under the License.
  */
 
+import { ApiService, ApplicationsService, AppListCloudPage, IdentityService, LocalStorageUtil, LoginSSOPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
-import {
-    ApiService,
-    IdentityService,
-    LoginSSOPage,
-    LocalStorageUtil,
-    ApplicationsService
-} from '@alfresco/adf-testing';
-import { AppListCloudPage } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 describe('Applications list', () => {

e2e/process-services-cloud/edit-process-filters-component.e2e.ts

@@ -15,12 +15,11 @@
  * limitations under the License.
  */
 
+import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginSSOPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
-import { ApiService, GroupIdentityService, IdentityService, LoginSSOPage } from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
 import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
-import { AppListCloudPage } from '@alfresco/adf-testing';
+import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 describe('Edit process filters cloud', () => {
 

e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts

@@ -16,23 +16,14 @@
  */
 
 import {
-    TasksService,
+    ApiService, AppListCloudPage, GroupIdentityService, IdentityService,
-    QueryService,
+    LoginSSOPage, NotificationHistoryPage, ProcessDefinitionsService,
-    ProcessDefinitionsService,
+    ProcessInstancesService, QueryService, TaskFormCloudComponent, TaskHeaderCloudPage,
-    ProcessInstancesService,
+    TasksService, Widget
-    LoginSSOPage,
-    ApiService,
-    IdentityService,
-    GroupIdentityService,
-    Widget,
-    NotificationHistoryPage,
-    TaskHeaderCloudPage,
-    TaskFormCloudComponent
 } from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
-import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
-import { AppListCloudPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
+import { TasksCloudDemoPage } from '../../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
 
 describe('Form Field Component - Dropdown Widget', () => {
     const loginSSOPage = new LoginSSOPage();

e2e/process-services-cloud/people-group-cloud-component.e2e.ts

@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { ApiService, GroupCloudComponentPage, GroupIdentityService, IdentityService, LoginSSOPage, PeopleCloudComponentPage, RolesService } from '@alfresco/adf-testing';
-import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage';
-import { GroupCloudComponentPage, PeopleCloudComponentPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
-import { LoginSSOPage, IdentityService, GroupIdentityService, RolesService, ApiService } from '@alfresco/adf-testing';
+import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 describe('People Groups Cloud Component', () => {
 

e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts

@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { ApiService, GroupCloudComponentPage, GroupIdentityService, IdentityService, LoginSSOPage, PeopleCloudComponentPage } from '@alfresco/adf-testing';
-import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage';
-import { GroupCloudComponentPage, PeopleCloudComponentPage } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
-import { LoginSSOPage, IdentityService, GroupIdentityService, ApiService } from '@alfresco/adf-testing';
+import { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 describe('People Groups Cloud Component', () => {
 

e2e/process-services-cloud/process-custom-filters.e2e.ts

@@ -15,17 +15,13 @@
  * limitations under the License.
  */
 
-import {
+import { ApiService, AppListCloudPage, BrowserActions, GroupIdentityService, IdentityService, LocalStorageUtil, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, StringUtil, TasksService } from '@alfresco/adf-testing';
-    TasksService, QueryService, ProcessDefinitionsService, ProcessInstancesService,
+import { browser } from 'protractor';
-    LoginSSOPage, ApiService, IdentityService, GroupIdentityService, StringUtil
-} from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
-import { AppListCloudPage, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { browser } from 'protractor';
-import { ProcessListCloudConfiguration } from './config/process-list-cloud.config';
 import { EditProcessFilterConfiguration } from './config/edit-process-filter.config';
+import { ProcessListCloudConfiguration } from './config/process-list-cloud.config';
 
 describe('Process list cloud', () => {
 

e2e/process-services-cloud/process-filter-results.e2e.ts

@@ -15,18 +15,14 @@
  * limitations under the License.
  */
 
-import {
+import { ApiService, AppListCloudPage, DateUtil, GroupIdentityService, IdentityService, LocalStorageUtil, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, StringUtil, TasksService } from '@alfresco/adf-testing';
-    TasksService, QueryService, ProcessDefinitionsService, ProcessInstancesService,
+import { browser } from 'protractor';
-    LoginSSOPage, ApiService, IdentityService, GroupIdentityService, StringUtil, DateUtil
-} from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
-import { AppListCloudPage, LocalStorageUtil } from '@alfresco/adf-testing';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { browser } from 'protractor';
-import { ProcessListCloudConfiguration } from './config/process-list-cloud.config';
-import { EditProcessFilterConfiguration } from './config/edit-process-filter.config';
 import { ProcessListPage } from '../pages/adf/process-services/processListPage';
+import { EditProcessFilterConfiguration } from './config/edit-process-filter.config';
+import { ProcessListCloudConfiguration } from './config/process-list-cloud.config';
 import moment = require('moment');
 
 describe('Process filters cloud', () => {

e2e/process-services-cloud/process-filters-cloud.e2e.ts

@@ -15,21 +15,11 @@
  * limitations under the License.
  */
 
+import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, TasksService } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
-import {
-    TasksService,
-    QueryService,
-    ProcessDefinitionsService,
-    ProcessInstancesService,
-    LoginSSOPage,
-    ApiService,
-    IdentityService,
-    GroupIdentityService
-} from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
-import { AppListCloudPage } from '@alfresco/adf-testing';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 describe('Process filters cloud', () => {
 

e2e/process-services-cloud/process-header-cloud.e2e.ts

@@ -15,26 +15,14 @@
  * limitations under the License.
  */
 
+import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginSSOPage, ProcessDefinitionsService, ProcessHeaderCloudPage, ProcessInstancesService, QueryService, StringUtil } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
+import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
+import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import CONSTANTS = require('../util/constants');
 import moment = require('moment');
 
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import {
-    ApiService,
-    StringUtil,
-    LoginSSOPage,
-    ProcessDefinitionsService,
-    ProcessInstancesService,
-    QueryService,
-    IdentityService,
-    GroupIdentityService
-} from '@alfresco/adf-testing';
-import { AppListCloudPage } from '@alfresco/adf-testing';
-import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
-import { ProcessHeaderCloudPage } from '@alfresco/adf-testing';
-import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
-
 describe('Process Header cloud component', () => {
 
     describe('Process Header cloud component', () => {

e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts

@@ -15,14 +15,11 @@
  * limitations under the License.
  */
 
+import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
-import { GroupIdentityService, IdentityService, LoginSSOPage } from '@alfresco/adf-testing';
 import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
-import { AppListCloudPage } from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
-import { ProcessDefinitionsService, ApiService } from '@alfresco/adf-testing';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { ProcessInstancesService } from '@alfresco/adf-testing';
 
 describe('Process list cloud', () => {
 

e2e/process-services-cloud/process-list-cloud-component.e2e.ts

@@ -15,17 +15,9 @@
  * limitations under the License.
  */
 
+import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LocalStorageUtil, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
-import {
-    ProcessDefinitionsService,
-    ProcessInstancesService,
-    LoginSSOPage,
-    ApiService,
-    LocalStorageUtil,
-    IdentityService, GroupIdentityService
-} from '@alfresco/adf-testing';
 import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
-import { AppListCloudPage } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { ProcessListCloudConfiguration } from './config/process-list-cloud.config';
 

e2e/process-services-cloud/process-list-selection-cloud.e2e.ts

@@ -15,14 +15,11 @@
  * limitations under the License.
  */
 
+import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
-import { GroupIdentityService, IdentityService, LoginSSOPage } from '@alfresco/adf-testing';
 import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
-import { AppListCloudPage } from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
-import { ProcessDefinitionsService, ApiService } from '@alfresco/adf-testing';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { ProcessInstancesService } from '@alfresco/adf-testing';
 
 describe('Process list cloud', () => {
 

e2e/process-services-cloud/start-process-cloud.e2e.ts

@@ -15,12 +15,10 @@
  * limitations under the License.
  */
 
-import { ApiService, GroupIdentityService, IdentityService, LoginSSOPage } from '@alfresco/adf-testing';
+import { ApiService, AppListCloudPage, BrowserActions, GroupIdentityService, IdentityService, LoginSSOPage, StartProcessCloudPage, StringUtil } from '@alfresco/adf-testing';
-import { AppListCloudPage, StartProcessCloudPage } from '@alfresco/adf-testing';
 import { browser, protractor } from 'protractor';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { ProcessCloudDemoPage } from '../pages/adf/demo-shell/process-services/processCloudDemoPage';
-import { StringUtil, BrowserActions } from '@alfresco/adf-testing';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 
 describe('Start Process', () => {
 

e2e/process-services-cloud/task-header-cloud.e2e.ts

@@ -16,12 +16,11 @@
  */
 
 import CONSTANTS = require('../util/constants');
-import { ApiService, StringUtil, IdentityService, GroupIdentityService, LocalStorageUtil } from '@alfresco/adf-testing';
+import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LocalStorageUtil, LoginSSOPage, StringUtil, TaskHeaderCloudPage, TasksService } from '@alfresco/adf-testing';
-import moment = require('moment');
 import { browser } from 'protractor';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { LoginSSOPage, AppListCloudPage, TaskHeaderCloudPage, TasksService } from '@alfresco/adf-testing';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import moment = require('moment');
 
 describe('Task Header cloud component', () => {
     const basicCreatedTaskName = StringUtil.generateRandomString();

e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts

@@ -15,14 +15,10 @@
  * limitations under the License.
  */
 
+import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, TasksService } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
-import { GroupIdentityService, IdentityService, LoginSSOPage, QueryService, TasksService } from '@alfresco/adf-testing';
-import { AppListCloudPage } from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
-
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { ProcessDefinitionsService, ApiService } from '@alfresco/adf-testing';
-import { ProcessInstancesService } from '@alfresco/adf-testing';
 
 describe('Process list cloud', () => {
 

e2e/process-services-cloud/task-list-selection.e2e.ts

@@ -15,13 +15,10 @@
  * limitations under the License.
  */
 
+import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LoginSSOPage, StringUtil, TasksService } from '@alfresco/adf-testing';
 import { browser } from 'protractor';
-
-import { ApiService, LoginSSOPage, TasksService, IdentityService, GroupIdentityService } from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
-import { AppListCloudPage } from '@alfresco/adf-testing';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { StringUtil } from '@alfresco/adf-testing';
 
 describe('Task list cloud - selection', () => {
 

e2e/process-services-cloud/tasks-custom-filters.e2e.ts

@@ -25,11 +25,11 @@ import {
     ProcessInstancesService,
     LoginSSOPage,
     ApiService,
-    IdentityService, GroupIdentityService
+    IdentityService, GroupIdentityService,
+    AppListCloudPage
 } from '@alfresco/adf-testing';
 import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { TasksCloudDemoPage } from '../pages/adf/demo-shell/process-services/tasksCloudDemoPage';
-import { AppListCloudPage } from '@alfresco/adf-testing';
 
 describe('Task filters cloud', () => {
 

e2e/process-services/attach-form-component.e2e.ts

@@ -15,19 +15,15 @@
  * limitations under the License.
  */
 
-import { LoginPage, FormFields } from '@alfresco/adf-testing';
+import { FormFields, LoginPage } from '@alfresco/adf-testing';
-import { TasksPage } from '../pages/adf/process-services/tasksPage';
-import { AttachFormPage } from '../pages/adf/process-services/attachFormPage';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-
-import CONSTANTS = require('../util/constants');
-
-import { browser } from 'protractor';
-
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
-import { UsersActions } from '../actions/users.actions';
+import { browser, by } from 'protractor';
 import { AppsActions } from '../actions/APS/apps.actions';
-import { by } from 'protractor';
+import { UsersActions } from '../actions/users.actions';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { AttachFormPage } from '../pages/adf/process-services/attachFormPage';
+import { TasksPage } from '../pages/adf/process-services/tasksPage';
+import CONSTANTS = require('../util/constants');
 
 describe('Attach Form Component', () => {
 

e2e/process-services/custom-tasks-filters.e2e.ts

@@ -15,18 +15,17 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '@alfresco/adf-testing';
+import { DateUtil, LoginPage, PaginationPage } from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { TaskListDemoPage } from '../pages/adf/demo-shell/process-services/taskListDemoPage';
-import { PaginationPage, DateUtil } from '@alfresco/adf-testing';
-import moment = require('moment');
-import { Tenant } from '../models/APS/tenant';
-import { browser } from 'protractor';
-import { Util } from '../util/util';
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
+import { browser } from 'protractor';
 import { AppsActions } from '../actions/APS/apps.actions';
 import { AppsRuntimeActions } from '../actions/APS/appsRuntime.actions';
 import { UsersActions } from '../actions/users.actions';
+import { Tenant } from '../models/APS/tenant';
+import { TaskListDemoPage } from '../pages/adf/demo-shell/process-services/taskListDemoPage';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { Util } from '../util/util';
+import moment = require('moment');
 
 describe('Start Task - Custom App', () => {
 

e2e/process-services/pagination-processlist-addingProcesses.e2e.ts

@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '@alfresco/adf-testing';
+import { LoginPage, PaginationPage } from '@alfresco/adf-testing';
-import { PaginationPage } from '@alfresco/adf-testing';
-import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage';
-import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
+import { browser } from 'protractor';
 import { AppsActions } from '../actions/APS/apps.actions';
 import { UsersActions } from '../actions/users.actions';
-import { browser } from 'protractor';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage';
+import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage';
 
 describe('Process List - Pagination when adding processes', () => {
 

e2e/process-services/pagination-tasklist-addingTasks.e2e.ts

@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '@alfresco/adf-testing';
+import { LoginPage, PaginationPage } from '@alfresco/adf-testing';
-import { TasksPage } from '../pages/adf/process-services/tasksPage';
-import { PaginationPage } from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import CONSTANTS = require('../util/constants');
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
+import { browser } from 'protractor';
 import { AppsActions } from '../actions/APS/apps.actions';
 import { UsersActions } from '../actions/users.actions';
-import { browser } from 'protractor';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { TasksPage } from '../pages/adf/process-services/tasksPage';
+import CONSTANTS = require('../util/constants');
 
 describe('Items per page set to 15 and adding of tasks', () => {
 

e2e/process-services/processlist-pagination.e2e.ts

@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '@alfresco/adf-testing';
+import { LoginPage, PaginationPage } from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { PaginationPage } from '@alfresco/adf-testing';
-import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage';
-import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage';
-import { browser } from 'protractor';
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
+import { browser } from 'protractor';
 import { AppsActions } from '../actions/APS/apps.actions';
 import { UsersActions } from '../actions/users.actions';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage';
+import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage';
 
 describe('Process List - Pagination', () => {
 

e2e/process-services/sort-tasklist-pagination.e2e.ts

@@ -15,17 +15,15 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '@alfresco/adf-testing';
+import { LoginPage, PaginationPage } from '@alfresco/adf-testing';
-import { TasksPage } from '../pages/adf/process-services/tasksPage';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { PaginationPage } from '@alfresco/adf-testing';
-import CONSTANTS = require('../util/constants');
-import { browser } from 'protractor';
-import { Util } from '../util/util';
-
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
+import { browser } from 'protractor';
 import { AppsActions } from '../actions/APS/apps.actions';
 import { UsersActions } from '../actions/users.actions';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { TasksPage } from '../pages/adf/process-services/tasksPage';
+import { Util } from '../util/util';
+import CONSTANTS = require('../util/constants');
 
 describe('Task List Pagination - Sorting', () => {
 

e2e/process-services/start-process-component.e2e.ts

@@ -16,22 +16,21 @@
  */
 
 import CONSTANTS = require('../util/constants');
-import { LoginPage, StartProcessDialog, Widget, FileBrowserUtil } from '@alfresco/adf-testing';
+import { FileBrowserUtil, LoginPage, StartProcessDialog, StringUtil, Widget } from '@alfresco/adf-testing';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage';
-import { StartProcessPage } from '../pages/adf/process-services/startProcessPage';
-import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage';
-import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage';
-import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage';
-import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage';
-import { AppsActions } from '../actions/APS/apps.actions';
-import { browser } from 'protractor';
-import { User } from '../models/APS/user';
-import { Tenant } from '../models/APS/tenant';
-import { FileModel } from '../models/ACS/fileModel';
-import dateFormat = require('dateformat');
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
-import { StringUtil } from '@alfresco/adf-testing';
+import { browser } from 'protractor';
+import { AppsActions } from '../actions/APS/apps.actions';
+import { FileModel } from '../models/ACS/fileModel';
+import { Tenant } from '../models/APS/tenant';
+import { User } from '../models/APS/user';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage';
+import { ProcessDetailsPage } from '../pages/adf/process-services/processDetailsPage';
+import { ProcessFiltersPage } from '../pages/adf/process-services/processFiltersPage';
+import { ProcessServicesPage } from '../pages/adf/process-services/processServicesPage';
+import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage';
+import { StartProcessPage } from '../pages/adf/process-services/startProcessPage';
+import dateFormat = require('dateformat');
 
 describe('Start Process Component', () => {
 

e2e/process-services/start-task-custom-app.e2e.ts

@@ -15,20 +15,17 @@
  * limitations under the License.
  */
 
-import { by } from 'protractor';
-
 import { LoginPage } from '@alfresco/adf-testing';
-import { TasksPage } from '../pages/adf/process-services/tasksPage';
-import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage';
-import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { Tenant } from '../models/APS/tenant';
-import { FileModel } from '../models/ACS/fileModel';
-import { browser } from 'protractor';
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
+import { browser, by } from 'protractor';
 import { AppsActions } from '../actions/APS/apps.actions';
 import { UsersActions } from '../actions/users.actions';
-
+import { FileModel } from '../models/ACS/fileModel';
+import { Tenant } from '../models/APS/tenant';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage';
+import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage';
+import { TasksPage } from '../pages/adf/process-services/tasksPage';
 import CONSTANTS = require('../util/constants');
 
 describe('Start Task - Custom App', () => {

e2e/process-services/start-task-task-app.e2e.ts

@@ -15,21 +15,20 @@
  * limitations under the License.
  */
 
-import { by, browser } from 'protractor';
+import { LoginPage, StringUtil } from '@alfresco/adf-testing';
-import { LoginPage } from '@alfresco/adf-testing';
-import { TasksPage } from '../pages/adf/process-services/tasksPage';
-import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage';
-import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import CONSTANTS = require('../util/constants');
-import { Tenant } from '../models/APS/tenant';
-import { FileModel } from '../models/ACS/fileModel';
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
+import { browser, by } from 'protractor';
 import { UsersActions } from '../actions/users.actions';
-import { StringUtil } from '@alfresco/adf-testing';
+import { FileModel } from '../models/ACS/fileModel';
+import { Tenant } from '../models/APS/tenant';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { AttachmentListPage } from '../pages/adf/process-services/attachmentListPage';
+import { ChecklistDialog } from '../pages/adf/process-services/dialog/createChecklistDialog';
+import { ProcessServiceTabBarPage } from '../pages/adf/process-services/processServiceTabBarPage';
+import { TasksPage } from '../pages/adf/process-services/tasksPage';
+import CONSTANTS = require('../util/constants');
 import fs = require('fs');
 import path = require('path');
-import { ChecklistDialog } from '../pages/adf/process-services/dialog/createChecklistDialog';
 
 describe('Start Task - Task App', () => {
 

e2e/process-services/task-details-form.e2e.ts

@@ -15,21 +15,18 @@
  * limitations under the License.
  */
 
-import { browser } from 'protractor';
+import { LoginPage, StringUtil, Widget } from '@alfresco/adf-testing';
-import { StringUtil, Widget } from '@alfresco/adf-testing';
-import CONSTANTS = require('../util/constants');
-
-import { LoginPage } from '@alfresco/adf-testing';
-
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { TasksListPage } from '../pages/adf/process-services/tasksListPage';
-import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage';
-import { FiltersPage } from '../pages/adf/process-services/filtersPage';
-import { AppsActions } from '../actions/APS/apps.actions';
-import { StandaloneTask } from '../models/APS/standaloneTask';
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
-import { UsersActions } from '../actions/users.actions';
+import { browser } from 'protractor';
+import { AppsActions } from '../actions/APS/apps.actions';
 import { FormModelActions } from '../actions/APS/formModel.actions';
+import { UsersActions } from '../actions/users.actions';
+import { StandaloneTask } from '../models/APS/standaloneTask';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { FiltersPage } from '../pages/adf/process-services/filtersPage';
+import { TaskDetailsPage } from '../pages/adf/process-services/taskDetailsPage';
+import { TasksListPage } from '../pages/adf/process-services/tasksListPage';
+import CONSTANTS = require('../util/constants');
 
 describe('Task Details - Form', () => {
     const loginPage = new LoginPage();

e2e/process-services/task-list-pagination.e2e.ts

@@ -15,15 +15,14 @@
  * limitations under the License.
  */
 
-import { LoginPage } from '@alfresco/adf-testing';
+import { LoginPage, PaginationPage } from '@alfresco/adf-testing';
-import { TasksPage } from '../pages/adf/process-services/tasksPage';
-import { NavigationBarPage } from '../pages/adf/navigationBarPage';
-import { PaginationPage } from '@alfresco/adf-testing';
-import CONSTANTS = require('../util/constants');
-import { browser } from 'protractor';
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
+import { browser } from 'protractor';
 import { AppsActions } from '../actions/APS/apps.actions';
 import { UsersActions } from '../actions/users.actions';
+import { NavigationBarPage } from '../pages/adf/navigationBarPage';
+import { TasksPage } from '../pages/adf/process-services/tasksPage';
+import CONSTANTS = require('../util/constants');
 
 describe('Task List Pagination', () => {
 

e2e/search/components/search-date-range.e2e.ts

@@ -15,16 +15,14 @@
  * limitations under the License.
  */
 
-import { LoginPage, LocalStorageUtil, DatePickerPage, DateUtil } from '@alfresco/adf-testing';
+import { DataTableComponentPage, DatePickerPage, DateUtil, LocalStorageUtil, LoginPage } from '@alfresco/adf-testing';
-import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
-import { DataTableComponentPage } from '@alfresco/adf-testing';
-import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
-import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
-import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
-import { SearchConfiguration } from '../search.config';
-
 import { AlfrescoApiCompatibility as AlfrescoApi } from '@alfresco/js-api';
 import { browser } from 'protractor';
+import { SearchDialog } from '../../pages/adf/dialog/searchDialog';
+import { NavigationBarPage } from '../../pages/adf/navigationBarPage';
+import { SearchFiltersPage } from '../../pages/adf/searchFiltersPage';
+import { SearchResultsPage } from '../../pages/adf/searchResultsPage';
+import { SearchConfiguration } from '../search.config';
 
 describe('Search Date Range Filter', () => {
 

lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts

@@ -17,11 +17,10 @@
 
 import { MatDialog } from '@angular/material';
 import { EventEmitter, Injectable, Output } from '@angular/core';
-import { ContentService, ThumbnailService } from '@alfresco/adf-core';
+import { ContentService, ThumbnailService, SitesService, TranslationService, AllowableOperationsEnum } from '@alfresco/adf-core';
 import { Subject, Observable, throwError } from 'rxjs';
 import { ShareDataRow } from '../document-list/data/share-data-row.model';
 import { Node, NodeEntry, SitePaging } from '@alfresco/js-api';
-import { SitesService, TranslationService, AllowableOperationsEnum } from '@alfresco/adf-core';
 import { DocumentListService } from '../document-list/services/document-list.service';
 import { ContentNodeSelectorComponent } from './content-node-selector.component';
 import { ContentNodeSelectorComponentData } from './content-node-selector.component-data.interface';

lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts

@@ -18,13 +18,12 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, fakeAsync, tick, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { NodeEntry, Node, SiteEntry, SitePaging } from '@alfresco/js-api';
+import { NodeEntry, Node, SiteEntry, SitePaging, NodePaging } from '@alfresco/js-api';
 import { SearchService, SitesService, setupTestBed } from '@alfresco/adf-core';
 import { Observable, Observer, of, throwError } from 'rxjs';
 import { DropdownBreadcrumbComponent } from '../breadcrumb';
 import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel.component';
 import { ContentNodeSelectorService } from './content-node-selector.service';
-import { NodePaging } from '@alfresco/js-api';
 import { ContentTestingModule } from '../testing/content.testing.module';
 import { DocumentListService } from '../document-list/services/document-list.service';
 import { DocumentListComponent } from '../document-list/components/document-list.component';

lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts

@@ -16,8 +16,7 @@
  */
 
 import { MAT_DIALOG_DATA } from '@angular/material';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core';
-import { EventEmitter } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { ContentNodeSelectorComponent } from './content-node-selector.component';
 import { Node } from '@alfresco/js-api';

lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts

@@ -25,10 +25,10 @@ import {
     NodesApiService,
     NotificationService,
     RenditionsService,
-    AppConfigService
+    AppConfigService,
+    CoreModule,
+    AppConfigServiceMock
 } from '@alfresco/adf-core';
-import { CoreModule, AppConfigServiceMock } from '@alfresco/adf-core';
-
 import { ContentNodeShareModule } from './content-node-share.module';
 import { ShareDialogComponent } from './content-node-share.dialog';
 import moment from 'moment-es6';

lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts

@@ -16,9 +16,8 @@
  */
 
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TestBed } from '@angular/core/testing';
+import { TestBed, ComponentFixture } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { ComponentFixture } from '@angular/core/testing';
 import { Component } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
 import { ContentTestingModule } from '../testing/content.testing.module';

lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import { TestBed } from '@angular/core/testing';
+import { TestBed, ComponentFixture } from '@angular/core/testing';
-import { ComponentFixture } from '@angular/core/testing';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
 import { setupTestBed } from '@alfresco/adf-core';
 import { ConfirmDialogComponent } from './confirm.dialog';

lib/content-services/src/lib/dialogs/folder.dialog.spec.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import { TestBed } from '@angular/core/testing';
+import { TestBed, async, ComponentFixture } from '@angular/core/testing';
-import { async, ComponentFixture } from '@angular/core/testing';
 import { MatDialogRef } from '@angular/material';
 import { NodesApiService, setupTestBed } from '@alfresco/adf-core';
 import { FolderDialogComponent } from './folder.dialog';

lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts

@@ -17,12 +17,12 @@
 
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ReactiveFormsModule } from '@angular/forms';
-import { CoreModule } from '@alfresco/adf-core';
 import { LibraryDialogComponent } from './library.dialog';
 import { TestBed, fakeAsync, tick, flush } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { MatDialogRef } from '@angular/material';
 import {
+    CoreModule,
     AlfrescoApiService,
     AlfrescoApiServiceMock,
     setupTestBed

lib/content-services/src/lib/dialogs/node-lock.dialog.spec.ts

@@ -17,8 +17,7 @@
 
 import moment from 'moment-es6';
 
-import { TestBed, fakeAsync, tick } from '@angular/core/testing';
+import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing';
-import { ComponentFixture } from '@angular/core/testing';
 import { MatDialogRef } from '@angular/material';
 import { AlfrescoApiService, setupTestBed } from '@alfresco/adf-core';
 import { NodeBodyLock } from '@alfresco/js-api';

lib/content-services/src/lib/document-list/components/content-action/content-action.component.spec.ts

@@ -15,19 +15,17 @@
  * limitations under the License.
  */
 
-import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange, EventEmitter } from '@angular/core';
-import { EventEmitter } from '@angular/core';
 import { async, TestBed } from '@angular/core/testing';
 import { ContentService, setupTestBed } from '@alfresco/adf-core';
 import { FileNode } from '../../../mock';
-import { ContentActionHandler } from './../../models/content-action.model';
+import { ContentActionHandler, ContentActionModel } from './../../models/content-action.model';
 import { DocumentActionsService } from './../../services/document-actions.service';
 import { FolderActionsService } from './../../services/folder-actions.service';
 import { NodeActionsService } from './../../services/node-actions.service';
 import { DocumentListComponent } from './../document-list.component';
 import { ContentActionListComponent } from './content-action-list.component';
 import { ContentActionComponent } from './content-action.component';
-import { ContentActionModel } from './../../models/content-action.model';
 import { ContentTestingModule } from '../../../testing/content.testing.module';
 
 describe('ContentAction', () => {

lib/content-services/src/lib/document-list/components/content-column/content-column-list.component.spec.ts

@@ -17,8 +17,7 @@
 
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { DataColumn, setupTestBed } from '@alfresco/adf-core';
+import { DataColumn, setupTestBed, LogService } from '@alfresco/adf-core';
-import { LogService } from '@alfresco/adf-core';
 import { DocumentListComponent } from './../document-list.component';
 import { ContentColumnListComponent } from './content-column-list.component';
 import { ContentTestingModule } from '../../../testing/content.testing.module';

lib/content-services/src/lib/document-list/components/content-column/content-column-list.component.ts

@@ -17,8 +17,7 @@
 
  /* tslint:disable:component-selector  */
 
-import { DataColumn } from '@alfresco/adf-core';
+import { DataColumn, LogService } from '@alfresco/adf-core';
-import { LogService } from '@alfresco/adf-core';
 import { Component } from '@angular/core';
 
 import { DocumentListComponent } from './../document-list.component';

lib/content-services/src/lib/document-list/components/document-list.component.spec.ts

@@ -17,11 +17,10 @@
 
 import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange, QueryList } from '@angular/core';
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
-import { AlfrescoApiService, DataColumnListComponent, DataColumnComponent } from '@alfresco/adf-core';
+import { setupTestBed, AlfrescoApiService, DataColumnListComponent, DataColumnComponent, DataColumn, DataTableComponent } from '@alfresco/adf-core';
-import { DataColumn, DataTableComponent } from '@alfresco/adf-core';
 import { Subject, of, throwError } from 'rxjs';
-import { FileNode, FolderNode } from '../../mock';
 import {
+    FileNode, FolderNode,
     fakeNodeAnswerWithNOEntries,
     fakeNodeWithNoPermission,
     fakeGetSitesAnswer,
@@ -35,7 +34,6 @@ import { RowFilter } from './../data/row-filter.model';
 import { DocumentListService } from './../services/document-list.service';
 import { CustomResourcesService } from './../services/custom-resources.service';
 import { DocumentListComponent } from './document-list.component';
-import { setupTestBed } from '@alfresco/adf-core';
 import { ContentTestingModule } from '../../testing/content.testing.module';
 import { NodeEntry } from '@alfresco/js-api';
 import { By } from '@angular/platform-browser';

lib/content-services/src/lib/search/components/search-control.component.spec.ts

@@ -24,9 +24,9 @@ import {
     setupTestBed,
     CoreModule,
     UserPreferencesService,
-    SearchTextInputComponent
+    SearchTextInputComponent,
+    ThumbnailService
 } from '@alfresco/adf-core';
-import { ThumbnailService } from '@alfresco/adf-core';
 import { noResult, results } from '../../mock';
 import { SearchControlComponent } from './search-control.component';
 import { SearchComponent } from './search.component';

lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts

@@ -18,14 +18,13 @@
 import { OnInit, Component, ViewEncapsulation, OnDestroy } from '@angular/core';
 import { FormControl, Validators, FormGroup } from '@angular/forms';
 import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE } from '@angular/material/core';
-import { MomentDateAdapter, MOMENT_DATE_FORMATS } from '@alfresco/adf-core';
+import { MomentDateAdapter, MOMENT_DATE_FORMATS, UserPreferencesService, UserPreferenceValues } from '@alfresco/adf-core';
 
 import { SearchWidget } from '../../search-widget.interface';
 import { SearchWidgetSettings } from '../../search-widget-settings.interface';
 import { SearchQueryBuilderService } from '../../search-query-builder.service';
 import { LiveErrorStateMatcher } from '../../forms/live-error-state-matcher';
 import { Moment } from 'moment';
-import { UserPreferencesService, UserPreferenceValues } from '@alfresco/adf-core';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
 

lib/content-services/src/lib/upload/components/base-upload/upload-base.spec.ts

@@ -17,9 +17,8 @@
 
 import { Component, NgZone } from '@angular/core';
 import { ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
-import { TranslationService, UploadService, setupTestBed, CoreModule, FileModel } from '@alfresco/adf-core';
+import { TranslationService, UploadService, setupTestBed, CoreModule, FileModel, TranslationMock } from '@alfresco/adf-core';
 import { UploadBase } from './upload-base';
-import { TranslationMock } from '@alfresco/adf-core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { UploadFilesEvent } from '../upload-files.event';
 

lib/content-services/src/lib/upload/components/base-upload/upload-base.ts

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-import { FileModel, FileInfo } from '@alfresco/adf-core';
+import { FileModel, FileInfo, UploadService, TranslationService } from '@alfresco/adf-core';
 import { EventEmitter, Input, Output, OnInit, OnDestroy, NgZone } from '@angular/core';
-import { UploadService, TranslationService } from '@alfresco/adf-core';
 import { Subject } from 'rxjs';
 import { UploadFilesEvent } from '../upload-files.event';
 import { takeUntil } from 'rxjs/operators';

lib/content-services/src/lib/upload/components/upload-button.component.spec.ts

@@ -17,10 +17,9 @@
 
 import { SimpleChange } from '@angular/core';
 import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { ContentService, UploadService, TranslationService, setupTestBed, CoreModule } from '@alfresco/adf-core';
+import { ContentService, UploadService, TranslationService, setupTestBed, CoreModule, TranslationMock } from '@alfresco/adf-core';
 import { of, throwError } from 'rxjs';
 import { UploadButtonComponent } from './upload-button.component';
-import { TranslationMock } from '@alfresco/adf-core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { NodeEntry } from '@alfresco/js-api';
 

lib/content-services/src/lib/upload/components/upload-version-button.component.ts

@@ -15,11 +15,10 @@
  * limitations under the License.
  */
 
-import { AllowableOperationsEnum  } from '@alfresco/adf-core';
+import { AllowableOperationsEnum, FileModel, EXTENDIBLE_COMPONENT } from '@alfresco/adf-core';
 import { Component, forwardRef, Input, OnChanges, ViewEncapsulation, OnInit } from '@angular/core';
 import { Node } from '@alfresco/js-api';
 import { UploadButtonComponent } from './upload-button.component';
-import { FileModel, EXTENDIBLE_COMPONENT } from '@alfresco/adf-core';
 
 @Component({
     selector: 'adf-upload-version-button',

lib/content-services/src/lib/webscript/webscript.component.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import { ObjectDataTableAdapter } from '@alfresco/adf-core';
+import { ObjectDataTableAdapter, AlfrescoApiService, LogService } from '@alfresco/adf-core';
-import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
 import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
 
 /**

lib/core/card-view/models/card-view-baseitem.model.spec.ts

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-import { CardViewItemProperties } from '../interfaces/card-view.interfaces';
+import { CardViewItemProperties, CardViewItemValidator } from '../interfaces/card-view.interfaces';
 import { CardViewBaseItemModel } from './card-view-baseitem.model';
-import { CardViewItemValidator } from '../interfaces/card-view.interfaces';
 
 class CarViewCustomItemModel extends CardViewBaseItemModel {}
 

lib/core/comments/comments.component.spec.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core';
-import { SimpleChange } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { of, throwError } from 'rxjs';
 import { CommentProcessService } from '../services/comment-process.service';

lib/core/dialogs/download-zip/download-zip.dialog.spec.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import { TestBed } from '@angular/core/testing';
+import { TestBed, ComponentFixture } from '@angular/core/testing';
-import { ComponentFixture } from '@angular/core/testing';
 import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
 import { DownloadZipDialogComponent } from './download-zip.dialog';
 import { setupTestBed } from '../../testing/setupTestBed';

lib/core/services/alfresco-api.service.ts

@@ -21,9 +21,9 @@ import {
     Core,
     Activiti,
     SearchApi,
-    Node
+    Node,
+    AlfrescoApiCompatibility, AlfrescoApiConfig
 } from '@alfresco/js-api';
-import { AlfrescoApiCompatibility, AlfrescoApiConfig } from '@alfresco/js-api';
 import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
 import { Subject, Observable } from 'rxjs';
 import { OauthConfigModel } from '../models/oauth-config.model';

lib/core/services/discovery-api.service.ts

@@ -16,11 +16,10 @@
  */
 
 import { Injectable } from '@angular/core';
-import { from, throwError } from 'rxjs';
+import { from, throwError, Observable } from 'rxjs';
 import { BpmProductVersionModel, EcmProductVersionModel } from '../models/product-version.model';
 import { AlfrescoApiService } from './alfresco-api.service';
 import { map, catchError } from 'rxjs/operators';
-import { Observable } from 'rxjs';
 
 @Injectable({
     providedIn: 'root'

lib/core/services/identity-group.service.spec.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import { async } from '@angular/core/testing';
+import { async, TestBed } from '@angular/core/testing';
-import { TestBed } from '@angular/core/testing';
 import {
     AlfrescoApiServiceMock,
     CoreModule,

lib/core/viewer/components/txtViewer.component.ts

@@ -16,8 +16,7 @@
  */
 
 import { HttpClient } from '@angular/common/http';
-import { Component, Input, OnChanges, ViewEncapsulation } from '@angular/core';
+import { Component, Input, OnChanges, ViewEncapsulation, SimpleChanges } from '@angular/core';
-import { SimpleChanges } from '@angular/core';
 import { AppConfigService } from './../../app-config/app-config.service';
 
 @Component({

lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.ts

@@ -18,8 +18,7 @@
 import { Injectable } from '@angular/core';
 import { Observable, from, throwError, of } from 'rxjs';
 import { map, catchError } from 'rxjs/operators';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService, AppConfigService, LogService } from '@alfresco/adf-core';
-import { AppConfigService, LogService } from '@alfresco/adf-core';
 import { Oauth2Auth } from '@alfresco/js-api';
 import { ApplicationInstanceModel } from '../models/application-instance.model';
 

lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts

@@ -19,9 +19,8 @@ import {
     Component, EventEmitter, Input, OnChanges,
     Output, SimpleChanges, OnDestroy
 } from '@angular/core';
-import { Observable, of, forkJoin, Subject } from 'rxjs';
+import { Observable, of, forkJoin, Subject, Subscription } from 'rxjs';
 import { switchMap, takeUntil, map } from 'rxjs/operators';
-import { Subscription } from 'rxjs';
 import {
     FormBaseComponent,
     FormFieldModel,

lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.ts

@@ -15,8 +15,7 @@
  * limitations under the License.
  */
 
-import { Component, Inject } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
-import { OnInit } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
 import { FormBuilder, FormGroup, AbstractControl, Validators } from '@angular/forms';
 

lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts

@@ -17,8 +17,7 @@
 import { Component, SimpleChange, ViewChild } from '@angular/core';
 import { ComponentFixture, TestBed, async } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { AppConfigService, setupTestBed, CoreModule, DataTableModule } from '@alfresco/adf-core';
+import { AppConfigService, setupTestBed, CoreModule, DataTableModule, DataRowEvent, ObjectDataRow } from '@alfresco/adf-core';
-import { DataRowEvent, ObjectDataRow } from '@alfresco/adf-core';
 import { ProcessListCloudService } from '../services/process-list-cloud.service';
 import { ProcessListCloudComponent } from './process-list-cloud.component';
 import { fakeProcessCloudList, fakeCustomSchema } from '../mock/process-list-service.mock';

lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.spec.ts

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 import { async } from '@angular/core/testing';
-import { setupTestBed, StorageService } from '@alfresco/adf-core';
+import { setupTestBed, StorageService, AlfrescoApiServiceMock, LogService, AppConfigService, CoreModule } from '@alfresco/adf-core';
 import { fakeProcessCloudList } from '../mock/process-list-service.mock';
-import { AlfrescoApiServiceMock, LogService, AppConfigService, CoreModule } from '@alfresco/adf-core';
 import { ProcessListCloudService } from './process-list-cloud.service';
 import { ProcessQueryCloudRequestModel } from '../models/process-cloud-query-request.model';