inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-1731] update material2 beta12 e angular2 4.4.5 (#2475)

Browse Source 
* update material2 beta12
update angular2 4.4.5

* fix changed version js-api

* update types hammerjs

* fix test

* clean old doc

* fix pagination test

* fix test

* missing update packages

* fix <mat-form-field> for select box

* start task component test
This commit is contained in:
Eugenio Romano
2017-10-16 09:58:19 +01:00
committed by Denys Vuika
parent 9663971256
commit fcb292c849
290 changed files with 1702 additions and 2456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
ng2-components/ng2-alfresco-datatable/docs/assets/adf-empty-list.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 120 KiB

BIN
ng2-components/ng2-alfresco-datatable/docs/assets/basic.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

BIN
ng2-components/ng2-alfresco-datatable/docs/assets/datatable-actions-console.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 44 KiB

BIN
ng2-components/ng2-alfresco-datatable/docs/assets/datatable-actions-ui.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 102 KiB

BIN
ng2-components/ng2-alfresco-datatable/docs/assets/datatable-demo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 20 KiB

BIN
ng2-components/ng2-alfresco-datatable/docs/assets/datatable-dom-events.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 133 KiB

BIN
ng2-components/ng2-alfresco-datatable/docs/assets/pagination-demo.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 12 KiB

24
ng2-components/ng2-alfresco-datatable/package.json
View File

@@ -34,17 +34,17 @@
"alfresco"
],
"dependencies": {
"@angular/animations": "4.3.6",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.3.6",
"@angular/compiler": "4.3.6",
"@angular/core": "4.3.6",
"@angular/forms": "4.3.6",
"@angular/http": "4.3.6",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.3.6",
"@angular/platform-browser-dynamic": "4.3.6",
"@angular/router": "4.3.6",
"@angular/animations": "4.4.5",
"@angular/cdk": "2.0.0-beta.12",
"@angular/common": "4.4.5",
"@angular/compiler": "4.4.5",
"@angular/core": "4.4.5",
"@angular/forms": "4.4.5",
"@angular/http": "4.4.5",
"@angular/material": "2.0.0-beta.12",
"@angular/platform-browser": "4.4.5",
"@angular/platform-browser-dynamic": "4.4.5",
"@angular/router": "4.4.5",
"@ngx-translate/core": "7.0.0",
"alfresco-js-api": "1.9.0",
"core-js": "2.4.1",
@@ -56,7 +56,7 @@
"zone.js": "0.8.12"
},
"devDependencies": {
"@types/hammerjs": "2.0.34",
"@types/hammerjs": "2.0.35",
"@types/jasmine": "2.5.35",
"@types/node": "6.0.45",
"adf-tslint-rules": "0.0.3",

30
ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html
View File

@@ -10,7 +10,7 @@
</th>
<!-- Columns -->
<th *ngIf="multiselect">
<md-checkbox [checked]="isSelectAllChecked" (change)="onSelectAllClick($event)"></md-checkbox>
<mat-checkbox [checked]="isSelectAllChecked" (change)="onSelectAllClick($event)"></mat-checkbox>
</th>
<th class="adf-data-table-cell--{{col.type || 'text'}} {{col.cssClass}}"
*ngFor="let col of data.getColumns()"
@@ -45,26 +45,26 @@
<!-- Actions (left) -->
<td *ngIf="actions && actionsPosition === 'left'">
<button md-icon-button [mdMenuTriggerFor]="menu"
<button mat-icon-button [matMenuTriggerFor]="menu"
[attr.data-automation-id]="'action_menu_' + idx">
<md-icon>more_vert</md-icon>
<mat-icon>more_vert</mat-icon>
</button>
<md-menu #menu="mdMenu">
<button md-menu-item *ngFor="let action of getRowActions(row)"
<mat-menu #menu="matMenu">
<button mat-menu-item *ngFor="let action of getRowActions(row)"
[attr.data-automation-id]="action.title"
[disabled]="action.disabled"
(click)="onExecuteRowAction(row, action)">
<md-icon *ngIf="action.icon">{{ action.icon }}</md-icon>
<mat-icon *ngIf="action.icon">{{ action.icon }}</mat-icon>
<span>{{ action.title }}</span>
</button>
</md-menu>
</mat-menu>
</td>
<td *ngIf="multiselect">
<md-checkbox
<mat-checkbox
[checked]="row.isSelected"
(change)="onCheckboxChange(row, $event)">
</md-checkbox>
</mat-checkbox>
</td>
<td *ngFor="let col of data.getColumns()"
class="adf-data-table-cell adf-data-table-cell--{{col.type || 'text'}} {{col.cssClass}}"
@@ -137,19 +137,19 @@
<!-- Actions (right) -->
<td *ngIf="actions && actionsPosition === 'right'" class="alfresco-datatable__actions-cell">
<button md-icon-button [mdMenuTriggerFor]="menu"
<button mat-icon-button [matMenuTriggerFor]="menu"
[attr.data-automation-id]="'action_menu_' + idx">
<md-icon>more_vert</md-icon>
<mat-icon>more_vert</mat-icon>
</button>
<md-menu #menu="mdMenu">
<button md-menu-item *ngFor="let action of getRowActions(row)"
<mat-menu #menu="matMenu">
<button mat-menu-item *ngFor="let action of getRowActions(row)"
[attr.data-automation-id]="action.title"
[disabled]="action.disabled"
(click)="onExecuteRowAction(row, action)">
<md-icon *ngIf="action.icon">{{ action.icon }}</md-icon>
<mat-icon *ngIf="action.icon">{{ action.icon }}</mat-icon>
<span>{{ action.title }}</span>
</button>
</md-menu>
</mat-menu>
</td>
</tr>

14
ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts
View File

@@ -17,7 +17,7 @@
import { SimpleChange } from '@angular/core';
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MdCheckboxChange } from '@angular/material';
import { MatCheckboxChange } from '@angular/material';
import { RouterTestingModule } from '@angular/router/testing';
import { CoreModule } from 'ng2-alfresco-core';
import { MaterialModule } from '../../material.module';
@@ -440,9 +440,9 @@ describe('DataTable', () => {
it('should invert "select all" status', () => {
expect(dataTable.isSelectAllChecked).toBeFalsy();
dataTable.onSelectAllClick(<MdCheckboxChange> { checked: true });
dataTable.onSelectAllClick(<MatCheckboxChange> { checked: true });
expect(dataTable.isSelectAllChecked).toBeTruthy();
dataTable.onSelectAllClick(<MdCheckboxChange> { checked: false });
dataTable.onSelectAllClick(<MatCheckboxChange> { checked: false });
expect(dataTable.isSelectAllChecked).toBeFalsy();
});
@@ -454,13 +454,13 @@ describe('DataTable', () => {
dataTable.multiselect = true;
dataTable.ngAfterContentInit();
dataTable.onSelectAllClick(<MdCheckboxChange> { checked: true });
dataTable.onSelectAllClick(<MatCheckboxChange> { checked: true });
expect(dataTable.isSelectAllChecked).toBe(true);
for (let i = 0; i < rows.length; i++) {
expect(rows[i].isSelected).toBe(true);
}
dataTable.onSelectAllClick(<MdCheckboxChange> { checked: false });
dataTable.onSelectAllClick(<MatCheckboxChange> { checked: false });
expect(dataTable.isSelectAllChecked).toBe(false);
for (let i = 0; i < rows.length; i++) {
expect(rows[i].isSelected).toBe(false);
@@ -471,7 +471,7 @@ describe('DataTable', () => {
dataTable.multiselect = true;
dataTable.ngOnChanges({'data': new SimpleChange('123', {}, true)});
dataTable.onSelectAllClick(<MdCheckboxChange> { checked: true });
dataTable.onSelectAllClick(<MatCheckboxChange> { checked: true });
expect(dataTable.isSelectAllChecked).toBe(true);
});
@@ -483,7 +483,7 @@ describe('DataTable', () => {
dataTable.multiselect = false;
dataTable.ngAfterContentInit();
dataTable.onSelectAllClick(<MdCheckboxChange> { checked: true });
dataTable.onSelectAllClick(<MatCheckboxChange> { checked: true });
expect(dataTable.isSelectAllChecked).toBe(true);
for (let i = 0; i < rows.length; i++) {
expect(rows[i].isSelected).toBe(false);

6
ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts
View File

@@ -19,7 +19,7 @@ import {
AfterContentInit, Component, ContentChild, DoCheck, ElementRef, EventEmitter, Input,
IterableDiffers, OnChanges, Output, SimpleChange, SimpleChanges, TemplateRef
} from '@angular/core';
import { MdCheckboxChange } from '@angular/material';
import { MatCheckboxChange } from '@angular/material';
import { DataColumnListComponent } from 'ng2-alfresco-core';
import { Observable, Observer, Subscription } from 'rxjs/Rx';
import { DataColumn, DataRow, DataRowEvent, DataSorting, DataTableAdapter } from '../../data/datatable-adapter';
@@ -330,7 +330,7 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck
}
}
onSelectAllClick(e: MdCheckboxChange) {
onSelectAllClick(e: MatCheckboxChange) {
this.isSelectAllChecked = e.checked;
if (this.multiselect) {
@@ -348,7 +348,7 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck
}
}
onCheckboxChange(row: DataRow, event: MdCheckboxChange) {
onCheckboxChange(row: DataRow, event: MatCheckboxChange) {
const newValue = event.checked;
this.selectRow(row, newValue);

20
ng2-components/ng2-alfresco-datatable/src/material.module.ts
View File

@@ -17,20 +17,20 @@
import { NgModule } from '@angular/core';
import {
MdButtonModule,
MdCheckboxModule,
MdIconModule,
MdMenuModule,
MdTooltipModule
MatButtonModule,
MatCheckboxModule,
MatIconModule,
MatMenuModule,
MatTooltipModule
} from '@angular/material';
export function modules() {
return [
MdCheckboxModule,
MdMenuModule,
MdIconModule,
MdButtonModule,
MdTooltipModule
MatCheckboxModule,
MatMenuModule,
MatIconModule,
MatButtonModule,
MatTooltipModule
];
}