diff --git a/demo-shell/.angular-cli.json b/demo-shell/.angular-cli.json index c8699820d6..948a596ee9 100644 --- a/demo-shell/.angular-cli.json +++ b/demo-shell/.angular-cli.json @@ -24,23 +24,43 @@ }, { "glob": "**/*", - "input": "../node_modules/core/bundles/assets", - "output": "./assets/" + "input": "../node_modules/@alfresco/adf-core/bundles/assets", + "output": "./core/assets/" }, { "glob": "**/*", - "input": "../node_modules/insights/bundles/assets", - "output": "./assets/" + "input": "../node_modules/@alfresco/adf-insights/bundles/assets", + "output": "./insights/assets/" }, { "glob": "**/*", - "input": "../node_modules/process-services/bundles/assets", - "output": "./assets/" + "input": "../node_modules/@alfresco/adf-process-services/bundles/assets", + "output": "./process-services/assets/" }, { "glob": "**/*", - "input": "../node_modules/content-services/bundles/assets", - "output": "./assets/" + "input": "../node_modules/@alfresco/adf-content-services/bundles/assets", + "output": "./content-services/assets/" + }, + { + "glob": "**/*", + "input": "../node_modules/@alfresco/adf-core/i18n", + "output": "./assets/@alfresco/core/i18n" + }, + { + "glob": "**/*", + "input": "../node_modules/@alfresco/adf-insights/i18n", + "output": "./assets/@alfresco/insights/i18n" + }, + { + "glob": "**/*", + "input": "../node_modules/@alfresco/adf-process-services/i18n", + "output": "./assets/@alfresco/process-services/i18n" + }, + { + "glob": "**/*", + "input": "../node_modules/@alfresco/adf-content-services/i18n", + "output": "./assets/@alfresco/content-services/i18n" }, { "glob": "pdf.worker.js", "input": "../node_modules/pdfjs-dist/build", "output": "./" } ], @@ -108,22 +128,22 @@ { "glob": "**/*", "input": "../../lib/core/i18n", - "output": "./assets/@adf/core/i18n" + "output": "./@alfresco/core/i18n" }, { "glob": "**/*", "input": "../../lib/insights/i18n", - "output": "./assets/@adf/insights/i18n" + "output": "./@alfresco/insights/i18n" }, { "glob": "**/*", "input": "../../lib/process-services/i18n", - "output": "./assets/@adf/process-services/i18n" + "output": "./@alfresco/process-services/i18n" }, { "glob": "**/*", "input": "../../lib/content-services/i18n", - "output": "./assets/@adf/content-services/i18n" + "output": "./@alfresco/content-services/i18n" }, { "glob": "pdf.worker.js", "input": "../node_modules/pdfjs-dist/build", "output": "./" } ], diff --git a/demo-shell/package.json b/demo-shell/package.json index 92853f89cc..d0ee9be023 100644 --- a/demo-shell/package.json +++ b/demo-shell/package.json @@ -7,7 +7,7 @@ "ng": "ng", "start": "npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --app=0 --open --aot=true", "start:dev": "npm run style:dev & npm run clean-lib-angular && npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --disable-host-check --app=1 pp-dev --proxy-config proxy.conf.js --open", - "start:dist": "npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --disable-host-check --aot=false --prod --app=0", + "start:dist": "npm run server-versions && rimraf dist && ng serve --host 0.0.0.0 --disable-host-check --aot=false --app=0", "build": "npm run server-versions && rimraf dist && ng build -app=0", "build:dev": "npm run style:dev & npm run server-versions && rimraf dist && ng build -app=1", "style:dev": "npm run webpack -- --config config/webpack.style.js --progress --profile --bail --watch", @@ -72,11 +72,11 @@ "@angular/platform-browser-dynamic": "5.0.0", "@angular/router": "5.0.0", "@ngx-translate/core": "8.0.0", - "alfresco-js-api": "^2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0", - "@alfresco/adf-content-services": "v2.0.0-8596ba4d39c79d593b878cc0a98abe1a2878ebda", - "@alfresco/adf-process-services": "v2.0.0-8596ba4d39c79d593b878cc0a98abe1a2878ebda", - "@alfresco/adf-core": "v2.0.0-8596ba4d39c79d593b878cc0a98abe1a2878ebda", - "@alfresco/adf-insights": "v2.0.0-8596ba4d39c79d593b878cc0a98abe1a2878ebda", + "alfresco-js-api": "2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0", + "@alfresco/adf-content-services": "2.0.0-303d0166157d305ebfbf1578bf5d1eadcaa631cc", + "@alfresco/adf-process-services": "2.0.0-303d0166157d305ebfbf1578bf5d1eadcaa631cc", + "@alfresco/adf-core": "2.0.0-303d0166157d305ebfbf1578bf5d1eadcaa631cc", + "@alfresco/adf-insights": "2.0.0-303d0166157d305ebfbf1578bf5d1eadcaa631cc", "chart.js": "2.5.0", "classlist.js": "1.1.20150312", "core-js": "2.4.1", diff --git a/demo-shell/src/app/adf.module.ts b/demo-shell/src/app/adf.module.ts index d50c562a76..5e2ae8cd1d 100644 --- a/demo-shell/src/app/adf.module.ts +++ b/demo-shell/src/app/adf.module.ts @@ -1,9 +1,9 @@ import { NgModule } from '@angular/core'; -import { ContentModule } from '@alfresco/content-services'; -import { ProcessModule } from '@alfresco/process-services'; -import { CoreModule } from '@alfresco/core'; -import { InsightsModule } from '@alfresco/insights'; +import { ContentModule } from '@alfresco/adf-content-services'; +import { ProcessModule } from '@alfresco/adf-process-services'; +import { CoreModule } from '@alfresco/adf-core'; +import { InsightsModule } from '@alfresco/adf-insights'; export function modules() { return [ diff --git a/demo-shell/src/app/app.component.ts b/demo-shell/src/app/app.component.ts index f25f92e608..6295d568a1 100644 --- a/demo-shell/src/app/app.component.ts +++ b/demo-shell/src/app/app.component.ts @@ -17,7 +17,7 @@ import { Component, ViewEncapsulation } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { SettingsService, PageTitleService, StorageService, TranslationService } from '@alfresco/core'; +import { SettingsService, PageTitleService, StorageService, TranslationService } from '@alfresco/adf-core'; @Component({ selector: 'app-root', diff --git a/demo-shell/src/app/app.module.ts b/demo-shell/src/app/app.module.ts index 5007965579..f7e67cf675 100644 --- a/demo-shell/src/app/app.module.ts +++ b/demo-shell/src/app/app.module.ts @@ -7,7 +7,7 @@ import { ChartsModule } from 'ng2-charts'; import { HttpClientModule } from '@angular/common/http'; import { TranslateService } from '@ngx-translate/core'; -import { AppConfigService, TRANSLATION_PROVIDER } from '@alfresco/core'; +import { AppConfigService, TRANSLATION_PROVIDER } from '@alfresco/adf-core'; import { AppComponent } from './app.component'; import { AdfModule } from './adf.module'; import { MaterialModule } from './material.module'; diff --git a/demo-shell/src/app/app.routes.ts b/demo-shell/src/app/app.routes.ts index a7c4c6c93e..5505e4da96 100644 --- a/demo-shell/src/app/app.routes.ts +++ b/demo-shell/src/app/app.routes.ts @@ -17,7 +17,7 @@ import { ModuleWithProviders } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { AuthGuard, AuthGuardBpm, AuthGuardEcm } from '@alfresco/core'; +import { AuthGuard, AuthGuardBpm, AuthGuardEcm } from '@alfresco/adf-core'; import { AppLayoutComponent } from './components/app-layout/app-layout.component'; import { LoginComponent } from './components/login/login.component'; import { SettingsComponent } from './components/settings/settings.component'; @@ -37,7 +37,7 @@ import { SocialComponent } from './components/social/social.component'; import { FilesComponent } from './components/files/files.component'; import { FormComponent } from './components/form/form.component'; -import { UploadButtonComponent } from '@alfresco/content-services'; +import { UploadButtonComponent } from '@alfresco/adf-content-services'; import { FileViewComponent } from './components/file-view/file-view.component'; import { CustomSourcesComponent } from './components/files/custom-sources.component'; import { FormListComponent } from './components/form/form-list.component'; diff --git a/demo-shell/src/app/components/about/about.component.ts b/demo-shell/src/app/components/about/about.component.ts index 916c6e811f..fb11864e79 100644 --- a/demo-shell/src/app/components/about/about.component.ts +++ b/demo-shell/src/app/components/about/about.component.ts @@ -24,7 +24,7 @@ import { DiscoveryApiService, EcmProductVersionModel, ObjectDataTableAdapter -} from '@alfresco/core'; +} from '@alfresco/adf-core'; @Component({ selector: 'adf-about-page', @@ -123,7 +123,7 @@ export class AboutComponent implements OnInit { private gitHubLinkCreation(alfrescoPackagesTableRepresentation): void { let corePackage = alfrescoPackagesTableRepresentation.find((packageUp) => { - return packageUp.name === '@alfresco/core'; + return packageUp.name === '@alfresco/adf-core'; }); if (corePackage) { diff --git a/demo-shell/src/app/components/activiti/activiti-process-attachments.component.ts b/demo-shell/src/app/components/activiti/activiti-process-attachments.component.ts index c616048a31..8ff15ade3f 100644 --- a/demo-shell/src/app/components/activiti/activiti-process-attachments.component.ts +++ b/demo-shell/src/app/components/activiti/activiti-process-attachments.component.ts @@ -17,8 +17,8 @@ import { Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core'; import { ProcessInstance, ProcessService , - ProcessAttachmentListComponent, ProcessUploadService } from '@alfresco/process-services'; -import { UploadService } from '@alfresco/core'; + ProcessAttachmentListComponent, ProcessUploadService } from '@alfresco/adf-process-services'; +import { UploadService } from '@alfresco/adf-core'; @Component({ selector: 'activiti-process-attachments', diff --git a/demo-shell/src/app/components/activiti/activiti-task-attachments.component.ts b/demo-shell/src/app/components/activiti/activiti-task-attachments.component.ts index d4c3c858a7..8582f80160 100644 --- a/demo-shell/src/app/components/activiti/activiti-task-attachments.component.ts +++ b/demo-shell/src/app/components/activiti/activiti-task-attachments.component.ts @@ -16,8 +16,8 @@ */ import { Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core'; -import { ProcessUploadService, TaskListService, TaskAttachmentListComponent } from '@alfresco/process-services'; -import { UploadService } from '@alfresco/core'; +import { ProcessUploadService, TaskListService, TaskAttachmentListComponent } from '@alfresco/adf-process-services'; +import { UploadService } from '@alfresco/adf-core'; @Component({ selector: 'activiti-task-attachments', diff --git a/demo-shell/src/app/components/activiti/activiti.component.ts b/demo-shell/src/app/components/activiti/activiti.component.ts index 64951fe805..64b1bf8287 100644 --- a/demo-shell/src/app/components/activiti/activiti.component.ts +++ b/demo-shell/src/app/components/activiti/activiti.component.ts @@ -31,9 +31,9 @@ import { Pagination, ProcessInstanceFilterRepresentation } from 'alfresco-js-api import { FORM_FIELD_VALIDATORS, FormEvent, FormFieldEvent, FormRenderingService, FormService, DynamicTableRow, ValidateDynamicTableRowEvent -} from '@alfresco/core'; +} from '@alfresco/adf-core'; -import { AnalyticsReportListComponent } from '@alfresco/insights'; +import { AnalyticsReportListComponent } from '@alfresco/adf-insights'; import { ProcessFiltersComponent, @@ -41,7 +41,7 @@ import { ProcessInstanceDetailsComponent, ProcessInstanceListComponent, StartProcessInstanceComponent -} from '@alfresco/process-services'; +} from '@alfresco/adf-process-services'; import { AppsListComponent, FilterRepresentationModel, @@ -50,14 +50,14 @@ import { TaskFiltersComponent, TaskListComponent, TaskListService -} from '@alfresco/process-services'; -import { LogService } from '@alfresco/core'; -import { AlfrescoApiService } from '@alfresco/core'; +} from '@alfresco/adf-process-services'; +import { LogService } from '@alfresco/adf-core'; +import { AlfrescoApiService } from '@alfresco/adf-core'; import { DataSorting, ObjectDataRow, ObjectDataTableAdapter -} from '@alfresco/core'; +} from '@alfresco/adf-core'; import { Subscription } from 'rxjs/Rx'; import { /*CustomEditorComponent*/ CustomStencil01 } from './custom-editor/custom-editor.component'; import { DemoFieldValidator } from './demo-field-validator'; diff --git a/demo-shell/src/app/components/activiti/apps-view.component.ts b/demo-shell/src/app/components/activiti/apps-view.component.ts index 4283f09eef..fcd2331524 100644 --- a/demo-shell/src/app/components/activiti/apps-view.component.ts +++ b/demo-shell/src/app/components/activiti/apps-view.component.ts @@ -17,7 +17,7 @@ import { Component } from '@angular/core'; import { Router } from '@angular/router'; -import { AppDefinitionRepresentationModel } from '@alfresco/process-services'; +import { AppDefinitionRepresentationModel } from '@alfresco/adf-process-services'; @Component({ selector: 'activiti-apps-view', diff --git a/demo-shell/src/app/components/activiti/custom-editor/custom-editor.component.ts b/demo-shell/src/app/components/activiti/custom-editor/custom-editor.component.ts index 96728e281f..bbe39dd559 100644 --- a/demo-shell/src/app/components/activiti/custom-editor/custom-editor.component.ts +++ b/demo-shell/src/app/components/activiti/custom-editor/custom-editor.component.ts @@ -18,7 +18,7 @@ /* tslint:disable */ import { Component, NgModule } from '@angular/core'; -import { WidgetComponent } from '@alfresco/core'; +import { WidgetComponent } from '@alfresco/adf-core'; @Component({ selector: 'custom-editor', diff --git a/demo-shell/src/app/components/activiti/demo-field-validator.ts b/demo-shell/src/app/components/activiti/demo-field-validator.ts index d72a6075b2..fb0b6b6a22 100644 --- a/demo-shell/src/app/components/activiti/demo-field-validator.ts +++ b/demo-shell/src/app/components/activiti/demo-field-validator.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { FormFieldModel, FormFieldTypes, FormFieldValidator } from '@alfresco/core'; +import { FormFieldModel, FormFieldTypes, FormFieldValidator } from '@alfresco/adf-core'; export class DemoFieldValidator implements FormFieldValidator { diff --git a/demo-shell/src/app/components/datatable/datatable.component.ts b/demo-shell/src/app/components/datatable/datatable.component.ts index 17113ddd97..51c406f914 100644 --- a/demo-shell/src/app/components/datatable/datatable.component.ts +++ b/demo-shell/src/app/components/datatable/datatable.component.ts @@ -16,8 +16,8 @@ */ import { Component, Input } from '@angular/core'; -import { AlfrescoApiService, LogService } from '@alfresco/core'; -import { DataCellEvent, DataRowActionEvent, DataSorting, ObjectDataColumn, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/core'; +import { AlfrescoApiService, LogService } from '@alfresco/adf-core'; +import { DataCellEvent, DataRowActionEvent, DataSorting, ObjectDataColumn, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Observable'; @Component({ diff --git a/demo-shell/src/app/components/file-view/file-view.component.ts b/demo-shell/src/app/components/file-view/file-view.component.ts index 48638ff425..0362474ed4 100644 --- a/demo-shell/src/app/components/file-view/file-view.component.ts +++ b/demo-shell/src/app/components/file-view/file-view.component.ts @@ -17,7 +17,7 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { AlfrescoApiService } from '@alfresco/core'; +import { AlfrescoApiService } from '@alfresco/adf-core'; @Component({ selector: 'adf-file-view', diff --git a/demo-shell/src/app/components/files/custom-sources.component.ts b/demo-shell/src/app/components/files/custom-sources.component.ts index b3c60d8c10..378ab11ce2 100644 --- a/demo-shell/src/app/components/files/custom-sources.component.ts +++ b/demo-shell/src/app/components/files/custom-sources.component.ts @@ -16,7 +16,7 @@ */ import { Component, Input, ViewChild } from '@angular/core'; -import { DocumentListComponent } from '@alfresco/content-services'; +import { DocumentListComponent } from '@alfresco/adf-content-services'; @Component({ selector: 'adf-custom-sources', diff --git a/demo-shell/src/app/components/files/files.component.ts b/demo-shell/src/app/components/files/files.component.ts index 6898c118d1..a8722517ee 100644 --- a/demo-shell/src/app/components/files/files.component.ts +++ b/demo-shell/src/app/components/files/files.component.ts @@ -26,9 +26,9 @@ import { AlfrescoApiService, ContentService, TranslationService, FileUploadEvent, FolderCreatedEvent, LogService, NotificationService, SiteModel, UploadService, DataColumn, DataRow -} from '@alfresco/core'; +} from '@alfresco/adf-core'; -import { DocumentListComponent, PermissionStyleModel, DownloadZipDialogComponent } from '@alfresco/content-services'; +import { DocumentListComponent, PermissionStyleModel, DownloadZipDialogComponent } from '@alfresco/adf-content-services'; import { VersionManagerDialogAdapterComponent } from './version-manager-dialog-adapter.component'; import { Subscription } from 'rxjs/Rx'; diff --git a/demo-shell/src/app/components/form/form-list.component.ts b/demo-shell/src/app/components/form/form-list.component.ts index 0e81b2fc7e..af30206f8d 100644 --- a/demo-shell/src/app/components/form/form-list.component.ts +++ b/demo-shell/src/app/components/form/form-list.component.ts @@ -16,7 +16,7 @@ */ import { Component, ViewChild } from '@angular/core'; -import { FormComponent, FormModel, FormService, LogService } from '@alfresco/core'; +import { FormComponent, FormModel, FormService, LogService } from '@alfresco/adf-core'; @Component({ selector: 'form-list', diff --git a/demo-shell/src/app/components/form/form.component.ts b/demo-shell/src/app/components/form/form.component.ts index 101eb369e2..8f7d7c0b25 100644 --- a/demo-shell/src/app/components/form/form.component.ts +++ b/demo-shell/src/app/components/form/form.component.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, OnInit } from '@angular/core'; -import { FormModel, FormService, LogService } from '@alfresco/core'; +import { FormModel, FormService, LogService } from '@alfresco/adf-core'; import { InMemoryFormService } from '../../services/in-memory-form.service'; import { DemoForm } from './demo-form'; diff --git a/demo-shell/src/app/components/home/home.component.spec.ts b/demo-shell/src/app/components/home/home.component.spec.ts index 2c6916a218..ad28f4c549 100644 --- a/demo-shell/src/app/components/home/home.component.spec.ts +++ b/demo-shell/src/app/components/home/home.component.spec.ts @@ -18,7 +18,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { TestBed } from '@angular/core/testing'; import { HomeComponent } from './home.component'; -import { CoreModule } from '@alfresco/core'; +import { CoreModule } from '@alfresco/adf-core'; describe('HomeComponent', () => { beforeEach(() => { diff --git a/demo-shell/src/app/components/login/login.component.ts b/demo-shell/src/app/components/login/login.component.ts index a575c7aa95..43a33c30e9 100644 --- a/demo-shell/src/app/components/login/login.component.ts +++ b/demo-shell/src/app/components/login/login.component.ts @@ -18,7 +18,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { Validators } from '@angular/forms'; import { Router } from '@angular/router'; -import { LogService, StorageService } from '@alfresco/core'; +import { LogService, StorageService } from '@alfresco/adf-core'; @Component({ selector: 'login', diff --git a/demo-shell/src/app/components/search/search-bar.component.ts b/demo-shell/src/app/components/search/search-bar.component.ts index 1e9c727573..9e3735a928 100644 --- a/demo-shell/src/app/components/search/search-bar.component.ts +++ b/demo-shell/src/app/components/search/search-bar.component.ts @@ -18,7 +18,7 @@ import { Component, EventEmitter, Output, Input } from '@angular/core'; import { Router } from '@angular/router'; import { MinimalNodeEntity } from 'alfresco-js-api'; -import { AuthenticationService } from '@alfresco/core'; +import { AuthenticationService } from '@alfresco/adf-core'; @Component({ selector: 'adf-search-bar', diff --git a/demo-shell/src/app/components/search/search-result.component.ts b/demo-shell/src/app/components/search/search-result.component.ts index d2666ff669..b8eb7ba836 100644 --- a/demo-shell/src/app/components/search/search-result.component.ts +++ b/demo-shell/src/app/components/search/search-result.component.ts @@ -18,7 +18,7 @@ import { Component, OnInit, Optional, ViewChild } from '@angular/core'; import { Router, ActivatedRoute, Params } from '@angular/router'; import { NodePaging } from 'alfresco-js-api'; -import { SearchComponent } from '@alfresco/content-services'; +import { SearchComponent } from '@alfresco/adf-content-services'; @Component({ selector: 'adf-search-result-component', diff --git a/demo-shell/src/app/components/settings/settings.component.ts b/demo-shell/src/app/components/settings/settings.component.ts index ad6f462117..51ac2d1100 100644 --- a/demo-shell/src/app/components/settings/settings.component.ts +++ b/demo-shell/src/app/components/settings/settings.component.ts @@ -16,7 +16,7 @@ */ import { Component } from '@angular/core'; -import { LogService } from '@alfresco/core'; +import { LogService } from '@alfresco/adf-core'; @Component({ selector: 'app-settings', diff --git a/demo-shell/src/app/components/webscript/webscript.component.ts b/demo-shell/src/app/components/webscript/webscript.component.ts index 93363e7b8a..c0da8fe05c 100644 --- a/demo-shell/src/app/components/webscript/webscript.component.ts +++ b/demo-shell/src/app/components/webscript/webscript.component.ts @@ -16,7 +16,7 @@ */ import { Component } from '@angular/core'; -import { LogService } from '@alfresco/core'; +import { LogService } from '@alfresco/adf-core'; @Component({ selector: 'alfresco-webscript', diff --git a/demo-shell/src/app/services/debug-app-config.service.ts b/demo-shell/src/app/services/debug-app-config.service.ts index 068b2dd26e..b2f2c9c915 100644 --- a/demo-shell/src/app/services/debug-app-config.service.ts +++ b/demo-shell/src/app/services/debug-app-config.service.ts @@ -17,7 +17,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; -import { AppConfigService, StorageService } from '@alfresco/core'; +import { AppConfigService, StorageService } from '@alfresco/adf-core'; @Injectable() export class DebugAppConfigService extends AppConfigService { diff --git a/demo-shell/src/app/services/in-memory-form.service.ts b/demo-shell/src/app/services/in-memory-form.service.ts index 54137c8e20..cf086009e8 100644 --- a/demo-shell/src/app/services/in-memory-form.service.ts +++ b/demo-shell/src/app/services/in-memory-form.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { AppConfigService, AlfrescoApiService, EcmModelService, LogService, FormFieldOption, FormService } from '@alfresco/core'; +import { AppConfigService, AlfrescoApiService, EcmModelService, LogService, FormFieldOption, FormService } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Observable'; interface ActivitiData { diff --git a/demo-shell/src/custom-style.scss b/demo-shell/src/custom-style.scss index 8646d96c64..e444243614 100644 --- a/demo-shell/src/custom-style.scss +++ b/demo-shell/src/custom-style.scss @@ -1,9 +1,9 @@ @import './app/components/app-layout/app-layout.component.scss'; -@import 'content-services/styles/index'; -@import 'process-services/styles/index'; -@import 'insights/styles/index'; -@import 'core/styles/index'; +@import '~@alfresco/adf-content-services/styles/index'; +@import '~@alfresco/adf-process-services/styles/index'; +@import '~@alfresco/adf-insights/styles/index'; +@import '~@alfresco/adf-core/styles/index'; @import '~@angular/material/theming'; diff --git a/demo-shell/src/tsconfig.dev.json b/demo-shell/src/tsconfig.dev.json index e14274fab9..d11dc25c06 100644 --- a/demo-shell/src/tsconfig.dev.json +++ b/demo-shell/src/tsconfig.dev.json @@ -17,8 +17,17 @@ "@angular/*": [ "../node_modules/@angular/*" ], - "@alfresco/*": [ - "../../lib/*" + "@alfresco/adf-core": [ + "../../lib/core" + ], + "@alfresco/adf-content-services": [ + "../../lib/content-services" + ], + "@alfresco/adf-process-services": [ + "../../lib/process-services" + ], + "@alfresco/adf-insights": [ + "../../lib/insights" ] } }, diff --git a/lib/config/karma-test-shim.js b/lib/config/karma-test-shim.js index 5a7b07ffbc..c9ed23e1e0 100644 --- a/lib/config/karma-test-shim.js +++ b/lib/config/karma-test-shim.js @@ -17,11 +17,11 @@ var appContext = require.context(".", true, /.spec.ts/);appContext.keys().forEac const TestBed = require('@angular/core/testing').TestBed; const browser = require('@angular/platform-browser-dynamic/testing'); -const CoreModule = require('@alfresco/core').CoreModule; -const AppConfigService = require('@alfresco/core').AppConfigService; -const AppConfigServiceMock = require('@alfresco/core').AppConfigServiceMock; -const TranslationService = require('@alfresco/core').TranslationService; -const TranslationMock = require('@alfresco/core').TranslationMock; +const CoreModule = require('@alfresco/adf-core').CoreModule; +const AppConfigService = require('@alfresco/adf-core').AppConfigService; +const AppConfigServiceMock = require('@alfresco/adf-core').AppConfigServiceMock; +const TranslationService = require('@alfresco/adf-core').TranslationService; +const TranslationMock = require('@alfresco/adf-core').TranslationMock; const TranslateModule = require('@ngx-translate/core').TranslateModule; const CommonModule = require('@angular/common').CommonModule; const FormsModule = require('@angular/forms').FormsModule; diff --git a/lib/config/webpack.common.js b/lib/config/webpack.common.js index 7b25eb411e..7f7313b4c5 100644 --- a/lib/config/webpack.common.js +++ b/lib/config/webpack.common.js @@ -26,14 +26,14 @@ module.exports = { resolve: { alias: { - "@alfresco/content-services": path.resolve(__dirname, '../content-services/'), - "@alfresco/content-services$": path.resolve(__dirname, '../content-services/index.ts'), - "@alfresco/process-services": path.resolve(__dirname, '../process-services/'), - "@alfresco/process-services$": path.resolve(__dirname, '../process-services/index.ts'), - "@alfresco/core": path.resolve(__dirname, '../core/'), - "@alfresco/core$": path.resolve(__dirname, '../core/index.ts'), - "@alfresco/insights": path.resolve(__dirname, '../insights/'), - "@alfresco/insights": path.resolve(__dirname, '../insights/index.ts') + "@alfresco/adf-content-services": path.resolve(__dirname, '../content-services/'), + "@alfresco/adf-content-services$": path.resolve(__dirname, '../content-services/index.ts'), + "@alfresco/adf-process-services": path.resolve(__dirname, '../process-services/'), + "@alfresco/adf-process-services$": path.resolve(__dirname, '../process-services/index.ts'), + "@alfresco/adf-core": path.resolve(__dirname, '../core/'), + "@alfresco/adf-core$": path.resolve(__dirname, '../core/index.ts'), + "@alfresco/adf-insights": path.resolve(__dirname, '../insights/'), + "@alfresco/adf-insights": path.resolve(__dirname, '../insights/index.ts') }, extensions: ['.ts', '.js', '.scss'], modules: [helpers.root('node_modules')] diff --git a/lib/content-services/.npmignore b/lib/content-services/.npmignore new file mode 100644 index 0000000000..a30cc5773b --- /dev/null +++ b/lib/content-services/.npmignore @@ -0,0 +1,19 @@ +npm-debug.log +.idea +.npmrc + +coverage/ +demo/ +dist/ +node_modules +typings/ +fonts/ + +/.editorconfig +/.travis.yml +/*.json +/karma-test-shim.js +/karma.conf.js +/gulpfile.ts +/.npmignore +/.happypack diff --git a/lib/content-services/breadcrumb/breadcrumb.component.spec.ts b/lib/content-services/breadcrumb/breadcrumb.component.spec.ts index ddfc6af357..d58ec1b16d 100644 --- a/lib/content-services/breadcrumb/breadcrumb.component.spec.ts +++ b/lib/content-services/breadcrumb/breadcrumb.component.spec.ts @@ -18,7 +18,7 @@ import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { PathElementEntity } from 'alfresco-js-api'; -import { DataTableModule } from '@alfresco/core'; +import { DataTableModule } from '@alfresco/adf-core'; import { fakeNodeWithCreatePermission } from '../mock'; import { MaterialModule } from '../material.module'; import { DocumentListService, DocumentListComponent } from '../document-list'; diff --git a/lib/content-services/breadcrumb/dropdown-breadcrumb.component.spec.ts b/lib/content-services/breadcrumb/dropdown-breadcrumb.component.spec.ts index d62d3f62b4..0dde798568 100644 --- a/lib/content-services/breadcrumb/dropdown-breadcrumb.component.spec.ts +++ b/lib/content-services/breadcrumb/dropdown-breadcrumb.component.spec.ts @@ -18,7 +18,7 @@ import { CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { DataTableModule } from '@alfresco/core'; +import { DataTableModule } from '@alfresco/adf-core'; import { fakeNodeWithCreatePermission } from '../mock'; import { MaterialModule } from '../material.module'; import { DocumentListComponent, DocumentListService } from '../document-list'; diff --git a/lib/content-services/content-node-selector/content-node-selector.component.spec.ts b/lib/content-services/content-node-selector/content-node-selector.component.spec.ts index c7ac5fe4f5..b1b6d352bd 100644 --- a/lib/content-services/content-node-selector/content-node-selector.component.spec.ts +++ b/lib/content-services/content-node-selector/content-node-selector.component.spec.ts @@ -20,8 +20,8 @@ import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; import { By } from '@angular/platform-browser'; import { MinimalNodeEntryEntity } from 'alfresco-js-api'; -import { ContentService, TranslationService, SearchService, SiteModel, SitesApiService } from '@alfresco/core'; -import { DataTableModule } from '@alfresco/core'; +import { ContentService, TranslationService, SearchService, SiteModel, SitesApiService } from '@alfresco/adf-core'; +import { DataTableModule } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Rx'; import { MaterialModule } from '../material.module'; import { EmptyFolderContentDirective, DocumentListComponent, DocumentListService } from '../document-list'; diff --git a/lib/content-services/content-node-selector/content-node-selector.component.ts b/lib/content-services/content-node-selector/content-node-selector.component.ts index ff4090115f..3e7f9b9cff 100644 --- a/lib/content-services/content-node-selector/content-node-selector.component.ts +++ b/lib/content-services/content-node-selector/content-node-selector.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Inject, Input, OnInit, Optional, Output, ViewChild, ViewEncapsulation } from '@angular/core'; -import { ContentService, HighlightDirective, SiteModel } from '@alfresco/core'; +import { ContentService, HighlightDirective, SiteModel } from '@alfresco/adf-core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; import { MinimalNodeEntryEntity, NodePaging, Pagination } from 'alfresco-js-api'; import { DocumentListComponent, PaginationStrategy } from '../document-list/components/document-list.component'; diff --git a/lib/content-services/content-node-selector/content-node-selector.module.ts b/lib/content-services/content-node-selector/content-node-selector.module.ts index a30d9bcb01..086d1bfb08 100644 --- a/lib/content-services/content-node-selector/content-node-selector.module.ts +++ b/lib/content-services/content-node-selector/content-node-selector.module.ts @@ -24,7 +24,7 @@ import { ContentNodeSelectorComponent } from './content-node-selector.component' import { ContentNodeSelectorService } from './content-node-selector.service'; import { SitesDropdownModule } from '../site-dropdown'; import { BreadcrumbModule } from '../breadcrumb'; -import { PaginationModule, ToolbarModule } from '@alfresco/core'; +import { PaginationModule, ToolbarModule } from '@alfresco/adf-core'; import { DocumentListModule } from '../document-list'; @NgModule({ diff --git a/lib/content-services/content-node-selector/content-node-selector.service.ts b/lib/content-services/content-node-selector/content-node-selector.service.ts index 7ca8c494e8..4d7e8fc37b 100644 --- a/lib/content-services/content-node-selector/content-node-selector.service.ts +++ b/lib/content-services/content-node-selector/content-node-selector.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { SearchOptions, SearchService } from '@alfresco/core'; +import { SearchOptions, SearchService } from '@alfresco/adf-core'; import { Injectable } from '@angular/core'; import { NodePaging } from 'alfresco-js-api'; import { Observable } from 'rxjs/Rx'; diff --git a/lib/content-services/content.module.ts b/lib/content-services/content.module.ts index 140be17512..125676c6c6 100644 --- a/lib/content-services/content.module.ts +++ b/lib/content-services/content.module.ts @@ -19,7 +19,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { CoreModule, TRANSLATION_PROVIDER } from '@alfresco/core'; +import { CoreModule, TRANSLATION_PROVIDER } from '@alfresco/adf-core'; import { MaterialModule } from './material.module'; @@ -62,8 +62,8 @@ import { DirectiveModule } from './directive'; provide: TRANSLATION_PROVIDER, multi: true, useValue: { - name: '@adf/content-services', - source: 'assets/@adf/content-services' + name: '@alfresco/content-services', + source: '@alfresco/content-services' } } ], diff --git a/lib/content-services/dialogs/dialog.module.ts b/lib/content-services/dialogs/dialog.module.ts index c154673aaa..0fa6b130a6 100644 --- a/lib/content-services/dialogs/dialog.module.ts +++ b/lib/content-services/dialogs/dialog.module.ts @@ -24,7 +24,7 @@ import { FolderDialogComponent } from './folder.dialog'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { NodesApiService, NotificationService, TranslationService } from '@alfresco/core'; +import { NodesApiService, NotificationService, TranslationService } from '@alfresco/adf-core'; @NgModule({ imports: [ diff --git a/lib/content-services/dialogs/download-zip.dialog.ts b/lib/content-services/dialogs/download-zip.dialog.ts index 073d3339e7..ffdb2f472a 100644 --- a/lib/content-services/dialogs/download-zip.dialog.ts +++ b/lib/content-services/dialogs/download-zip.dialog.ts @@ -18,7 +18,7 @@ import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; import { DownloadEntry, MinimalNodeEntity } from 'alfresco-js-api'; -import { LogService, AlfrescoApiService } from '@alfresco/core'; +import { LogService, AlfrescoApiService } from '@alfresco/adf-core'; @Component({ selector: 'adf-download-zip-dialog', diff --git a/lib/content-services/dialogs/folder.dialog.spec.ts b/lib/content-services/dialogs/folder.dialog.spec.ts index f849d55ff5..784513bbf3 100644 --- a/lib/content-services/dialogs/folder.dialog.spec.ts +++ b/lib/content-services/dialogs/folder.dialog.spec.ts @@ -23,7 +23,7 @@ import { MaterialModule } from '../material.module'; import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing'; import { Observable } from 'rxjs/Rx'; -import { NodesApiService, NotificationService, TranslationService } from '@alfresco/core'; +import { NodesApiService, NotificationService, TranslationService } from '@alfresco/adf-core'; import { FolderDialogComponent } from './folder.dialog'; describe('FolderDialogComponent', () => { diff --git a/lib/content-services/dialogs/folder.dialog.ts b/lib/content-services/dialogs/folder.dialog.ts index 42b961952a..33bf99aab7 100644 --- a/lib/content-services/dialogs/folder.dialog.ts +++ b/lib/content-services/dialogs/folder.dialog.ts @@ -22,7 +22,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; import { MinimalNodeEntryEntity } from 'alfresco-js-api'; -import { NodesApiService, NotificationService, TranslationService } from '@alfresco/core'; +import { NodesApiService, NotificationService, TranslationService } from '@alfresco/adf-core'; import { forbidEndingDot, forbidOnlySpaces, forbidSpecialCharacters } from './folder-name.validators'; diff --git a/lib/content-services/directive/folder-create.directive.spec.ts b/lib/content-services/directive/folder-create.directive.spec.ts index ae5a47c5f3..c764794ed9 100644 --- a/lib/content-services/directive/folder-create.directive.spec.ts +++ b/lib/content-services/directive/folder-create.directive.spec.ts @@ -24,7 +24,7 @@ import { By } from '@angular/platform-browser'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs/Rx'; -import { AppConfigService, DirectiveModule, ContentService, TranslateLoaderService } from '@alfresco/core'; +import { AppConfigService, DirectiveModule, ContentService, TranslateLoaderService } from '@alfresco/adf-core'; import { FolderCreateDirective } from './folder-create.directive'; @Component({ diff --git a/lib/content-services/directive/folder-create.directive.ts b/lib/content-services/directive/folder-create.directive.ts index 5ded96536d..493b0b20c1 100644 --- a/lib/content-services/directive/folder-create.directive.ts +++ b/lib/content-services/directive/folder-create.directive.ts @@ -19,7 +19,7 @@ import { Directive, HostListener, Input } from '@angular/core'; import { MatDialog, MatDialogConfig } from '@angular/material'; import { MinimalNodeEntryEntity } from 'alfresco-js-api'; import { FolderDialogComponent } from '../dialogs/folder.dialog'; -import { ContentService } from '@alfresco/core'; +import { ContentService } from '@alfresco/adf-core'; const DEFAULT_FOLDER_PARENT_ID = '-my-'; diff --git a/lib/content-services/directive/folder-edit.directive.spec.ts b/lib/content-services/directive/folder-edit.directive.spec.ts index c765c4d9c2..7589d63468 100644 --- a/lib/content-services/directive/folder-edit.directive.spec.ts +++ b/lib/content-services/directive/folder-edit.directive.spec.ts @@ -25,7 +25,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { Observable } from 'rxjs/Rx'; -import { AppConfigService, ContentService, TranslateLoaderService, DirectiveModule } from '@alfresco/core'; +import { AppConfigService, ContentService, TranslateLoaderService, DirectiveModule } from '@alfresco/adf-core'; import { FolderEditDirective } from './folder-edit.directive'; @Component({ diff --git a/lib/content-services/directive/folder-edit.directive.ts b/lib/content-services/directive/folder-edit.directive.ts index 3aaa4badd8..3db1a46751 100644 --- a/lib/content-services/directive/folder-edit.directive.ts +++ b/lib/content-services/directive/folder-edit.directive.ts @@ -21,7 +21,7 @@ import { MatDialog, MatDialogConfig } from '@angular/material'; import { MinimalNodeEntryEntity } from 'alfresco-js-api'; import { FolderDialogComponent } from '../dialogs/folder.dialog'; -import { ContentService } from '@alfresco/core'; +import { ContentService } from '@alfresco/adf-core'; @Directive({ selector: '[adf-edit-folder]' diff --git a/lib/content-services/document-list/components/content-action/content-action-list.component.spec.ts b/lib/content-services/document-list/components/content-action/content-action-list.component.spec.ts index 358527b860..5dcdcb532f 100644 --- a/lib/content-services/document-list/components/content-action/content-action-list.component.spec.ts +++ b/lib/content-services/document-list/components/content-action/content-action-list.component.spec.ts @@ -17,7 +17,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { async, TestBed } from '@angular/core/testing'; -import { DataTableModule } from '@alfresco/core'; +import { DataTableModule } from '@alfresco/adf-core'; import { MaterialModule } from '../../../material.module'; import { DocumentListService } from '../../services/document-list.service'; import { ContentActionModel } from './../../models/content-action.model'; diff --git a/lib/content-services/document-list/components/content-action/content-action.component.spec.ts b/lib/content-services/document-list/components/content-action/content-action.component.spec.ts index 770799d5cf..0fa7099fba 100644 --- a/lib/content-services/document-list/components/content-action/content-action.component.spec.ts +++ b/lib/content-services/document-list/components/content-action/content-action.component.spec.ts @@ -18,8 +18,8 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { EventEmitter } from '@angular/core'; import { async, TestBed } from '@angular/core/testing'; -import { ContentService, TranslationService, NotificationService } from '@alfresco/core'; -import { DataTableModule } from '@alfresco/core'; +import { ContentService, TranslationService, NotificationService } from '@alfresco/adf-core'; +import { DataTableModule } from '@alfresco/adf-core'; import { MaterialModule } from '../../../material.module'; import { DocumentListService } from '../../services/document-list.service'; diff --git a/lib/content-services/document-list/components/content-column/content-column-list.component.spec.ts b/lib/content-services/document-list/components/content-column/content-column-list.component.spec.ts index 266bcfdda9..b0cef75fc7 100644 --- a/lib/content-services/document-list/components/content-column/content-column-list.component.spec.ts +++ b/lib/content-services/document-list/components/content-column/content-column-list.component.spec.ts @@ -17,10 +17,10 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { async, TestBed } from '@angular/core/testing'; -import { DataColumn, DataTableModule } from '@alfresco/core'; +import { DataColumn, DataTableModule } from '@alfresco/adf-core'; import { MaterialModule } from '../../../material.module'; -import { LogService } from '@alfresco/core'; +import { LogService } from '@alfresco/adf-core'; import { DocumentListService } from '../../services/document-list.service'; import { DocumentListComponent } from './../document-list.component'; import { ContentColumnListComponent } from './content-column-list.component'; diff --git a/lib/content-services/document-list/components/content-column/content-column-list.component.ts b/lib/content-services/document-list/components/content-column/content-column-list.component.ts index 07c5b06acb..e41e865d17 100644 --- a/lib/content-services/document-list/components/content-column/content-column-list.component.ts +++ b/lib/content-services/document-list/components/content-column/content-column-list.component.ts @@ -17,8 +17,8 @@ /* tslint:disable:component-selector */ -import { DataColumn } from '@alfresco/core'; -import { LogService } from '@alfresco/core'; +import { DataColumn } from '@alfresco/adf-core'; +import { LogService } from '@alfresco/adf-core'; import { Component } from '@angular/core'; import { DocumentListComponent } from './../document-list.component'; diff --git a/lib/content-services/document-list/components/content-column/content-column.component.spec.ts b/lib/content-services/document-list/components/content-column/content-column.component.spec.ts index 3d63565b5a..ef8400ee76 100644 --- a/lib/content-services/document-list/components/content-column/content-column.component.spec.ts +++ b/lib/content-services/document-list/components/content-column/content-column.component.spec.ts @@ -17,8 +17,8 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { async, TestBed } from '@angular/core/testing'; -import { LogService } from '@alfresco/core'; -import { DataTableModule } from '@alfresco/core'; +import { LogService } from '@alfresco/adf-core'; +import { DataTableModule } from '@alfresco/adf-core'; import { MaterialModule } from '../../../material.module'; import { DocumentListService } from '../../services/document-list.service'; import { DocumentListComponent } from './../document-list.component'; diff --git a/lib/content-services/document-list/components/content-column/content-column.component.ts b/lib/content-services/document-list/components/content-column/content-column.component.ts index 982497f02e..ebca175b37 100644 --- a/lib/content-services/document-list/components/content-column/content-column.component.ts +++ b/lib/content-services/document-list/components/content-column/content-column.component.ts @@ -17,8 +17,8 @@ /* tslint:disable:component-selector */ -import { DataColumn } from '@alfresco/core'; -import { LogService } from '@alfresco/core'; +import { DataColumn } from '@alfresco/adf-core'; +import { LogService } from '@alfresco/adf-core'; import { AfterContentInit, Component, ContentChild, Input, OnInit, TemplateRef } from '@angular/core'; import { ContentColumnListComponent } from './content-column-list.component'; diff --git a/lib/content-services/document-list/components/document-list.component.spec.ts b/lib/content-services/document-list/components/document-list.component.spec.ts index 02618ca941..f5e3c95dbe 100644 --- a/lib/content-services/document-list/components/document-list.component.spec.ts +++ b/lib/content-services/document-list/components/document-list.component.spec.ts @@ -18,9 +18,9 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgZone, SimpleChange, TemplateRef } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { Pagination } from 'alfresco-js-api'; -import { AlfrescoApiService, TranslationService, AppConfigService, UserPreferencesService } from '@alfresco/core'; -import { DataColumn, DataTableComponent } from '@alfresco/core'; -import { DataTableModule } from '@alfresco/core'; +import { AlfrescoApiService, TranslationService, AppConfigService, UserPreferencesService } from '@alfresco/adf-core'; +import { DataColumn, DataTableComponent } from '@alfresco/adf-core'; +import { DataTableModule } from '@alfresco/adf-core'; import { Observable, Subject } from 'rxjs/Rx'; import { FileNode, FolderNode } from '../../mock'; import { diff --git a/lib/content-services/document-list/components/document-list.component.ts b/lib/content-services/document-list/components/document-list.component.ts index 0065a5f912..13771f8082 100644 --- a/lib/content-services/document-list/components/document-list.component.ts +++ b/lib/content-services/document-list/components/document-list.component.ts @@ -22,8 +22,8 @@ import { DataSorting, DataTableComponent, ObjectDataColumn -} from '@alfresco/core'; -import { AlfrescoApiService, AppConfigService, DataColumnListComponent, UserPreferencesService } from '@alfresco/core'; +} from '@alfresco/adf-core'; +import { AlfrescoApiService, AppConfigService, DataColumnListComponent, UserPreferencesService } from '@alfresco/adf-core'; import { AfterContentInit, Component, ContentChild, ElementRef, EventEmitter, HostListener, Input, NgZone, OnChanges, OnInit, Output, SimpleChanges, TemplateRef, ViewChild, ViewEncapsulation diff --git a/lib/content-services/document-list/components/empty-folder/empty-folder-content.directive.spec.ts b/lib/content-services/document-list/components/empty-folder/empty-folder-content.directive.spec.ts index 827fd70daf..48fd0681a6 100644 --- a/lib/content-services/document-list/components/empty-folder/empty-folder-content.directive.spec.ts +++ b/lib/content-services/document-list/components/empty-folder/empty-folder-content.directive.spec.ts @@ -17,7 +17,7 @@ import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { async, TestBed } from '@angular/core/testing'; -import { DataTableComponent, DataTableModule } from '@alfresco/core'; +import { DataTableComponent, DataTableModule } from '@alfresco/adf-core'; import { MaterialModule } from '../../../material.module'; import { DocumentListService } from '../../services/document-list.service'; diff --git a/lib/content-services/document-list/components/no-permission/no-permission-content.directive.spec.ts b/lib/content-services/document-list/components/no-permission/no-permission-content.directive.spec.ts index 098c089944..032de585a9 100644 --- a/lib/content-services/document-list/components/no-permission/no-permission-content.directive.spec.ts +++ b/lib/content-services/document-list/components/no-permission/no-permission-content.directive.spec.ts @@ -17,7 +17,7 @@ import { async, TestBed } from '@angular/core/testing'; import { MatProgressSpinnerModule } from '@angular/material'; -import { DataTableComponent, DataTableModule } from '@alfresco/core'; +import { DataTableComponent, DataTableModule } from '@alfresco/adf-core'; import { DocumentListService } from '../../services/document-list.service'; import { MaterialModule } from '../../../material.module'; diff --git a/lib/content-services/document-list/components/node.event.ts b/lib/content-services/document-list/components/node.event.ts index d836d761b6..aa633ef57d 100644 --- a/lib/content-services/document-list/components/node.event.ts +++ b/lib/content-services/document-list/components/node.event.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { BaseEvent } from '@alfresco/core'; +import { BaseEvent } from '@alfresco/adf-core'; import { MinimalNodeEntity, MinimalNodeEntryEntity } from 'alfresco-js-api'; export class NodeEntityEvent extends BaseEvent { diff --git a/lib/content-services/document-list/data/image-resolver.model.ts b/lib/content-services/document-list/data/image-resolver.model.ts index c5fe27a05e..d887efab4b 100644 --- a/lib/content-services/document-list/data/image-resolver.model.ts +++ b/lib/content-services/document-list/data/image-resolver.model.ts @@ -15,6 +15,6 @@ * limitations under the License. */ -import { DataColumn, DataRow } from '@alfresco/core'; +import { DataColumn, DataRow } from '@alfresco/adf-core'; export type ImageResolver = (row: DataRow, column: DataColumn) => string; diff --git a/lib/content-services/document-list/data/share-data-row.model.ts b/lib/content-services/document-list/data/share-data-row.model.ts index 59c7771d32..45bf73737b 100644 --- a/lib/content-services/document-list/data/share-data-row.model.ts +++ b/lib/content-services/document-list/data/share-data-row.model.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { DataRow } from '@alfresco/core'; -import { ObjectUtils } from '@alfresco/core'; +import { DataRow } from '@alfresco/adf-core'; +import { ObjectUtils } from '@alfresco/adf-core'; import { MinimalNode, MinimalNodeEntity } from 'alfresco-js-api'; import { PermissionStyleModel } from './../models/permissions-style.model'; import { DocumentListService } from './../services/document-list.service'; diff --git a/lib/content-services/document-list/data/share-datatable-adapter.spec.ts b/lib/content-services/document-list/data/share-datatable-adapter.spec.ts index 17f3d55d70..68962b9ec2 100644 --- a/lib/content-services/document-list/data/share-datatable-adapter.spec.ts +++ b/lib/content-services/document-list/data/share-datatable-adapter.spec.ts @@ -16,7 +16,7 @@ */ import { async, TestBed } from '@angular/core/testing'; -import { DataColumn, DataRow, DataSorting } from '@alfresco/core'; +import { DataColumn, DataRow, DataSorting } from '@alfresco/adf-core'; import { FileNode, FolderNode } from './../../mock'; import { DocumentListService } from './../services/document-list.service'; import { ShareDataRow } from './share-data-row.model'; diff --git a/lib/content-services/document-list/data/share-datatable-adapter.ts b/lib/content-services/document-list/data/share-datatable-adapter.ts index 844dfb3bea..071ce62059 100644 --- a/lib/content-services/document-list/data/share-datatable-adapter.ts +++ b/lib/content-services/document-list/data/share-datatable-adapter.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { DataColumn, DataRow, DataSorting, DataTableAdapter } from '@alfresco/core'; -import { TimeAgoPipe } from '@alfresco/core'; +import { DataColumn, DataRow, DataSorting, DataTableAdapter } from '@alfresco/adf-core'; +import { TimeAgoPipe } from '@alfresco/adf-core'; import { DatePipe } from '@angular/common'; import { NodePaging } from 'alfresco-js-api'; import { PermissionStyleModel } from './../models/permissions-style.model'; diff --git a/lib/content-services/document-list/document-list.module.ts b/lib/content-services/document-list/document-list.module.ts index 2588cdd830..da74dea323 100644 --- a/lib/content-services/document-list/document-list.module.ts +++ b/lib/content-services/document-list/document-list.module.ts @@ -19,7 +19,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FlexLayoutModule } from '@angular/flex-layout'; import { TranslateModule } from '@ngx-translate/core'; -import { DataTableModule, PaginationModule, ToolbarModule } from '@alfresco/core'; +import { DataTableModule, PaginationModule, ToolbarModule } from '@alfresco/adf-core'; import { MaterialModule } from '../material.module'; import { UploadModule } from '../upload'; diff --git a/lib/content-services/document-list/models/permissions-style.model.ts b/lib/content-services/document-list/models/permissions-style.model.ts index 36d5969b0d..79eb1dc1c9 100644 --- a/lib/content-services/document-list/models/permissions-style.model.ts +++ b/lib/content-services/document-list/models/permissions-style.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { PermissionsEnum } from '@alfresco/core'; +import { PermissionsEnum } from '@alfresco/adf-core'; export class PermissionStyleModel { css: string; diff --git a/lib/content-services/document-list/services/document-actions.service.spec.ts b/lib/content-services/document-list/services/document-actions.service.spec.ts index d8c6f7e119..6cd7a5f5ae 100644 --- a/lib/content-services/document-list/services/document-actions.service.spec.ts +++ b/lib/content-services/document-list/services/document-actions.service.spec.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ContentService, TranslationService, NotificationService } from '@alfresco/core'; +import { ContentService, TranslationService, NotificationService } from '@alfresco/adf-core'; import { FileNode, FolderNode, DocumentListServiceMock } from '../../mock'; import { ContentActionHandler } from '../models/content-action.model'; import { DocumentActionsService } from './document-actions.service'; diff --git a/lib/content-services/document-list/services/document-actions.service.ts b/lib/content-services/document-list/services/document-actions.service.ts index fa41b72687..e961161230 100644 --- a/lib/content-services/document-list/services/document-actions.service.ts +++ b/lib/content-services/document-list/services/document-actions.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ContentService } from '@alfresco/core'; +import { ContentService } from '@alfresco/adf-core'; import { Injectable } from '@angular/core'; import { MinimalNodeEntity } from 'alfresco-js-api'; import { Observable } from 'rxjs/Observable'; diff --git a/lib/content-services/document-list/services/document-list.service.spec.ts b/lib/content-services/document-list/services/document-list.service.spec.ts index 5ae4838cc5..e1ad20798f 100644 --- a/lib/content-services/document-list/services/document-list.service.spec.ts +++ b/lib/content-services/document-list/services/document-list.service.spec.ts @@ -16,8 +16,8 @@ */ import { async, TestBed } from '@angular/core/testing'; -import { CookieService, LogService } from '@alfresco/core'; -import { CookieServiceMock } from '@alfresco/core'; +import { CookieService, LogService } from '@alfresco/adf-core'; +import { CookieServiceMock } from '@alfresco/adf-core'; import { DocumentListService } from './document-list.service'; declare let jasmine: any; diff --git a/lib/content-services/document-list/services/document-list.service.ts b/lib/content-services/document-list/services/document-list.service.ts index a5a1e6a3de..fdeb06d028 100644 --- a/lib/content-services/document-list/services/document-list.service.ts +++ b/lib/content-services/document-list/services/document-list.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService, AuthenticationService, ContentService, LogService, PermissionsEnum, ThumbnailService } from '@alfresco/core'; +import { AlfrescoApiService, AuthenticationService, ContentService, LogService, PermissionsEnum, ThumbnailService } from '@alfresco/adf-core'; import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { MinimalNodeEntity, MinimalNodeEntryEntity, NodePaging } from 'alfresco-js-api'; diff --git a/lib/content-services/document-list/services/folder-actions.service.spec.ts b/lib/content-services/document-list/services/folder-actions.service.spec.ts index 4ffcb22e3d..d5c323d123 100644 --- a/lib/content-services/document-list/services/folder-actions.service.spec.ts +++ b/lib/content-services/document-list/services/folder-actions.service.spec.ts @@ -16,7 +16,7 @@ */ import { async, TestBed } from '@angular/core/testing'; -import { TranslationService, AppConfigService, NotificationService } from '@alfresco/core'; +import { TranslationService, AppConfigService, NotificationService } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Rx'; import { FileNode, FolderNode } from '../../mock'; import { ContentActionHandler } from '../models/content-action.model'; diff --git a/lib/content-services/document-list/services/folder-actions.service.ts b/lib/content-services/document-list/services/folder-actions.service.ts index cb7c2ca22c..72e7ec669a 100644 --- a/lib/content-services/document-list/services/folder-actions.service.ts +++ b/lib/content-services/document-list/services/folder-actions.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ContentService } from '@alfresco/core'; +import { ContentService } from '@alfresco/adf-core'; import { Injectable } from '@angular/core'; import { MinimalNodeEntity } from 'alfresco-js-api'; import { Observable, Subject } from 'rxjs/Rx'; diff --git a/lib/content-services/document-list/services/node-actions.service.ts b/lib/content-services/document-list/services/node-actions.service.ts index 9bfc0edc8d..31b1632168 100644 --- a/lib/content-services/document-list/services/node-actions.service.ts +++ b/lib/content-services/document-list/services/node-actions.service.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { DataColumn } from '@alfresco/core'; -import { ContentService } from '@alfresco/core'; +import { DataColumn } from '@alfresco/adf-core'; +import { ContentService } from '@alfresco/adf-core'; import { EventEmitter, Injectable } from '@angular/core'; import { MatDialog } from '@angular/material'; import { MinimalNodeEntryEntity } from 'alfresco-js-api'; diff --git a/lib/content-services/karma-test-shim.js b/lib/content-services/karma-test-shim.js index 1ddf519a56..66b295c42a 100644 --- a/lib/content-services/karma-test-shim.js +++ b/lib/content-services/karma-test-shim.js @@ -17,11 +17,11 @@ var appContext = require.context(".", true, /.spec.ts/);appContext.keys().forEac const TestBed = require('@angular/core/testing').TestBed; const browser = require('@angular/platform-browser-dynamic/testing'); -const CoreModule = require('@alfresco/core').CoreModule; -const AppConfigService = require('@alfresco/core').AppConfigService; -const AppConfigServiceMock = require('@alfresco/core').AppConfigServiceMock; -const TranslationService = require('@alfresco/core').TranslationService; -const TranslationMock = require('@alfresco/core').TranslationMock; +const CoreModule = require('@alfresco/adf-core').CoreModule; +const AppConfigService = require('@alfresco/adf-core').AppConfigService; +const AppConfigServiceMock = require('@alfresco/adf-core').AppConfigServiceMock; +const TranslationService = require('@alfresco/adf-core').TranslationService; +const TranslationMock = require('@alfresco/adf-core').TranslationMock; TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting()); diff --git a/lib/content-services/mock/document-list.service.mock.ts b/lib/content-services/mock/document-list.service.mock.ts index f5de75f9fb..8e5d4e6eb5 100644 --- a/lib/content-services/mock/document-list.service.mock.ts +++ b/lib/content-services/mock/document-list.service.mock.ts @@ -22,7 +22,7 @@ import { SettingsService, LogService, ThumbnailService -} from '@alfresco/core'; +} from '@alfresco/adf-core'; import { Observable } from 'rxjs/Rx'; import { NodePaging, DocumentListService } from '../document-list'; import { PageNode } from './document-library.model.mock'; diff --git a/lib/content-services/package.json b/lib/content-services/package.json index f4feaa36b9..213affc1e9 100644 --- a/lib/content-services/package.json +++ b/lib/content-services/package.json @@ -26,8 +26,8 @@ "@angular/platform-browser-dynamic": "5.0.0", "@angular/router": "5.0.0", "@ngx-translate/core": "8.0.0", - "alfresco-js-api": "^2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0", - "@alfresco/adf-core":"v2.0.0-8596ba4d39c79d593b878cc0a98abe1a2878ebda", + "alfresco-js-api": "2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0", + "@alfresco/adf-core": "2.0.0-303d0166157d305ebfbf1578bf5d1eadcaa631cc", "chart.js": "2.5.0", "core-js": "2.4.1", "hammerjs": "2.0.8", diff --git a/lib/content-services/search/components/search-control.component.spec.ts b/lib/content-services/search/components/search-control.component.spec.ts index 8d5409c7d9..3f3eb593e0 100644 --- a/lib/content-services/search/components/search-control.component.spec.ts +++ b/lib/content-services/search/components/search-control.component.spec.ts @@ -19,8 +19,8 @@ import { DebugElement } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { MaterialModule } from '../../material.module'; import { By } from '@angular/platform-browser'; -import { AuthenticationService, SearchService } from '@alfresco/core'; -import { ThumbnailService } from '@alfresco/core'; +import { AuthenticationService, SearchService } from '@alfresco/adf-core'; +import { ThumbnailService } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Observable'; import { noResult, results } from '../../mock'; import { SearchControlComponent } from './search-control.component'; diff --git a/lib/content-services/search/components/search-control.component.ts b/lib/content-services/search/components/search-control.component.ts index 5e5633e79b..f724d2634a 100644 --- a/lib/content-services/search/components/search-control.component.ts +++ b/lib/content-services/search/components/search-control.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AuthenticationService, ThumbnailService } from '@alfresco/core'; +import { AuthenticationService, ThumbnailService } from '@alfresco/adf-core'; import { animate, state, style, transition, trigger } from '@angular/animations'; import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core'; import { MinimalNodeEntity } from 'alfresco-js-api'; diff --git a/lib/content-services/search/components/search.component.spec.ts b/lib/content-services/search/components/search.component.spec.ts index 4db2536041..61d4afb82a 100644 --- a/lib/content-services/search/components/search.component.spec.ts +++ b/lib/content-services/search/components/search.component.spec.ts @@ -16,7 +16,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { SearchService } from '@alfresco/core'; +import { SearchService } from '@alfresco/adf-core'; import { SearchModule } from '../../index'; import { differentResult, result, SimpleSearchTestComponent } from '../../mock'; diff --git a/lib/content-services/search/components/search.component.ts b/lib/content-services/search/components/search.component.ts index 6aaf98e046..c23c1f6c43 100644 --- a/lib/content-services/search/components/search.component.ts +++ b/lib/content-services/search/components/search.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { SearchOptions, SearchService } from '@alfresco/core'; +import { SearchOptions, SearchService } from '@alfresco/adf-core'; import { AfterContentInit, ChangeDetectionStrategy, diff --git a/lib/content-services/search/search.module.ts b/lib/content-services/search/search.module.ts index dfdad9ca26..5a7e25db8d 100644 --- a/lib/content-services/search/search.module.ts +++ b/lib/content-services/search/search.module.ts @@ -21,7 +21,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; import { MaterialModule } from '../material.module'; -import { PipeModule, SearchService } from '@alfresco/core'; +import { PipeModule, SearchService } from '@alfresco/adf-core'; import { SearchTriggerDirective } from './components/search-trigger.directive'; diff --git a/lib/content-services/site-dropdown/sites-dropdown.component.ts b/lib/content-services/site-dropdown/sites-dropdown.component.ts index 02665bdf4f..243ad63799 100644 --- a/lib/content-services/site-dropdown/sites-dropdown.component.ts +++ b/lib/content-services/site-dropdown/sites-dropdown.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { SiteModel, SitesApiService } from '@alfresco/core'; +import { SiteModel, SitesApiService } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; @Component({ diff --git a/lib/content-services/social/services/rating.service.ts b/lib/content-services/social/services/rating.service.ts index 3c7b561af8..04d892a1af 100644 --- a/lib/content-services/social/services/rating.service.ts +++ b/lib/content-services/social/services/rating.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService } from '@alfresco/core'; +import { AlfrescoApiService } from '@alfresco/adf-core'; import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { RatingBody } from 'alfresco-js-api'; diff --git a/lib/content-services/tag/services/tag.service.spec.ts b/lib/content-services/tag/services/tag.service.spec.ts index 2e411e495a..4cf468f6de 100644 --- a/lib/content-services/tag/services/tag.service.spec.ts +++ b/lib/content-services/tag/services/tag.service.spec.ts @@ -16,7 +16,7 @@ */ import { async, TestBed } from '@angular/core/testing'; -import { AppConfigService, CoreModule } from '@alfresco/core'; +import { AppConfigService, CoreModule } from '@alfresco/adf-core'; import { TagService } from './tag.service'; declare let jasmine: any; diff --git a/lib/content-services/tag/services/tag.service.ts b/lib/content-services/tag/services/tag.service.ts index 5c82ddbf58..a141a3d5fc 100644 --- a/lib/content-services/tag/services/tag.service.ts +++ b/lib/content-services/tag/services/tag.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService, LogService } from '@alfresco/core'; +import { AlfrescoApiService, LogService } from '@alfresco/adf-core'; import { EventEmitter, Injectable, Output } from '@angular/core'; import { Observable } from 'rxjs/Rx'; diff --git a/lib/content-services/tag/tag-actions.component.spec.ts b/lib/content-services/tag/tag-actions.component.spec.ts index 45e085d23b..5e32c63d38 100644 --- a/lib/content-services/tag/tag-actions.component.spec.ts +++ b/lib/content-services/tag/tag-actions.component.spec.ts @@ -17,7 +17,7 @@ import { DebugElement } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { AppConfigService, CoreModule } from '@alfresco/core'; +import { AppConfigService, CoreModule } from '@alfresco/adf-core'; import { TagActionsComponent } from './tag-actions.component'; import { TagService } from './services/tag.service'; import { MaterialModule } from '../material.module'; diff --git a/lib/content-services/tag/tag-actions.component.ts b/lib/content-services/tag/tag-actions.component.ts index f45bf6b305..fd7068f56e 100644 --- a/lib/content-services/tag/tag-actions.component.ts +++ b/lib/content-services/tag/tag-actions.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { TranslationService } from '@alfresco/core'; +import { TranslationService } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, OnChanges, Output, ViewEncapsulation } from '@angular/core'; import { TagService } from './services/tag.service'; diff --git a/lib/content-services/tag/tag-list.component.spec.ts b/lib/content-services/tag/tag-list.component.spec.ts index a10f7cb8e9..b4001b43c1 100644 --- a/lib/content-services/tag/tag-list.component.spec.ts +++ b/lib/content-services/tag/tag-list.component.spec.ts @@ -17,7 +17,7 @@ import { DebugElement } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { AppConfigService, CoreModule } from '@alfresco/core'; +import { AppConfigService, CoreModule } from '@alfresco/adf-core'; import { TagService } from './services/tag.service'; import { TagListComponent } from '././tag-list.component'; import { MaterialModule } from '../material.module'; diff --git a/lib/content-services/tag/tag-node-list.component.spec.ts b/lib/content-services/tag/tag-node-list.component.spec.ts index 7b09c43304..68ab096144 100644 --- a/lib/content-services/tag/tag-node-list.component.spec.ts +++ b/lib/content-services/tag/tag-node-list.component.spec.ts @@ -17,7 +17,7 @@ import { DebugElement } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { AppConfigService, CoreModule } from '@alfresco/core'; +import { AppConfigService, CoreModule } from '@alfresco/adf-core'; import { TagNodeListComponent } from './tag-node-list.component'; import { TagService } from './services/tag.service'; import { MaterialModule } from '../material.module'; diff --git a/lib/content-services/tsconfig.json b/lib/content-services/tsconfig.json index 037d572eff..5c62dd588c 100644 --- a/lib/content-services/tsconfig.json +++ b/lib/content-services/tsconfig.json @@ -19,9 +19,9 @@ "outDir": "./dist", "baseUrl" : "./", "paths": { - "@alfresco/process-services": ["../process-services"], - "@alfresco/content-services": ["../content-services"], - "@alfresco/core": ["../core"], + "@alfresco/adf-process-services": ["../process-services"], + "@alfresco/adf-content-services": ["../content-services"], + "@alfresco/adf-core": ["../core"], "@angular/*": ["../node_modules/@angular/*"] }, "lib": [ diff --git a/lib/content-services/upload/components/file-uploading-dialog.component.spec.ts b/lib/content-services/upload/components/file-uploading-dialog.component.spec.ts index 370d5b19b6..07754f151c 100644 --- a/lib/content-services/upload/components/file-uploading-dialog.component.spec.ts +++ b/lib/content-services/upload/components/file-uploading-dialog.component.spec.ts @@ -17,7 +17,7 @@ import { EventEmitter } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { FileModel, FileUploadCompleteEvent, FileUploadErrorEvent, UploadService } from '@alfresco/core'; +import { FileModel, FileUploadCompleteEvent, FileUploadErrorEvent, UploadService } from '@alfresco/adf-core'; import { UploadModule } from '../upload.module'; import { FileUploadingDialogComponent } from './file-uploading-dialog.component'; diff --git a/lib/content-services/upload/components/file-uploading-dialog.component.ts b/lib/content-services/upload/components/file-uploading-dialog.component.ts index 9eb9398e0e..bffc046661 100644 --- a/lib/content-services/upload/components/file-uploading-dialog.component.ts +++ b/lib/content-services/upload/components/file-uploading-dialog.component.ts @@ -16,7 +16,7 @@ */ import { FileModel, FileUploadCompleteEvent, FileUploadDeleteEvent, - FileUploadErrorEvent, FileUploadStatus, UploadService } from '@alfresco/core'; + FileUploadErrorEvent, FileUploadStatus, UploadService } from '@alfresco/adf-core'; import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { Observable, Subscription } from 'rxjs/Rx'; import { FileUploadingListComponent } from './file-uploading-list.component'; diff --git a/lib/content-services/upload/components/file-uploading-list-row.component.spec.ts b/lib/content-services/upload/components/file-uploading-list-row.component.spec.ts index 233b74256e..791947102c 100644 --- a/lib/content-services/upload/components/file-uploading-list-row.component.spec.ts +++ b/lib/content-services/upload/components/file-uploading-list-row.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { FileModel } from '@alfresco/core'; +import { FileModel } from '@alfresco/adf-core'; import { UploadModule } from '../upload.module'; import { FileUploadingListRowComponent } from './file-uploading-list-row.component'; diff --git a/lib/content-services/upload/components/file-uploading-list-row.component.ts b/lib/content-services/upload/components/file-uploading-list-row.component.ts index 45d26372ec..ad5c12c8b8 100644 --- a/lib/content-services/upload/components/file-uploading-list-row.component.ts +++ b/lib/content-services/upload/components/file-uploading-list-row.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { FileModel, FileUploadStatus } from '@alfresco/core'; +import { FileModel, FileUploadStatus } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, Output } from '@angular/core'; @Component({ diff --git a/lib/content-services/upload/components/file-uploading-list.component.spec.ts b/lib/content-services/upload/components/file-uploading-list.component.spec.ts index d20b57f017..c86fa948ec 100644 --- a/lib/content-services/upload/components/file-uploading-list.component.spec.ts +++ b/lib/content-services/upload/components/file-uploading-list.component.spec.ts @@ -16,7 +16,7 @@ */ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { TranslationService, FileUploadStatus, NodesApiService, NotificationService, UploadService } from '@alfresco/core'; +import { TranslationService, FileUploadStatus, NodesApiService, NotificationService, UploadService } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Rx'; import { UploadModule } from '../upload.module'; import { FileUploadingListComponent } from './file-uploading-list.component'; diff --git a/lib/content-services/upload/components/file-uploading-list.component.ts b/lib/content-services/upload/components/file-uploading-list.component.ts index 08d4a4db02..aa8bbd6279 100644 --- a/lib/content-services/upload/components/file-uploading-list.component.ts +++ b/lib/content-services/upload/components/file-uploading-list.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { FileModel, FileUploadStatus, NodesApiService, NotificationService, TranslationService, UploadService } from '@alfresco/core'; +import { FileModel, FileUploadStatus, NodesApiService, NotificationService, TranslationService, UploadService } from '@alfresco/adf-core'; import { Component, ContentChild, Input, TemplateRef } from '@angular/core'; import { Observable } from 'rxjs/Rx'; diff --git a/lib/content-services/upload/components/upload-button.component.spec.ts b/lib/content-services/upload/components/upload-button.component.spec.ts index 365e298e1f..b7210e104c 100644 --- a/lib/content-services/upload/components/upload-button.component.spec.ts +++ b/lib/content-services/upload/components/upload-button.component.spec.ts @@ -18,10 +18,10 @@ import { DebugElement, SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { MaterialModule } from '../../material.module'; -import { ContentService, UploadService, TranslationService } from '@alfresco/core'; +import { ContentService, UploadService, TranslationService } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Rx'; import { UploadButtonComponent } from './upload-button.component'; -import { TranslationMock } from '@alfresco/core'; +import { TranslationMock } from '@alfresco/adf-core'; describe('UploadButtonComponent', () => { diff --git a/lib/content-services/upload/components/upload-button.component.ts b/lib/content-services/upload/components/upload-button.component.ts index 31181b35f0..d5c46cb074 100644 --- a/lib/content-services/upload/components/upload-button.component.ts +++ b/lib/content-services/upload/components/upload-button.component.ts @@ -25,7 +25,7 @@ import { NotificationService, TranslationService, UploadService -} from '@alfresco/core'; +} from '@alfresco/adf-core'; import { Component, EventEmitter, diff --git a/lib/content-services/upload/components/upload-drag-area.component.spec.ts b/lib/content-services/upload/components/upload-drag-area.component.spec.ts index 90f394cfe9..83a0115e9d 100644 --- a/lib/content-services/upload/components/upload-drag-area.component.spec.ts +++ b/lib/content-services/upload/components/upload-drag-area.component.spec.ts @@ -17,7 +17,7 @@ import { DebugElement } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { FileModel, LogService, UploadService } from '@alfresco/core'; +import { FileModel, LogService, UploadService } from '@alfresco/adf-core'; import { FileDraggableDirective } from '../directives/file-draggable.directive'; import { UploadDragAreaComponent } from './upload-drag-area.component'; diff --git a/lib/content-services/upload/components/upload-drag-area.component.ts b/lib/content-services/upload/components/upload-drag-area.component.ts index 9aa3df5ae1..b8a66a7567 100644 --- a/lib/content-services/upload/components/upload-drag-area.component.ts +++ b/lib/content-services/upload/components/upload-drag-area.component.ts @@ -24,7 +24,7 @@ import { NotificationService, TranslationService, UploadService -} from '@alfresco/core'; +} from '@alfresco/adf-core'; import { Component, EventEmitter, forwardRef, Input, Output, ViewEncapsulation } from '@angular/core'; @Component({ diff --git a/lib/content-services/upload/directives/file-draggable.directive.ts b/lib/content-services/upload/directives/file-draggable.directive.ts index 5c24abf61d..c0cf40d4fd 100644 --- a/lib/content-services/upload/directives/file-draggable.directive.ts +++ b/lib/content-services/upload/directives/file-draggable.directive.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { FileUtils } from '@alfresco/core'; +import { FileUtils } from '@alfresco/adf-core'; import { Directive, ElementRef, EventEmitter, Input, NgZone, OnDestroy, OnInit, Output } from '@angular/core'; @Directive({ diff --git a/lib/content-services/upload/upload.module.ts b/lib/content-services/upload/upload.module.ts index 9db7b7eb32..4ede65adfc 100644 --- a/lib/content-services/upload/upload.module.ts +++ b/lib/content-services/upload/upload.module.ts @@ -26,7 +26,7 @@ import { FileUploadingListComponent } from './components/file-uploading-list.com import { UploadButtonComponent } from './components/upload-button.component'; import { UploadDragAreaComponent } from './components/upload-drag-area.component'; -import { PipeModule } from '@alfresco/core'; +import { PipeModule } from '@alfresco/adf-core'; import { FileDraggableDirective } from './directives/file-draggable.directive'; @NgModule({ diff --git a/lib/content-services/version-manager/version-list.component.spec.ts b/lib/content-services/version-manager/version-list.component.spec.ts index f967859828..b2b216f78c 100644 --- a/lib/content-services/version-manager/version-list.component.spec.ts +++ b/lib/content-services/version-manager/version-list.component.spec.ts @@ -20,7 +20,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; import { MaterialModule } from '../material.module'; import { VersionListComponent } from './version-list.component'; -import { AlfrescoApiService, CoreModule } from '@alfresco/core'; +import { AlfrescoApiService, CoreModule } from '@alfresco/adf-core'; describe('VersionListComponent', () => { let component: VersionListComponent; diff --git a/lib/content-services/version-manager/version-list.component.ts b/lib/content-services/version-manager/version-list.component.ts index b6698fb08a..37cb687f36 100644 --- a/lib/content-services/version-manager/version-list.component.ts +++ b/lib/content-services/version-manager/version-list.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService } from '@alfresco/core'; +import { AlfrescoApiService } from '@alfresco/adf-core'; import { Component, Input, OnChanges, ViewEncapsulation } from '@angular/core'; import { VersionsApi } from 'alfresco-js-api'; diff --git a/lib/content-services/webscript/webscript.component.spec.ts b/lib/content-services/webscript/webscript.component.spec.ts index 8d05e8e7ce..d6f5fecdb6 100644 --- a/lib/content-services/webscript/webscript.component.spec.ts +++ b/lib/content-services/webscript/webscript.component.spec.ts @@ -17,8 +17,8 @@ import { DebugElement } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { AppConfigService, CoreModule } from '@alfresco/core'; -import { DataTableModule } from '@alfresco/core'; +import { AppConfigService, CoreModule } from '@alfresco/adf-core'; +import { DataTableModule } from '@alfresco/adf-core'; import { WebscriptComponent } from './webscript.component'; declare let jasmine: any; diff --git a/lib/content-services/webscript/webscript.component.ts b/lib/content-services/webscript/webscript.component.ts index 4ea982f861..7fe31f2b93 100644 --- a/lib/content-services/webscript/webscript.component.ts +++ b/lib/content-services/webscript/webscript.component.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { ObjectDataTableAdapter } from '@alfresco/core'; -import { AlfrescoApiService, LogService } from '@alfresco/core'; +import { ObjectDataTableAdapter } from '@alfresco/adf-core'; +import { AlfrescoApiService, LogService } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; /** diff --git a/lib/content-services/webscript/webscript.module.ts b/lib/content-services/webscript/webscript.module.ts index 5fb5c3e8eb..b6ebbdb6a5 100644 --- a/lib/content-services/webscript/webscript.module.ts +++ b/lib/content-services/webscript/webscript.module.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { DataTableModule, PipeModule } from '@alfresco/core'; +import { DataTableModule, PipeModule } from '@alfresco/adf-core'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; diff --git a/lib/core/.npmignore b/lib/core/.npmignore new file mode 100644 index 0000000000..a30cc5773b --- /dev/null +++ b/lib/core/.npmignore @@ -0,0 +1,19 @@ +npm-debug.log +.idea +.npmrc + +coverage/ +demo/ +dist/ +node_modules +typings/ +fonts/ + +/.editorconfig +/.travis.yml +/*.json +/karma-test-shim.js +/karma.conf.js +/gulpfile.ts +/.npmignore +/.happypack diff --git a/lib/core/core.module.ts b/lib/core/core.module.ts index 3785c10e86..2fb4dd3b7c 100644 --- a/lib/core/core.module.ts +++ b/lib/core/core.module.ts @@ -85,8 +85,8 @@ export function createTranslateLoader(http: HttpClient, logService: LogService) provide: TRANSLATION_PROVIDER, multi: true, useValue: { - name: '@adf/core', - source: 'assets/@adf/core' + name: '@alfresco/core', + source: '@alfresco/core' } } ], diff --git a/lib/core/karma-test-shim.js b/lib/core/karma-test-shim.js index 004e130997..5ba7d00a9b 100644 --- a/lib/core/karma-test-shim.js +++ b/lib/core/karma-test-shim.js @@ -32,8 +32,8 @@ const PipeModule = require('./pipes/pipe.module').PipeModule; const AppConfigModule = require('./app-config/app-config.module').AppConfigModule; const LogService = require('./services/log.service').LogService; const TranslateLoaderService = require('./services/translate-loader.service').TranslateLoaderService; -const AppConfigService = require('@alfresco/core').AppConfigService; -const AppConfigServiceMock = require('@alfresco/core').AppConfigServiceMock; +const AppConfigService = require('@alfresco/adf-core').AppConfigService; +const AppConfigServiceMock = require('@alfresco/adf-core').AppConfigServiceMock; TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting()); diff --git a/lib/core/package.json b/lib/core/package.json index 6525f2e8c7..169e19ddef 100644 --- a/lib/core/package.json +++ b/lib/core/package.json @@ -3,7 +3,7 @@ "description": "Alfresco ADF core", "version": "2.0.0", "author": "Alfresco Software, Ltd.", - "main": "bundles/adf-process-services.js", + "main": "bundles/adf-core.js", "repository": { "type": "git", "url": "https://github.com/Alfresco/alfresco-ng2-components.git" @@ -26,7 +26,7 @@ "@angular/platform-browser-dynamic": "5.0.0", "@angular/router": "5.0.0", "@ngx-translate/core": "8.0.0", - "alfresco-js-api": "^2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0", + "alfresco-js-api": "2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0", "chart.js": "2.5.0", "core-js": "2.4.1", "hammerjs": "2.0.8", diff --git a/lib/core/services/translate-loader.spec.ts b/lib/core/services/translate-loader.spec.ts index 3eb3b51f11..d3da14270a 100644 --- a/lib/core/services/translate-loader.spec.ts +++ b/lib/core/services/translate-loader.spec.ts @@ -59,7 +59,7 @@ describe('TranslateLoader', () => { provide: TRANSLATION_PROVIDER, multi: true, useValue: { - name: '@alfresco/core', + name: '@alfresco/adf-core', source: 'assets/ng2-alfresco-core' } } diff --git a/lib/core/services/translation.service.spec.ts b/lib/core/services/translation.service.spec.ts index 8a5c472980..17c3ef647c 100644 --- a/lib/core/services/translation.service.spec.ts +++ b/lib/core/services/translation.service.spec.ts @@ -56,7 +56,7 @@ describe('TranslationService', () => { provide: TRANSLATION_PROVIDER, multi: true, useValue: { - name: '@alfresco/core', + name: '@alfresco/adf-core', source: 'assets/ng2-alfresco-core' } } diff --git a/lib/core/tsconfig.json b/lib/core/tsconfig.json index 037d572eff..5c62dd588c 100644 --- a/lib/core/tsconfig.json +++ b/lib/core/tsconfig.json @@ -19,9 +19,9 @@ "outDir": "./dist", "baseUrl" : "./", "paths": { - "@alfresco/process-services": ["../process-services"], - "@alfresco/content-services": ["../content-services"], - "@alfresco/core": ["../core"], + "@alfresco/adf-process-services": ["../process-services"], + "@alfresco/adf-content-services": ["../content-services"], + "@alfresco/adf-core": ["../core"], "@angular/*": ["../node_modules/@angular/*"] }, "lib": [ diff --git a/lib/insights/.npmignore b/lib/insights/.npmignore new file mode 100644 index 0000000000..a30cc5773b --- /dev/null +++ b/lib/insights/.npmignore @@ -0,0 +1,19 @@ +npm-debug.log +.idea +.npmrc + +coverage/ +demo/ +dist/ +node_modules +typings/ +fonts/ + +/.editorconfig +/.travis.yml +/*.json +/karma-test-shim.js +/karma.conf.js +/gulpfile.ts +/.npmignore +/.happypack diff --git a/lib/insights/analytics-process/analytics-process.module.ts b/lib/insights/analytics-process/analytics-process.module.ts index 2df0dd2475..71ae9641be 100644 --- a/lib/insights/analytics-process/analytics-process.module.ts +++ b/lib/insights/analytics-process/analytics-process.module.ts @@ -24,7 +24,7 @@ import { MaterialModule } from '../material.module'; import { ChartsModule } from 'ng2-charts'; -import { ToolbarModule } from '@alfresco/core'; +import { ToolbarModule } from '@alfresco/adf-core'; import { AnalyticsGeneratorComponent } from './components/analytics-generator.component'; import { AnalyticsReportHeatMapComponent } from './components/analytics-report-heat-map.component'; import { AnalyticsReportListComponent } from './components/analytics-report-list.component'; diff --git a/lib/insights/analytics-process/components/analytics-report-parameters.component.ts b/lib/insights/analytics-process/components/analytics-report-parameters.component.ts index 7c7d98b26b..31888b5ca3 100644 --- a/lib/insights/analytics-process/components/analytics-report-parameters.component.ts +++ b/lib/insights/analytics-process/components/analytics-report-parameters.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ContentService, LogService } from '@alfresco/core'; +import { ContentService, LogService } from '@alfresco/adf-core'; import { AfterContentChecked, Component, diff --git a/lib/insights/analytics-process/components/widgets/date-range/date-range.widget.ts b/lib/insights/analytics-process/components/widgets/date-range/date-range.widget.ts index be7f1fa6e4..f3075aa0fa 100644 --- a/lib/insights/analytics-process/components/widgets/date-range/date-range.widget.ts +++ b/lib/insights/analytics-process/components/widgets/date-range/date-range.widget.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { MOMENT_DATE_FORMATS, MomentDateAdapter, UserPreferencesService } from '@alfresco/core'; +import { MOMENT_DATE_FORMATS, MomentDateAdapter, UserPreferencesService } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core'; import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/forms'; import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material'; diff --git a/lib/insights/analytics-process/karma-test-shim.js b/lib/insights/analytics-process/karma-test-shim.js index 3f9f4bd243..cf46ce37c7 100644 --- a/lib/insights/analytics-process/karma-test-shim.js +++ b/lib/insights/analytics-process/karma-test-shim.js @@ -18,11 +18,11 @@ appContext.keys().forEach(appContext); const TestBed = require('@angular/core/testing').TestBed; const browser = require('@angular/platform-browser-dynamic/testing'); -const CoreModule = require('@alfresco/core').CoreModule; -const AppConfigService = require('@alfresco/core').AppConfigService; -const AppConfigServiceMock = require('@alfresco/core').AppConfigServiceMock; -const TranslationService = require('@alfresco/core').TranslationService; -const TranslationMock = require('@alfresco/core').TranslationMock; +const CoreModule = require('@alfresco/adf-core').CoreModule; +const AppConfigService = require('@alfresco/adf-core').AppConfigService; +const AppConfigServiceMock = require('@alfresco/adf-core').AppConfigServiceMock; +const TranslationService = require('@alfresco/adf-core').TranslationService; +const TranslationMock = require('@alfresco/adf-core').TranslationMock; TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting()); diff --git a/lib/insights/analytics-process/services/analytics.service.spec.ts b/lib/insights/analytics-process/services/analytics.service.spec.ts index d4331154e0..728281a61c 100644 --- a/lib/insights/analytics-process/services/analytics.service.spec.ts +++ b/lib/insights/analytics-process/services/analytics.service.spec.ts @@ -16,7 +16,7 @@ */ import { TestBed } from '@angular/core/testing'; -import { AlfrescoApiService } from '@alfresco/core'; +import { AlfrescoApiService } from '@alfresco/adf-core'; import { fakeReportList } from '../../mock'; import { AnalyticsService } from './analytics.service'; diff --git a/lib/insights/analytics-process/services/analytics.service.ts b/lib/insights/analytics-process/services/analytics.service.ts index 80a0a46cd2..7f5e9e7804 100644 --- a/lib/insights/analytics-process/services/analytics.service.ts +++ b/lib/insights/analytics-process/services/analytics.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService, LogService } from '@alfresco/core'; +import { AlfrescoApiService, LogService } from '@alfresco/adf-core'; import { Injectable } from '@angular/core'; import { Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; diff --git a/lib/insights/diagram/karma-test-shim.js b/lib/insights/diagram/karma-test-shim.js index 2e3a18b8c8..dade694f76 100644 --- a/lib/insights/diagram/karma-test-shim.js +++ b/lib/insights/diagram/karma-test-shim.js @@ -18,11 +18,11 @@ appContext.keys().forEach(appContext); const TestBed = require('@angular/core/testing').TestBed; const browser = require('@angular/platform-browser-dynamic/testing'); -const CoreModule = require('@alfresco/core').CoreModule; -const AppConfigService = require('@alfresco/core').AppConfigService; -const AppConfigServiceMock = require('@alfresco/core').AppConfigServiceMock; -const TranslationService = require('@alfresco/core').TranslationService; -const TranslationMock = require('@alfresco/core').TranslationMock; +const CoreModule = require('@alfresco/adf-core').CoreModule; +const AppConfigService = require('@alfresco/adf-core').AppConfigService; +const AppConfigServiceMock = require('@alfresco/adf-core').AppConfigServiceMock; +const TranslationService = require('@alfresco/adf-core').TranslationService; +const TranslationMock = require('@alfresco/adf-core').TranslationMock; TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting()); diff --git a/lib/insights/diagram/services/diagrams.service.ts b/lib/insights/diagram/services/diagrams.service.ts index 632f0c5e36..9c6e829cfa 100644 --- a/lib/insights/diagram/services/diagrams.service.ts +++ b/lib/insights/diagram/services/diagrams.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService, LogService } from '@alfresco/core'; +import { AlfrescoApiService, LogService } from '@alfresco/adf-core'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; diff --git a/lib/insights/insights.module.ts b/lib/insights/insights.module.ts index 7fe57e7ce2..85ca959938 100644 --- a/lib/insights/insights.module.ts +++ b/lib/insights/insights.module.ts @@ -19,7 +19,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { CoreModule, TRANSLATION_PROVIDER } from '@alfresco/core'; +import { CoreModule, TRANSLATION_PROVIDER } from '@alfresco/adf-core'; import { MaterialModule } from './material.module'; @@ -42,8 +42,8 @@ import { DiagramsModule } from './diagram'; provide: TRANSLATION_PROVIDER, multi: true, useValue: { - name: '@adf/insights', - source: 'assets/@adf/insights' + name: '@alfresco/insights', + source: '@alfresco/insights' } } ], diff --git a/lib/insights/karma-test-shim.js b/lib/insights/karma-test-shim.js index cc149f050d..12b444cdb7 100644 --- a/lib/insights/karma-test-shim.js +++ b/lib/insights/karma-test-shim.js @@ -17,11 +17,11 @@ var appContext = require.context(".", true, /.spec.ts/);appContext.keys().forEac const TestBed = require('@angular/core/testing').TestBed; const browser = require('@angular/platform-browser-dynamic/testing'); -const CoreModule = require('@alfresco/core').CoreModule; -const AppConfigService = require('@alfresco/core').AppConfigService; -const AppConfigServiceMock = require('@alfresco/core').AppConfigServiceMock; -const TranslationService = require('@alfresco/core').TranslationService; -const TranslationMock = require('@alfresco/core').TranslationMock; +const CoreModule = require('@alfresco/adf-core').CoreModule; +const AppConfigService = require('@alfresco/adf-core').AppConfigService; +const AppConfigServiceMock = require('@alfresco/adf-core').AppConfigServiceMock; +const TranslationService = require('@alfresco/adf-core').TranslationService; +const TranslationMock = require('@alfresco/adf-core').TranslationMock; TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting()); diff --git a/lib/insights/package.json b/lib/insights/package.json index 46c6b26e4f..63d0e873b2 100644 --- a/lib/insights/package.json +++ b/lib/insights/package.json @@ -3,7 +3,7 @@ "description": "Alfresco ADF insights", "version": "2.0.0", "author": "Alfresco Software, Ltd.", - "main": "bundles/adf-analytics.js", + "main": "bundles/adf-insights.js", "repository": { "type": "git", "url": "https://github.com/Alfresco/alfresco-ng2-components.git" @@ -26,8 +26,8 @@ "@angular/platform-browser-dynamic": "5.0.0", "@angular/router": "5.0.0", "@ngx-translate/core": "8.0.0", - "alfresco-js-api": "^2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0", - "@alfresco/adf-core":"v2.0.0-8596ba4d39c79d593b878cc0a98abe1a2878ebda", + "alfresco-js-api": "2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0", + "@alfresco/adf-core": "2.0.0-303d0166157d305ebfbf1578bf5d1eadcaa631cc", "chart.js": "2.5.0", "core-js": "2.4.1", "hammerjs": "2.0.8", diff --git a/lib/insights/tsconfig.json b/lib/insights/tsconfig.json index ec16902eab..d8715c8791 100644 --- a/lib/insights/tsconfig.json +++ b/lib/insights/tsconfig.json @@ -19,10 +19,10 @@ "outDir": "./dist", "baseUrl" : "./", "paths": { - "@alfresco/process-services": ["../process-services"], - "@alfresco/content-services": ["../content-services"], - "@alfresco/core": ["../core"], - "@alfresco/insights": ["../analytics"], + "@alfresco/adf-process-services": ["../process-services"], + "@alfresco/adf-content-services": ["../content-services"], + "@alfresco/adf-core": ["../core"], + "@alfresco/adf-insights": ["../analytics"], "@angular/*": ["../node_modules/@angular/*"] }, "lib": [ diff --git a/lib/package.json b/lib/package.json index 210b893f04..79cf122245 100644 --- a/lib/package.json +++ b/lib/package.json @@ -1,7 +1,7 @@ { "name": "alfresco-components", "description": "Alfresco Angular components", - "version": "2.0.0-beta1", + "version": "2.0.0", "author": "Alfresco Software, Ltd.", "scripts": { "clean": "rimraf node_modules", @@ -58,7 +58,7 @@ "@angular/platform-browser-dynamic": "5.0.0", "@angular/router": "5.0.0", "@ngx-translate/core": "8.0.0", - "alfresco-js-api": "^2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0", + "alfresco-js-api": "2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0", "chart.js": "2.5.0", "core-js": "2.4.1", "hammerjs": "2.0.8", @@ -113,7 +113,7 @@ "null-loader": "0.1.1", "raw-loader": "0.5.1", "remap-istanbul": "0.6.3", - "rimraf": "2.6.1", + "rimraf": "^2.6.2", "run-sequence": "1.2.2", "sass-loader": "6.0.5", "script-loader": "0.7.0", diff --git a/lib/process-services/.npmignore b/lib/process-services/.npmignore new file mode 100644 index 0000000000..a30cc5773b --- /dev/null +++ b/lib/process-services/.npmignore @@ -0,0 +1,19 @@ +npm-debug.log +.idea +.npmrc + +coverage/ +demo/ +dist/ +node_modules +typings/ +fonts/ + +/.editorconfig +/.travis.yml +/*.json +/karma-test-shim.js +/karma.conf.js +/gulpfile.ts +/.npmignore +/.happypack diff --git a/lib/process-services/app-list/apps-list.component.spec.ts b/lib/process-services/app-list/apps-list.component.spec.ts index 9591053dc8..7f9cac49e0 100644 --- a/lib/process-services/app-list/apps-list.component.spec.ts +++ b/lib/process-services/app-list/apps-list.component.spec.ts @@ -18,7 +18,7 @@ import { DebugElement } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { AppsProcessService, CoreModule } from '@alfresco/core'; +import { AppsProcessService, CoreModule } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Rx'; import { MaterialModule } from '../material.module'; diff --git a/lib/process-services/app-list/apps-list.component.ts b/lib/process-services/app-list/apps-list.component.ts index 39250e782b..01bbb8a786 100644 --- a/lib/process-services/app-list/apps-list.component.ts +++ b/lib/process-services/app-list/apps-list.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AppsProcessService, TranslationService } from '@alfresco/core'; +import { AppsProcessService, TranslationService } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { Observer } from 'rxjs/Observer'; diff --git a/lib/process-services/attachment/attachment.module.ts b/lib/process-services/attachment/attachment.module.ts index 4bc3eca4d1..030ead0849 100644 --- a/lib/process-services/attachment/attachment.module.ts +++ b/lib/process-services/attachment/attachment.module.ts @@ -19,7 +19,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { MaterialModule } from '../material.module'; -import { DataColumnModule, DataTableModule, DirectiveModule } from '@alfresco/core'; +import { DataColumnModule, DataTableModule, DirectiveModule } from '@alfresco/adf-core'; import { TaskAttachmentListComponent } from './task-attachment-list.component'; import { ProcessAttachmentListComponent } from './process-attachment-list.component'; diff --git a/lib/process-services/attachment/create-process-attachment.component.spec.ts b/lib/process-services/attachment/create-process-attachment.component.spec.ts index cdc563820e..81c818740e 100644 --- a/lib/process-services/attachment/create-process-attachment.component.spec.ts +++ b/lib/process-services/attachment/create-process-attachment.component.spec.ts @@ -18,8 +18,8 @@ import { SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { MaterialModule } from '../material.module'; -import { ProcessContentService } from '@alfresco/core'; -import { TranslationService } from '@alfresco/core'; +import { ProcessContentService } from '@alfresco/adf-core'; +import { TranslationService } from '@alfresco/adf-core'; import { CreateProcessAttachmentComponent } from './create-process-attachment.component'; declare let jasmine: any; diff --git a/lib/process-services/attachment/create-process-attachment.component.ts b/lib/process-services/attachment/create-process-attachment.component.ts index bba08b8e4c..669e137f05 100644 --- a/lib/process-services/attachment/create-process-attachment.component.ts +++ b/lib/process-services/attachment/create-process-attachment.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; -import { ProcessContentService } from '@alfresco/core'; +import { ProcessContentService } from '@alfresco/adf-core'; @Component({ selector: 'adf-create-process-attachment', diff --git a/lib/process-services/attachment/create-task-attachment.component.spec.ts b/lib/process-services/attachment/create-task-attachment.component.spec.ts index fbc68424e0..397d421ae8 100644 --- a/lib/process-services/attachment/create-task-attachment.component.spec.ts +++ b/lib/process-services/attachment/create-task-attachment.component.spec.ts @@ -20,7 +20,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { MaterialModule } from '../material.module'; import { Observable } from 'rxjs/Rx'; -import { ProcessContentService } from '@alfresco/core'; +import { ProcessContentService } from '@alfresco/adf-core'; import { AttachmentComponent } from './create-task-attachment.component'; describe('Activiti Task Create Attachment', () => { diff --git a/lib/process-services/attachment/create-task-attachment.component.ts b/lib/process-services/attachment/create-task-attachment.component.ts index 6baaf13076..65310420e3 100644 --- a/lib/process-services/attachment/create-task-attachment.component.ts +++ b/lib/process-services/attachment/create-task-attachment.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; -import { ProcessContentService } from '@alfresco/core'; +import { ProcessContentService } from '@alfresco/adf-core'; @Component({ selector: 'adf-create-task-attachment', diff --git a/lib/process-services/attachment/process-attachment-list.component.spec.ts b/lib/process-services/attachment/process-attachment-list.component.spec.ts index 8abea6790d..074be441a6 100644 --- a/lib/process-services/attachment/process-attachment-list.component.spec.ts +++ b/lib/process-services/attachment/process-attachment-list.component.spec.ts @@ -20,7 +20,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { MatProgressSpinnerModule } from '@angular/material'; import { By } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; -import { ProcessContentService } from '@alfresco/core'; +import { ProcessContentService } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Rx'; import { ProcessAttachmentListComponent } from './process-attachment-list.component'; diff --git a/lib/process-services/attachment/process-attachment-list.component.ts b/lib/process-services/attachment/process-attachment-list.component.ts index 8111ddf669..a5d74b91dd 100644 --- a/lib/process-services/attachment/process-attachment-list.component.ts +++ b/lib/process-services/attachment/process-attachment-list.component.ts @@ -15,9 +15,9 @@ * limitations under the License. */ -import { ContentService, ThumbnailService } from '@alfresco/core'; +import { ContentService, ThumbnailService } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, NgZone, OnChanges, Output, SimpleChanges } from '@angular/core'; -import { ProcessContentService } from '@alfresco/core'; +import { ProcessContentService } from '@alfresco/adf-core'; declare var require: any; diff --git a/lib/process-services/attachment/task-attachment-list.component.spec.ts b/lib/process-services/attachment/task-attachment-list.component.spec.ts index d02c8d70ac..a11a7eebed 100644 --- a/lib/process-services/attachment/task-attachment-list.component.spec.ts +++ b/lib/process-services/attachment/task-attachment-list.component.spec.ts @@ -21,7 +21,7 @@ import { By } from '@angular/platform-browser'; import { MaterialModule } from '../material.module'; import { Observable } from 'rxjs/Rx'; import { TaskAttachmentListComponent } from './task-attachment-list.component'; -import { ProcessContentService } from '@alfresco/core'; +import { ProcessContentService } from '@alfresco/adf-core'; describe('TaskAttachmentList', () => { diff --git a/lib/process-services/attachment/task-attachment-list.component.ts b/lib/process-services/attachment/task-attachment-list.component.ts index 8d5f63355a..fd159f69ec 100644 --- a/lib/process-services/attachment/task-attachment-list.component.ts +++ b/lib/process-services/attachment/task-attachment-list.component.ts @@ -15,9 +15,9 @@ * limitations under the License. */ -import { ContentService, ThumbnailService } from '@alfresco/core'; +import { ContentService, ThumbnailService } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, NgZone, OnChanges, Output, SimpleChanges } from '@angular/core'; -import { ProcessContentService } from '@alfresco/core'; +import { ProcessContentService } from '@alfresco/adf-core'; declare var require: any; diff --git a/lib/process-services/comments/comment-list.component.spec.ts b/lib/process-services/comments/comment-list.component.spec.ts index 3373d65026..87c4e4162d 100644 --- a/lib/process-services/comments/comment-list.component.spec.ts +++ b/lib/process-services/comments/comment-list.component.spec.ts @@ -17,8 +17,8 @@ import { DatePipe } from '@angular/common'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { CommentProcessModel, UserProcessModel } from '@alfresco/core'; -import { DataRowEvent, ObjectDataRow } from '@alfresco/core'; +import { CommentProcessModel, UserProcessModel } from '@alfresco/adf-core'; +import { DataRowEvent, ObjectDataRow } from '@alfresco/adf-core'; import { CommentListComponent } from './comment-list.component'; const testUser: UserProcessModel = new UserProcessModel({ diff --git a/lib/process-services/comments/comment-list.component.ts b/lib/process-services/comments/comment-list.component.ts index f8d6a36a96..3f4bc1f27b 100644 --- a/lib/process-services/comments/comment-list.component.ts +++ b/lib/process-services/comments/comment-list.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { CommentProcessModel, PeopleProcessService, UserProcessModel } from '@alfresco/core'; +import { CommentProcessModel, PeopleProcessService, UserProcessModel } from '@alfresco/adf-core'; import { DatePipe } from '@angular/common'; import { Component, EventEmitter, Input, Output } from '@angular/core'; diff --git a/lib/process-services/comments/comments.component.spec.ts b/lib/process-services/comments/comments.component.spec.ts index da1bf8518d..48109fc922 100644 --- a/lib/process-services/comments/comments.component.spec.ts +++ b/lib/process-services/comments/comments.component.spec.ts @@ -19,12 +19,12 @@ import { SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { Observable } from 'rxjs/Rx'; -import { FormModule } from '@alfresco/core'; -import { CommentProcessService } from '@alfresco/core'; +import { FormModule } from '@alfresco/adf-core'; +import { CommentProcessService } from '@alfresco/adf-core'; import { DatePipe } from '@angular/common'; import { MatInputModule } from '@angular/material'; -import { PeopleProcessService } from '@alfresco/core'; +import { PeopleProcessService } from '@alfresco/adf-core'; import { TaskListService } from '../task-list/services/tasklist.service'; import { CommentListComponent } from './comment-list.component'; import { CommentsComponent } from './comments.component'; diff --git a/lib/process-services/comments/comments.component.ts b/lib/process-services/comments/comments.component.ts index ff0450b399..5bbc280723 100644 --- a/lib/process-services/comments/comments.component.ts +++ b/lib/process-services/comments/comments.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { CommentProcessModel, CommentProcessService } from '@alfresco/core'; +import { CommentProcessModel, CommentProcessService } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { Observable, Observer } from 'rxjs/Rx'; diff --git a/lib/process-services/comments/comments.module.ts b/lib/process-services/comments/comments.module.ts index df830457de..d4709e22ab 100644 --- a/lib/process-services/comments/comments.module.ts +++ b/lib/process-services/comments/comments.module.ts @@ -20,7 +20,7 @@ import { NgModule } from '@angular/core'; import { TranslateModule } from '@ngx-translate/core'; import { MaterialModule } from '../material.module'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { DataColumnModule, DataTableModule } from '@alfresco/core'; +import { DataColumnModule, DataTableModule } from '@alfresco/adf-core'; import { ProcessCommentsComponent } from './process-comments.component'; import { CommentListComponent } from './comment-list.component'; diff --git a/lib/process-services/comments/process-comments.component.spec.ts b/lib/process-services/comments/process-comments.component.spec.ts index 215d0ead94..4435ee4dc3 100644 --- a/lib/process-services/comments/process-comments.component.spec.ts +++ b/lib/process-services/comments/process-comments.component.spec.ts @@ -22,7 +22,7 @@ import { MatInputModule } from '@angular/material'; import { Observable } from 'rxjs/Rx'; import { CommentListComponent, CommentsComponent } from '../index'; -import { CommentProcessService, PeopleProcessService } from '@alfresco/core'; +import { CommentProcessService, PeopleProcessService } from '@alfresco/adf-core'; import { ProcessService } from '../process-list/services/process.service'; import { ProcessCommentsComponent } from './process-comments.component'; diff --git a/lib/process-services/comments/process-comments.component.ts b/lib/process-services/comments/process-comments.component.ts index 3b937eefff..eca8ea3de1 100644 --- a/lib/process-services/comments/process-comments.component.ts +++ b/lib/process-services/comments/process-comments.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { CommentProcessModel, CommentProcessService } from '@alfresco/core'; +import { CommentProcessModel, CommentProcessService } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { Observable, Observer } from 'rxjs/Rx'; diff --git a/lib/process-services/karma-test-shim.js b/lib/process-services/karma-test-shim.js index 5a7b07ffbc..c9ed23e1e0 100644 --- a/lib/process-services/karma-test-shim.js +++ b/lib/process-services/karma-test-shim.js @@ -17,11 +17,11 @@ var appContext = require.context(".", true, /.spec.ts/);appContext.keys().forEac const TestBed = require('@angular/core/testing').TestBed; const browser = require('@angular/platform-browser-dynamic/testing'); -const CoreModule = require('@alfresco/core').CoreModule; -const AppConfigService = require('@alfresco/core').AppConfigService; -const AppConfigServiceMock = require('@alfresco/core').AppConfigServiceMock; -const TranslationService = require('@alfresco/core').TranslationService; -const TranslationMock = require('@alfresco/core').TranslationMock; +const CoreModule = require('@alfresco/adf-core').CoreModule; +const AppConfigService = require('@alfresco/adf-core').AppConfigService; +const AppConfigServiceMock = require('@alfresco/adf-core').AppConfigServiceMock; +const TranslationService = require('@alfresco/adf-core').TranslationService; +const TranslationMock = require('@alfresco/adf-core').TranslationMock; const TranslateModule = require('@ngx-translate/core').TranslateModule; const CommonModule = require('@angular/common').CommonModule; const FormsModule = require('@angular/forms').FormsModule; diff --git a/lib/process-services/package.json b/lib/process-services/package.json index 01d5c73d56..611516d42a 100644 --- a/lib/process-services/package.json +++ b/lib/process-services/package.json @@ -26,8 +26,8 @@ "@angular/platform-browser-dynamic": "5.0.0", "@angular/router": "5.0.0", "@ngx-translate/core": "8.0.0", - "alfresco-js-api": "^2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0", - "@alfresco/adf-core":"v2.0.0-8596ba4d39c79d593b878cc0a98abe1a2878ebda", + "alfresco-js-api": "2.0.0-de41fd8ca9c1c6f6072d2e06415eef0a71330dc0", + "@alfresco/adf-core": "2.0.0-303d0166157d305ebfbf1578bf5d1eadcaa631cc", "chart.js": "2.5.0", "core-js": "2.4.1", "hammerjs": "2.0.8", diff --git a/lib/process-services/people/people-list.component.spec.ts b/lib/process-services/people/people-list.component.spec.ts index f0f1bf43d4..161aa21d23 100644 --- a/lib/process-services/people/people-list.component.spec.ts +++ b/lib/process-services/people/people-list.component.spec.ts @@ -16,8 +16,8 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { UserProcessModel } from '@alfresco/core'; -import { DataRowActionEvent, DataRowEvent, ObjectDataRow } from '@alfresco/core'; +import { UserProcessModel } from '@alfresco/adf-core'; +import { DataRowActionEvent, DataRowEvent, ObjectDataRow } from '@alfresco/adf-core'; import { UserEventModel } from '../task-list/models/user-event.model'; import { PeopleListComponent } from './people-list.component'; diff --git a/lib/process-services/people/people-list.component.ts b/lib/process-services/people/people-list.component.ts index 3e47a0d5a7..4349adb118 100644 --- a/lib/process-services/people/people-list.component.ts +++ b/lib/process-services/people/people-list.component.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { DataTableComponent } from '@alfresco/core'; -import { DataColumnListComponent, UserProcessModel } from '@alfresco/core'; +import { DataTableComponent } from '@alfresco/adf-core'; +import { DataColumnListComponent, UserProcessModel } from '@alfresco/adf-core'; import { AfterContentInit, AfterViewInit, Component, ContentChild, EventEmitter, Input, Output, ViewChild } from '@angular/core'; import { UserEventModel } from '../task-list/models/user-event.model'; diff --git a/lib/process-services/people/people-search.component.spec.ts b/lib/process-services/people/people-search.component.spec.ts index 230f82bed0..2e17dcdec8 100644 --- a/lib/process-services/people/people-search.component.spec.ts +++ b/lib/process-services/people/people-search.component.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { MatButtonModule, MatInputModule } from '@angular/material'; -import { UserProcessModel } from '@alfresco/core'; +import { UserProcessModel } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Observable'; import { PeopleListComponent } from './people-list.component'; import { PeopleSearchComponent } from './people-search.component'; diff --git a/lib/process-services/people/people-search.component.ts b/lib/process-services/people/people-search.component.ts index 9e2386596d..f324a96985 100644 --- a/lib/process-services/people/people-search.component.ts +++ b/lib/process-services/people/people-search.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { PeopleProcessService, UserProcessModel } from '@alfresco/core'; +import { PeopleProcessService, UserProcessModel } from '@alfresco/adf-core'; import { Component, Directive, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core'; import { FormControl } from '@angular/forms'; import { Observable } from 'rxjs/Observable'; diff --git a/lib/process-services/people/people.component.spec.ts b/lib/process-services/people/people.component.spec.ts index da556fa5c1..b43e818fc2 100644 --- a/lib/process-services/people/people.component.spec.ts +++ b/lib/process-services/people/people.component.spec.ts @@ -18,8 +18,8 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { MatButtonModule, MatInputModule } from '@angular/material'; -import { LogService } from '@alfresco/core'; -import { PeopleProcessService, UserProcessModel } from '@alfresco/core'; +import { LogService } from '@alfresco/adf-core'; +import { PeopleProcessService, UserProcessModel } from '@alfresco/adf-core'; import { PeopleListComponent } from './people-list.component'; import { PeopleSearchComponent } from './people-search.component'; import { PeopleComponent } from './people.component'; diff --git a/lib/process-services/people/people.component.ts b/lib/process-services/people/people.component.ts index 8bfb27044d..3a6968abfd 100644 --- a/lib/process-services/people/people.component.ts +++ b/lib/process-services/people/people.component.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { LogService, UserProcessModel } from '@alfresco/core'; -import { PeopleProcessService } from '@alfresco/core'; +import { LogService, UserProcessModel } from '@alfresco/adf-core'; +import { PeopleProcessService } from '@alfresco/adf-core'; import { AfterViewInit, Component, Input, OnInit, ViewChild } from '@angular/core'; import { Observable, Observer } from 'rxjs/Rx'; import { UserEventModel } from '../task-list/models/user-event.model'; diff --git a/lib/process-services/people/people.module.ts b/lib/process-services/people/people.module.ts index bdda0182a1..626f3260e8 100644 --- a/lib/process-services/people/people.module.ts +++ b/lib/process-services/people/people.module.ts @@ -21,7 +21,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { MaterialModule } from '../material.module'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { DataColumnModule, DataTableModule } from '@alfresco/core'; +import { DataColumnModule, DataTableModule } from '@alfresco/adf-core'; import { PeopleComponent } from './people.component'; import { PeopleListComponent } from './people-list.component'; import { PeopleSearchActionLabelDirective, PeopleSearchComponent, PeopleSearchTitleDirective } from './people-search.component'; diff --git a/lib/process-services/process-list/components/process-audit.directive.ts b/lib/process-services/process-list/components/process-audit.directive.ts index 9bfdf4a25d..59c8ba26d5 100644 --- a/lib/process-services/process-list/components/process-audit.directive.ts +++ b/lib/process-services/process-list/components/process-audit.directive.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ContentService } from '@alfresco/core'; +import { ContentService } from '@alfresco/adf-core'; import { Directive, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { ProcessService } from './../services/process.service'; diff --git a/lib/process-services/process-list/components/process-filters.component.spec.ts b/lib/process-services/process-list/components/process-filters.component.spec.ts index 02c144f699..e3430f69f9 100644 --- a/lib/process-services/process-list/components/process-filters.component.spec.ts +++ b/lib/process-services/process-list/components/process-filters.component.spec.ts @@ -16,7 +16,7 @@ */ import { SimpleChange } from '@angular/core'; -import { AppsProcessService } from '@alfresco/core'; +import { AppsProcessService } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Rx'; import { FilterProcessRepresentationModel } from '../models/filter-process.model'; import { ProcessFilterService } from '../services/process-filter.service'; diff --git a/lib/process-services/process-list/components/process-filters.component.ts b/lib/process-services/process-list/components/process-filters.component.ts index 3d85f94f74..769ad300d2 100644 --- a/lib/process-services/process-list/components/process-filters.component.ts +++ b/lib/process-services/process-list/components/process-filters.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AppsProcessService } from '@alfresco/core'; +import { AppsProcessService } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; import { ProcessInstanceFilterRepresentation } from 'alfresco-js-api'; import { Observable, Observer } from 'rxjs/Rx'; diff --git a/lib/process-services/process-list/components/process-instance-details.component.spec.ts b/lib/process-services/process-list/components/process-instance-details.component.spec.ts index 5e0f927993..3b68023824 100644 --- a/lib/process-services/process-list/components/process-instance-details.component.spec.ts +++ b/lib/process-services/process-list/components/process-instance-details.component.spec.ts @@ -21,7 +21,7 @@ import { MaterialModule } from '../../material.module'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { FormModule, FormService } from '@alfresco/core'; +import { FormModule, FormService } from '@alfresco/adf-core'; import { TaskListModule } from '../../task-list'; import { ProcessInstance } from '../models/process-instance.model'; diff --git a/lib/process-services/process-list/components/process-instance-details.component.ts b/lib/process-services/process-list/components/process-instance-details.component.ts index 8d3f9170ee..1b282db975 100644 --- a/lib/process-services/process-list/components/process-instance-details.component.ts +++ b/lib/process-services/process-list/components/process-instance-details.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { LogService } from '@alfresco/core'; +import { LogService } from '@alfresco/adf-core'; import { DatePipe } from '@angular/common'; import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild } from '@angular/core'; import { TaskDetailsEvent } from '../../task-list'; diff --git a/lib/process-services/process-list/components/process-instance-header.component.spec.ts b/lib/process-services/process-list/components/process-instance-header.component.spec.ts index 33ad956f06..9bdf89339b 100644 --- a/lib/process-services/process-list/components/process-instance-header.component.spec.ts +++ b/lib/process-services/process-list/components/process-instance-header.component.spec.ts @@ -16,7 +16,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { CardViewUpdateService } from '@alfresco/core'; +import { CardViewUpdateService } from '@alfresco/adf-core'; import { MaterialModule } from '../../material.module'; import { ProcessInstance } from '../models/process-instance.model'; diff --git a/lib/process-services/process-list/components/process-instance-header.component.ts b/lib/process-services/process-list/components/process-instance-header.component.ts index d9f3239146..50c6653d02 100644 --- a/lib/process-services/process-list/components/process-instance-header.component.ts +++ b/lib/process-services/process-list/components/process-instance-header.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { CardViewDateItemModel, CardViewItem, CardViewTextItemModel } from '@alfresco/core'; +import { CardViewDateItemModel, CardViewItem, CardViewTextItemModel } from '@alfresco/adf-core'; import { Component, Input, OnChanges, SimpleChanges } from '@angular/core'; import { ProcessInstance } from '../models/process-instance.model'; diff --git a/lib/process-services/process-list/components/process-instance-tasks.component.ts b/lib/process-services/process-list/components/process-instance-tasks.component.ts index 1661a475f3..2d634cd5c8 100644 --- a/lib/process-services/process-list/components/process-instance-tasks.component.ts +++ b/lib/process-services/process-list/components/process-instance-tasks.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { LogService } from '@alfresco/core'; +import { LogService } from '@alfresco/adf-core'; import { DatePipe } from '@angular/common'; import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core'; import { MatDialog } from '@angular/material'; diff --git a/lib/process-services/process-list/components/process-list.component.spec.ts b/lib/process-services/process-list/components/process-list.component.spec.ts index ece3bfaafc..61f4ad9bf7 100644 --- a/lib/process-services/process-list/components/process-list.component.spec.ts +++ b/lib/process-services/process-list/components/process-list.component.spec.ts @@ -21,8 +21,8 @@ import { MatProgressSpinnerModule } from '@angular/material'; import { Observable } from 'rxjs/Rx'; import { ProcessInstanceListComponent } from './process-list.component'; -import { AppConfigService } from '@alfresco/core'; -import { DataRowEvent, DataSorting, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/core'; +import { AppConfigService } from '@alfresco/adf-core'; +import { DataRowEvent, DataSorting, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/adf-core'; import { fakeProcessInstance, fakeProcessInstancesWithNoName } from '../../mock'; import { ProcessService } from '../services/process.service'; diff --git a/lib/process-services/process-list/components/process-list.component.ts b/lib/process-services/process-list/components/process-list.component.ts index 1b3ca92ca4..98aa026847 100644 --- a/lib/process-services/process-list/components/process-list.component.ts +++ b/lib/process-services/process-list/components/process-list.component.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { DataColumn, DataRowEvent, DataSorting, DataTableAdapter, ObjectDataColumn, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/core'; -import { AppConfigService, DataColumnListComponent } from '@alfresco/core'; +import { DataColumn, DataRowEvent, DataSorting, DataTableAdapter, ObjectDataColumn, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/adf-core'; +import { AppConfigService, DataColumnListComponent } from '@alfresco/adf-core'; import { DatePipe } from '@angular/common'; import { AfterContentInit, Component, ContentChild, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { ProcessFilterParamRepresentationModel } from '../models/filter-process.model'; diff --git a/lib/process-services/process-list/components/start-process.component.spec.ts b/lib/process-services/process-list/components/start-process.component.spec.ts index 66c56f898d..97cf40a319 100644 --- a/lib/process-services/process-list/components/start-process.component.spec.ts +++ b/lib/process-services/process-list/components/start-process.component.spec.ts @@ -23,7 +23,7 @@ import { MatInputModule, MatSelectModule } from '@angular/material'; -import { FormModule, FormService } from '@alfresco/core'; +import { FormModule, FormService } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Rx'; import { ProcessInstanceVariable } from '../models/process-instance-variable.model'; diff --git a/lib/process-services/process-list/components/start-process.component.ts b/lib/process-services/process-list/components/start-process.component.ts index bccb4171af..2c16a45acf 100644 --- a/lib/process-services/process-list/components/start-process.component.ts +++ b/lib/process-services/process-list/components/start-process.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, ViewChild, ViewEncapsulation } from '@angular/core'; -import { StartFormComponent } from '@alfresco/core'; +import { StartFormComponent } from '@alfresco/adf-core'; import { ProcessInstanceVariable } from '../models/process-instance-variable.model'; import { ProcessDefinitionRepresentation } from './../models/process-definition.model'; import { ProcessInstance } from './../models/process-instance.model'; diff --git a/lib/process-services/process-list/process-list.module.ts b/lib/process-services/process-list/process-list.module.ts index 686ac28f2f..6ef7d1d524 100644 --- a/lib/process-services/process-list/process-list.module.ts +++ b/lib/process-services/process-list/process-list.module.ts @@ -20,10 +20,10 @@ import { NgModule } from '@angular/core'; import { FlexLayoutModule } from '@angular/flex-layout'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { TranslateModule } from '@ngx-translate/core'; -import { FormModule } from '@alfresco/core'; +import { FormModule } from '@alfresco/adf-core'; import { MaterialModule } from '../material.module'; -import { CardViewModule, CardViewUpdateService, DataColumnModule, DataTableModule, DirectiveModule, PipeModule } from '@alfresco/core'; +import { CardViewModule, CardViewUpdateService, DataColumnModule, DataTableModule, DirectiveModule, PipeModule } from '@alfresco/adf-core'; import { TaskListModule } from '../task-list'; import { PeopleModule } from '../people'; import { CommentsModule } from '../comments'; diff --git a/lib/process-services/process-list/services/process-filter.service.spec.ts b/lib/process-services/process-list/services/process-filter.service.spec.ts index 2226223289..013d0ba4da 100644 --- a/lib/process-services/process-list/services/process-filter.service.spec.ts +++ b/lib/process-services/process-list/services/process-filter.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { async } from '@angular/core/testing'; import { AlfrescoApi } from 'alfresco-js-api'; -import { AlfrescoApiService } from '@alfresco/core'; +import { AlfrescoApiService } from '@alfresco/adf-core'; import { fakeError, fakeProcessFilters } from '../../mock'; import { FilterProcessRepresentationModel } from '../models/filter-process.model'; import { ProcessFilterService } from './process-filter.service'; diff --git a/lib/process-services/process-list/services/process-filter.service.ts b/lib/process-services/process-list/services/process-filter.service.ts index b477f97198..69e8a47dae 100644 --- a/lib/process-services/process-list/services/process-filter.service.ts +++ b/lib/process-services/process-list/services/process-filter.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService, LogService } from '@alfresco/core'; +import { AlfrescoApiService, LogService } from '@alfresco/adf-core'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { FilterProcessRepresentationModel } from '../models/filter-process.model'; diff --git a/lib/process-services/process-list/services/process.service.spec.ts b/lib/process-services/process-list/services/process.service.spec.ts index dd8f2826de..7551d7a0ef 100644 --- a/lib/process-services/process-list/services/process.service.spec.ts +++ b/lib/process-services/process-list/services/process.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { async } from '@angular/core/testing'; import { AlfrescoApi } from 'alfresco-js-api'; -import { AlfrescoApiService } from '@alfresco/core'; +import { AlfrescoApiService } from '@alfresco/adf-core'; import { exampleProcess, fakeProcessInstances } from '../../mock'; import { fakeError, fakeProcessDef, fakeTasksList } from '../../mock'; import { ProcessFilterParamRepresentationModel } from '../models/filter-process.model'; diff --git a/lib/process-services/process-list/services/process.service.ts b/lib/process-services/process-list/services/process.service.ts index c574e61f4e..c967d4a1af 100644 --- a/lib/process-services/process-list/services/process.service.ts +++ b/lib/process-services/process-list/services/process.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService } from '@alfresco/core'; +import { AlfrescoApiService } from '@alfresco/adf-core'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Observable'; import { TaskDetailsModel } from '../../task-list'; diff --git a/lib/process-services/process.module.ts b/lib/process-services/process.module.ts index 9c93807965..4a63ce1484 100644 --- a/lib/process-services/process.module.ts +++ b/lib/process-services/process.module.ts @@ -19,7 +19,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { CoreModule, TRANSLATION_PROVIDER } from '@alfresco/core'; +import { CoreModule, TRANSLATION_PROVIDER } from '@alfresco/adf-core'; import { MaterialModule } from './material.module'; @@ -50,8 +50,8 @@ import { PeopleModule } from './people'; provide: TRANSLATION_PROVIDER, multi: true, useValue: { - name: '@adf/process-services', - source: 'assets/@adf/process-services' + name: '@alfresco/process-services', + source: '@alfresco/process-services' } } ], diff --git a/lib/process-services/task-list/components/start-task.component.spec.ts b/lib/process-services/task-list/components/start-task.component.spec.ts index 26dbbde3f5..52d6a205fd 100644 --- a/lib/process-services/task-list/components/start-task.component.spec.ts +++ b/lib/process-services/task-list/components/start-task.component.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { MaterialModule } from '../../material.module'; -import { PeopleProcessService } from '@alfresco/core'; +import { PeopleProcessService } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Rx'; import { startTaskMock } from '../../mock'; import { StartTaskModel } from '../models/start-task.model'; diff --git a/lib/process-services/task-list/components/start-task.component.ts b/lib/process-services/task-list/components/start-task.component.ts index a0251888d5..23c3c7fcf8 100644 --- a/lib/process-services/task-list/components/start-task.component.ts +++ b/lib/process-services/task-list/components/start-task.component.ts @@ -16,7 +16,7 @@ */ import { LogService, MOMENT_DATE_FORMATS, - MomentDateAdapter, PeopleProcessService, UserPreferencesService, UserProcessModel } from '@alfresco/core'; + MomentDateAdapter, PeopleProcessService, UserPreferencesService, UserProcessModel } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core'; import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material'; import * as moment from 'moment'; diff --git a/lib/process-services/task-list/components/task-audit.directive.ts b/lib/process-services/task-list/components/task-audit.directive.ts index f9a0e17e29..58ebc074fe 100644 --- a/lib/process-services/task-list/components/task-audit.directive.ts +++ b/lib/process-services/task-list/components/task-audit.directive.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ContentService } from '@alfresco/core'; +import { ContentService } from '@alfresco/adf-core'; import { Directive, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'; import { TaskListService } from './../services/tasklist.service'; diff --git a/lib/process-services/task-list/components/task-details.component.spec.ts b/lib/process-services/task-list/components/task-details.component.spec.ts index 5d8c310bc9..913a83c75f 100644 --- a/lib/process-services/task-list/components/task-details.component.spec.ts +++ b/lib/process-services/task-list/components/task-details.component.spec.ts @@ -21,10 +21,10 @@ import { MatButtonModule, MatInputModule } from '@angular/material'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; -import { FormModule, FormModel, FormOutcomeEvent, FormOutcomeModel, FormService } from '@alfresco/core'; -import { CommentProcessService, LogService } from '@alfresco/core'; +import { FormModule, FormModel, FormOutcomeEvent, FormOutcomeModel, FormService } from '@alfresco/adf-core'; +import { CommentProcessService, LogService } from '@alfresco/adf-core'; -import { PeopleProcessService, UserProcessModel } from '@alfresco/core'; +import { PeopleProcessService, UserProcessModel } from '@alfresco/adf-core'; import { TaskDetailsModel } from '../models/task-details.model'; import { noDataMock, taskDetailsMock, taskFormMock, tasksMock } from '../../mock'; import { TaskListService } from './../services/tasklist.service'; diff --git a/lib/process-services/task-list/components/task-details.component.ts b/lib/process-services/task-list/components/task-details.component.ts index 772ebe8a4b..fa0c8f58ab 100644 --- a/lib/process-services/task-list/components/task-details.component.ts +++ b/lib/process-services/task-list/components/task-details.component.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { PeopleProcessService, UserProcessModel } from '@alfresco/core'; -import { AuthenticationService, CardViewUpdateService, ClickNotification, LogService, UpdateNotification } from '@alfresco/core'; +import { PeopleProcessService, UserProcessModel } from '@alfresco/adf-core'; +import { AuthenticationService, CardViewUpdateService, ClickNotification, LogService, UpdateNotification } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, @@ -29,7 +29,7 @@ import { Component, } from '@angular/core'; import { MatDialog, MatDialogRef } from '@angular/material'; import { Observable, Observer } from 'rxjs/Rx'; -import { ContentLinkModel, FormFieldValidator, FormModel, FormOutcomeEvent } from '@alfresco/core'; +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/task-list/components/task-filters.component.spec.ts b/lib/process-services/task-list/components/task-filters.component.spec.ts index a830ed34f5..7c27995d7e 100644 --- a/lib/process-services/task-list/components/task-filters.component.spec.ts +++ b/lib/process-services/task-list/components/task-filters.component.spec.ts @@ -17,7 +17,7 @@ import { SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { AppConfigService, AppsProcessService } from '@alfresco/core'; +import { AppConfigService, AppsProcessService } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Rx'; import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model'; import { TaskListService } from '../services/tasklist.service'; diff --git a/lib/process-services/task-list/components/task-filters.component.ts b/lib/process-services/task-list/components/task-filters.component.ts index d868d6e721..560e5974e4 100644 --- a/lib/process-services/task-list/components/task-filters.component.ts +++ b/lib/process-services/task-list/components/task-filters.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AppsProcessService } from '@alfresco/core'; +import { AppsProcessService } from '@alfresco/adf-core'; import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; import { Observable, Observer } from 'rxjs/Rx'; import { FilterParamsModel, FilterRepresentationModel } from '../models/filter.model'; diff --git a/lib/process-services/task-list/components/task-header.component.spec.ts b/lib/process-services/task-list/components/task-header.component.spec.ts index 7559088c7a..f33d2ce051 100644 --- a/lib/process-services/task-list/components/task-header.component.spec.ts +++ b/lib/process-services/task-list/components/task-header.component.spec.ts @@ -18,8 +18,8 @@ import { DebugElement } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { By } from '@angular/platform-browser'; -import { CardViewUpdateService, UserProcessModel } from '@alfresco/core'; -import { BpmUserService } from '@alfresco/core'; +import { CardViewUpdateService, UserProcessModel } from '@alfresco/adf-core'; +import { BpmUserService } from '@alfresco/adf-core'; import { MaterialModule } from '../../material.module'; import { Observable } from 'rxjs/Rx'; import { diff --git a/lib/process-services/task-list/components/task-header.component.ts b/lib/process-services/task-list/components/task-header.component.ts index 5b61c2a2e0..04e84be173 100644 --- a/lib/process-services/task-list/components/task-header.component.ts +++ b/lib/process-services/task-list/components/task-header.component.ts @@ -17,7 +17,7 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; -import { BpmUserService, CardViewDateItemModel, CardViewItem, CardViewMapItemModel, CardViewTextItemModel, LogService } from '@alfresco/core'; +import { BpmUserService, CardViewDateItemModel, CardViewItem, CardViewMapItemModel, CardViewTextItemModel, LogService } from '@alfresco/adf-core'; import { TaskDetailsModel } from '../models/task-details.model'; import { TaskListService } from './../services/tasklist.service'; diff --git a/lib/process-services/task-list/components/task-list.component.spec.ts b/lib/process-services/task-list/components/task-list.component.spec.ts index 4d962dc070..d9a2b6b150 100644 --- a/lib/process-services/task-list/components/task-list.component.spec.ts +++ b/lib/process-services/task-list/components/task-list.component.spec.ts @@ -18,8 +18,8 @@ import { SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { MaterialModule } from '../../material.module'; -import { AppConfigService } from '@alfresco/core'; -import { DataRowEvent, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/core'; +import { AppConfigService } from '@alfresco/adf-core'; +import { DataRowEvent, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/adf-core'; import { TaskListService } from '../services/tasklist.service'; import { TaskListComponent } from './task-list.component'; diff --git a/lib/process-services/task-list/components/task-list.component.ts b/lib/process-services/task-list/components/task-list.component.ts index 9e0733547e..4bc4cd94c5 100644 --- a/lib/process-services/task-list/components/task-list.component.ts +++ b/lib/process-services/task-list/components/task-list.component.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { DataColumn, DataRowEvent, DataTableAdapter, ObjectDataColumn, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/core'; -import { AppConfigService, DataColumnListComponent } from '@alfresco/core'; +import { DataColumn, DataRowEvent, DataTableAdapter, ObjectDataColumn, ObjectDataRow, ObjectDataTableAdapter } from '@alfresco/adf-core'; +import { AppConfigService, DataColumnListComponent } from '@alfresco/adf-core'; import { AfterContentInit, Component, ContentChild, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core'; import { Observable } from 'rxjs/Rx'; import { TaskQueryRequestRepresentationModel } from '../models/filter.model'; diff --git a/lib/process-services/task-list/models/start-task.model.ts b/lib/process-services/task-list/models/start-task.model.ts index 545d9a98fd..dfe1199f9a 100644 --- a/lib/process-services/task-list/models/start-task.model.ts +++ b/lib/process-services/task-list/models/start-task.model.ts @@ -22,7 +22,7 @@ * * @returns {StartTaskModel} . */ -import { UserProcessModel } from '@alfresco/core'; +import { UserProcessModel } from '@alfresco/adf-core'; export class StartTaskModel { diff --git a/lib/process-services/task-list/models/task-details.model.ts b/lib/process-services/task-list/models/task-details.model.ts index d256958559..7e3bb47973 100644 --- a/lib/process-services/task-list/models/task-details.model.ts +++ b/lib/process-services/task-list/models/task-details.model.ts @@ -22,7 +22,7 @@ * * @returns {TaskDetailsModel} . */ -import { UserProcessModel } from '@alfresco/core'; +import { UserProcessModel } from '@alfresco/adf-core'; import { TaskRepresentation } from 'alfresco-js-api'; import { UserGroupModel } from './user-group.model'; diff --git a/lib/process-services/task-list/services/process-upload.service.ts b/lib/process-services/task-list/services/process-upload.service.ts index 043dfce8bc..123cbd8bc8 100644 --- a/lib/process-services/task-list/services/process-upload.service.ts +++ b/lib/process-services/task-list/services/process-upload.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService, AppConfigService, UploadService } from '@alfresco/core'; +import { AlfrescoApiService, AppConfigService, UploadService } from '@alfresco/adf-core'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs/Rx'; diff --git a/lib/process-services/task-list/services/task-filter.service.ts b/lib/process-services/task-list/services/task-filter.service.ts index c9d867b950..acbbd5a944 100644 --- a/lib/process-services/task-list/services/task-filter.service.ts +++ b/lib/process-services/task-list/services/task-filter.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService, LogService } from '@alfresco/core'; +import { AlfrescoApiService, LogService } from '@alfresco/adf-core'; import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs/Rx'; import { FilterRepresentationModel } from '../models/filter.model'; diff --git a/lib/process-services/task-list/services/tasklist.service.spec.ts b/lib/process-services/task-list/services/tasklist.service.spec.ts index a38cf0204a..b202651450 100644 --- a/lib/process-services/task-list/services/tasklist.service.spec.ts +++ b/lib/process-services/task-list/services/tasklist.service.spec.ts @@ -16,7 +16,7 @@ */ import { async, TestBed } from '@angular/core/testing'; -import { UserProcessModel } from '@alfresco/core'; +import { UserProcessModel } from '@alfresco/adf-core'; import { Observable } from 'rxjs/Rx'; import { fakeCompletedTaskList, diff --git a/lib/process-services/task-list/services/tasklist.service.ts b/lib/process-services/task-list/services/tasklist.service.ts index 65e4da2193..ad0f628375 100644 --- a/lib/process-services/task-list/services/tasklist.service.ts +++ b/lib/process-services/task-list/services/tasklist.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AlfrescoApiService, LogService } from '@alfresco/core'; +import { AlfrescoApiService, LogService } from '@alfresco/adf-core'; import { Injectable } from '@angular/core'; import { Observable, Subject } from 'rxjs/Rx'; import { FilterRepresentationModel, TaskQueryRequestRepresentationModel } from '../models/filter.model'; diff --git a/lib/process-services/task-list/task-list.module.ts b/lib/process-services/task-list/task-list.module.ts index bc0ecd83f4..bd150b66a2 100644 --- a/lib/process-services/task-list/task-list.module.ts +++ b/lib/process-services/task-list/task-list.module.ts @@ -19,9 +19,9 @@ import { CommonModule, DatePipe } from '@angular/common'; import { NgModule } from '@angular/core'; import { FlexLayoutModule } from '@angular/flex-layout'; import { TranslateModule } from '@ngx-translate/core'; -import { FormModule } from '@alfresco/core'; +import { FormModule } from '@alfresco/adf-core'; -import { CardViewModule, DataColumnModule, DataTableModule, DirectiveModule, InfoDrawerModule } from '@alfresco/core'; +import { CardViewModule, DataColumnModule, DataTableModule, DirectiveModule, InfoDrawerModule } from '@alfresco/adf-core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../material.module'; diff --git a/lib/process-services/tsconfig.json b/lib/process-services/tsconfig.json index 65fbab8efc..5be48c9ebb 100644 --- a/lib/process-services/tsconfig.json +++ b/lib/process-services/tsconfig.json @@ -19,10 +19,10 @@ "outDir": "./dist", "baseUrl" : "./", "paths": { - "@alfresco/process-services": ["../process-services"], - "@alfresco/content-services": ["../content-services"], - "@alfresco/insights": ["../analytics"], - "@alfresco/core": ["../core"], + "@alfresco/adf-process-services": ["../process-services"], + "@alfresco/adf-content-services": ["../content-services"], + "@alfresco/adf-insights": ["../analytics"], + "@alfresco/adf-core": ["../core"], "@angular/*": ["../node_modules/@angular/*"] }, "lib": [ diff --git a/lib/tsconfig.json b/lib/tsconfig.json index 386a716569..30bfde37c6 100644 --- a/lib/tsconfig.json +++ b/lib/tsconfig.json @@ -20,10 +20,10 @@ "baseUrl" : "./", "types": ["jasmine"], "paths": { - "@alfresco/process-services": ["./process-services/"], - "@alfresco/content-services": ["./content-services/"], - "@alfresco/core": ["./core/"], - "@alfresco/insights": ["./analytics"], + "@alfresco/adf-process-services": ["./process-services/"], + "@alfresco/adf-content-services": ["./content-services/"], + "@alfresco/adf-core": ["./core/"], + "@alfresco/adf-insights": ["./analytics"], "alfresco-js-api": ["./node_modules/alfresco-js-api/"], "@angular/*": ["./node_modules/@angular/*"], "rxjs/*": ["./node_modules/rxjs/*"] diff --git a/scripts/update-version.sh b/scripts/update-version.sh index 3d8b7fb6eb..c7a75b63fb 100755 --- a/scripts/update-version.sh +++ b/scripts/update-version.sh @@ -13,6 +13,8 @@ eval projects=( "core" cd `dirname $0` +prefix="@alfresco\/adf-" + show_help() { echo "Usage: update-version.sh" echo "" @@ -53,7 +55,7 @@ only_demoshell() { update_component_version() { echo "====== UPDATE PACKAGE VERSION of ${PACKAGE} to ${VERSION} version in all the package.json ======" DESTDIR="$DIR/../lib/${1}" - sed "${sedi[@]}" "s/\"version\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"version\": \"${VERSION}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/g" ${DESTDIR}/package.json } clean_lock() { @@ -67,10 +69,11 @@ update_component_dependency_version(){ for (( j=0; j<${projectslength}; j++ )); do - echo "====== UPDATE DEPENDENCY VERSION of ${projects[$j]} to ~${VERSION} in ${1}======" + echo "====== UPDATE DEPENDENCY VERSION of .* to ~${VERSION} in ${1}======" - sed "${sedi[@]}" "s/\"${projects[$j]}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${projects[$j]}\": \"${VERSION}\"/g" ${DESTDIR}/package.json - sed "${sedi[@]}" "s/\"${projects[$j]}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${projects[$j]}\": \"~${VERSION}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${prefix}${projects[$j]}\": \".*\"/\"${prefix}${projects[$j]}\": \"${VERSION}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${prefix}${projects[$j]}\": \"~.*\"/\"${prefix}${projects[$j]}\": \"~${VERSION}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${prefix}${projects[$j]}\": \"^.*\"/\"${prefix}${projects[$j]}\": \"^${VERSION}\"/g" ${DESTDIR}/package.json done } @@ -80,9 +83,10 @@ update_total_build_dependency_version(){ for (( j=0; j<${projectslength}; j++ )); do - echo "====== UPDATE TOTAL BUILD DEPENDENCY VERSION of ${projects[$j]} to ~${VERSION} in ${1}======" - sed "${sedi[@]}" "s/\"${projects[$j]}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${projects[$j]}\": \"${VERSION}\"/g" ${DESTDIR}/package.json - sed "${sedi[@]}" "s/\"${projects[$j]}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${projects[$j]}\": \"~${VERSION}\"/g" ${DESTDIR}/package.json + echo "====== UPDATE TOTAL BUILD DEPENDENCY VERSION of .* to ~${VERSION} in ${1}======" + sed "${sedi[@]}" "s/\"${prefix}${projects[$j]}\": \".*\"/\"${prefix}${projects[$j]}\": \"${VERSION}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${prefix}${projects[$j]}\": \"~.*\"/\"${prefix}${projects[$j]}\": \"~${VERSION}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${prefix}${projects[$j]}\": \"^.*\"/\"${prefix}${projects[$j]}\": \"^${VERSION}\"/g" ${DESTDIR}/package.json done } @@ -91,8 +95,9 @@ update_total_build_dependency_js_version(){ DESTDIR="$DIR/../lib/" PACKAGETOCHANGE="alfresco-js-api" - sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g" ${DESTDIR}/package.json - sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \".*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"~.*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"^.*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g" ${DESTDIR}/package.json } update_component_js_version(){ @@ -101,8 +106,9 @@ update_component_js_version(){ PACKAGETOCHANGE="alfresco-js-api" - sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGETOCHANGE}\": \"${2}\"/g" ${DESTDIR}/package.json - sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGETOCHANGE}\": \"${2}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \".*\"/\"${PACKAGETOCHANGE}\": \"${2}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"~.*\"/\"${PACKAGETOCHANGE}\": \"${2}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"^.*\"/\"${PACKAGETOCHANGE}\": \"${2}\"/g" ${DESTDIR}/package.json } @@ -113,8 +119,9 @@ update_demo_shell_dependency_version(){ echo "====== UPDATE VERSION OF DEMO-SHELL to ${projects[$k]} version ${VERSION} ======" DESTDIR="$DIR/../demo-shell/" - sed "${sedi[@]}" "s/\"${projects[$k]}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${projects[$k]}\": \"${VERSION}\"/g" ${DESTDIR}/package.json - sed "${sedi[@]}" "s/\"${projects[$k]}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${projects[$k]}\": \"~${VERSION}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${prefix}${projects[$k]}\": \".*\"/\"${prefix}${projects[$k]}\": \"${VERSION}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${prefix}${projects[$k]}\": \"~.*\"/\"${prefix}${projects[$k]}\": \"~${VERSION}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${prefix}${projects[$k]}\": \"^.*\"/\"${prefix}${projects[$k]}\": \"^${VERSION}\"/g" ${DESTDIR}/package.json done } @@ -123,8 +130,9 @@ update_demo_shell_js_version(){ DESTDIR="$DIR/../demo-shell/" PACKAGETOCHANGE="alfresco-js-api" - sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g" ${DESTDIR}/package.json - sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"~[0-9]\\.[0-9]\\.[0-9]\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \".*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"~.*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g" ${DESTDIR}/package.json + sed "${sedi[@]}" "s/\"${PACKAGETOCHANGE}\": \"^.*\"/\"${PACKAGETOCHANGE}\": \"${1}\"/g" ${DESTDIR}/package.json } clean_lock_demo_shell(){ @@ -211,9 +219,9 @@ if $JS_API == true; then fi DESTDIR="$DIR/../demo-shell/" -sed "${sedi[@]}" "s/\"version\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"version\": \"${VERSION}\"/g" ${DIR}/../demo-shell/package.json +sed "${sedi[@]}" "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/g" ${DIR}/../demo-shell/package.json if $EXEC_COMPONENT == true; then rm ${DIR}/../lib/package-lock.json - sed "${sedi[@]}" "s/\"version\": \"[0-9]\\.[0-9]\\.[0-9]\"/\"version\": \"${VERSION}\"/g" ${DIR}/../lib/package.json + sed "${sedi[@]}" "s/\"version\": \".*\"/\"version\": \"${VERSION}\"/g" ${DIR}/../lib/package.json fi