inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-05-12 17:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACA-1229] preparation for production mode (#255)

Browse Source 
* upgrade to latest ADF, remove CommonModule

* single application module
This commit is contained in:
Denys Vuika 2018-03-23 20:43:52 +00:00 committed by Cilibiu Bogdan
parent ac28a28f94
commit 2a36f2100c
13 changed files with 118 additions and 7715 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
package-lock.json generated
View File

@ -5,11 +5,11 @@
"requires": true,
"dependencies": {
"@alfresco/adf-content-services": {
"version": "2.3.0-18ec14f2109fb6249e9d67ffd5edc3be157b8f18",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.3.0-18ec14f2109fb6249e9d67ffd5edc3be157b8f18.tgz",
"integrity": "sha512-J8wuj/zlUPHmW13HZBL+nJ1JzHWX4lCC9yRQ7j+j++lKgxtSkpma6UmN2Sdnj0aZdDwtWBqrQrdGnyo1HzI1HA==",
"version": "2.3.0-10d437b30b1fa6fe5e37ba1bd920de4728d90527",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.3.0-10d437b30b1fa6fe5e37ba1bd920de4728d90527.tgz",
"integrity": "sha512-HpIdt6JaD8eRYIfsfiVTuF1/bDutT/qnBIsOgGn8vTRVD9leWkb5Av2NLyP+7EO2xsFtNfbVpqGtxdOxxZioAw==",
"requires": {
"@alfresco/adf-core": "2.3.0-18ec14f2109fb6249e9d67ffd5edc3be157b8f18",
"@alfresco/adf-core": "2.3.0-10d437b30b1fa6fe5e37ba1bd920de4728d90527",
"@angular/animations": "5.1.1",
"@angular/cdk": "5.0.1",
"@angular/common": "5.1.1",
@ -24,7 +24,7 @@
"@angular/platform-browser-dynamic": "5.1.1",
"@angular/router": "5.1.1",
"@ngx-translate/core": "9.1.1",
"alfresco-js-api": "2.3.0-bc739247d02401e9678943b98aa63de8cb85a274",
"alfresco-js-api": "2.3.0-7186e9787152f396d8c6c6dc191578ac486a1986",
"chart.js": "2.5.0",
"core-js": "2.4.1",
"hammerjs": "2.0.8",
@ -40,6 +40,15 @@
"zone.js": "0.8.14"
},
"dependencies": {
"alfresco-js-api": {
"version": "2.3.0-7186e9787152f396d8c6c6dc191578ac486a1986",
"resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.3.0-7186e9787152f396d8c6c6dc191578ac486a1986.tgz",
"integrity": "sha512-Qqejfdl5GXC09PSTGrCwwwVXYr8bZ+rHS1J/LulwvcpsU/6nnR+8Y/mJle3zTq+5ltnRwSlQ0aCBq5PMd5DR/g==",
"requires": {
"event-emitter": "0.3.4",
"superagent": "3.8.2"
}
},
"core-js": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
@ -61,9 +70,9 @@
}
},
"@alfresco/adf-core": {
"version": "2.3.0-18ec14f2109fb6249e9d67ffd5edc3be157b8f18",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.3.0-18ec14f2109fb6249e9d67ffd5edc3be157b8f18.tgz",
"integrity": "sha512-IKbD8f6oVzM1aVHjt0AfqXqsH6tLsj2QEs1YrxDnldArtclzNhD+JqLvRbxvFWJLGc16Spsv0hLxk1uOBQem6A==",
"version": "2.3.0-10d437b30b1fa6fe5e37ba1bd920de4728d90527",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.3.0-10d437b30b1fa6fe5e37ba1bd920de4728d90527.tgz",
"integrity": "sha512-qoKTNfyvMBO+j89Snd3EcrVNQlMQFad/vehJibz6j7QcjtEW3LDO37CL1+hyKOfv02y4OSYL4H7d6b1chFDjXw==",
"requires": {
"@angular/animations": "5.1.1",
"@angular/cdk": "5.0.1",
@ -79,7 +88,7 @@
"@angular/platform-browser-dynamic": "5.1.1",
"@angular/router": "5.1.1",
"@ngx-translate/core": "9.1.1",
"alfresco-js-api": "2.3.0-bc739247d02401e9678943b98aa63de8cb85a274",
"alfresco-js-api": "2.3.0-7186e9787152f396d8c6c6dc191578ac486a1986",
"chart.js": "2.5.0",
"core-js": "2.4.1",
"hammerjs": "2.0.8",
@ -95,6 +104,15 @@
"zone.js": "0.8.14"
},
"dependencies": {
"alfresco-js-api": {
"version": "2.3.0-7186e9787152f396d8c6c6dc191578ac486a1986",
"resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.3.0-7186e9787152f396d8c6c6dc191578ac486a1986.tgz",
"integrity": "sha512-Qqejfdl5GXC09PSTGrCwwwVXYr8bZ+rHS1J/LulwvcpsU/6nnR+8Y/mJle3zTq+5ltnRwSlQ0aCBq5PMd5DR/g==",
"requires": {
"event-emitter": "0.3.4",
"superagent": "3.8.2"
}
},
"core-js": {
"version": "2.4.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz",
@ -656,9 +674,9 @@
"integrity": "sha1-rCsnk5xUPpXSwG5/f1wnvkqlQ74="
},
"alfresco-js-api": {
"version": "2.3.0-bc739247d02401e9678943b98aa63de8cb85a274",
"resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.3.0-bc739247d02401e9678943b98aa63de8cb85a274.tgz",
"integrity": "sha512-8E/0jFYyu9i908GeqjX2Q1iSVzlsheTBCMt9yggWqMIJ8etp9CdGUkOWo6LalCbBqtvlcqlHGC5IuzpA6tkNCg==",
"version": "2.3.0-7186e9787152f396d8c6c6dc191578ac486a1986",
"resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.3.0-7186e9787152f396d8c6c6dc191578ac486a1986.tgz",
"integrity": "sha512-Qqejfdl5GXC09PSTGrCwwwVXYr8bZ+rHS1J/LulwvcpsU/6nnR+8Y/mJle3zTq+5ltnRwSlQ0aCBq5PMd5DR/g==",
"requires": {
"event-emitter": "0.3.4",
"superagent": "3.8.2"

6
package.json
View File

@ -16,8 +16,8 @@
},
"private": true,
"dependencies": {
"@alfresco/adf-content-services": "2.3.0-18ec14f2109fb6249e9d67ffd5edc3be157b8f18",
"@alfresco/adf-core": "2.3.0-18ec14f2109fb6249e9d67ffd5edc3be157b8f18",
"@alfresco/adf-content-services": "2.3.0-10d437b30b1fa6fe5e37ba1bd920de4728d90527",
"@alfresco/adf-core": "2.3.0-10d437b30b1fa6fe5e37ba1bd920de4728d90527",
"@angular/animations": "5.1.1",
"@angular/cdk": "5.0.1",
"@angular/common": "5.1.1",
@ -34,7 +34,7 @@
"@mat-datetimepicker/core": "1.0.1",
"@mat-datetimepicker/moment": "1.0.1",
"@ngx-translate/core": "9.1.1",
"alfresco-js-api": "2.3.0-bc739247d02401e9678943b98aa63de8cb85a274",
"alfresco-js-api": "2.3.0-7186e9787152f396d8c6c6dc191578ac486a1986",
"core-js": "2.5.3",
"hammerjs": "2.0.8",
"moment-es6": "1.0.0",

43
src/app/adf.module.ts
View File

@ -1,43 +0,0 @@
/*!
* @license
* Alfresco Example Content Application
*
* Copyright (C) 2005 - 2018 Alfresco Software Limited
*
* This file is part of the Alfresco Example Content Application.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* The Alfresco Example Content Application is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The Alfresco Example Content Application is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
import { NgModule } from '@angular/core';
// ADF modules
import { CoreModule } from '@alfresco/adf-core';
import { ContentModule } from '@alfresco/adf-content-services';
export function modules() {
return [
CoreModule,
ContentModule
];
}
@NgModule({
imports: modules(),
exports: modules()
})
export class AdfModule { }

54
src/app/app.module.ts
View File

@ -26,11 +26,10 @@
import { BrowserModule } from '@angular/platform-browser';
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
import { TRANSLATION_PROVIDER } from '@alfresco/adf-core';
import { AdfModule } from './adf.module';
import { CommonModule } from './common/common.module';
import { MaterialModule } from './common/material.module';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { TRANSLATION_PROVIDER, CoreModule } from '@alfresco/adf-core';
import { ContentModule } from '@alfresco/adf-content-services';
import { AppComponent } from './app.component';
import { APP_ROUTES } from './app.routes';
@ -53,17 +52,37 @@ import { SidenavComponent } from './components/sidenav/sidenav.component';
import { AboutComponent } from './components/about/about.component';
import { LocationLinkComponent } from './components/location-link/location-link.component';
import { EmptyFolderComponent } from './components/empty-folder/empty-folder.component';
import { NodeCopyDirective } from './common/directives/node-copy.directive';
import { NodeDeleteDirective } from './common/directives/node-delete.directive';
import { NodeMoveDirective } from './common/directives/node-move.directive';
import { NodeRestoreDirective } from './common/directives/node-restore.directive';
import { NodePermanentDeleteDirective } from './common/directives/node-permanent-delete.directive';
import { NodeUnshareDirective } from './common/directives/node-unshare.directive';
import { NodeInfoDirective } from './common/directives/node-info.directive';
import { NodeVersionsDirective } from './common/directives/node-versions.directive';
import { VersionManagerDialogAdapterComponent } from './components/versions-dialog/version-manager-dialog-adapter.component';
import { BrowsingFilesService } from './common/services/browsing-files.service';
import { ContentManagementService } from './common/services/content-management.service';
import { NodeActionsService } from './common/services/node-actions.service';
import { MatMenuModule, MatIconModule, MatButtonModule, MatDialogModule, MatInputModule } from '@angular/material';
@NgModule({
imports: [
BrowserModule,
BrowserAnimationsModule,
FormsModule,
ReactiveFormsModule,
RouterModule.forRoot(APP_ROUTES, {
useHash: true,
enableTracing: false // enable for debug only
}),
AdfModule,
CommonModule,
MaterialModule
MatMenuModule,
MatIconModule,
MatButtonModule,
MatDialogModule,
MatInputModule,
CoreModule,
ContentModule
],
declarations: [
AppComponent,
@ -84,7 +103,16 @@ import { EmptyFolderComponent } from './components/empty-folder/empty-folder.com
PreviewComponent,
AboutComponent,
LocationLinkComponent,
EmptyFolderComponent
EmptyFolderComponent,
NodeCopyDirective,
NodeDeleteDirective,
NodeMoveDirective,
NodeRestoreDirective,
NodePermanentDeleteDirective,
NodeUnshareDirective,
NodeInfoDirective,
NodeVersionsDirective,
VersionManagerDialogAdapterComponent
],
providers: [
{
@ -94,7 +122,13 @@ import { EmptyFolderComponent } from './components/empty-folder/empty-folder.com
name: 'app',
source: 'assets'
}
}
},
BrowsingFilesService,
ContentManagementService,
NodeActionsService
],
entryComponents: [
VersionManagerDialogAdapterComponent
],
bootstrap: [AppComponent]
})

95
src/app/common/common.module.ts
View File

@ -1,95 +0,0 @@
/*!
* @license
* Alfresco Example Content Application
*
* Copyright (C) 2005 - 2018 Alfresco Software Limited
*
* This file is part of the Alfresco Example Content Application.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* The Alfresco Example Content Application is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The Alfresco Example Content Application is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
import { NgModule } from '@angular/core';
import { DatePipe } from '@angular/common';
import { RouterModule } from '@angular/router';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { AdfModule } from '../adf.module';
import { MaterialModule } from './material.module';
import { NodeCopyDirective } from './directives/node-copy.directive';
import { NodeDeleteDirective } from './directives/node-delete.directive';
import { NodeMoveDirective } from './directives/node-move.directive';
import { NodeRestoreDirective } from './directives/node-restore.directive';
import { NodePermanentDeleteDirective } from './directives/node-permanent-delete.directive';
import { NodeUnshareDirective } from './directives/node-unshare.directive';
import { NodeInfoDirective} from './directives/node-info.directive';
import { NodeVersionsDirective} from './directives/node-versions.directive';
import { ContentManagementService } from './services/content-management.service';
import { BrowsingFilesService } from './services/browsing-files.service';
import { NodeActionsService } from './services/node-actions.service';
import { VersionManagerDialogAdapterComponent } from '../components/versions-dialog/version-manager-dialog-adapter.component';
export function modules() {
return [
BrowserAnimationsModule,
FormsModule,
ReactiveFormsModule,
MaterialModule,
RouterModule,
AdfModule
];
}
export function declarations() {
return [
NodeCopyDirective,
NodeDeleteDirective,
NodeMoveDirective,
NodeRestoreDirective,
NodePermanentDeleteDirective,
NodeUnshareDirective,
NodeInfoDirective,
NodeVersionsDirective,
VersionManagerDialogAdapterComponent
];
}
export function providers() {
return [
DatePipe,
BrowsingFilesService,
ContentManagementService,
NodeActionsService
];
}
@NgModule({
imports: modules(),
declarations: declarations(),
entryComponents: [
VersionManagerDialogAdapterComponent
],
providers: providers(),
exports: [
...modules(),
...declarations()
]
})
export class CommonModule {}

16
src/app/common/directives/node-delete.directive.spec.ts
View File

@ -25,13 +25,15 @@
import { TestBed, ComponentFixture } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { TranslationService, NodesApiService, NotificationService } from '@alfresco/adf-core';
import { TranslationService, NodesApiService, NotificationService, CoreModule } from '@alfresco/adf-core';
import { Component, DebugElement } from '@angular/core';
import { Observable } from 'rxjs/Rx';
import { CommonModule } from '../common.module';
import { NodeDeleteDirective } from './node-delete.directive';
import { ContentManagementService } from '../services/content-management.service';
import { MatSnackBarModule } from '@angular/material';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@Component({
template: '<div [app-delete-node]="selection"></div>'
@ -53,10 +55,18 @@ describe('NodeDeleteDirective', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [
CommonModule
BrowserAnimationsModule,
FormsModule,
ReactiveFormsModule,
CoreModule,
MatSnackBarModule
],
declarations: [
NodeDeleteDirective,
TestComponent
],
providers: [
ContentManagementService
]
});

9
src/app/common/directives/node-info.directive.spec.ts
View File

@ -25,8 +25,8 @@
import { Component } from '@angular/core';
import { ComponentFixture, TestBed, async, fakeAsync, tick } from '@angular/core/testing';
import { AlfrescoApiService } from '@alfresco/adf-core';
import { CommonModule } from '../common.module';
import { AlfrescoApiService, CoreModule } from '@alfresco/adf-core';
import { NodeInfoDirective } from './node-info.directive';
@Component({
template: '<div [app-node-info]="selection"></div>'
@ -44,10 +44,11 @@ describe('NodeInfoDirective', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
CommonModule
CoreModule
],
declarations: [
TestComponent
TestComponent,
NodeInfoDirective
]
});

16
src/app/common/directives/node-move.directive.spec.ts
View File

@ -27,12 +27,13 @@ import { Component, DebugElement } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Rx';
import { TranslationService, NodesApiService, NotificationService, CoreModule } from '@alfresco/adf-core';
import { DocumentListService } from '@alfresco/adf-content-services';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { TranslationService, NodesApiService, NotificationService } from '@alfresco/adf-core';
import { CommonModule } from '../common.module';
import { NodeActionsService } from '../services/node-actions.service';
import { NodeMoveDirective } from './node-move.directive';
import { ContentManagementService } from '../services/content-management.service';
@Component({
template: '<div [app-move-node]="selection"></div>'
@ -53,10 +54,17 @@ describe('NodeMoveDirective', () => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [
CommonModule
BrowserAnimationsModule,
CoreModule
],
declarations: [
NodeMoveDirective,
TestComponent
],
providers: [
DocumentListService,
ContentManagementService,
NodeActionsService
]
});

6
src/app/common/directives/node-permanent-delete.directive.spec.ts
View File

@ -27,9 +27,8 @@ import { Component, DebugElement } from '@angular/core';
import { TestBed, ComponentFixture, async, fakeAsync, tick } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Rx';
import { AlfrescoApiService, TranslationService, NotificationService } from '@alfresco/adf-core';
import { AlfrescoApiService, TranslationService, NotificationService, CoreModule } from '@alfresco/adf-core';
import { CommonModule } from '../common.module';
import { NodePermanentDeleteDirective } from './node-permanent-delete.directive';
@Component({
@ -52,9 +51,10 @@ describe('NodePermanentDeleteDirective', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
CommonModule
CoreModule
],
declarations: [
NodePermanentDeleteDirective,
TestComponent
]
})

2
src/app/common/directives/node-permanent-delete.directive.ts
View File

@ -30,10 +30,12 @@ import { TranslationService, AlfrescoApiService, NotificationService } from '@al
import { MinimalNodeEntity } from 'alfresco-js-api';
@Directive({
// tslint:disable-next-line:directive-selector
selector: '[app-permanent-delete-node]'
})
export class NodePermanentDeleteDirective {
// tslint:disable-next-line:no-input-rename
@Input('app-permanent-delete-node')
selection: MinimalNodeEntity[];

10
src/app/common/directives/node-restore.directive.spec.ts
View File

@ -30,10 +30,10 @@ import { TestBed, ComponentFixture, async, fakeAsync, tick } from '@angular/core
import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Rx';
import { CommonModule } from '../common.module';
import { AlfrescoApiService, TranslationService, NotificationService } from '@alfresco/adf-core';
import { AlfrescoApiService, TranslationService, NotificationService, CoreModule } from '@alfresco/adf-core';
import { NodeRestoreDirective } from './node-restore.directive';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
@Component({
template: `<div [app-restore-node]="selection"></div>`
@ -57,10 +57,12 @@ describe('NodeRestoreDirective', () => {
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
CommonModule,
RouterTestingModule
BrowserAnimationsModule,
RouterTestingModule,
CoreModule
],
declarations: [
NodeRestoreDirective,
TestComponent
]
})

49
src/app/common/material.module.ts
View File

@ -1,49 +0,0 @@
/*!
* @license
* Alfresco Example Content Application
*
* Copyright (C) 2005 - 2018 Alfresco Software Limited
*
* This file is part of the Alfresco Example Content Application.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* The Alfresco Example Content Application is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The Alfresco Example Content Application is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
import { NgModule } from '@angular/core';
import {
MatMenuModule,
MatIconModule,
MatButtonModule,
MatDialogModule,
MatInputModule
} from '@angular/material';
export function modules() {
return [
MatMenuModule,
MatIconModule,
MatButtonModule,
MatDialogModule,
MatInputModule
];
}
@NgModule({
imports: modules(),
exports: modules()
})
export class MaterialModule {}

7485
yarn.lock
View File

File diff suppressed because it is too large Load Diff