Fix prefix adf- import (#2657)

* fix prefix adf- import * missing conf file prefix replacement * fix demo shell start
2025-07-24 17:32:15 +00:00 · 2017-11-17 02:46:31 +00:00
parent 303d016615
commit ff2e855aa3
193 changed files with 450 additions and 337 deletions
--- 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": "./" }
      ],
--- 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",
--- 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 [
--- 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',
--- 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';
--- 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';
--- 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) {
--- 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',
--- 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',
--- 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';
--- 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',
--- 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',
--- 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 {

--- 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({
--- 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',
--- 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',
--- 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';
--- 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',
--- 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';

--- 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(() => {
--- 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',
--- 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',
--- 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',
--- 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',
--- 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',
--- 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 {
--- 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 {
--- 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';

--- 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"
      ]
    }
  },