fix demo shell start:dev

This commit is contained in:
Mario Romano 2017-10-25 00:49:36 +01:00
parent 8dffbaf503
commit 8f2e3759b7
5 changed files with 48 additions and 86 deletions

View File

@ -5,7 +5,7 @@
"scripts": {
"ng": "ng",
"start": "npm run server-versions && rimraf dist && ng serve --app=0 --open --aot=true",
"start:dev": "npm run server-versions && rimraf dist && ng serve --app=1 pp-dev --proxy-config proxy.conf.json --open",
"start:dev": "npm run clean-ng2-component-angular && npm run server-versions && rimraf dist && ng serve --app=1 pp-dev --proxy-config proxy.conf.json --open",
"start:dist": "npm run server-versions && rimraf dist && ng serve --aot=false --prod --app=0",
"build": "npm run server-versions && rimraf dist && ng build -app=0",
"build:dev": "npm run server-versions && rimraf dist && ng build -app=1",
@ -14,6 +14,7 @@
"e2e": "ng e2e",
"server-versions": "rimraf versions.json && npm list --depth=0 --json=true --prod=true > versions.json || exit 0",
"clean": "npm run clean-build && rimraf dist node_modules typings dist",
"clean-ng2-component-angular": "rimraf ../ng2-components/node_modules/@angular",
"clean-build": "rimraf 'app/{,**/}**.js' 'app/{,**/}**.js.map' 'app/{,**/}**.d.ts'",
"clean-lock": "rimraf package-lock.json"
},
@ -62,10 +63,10 @@
"ng2-charts": "1.6.0",
"pdfjs-dist": "1.5.404",
"raphael": "2.2.7",
"reflect-metadata": "0.1.9",
"reflect-metadata": "0.1.10",
"rxjs": "5.1.0",
"web-animations-js": "2.3.1",
"zone.js": "0.8.4"
"zone.js": "0.8.12"
},
"devDependencies": {
"@angular/cli": "1.4.9",

View File

@ -185,22 +185,22 @@ export class DataTableComponent {
.getNodeInfo('-my-', opts)).subscribe((data) => {
this.logService.log('FUnNy');
this.logService.log(data);
let objects = new ObjectDataTableAdapter([
{
id: data.id,
name: data.name,
createdBy: data.createdByUser.displayName,
createdOn: new Date(data.createdAt),
icon: 'material-icons://face'
}],
[
{ type: 'image', key: 'icon', title: '', srTitle: 'Thumbnail' },
{ type: 'text', key: 'id', title: 'Id', sortable: true },
{ type: 'text', key: 'createdOn', title: 'Created On', sortable: true },
{ type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true },
{ type: 'text', key: 'createdBy.name', title: 'Created By', sortable: true }
]);
this.data = objects;
// let objects = new ObjectDataTableAdapter([
// {
// id: data.id,
// name: data.name,
// createdBy: data.createdByUser.displayName,
// createdOn: new Date(data.createdAt),
// icon: 'material-icons://face'
// }],
// [
// { type: 'image', key: 'icon', title: '', srTitle: 'Thumbnail' },
// { type: 'text', key: 'id', title: 'Id', sortable: true },
// { type: 'text', key: 'createdOn', title: 'Created On', sortable: true },
// { type: 'text', key: 'name', title: 'Name', cssClass: 'full-width name-column', sortable: true },
// { type: 'text', key: 'createdBy.name', title: 'Created By', sortable: true }
// ]);
// this.data = objects;
});
}
}

View File

