From 98774395d213c2d76f209763689de9e280dadc21 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Wed, 10 Jun 2020 15:29:02 +0100 Subject: [PATCH] fix imports (#5769) --- .../process-service/form-viewer.component.ts | 3 +-- .../process-service/show-diagram.component.ts | 3 +-- e2e/actions/users.actions.ts | 11 ++++------- e2e/core/user-info-component.e2e.ts | 4 ++-- e2e/pages/adf/content-services.page.ts | 2 +- .../adf/process-services/attachment-list.page.ts | 5 ++--- e2e/pages/adf/version-manager.page.ts | 2 +- e2e/process-services/checklist-component.e2e.ts | 4 ++-- e2e/process-services/people-component.e2e.ts | 4 ++-- e2e/process-services/standalone-task.e2e.ts | 4 ++-- e2e/process-services/start-task-task-app.e2e.ts | 4 ++-- .../task-attachment-list-action-menu.e2e.ts | 4 ++-- 12 files changed, 22 insertions(+), 28 deletions(-) diff --git a/demo-shell/src/app/components/process-service/form-viewer.component.ts b/demo-shell/src/app/components/process-service/form-viewer.component.ts index 496dcb2993..5818d8f9da 100644 --- a/demo-shell/src/app/components/process-service/form-viewer.component.ts +++ b/demo-shell/src/app/components/process-service/form-viewer.component.ts @@ -16,8 +16,7 @@ */ import { Component, OnInit } from '@angular/core'; -import { ActivatedRoute } from '@angular/router'; -import { Params } from '@angular/router/src/shared'; +import { ActivatedRoute, Params } from '@angular/router'; @Component({ selector: 'app-form-viewer', diff --git a/demo-shell/src/app/components/process-service/show-diagram.component.ts b/demo-shell/src/app/components/process-service/show-diagram.component.ts index 2872bddef6..232b8114f0 100644 --- a/demo-shell/src/app/components/process-service/show-diagram.component.ts +++ b/demo-shell/src/app/components/process-service/show-diagram.component.ts @@ -16,8 +16,7 @@ */ import { Component } from '@angular/core'; -import { ActivatedRoute, Router } from '@angular/router'; -import { Params } from '@angular/router/src/shared'; +import { ActivatedRoute, Router, Params } from '@angular/router'; @Component({ selector: 'app-show-diagram', diff --git a/e2e/actions/users.actions.ts b/e2e/actions/users.actions.ts index 337efa57e5..59c7e6da99 100644 --- a/e2e/actions/users.actions.ts +++ b/e2e/actions/users.actions.ts @@ -15,16 +15,13 @@ * limitations under the License. */ -import path = require('path'); -import fs = require('fs'); -import remote = require('selenium-webdriver/remote'); - +import * as path from 'path'; +import * as fs from 'fs'; +import * as remote from 'selenium-webdriver/remote'; import { browser } from 'protractor'; - -import { ImageUploadRepresentation } from '@alfresco/js-api'; +import { ImageUploadRepresentation, UserRepresentation } from '@alfresco/js-api'; import { ApiService, IdentityService, UserModel, Logger } from '@alfresco/adf-testing'; import { Tenant } from '../models/APS/tenant'; -import { UserRepresentation } from '@alfresco/js-api/src/api/activiti-rest-api/model/userRepresentation'; export class UsersActions { diff --git a/e2e/core/user-info-component.e2e.ts b/e2e/core/user-info-component.e2e.ts index 0aa8c2728e..5baff615cb 100644 --- a/e2e/core/user-info-component.e2e.ts +++ b/e2e/core/user-info-component.e2e.ts @@ -21,8 +21,8 @@ import { browser } from 'protractor'; import { UsersActions } from '../actions/users.actions'; import { FileModel } from '../models/ACS/file.model'; import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; -import path = require('path'); -import fs = require('fs'); +import * as path from 'path'; +import * as fs from 'fs'; describe('User Info component', () => { diff --git a/e2e/pages/adf/content-services.page.ts b/e2e/pages/adf/content-services.page.ts index b43844ab45..3f1502e146 100644 --- a/e2e/pages/adf/content-services.page.ts +++ b/e2e/pages/adf/content-services.page.ts @@ -21,7 +21,7 @@ import { CreateLibraryDialogPage } from './dialog/create-library-dialog.page'; import { FolderDialogPage } from './dialog/folder-dialog.page'; import { NavigationBarPage } from './navigation-bar.page'; -import path = require('path'); +import * as path from 'path'; export class ContentServicesPage { diff --git a/e2e/pages/adf/process-services/attachment-list.page.ts b/e2e/pages/adf/process-services/attachment-list.page.ts index 1dec00c999..7534659b04 100644 --- a/e2e/pages/adf/process-services/attachment-list.page.ts +++ b/e2e/pages/adf/process-services/attachment-list.page.ts @@ -16,9 +16,8 @@ */ import { element, by, protractor, browser, ElementFinder } from 'protractor'; - -import path = require('path'); -import remote = require('selenium-webdriver/remote'); +import * as path from 'path'; +import * as remote from 'selenium-webdriver/remote'; import { BrowserVisibility, BrowserActions } from '@alfresco/adf-testing'; export class AttachmentListPage { diff --git a/e2e/pages/adf/version-manager.page.ts b/e2e/pages/adf/version-manager.page.ts index a7c5bd76fc..5423c98c5a 100644 --- a/e2e/pages/adf/version-manager.page.ts +++ b/e2e/pages/adf/version-manager.page.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import path = require('path'); +import * as path from 'path'; import { BrowserActions, BrowserVisibility, TogglePage } from '@alfresco/adf-testing'; import { browser, by, element, ElementFinder } from 'protractor'; diff --git a/e2e/process-services/checklist-component.e2e.ts b/e2e/process-services/checklist-component.e2e.ts index e69addd8dd..fd582084bc 100644 --- a/e2e/process-services/checklist-component.e2e.ts +++ b/e2e/process-services/checklist-component.e2e.ts @@ -23,8 +23,8 @@ import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import CONSTANTS = require('../util/constants'); import { browser } from 'protractor'; import { UsersActions } from '../actions/users.actions'; -import fs = require('fs'); -import path = require('path'); +import * as fs from 'fs'; +import * as path from 'path'; import { TaskRepresentation } from '@alfresco/js-api'; describe('Checklist component', () => { diff --git a/e2e/process-services/people-component.e2e.ts b/e2e/process-services/people-component.e2e.ts index 853a73c004..4432c85921 100644 --- a/e2e/process-services/people-component.e2e.ts +++ b/e2e/process-services/people-component.e2e.ts @@ -22,8 +22,8 @@ import { ProcessServicesPage } from '../pages/adf/process-services/process-servi import CONSTANTS = require('../util/constants'); import { browser } from 'protractor'; import { UsersActions } from '../actions/users.actions'; -import fs = require('fs'); -import path = require('path'); +import * as fs from 'fs'; +import * as path from 'path'; import { TaskRepresentation } from '@alfresco/js-api'; describe('People component', () => { diff --git a/e2e/process-services/standalone-task.e2e.ts b/e2e/process-services/standalone-task.e2e.ts index d3d6e0e4f6..67b34186be 100644 --- a/e2e/process-services/standalone-task.e2e.ts +++ b/e2e/process-services/standalone-task.e2e.ts @@ -23,8 +23,8 @@ import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import CONSTANTS = require('../util/constants'); import Task = require('../models/APS/Task'); import { UsersActions } from '../actions/users.actions'; -import fs = require('fs'); -import path = require('path'); +import * as fs from 'fs'; +import * as path from 'path'; describe('Start Task - Task App', () => { diff --git a/e2e/process-services/start-task-task-app.e2e.ts b/e2e/process-services/start-task-task-app.e2e.ts index 4446f3220a..bb556bc766 100644 --- a/e2e/process-services/start-task-task-app.e2e.ts +++ b/e2e/process-services/start-task-task-app.e2e.ts @@ -25,8 +25,8 @@ import { ChecklistDialog } from '../pages/adf/process-services/dialog/create-che import { ProcessServiceTabBarPage } from '../pages/adf/process-services/process-service-tab-bar.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import CONSTANTS = require('../util/constants'); -import fs = require('fs'); -import path = require('path'); +import * as fs from 'fs'; +import * as path from 'path'; import { TaskRepresentation } from '@alfresco/js-api'; describe('Start Task - Task App', () => { diff --git a/e2e/process-services/task-attachment-list-action-menu.e2e.ts b/e2e/process-services/task-attachment-list-action-menu.e2e.ts index 674c5d793c..9095155f3a 100644 --- a/e2e/process-services/task-attachment-list-action-menu.e2e.ts +++ b/e2e/process-services/task-attachment-list-action-menu.e2e.ts @@ -21,8 +21,8 @@ import { NavigationBarPage } from '../pages/adf/navigation-bar.page'; import { TasksPage } from '../pages/adf/process-services/tasks.page'; import { AttachmentListPage } from '../pages/adf/process-services/attachment-list.page'; import CONSTANTS = require('../util/constants'); -import path = require('path'); -import fs = require('fs'); +import * as fs from 'fs'; +import * as path from 'path'; import { UsersActions } from '../actions/users.actions'; import { FileModel } from '../models/ACS/file.model'; import { TaskRepresentation } from '@alfresco/js-api';