From 3dd43ce9b59d77c5d6b0706176093a9161968950 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 15 Nov 2019 13:38:01 +0000 Subject: [PATCH] [ADF-4997] no-duplicate-imports rule (#5256) * no-duplicate-imports rule * no-duplicate-imports rule --- demo-shell/src/app/app.module.ts | 6 ++-- .../copy-content/datatable.component.ts | 3 +- .../name-column/name-column.component.ts | 3 +- .../app/components/files/files.component.ts | 3 +- ...ersion-manager-dialog-adapter.component.ts | 4 +-- .../app/components/form/fake-form.service.ts | 3 +- .../process-attachments.component.ts | 4 +-- .../process-service.component.ts | 9 ++---- .../search/search-extended.component.ts | 3 +- demo-shell/src/polyfills.ts | 2 -- .../create-library-directive.e2e.ts | 4 +-- .../trashcan-pagination.e2e.ts | 16 ++++------ .../version/version-actions.e2e.ts | 12 ++++---- e2e/core/card-view/card-view-component.e2e.ts | 11 +++---- .../data-table-component-selection.e2e.ts | 10 +++---- .../datatable/data-table-component.e2e.ts | 11 ++++--- e2e/core/header-component.e2e.ts | 9 ++---- e2e/core/infinite-scrolling.e2e.ts | 14 ++++----- e2e/core/login/login-component.e2e.ts | 18 ++++-------- e2e/core/pagination-empty-current-page.e2e.ts | 14 ++++----- e2e/core/settings-component.e2e.ts | 7 ++--- e2e/core/user-info-component-cloud.e2e.ts | 4 +-- e2e/core/user-info-component.e2e.ts | 11 ++++--- e2e/pages/adf/commentsPage.ts | 6 ++-- e2e/pages/adf/contentServicesPage.ts | 11 ++++--- e2e/pages/adf/demo-shell/customSourcesPage.ts | 5 ++-- e2e/pages/adf/demo-shell/dataTablePage.ts | 3 +- .../process-services/processCloudDemoPage.ts | 10 ++----- .../process-services/processListDemoPage.ts | 5 ++-- .../process-services/taskListDemoPage.ts | 5 ++-- e2e/pages/adf/navigationBarPage.ts | 5 ++-- e2e/pages/adf/permissionsPage.ts | 6 ++-- e2e/pages/adf/process-services/filtersPage.ts | 3 +- .../process-services/processFiltersPage.ts | 5 ++-- .../adf/process-services/taskDetailsPage.ts | 5 ++-- .../adf/process-services/tasksListPage.ts | 3 +- e2e/pages/adf/searchFiltersPage.ts | 12 ++------ e2e/pages/adf/searchResultsPage.ts | 5 ++-- e2e/pages/adf/versionManagerPage.ts | 3 +- .../apps-section-cloud.e2e.ts | 9 +----- .../edit-process-filters-component.e2e.ts | 7 ++--- .../form-field/dropdown-widget.e2e.ts | 21 ++++---------- .../people-group-cloud-component.e2e.ts | 7 ++--- ...people-group-cloud-filter-component.e2e.ts | 7 ++--- .../process-custom-filters.e2e.ts | 12 +++----- .../process-filter-results.e2e.ts | 14 ++++----- .../process-filters-cloud.e2e.ts | 14 ++------- .../process-header-cloud.e2e.ts | 20 +++---------- .../process-list-cloud-action-menu.e2e.ts | 7 ++--- .../process-list-cloud-component.e2e.ts | 10 +------ .../process-list-selection-cloud.e2e.ts | 7 ++--- .../start-process-cloud.e2e.ts | 6 ++-- .../task-header-cloud.e2e.ts | 7 ++--- .../task-list-cloud-action-menu.e2e.ts | 8 ++--- .../task-list-selection.e2e.ts | 7 ++--- .../tasks-custom-filters.e2e.ts | 4 +-- .../attach-form-component.e2e.ts | 18 +++++------- .../custom-tasks-filters.e2e.ts | 15 +++++----- ...ination-processlist-addingProcesses.e2e.ts | 11 ++++--- .../pagination-tasklist-addingTasks.e2e.ts | 11 ++++--- .../processlist-pagination.e2e.ts | 11 ++++--- .../sort-tasklist-pagination.e2e.ts | 14 ++++----- .../start-process-component.e2e.ts | 29 +++++++++---------- .../start-task-custom-app.e2e.ts | 17 +++++------ .../start-task-task-app.e2e.ts | 21 +++++++------- e2e/process-services/task-details-form.e2e.ts | 23 +++++++-------- .../task-list-pagination.e2e.ts | 11 ++++--- .../components/search-date-range.e2e.ts | 14 ++++----- .../content-node-dialog.service.ts | 3 +- ...tent-node-selector-panel.component.spec.ts | 3 +- .../content-node-selector.component.spec.ts | 3 +- .../content-node-share.dialog.spec.ts | 6 ++-- .../content-node-share.directive.spec.ts | 3 +- .../src/lib/dialogs/confirm.dialog.spec.ts | 3 +- .../src/lib/dialogs/folder.dialog.spec.ts | 3 +- .../dialogs/library/library.dialog.spec.ts | 2 +- .../src/lib/dialogs/node-lock.dialog.spec.ts | 3 +- .../content-action.component.spec.ts | 6 ++-- .../content-column-list.component.spec.ts | 3 +- .../content-column-list.component.ts | 3 +- .../document-list.component.spec.ts | 6 ++-- .../search-control.component.spec.ts | 4 +-- .../search-date-range.component.ts | 3 +- .../base-upload/upload-base.spec.ts | 3 +- .../components/base-upload/upload-base.ts | 3 +- .../upload-button.component.spec.ts | 3 +- .../upload-version-button.component.ts | 3 +- .../src/lib/webscript/webscript.component.ts | 3 +- .../models/card-view-baseitem.model.spec.ts | 3 +- lib/core/comments/comments.component.spec.ts | 3 +- .../download-zip/download-zip.dialog.spec.ts | 3 +- lib/core/services/alfresco-api.service.ts | 4 +-- lib/core/services/discovery-api.service.ts | 3 +- .../services/identity-group.service.spec.ts | 3 +- .../viewer/components/txtViewer.component.ts | 3 +- .../services/apps-process-cloud.service.ts | 3 +- .../form/components/form-cloud.component.ts | 3 +- .../process-filter-dialog-cloud.component.ts | 3 +- .../process-list-cloud.component.spec.ts | 3 +- .../process-list-cloud.service.spec.ts | 3 +- .../start-process-cloud.service.spec.ts | 2 +- .../task/services/task-cloud.service.spec.ts | 3 +- .../start-task-cloud.component.spec.ts | 2 +- .../components/start-task-cloud.component.ts | 2 +- .../services/start-task-cloud.service.spec.ts | 2 +- .../task-filter-dialog-cloud.component.ts | 3 +- .../task-list-cloud.component.spec.ts | 3 +- .../services/task-list-cloud.service.spec.ts | 3 +- .../select-apps-dialog-component.spec.ts | 6 ++-- .../process-attachment-list.component.ts | 3 +- .../task-attachment-list.component.ts | 3 +- .../form/form.component.visibility.spec.ts | 3 +- .../src/lib/form/start-form.component.spec.ts | 7 +++-- .../people-list/people-list.component.spec.ts | 3 +- .../people-list/people-list.component.ts | 3 +- .../people/people.component.spec.ts | 3 +- .../components/people/people.component.ts | 3 +- .../process-filters.component.spec.ts | 3 +- .../components/process-list.component.spec.ts | 12 ++++---- .../components/process-list.component.ts | 4 +-- .../services/process.service.spec.ts | 3 +- .../components/start-task.component.ts | 6 ++-- .../components/task-details.component.spec.ts | 10 +++---- .../components/task-details.component.ts | 8 ++--- .../components/task-header.component.spec.ts | 3 +- .../components/task-list.component.spec.ts | 3 +- .../components/task-list.component.ts | 2 +- .../services/tasklist.service.spec.ts | 3 +- .../dialog/download-dialog.page.ts | 3 +- .../pages/search/search-radio.page.ts | 3 +- lib/testing/src/lib/core/pages/error.page.ts | 3 +- .../src/lib/core/pages/form/formFields.ts | 3 +- .../pages/form/widgets/attachFileWidget.ts | 3 +- .../core/pages/form/widgets/checkboxWidget.ts | 3 +- lib/testing/src/lib/core/pages/header.page.ts | 3 +- lib/testing/src/lib/core/pages/login.page.ts | 3 +- .../core/pages/notification-history.page.ts | 3 +- .../src/lib/core/pages/pagination.page.ts | 3 +- .../src/lib/core/pages/user-info.page.ts | 3 +- .../app/app-list-cloud.page.ts | 3 +- .../dialog/edit-process-filter-dialog.page.ts | 4 +-- .../dialog/edit-task-filter-dialog.page.ts | 3 +- ...dit-process-filter-cloud-component.page.ts | 3 +- .../edit-task-filter-cloud-component.page.ts | 3 +- .../process-header-cloud-component.page.ts | 3 +- .../pages/start-tasks-cloud-component.page.ts | 3 +- .../pages/task-form-cloud-component.page.ts | 3 +- .../pages/task-header-cloud-component.page.ts | 3 +- tslint.json | 1 + 149 files changed, 336 insertions(+), 578 deletions(-) diff --git a/demo-shell/src/app/app.module.ts b/demo-shell/src/app/app.module.ts index 6e18f28faf..a53a2bc8ba 100644 --- a/demo-shell/src/app/app.module.ts +++ b/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 diff --git a/demo-shell/src/app/components/datatable/copy-content/datatable.component.ts b/demo-shell/src/app/components/datatable/copy-content/datatable.component.ts index 64195a2dfc..9b486aa3ab 100644 --- a/demo-shell/src/app/components/datatable/copy-content/datatable.component.ts +++ b/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 { ObjectDataTableAdapter } from '@alfresco/adf-core'; +import { DataColumn, DataRow, ObjectDataTableAdapter } from '@alfresco/adf-core'; export class FilteredDataAdapter extends ObjectDataTableAdapter { diff --git a/demo-shell/src/app/components/document-list/extension-presets/name-column/name-column.component.ts b/demo-shell/src/app/components/document-list/extension-presets/name-column/name-column.component.ts index bed4b8e57a..11dba7b150 100644 --- a/demo-shell/src/app/components/document-list/extension-presets/name-column/name-column.component.ts +++ b/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({ diff --git a/demo-shell/src/app/components/files/files.component.ts b/demo-shell/src/app/components/files/files.component.ts index d21a0585fd..75fe779793 100644 --- a/demo-shell/src/app/components/files/files.component.ts +++ b/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-'; diff --git a/demo-shell/src/app/components/files/version-manager-dialog-adapter.component.ts b/demo-shell/src/app/components/files/version-manager-dialog-adapter.component.ts index 0c8e1d1633..9b76047d7b 100644 --- a/demo-shell/src/app/components/files/version-manager-dialog-adapter.component.ts +++ b/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', diff --git a/demo-shell/src/app/components/form/fake-form.service.ts b/demo-shell/src/app/components/form/fake-form.service.ts index 8d10f34b44..7a7edcd1bc 100644 --- a/demo-shell/src/app/components/form/fake-form.service.ts +++ b/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 { diff --git a/demo-shell/src/app/components/process-service/process-attachments.component.ts b/demo-shell/src/app/components/process-service/process-attachments.component.ts index f79897f07a..06dd45dce5 100644 --- a/demo-shell/src/app/components/process-service/process-attachments.component.ts +++ b/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 { AlfrescoApiService } from '@alfresco/adf-core'; -import { AppConfigService } from '@alfresco/adf-core'; +import { UploadService, AlfrescoApiService, AppConfigService } from '@alfresco/adf-core'; import { PreviewService } from '../../services/preview.service'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/demo-shell/src/app/components/process-service/process-service.component.ts b/demo-shell/src/app/components/process-service/process-service.component.ts index 5db7949503..b80519620a 100644 --- a/demo-shell/src/app/components/process-service/process-service.component.ts +++ b/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 -} from '@alfresco/adf-process-services'; -import { + StartProcessInstanceComponent, 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'; diff --git a/demo-shell/src/app/components/search/search-extended.component.ts b/demo-shell/src/app/components/search/search-extended.component.ts index 307e5ce9db..ff970a954c 100644 --- a/demo-shell/src/app/components/search/search-extended.component.ts +++ b/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 { SearchService, SearchConfigurationService } from '@alfresco/adf-core'; +import { ThumbnailService, SearchService, SearchConfigurationService } from '@alfresco/adf-core'; import { TestSearchConfigurationService } from './search-config-test.service'; @Component({ diff --git a/demo-shell/src/polyfills.ts b/demo-shell/src/polyfills.ts index 31808e229d..7390a29620 100644 --- a/demo-shell/src/polyfills.ts +++ b/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'; /*************************************************************************************************** diff --git a/e2e/content-services/directives/create-library-directive.e2e.ts b/e2e/content-services/directives/create-library-directive.e2e.ts index de174e3153..6c71c9277b 100644 --- a/e2e/content-services/directives/create-library-directive.e2e.ts +++ b/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', () => { diff --git a/e2e/content-services/trashcan-pagination.e2e.ts b/e2e/content-services/trashcan-pagination.e2e.ts index d368f46d5d..0a3e9c146e 100644 --- a/e2e/content-services/trashcan-pagination.e2e.ts +++ b/e2e/content-services/trashcan-pagination.e2e.ts @@ -15,21 +15,15 @@ * limitations under the License. */ -import { LoginPage } from '@alfresco/adf-testing'; -import { TrashcanPage } from '../pages/adf/trashcanPage'; - -import { PaginationPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; - +import { LoginPage, PaginationPage, 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 { 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', diff --git a/e2e/content-services/version/version-actions.e2e.ts b/e2e/content-services/version/version-actions.e2e.ts index b617e34028..2d44604ec6 100644 --- a/e2e/content-services/version/version-actions.e2e.ts +++ b/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 { UploadActions } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { BrowserVisibility, FileBrowserUtil, BrowserActions } from '@alfresco/adf-testing'; +import { ContentServicesPage } from '../../pages/adf/contentServicesPage'; import { UploadDialog } from '../../pages/adf/dialog/uploadDialog'; +import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; +import { VersionManagePage } from '../../pages/adf/versionManagerPage'; describe('Version component actions', () => { diff --git a/e2e/core/card-view/card-view-component.e2e.ts b/e2e/core/card-view/card-view-component.e2e.ts index 209aac8fa4..0be4a72175 100644 --- a/e2e/core/card-view/card-view-component.e2e.ts +++ b/e2e/core/card-view/card-view-component.e2e.ts @@ -15,14 +15,11 @@ * limitations under the License. */ -import { element, by, browser } from 'protractor'; - -import { LoginPage } from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../../pages/adf/navigationBarPage'; -import { MetadataViewPage } from '../../pages/adf/metadataViewPage'; - +import { BrowserVisibility, LoginPage } from '@alfresco/adf-testing'; +import { browser, by, element } from 'protractor'; 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(); diff --git a/e2e/core/datatable/data-table-component-selection.e2e.ts b/e2e/core/datatable/data-table-component-selection.e2e.ts index 4076a90575..2e20c6c446 100644 --- a/e2e/core/datatable/data-table-component-selection.e2e.ts +++ b/e2e/core/datatable/data-table-component-selection.e2e.ts @@ -15,13 +15,11 @@ * limitations under the License. */ -import { 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 { DataTableComponentPage, LoginPage } from '@alfresco/adf-testing'; 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', () => { diff --git a/e2e/core/datatable/data-table-component.e2e.ts b/e2e/core/datatable/data-table-component.e2e.ts index 2f89cea625..36929dc642 100644 --- a/e2e/core/datatable/data-table-component.e2e.ts +++ b/e2e/core/datatable/data-table-component.e2e.ts @@ -15,15 +15,14 @@ * limitations under the License. */ -import { 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 { DataTableComponentPage, LoginPage, NotificationHistoryPage } from '@alfresco/adf-testing'; 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', () => { diff --git a/e2e/core/header-component.e2e.ts b/e2e/core/header-component.e2e.ts index 3b579646ab..3f4301dfc9 100644 --- a/e2e/core/header-component.e2e.ts +++ b/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 { NavigationBarPage } from '../pages/adf/navigationBarPage'; - -import { HeaderPage, SettingsPage } from '@alfresco/adf-testing'; -import { browser } from 'protractor'; - +import { HeaderPage, LoginPage, SettingsPage } from '@alfresco/adf-testing'; 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', () => { diff --git a/e2e/core/infinite-scrolling.e2e.ts b/e2e/core/infinite-scrolling.e2e.ts index 86e90277b2..f222add806 100644 --- a/e2e/core/infinite-scrolling.e2e.ts +++ b/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(); diff --git a/e2e/core/login/login-component.e2e.ts b/e2e/core/login/login-component.e2e.ts index a41cf0a167..89e4debb36 100644 --- a/e2e/core/login/login-component.e2e.ts +++ b/e2e/core/login/login-component.e2e.ts @@ -15,19 +15,13 @@ * limitations under the License. */ -import { browser } from 'protractor'; - -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 { BrowserActions, ErrorPage, LoginPage, SettingsPage, UserInfoPage } from '@alfresco/adf-testing'; 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', () => { diff --git a/e2e/core/pagination-empty-current-page.e2e.ts b/e2e/core/pagination-empty-current-page.e2e.ts index 990ec83737..4083dd6e03 100644 --- a/e2e/core/pagination-empty-current-page.e2e.ts +++ b/e2e/core/pagination-empty-current-page.e2e.ts @@ -15,16 +15,14 @@ * limitations under the License. */ -import { LoginPage, 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 { LoginPage, PaginationPage, UploadActions, ViewerPage } from '@alfresco/adf-testing'; 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', () => { diff --git a/e2e/core/settings-component.e2e.ts b/e2e/core/settings-component.e2e.ts index bc6fd7f4b9..78a02f3df2 100644 --- a/e2e/core/settings-component.e2e.ts +++ b/e2e/core/settings-component.e2e.ts @@ -15,13 +15,12 @@ * limitations under the License. */ -import { LoginPage, SettingsPage, BrowserActions } from '@alfresco/adf-testing'; -import { protractor } from 'protractor'; +import { BrowserActions, LoginPage, SettingsPage } from '@alfresco/adf-testing'; +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', () => { diff --git a/e2e/core/user-info-component-cloud.e2e.ts b/e2e/core/user-info-component-cloud.e2e.ts index 8a144a10d6..954dd38e52 100644 --- a/e2e/core/user-info-component-cloud.e2e.ts +++ b/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', () => { diff --git a/e2e/core/user-info-component.e2e.ts b/e2e/core/user-info-component.e2e.ts index 60360cf0b4..86dc41247a 100644 --- a/e2e/core/user-info-component.e2e.ts +++ b/e2e/core/user-info-component.e2e.ts @@ -15,15 +15,14 @@ * limitations under the License. */ -import { LoginPage } from '@alfresco/adf-testing'; -import { UserInfoPage } from '@alfresco/adf-testing'; +import { LoginPage, 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', () => { diff --git a/e2e/pages/adf/commentsPage.ts b/e2e/pages/adf/commentsPage.ts index d1ab8950a9..e7d5dd46d7 100644 --- a/e2e/pages/adf/commentsPage.ts +++ b/e2e/pages/adf/commentsPage.ts @@ -15,10 +15,8 @@ * limitations under the License. */ -import { element, by, ElementFinder, ElementArrayFinder } from 'protractor'; - -import { TabsPage } from '@alfresco/adf-testing'; -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; +import { BrowserActions, BrowserVisibility, TabsPage } from '@alfresco/adf-testing'; +import { by, element, ElementArrayFinder, ElementFinder } from 'protractor'; export class CommentsPage { diff --git a/e2e/pages/adf/contentServicesPage.ts b/e2e/pages/adf/contentServicesPage.ts index 668dd614c7..04c92c686a 100644 --- a/e2e/pages/adf/contentServicesPage.ts +++ b/e2e/pages/adf/contentServicesPage.ts @@ -15,15 +15,14 @@ * limitations under the License. */ -import { FolderDialog } from './dialog/folderDialog'; -import { CreateLibraryDialog } from './dialog/createLibraryDialog'; -import { FormControllersPage } from '@alfresco/adf-testing'; +import { BrowserActions, BrowserVisibility, DateUtil, DocumentListPage, FormControllersPage } from '@alfresco/adf-testing'; +import { $$, browser, by, element, ElementFinder, protractor } from 'protractor'; 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 { diff --git a/e2e/pages/adf/demo-shell/customSourcesPage.ts b/e2e/pages/adf/demo-shell/customSourcesPage.ts index 8e0706ca5c..bc9542fadb 100644 --- a/e2e/pages/adf/demo-shell/customSourcesPage.ts +++ b/e2e/pages/adf/demo-shell/customSourcesPage.ts @@ -15,9 +15,8 @@ * limitations under the License. */ -import { BrowserVisibility } from '@alfresco/adf-testing'; -import { element, by, ElementFinder } from 'protractor'; -import { DataTableComponentPage, BrowserActions } from '@alfresco/adf-testing'; +import { BrowserActions, BrowserVisibility, DataTableComponentPage } from '@alfresco/adf-testing'; +import { by, element, ElementFinder } from 'protractor'; import { NavigationBarPage } from '../navigationBarPage'; const source = { diff --git a/e2e/pages/adf/demo-shell/dataTablePage.ts b/e2e/pages/adf/demo-shell/dataTablePage.ts index 37a5ed0345..7fab5e5b90 100644 --- a/e2e/pages/adf/demo-shell/dataTablePage.ts +++ b/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 { diff --git a/e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts index e71637e930..b5df0b48a6 100644 --- a/e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts +++ b/e2e/pages/adf/demo-shell/process-services/processCloudDemoPage.ts @@ -15,14 +15,8 @@ * limitations under the License. */ -import { element, by, ElementFinder } from 'protractor'; -import { BrowserVisibility } from '@alfresco/adf-testing'; -import { - ProcessFiltersCloudComponentPage, - EditProcessFilterCloudComponentPage, - ProcessListCloudComponentPage, - BrowserActions -} from '@alfresco/adf-testing'; +import { BrowserActions, BrowserVisibility, EditProcessFilterCloudComponentPage, ProcessFiltersCloudComponentPage, ProcessListCloudComponentPage } from '@alfresco/adf-testing'; +import { by, element, ElementFinder } from 'protractor'; export class ProcessCloudDemoPage { diff --git a/e2e/pages/adf/demo-shell/process-services/processListDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/processListDemoPage.ts index a10e73b6e5..5451b05905 100644 --- a/e2e/pages/adf/demo-shell/process-services/processListDemoPage.ts +++ b/e2e/pages/adf/demo-shell/process-services/processListDemoPage.ts @@ -15,9 +15,8 @@ * limitations under the License. */ -import { BrowserVisibility } from '@alfresco/adf-testing'; -import { DataTableComponentPage, BrowserActions } from '@alfresco/adf-testing'; -import { element, by, protractor, ElementFinder } from 'protractor'; +import { BrowserActions, BrowserVisibility, DataTableComponentPage } from '@alfresco/adf-testing'; +import { by, element, ElementFinder, protractor } from 'protractor'; export class ProcessListDemoPage { diff --git a/e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts b/e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts index 3ec6703919..f88ac3a098 100644 --- a/e2e/pages/adf/demo-shell/process-services/taskListDemoPage.ts +++ b/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 { diff --git a/e2e/pages/adf/navigationBarPage.ts b/e2e/pages/adf/navigationBarPage.ts index 03d187235a..1b77e5d112 100644 --- a/e2e/pages/adf/navigationBarPage.ts +++ b/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 { diff --git a/e2e/pages/adf/permissionsPage.ts b/e2e/pages/adf/permissionsPage.ts index 380422ec90..dc17d7bff2 100644 --- a/e2e/pages/adf/permissionsPage.ts +++ b/e2e/pages/adf/permissionsPage.ts @@ -15,10 +15,8 @@ * limitations under the License. */ -import { element, by, ElementFinder } from 'protractor'; - -import { DataTableComponentPage } from '@alfresco/adf-testing'; -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; +import { BrowserActions, BrowserVisibility, DataTableComponentPage } from '@alfresco/adf-testing'; +import { by, element, ElementFinder } from 'protractor'; const column = { role: 'Role' diff --git a/e2e/pages/adf/process-services/filtersPage.ts b/e2e/pages/adf/process-services/filtersPage.ts index 9fb1df58a6..9fc7807470 100644 --- a/e2e/pages/adf/process-services/filtersPage.ts +++ b/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 { diff --git a/e2e/pages/adf/process-services/processFiltersPage.ts b/e2e/pages/adf/process-services/processFiltersPage.ts index 4f631290c7..129a953608 100644 --- a/e2e/pages/adf/process-services/processFiltersPage.ts +++ b/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 { diff --git a/e2e/pages/adf/process-services/taskDetailsPage.ts b/e2e/pages/adf/process-services/taskDetailsPage.ts index 175adc15d7..30378b0501 100644 --- a/e2e/pages/adf/process-services/taskDetailsPage.ts +++ b/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 { diff --git a/e2e/pages/adf/process-services/tasksListPage.ts b/e2e/pages/adf/process-services/tasksListPage.ts index 6e4ec379e2..1ab983fae7 100644 --- a/e2e/pages/adf/process-services/tasksListPage.ts +++ b/e2e/pages/adf/process-services/tasksListPage.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; -import { DataTableComponentPage } from '@alfresco/adf-testing'; +import { BrowserActions, BrowserVisibility, DataTableComponentPage } from '@alfresco/adf-testing'; import { by, element, ElementFinder } from 'protractor'; export class TasksListPage { diff --git a/e2e/pages/adf/searchFiltersPage.ts b/e2e/pages/adf/searchFiltersPage.ts index e9398bed28..98c0f01e0f 100644 --- a/e2e/pages/adf/searchFiltersPage.ts +++ b/e2e/pages/adf/searchFiltersPage.ts @@ -15,16 +15,8 @@ * limitations under the License. */ -import { element, by, ElementFinder } from 'protractor'; -import { BrowserVisibility, SearchCategoriesPage } from '@alfresco/adf-testing'; -import { - SearchCheckListPage, - SearchTextPage, - NumberRangeFilterPage, - DateRangeFilterPage, - SearchSliderPage, - SearchRadioPage -} from '@alfresco/adf-testing'; +import { BrowserVisibility, DateRangeFilterPage, NumberRangeFilterPage, SearchCategoriesPage, SearchCheckListPage, SearchRadioPage, SearchSliderPage, SearchTextPage } from '@alfresco/adf-testing'; +import { by, element, ElementFinder } from 'protractor'; export class SearchFiltersPage { diff --git a/e2e/pages/adf/searchResultsPage.ts b/e2e/pages/adf/searchResultsPage.ts index 8f44852e74..e0c021dcbd 100644 --- a/e2e/pages/adf/searchResultsPage.ts +++ b/e2e/pages/adf/searchResultsPage.ts @@ -15,10 +15,9 @@ * limitations under the License. */ -import { DataTableComponentPage } from '@alfresco/adf-testing'; -import { element, by, ElementFinder } from 'protractor'; +import { BrowserVisibility, DataTableComponentPage, SearchSortingPickerPage } from '@alfresco/adf-testing'; +import { by, element, ElementFinder } from 'protractor'; import { ContentServicesPage } from './contentServicesPage'; -import { BrowserVisibility, SearchSortingPickerPage } from '@alfresco/adf-testing'; export class SearchResultsPage { diff --git a/e2e/pages/adf/versionManagerPage.ts b/e2e/pages/adf/versionManagerPage.ts index f9b6b27df4..c6e7bedf93 100644 --- a/e2e/pages/adf/versionManagerPage.ts +++ b/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 { diff --git a/e2e/process-services-cloud/apps-section-cloud.e2e.ts b/e2e/process-services-cloud/apps-section-cloud.e2e.ts index d161ed4b17..1b1cc2df31 100644 --- a/e2e/process-services-cloud/apps-section-cloud.e2e.ts +++ b/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', () => { diff --git a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts b/e2e/process-services-cloud/edit-process-filters-component.e2e.ts index 9edfea37dd..7a657b4e6d 100644 --- a/e2e/process-services-cloud/edit-process-filters-component.e2e.ts +++ b/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', () => { diff --git a/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts b/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts index fe26c3b770..aae3336370 100644 --- a/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts +++ b/e2e/process-services-cloud/form-field/dropdown-widget.e2e.ts @@ -16,23 +16,14 @@ */ import { - TasksService, - QueryService, - ProcessDefinitionsService, - ProcessInstancesService, - LoginSSOPage, - ApiService, - IdentityService, - GroupIdentityService, - Widget, - NotificationHistoryPage, - TaskHeaderCloudPage, - TaskFormCloudComponent + ApiService, AppListCloudPage, GroupIdentityService, IdentityService, + LoginSSOPage, NotificationHistoryPage, ProcessDefinitionsService, + ProcessInstancesService, QueryService, TaskFormCloudComponent, TaskHeaderCloudPage, + TasksService, Widget } 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(); diff --git a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts b/e2e/process-services-cloud/people-group-cloud-component.e2e.ts index f6ff1acd81..a0ba972012 100644 --- a/e2e/process-services-cloud/people-group-cloud-component.e2e.ts +++ b/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 { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage'; -import { GroupCloudComponentPage, PeopleCloudComponentPage } from '@alfresco/adf-testing'; +import { ApiService, GroupCloudComponentPage, GroupIdentityService, IdentityService, LoginSSOPage, PeopleCloudComponentPage, RolesService } 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', () => { diff --git a/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts b/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts index 48c80f8017..54d1767e5a 100644 --- a/e2e/process-services-cloud/people-group-cloud-filter-component.e2e.ts +++ b/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 { PeopleGroupCloudComponentPage } from '../pages/adf/demo-shell/process-services/peopleGroupCloudComponentPage'; -import { GroupCloudComponentPage, PeopleCloudComponentPage } from '@alfresco/adf-testing'; +import { ApiService, GroupCloudComponentPage, GroupIdentityService, IdentityService, LoginSSOPage, 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', () => { diff --git a/e2e/process-services-cloud/process-custom-filters.e2e.ts b/e2e/process-services-cloud/process-custom-filters.e2e.ts index f89faa16d7..17c9574df7 100644 --- a/e2e/process-services-cloud/process-custom-filters.e2e.ts +++ b/e2e/process-services-cloud/process-custom-filters.e2e.ts @@ -15,17 +15,13 @@ * limitations under the License. */ -import { - TasksService, QueryService, ProcessDefinitionsService, ProcessInstancesService, - LoginSSOPage, ApiService, IdentityService, GroupIdentityService, StringUtil -} from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { ApiService, AppListCloudPage, BrowserActions, GroupIdentityService, IdentityService, LocalStorageUtil, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, StringUtil, TasksService } 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 { AppListCloudPage, LocalStorageUtil, BrowserActions } from '@alfresco/adf-testing'; -import { browser } from 'protractor'; -import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; +import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; describe('Process list cloud', () => { diff --git a/e2e/process-services-cloud/process-filter-results.e2e.ts b/e2e/process-services-cloud/process-filter-results.e2e.ts index 02abcf6c1b..c0ffd3faae 100644 --- a/e2e/process-services-cloud/process-filter-results.e2e.ts +++ b/e2e/process-services-cloud/process-filter-results.e2e.ts @@ -15,18 +15,14 @@ * limitations under the License. */ -import { - TasksService, QueryService, ProcessDefinitionsService, ProcessInstancesService, - LoginSSOPage, ApiService, IdentityService, GroupIdentityService, StringUtil, DateUtil -} from '@alfresco/adf-testing'; -import { NavigationBarPage } from '../pages/adf/navigationBarPage'; +import { ApiService, AppListCloudPage, DateUtil, GroupIdentityService, IdentityService, LocalStorageUtil, LoginSSOPage, ProcessDefinitionsService, ProcessInstancesService, QueryService, StringUtil, TasksService } 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 { AppListCloudPage, LocalStorageUtil } from '@alfresco/adf-testing'; -import { browser } from 'protractor'; -import { ProcessListCloudConfiguration } from './config/process-list-cloud.config'; -import { EditProcessFilterConfiguration } from './config/edit-process-filter.config'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; 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', () => { diff --git a/e2e/process-services-cloud/process-filters-cloud.e2e.ts b/e2e/process-services-cloud/process-filters-cloud.e2e.ts index ce6698c60f..d38b25366a 100644 --- a/e2e/process-services-cloud/process-filters-cloud.e2e.ts +++ b/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', () => { diff --git a/e2e/process-services-cloud/process-header-cloud.e2e.ts b/e2e/process-services-cloud/process-header-cloud.e2e.ts index 7e59a4aa16..e8a23df7a7 100644 --- a/e2e/process-services-cloud/process-header-cloud.e2e.ts +++ b/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', () => { diff --git a/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts b/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts index bbd9af4213..07c8b1002f 100644 --- a/e2e/process-services-cloud/process-list-cloud-action-menu.e2e.ts +++ b/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 { ProcessInstancesService } from '@alfresco/adf-testing'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; describe('Process list cloud', () => { diff --git a/e2e/process-services-cloud/process-list-cloud-component.e2e.ts b/e2e/process-services-cloud/process-list-cloud-component.e2e.ts index 7bcd6a7e7b..68709c69b5 100644 --- a/e2e/process-services-cloud/process-list-cloud-component.e2e.ts +++ b/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'; diff --git a/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts b/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts index 9c6d06790a..e0d2780127 100644 --- a/e2e/process-services-cloud/process-list-selection-cloud.e2e.ts +++ b/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 { ProcessInstancesService } from '@alfresco/adf-testing'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; describe('Process list cloud', () => { diff --git a/e2e/process-services-cloud/start-process-cloud.e2e.ts b/e2e/process-services-cloud/start-process-cloud.e2e.ts index 004e735792..797c95608d 100644 --- a/e2e/process-services-cloud/start-process-cloud.e2e.ts +++ b/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 { AppListCloudPage, StartProcessCloudPage } from '@alfresco/adf-testing'; +import { ApiService, AppListCloudPage, BrowserActions, GroupIdentityService, IdentityService, LoginSSOPage, StartProcessCloudPage, StringUtil } 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', () => { diff --git a/e2e/process-services-cloud/task-header-cloud.e2e.ts b/e2e/process-services-cloud/task-header-cloud.e2e.ts index 7370a9ad63..a84e98b246 100644 --- a/e2e/process-services-cloud/task-header-cloud.e2e.ts +++ b/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 moment = require('moment'); +import { ApiService, AppListCloudPage, GroupIdentityService, IdentityService, LocalStorageUtil, LoginSSOPage, StringUtil, TaskHeaderCloudPage, TasksService } from '@alfresco/adf-testing'; 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(); diff --git a/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts b/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts index ae33d885c5..8f0e79be58 100644 --- a/e2e/process-services-cloud/task-list-cloud-action-menu.e2e.ts +++ b/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 { ProcessDefinitionsService, ApiService } from '@alfresco/adf-testing'; -import { ProcessInstancesService } from '@alfresco/adf-testing'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; describe('Process list cloud', () => { diff --git a/e2e/process-services-cloud/task-list-selection.e2e.ts b/e2e/process-services-cloud/task-list-selection.e2e.ts index 0c102777a6..cd7dbb9a99 100644 --- a/e2e/process-services-cloud/task-list-selection.e2e.ts +++ b/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 { StringUtil } from '@alfresco/adf-testing'; +import { NavigationBarPage } from '../pages/adf/navigationBarPage'; describe('Task list cloud - selection', () => { diff --git a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts b/e2e/process-services-cloud/tasks-custom-filters.e2e.ts index 823627f85d..bf8d4f8a0f 100644 --- a/e2e/process-services-cloud/tasks-custom-filters.e2e.ts +++ b/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', () => { diff --git a/e2e/process-services/attach-form-component.e2e.ts b/e2e/process-services/attach-form-component.e2e.ts index 927185650a..fe3265fc80 100644 --- a/e2e/process-services/attach-form-component.e2e.ts +++ b/e2e/process-services/attach-form-component.e2e.ts @@ -15,19 +15,15 @@ * limitations under the License. */ -import { LoginPage, FormFields } 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 { FormFields, LoginPage } from '@alfresco/adf-testing'; 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', () => { diff --git a/e2e/process-services/custom-tasks-filters.e2e.ts b/e2e/process-services/custom-tasks-filters.e2e.ts index 54101ab3a4..7bcee7a782 100644 --- a/e2e/process-services/custom-tasks-filters.e2e.ts +++ b/e2e/process-services/custom-tasks-filters.e2e.ts @@ -15,18 +15,17 @@ * limitations under the License. */ -import { LoginPage } 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 { DateUtil, LoginPage, PaginationPage } from '@alfresco/adf-testing'; 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', () => { diff --git a/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts b/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts index 7aa94688e9..cd3dcf7f9d 100644 --- a/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts +++ b/e2e/process-services/pagination-processlist-addingProcesses.e2e.ts @@ -15,15 +15,14 @@ * limitations under the License. */ -import { LoginPage } 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 { LoginPage, PaginationPage } from '@alfresco/adf-testing'; 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', () => { diff --git a/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts b/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts index c2729ef420..13e6f6d9ed 100644 --- a/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts +++ b/e2e/process-services/pagination-tasklist-addingTasks.e2e.ts @@ -15,15 +15,14 @@ * limitations under the License. */ -import { LoginPage } 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 { LoginPage, PaginationPage } from '@alfresco/adf-testing'; 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', () => { diff --git a/e2e/process-services/processlist-pagination.e2e.ts b/e2e/process-services/processlist-pagination.e2e.ts index cab240794e..db896d011f 100644 --- a/e2e/process-services/processlist-pagination.e2e.ts +++ b/e2e/process-services/processlist-pagination.e2e.ts @@ -15,15 +15,14 @@ * limitations under the License. */ -import { LoginPage } 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 { LoginPage, PaginationPage } from '@alfresco/adf-testing'; 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', () => { diff --git a/e2e/process-services/sort-tasklist-pagination.e2e.ts b/e2e/process-services/sort-tasklist-pagination.e2e.ts index d593eeecab..81ffc8ba7e 100644 --- a/e2e/process-services/sort-tasklist-pagination.e2e.ts +++ b/e2e/process-services/sort-tasklist-pagination.e2e.ts @@ -15,17 +15,15 @@ * limitations under the License. */ -import { LoginPage } 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 { LoginPage, PaginationPage } from '@alfresco/adf-testing'; 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', () => { diff --git a/e2e/process-services/start-process-component.e2e.ts b/e2e/process-services/start-process-component.e2e.ts index 4c9b570f12..c1f6ffb85d 100644 --- a/e2e/process-services/start-process-component.e2e.ts +++ b/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 { 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 { FileBrowserUtil, LoginPage, StartProcessDialog, StringUtil, Widget } from '@alfresco/adf-testing'; 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', () => { diff --git a/e2e/process-services/start-task-custom-app.e2e.ts b/e2e/process-services/start-task-custom-app.e2e.ts index 98696d6e99..fe1d44411d 100644 --- a/e2e/process-services/start-task-custom-app.e2e.ts +++ b/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', () => { diff --git a/e2e/process-services/start-task-task-app.e2e.ts b/e2e/process-services/start-task-task-app.e2e.ts index 7ba67c889c..699bd1538a 100644 --- a/e2e/process-services/start-task-task-app.e2e.ts +++ b/e2e/process-services/start-task-task-app.e2e.ts @@ -15,21 +15,20 @@ * limitations under the License. */ -import { by, browser } 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 CONSTANTS = require('../util/constants'); -import { Tenant } from '../models/APS/tenant'; -import { FileModel } from '../models/ACS/fileModel'; +import { LoginPage, StringUtil } from '@alfresco/adf-testing'; 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', () => { diff --git a/e2e/process-services/task-details-form.e2e.ts b/e2e/process-services/task-details-form.e2e.ts index 3d89dac6db..24965b5f91 100644 --- a/e2e/process-services/task-details-form.e2e.ts +++ b/e2e/process-services/task-details-form.e2e.ts @@ -15,21 +15,18 @@ * limitations under the License. */ -import { browser } from 'protractor'; -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 { LoginPage, StringUtil, Widget } from '@alfresco/adf-testing'; 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(); diff --git a/e2e/process-services/task-list-pagination.e2e.ts b/e2e/process-services/task-list-pagination.e2e.ts index 24a01a61a4..1b65a4365e 100644 --- a/e2e/process-services/task-list-pagination.e2e.ts +++ b/e2e/process-services/task-list-pagination.e2e.ts @@ -15,15 +15,14 @@ * limitations under the License. */ -import { LoginPage } 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 { LoginPage, PaginationPage } from '@alfresco/adf-testing'; 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', () => { diff --git a/e2e/search/components/search-date-range.e2e.ts b/e2e/search/components/search-date-range.e2e.ts index e00c33f575..a14e71fdd1 100644 --- a/e2e/search/components/search-date-range.e2e.ts +++ b/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 { 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 { DataTableComponentPage, DatePickerPage, DateUtil, LocalStorageUtil, LoginPage } from '@alfresco/adf-testing'; 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', () => { diff --git a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts b/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts index fbcbed01ec..88bec54d67 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-dialog.service.ts +++ b/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'; diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts index 603461c4fa..0848d1d4d9 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector-panel.component.spec.ts +++ b/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'; diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts index cf5c29f0a4..4ee9fce31b 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts +++ b/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 { EventEmitter } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, EventEmitter } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ContentNodeSelectorComponent } from './content-node-selector.component'; import { Node } from '@alfresco/js-api'; diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts b/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts index aaf7c63236..12f1cabcd7 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.dialog.spec.ts +++ b/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'; diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts b/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts index abfc7d4e98..aa2d07a2a7 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts +++ b/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'; diff --git a/lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts b/lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts index 5c5d92c6a7..aa3a7a59c7 100644 --- a/lib/content-services/src/lib/dialogs/confirm.dialog.spec.ts +++ b/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 { ComponentFixture } from '@angular/core/testing'; +import { TestBed, ComponentFixture } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { setupTestBed } from '@alfresco/adf-core'; import { ConfirmDialogComponent } from './confirm.dialog'; diff --git a/lib/content-services/src/lib/dialogs/folder.dialog.spec.ts b/lib/content-services/src/lib/dialogs/folder.dialog.spec.ts index d68a05bdf7..fc7df45bfa 100644 --- a/lib/content-services/src/lib/dialogs/folder.dialog.spec.ts +++ b/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 { async, ComponentFixture } from '@angular/core/testing'; +import { TestBed, async, ComponentFixture } from '@angular/core/testing'; import { MatDialogRef } from '@angular/material'; import { NodesApiService, setupTestBed } from '@alfresco/adf-core'; import { FolderDialogComponent } from './folder.dialog'; diff --git a/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts b/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts index d46348b56d..ac5e92b38a 100644 --- a/lib/content-services/src/lib/dialogs/library/library.dialog.spec.ts +++ b/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 diff --git a/lib/content-services/src/lib/dialogs/node-lock.dialog.spec.ts b/lib/content-services/src/lib/dialogs/node-lock.dialog.spec.ts index 40fa07162c..59a08e54f4 100644 --- a/lib/content-services/src/lib/dialogs/node-lock.dialog.spec.ts +++ b/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 { ComponentFixture } from '@angular/core/testing'; +import { TestBed, fakeAsync, tick, ComponentFixture } from '@angular/core/testing'; import { MatDialogRef } from '@angular/material'; import { AlfrescoApiService, setupTestBed } from '@alfresco/adf-core'; import { NodeBodyLock } from '@alfresco/js-api'; diff --git a/lib/content-services/src/lib/document-list/components/content-action/content-action.component.spec.ts b/lib/content-services/src/lib/document-list/components/content-action/content-action.component.spec.ts index b53813a1af..0b756b4c8c 100644 --- a/lib/content-services/src/lib/document-list/components/content-action/content-action.component.spec.ts +++ b/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 { EventEmitter } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange, 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', () => { diff --git a/lib/content-services/src/lib/document-list/components/content-column/content-column-list.component.spec.ts b/lib/content-services/src/lib/document-list/components/content-column/content-column-list.component.spec.ts index 80babccd6b..6d258cd057 100644 --- a/lib/content-services/src/lib/document-list/components/content-column/content-column-list.component.spec.ts +++ b/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 { LogService } from '@alfresco/adf-core'; +import { DataColumn, setupTestBed, 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'; diff --git a/lib/content-services/src/lib/document-list/components/content-column/content-column-list.component.ts b/lib/content-services/src/lib/document-list/components/content-column/content-column-list.component.ts index b1bc665692..b57dccc7a7 100644 --- a/lib/content-services/src/lib/document-list/components/content-column/content-column-list.component.ts +++ b/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 { LogService } from '@alfresco/adf-core'; +import { DataColumn, LogService } from '@alfresco/adf-core'; import { Component } from '@angular/core'; import { DocumentListComponent } from './../document-list.component'; diff --git a/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts b/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts index 43ce2e1041..96a1ac6de3 100644 --- a/lib/content-services/src/lib/document-list/components/document-list.component.spec.ts +++ b/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 { DataColumn, DataTableComponent } from '@alfresco/adf-core'; +import { setupTestBed, AlfrescoApiService, DataColumnListComponent, DataColumnComponent, 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'; diff --git a/lib/content-services/src/lib/search/components/search-control.component.spec.ts b/lib/content-services/src/lib/search/components/search-control.component.spec.ts index 68203ee202..33d09a456d 100644 --- a/lib/content-services/src/lib/search/components/search-control.component.spec.ts +++ b/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'; diff --git a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts b/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts index 4753873498..c806fb116d 100644 --- a/lib/content-services/src/lib/search/components/search-date-range/search-date-range.component.ts +++ b/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'; diff --git a/lib/content-services/src/lib/upload/components/base-upload/upload-base.spec.ts b/lib/content-services/src/lib/upload/components/base-upload/upload-base.spec.ts index 5ee3887925..cbd0f648ab 100644 --- a/lib/content-services/src/lib/upload/components/base-upload/upload-base.spec.ts +++ b/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'; diff --git a/lib/content-services/src/lib/upload/components/base-upload/upload-base.ts b/lib/content-services/src/lib/upload/components/base-upload/upload-base.ts index fdb0e392fa..d6b5bdedd7 100644 --- a/lib/content-services/src/lib/upload/components/base-upload/upload-base.ts +++ b/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'; diff --git a/lib/content-services/src/lib/upload/components/upload-button.component.spec.ts b/lib/content-services/src/lib/upload/components/upload-button.component.spec.ts index fbb35d6433..e459dc865a 100644 --- a/lib/content-services/src/lib/upload/components/upload-button.component.spec.ts +++ b/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'; diff --git a/lib/content-services/src/lib/upload/components/upload-version-button.component.ts b/lib/content-services/src/lib/upload/components/upload-version-button.component.ts index cda63a6092..08856aaa20 100644 --- a/lib/content-services/src/lib/upload/components/upload-version-button.component.ts +++ b/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', diff --git a/lib/content-services/src/lib/webscript/webscript.component.ts b/lib/content-services/src/lib/webscript/webscript.component.ts index 04f0b7beb4..89bdd02489 100644 --- a/lib/content-services/src/lib/webscript/webscript.component.ts +++ b/lib/content-services/src/lib/webscript/webscript.component.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { ObjectDataTableAdapter } from '@alfresco/adf-core'; -import { AlfrescoApiService, LogService } from '@alfresco/adf-core'; +import { ObjectDataTableAdapter, AlfrescoApiService, LogService } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; /** diff --git a/lib/core/card-view/models/card-view-baseitem.model.spec.ts b/lib/core/card-view/models/card-view-baseitem.model.spec.ts index b7a9f49511..f1b6f7daf3 100644 --- a/lib/core/card-view/models/card-view-baseitem.model.spec.ts +++ b/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 {} diff --git a/lib/core/comments/comments.component.spec.ts b/lib/core/comments/comments.component.spec.ts index 0267d63dac..677e3a2e6b 100644 --- a/lib/core/comments/comments.component.spec.ts +++ b/lib/core/comments/comments.component.spec.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { SimpleChange } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { of, throwError } from 'rxjs'; import { CommentProcessService } from '../services/comment-process.service'; diff --git a/lib/core/dialogs/download-zip/download-zip.dialog.spec.ts b/lib/core/dialogs/download-zip/download-zip.dialog.spec.ts index 3870645998..549e2c90dd 100755 --- a/lib/core/dialogs/download-zip/download-zip.dialog.spec.ts +++ b/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 { ComponentFixture } from '@angular/core/testing'; +import { TestBed, ComponentFixture } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; import { DownloadZipDialogComponent } from './download-zip.dialog'; import { setupTestBed } from '../../testing/setupTestBed'; diff --git a/lib/core/services/alfresco-api.service.ts b/lib/core/services/alfresco-api.service.ts index 72fff5440b..adc5d7fe69 100644 --- a/lib/core/services/alfresco-api.service.ts +++ b/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'; diff --git a/lib/core/services/discovery-api.service.ts b/lib/core/services/discovery-api.service.ts index 67445ff7e3..f9302a51cc 100644 --- a/lib/core/services/discovery-api.service.ts +++ b/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' diff --git a/lib/core/services/identity-group.service.spec.ts b/lib/core/services/identity-group.service.spec.ts index b7b54b5171..eb3cdf9cb7 100644 --- a/lib/core/services/identity-group.service.spec.ts +++ b/lib/core/services/identity-group.service.spec.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { async } from '@angular/core/testing'; -import { TestBed } from '@angular/core/testing'; +import { async, TestBed } from '@angular/core/testing'; import { AlfrescoApiServiceMock, CoreModule, diff --git a/lib/core/viewer/components/txtViewer.component.ts b/lib/core/viewer/components/txtViewer.component.ts index 2d8ef66558..30c4b8c3f4 100644 --- a/lib/core/viewer/components/txtViewer.component.ts +++ b/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 { SimpleChanges } from '@angular/core'; +import { Component, Input, OnChanges, ViewEncapsulation, SimpleChanges } from '@angular/core'; import { AppConfigService } from './../../app-config/app-config.service'; @Component({ diff --git a/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.ts b/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.ts index 965c3bdf57..4f7a03c897 100644 --- a/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.ts +++ b/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 { AppConfigService, LogService } from '@alfresco/adf-core'; +import { AlfrescoApiService, AppConfigService, LogService } from '@alfresco/adf-core'; import { Oauth2Auth } from '@alfresco/js-api'; import { ApplicationInstanceModel } from '../models/application-instance.model'; diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts index 1ef821363f..57ea57ad19 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.ts +++ b/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, diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.ts index df38a26fdb..6afabc5161 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/process-filter-dialog-cloud.component.ts +++ b/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 { OnInit } from '@angular/core'; +import { Component, Inject, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; import { FormBuilder, FormGroup, AbstractControl, Validators } from '@angular/forms'; diff --git a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts index 0fb4d7d973..57a53578d1 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts +++ b/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 { DataRowEvent, ObjectDataRow } from '@alfresco/adf-core'; +import { AppConfigService, setupTestBed, CoreModule, DataTableModule, 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'; diff --git a/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.spec.ts index 34f8094269..e268f462e3 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/services/process-list-cloud.service.spec.ts +++ b/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'; diff --git a/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.spec.ts index 47e7cc0f16..12368d6812 100755 --- a/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.spec.ts @@ -16,9 +16,9 @@ */ import { TestBed } from '@angular/core/testing'; -import { setupTestBed, CoreModule } from '@alfresco/adf-core'; import { of, throwError } from 'rxjs'; import { + setupTestBed, CoreModule, AlfrescoApiService, AppConfigService, LogService, diff --git a/lib/process-services-cloud/src/lib/task/services/task-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/services/task-cloud.service.spec.ts index d56b74c417..2cae29aeae 100644 --- a/lib/process-services-cloud/src/lib/task/services/task-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/task/services/task-cloud.service.spec.ts @@ -16,8 +16,7 @@ */ import { async, TestBed } from '@angular/core/testing'; -import { setupTestBed, IdentityUserService, StorageService } from '@alfresco/adf-core'; -import { AlfrescoApiServiceMock, LogService, AppConfigService, CoreModule } from '@alfresco/adf-core'; +import { setupTestBed, IdentityUserService, StorageService, AlfrescoApiServiceMock, LogService, AppConfigService, CoreModule } from '@alfresco/adf-core'; import { TaskCloudService } from './task-cloud.service'; import { taskCompleteCloudMock } from '../task-header/mocks/fake-complete-task.mock'; import { assignedTaskDetailsCloudMock, createdTaskDetailsCloudMock, emptyOwnerTaskDetailsCloudMock } from '../task-header/mocks/task-details-cloud.mock'; diff --git a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.spec.ts index b8df3ed79d..4fd7af41fe 100644 --- a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.spec.ts @@ -16,8 +16,8 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { setupTestBed, IdentityUserService } from '@alfresco/adf-core'; import { + setupTestBed, IdentityUserService, AlfrescoApiService, AppConfigService, LogService, diff --git a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.ts b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.ts index 7331f0833e..ddcc6e3b0b 100644 --- a/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/start-task/components/start-task-cloud.component.ts @@ -16,12 +16,12 @@ */ import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation, OnDestroy, ViewChild } from '@angular/core'; import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core'; -import { MOMENT_DATE_FORMATS, MomentDateAdapter } from '@alfresco/adf-core'; import moment from 'moment-es6'; import { Moment } from 'moment'; import { Observable, Subject } from 'rxjs'; import { FormBuilder, AbstractControl, Validators, FormGroup, FormControl } from '@angular/forms'; import { + MOMENT_DATE_FORMATS, MomentDateAdapter, LogService, UserPreferencesService, IdentityUserService, diff --git a/lib/process-services-cloud/src/lib/task/start-task/services/start-task-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/start-task/services/start-task-cloud.service.spec.ts index 03b5d0977c..d5defdd894 100644 --- a/lib/process-services-cloud/src/lib/task/start-task/services/start-task-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/task/start-task/services/start-task-cloud.service.spec.ts @@ -17,13 +17,13 @@ import { TestBed } from '@angular/core/testing'; -import { setupTestBed } from '@alfresco/adf-core'; import { StartTaskCloudTestingModule } from '../testing/start-task-cloud.testing.module'; import { of, throwError } from 'rxjs'; import { taskDetailsMock } from '../mock/task-details.mock'; import { TaskDetailsCloudModel } from '../models/task-details-cloud.model'; import { HttpErrorResponse } from '@angular/common/http'; import { + setupTestBed, AlfrescoApiService, AppConfigService, LogService, diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog-cloud.component.ts index 6770ae9e22..d3a0f50bf2 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog-cloud.component.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { Component, Inject } from '@angular/core'; -import { OnInit } from '@angular/core'; +import { Component, Inject, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; import { FormBuilder, FormGroup, AbstractControl, Validators } from '@angular/forms'; diff --git a/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts index 191ee87a82..0ce5bb70be 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts @@ -18,8 +18,7 @@ import { Component, SimpleChange, ViewChild, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { AppConfigService, setupTestBed, CoreModule } from '@alfresco/adf-core'; -import { DataRowEvent, ObjectDataRow } from '@alfresco/adf-core'; +import { AppConfigService, setupTestBed, CoreModule, DataRowEvent, ObjectDataRow } from '@alfresco/adf-core'; import { TaskListCloudService } from '../services/task-list-cloud.service'; import { TaskListCloudComponent } from './task-list-cloud.component'; import { fakeGlobalTask, fakeCustomSchema } from '../mock/fakeTaskResponseMock'; diff --git a/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts index 336f2927b2..ef9e58ad4a 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/services/task-list-cloud.service.spec.ts @@ -16,9 +16,8 @@ */ 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 { fakeTaskCloudList } from '../mock/fakeTaskResponseMock'; -import { AlfrescoApiServiceMock, LogService, AppConfigService, CoreModule } from '@alfresco/adf-core'; import { TaskListCloudService } from './task-list-cloud.service'; import { TaskQueryCloudRequestModel } from '../models/filter-cloud-model'; diff --git a/lib/process-services/src/lib/app-list/select-apps-dialog-component.spec.ts b/lib/process-services/src/lib/app-list/select-apps-dialog-component.spec.ts index 56dd406c25..ca6a96a87a 100644 --- a/lib/process-services/src/lib/app-list/select-apps-dialog-component.spec.ts +++ b/lib/process-services/src/lib/app-list/select-apps-dialog-component.spec.ts @@ -16,10 +16,8 @@ */ import { Component } from '@angular/core'; -import { TestBed } from '@angular/core/testing'; -import { ComponentFixture } from '@angular/core/testing'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material'; -import { MatDialog } from '@angular/material'; +import { TestBed, ComponentFixture } from '@angular/core/testing'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { OverlayContainer } from '@angular/cdk/overlay'; import { AppsProcessService, setupTestBed } from '@alfresco/adf-core'; import { deployedApps } from '../mock/apps-list.mock'; diff --git a/lib/process-services/src/lib/attachment/process-attachment-list.component.ts b/lib/process-services/src/lib/attachment/process-attachment-list.component.ts index a96fa82eee..4b9c7405ae 100644 --- a/lib/process-services/src/lib/attachment/process-attachment-list.component.ts +++ b/lib/process-services/src/lib/attachment/process-attachment-list.component.ts @@ -15,9 +15,8 @@ * limitations under the License. */ -import { ContentService, EmptyListComponent , ThumbnailService } from '@alfresco/adf-core'; +import { ContentService, EmptyListComponent , ThumbnailService, ProcessContentService } from '@alfresco/adf-core'; import { AfterContentInit, ContentChild, Component, EventEmitter, Input, NgZone, OnChanges, Output, SimpleChanges, ViewEncapsulation } from '@angular/core'; -import { ProcessContentService } from '@alfresco/adf-core'; @Component({ selector: 'adf-process-attachment-list', diff --git a/lib/process-services/src/lib/attachment/task-attachment-list.component.ts b/lib/process-services/src/lib/attachment/task-attachment-list.component.ts index 3e8995a841..69204a5eee 100644 --- a/lib/process-services/src/lib/attachment/task-attachment-list.component.ts +++ b/lib/process-services/src/lib/attachment/task-attachment-list.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ContentService, ThumbnailService, EmptyListComponent } from '@alfresco/adf-core'; +import { ContentService, ThumbnailService, EmptyListComponent, ProcessContentService } from '@alfresco/adf-core'; import { AfterContentInit, ContentChild, @@ -28,7 +28,6 @@ import { SimpleChanges, ViewEncapsulation } from '@angular/core'; -import { ProcessContentService } from '@alfresco/adf-core'; @Component({ selector: 'adf-task-attachment-list', diff --git a/lib/process-services/src/lib/form/form.component.visibility.spec.ts b/lib/process-services/src/lib/form/form.component.visibility.spec.ts index 010f819341..4cd4428de2 100644 --- a/lib/process-services/src/lib/form/form.component.visibility.spec.ts +++ b/lib/process-services/src/lib/form/form.component.visibility.spec.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; -import { SimpleChange } from '@angular/core'; +import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core'; import { of } from 'rxjs'; import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; diff --git a/lib/process-services/src/lib/form/start-form.component.spec.ts b/lib/process-services/src/lib/form/start-form.component.spec.ts index 449fb0e657..73e6723508 100644 --- a/lib/process-services/src/lib/form/start-form.component.spec.ts +++ b/lib/process-services/src/lib/form/start-form.component.spec.ts @@ -18,8 +18,11 @@ import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { of, throwError } from 'rxjs'; -import { startFormDateWidgetMock, startFormDropdownDefinitionMock, startFormTextDefinitionMock, startMockForm, startMockFormWithTab } from './start-form.component.mock'; -import { startFormAmountWidgetMock, startFormNumberWidgetMock, startFormRadioButtonWidgetMock } from './start-form.component.mock'; +import { + startFormDateWidgetMock, startFormDropdownDefinitionMock, + startFormTextDefinitionMock, startMockForm, startMockFormWithTab, + startFormAmountWidgetMock, startFormNumberWidgetMock, startFormRadioButtonWidgetMock +} from './start-form.component.mock'; import { StartFormComponent } from './start-form.component'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { FormService, WidgetVisibilityService, setupTestBed, CoreModule, FormModel, FormOutcomeModel } from '@alfresco/adf-core'; diff --git a/lib/process-services/src/lib/people/components/people-list/people-list.component.spec.ts b/lib/process-services/src/lib/people/components/people-list/people-list.component.spec.ts index ade64e0a43..a9ce4382c3 100644 --- a/lib/process-services/src/lib/people/components/people-list/people-list.component.spec.ts +++ b/lib/process-services/src/lib/people/components/people-list/people-list.component.spec.ts @@ -16,8 +16,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { UserProcessModel, setupTestBed } from '@alfresco/adf-core'; -import { DataRowActionEvent, DataRowEvent, ObjectDataRow } from '@alfresco/adf-core'; +import { UserProcessModel, setupTestBed, DataRowActionEvent, DataRowEvent, ObjectDataRow } from '@alfresco/adf-core'; import { UserEventModel } from '../../../task-list/models/user-event.model'; import { PeopleListComponent } from './people-list.component'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; diff --git a/lib/process-services/src/lib/people/components/people-list/people-list.component.ts b/lib/process-services/src/lib/people/components/people-list/people-list.component.ts index f848074dc2..b5148cbc1f 100644 --- a/lib/process-services/src/lib/people/components/people-list/people-list.component.ts +++ b/lib/process-services/src/lib/people/components/people-list/people-list.component.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { DataTableComponent, DataCellEvent } from '@alfresco/adf-core'; -import { DataColumnListComponent, UserProcessModel } from '@alfresco/adf-core'; +import { DataTableComponent, DataCellEvent, DataColumnListComponent, UserProcessModel } from '@alfresco/adf-core'; import { AfterContentInit, Component, ContentChild, EventEmitter, Input, Output, ViewChild } from '@angular/core'; import { UserEventModel } from '../../../task-list/models/user-event.model'; diff --git a/lib/process-services/src/lib/people/components/people/people.component.spec.ts b/lib/process-services/src/lib/people/components/people/people.component.spec.ts index d447728913..5e1c497f3d 100644 --- a/lib/process-services/src/lib/people/components/people/people.component.spec.ts +++ b/lib/process-services/src/lib/people/components/people/people.component.spec.ts @@ -16,8 +16,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { LogService, setupTestBed } from '@alfresco/adf-core'; -import { UserProcessModel } from '@alfresco/adf-core'; +import { LogService, setupTestBed, UserProcessModel } from '@alfresco/adf-core'; import { PeopleComponent } from './people.component'; import { ProcessTestingModule } from '../../../testing/process.testing.module'; diff --git a/lib/process-services/src/lib/people/components/people/people.component.ts b/lib/process-services/src/lib/people/components/people/people.component.ts index 442d45a0da..dd564b41aa 100644 --- a/lib/process-services/src/lib/people/components/people/people.component.ts +++ b/lib/process-services/src/lib/people/components/people/people.component.ts @@ -15,8 +15,7 @@ * limitations under the License. */ -import { LogService, UserProcessModel } from '@alfresco/adf-core'; -import { PeopleProcessService } from '@alfresco/adf-core'; +import { LogService, UserProcessModel, PeopleProcessService } from '@alfresco/adf-core'; import { Component, Input, ViewChild } from '@angular/core'; import { Observable, Observer } from 'rxjs'; import { UserEventModel } from '../../../task-list/models/user-event.model'; diff --git a/lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts index f3c25ef564..e06676509a 100644 --- a/lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-filters.component.spec.ts @@ -16,12 +16,11 @@ */ import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core'; -import { AppsProcessService } from '@alfresco/adf-core'; +import { AppsProcessService, CoreModule, setupTestBed } from '@alfresco/adf-core'; import { from } from 'rxjs'; import { FilterProcessRepresentationModel } from '../models/filter-process.model'; import { ProcessFilterService } from '../services/process-filter.service'; import { ProcessFiltersComponent } from './process-filters.component'; -import { CoreModule, setupTestBed } from '@alfresco/adf-core'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; diff --git a/lib/process-services/src/lib/process-list/components/process-list.component.spec.ts b/lib/process-services/src/lib/process-list/components/process-list.component.spec.ts index 64141937d3..c32253a83c 100644 --- a/lib/process-services/src/lib/process-list/components/process-list.component.spec.ts +++ b/lib/process-services/src/lib/process-list/components/process-list.component.spec.ts @@ -19,16 +19,14 @@ import { Component, SimpleChange, ViewChild } from '@angular/core'; import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; import { of, throwError } from 'rxjs'; import { By } from '@angular/platform-browser'; - import { ProcessInstanceListComponent } from './process-list.component'; - -import { AppConfigService, setupTestBed, CoreModule, DataTableModule, DataRow, DataColumn } from '@alfresco/adf-core'; -import { DataRowEvent, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/adf-core'; - -import { fakeProcessInstance, fakeProcessInstancesWithNoName, fakeProcessInstancesEmpty } from '../../mock'; +import { + AppConfigService, setupTestBed, CoreModule, DataTableModule, DataRow, DataColumn, + DataRowEvent, ObjectDataRow, ObjectDataTableAdapter +} from '@alfresco/adf-core'; +import { fakeProcessInstance, fakeProcessInstancesWithNoName, fakeProcessInstancesEmpty, fakeProcessCustomSchema } from '../../mock'; import { ProcessService } from '../services/process.service'; import { ProcessTestingModule } from '../../testing/process.testing.module'; -import { fakeProcessCustomSchema } from '../../mock'; import { ProcessListModule } from '../process-list.module'; describe('ProcessInstanceListComponent', () => { diff --git a/lib/process-services/src/lib/process-list/components/process-list.component.ts b/lib/process-services/src/lib/process-list/components/process-list.component.ts index 143249e96a..7f7a2f4fa1 100644 --- a/lib/process-services/src/lib/process-list/components/process-list.component.ts +++ b/lib/process-services/src/lib/process-list/components/process-list.component.ts @@ -22,9 +22,7 @@ import { CustomEmptyContentTemplateDirective, CustomLoadingContentTemplateDirective, DataRow, - DataColumn -} from '@alfresco/adf-core'; -import { + DataColumn, AppConfigService, PaginatedComponent, PaginationComponent, diff --git a/lib/process-services/src/lib/process-list/services/process.service.spec.ts b/lib/process-services/src/lib/process-list/services/process.service.spec.ts index fc425e3d88..a5ae3de20b 100644 --- a/lib/process-services/src/lib/process-list/services/process.service.spec.ts +++ b/lib/process-services/src/lib/process-list/services/process.service.spec.ts @@ -16,8 +16,7 @@ */ import { async } from '@angular/core/testing'; -import { exampleProcess, fakeProcessInstances } from '../../mock'; -import { mockError, fakeProcessDef, fakeTasksList } from '../../mock'; +import { exampleProcess, fakeProcessInstances, mockError, fakeProcessDef, fakeTasksList } from '../../mock'; import { ProcessFilterParamRepresentationModel } from '../models/filter-process.model'; import { ProcessInstanceVariable } from '../models/process-instance-variable.model'; import { ProcessService } from './process.service'; diff --git a/lib/process-services/src/lib/task-list/components/start-task.component.ts b/lib/process-services/src/lib/task-list/components/start-task.component.ts index d48cec83c5..605c54d688 100644 --- a/lib/process-services/src/lib/task-list/components/start-task.component.ts +++ b/lib/process-services/src/lib/task-list/components/start-task.component.ts @@ -15,10 +15,12 @@ * limitations under the License. */ -import { LogService, UserPreferencesService, UserPreferenceValues, UserProcessModel, FormFieldModel, FormModel } from '@alfresco/adf-core'; +import { + LogService, UserPreferencesService, UserPreferenceValues, UserProcessModel, FormFieldModel, FormModel, + MOMENT_DATE_FORMATS, MomentDateAdapter +} from '@alfresco/adf-core'; import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation, OnDestroy } from '@angular/core'; import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material/core'; -import { MOMENT_DATE_FORMATS, MomentDateAdapter } from '@alfresco/adf-core'; import moment from 'moment-es6'; import { Moment } from 'moment'; import { Observable, of, Subject } from 'rxjs'; diff --git a/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts index 27267030e8..066110c24a 100644 --- a/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-details.component.spec.ts @@ -19,18 +19,17 @@ import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { of, throwError } from 'rxjs'; - import { FormModel, FormOutcomeEvent, FormOutcomeModel, FormService, setupTestBed, - BpmUserService + BpmUserService, + CommentProcessService, LogService, AuthenticationService, + UserProcessModel, + PeopleProcessService } from '@alfresco/adf-core'; -import { CommentProcessService, LogService, AuthenticationService } from '@alfresco/adf-core'; - -import { UserProcessModel } from '@alfresco/adf-core'; import { TaskDetailsModel } from '../models/task-details.model'; import { noDataMock, @@ -44,7 +43,6 @@ import { import { TaskListService } from './../services/tasklist.service'; import { TaskDetailsComponent } from './task-details.component'; import { ProcessTestingModule } from '../../testing/process.testing.module'; -import { PeopleProcessService } from '@alfresco/adf-core'; const fakeUser: UserProcessModel = new UserProcessModel({ id: 'fake-id', diff --git a/lib/process-services/src/lib/task-list/components/task-details.component.ts b/lib/process-services/src/lib/task-list/components/task-details.component.ts index 0ece45c490..431c5c6649 100644 --- a/lib/process-services/src/lib/task-list/components/task-details.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-details.component.ts @@ -15,14 +15,15 @@ * limitations under the License. */ -import { PeopleProcessService, UserProcessModel } from '@alfresco/adf-core'; import { + PeopleProcessService, UserProcessModel, AuthenticationService, CardViewUpdateService, ClickNotification, LogService, UpdateNotification, - CommentsComponent + CommentsComponent, + ContentLinkModel, FormFieldValidator, FormModel, FormOutcomeEvent } from '@alfresco/adf-core'; import { Component, @@ -36,9 +37,8 @@ import { ViewChild, OnDestroy } from '@angular/core'; -import { MatDialog, MatDialogRef } from '@angular/material'; +import { MatDialog, MatDialogRef } from '@angular/material/dialog'; import { Observable, Observer, Subject } from 'rxjs'; -import { ContentLinkModel, FormFieldValidator, FormModel, FormOutcomeEvent } from '@alfresco/adf-core'; import { TaskQueryRequestRepresentationModel } from '../models/filter.model'; import { TaskDetailsModel } from '../models/task-details.model'; import { TaskListService } from './../services/tasklist.service'; diff --git a/lib/process-services/src/lib/task-list/components/task-header.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-header.component.spec.ts index 38f103ab7e..082eb5580a 100644 --- a/lib/process-services/src/lib/task-list/components/task-header.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-header.component.spec.ts @@ -17,8 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { AppConfigService, setupTestBed } from '@alfresco/adf-core'; -import { BpmUserService } from '@alfresco/adf-core'; +import { AppConfigService, setupTestBed, BpmUserService } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { completedTaskDetailsMock, diff --git a/lib/process-services/src/lib/task-list/components/task-list.component.spec.ts b/lib/process-services/src/lib/task-list/components/task-list.component.spec.ts index 6040c9b6f8..bab789129e 100644 --- a/lib/process-services/src/lib/task-list/components/task-list.component.spec.ts +++ b/lib/process-services/src/lib/task-list/components/task-list.component.spec.ts @@ -18,8 +18,7 @@ import { Component, SimpleChange, ViewChild } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { AppConfigService, setupTestBed, CoreModule, DataTableModule } from '@alfresco/adf-core'; -import { DataRowEvent, ObjectDataRow } from '@alfresco/adf-core'; +import { AppConfigService, setupTestBed, CoreModule, DataTableModule, DataRowEvent, ObjectDataRow } from '@alfresco/adf-core'; import { TaskListService } from '../services/tasklist.service'; import { TaskListComponent } from './task-list.component'; import { ProcessTestingModule } from '../../testing/process.testing.module'; diff --git a/lib/process-services/src/lib/task-list/components/task-list.component.ts b/lib/process-services/src/lib/task-list/components/task-list.component.ts index 1535907aa1..9f0bdce750 100644 --- a/lib/process-services/src/lib/task-list/components/task-list.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-list.component.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { DataRowEvent, DataTableAdapter, DataTableSchema, CustomEmptyContentTemplateDirective, CustomLoadingContentTemplateDirective } from '@alfresco/adf-core'; import { + DataRowEvent, DataTableAdapter, DataTableSchema, CustomEmptyContentTemplateDirective, CustomLoadingContentTemplateDirective, AppConfigService, PaginationComponent, PaginatedComponent, UserPreferencesService, UserPreferenceValues, PaginationModel } from '@alfresco/adf-core'; import { diff --git a/lib/process-services/src/lib/task-list/services/tasklist.service.spec.ts b/lib/process-services/src/lib/task-list/services/tasklist.service.spec.ts index 0e928be281..1ae6a6c3d5 100644 --- a/lib/process-services/src/lib/task-list/services/tasklist.service.spec.ts +++ b/lib/process-services/src/lib/task-list/services/tasklist.service.spec.ts @@ -16,7 +16,7 @@ */ import { async } from '@angular/core/testing'; -import { UserProcessModel, setupTestBed, CoreModule, StorageService } from '@alfresco/adf-core'; +import { UserProcessModel, setupTestBed, CoreModule, StorageService, AlfrescoApiServiceMock, LogService, AppConfigService } from '@alfresco/adf-core'; import { of } from 'rxjs'; import { fakeCompletedTaskList, @@ -35,7 +35,6 @@ import { import { FilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model'; import { TaskDetailsModel } from '../models/task-details.model'; import { TaskListService } from './tasklist.service'; -import { AlfrescoApiServiceMock, LogService, AppConfigService } from '@alfresco/adf-core'; import { TaskUpdateRepresentation } from '@alfresco/js-api'; declare let jasmine: any; diff --git a/lib/testing/src/lib/content-services/dialog/download-dialog.page.ts b/lib/testing/src/lib/content-services/dialog/download-dialog.page.ts index 49226aa39b..e9c3796cc4 100644 --- a/lib/testing/src/lib/content-services/dialog/download-dialog.page.ts +++ b/lib/testing/src/lib/content-services/dialog/download-dialog.page.ts @@ -15,9 +15,8 @@ * limitations under the License. */ -import { by, element } from 'protractor'; +import { by, element, ElementFinder } from 'protractor'; import { BrowserActions } from '../../core/utils/browser-actions'; -import { ElementFinder } from 'protractor'; export class DownloadDialogPage { cancelButton: ElementFinder = element(by.id(`cancel-button`)); diff --git a/lib/testing/src/lib/content-services/pages/search/search-radio.page.ts b/lib/testing/src/lib/content-services/pages/search/search-radio.page.ts index b99827757b..9df0e17168 100644 --- a/lib/testing/src/lib/content-services/pages/search/search-radio.page.ts +++ b/lib/testing/src/lib/content-services/pages/search/search-radio.page.ts @@ -15,10 +15,9 @@ * limitations under the License. */ -import { element, by, browser } from 'protractor'; +import { element, by, browser, ElementFinder } from 'protractor'; import { BrowserActions } from '../../../core/utils/browser-actions'; import { BrowserVisibility } from '../../../core/utils/browser-visibility'; -import { ElementFinder } from 'protractor'; export class SearchRadioPage { diff --git a/lib/testing/src/lib/core/pages/error.page.ts b/lib/testing/src/lib/core/pages/error.page.ts index cb3dc69e6c..f67729d619 100644 --- a/lib/testing/src/lib/core/pages/error.page.ts +++ b/lib/testing/src/lib/core/pages/error.page.ts @@ -16,9 +16,8 @@ */ import { BrowserVisibility } from '../utils/browser-visibility'; -import { element, by } from 'protractor'; +import { element, by, ElementFinder } from 'protractor'; import { BrowserActions } from '../utils/browser-actions'; -import { ElementFinder } from 'protractor'; export class ErrorPage { diff --git a/lib/testing/src/lib/core/pages/form/formFields.ts b/lib/testing/src/lib/core/pages/form/formFields.ts index 28758cc31a..119ca17628 100644 --- a/lib/testing/src/lib/core/pages/form/formFields.ts +++ b/lib/testing/src/lib/core/pages/form/formFields.ts @@ -15,9 +15,8 @@ * limitations under the License. */ -import { by, element, Locator } from 'protractor'; +import { by, element, Locator, ElementFinder } from 'protractor'; import { BrowserVisibility, BrowserActions } from '../../utils/public-api'; -import { ElementFinder } from 'protractor'; export class FormFields { diff --git a/lib/testing/src/lib/core/pages/form/widgets/attachFileWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/attachFileWidget.ts index f5f8d78048..f24ba538d8 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/attachFileWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/attachFileWidget.ts @@ -18,8 +18,7 @@ import { FormFields } from '../formFields'; import { BrowserVisibility, BrowserActions } from '../../../utils/public-api'; import * as remote from 'selenium-webdriver/remote'; -import { element, by, browser } from 'protractor'; -import { ElementFinder } from 'protractor'; +import { element, by, browser, ElementFinder } from 'protractor'; export class AttachFileWidget { diff --git a/lib/testing/src/lib/core/pages/form/widgets/checkboxWidget.ts b/lib/testing/src/lib/core/pages/form/widgets/checkboxWidget.ts index a3901ff601..6c25041139 100644 --- a/lib/testing/src/lib/core/pages/form/widgets/checkboxWidget.ts +++ b/lib/testing/src/lib/core/pages/form/widgets/checkboxWidget.ts @@ -17,8 +17,7 @@ import { FormFields } from '../formFields'; import { BrowserActions, BrowserVisibility } from '../../../utils/public-api'; -import { by, element, Locator } from 'protractor'; -import { ElementFinder } from 'protractor'; +import { by, element, Locator, ElementFinder } from 'protractor'; export class CheckboxWidget { diff --git a/lib/testing/src/lib/core/pages/header.page.ts b/lib/testing/src/lib/core/pages/header.page.ts index af1cbccbd8..4e8a29ea7b 100644 --- a/lib/testing/src/lib/core/pages/header.page.ts +++ b/lib/testing/src/lib/core/pages/header.page.ts @@ -15,10 +15,9 @@ * limitations under the License. */ -import { element, by, protractor, browser } from 'protractor'; +import { element, by, protractor, browser, ElementFinder } from 'protractor'; import { BrowserVisibility } from '../utils/browser-visibility'; import { BrowserActions } from '../utils/browser-actions'; -import { ElementFinder } from 'protractor'; export class HeaderPage { diff --git a/lib/testing/src/lib/core/pages/login.page.ts b/lib/testing/src/lib/core/pages/login.page.ts index 669400b58a..df84b96773 100644 --- a/lib/testing/src/lib/core/pages/login.page.ts +++ b/lib/testing/src/lib/core/pages/login.page.ts @@ -16,11 +16,10 @@ */ import { FormControllersPage } from './form-controller.page'; -import { browser, by, element } from 'protractor'; +import { browser, by, element, ElementFinder } from 'protractor'; import { BrowserVisibility } from '../utils/browser-visibility'; import { LocalStorageUtil } from '../utils/local-storage.util'; import { BrowserActions } from '../utils/browser-actions'; -import { ElementFinder } from 'protractor'; export class LoginPage { diff --git a/lib/testing/src/lib/core/pages/notification-history.page.ts b/lib/testing/src/lib/core/pages/notification-history.page.ts index 5792b0ac6b..576ee94a2d 100644 --- a/lib/testing/src/lib/core/pages/notification-history.page.ts +++ b/lib/testing/src/lib/core/pages/notification-history.page.ts @@ -15,9 +15,8 @@ * limitations under the License. */ -import { by, element } from 'protractor'; +import { by, element, ElementFinder } from 'protractor'; import { BrowserActions } from '../utils/browser-actions'; -import { ElementFinder } from 'protractor'; export class NotificationHistoryPage { diff --git a/lib/testing/src/lib/core/pages/pagination.page.ts b/lib/testing/src/lib/core/pages/pagination.page.ts index 47e62337ca..887e994583 100644 --- a/lib/testing/src/lib/core/pages/pagination.page.ts +++ b/lib/testing/src/lib/core/pages/pagination.page.ts @@ -15,10 +15,9 @@ * limitations under the License. */ -import { browser, by, element, Locator } from 'protractor'; +import { browser, by, element, Locator, ElementFinder } from 'protractor'; import { BrowserVisibility } from '../utils/browser-visibility'; import { BrowserActions } from '../utils/browser-actions'; -import { ElementFinder } from 'protractor'; export class PaginationPage { diff --git a/lib/testing/src/lib/core/pages/user-info.page.ts b/lib/testing/src/lib/core/pages/user-info.page.ts index dc315b5faf..c5ef8bad89 100644 --- a/lib/testing/src/lib/core/pages/user-info.page.ts +++ b/lib/testing/src/lib/core/pages/user-info.page.ts @@ -15,11 +15,10 @@ * limitations under the License. */ -import { element, by } from 'protractor'; +import { element, by, ElementFinder } from 'protractor'; import { BrowserVisibility } from '../utils/browser-visibility'; import { TabsPage } from '../../material/pages/tabs.page'; import { BrowserActions } from '../utils/browser-actions'; -import { ElementFinder } from 'protractor'; export class UserInfoPage { diff --git a/lib/testing/src/lib/process-services-cloud/app/app-list-cloud.page.ts b/lib/testing/src/lib/process-services-cloud/app/app-list-cloud.page.ts index 36c86667d1..bf39d38245 100644 --- a/lib/testing/src/lib/process-services-cloud/app/app-list-cloud.page.ts +++ b/lib/testing/src/lib/process-services-cloud/app/app-list-cloud.page.ts @@ -15,10 +15,9 @@ * limitations under the License. */ -import { element, by } from 'protractor'; +import { element, by, ElementArrayFinder, ElementFinder } from 'protractor'; import { BrowserVisibility } from '../../core/utils/browser-visibility'; import { BrowserActions } from '../../core/utils/browser-actions'; -import { ElementArrayFinder, ElementFinder } from 'protractor'; export class AppListCloudPage { diff --git a/lib/testing/src/lib/process-services-cloud/pages/dialog/edit-process-filter-dialog.page.ts b/lib/testing/src/lib/process-services-cloud/pages/dialog/edit-process-filter-dialog.page.ts index 23fdb7e9cb..b09d3ae708 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/dialog/edit-process-filter-dialog.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/dialog/edit-process-filter-dialog.page.ts @@ -15,11 +15,9 @@ * limitations under the License. */ -import { browser, by, element } from 'protractor'; +import { browser, by, element, ElementFinder, Locator } from 'protractor'; import { BrowserVisibility } from '../../../core/utils/browser-visibility'; import { BrowserActions } from '../../../core/utils/browser-actions'; -import { ElementFinder } from 'protractor'; -import { Locator } from 'protractor/built/locators'; export class EditProcessFilterDialogPage { diff --git a/lib/testing/src/lib/process-services-cloud/pages/dialog/edit-task-filter-dialog.page.ts b/lib/testing/src/lib/process-services-cloud/pages/dialog/edit-task-filter-dialog.page.ts index e0251df23d..3afea789ef 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/dialog/edit-task-filter-dialog.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/dialog/edit-task-filter-dialog.page.ts @@ -15,10 +15,9 @@ * limitations under the License. */ -import { browser, by, element, Locator } from 'protractor'; +import { browser, by, element, Locator, ElementFinder } from 'protractor'; import { BrowserVisibility } from '../../../core/utils/browser-visibility'; import { BrowserActions } from '../../../core/utils/browser-actions'; -import { ElementFinder } from 'protractor'; export class EditTaskFilterDialogPage { diff --git a/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts index 6833c87376..00bb2b306c 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/edit-process-filter-cloud-component.page.ts @@ -14,11 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { browser, by, element, protractor } from 'protractor'; +import { browser, by, element, protractor, ElementFinder } from 'protractor'; import { EditProcessFilterDialogPage } from './dialog/edit-process-filter-dialog.page'; import { BrowserVisibility } from '../../core/utils/browser-visibility'; import { BrowserActions } from '../../core/utils/browser-actions'; -import { ElementFinder } from 'protractor'; export class EditProcessFilterCloudComponentPage { diff --git a/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts index 7db252cc7e..4404203d75 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts @@ -15,11 +15,10 @@ * limitations under the License. */ -import { browser, by, element, protractor } from 'protractor'; +import { browser, by, element, protractor, ElementFinder } from 'protractor'; import { EditTaskFilterDialogPage } from './dialog/edit-task-filter-dialog.page'; import { BrowserVisibility } from '../../core/utils/browser-visibility'; import { BrowserActions } from '../../core/utils/browser-actions'; -import { ElementFinder } from 'protractor'; export class EditTaskFilterCloudComponentPage { diff --git a/lib/testing/src/lib/process-services-cloud/pages/process-header-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/process-header-cloud-component.page.ts index f3bcd8c198..caec4e02a6 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/process-header-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/process-header-cloud-component.page.ts @@ -15,9 +15,8 @@ * limitations under the License. */ -import { element, by } from 'protractor'; +import { element, by, ElementFinder } from 'protractor'; import { BrowserActions } from '../../core/utils/browser-actions'; -import { ElementFinder } from 'protractor'; export class ProcessHeaderCloudPage { diff --git a/lib/testing/src/lib/process-services-cloud/pages/start-tasks-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/start-tasks-cloud-component.page.ts index 923bf47c24..ffbadbc3a6 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/start-tasks-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/start-tasks-cloud-component.page.ts @@ -15,10 +15,9 @@ * limitations under the License. */ -import { element, by, Key } from 'protractor'; +import { element, by, Key, ElementFinder } from 'protractor'; import { BrowserVisibility } from '../../core/utils/browser-visibility'; import { BrowserActions } from '../../core/utils/browser-actions'; -import { ElementFinder } from 'protractor'; export class StartTasksCloudPage { diff --git a/lib/testing/src/lib/process-services-cloud/pages/task-form-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/task-form-cloud-component.page.ts index 17b79dfb1d..817e42c197 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/task-form-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/task-form-cloud-component.page.ts @@ -15,11 +15,10 @@ * limitations under the License. */ -import { element, by } from 'protractor'; +import { element, by, ElementFinder } from 'protractor'; import { BrowserVisibility } from '../../core/utils/browser-visibility'; import { BrowserActions } from '../../core/utils/browser-actions'; import { FormFields } from '../../core/pages/form/formFields'; -import { ElementFinder } from 'protractor'; export class TaskFormCloudComponent { diff --git a/lib/testing/src/lib/process-services-cloud/pages/task-header-cloud-component.page.ts b/lib/testing/src/lib/process-services-cloud/pages/task-header-cloud-component.page.ts index 62358a3f5d..9101ce0653 100644 --- a/lib/testing/src/lib/process-services-cloud/pages/task-header-cloud-component.page.ts +++ b/lib/testing/src/lib/process-services-cloud/pages/task-header-cloud-component.page.ts @@ -15,10 +15,9 @@ * limitations under the License. */ -import { element, by } from 'protractor'; +import { element, by, ElementFinder } from 'protractor'; import { BrowserActions } from '../../core/utils/browser-actions'; import { BrowserVisibility } from '../../core/utils/browser-visibility'; -import { ElementFinder } from 'protractor'; export class TaskHeaderCloudPage { diff --git a/tslint.json b/tslint.json index 80cd0964b8..1570c50413 100644 --- a/tslint.json +++ b/tslint.json @@ -191,6 +191,7 @@ "adf-prefix-name": true, "no-input-rename": true, "no-output-rename": true, + "no-duplicate-imports": true, "rxjs-ban-operators": { "severity": "error" },