@ -43,7 +43,7 @@ export class InMemoryFormService extends FormService {
constructor(appConfig: AppConfigService,
ecmModelService: EcmModelService,
apiService: AlfrescoApiService,
logService: LogService) {
public logService: LogService) {
super(ecmModelService, apiService, logService);
this.data = appConfig.get<ActivitiData>('activiti');
}

View File

@ -3,105 +3,63 @@
"compilerOptions": {
"outDir": "../out-tsc/app",
"module": "es2015",
"baseUrl": "",
"rootDir": "..",
"baseUrl": ".",
"skipLibCheck": true,
"types": [],
"paths": {
"ng2-alfresco-core": [
"../../ng2-components/ng2-alfresco-core/index.ts"
],
"ng2-alfresco-core/*": [
"../../ng2-components/ng2-alfresco-core/*"
"../../ng2-components/ng2-alfresco-core"
],
"ng2-alfresco-login": [
"../../ng2-components/ng2-alfresco-login/index.ts"
],
"ng2-alfresco-login/*": [
"../../ng2-components/ng2-alfresco-login/*"
"../../ng2-components/ng2-alfresco-login"
],
"ng2-alfresco-userinfo": [
"../../ng2-components/ng2-alfresco-userinfo/index.ts"
],
"ng2-alfresco-userinfo/*": [
"../../ng2-components/ng2-alfresco-userinfo/*"
"../../ng2-components/ng2-alfresco-userinfo"
],
"ng2-alfresco-search": [
"../../ng2-components/ng2-alfresco-search/index.ts"
],
"ng2-alfresco-search/*": [
"../../ng2-components/ng2-alfresco-search/*"
"../../ng2-components/ng2-alfresco-search"
],
"ng2-alfresco-datatable": [
"../../ng2-components/ng2-alfresco-datatable/index.ts"
],
"ng2-alfresco-datatable/*": [
"../../ng2-components/ng2-alfresco-datatable/*"
"../../ng2-components/ng2-alfresco-datatable"
],
"ng2-alfresco-documentlist": [
"../../ng2-components/ng2-alfresco-documentlist/index.ts"
],
"ng2-alfresco-documentlist/*": [
"../../ng2-components/ng2-alfresco-documentlist/*"
"../../ng2-components/ng2-alfresco-documentlist"
],
"ng2-alfresco-viewer": [
"../../ng2-components/ng2-alfresco-viewer/index.ts"
],
"ng2-alfresco-viewer/*": [
"../../ng2-components/ng2-alfresco-viewer/*"
"../../ng2-components/ng2-alfresco-viewer"
],
"ng2-alfresco-social": [
"../../ng2-components/ng2-alfresco-social/index.ts"
],
"ng2-alfresco-social/*": [
"../../ng2-components/ng2-alfresco-social/*"
"../../ng2-components/ng2-alfresco-social"
],
"ng2-alfresco-tag": [
"../../ng2-components/ng2-alfresco-tag/index.ts"
],
"ng2-alfresco-tag/*": [
"../../ng2-components/ng2-alfresco-tag/*"
"../../ng2-components/ng2-alfresco-tag"
],
"ng2-alfresco-upload": [
"../../ng2-components/ng2-alfresco-upload/index.ts"
],
"ng2-alfresco-upload/*": [
"../../ng2-components/ng2-alfresco-upload/*"
"../../ng2-components/ng2-alfresco-upload"
],
"ng2-alfresco-webscript": [
"../../ng2-components/ng2-alfresco-webscript/index.ts"
],
"ng2-alfresco-webscript/*": [
"../../ng2-components/ng2-alfresco-webscript/*"
"../../ng2-components/ng2-alfresco-webscript"
],
"ng2-activiti-analytics": [
"../../ng2-components/ng2-activiti-analytics/index.ts"
],
"ng2-activiti-analytics/*": [
"../../ng2-components/ng2-activiti-analytics/*"
"../../ng2-components/ng2-activiti-analytics"
],
"ng2-activiti-diagrams": [
"../../ng2-components/ng2-activiti-diagrams/index.ts"
],
"ng2-activiti-diagrams/*": [
"../../ng2-components/ng2-activiti-diagrams/*"
"../../ng2-components/ng2-activiti-diagrams"
],
"ng2-activiti-form": [
"../../ng2-components/ng2-activiti-form/index.ts"
],
"ng2-activiti-form/*": [
"../../ng2-components/ng2-activiti-form/*"
"../../ng2-components/ng2-activiti-form"
],
"ng2-activiti-processlist": [
"../../ng2-components/ng2-activiti-processlist/index.ts"
],
"ng2-activiti-processlist/*": [
"../../ng2-components/ng2-activiti-processlist/*"
"../../ng2-components/ng2-activiti-processlist"
],
"ng2-activiti-tasklist": [
"../../ng2-components/ng2-activiti-tasklist/index.ts"
],
"ng2-activiti-tasklist/*": [
"../../ng2-components/ng2-activiti-tasklist/*"
"../../ng2-components/ng2-activiti-tasklist"
],
// "alfresco-js-api": [
// "../../../alfresco-js-api/dist/alfresco-js-api.js"
// ],
"rxjs/*": [
"../node_modules/rxjs/*"
],
@ -113,5 +71,8 @@
"exclude": [
"test.ts",
"**/*.spec.ts"
]
],
"angularCompilerOptions": {
"skipTemplateCodegen": false
}
}