From fe9e8cdc4343b69ae48cf424435354c62398394e Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Tue, 14 Jun 2016 05:37:46 +0100 Subject: [PATCH] Upgrade document list to angular 2.0.0-rc.1 --- .../ng2-alfresco-documentlist/demo/index.html | 9 +++ .../demo/package.json | 42 +++++++----- .../demo/src/main.ts | 6 +- .../demo/systemjs.config.js | 67 ++++++++++--------- .../ng2-alfresco-documentlist/package.json | 25 ++++--- .../src/components/content-action-list.ts | 2 +- .../src/components/content-action.spec.ts | 4 +- .../src/components/content-action.ts | 2 +- .../components/content-column-list.spec.ts | 2 +- .../src/components/content-column-list.ts | 2 +- .../src/components/content-column.spec.ts | 2 +- .../src/components/content-column.ts | 2 +- .../src/components/document-list.html | 16 ++--- .../src/components/document-list.spec.ts | 2 +- .../src/components/document-list.ts | 10 ++- .../src/components/empty-folder-content.ts | 2 +- .../src/services/alfresco.service.ts | 4 +- .../src/services/context-menu.service.ts | 26 ------- .../services/document-actions.service.spec.ts | 2 +- .../src/services/document-actions.service.ts | 2 +- .../services/folder-actions.service.spec.ts | 2 +- .../src/services/folder-actions.service.ts | 2 +- 22 files changed, 121 insertions(+), 112 deletions(-) delete mode 100644 ng2-components/ng2-alfresco-documentlist/src/services/context-menu.service.ts diff --git a/ng2-components/ng2-alfresco-documentlist/demo/index.html b/ng2-components/ng2-alfresco-documentlist/demo/index.html index 1951fdc301..464a825257 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/index.html +++ b/ng2-components/ng2-alfresco-documentlist/demo/index.html @@ -11,7 +11,15 @@ + + + + + + + + diff --git a/ng2-components/ng2-alfresco-documentlist/demo/package.json b/ng2-components/ng2-alfresco-documentlist/demo/package.json index 8c8b2e2855..f15e2914cb 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/package.json +++ b/ng2-components/ng2-alfresco-documentlist/demo/package.json @@ -16,23 +16,35 @@ }, "license": "Apache-2.0", "dependencies": { - "angular2": "2.0.0-beta.15", - "es6-promise": "3.0.2", - "es6-shim": "0.35.0", - "reflect-metadata": "0.1.2", - "rxjs": "5.0.0-beta.2", - "material-design-icons": "^2.2.3", - "material-design-lite": "^1.1.3", - "zone.js": "0.6.10", - "ng2-alfresco-documentlist": "^0.1.16" + "@angular/common": "2.0.0-rc.1", + "@angular/compiler": "2.0.0-rc.1", + "@angular/core": "2.0.0-rc.1", + "@angular/http": "2.0.0-rc.1", + "@angular/platform-browser": "2.0.0-rc.1", + "@angular/platform-browser-dynamic": "2.0.0-rc.1", + "@angular/router": "2.0.0-rc.1", + "@angular/router-deprecated": "2.0.0-rc.1", + "@angular/upgrade": "2.0.0-rc.1", + "systemjs": "0.19.27", + "core-js": "^2.4.0", + "reflect-metadata": "^0.1.3", + "rxjs": "5.0.0-beta.6", + "zone.js": "^0.6.12", + "angular2-in-memory-web-api": "0.0.11", + + "material-design-icons": "^2.2.3", + "material-design-lite": "^1.1.3", + "ng2-alfresco-documentlist": "^0.1.16", + "alfresco-js-api": "^0.1.0", + "ng2-translate": "2.1.0" }, "devDependencies": { - "browser-sync": "^2.10.0", - "connect-history-api-fallback": "^1.2.0", - "concurrently": "^2.0.0", - "tslint": "^3.8.1", - "typescript": "^1.8.10", - "typings": "^0.7.12" + "browser-sync": "^2.10.0", + "connect-history-api-fallback": "^1.2.0", + "concurrently": "^2.0.0", + "tslint": "^3.8.1", + "typescript": "^1.8.10", + "typings": "^1.0.4" }, "keywords": [ "angular2", diff --git a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts index 073e776dce..9468f92fd8 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts +++ b/ng2-components/ng2-alfresco-documentlist/demo/src/main.ts @@ -15,9 +15,9 @@ * limitations under the License. */ -import { Component, OnInit } from 'angular2/core'; -import { bootstrap } from 'angular2/platform/browser'; -import { HTTP_PROVIDERS } from 'angular2/http'; +import { Component, OnInit } from '@angular/core'; +import { bootstrap } from '@angular/platform-browser-dynamic'; +import { HTTP_PROVIDERS } from '@angular/http'; import { ALFRESCO_CORE_PROVIDERS, diff --git a/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js b/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js index ec02b6daa8..e02792d2e0 100644 --- a/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js +++ b/ng2-components/ng2-alfresco-documentlist/demo/systemjs.config.js @@ -1,48 +1,55 @@ /** - * @license - * Copyright 2016 Alfresco Software, Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. + * System configuration for Angular 2 samples + * Adjust as necessary for your application needs. */ - -(function (global) { - +(function(global) { // map tells the System loader where to look for things var map = { + 'app': 'dist', // 'dist', + '@angular': 'node_modules/@angular', + 'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api', + 'rxjs': 'node_modules/rxjs', + 'ng2-translate': 'node_modules/ng2-translate', 'ng2-alfresco-core': 'node_modules/ng2-alfresco-core', - 'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist', - 'rxjs': 'node_modules/rxjs', - 'angular2' : 'node_modules/angular2', - 'app': 'dist/main' + 'ng2-alfresco-documentlist': 'node_modules/ng2-alfresco-documentlist' }; - // packages tells the System loader how to load when no filename and/or no extension var packages = { - 'app': { format: 'register', defaultExtension: 'js' }, + 'app': { main: 'main.js', defaultExtension: 'js' }, + 'rxjs': { defaultExtension: 'js' }, + 'angular2-in-memory-web-api': { main: 'index.js', defaultExtension: 'js' }, + 'ng2-translate': { defaultExtension: 'js' }, 'ng2-alfresco-core': { defaultExtension: 'js' }, - 'ng2-alfresco-documentlist': { defaultExtension: 'js' }, - 'rxjs': { defaultExtension: 'js' }, - 'angular2': { defaultExtension: 'js' } + 'ng2-alfresco-documentlist': { defaultExtension: 'js' } }; - + var ngPackageNames = [ + 'common', + 'compiler', + 'core', + 'http', + 'platform-browser', + 'platform-browser-dynamic', + 'router', + 'router-deprecated', + 'upgrade' + ]; + // Individual files (~300 requests): + function packIndex(pkgName) { + packages['@angular/'+pkgName] = { main: 'index.js', defaultExtension: 'js' }; + } + // Bundled (~40 requests): + function packUmd(pkgName) { + packages['@angular/'+pkgName] = { main: pkgName + '.umd.js', defaultExtension: 'js' }; + } + // Most environments should use UMD; some (Karma) need the individual index files + var setPackageConfig = System.packageWithIndex ? packIndex : packUmd; + // Add package entries for angular packages + ngPackageNames.forEach(setPackageConfig); var config = { - defaultJSExtensions: true, map: map, packages: packages }; - System.config(config); - })(this); diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index 8bbf96f930..7d21554ccc 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -54,16 +54,25 @@ "alfresco" ], "dependencies": { - "angular2": "2.0.0-beta.15", - "es6-module-loader": "^0.17.8", - "es6-shim": "^0.35.0", - "ng2-alfresco-core": "^0.1.0", - "reflect-metadata": "0.1.2", - "rxjs": "5.0.0-beta.2", - "systemjs": "0.19.26", + "@angular/common": "2.0.0-rc.1", + "@angular/compiler": "2.0.0-rc.1", + "@angular/core": "2.0.0-rc.1", + "@angular/http": "2.0.0-rc.1", + "@angular/platform-browser": "2.0.0-rc.1", + "@angular/platform-browser-dynamic": "2.0.0-rc.1", + "@angular/router": "2.0.0-rc.1", + "@angular/router-deprecated": "2.0.0-rc.1", + "@angular/upgrade": "2.0.0-rc.1", + "systemjs": "0.19.27", + "core-js": "^2.4.0", + "reflect-metadata": "^0.1.3", + "rxjs": "5.0.0-beta.6", "zone.js": "^0.6.12", + "angular2-in-memory-web-api": "0.0.11", + + "ng2-alfresco-core": "^0.1.0", "alfresco-js-api": "^0.1.0", - "ng2-translate": "1.11.1" + "ng2-translate": "2.1.0" }, "devDependencies": { "concurrently": "^2.1.0", diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-action-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-action-list.ts index 007e0dfe85..7f8cef1d1b 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-action-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-action-list.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import {Component} from 'angular2/core'; +import {Component} from '@angular/core'; import {DocumentList} from './document-list'; import {ContentActionModel} from './../models/content-action.model'; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-action.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-action.spec.ts index 3baeb4842b..cf29f3b0c9 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-action.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-action.spec.ts @@ -20,8 +20,8 @@ import { describe, expect, beforeEach -} from 'angular2/testing'; -import {EventEmitter} from 'angular2/core'; +} from '@angular/core/testing'; +import {EventEmitter} from '@angular/core'; import {DocumentList} from './document-list'; import {AlfrescoServiceMock} from '../assets/alfresco.service.mock'; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-action.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-action.ts index 95dcf049f2..1bbff3ee6c 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-action.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-action.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import {Component, OnInit, OnChanges, Input, Output, EventEmitter} from 'angular2/core'; +import {Component, OnInit, OnChanges, Input, Output, EventEmitter} from '@angular/core'; import {ContentActionModel} from './../models/content-action.model'; import {ContentActionList} from './content-action-list'; import {DocumentActionsService} from '../services/document-actions.service'; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.spec.ts index 9eb5632dd2..e7364e0fcf 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.spec.ts @@ -20,7 +20,7 @@ import { describe, expect, beforeEach -} from 'angular2/testing'; +} from '@angular/core/testing'; import {DocumentList} from './document-list'; import {AlfrescoServiceMock} from '../assets/alfresco.service.mock'; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.ts index 42c745caf3..73afe4fccd 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column-list.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import {Component} from 'angular2/core'; +import {Component} from '@angular/core'; import {DocumentList} from './document-list'; import {ContentColumnModel} from './../models/content-column.model'; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column.spec.ts index 9cc5d46aca..764a248dc7 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column.spec.ts @@ -20,7 +20,7 @@ import { describe, expect, beforeEach -} from 'angular2/testing'; +} from '@angular/core/testing'; import {DocumentList} from './document-list'; import {ContentColumn} from './content-column'; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-column.ts b/ng2-components/ng2-alfresco-documentlist/src/components/content-column.ts index 568cf9f17a..1599d765f6 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-column.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-column.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Component, OnInit, Input, OnChanges } from 'angular2/core'; +import { Component, OnInit, Input, OnChanges } from '@angular/core'; import { ContentColumnList } from './content-column-list'; import { ContentColumnModel } from './../models/content-column.model'; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html index 5e51490245..a8a3dd1c15 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.html @@ -1,5 +1,5 @@
    -
  1. +
  2. {{r.name}} {{r.name}}
    3. @@ -9,7 +9,7 @@ - - @@ -74,7 +74,7 @@ [attr.for]="'folder_action_menu_' + idx">
  3. {{action.title}}
    4. @@ -84,7 +84,7 @@ @@ -97,7 +97,7 @@ [attr.for]="'document_action_menu_' + idx">
  4. {{action.title}}
    5. diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts index c54173632e..31374c9c97 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.spec.ts @@ -20,7 +20,7 @@ import { describe, expect, beforeEach -} from 'angular2/testing'; +} from '@angular/core/testing'; import { DocumentList } from './document-list'; import { ContentColumnModel } from '../models/content-column.model'; diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts index 1d6a96b8ec..b891823bd4 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/document-list.ts @@ -25,8 +25,8 @@ import { AfterViewChecked, OnChanges, TemplateRef -} from 'angular2/core'; -import { DatePipe } from 'angular2/common'; +} from '@angular/core'; +import { DatePipe } from '@angular/common'; import { Subject } from 'rxjs/Rx'; import { CONTEXT_MENU_DIRECTIVES } from 'ng2-alfresco-core/dist/ng2-alfresco-core'; import { AlfrescoService } from './../services/alfresco.service'; @@ -92,7 +92,7 @@ export class DocumentList implements OnInit, AfterViewChecked, AfterContentInit, actions: ContentActionModel[] = []; columns: ContentColumnModel[] = []; - emptyFolderTemplate: TemplateRef; + emptyFolderTemplate: TemplateRef; private _folder: NodePaging; @@ -469,9 +469,7 @@ export class DocumentList implements OnInit, AfterViewChecked, AfterContentInit, if (col.type === 'date') { let datePipe = new DatePipe(); if (datePipe.supports(value)) { - // TODO: to be changed to plan non-array value post angular2 beta.15 - let pattern = col.format ? [col.format] : []; - return datePipe.transform(value, pattern); + return datePipe.transform(value, col.format); } } diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder-content.ts b/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder-content.ts index 5a4ae68e14..fe95d04679 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder-content.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/components/empty-folder-content.ts @@ -21,7 +21,7 @@ import { TemplateRef, OnInit, AfterContentInit -} from 'angular2/core'; +} from '@angular/core'; import { DocumentList } from './document-list'; @Directive({ diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/alfresco.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/alfresco.service.ts index 02e5fbc38d..fca22e0f24 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/alfresco.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/alfresco.service.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { Injectable } from 'angular2/core'; -import { Response } from 'angular2/http'; +import { Injectable } from '@angular/core'; +import { Response } from '@angular/http'; import { Observable } from 'rxjs/Rx'; import { NodePaging, MinimalNodeEntity } from './../models/document-library.model'; import { diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/context-menu.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/context-menu.service.ts deleted file mode 100644 index 438f43cd2e..0000000000 --- a/ng2-components/ng2-alfresco-documentlist/src/services/context-menu.service.ts +++ /dev/null @@ -1,26 +0,0 @@ -/*! - * @license - * Copyright 2016 Alfresco Software, Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* -import {Injectable} from 'angular2/core'; -import {Subject} from 'rxjs/Rx'; - -@Injectable() -export class ContextMenuService { - public show: Subject<{event: MouseEvent, obj: any[]}> = new Subject(); -} -*/ diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts index b5e0f4993e..5c4d0da547 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.spec.ts @@ -20,7 +20,7 @@ import { describe, expect, beforeEach -} from 'angular2/testing'; +} from '@angular/core/testing'; import {ContentActionHandler} from '../models/content-action.model'; import {DocumentActionsService} from './document-actions.service'; import {AlfrescoServiceMock} from '../assets/alfresco.service.mock'; diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts index 0bef5b995a..6f11303c3f 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/document-actions.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import {Injectable} from 'angular2/core'; +import {Injectable} from '@angular/core'; import {ContentActionHandler} from '../models/content-action.model'; import {AlfrescoService} from './alfresco.service'; import { diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/folder-actions.service.spec.ts b/ng2-components/ng2-alfresco-documentlist/src/services/folder-actions.service.spec.ts index f500e3a4b8..51bc36246a 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/folder-actions.service.spec.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/folder-actions.service.spec.ts @@ -20,7 +20,7 @@ import { describe, expect, beforeEach -} from 'angular2/testing'; +} from '@angular/core/testing'; import {FolderActionsService} from './folder-actions.service'; import {ContentActionHandler} from '../models/content-action.model'; diff --git a/ng2-components/ng2-alfresco-documentlist/src/services/folder-actions.service.ts b/ng2-components/ng2-alfresco-documentlist/src/services/folder-actions.service.ts index 10aa89266a..fccc56109b 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/services/folder-actions.service.ts +++ b/ng2-components/ng2-alfresco-documentlist/src/services/folder-actions.service.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import {Injectable} from 'angular2/core'; +import {Injectable} from '@angular/core'; import {ContentActionHandler} from '../models/content-action.model'; import {AlfrescoService} from './alfresco.service';