diff --git a/demo-shell-ng2/app/components/about/about.component.html b/demo-shell-ng2/app/components/about/about.component.html index ac9815a75f..23b587f28d 100644 --- a/demo-shell-ng2/app/components/about/about.component.html +++ b/demo-shell-ng2/app/components/about/about.component.html @@ -1,15 +1,15 @@

Server settings

- + The values below are taken from the AppConfigService and loaded from the '{{ configFile }}' file. - -

Alfresco Process Services URL: {{ bpmHost }}

- - - -

Alfresco Content Services URL: {{ ecmHost }}

- - + +

Alfresco Process Services URL: {{ bpmHost }}

+ + + +

Alfresco Content Services URL: {{ ecmHost }}

+ +

Product Versions

diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html index b91c008e98..4bfee9a360 100644 --- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html +++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html @@ -1,11 +1,11 @@ - - + +
-
@@ -77,18 +77,18 @@ adf-task-audit [task-id]="currentTaskId" [download]="true" - md-icon-button (clicked)="onAuditClick($event)" (error)="onAuditError($event)"> - assignment_ind + mat-icon-button (clicked)="onAuditClick($event)" (error)="onAuditError($event)"> + assignment_ind
- - + + - - + +
- - +
@@ -108,11 +108,11 @@
@@ -161,21 +161,21 @@ {{'PS-TAB.AUDIT-LOG' | translate}}
- - + + - - + +
@@ -187,8 +187,8 @@
- - +
@@ -216,8 +216,8 @@
- - + +
- +
diff --git a/demo-shell-ng2/app/components/app-layout/app-layout.component.html b/demo-shell-ng2/app/components/app-layout/app-layout.component.html index db06c2839b..ae60b620b6 100644 --- a/demo-shell-ng2/app/components/app-layout/app-layout.component.html +++ b/demo-shell-ng2/app/components/app-layout/app-layout.component.html @@ -1,18 +1,18 @@ - - - - - {{link.icon}} + + + + + {{link.icon}} {{link.title | translate }} - - exit_to_app + + exit_to_app Logout - - + + - + + - + diff --git a/demo-shell-ng2/app/components/app-layout/app-layout.component.scss b/demo-shell-ng2/app/components/app-layout/app-layout.component.scss index f9aebf5138..e001e8586a 100644 --- a/demo-shell-ng2/app/components/app-layout/app-layout.component.scss +++ b/demo-shell-ng2/app/components/app-layout/app-layout.component.scss @@ -33,7 +33,7 @@ line-height: $toolbarHeight; overflow: hidden; - md-toolbar-row { + mat-toolbar-row { height: $toolbarHeight; align-items: stretch; justify-content: space-between; diff --git a/demo-shell-ng2/app/components/datatable/datatable-demo.component.html b/demo-shell-ng2/app/components/datatable/datatable-demo.component.html index 792443cf1f..dcba5a85ce 100644 --- a/demo-shell-ng2/app/components/datatable/datatable-demo.component.html +++ b/demo-shell-ng2/app/components/datatable/datatable-demo.component.html @@ -9,7 +9,7 @@ (executeRowAction)="onExecuteRowAction($event)" (row-click)="onRowClick($event)" (row-dblclick)="onRowDblClick($event)"> - + - - + +

- dvr + dvr DocumentList - Content Services

- - + + Demonstrates multiple Alfresco Content Services components used together to display the files of your Content Services instance: - - + + - - + +

- apps + apps Process Services

- - + + Demonstrates multiple Alfresco Process Services components used together to show your Process Services process and tasks: - - + + - - + +

- view_module + view_module DataTable - Content Services & Process Services

- - + + Basic table component:
  • - brightness_1 + brightness_1 Communication with the Rest Api and core services ng2-alfresco-core
- - + + - - + +

- file_upload + file_upload Uploader - Content Services

- - + + Basic table uploader component for the Content Services & Process Services:
  • - brightness_1 + brightness_1 Communication with the Rest Api and core services ng2-alfresco-core
- - + + - - + +

- account_circle + account_circle Login - Content Services & Process Services

- - + + Login component for the Content Services and Process Services:
  • - brightness_1 + brightness_1 Communication with the Rest Api and core services ng2-alfresco-core
- - + + - - + +

- extension + extension Webscript - Content Services

- - + + Displays and creates webscripts in your Content Services instance:
  • - brightness_1 + brightness_1 Communication with the Rest Api and core services ng2-alfresco-core
- - + + - - + +

- local_offer + local_offer Tag - Content Services

- - + + Displays and adds tags to the node of your Content Services instance: - - + + diff --git a/demo-shell-ng2/app/components/login/login-demo.component.html b/demo-shell-ng2/app/components/login/login-demo.component.html index f9caff270c..20605e458d 100644 --- a/demo-shell-ng2/app/components/login/login-demo.component.html +++ b/demo-shell-ng2/app/components/login/login-demo.component.html @@ -2,47 +2,47 @@

- {{ 'LOGIN.CONTENT_SERVICES'| translate }} - +

- {{ 'LOGIN.PROCESS_SERVICES'| translate }} - +

- CSRF - +

- {{ 'LOGIN.LOGIN_FOOTER'| translate }} - +

- - settings + + settings

- {{ 'LOGIN.CONTENT_SERVICES'| translate }} - +

- {{ 'LOGIN.PROCESS_SERVICES'| translate }} - +

- CSRF - +

- {{ 'LOGIN.LOGIN_FOOTER'| translate }} - +

diff --git a/demo-shell-ng2/app/components/search/search-bar.component.html b/demo-shell-ng2/app/components/search/search-bar.component.html index 1f3b2a73a8..bbcf6d3ed4 100644 --- a/demo-shell-ng2/app/components/search/search-bar.component.html +++ b/demo-shell-ng2/app/components/search/search-bar.component.html @@ -10,5 +10,5 @@ - + diff --git a/demo-shell-ng2/app/components/search/search.component.html b/demo-shell-ng2/app/components/search/search.component.html index 940f62267e..15f890067a 100644 --- a/demo-shell-ng2/app/components/search/search.component.html +++ b/demo-shell-ng2/app/components/search/search.component.html @@ -9,6 +9,6 @@ - + diff --git a/demo-shell-ng2/app/components/settings/settings.component.html b/demo-shell-ng2/app/components/settings/settings.component.html index 04a65ddf6a..7974799696 100644 --- a/demo-shell-ng2/app/components/settings/settings.component.html +++ b/demo-shell-ng2/app/components/settings/settings.component.html @@ -1,17 +1,17 @@
- +

{{'SETTINGS.TITLE' | translate}}

- + - - + + - {{'SETTINGS.CS-HOST' | translate }} + {{'SETTINGS.CS-HOST' | translate }} - - link - + link + - + {{ 'SETTINGS.NOT_VALID'| translate }} - - + +

- {{'SETTINGS.BP-HOST' | translate }} + {{'SETTINGS.BP-HOST' | translate }} - - link - + link + - + {{ 'SETTINGS.NOT_VALID'| translate }} - - + + - - + + - - - - + +

diff --git a/demo-shell-ng2/app/components/social/social.component.html b/demo-shell-ng2/app/components/social/social.component.html index f7f2b5878d..43e7763228 100644 --- a/demo-shell-ng2/app/components/social/social.component.html +++ b/demo-shell-ng2/app/components/social/social.component.html @@ -3,19 +3,19 @@
- +
{{'SOCIAL.LIKE' | translate }}
- +
- +
{{'SOCIAL.RATING' | translate }}
- +
diff --git a/demo-shell-ng2/app/components/tag/tag.component.html b/demo-shell-ng2/app/components/tag/tag.component.html index de2e60e9ff..b6c8e1145e 100644 --- a/demo-shell-ng2/app/components/tag/tag.component.html +++ b/demo-shell-ng2/app/components/tag/tag.component.html @@ -2,24 +2,24 @@
- + - +
- +
{{'TAG.LIST' | translate }}
- +
- +
{{'TAG.NODE_LIST' | translate }}
- +
diff --git a/demo-shell-ng2/app/components/theme-picker/theme-picker.css b/demo-shell-ng2/app/components/theme-picker/theme-picker.css index 2309306b76..ce59d7181d 100644 --- a/demo-shell-ng2/app/components/theme-picker/theme-picker.css +++ b/demo-shell-ng2/app/components/theme-picker/theme-picker.css @@ -1,8 +1,8 @@ -.docs-theme-picker-menu .md-menu-content { +.docs-theme-picker-menu .mat-menu-content { padding: 8px; } -.docs-theme-picker-menu [md-menu-item] { +.docs-theme-picker-menu [mat-menu-item] { flex: 0 0 auto; padding: 0; overflow: hidden; diff --git a/demo-shell-ng2/app/components/theme-picker/theme-picker.html b/demo-shell-ng2/app/components/theme-picker/theme-picker.html index dbb86fea32..493720040f 100644 --- a/demo-shell-ng2/app/components/theme-picker/theme-picker.html +++ b/demo-shell-ng2/app/components/theme-picker/theme-picker.html @@ -1,17 +1,17 @@ - - - - + + check_circle - - + invert_colors - + {{theme.name}} - - + + diff --git a/demo-shell-ng2/app/components/theme-picker/theme-picker.ts b/demo-shell-ng2/app/components/theme-picker/theme-picker.ts index ab11546468..19d51367a3 100644 --- a/demo-shell-ng2/app/components/theme-picker/theme-picker.ts +++ b/demo-shell-ng2/app/components/theme-picker/theme-picker.ts @@ -1,8 +1,8 @@ import { CommonModule } from '@angular/common'; import { ChangeDetectionStrategy, Component, NgModule } from '@angular/core'; import { - MdButtonModule, MdGridListModule, MdIconModule, MdMenuModule, - MdTooltipModule + MatButtonModule, MatGridListModule, MatIconModule, MatMenuModule, + MatTooltipModule } from '@angular/material'; import { StyleManager } from './style-manager/style-manager'; import { DocsSiteTheme, ThemeStorage } from './theme-storage/theme-storage'; @@ -116,11 +116,11 @@ export class ThemePickerComponent { @NgModule({ imports: [ - MdButtonModule, - MdIconModule, - MdMenuModule, - MdGridListModule, - MdTooltipModule, + MatButtonModule, + MatIconModule, + MatMenuModule, + MatGridListModule, + MatTooltipModule, CommonModule ], exports: [ThemePickerComponent], diff --git a/demo-shell-ng2/app/material.module.ts b/demo-shell-ng2/app/material.module.ts index 68d96368d0..7011bbe081 100644 --- a/demo-shell-ng2/app/material.module.ts +++ b/demo-shell-ng2/app/material.module.ts @@ -17,21 +17,21 @@ import { NgModule } from '@angular/core'; import { - MdDialogModule, - MdInputModule, - MdProgressBarModule, - MdSelectModule, - MdSidenavModule, - MdSlideToggleModule + MatDialogModule, + MatInputModule, + MatProgressBarModule, + MatSelectModule, + MatSidenavModule, + MatSlideToggleModule } from '@angular/material'; const MATERIAL_MODULES = [ - MdSlideToggleModule, - MdInputModule, - MdSelectModule, - MdDialogModule, - MdSidenavModule, - MdProgressBarModule + MatSlideToggleModule, + MatInputModule, + MatSelectModule, + MatDialogModule, + MatSidenavModule, + MatProgressBarModule ]; @NgModule({ diff --git a/demo-shell-ng2/package.json b/demo-shell-ng2/package.json index 69eb46529a..b7777a1eb1 100644 --- a/demo-shell-ng2/package.json +++ b/demo-shell-ng2/package.json @@ -56,19 +56,19 @@ "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/compiler-cli": "4.3.6", - "@angular/core": "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/compiler-cli": "4.4.5", + "@angular/core": "4.4.5", "@angular/flex-layout": "2.0.0-beta.9", - "@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/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", "chart.js": "2.5.0", @@ -106,7 +106,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", diff --git a/ng2-components/ng2-activiti-analytics/docs/assets/analytics-without-parameters.png b/ng2-components/ng2-activiti-analytics/docs/assets/analytics-without-parameters.png deleted file mode 100644 index 06146ecd33..0000000000 Binary files a/ng2-components/ng2-activiti-analytics/docs/assets/analytics-without-parameters.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-analytics/package.json b/ng2-components/ng2-activiti-analytics/package.json index 216f5f47a8..e86a536ba4 100644 --- a/ng2-components/ng2-activiti-analytics/package.json +++ b/ng2-components/ng2-activiti-analytics/package.json @@ -32,17 +32,17 @@ "url": "https://github.com/Alfresco/alfresco-ng2-components/issues" }, "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", "chart.js": "2.5.0", @@ -59,7 +59,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", diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.html index 2aae8b7c2d..b22ae15a16 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.html +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-generator.component.html @@ -1,11 +1,11 @@
-
@@ -84,12 +84,12 @@

{{report.title}}

{{'ANALYTICS.MESSAGES.NO-DATA-FOUND' | translate}}
- Stacked + (change)="refresh(report)">Stacked - - + - assignment + class="activiti-filters__entry-icon">assignment {{report.name}} - - + +
- + -
+

{{report.name}}

-
+

{{report.description}}

-
- done +
+ done
- +
diff --git a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html index afccf201a0..2dc6e8b689 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html +++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.html @@ -5,9 +5,9 @@
- + - +
- mode_edit + mode_edit

{{reportParameters.name}}
- - - -
@@ -102,30 +102,30 @@
-
{{action}} report
-
+
{{action}} report
+
{{'DIALOG.SAVE_MESSAGE' | translate}}
- - + - +
-
- -
\ No newline at end of file diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html index f60ca92e0a..d9d4b5123f 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html +++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.html @@ -7,48 +7,48 @@ {{'DATE-WIDGET.MESSAGES.START-DATE-REQUIRED' | translate}} - - - + + + - - - + + - - - - + + + + - - - + + - - - + + +
diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.ts b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.ts index b7e0ef18d8..c19cb1d587 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.ts +++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.ts @@ -17,7 +17,7 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core'; import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/forms'; -import { DateAdapter, MD_DATE_FORMATS } from '@angular/material'; +import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material'; import * as moment from 'moment'; import { Moment } from 'moment'; import { MOMENT_DATE_FORMATS, MomentDateAdapter } from 'ng2-alfresco-core'; @@ -27,7 +27,7 @@ import { MOMENT_DATE_FORMATS, MomentDateAdapter } from 'ng2-alfresco-core'; templateUrl: './date-range.widget.html', providers: [ {provide: DateAdapter, useClass: MomentDateAdapter}, - {provide: MD_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS}], + {provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS}], styleUrls: ['./date-range.widget.scss'], encapsulation: ViewEncapsulation.None }) diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/duration/duration.widget.html b/ng2-components/ng2-activiti-analytics/src/components/widgets/duration/duration.widget.html index be22e10e25..488abbadeb 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/widgets/duration/duration.widget.html +++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/duration/duration.widget.html @@ -1,8 +1,8 @@
- - + - +
diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/duration/duration.widget.scss b/ng2-components/ng2-activiti-analytics/src/components/widgets/duration/duration.widget.scss index 9deb10d249..36a92ef8e3 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/widgets/duration/duration.widget.scss +++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/duration/duration.widget.scss @@ -10,7 +10,7 @@ .adf-number-widget { width: 100%; - .mat-input-container { + .mat-form-field { width: 100%; } } diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.html b/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.html index dd6afd4a00..45cbc7fafc 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.html +++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.html @@ -1,6 +1,6 @@
- - + - +
diff --git a/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.scss b/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.scss index ccb5a6584a..c4e6d3661a 100644 --- a/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.scss +++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/number/number.widget.scss @@ -1,7 +1,7 @@ .adf-number-widget { width: 100%; - .mat-input-container { + .mat-form-field { width: 100%; } } \ No newline at end of file diff --git a/ng2-components/ng2-activiti-analytics/src/material.module.ts b/ng2-components/ng2-activiti-analytics/src/material.module.ts index 74fdbc1c70..6c4f883040 100644 --- a/ng2-components/ng2-activiti-analytics/src/material.module.ts +++ b/ng2-components/ng2-activiti-analytics/src/material.module.ts @@ -17,28 +17,28 @@ import { NgModule } from '@angular/core'; import { - MdButtonModule, - MdCheckboxModule, - MdDatepickerModule, - MdGridListModule, - MdIconModule, - MdInputModule, - MdListModule, - MdNativeDateModule, - MdTooltipModule + MatButtonModule, + MatCheckboxModule, + MatDatepickerModule, + MatGridListModule, + MatIconModule, + MatInputModule, + MatListModule, + MatNativeDateModule, + MatTooltipModule } from '@angular/material'; export function modules() { return [ - MdButtonModule, - MdInputModule, - MdIconModule, - MdTooltipModule, - MdNativeDateModule, - MdDatepickerModule, - MdCheckboxModule, - MdListModule, - MdGridListModule + MatButtonModule, + MatInputModule, + MatIconModule, + MatTooltipModule, + MatNativeDateModule, + MatDatepickerModule, + MatCheckboxModule, + MatListModule, + MatGridListModule ]; } diff --git a/ng2-components/ng2-activiti-diagrams/package.json b/ng2-components/ng2-activiti-diagrams/package.json index 0da3c6a4df..8aca1b5359 100644 --- a/ng2-components/ng2-activiti-diagrams/package.json +++ b/ng2-components/ng2-activiti-diagrams/package.json @@ -28,17 +28,17 @@ "url": "https://github.com/Alfresco/alfresco-ng2-components/issues" }, "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", @@ -51,7 +51,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", diff --git a/ng2-components/ng2-activiti-form/docs/assets/activiti-stencil-01.png b/ng2-components/ng2-activiti-form/docs/assets/activiti-stencil-01.png deleted file mode 100644 index 6f01cec9d5..0000000000 Binary files a/ng2-components/ng2-activiti-form/docs/assets/activiti-stencil-01.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-form/docs/assets/activiti-stencil-02.png b/ng2-components/ng2-activiti-form/docs/assets/activiti-stencil-02.png deleted file mode 100644 index 340fb7dece..0000000000 Binary files a/ng2-components/ng2-activiti-form/docs/assets/activiti-stencil-02.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-form/docs/assets/activiti-stencil-03.png b/ng2-components/ng2-activiti-form/docs/assets/activiti-stencil-03.png deleted file mode 100644 index d2763a2178..0000000000 Binary files a/ng2-components/ng2-activiti-form/docs/assets/activiti-stencil-03.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-form/docs/assets/adf-stencil-01.png b/ng2-components/ng2-activiti-form/docs/assets/adf-stencil-01.png deleted file mode 100644 index 4f3473cc98..0000000000 Binary files a/ng2-components/ng2-activiti-form/docs/assets/adf-stencil-01.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-form/docs/assets/adf-stencil-02.png b/ng2-components/ng2-activiti-form/docs/assets/adf-stencil-02.png deleted file mode 100644 index 334b4ca6c6..0000000000 Binary files a/ng2-components/ng2-activiti-form/docs/assets/adf-stencil-02.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-form/docs/assets/demo-validator.png b/ng2-components/ng2-activiti-form/docs/assets/demo-validator.png deleted file mode 100644 index e06d00b0c6..0000000000 Binary files a/ng2-components/ng2-activiti-form/docs/assets/demo-validator.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-form/docs/assets/form-service-sample-01.png b/ng2-components/ng2-activiti-form/docs/assets/form-service-sample-01.png deleted file mode 100644 index 479144ac25..0000000000 Binary files a/ng2-components/ng2-activiti-form/docs/assets/form-service-sample-01.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-form/docs/assets/text-custom-widget.png b/ng2-components/ng2-activiti-form/docs/assets/text-custom-widget.png deleted file mode 100644 index ebec57f023..0000000000 Binary files a/ng2-components/ng2-activiti-form/docs/assets/text-custom-widget.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-form/docs/assets/text-default-widget.png b/ng2-components/ng2-activiti-form/docs/assets/text-default-widget.png deleted file mode 100644 index e75766e065..0000000000 Binary files a/ng2-components/ng2-activiti-form/docs/assets/text-default-widget.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-form/docs/extensibility.md b/ng2-components/ng2-activiti-form/docs/extensibility.md deleted file mode 100644 index b2b38afb10..0000000000 --- a/ng2-components/ng2-activiti-form/docs/extensibility.md +++ /dev/null @@ -1,261 +0,0 @@ -# Form Extensibility and Customisation - -_Note: it is assumed you are familiar with Alfresco Activiti form definition structure._ - -- How components and widgets are rendered on a Form -- Replacing default form widgets with custom components -- Replacing custom stencils with custom components - - - -## How components and widgets are rendered on a Form - -All form field editors (aka widgets) on a Form are rendered by means of `FormFieldComponent` -that takes an instance of a `FormFieldModel`: - -```html - -``` - -This component depends on `FormRenderingService` service to map `FormFieldModel` to UI component -based on field type or metadata information. - -### Component type resolvers - -`FormRenderingService` maps field types to corresponding instances exposing `ComponentTypeResolver` interface: - -```ts -export interface ComponentTypeResolver { - (field: FormFieldModel): Type<{}>; -} -``` - -Typically a `ComponentTypeResolver` is a function that takes `FormFieldModel` and returns corresponding component type. -It can be either a predefined component type or a dynamically evaluated based on field properties and metadata. - -#### Static component mapping - -You can (re)map fields like in the following: - -```ts -let customResolver: ComponentTypeResolver = () => CustomWidgetComponent; -formRenderingService.setComponentTypeResolver('text', customResolver, true); -``` - -or simply: - -```ts -formRenderingService.setComponentTypeResolver('text', () => CustomWidgetComponent, true); -``` - -#### Dynamic component mapping - -Alternatively your resolver may return different component types based on `FormFieldModel` state and condition: - -```ts -let customResolver: ComponentTypeResolver = (field: FormFieldModel): Type<{}> => { - if (field) { - let params = field.params; - } - return UnknownWidgetComponent; -}; -formRenderingService.setComponentTypeResolver('text', customResolver, true); -``` - -### Default component mappings - -Stencil Name | Field Type | Component Type | -| --- | --- | --- | -| Text | text | TextWidgetComponent | -| Number | integer | NumberWidgetComponent | -| Multi-line text | multi-line-text | MultilineTextWidgetComponentComponent | -| Checkbox | boolean | CheckboxWidgetComponent | -| Dropdown | dropdown | DropdownWidgetComponent | -| Date | date | DateWidgetComponent | -| Amount | amount | AmountWidgetComponent | -| Radio buttons | radio-buttons | RadioButtonsWidgetComponent | -| Hyperlink | hyperlink | HyperlinkWidgetComponent | -| Display value | readonly | DisplayValueWidgetComponent | -| Display text | readonly-text | DisplayTextWidgetComponentComponent | -| Typeahead | typeahead | TypeaheadWidgetComponent | -| People | people | PeopleWidgetComponent | -| Group of people | functional-group | FunctionalGroupWidgetComponent | -| Dynamic table | dynamic-table | DynamicTableWidgetComponent | -| N/A | container | ContainerWidgetComponent (layout component) | -| Header | group | ContainerWidgetComponent | -| Attach | upload | AttachWidgetComponent or UploadWidgetComponent (based on metadata) | -| N/A | N/A | UnknownWidgetComponent | - - - -## Replacing default form widgets with custom components - -This is a short walkthrough on replacing a standard `Text` widget with a custom component for all Alfresco Activiti forms -rendered within `` component. - -First let's create a simple Alfresco Activiti form with `Text` widgets: - -![default text widget](assets/text-default-widget.png) - -Every custom widget must inherit `WidgetComponent` class in order to function properly: - -```ts -import { Component } from '@angular/core'; -import { WidgetComponent } from 'ng2-activiti-form'; - -@Component({ - selector: 'custom-editor', - template: ` -
Look, I'm a custom editor!
- ` -}) -export class CustomEditorComponent extends WidgetComponent {} -``` - -Now you will need to add it to the application module or any custom module that is imported into the application one: - -```ts -import { NgModule } from '@angular/core'; -import { CustomEditorComponent } from './custom-editor.component'; - -@NgModule({ - declarations: [ CustomEditorComponent ], - exports: [ CustomEditorComponent ], - entryComponents: [ CustomEditorComponent ] -}) -export class CustomEditorsModule {} -``` - -Every custom widget should be added into all three module collections: `declarations`, `exports` and `entryComponents`. - -If you decided to store custom widgets in a separate dedicated module (and optionally as separate redistributable library) -don't forget to import it into your main application one: - -```ts -@NgModule({ - imports: [ - // ... - CustomEditorsModule - // ... - ], - providers: [], - bootstrap: [ AppComponent ] -}) -export class AppModule {} -``` - -Now you can import `FormRenderingService` in any of your Views and override default mapping similar to the following: - -```ts -import { Component } from '@angular/core'; -import { CustomEditorComponent } from './custom-editor.component'; - -@Component({...}) -export class MyView { - - constructor(formRenderingService: FormRenderingService) { - formRenderingService.setComponentTypeResolver('text', () => CustomEditorComponent, true); - } - -} -``` - -At runtime it should look similar to the following: - -![custom text widget](assets/text-custom-widget.png) - - - -## Replacing custom stencils with custom components - -This is a short walkthrough on rendering custom Alfresco Activiti stencils by means of custom Angular 2 components. - -### Creating custom stencil - -First let's create a basic stencil and call it `Custom Stencil 01`: - -![custom stencil](assets/activiti-stencil-01.png) - -_Note the `internal identifier` value as it will become a `field type` value when corresponding form is rendered._ - -Next put some simple html layout for `Form runtime template` and `Form editor template` fields: - -```html -
Custom activiti stencil
-``` - -Now you are ready to design a test form based on your custom stencil: - -![custom stencil form](assets/activiti-stencil-02.png) - -Once wired with a new task it should look like the following within Alfresco Activiti web application: - -![custom stencil task](assets/activiti-stencil-03.png) - -### Creating custom widget - -If you load previously created task into ADF `` component you will see something like the following: - -![adf stencil](assets/adf-stencil-01.png) - -Let's create an Angular 2 component to render missing content: - -```ts -import { Component } from '@angular/core'; -import { WidgetComponent } from 'ng2-activiti-form'; - -@Component({ - selector: 'custom-stencil-01', - template: `
ADF version of custom Activiti stencil
` -}) -export class CustomStencil01 extends WidgetComponent {} -``` - -Put it inside custom module: - -```ts -import { NgModule } from '@angular/core'; -import { CustomStencil01 } from './custom-stencil-01.component'; - -@NgModule({ - declarations: [ CustomStencil01 ], - exports: [ CustomStencil01 ], - entryComponents: [ CustomStencil01 ] -}) -export class CustomEditorsModule {} -``` - -And import into your Application Module - -```ts -@NgModule({ - imports: [ - // ... - CustomEditorsModule - // ... - ], - providers: [], - bootstrap: [ AppComponent ] -}) -export class AppModule {} -``` - -Now you can import `FormRenderingService` in any of your Views and provide new mapping: - -```ts -import { Component } from '@angular/core'; -import { CustomStencil01 } from './custom-stencil-01.component'; - -@Component({...}) -export class MyView { - - constructor(formRenderingService: FormRenderingService) { - formRenderingService.setComponentTypeResolver('custom_stencil_01', () => CustomStencil01, true); - } - -} -``` - -At runtime you should now see your custom Angular 2 component rendered in place of the stencils: - -![adf stencil runtime](assets/adf-stencil-02.png) \ No newline at end of file diff --git a/ng2-components/ng2-activiti-form/docs/stencils.md b/ng2-components/ng2-activiti-form/docs/stencils.md deleted file mode 100644 index d11d411404..0000000000 --- a/ng2-components/ng2-activiti-form/docs/stencils.md +++ /dev/null @@ -1,144 +0,0 @@ -# Form Stencils with Angular 2 - -Form component provides basic support for custom stencils created with Activiti stencil editor. - -## Installing - -Configuring support for stencils requires the following configuration for your `index.html` file: - -```html - - - - -``` - -Where `` should be replaced with a valid url pointing to your Activiti installation, for example: - -```html - -``` -- `/app/rest/script-files/controllers` - provides all stencil controllers stored within Activiti - -- `runtime.ng1.js` - provides a compatibility layer for controllers created with Angular 1 - (this is to avoid runtime errors when loading Angular 1 code into `` component) - -- `runtime.adf.js` - provides API for stencil management and registration, - i.e. mapping html templates with corresponding controller classes - -## Creating new stencil - -Create a new stencil and add a new item called `ng2 component 01`. - -The internal identifier in this case should be `ng2_component_01`. -This value will be used as field type when form gets rendered. - -## Form runtime template - -This should be a valid Angular 2 component template that you want to render in `` component: - -```html -
-
Angular2 Component
-
Created by: {{name}}
-
-``` - -## Form editor template - -This can be any html layout to be rendered as a component placeholder in Activiti Form Designer. - -```html -
-
- Angular2 Component 01 -
-
-``` - -## Custom component controller - -This field should contain JavaScript code for Angular 2 component class. - -_Note: If you are using TypeScript then you should be putting transpiled JavaScript code here, -you can try official [TypeScript playground](http://www.typescriptlang.org/play/) -to see how TS code gets transpiled into JS._ - -### JavaScript code - -```js -var SampleClass1 = (function () { - function SampleClass1() { - this.name = 'Denys'; - console.log('ng2_component_01 ctor'); - } - SampleClass1.prototype.ngOnInit = function () { - console.log('OnInit called'); - }; - return SampleClass1; -}()); -``` - -### TypeScript code - -The TypeScript version of the code above is: - -```ts -import { OnInit } from '@angular/core'; - -class SampleClass1 implements OnInit { - - constructor() { - console.log('ctor called'); - } - - ngOnInit() { - console.log('OnInit called'); - } - -} -``` - -### Mapping template with component class - -In order to map **form runtime template** with the corresponding component class -you will need to register both parts with `adf.registerComponent(identifier, class)` api: - -```js -if (adf) { - adf.registerComponent('ng2_component_01', SampleClass1); -} -``` - -### Final result - -```js -var SampleClass1 = (function () { - function SampleClass1() { - this.name = 'Denys'; - console.log('ng2_component_01 ctor'); - } - SampleClass1.prototype.ngOnInit = function () { - console.log('OnInit called'); - }; - return SampleClass1; -}()); - -if (adf) { - adf.registerComponent('ng2_component_01', SampleClass1); -} -``` - -## Runtime result - -When rendered on the form this stencil item should look like the following: - -```html -Angular2 Component -Created by: Denys -``` - -ADF Form component will automatically assemble and compile a valid Angular 2 component on the fly. \ No newline at end of file diff --git a/ng2-components/ng2-activiti-form/package.json b/ng2-components/ng2-activiti-form/package.json index cd2a01560d..9a8adc6347 100644 --- a/ng2-components/ng2-activiti-form/package.json +++ b/ng2-components/ng2-activiti-form/package.json @@ -35,17 +35,17 @@ "activiti" ], "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", @@ -58,7 +58,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", diff --git a/ng2-components/ng2-activiti-form/src/components/form-field/form-field.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/form-field/form-field.component.spec.ts index 246c1d119f..7ebe56a731 100644 --- a/ng2-components/ng2-activiti-form/src/components/form-field/form-field.component.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/form-field/form-field.component.spec.ts @@ -16,7 +16,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MdInputModule } from '@angular/material'; +import { MatInputModule } from '@angular/material'; import { CoreModule } from 'ng2-alfresco-core'; import { ErrorWidgetComponent } from '../widgets/error/error.component'; import { FormRenderingService } from './../../services/form-rendering.service'; @@ -38,7 +38,7 @@ describe('FormFieldComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [CoreModule, - MdInputModule + MatInputModule ], declarations: [ FormFieldComponent, diff --git a/ng2-components/ng2-activiti-form/src/components/form.component.html b/ng2-components/ng2-activiti-form/src/components/form.component.html index 8b42d8d855..7eb25440fe 100644 --- a/ng2-components/ng2-activiti-form/src/components/form.component.html +++ b/ng2-components/ng2-activiti-form/src/components/form.component.html @@ -3,22 +3,22 @@
- - - + + +

-
- {{ form.isValid ? 'event_available' : 'event_busy' }} + {{ form.isValid ? 'event_available' : 'event_busy' }} {{form.taskName}}

- - - + + +
@@ -28,25 +28,25 @@
- - + + - - + +
- Debug mode + Debug mode

Values

{{form.values | json}}
diff --git a/ng2-components/ng2-activiti-form/src/components/form.component.visibility.spec.ts b/ng2-components/ng2-activiti-form/src/components/form.component.visibility.spec.ts index e9efb1e8da..4b63cc66fe 100644 --- a/ng2-components/ng2-activiti-form/src/components/form.component.visibility.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/form.component.visibility.spec.ts @@ -106,9 +106,9 @@ describe('FormComponent UI and visibiltiy', () => { expect(dropdown).toBeDefined(); expect(dropdown).not.toBeNull(); - const optOne = fixture.debugElement.queryAll(By.css('[id="md-option-1"]')); - const optTwo = fixture.debugElement.queryAll(By.css('[id="md-option-2"]')); - const optThree = fixture.debugElement.queryAll(By.css('[id="md-option-3"]')); + const optOne = fixture.debugElement.queryAll(By.css('[id="mat-option-1"]')); + const optTwo = fixture.debugElement.queryAll(By.css('[id="mat-option-2"]')); + const optThree = fixture.debugElement.queryAll(By.css('[id="mat-option-3"]')); expect(optOne[0].nativeElement.innerText).toEqual('united kingdom'); expect(optTwo[0].nativeElement.innerText).toEqual('italy'); diff --git a/ng2-components/ng2-activiti-form/src/components/material.module.ts b/ng2-components/ng2-activiti-form/src/components/material.module.ts index a54bd47557..80dc1ca37f 100644 --- a/ng2-components/ng2-activiti-form/src/components/material.module.ts +++ b/ng2-components/ng2-activiti-form/src/components/material.module.ts @@ -17,23 +17,23 @@ import { NgModule } from '@angular/core'; import { - MD_PLACEHOLDER_GLOBAL_OPTIONS, MdAutocompleteModule, MdButtonModule, MdCardModule, - MdCheckboxModule, MdDatepickerModule, MdGridListModule, MdIconModule, MdInputModule, - MdListModule, MdOptionModule, MdRadioModule, MdSelectModule, MdSlideToggleModule, MdTableModule, - MdTabsModule + MAT_PLACEHOLDER_GLOBAL_OPTIONS, MatAutocompleteModule, MatButtonModule, MatCardModule, + MatCheckboxModule, MatDatepickerModule, MatGridListModule, MatIconModule, MatInputModule, + MatListModule, MatOptionModule, MatRadioModule, MatSelectModule, MatSlideToggleModule, MatTableModule, + MatTabsModule } from '@angular/material'; export function modules() { return [ - MdAutocompleteModule, MdButtonModule, MdCardModule, MdCheckboxModule, - MdDatepickerModule, MdGridListModule, MdIconModule, MdInputModule, MdListModule, - MdOptionModule, MdRadioModule, MdSelectModule, MdSlideToggleModule, MdTableModule, MdTabsModule + MatAutocompleteModule, MatButtonModule, MatCardModule, MatCheckboxModule, + MatDatepickerModule, MatGridListModule, MatIconModule, MatInputModule, MatListModule, + MatOptionModule, MatRadioModule, MatSelectModule, MatSlideToggleModule, MatTableModule, MatTabsModule ]; } @NgModule({ providers: [ - {provide: MD_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'never' }} + {provide: MAT_PLACEHOLDER_GLOBAL_OPTIONS, useValue: { float: 'never' }} ], imports: modules(), exports: modules() diff --git a/ng2-components/ng2-activiti-form/src/components/start-form.component.html b/ng2-components/ng2-activiti-form/src/components/start-form.component.html index 8281a9c977..4bc5f210f1 100644 --- a/ng2-components/ng2-activiti-form/src/components/start-form.component.html +++ b/ng2-components/ng2-activiti-form/src/components/start-form.component.html @@ -1,11 +1,11 @@
- - - + + +

{{form.taskName}}

- - - + + +
@@ -15,23 +15,23 @@
- - + + - - - - - + +
diff --git a/ng2-components/ng2-activiti-form/src/components/start-form.component.spec.ts b/ng2-components/ng2-activiti-form/src/components/start-form.component.spec.ts index 64543d1254..20fd92be8e 100644 --- a/ng2-components/ng2-activiti-form/src/components/start-form.component.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/start-form.component.spec.ts @@ -235,7 +235,7 @@ describe('ActivitiStartForm', () => { const formFields = component.form.getFormFields(); const labelField = formFields.find(field => field.id === 'mockTypeDropDown'); const dropDownWidget = fixture.debugElement.nativeElement.querySelector('dropdown-widget'); - const selectElement = fixture.debugElement.nativeElement.querySelector('.adf-dropdown-widget>md-select .mat-select-trigger'); + const selectElement = fixture.debugElement.nativeElement.querySelector('.adf-dropdown-widget>mat-select .mat-select-trigger'); selectElement.click(); expect(selectElement).toBeDefined(); expect(dropDownWidget).toBeDefined(); @@ -365,8 +365,8 @@ describe('ActivitiStartForm', () => { component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) }); fixture.whenStable().then(() => { fixture.detectChanges(); - const titleIcon = fixture.debugElement.nativeElement.querySelector('md-card-title>md-icon'); - const titleElement = fixture.debugElement.nativeElement.querySelector('md-card-title>h2'); + const titleIcon = fixture.debugElement.nativeElement.querySelector('mat-card-title>mat-icon'); + const titleElement = fixture.debugElement.nativeElement.querySelector('mat-card-title>h2'); const actionButtons = fixture.debugElement.nativeElement.querySelectorAll('.mat-button'); expect(titleIcon).toBeDefined(); expect(titleElement).toBeDefined(); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.html index 031188f3b4..a03c1470a6 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.html @@ -1,8 +1,8 @@
- + - {{currency }} - {{currency }} + - +
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.spec.ts index 38f1a7e45b..147fd881b5 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/amount/amount.widget.spec.ts @@ -16,7 +16,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MdInputModule } from '@angular/material'; +import { MatInputModule } from '@angular/material'; import { CoreModule } from 'ng2-alfresco-core'; import { ActivitiAlfrescoContentService } from '../../../services/activiti-alfresco.service'; import { ErrorWidgetComponent } from '../error/error.component'; @@ -34,7 +34,7 @@ describe('AmountWidgetComponent', () => { TestBed.configureTestingModule({ imports: [ CoreModule, - MdInputModule + MatInputModule ], declarations: [ AmountWidgetComponent, diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/checkbox/checkbox.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/checkbox/checkbox.widget.html index cc9f95ae3b..f0b0293801 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/checkbox/checkbox.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/checkbox/checkbox.widget.html @@ -1,5 +1,5 @@
- {{field.name}} * - +
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html index 9052855031..7b45d2e6ab 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.html @@ -2,10 +2,10 @@

{{content.name}}

diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.scss b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.scss index ef7e8c832e..59c3fea6d8 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.scss +++ b/ng2-components/ng2-activiti-form/src/components/widgets/container/container.widget.scss @@ -51,7 +51,7 @@ width: 100%; } - md-input-container { + mat-form-field { width: 100%; } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/content/content.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/content/content.widget.html index 991535b82f..94e077e2bd 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/content/content.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/content/content.widget.html @@ -1,5 +1,5 @@ - - + +
{{content.name}}
@@ -9,14 +9,14 @@
{{content.name}}
- + - - - - - + + diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/content/content.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/content/content.widget.spec.ts index bf9eb9bbae..32d5b59d3f 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/content/content.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/content/content.widget.spec.ts @@ -17,7 +17,7 @@ import { DebugElement, SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MdTabsModule } from '@angular/material'; +import { MatTabsModule } from '@angular/material'; import { By } from '@angular/platform-browser'; import { AlfrescoTranslationService, ContentService, CoreModule } from 'ng2-alfresco-core'; import { Observable } from 'rxjs/Rx'; @@ -65,7 +65,7 @@ describe('ContentWidgetComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - MdTabsModule, + MatTabsModule, CoreModule ], declarations: [ diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.html index 275ead0059..3187528a94 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.html @@ -1,9 +1,9 @@
- + - - - + + - +
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.ts index f4434775f0..9a11210c6e 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.ts @@ -18,7 +18,7 @@ /* tslint:disable:component-selector */ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { DateAdapter, MD_DATE_FORMATS } from '@angular/material'; +import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material'; import * as moment from 'moment'; import { Moment } from 'moment'; import { MOMENT_DATE_FORMATS, MomentDateAdapter } from 'ng2-alfresco-core'; @@ -29,7 +29,7 @@ import { baseHost , WidgetComponent } from './../widget.component'; selector: 'date-widget', providers: [ {provide: DateAdapter, useClass: MomentDateAdapter}, - {provide: MD_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS}], + {provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS}], templateUrl: './date.widget.html', styleUrls: ['./date.widget.scss'], host: baseHost, diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.html index 18ffbea93d..5f676b0620 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.html @@ -1,16 +1,20 @@
- - {{opt.name}} - {{field.value}} - - - + + + {{opt.name}} + + {{field.value}} + + + +
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts index 97434b6922..fa0324ef69 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.spec.ts @@ -153,9 +153,9 @@ describe('DropdownWidgetComponent', () => { openSelect(); - const optOne = fixture.debugElement.queryAll(By.css('[id="md-option-1"]')); - const optTwo = fixture.debugElement.queryAll(By.css('[id="md-option-2"]')); - const optThree = fixture.debugElement.queryAll(By.css('[id="md-option-3"]')); + const optOne = fixture.debugElement.queryAll(By.css('[id="mat-option-1"]')); + const optTwo = fixture.debugElement.queryAll(By.css('[id="mat-option-2"]')); + const optThree = fixture.debugElement.queryAll(By.css('[id="mat-option-3"]')); expect(optOne).not.toBeNull(); expect(optTwo).not.toBeNull(); @@ -236,9 +236,9 @@ describe('DropdownWidgetComponent', () => { openSelect(); - const optOne = fixture.debugElement.queryAll(By.css('[id="md-option-1"]')); - const optTwo = fixture.debugElement.queryAll(By.css('[id="md-option-2"]')); - const optThree = fixture.debugElement.queryAll(By.css('[id="md-option-3"]')); + const optOne = fixture.debugElement.queryAll(By.css('[id="mat-option-1"]')); + const optTwo = fixture.debugElement.queryAll(By.css('[id="mat-option-2"]')); + const optThree = fixture.debugElement.queryAll(By.css('[id="mat-option-3"]')); expect(optOne).not.toBeNull(); expect(optTwo).not.toBeNull(); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.html index 58c4be6330..fb453f5381 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.html @@ -25,31 +25,31 @@
- - - - -
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/boolean/boolean.editor.html b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/boolean/boolean.editor.html index 3820fca3d1..99af70b747 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/boolean/boolean.editor.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/boolean/boolean.editor.html @@ -1,5 +1,5 @@ diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/date/date.editor.html b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/date/date.editor.html index 254631b6d3..3f3de32799 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/date/date.editor.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/date/date.editor.html @@ -1,16 +1,16 @@
- + - - - - + + +
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/date/date.editor.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/date/date.editor.ts index 623c46a5c4..c3c9a64f8a 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/date/date.editor.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/date/date.editor.ts @@ -18,7 +18,7 @@ /* tslint:disable:component-selector */ import { Component, Input, OnInit } from '@angular/core'; -import { DateAdapter, MD_DATE_FORMATS } from '@angular/material'; +import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material'; import * as moment from 'moment'; import { Moment } from 'moment'; import { MOMENT_DATE_FORMATS, MomentDateAdapter } from 'ng2-alfresco-core'; @@ -29,7 +29,7 @@ import { DynamicTableColumn, DynamicTableModel, DynamicTableRow } from './../../ templateUrl: './date.editor.html', providers: [ {provide: DateAdapter, useClass: MomentDateAdapter}, - {provide: MD_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS}], + {provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS}], styleUrls: ['./date.editor.scss'] }) export class DateEditorComponent implements OnInit { diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.html b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.html index b80a2652ba..f8c2883f30 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.html @@ -1,14 +1,16 @@
- - - {{opt.name}} - + + + + {{opt.name}} + +
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts index bebe5ee5ba..a2cc72ddcc 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts @@ -246,9 +246,9 @@ describe('DropdownEditorComponent', () => { openSelect(); - const optOne = fixture.debugElement.queryAll(By.css('[id="md-option-1"]')); - const optTwo = fixture.debugElement.queryAll(By.css('[id="md-option-2"]')); - const optThree = fixture.debugElement.queryAll(By.css('[id="md-option-3"]')); + const optOne = fixture.debugElement.queryAll(By.css('[id="mat-option-1"]')); + const optTwo = fixture.debugElement.queryAll(By.css('[id="mat-option-2"]')); + const optThree = fixture.debugElement.queryAll(By.css('[id="mat-option-3"]')); expect(optOne).not.toBeNull(); expect(optTwo).not.toBeNull(); @@ -294,9 +294,9 @@ describe('DropdownEditorComponent', () => { openSelect(); - const optOne = fixture.debugElement.queryAll(By.css('[id="md-option-1"]')); - const optTwo = fixture.debugElement.queryAll(By.css('[id="md-option-2"]')); - const optThree = fixture.debugElement.queryAll(By.css('[id="md-option-3"]')); + const optOne = fixture.debugElement.queryAll(By.css('[id="mat-option-1"]')); + const optTwo = fixture.debugElement.queryAll(By.css('[id="mat-option-2"]')); + const optThree = fixture.debugElement.queryAll(By.css('[id="mat-option-3"]')); expect(optOne).not.toBeNull(); expect(optTwo).not.toBeNull(); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/row.editor.html b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/row.editor.html index fad8233126..d26a343ada 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/row.editor.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/row.editor.html @@ -35,7 +35,7 @@
- - + +
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/text/text.editor.html b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/text/text.editor.html index 28d0e6a71b..4071c0bf09 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/text/text.editor.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/editors/text/text.editor.html @@ -1,12 +1,12 @@
- + - - +
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.html index 9351a7aa7e..47688ba7b4 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.html @@ -1,9 +1,9 @@
- + - - - + + {{item.name}} - - + + - +
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.html index 4a14b14878..e885aee522 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.html @@ -1,9 +1,9 @@
- + - - +
{{field?.value?.length || 0}}/{{field.maxLength}}
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html index 1eb4fd0fac..06b3e34598 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html @@ -1,8 +1,8 @@
- + - - +
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.html index 61ab5d51eb..f9b3859a13 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.html @@ -4,10 +4,10 @@ [class.adf-readonly]="field.readOnly" id="people-widget-content" *ngIf="field.isVisible"> - + - - + [matAutocomplete]="auto"> + +
{{getInitialUserName(user.firstName, user.lastName)}} @@ -28,9 +28,9 @@
{{getDisplayName(user)}}
- - - + + +
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.html index bcb5e912ef..e12420c87e 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.html @@ -2,8 +2,8 @@ [class.adf-invalid]="!field.isValid" [class.adf-readonly]="field.readOnly" [id]="field.id" *ngIf="field?.isVisible">
- - + {{opt.name}} - - + +
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.html index 439e9a3d78..e71d0d1baf 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/tabs/tabs.widget.html @@ -1,9 +1,9 @@
- - + +
- - + +
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.html index 8d26fba026..7088711058 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.html @@ -1,8 +1,8 @@
- + - - +
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.html index 1289f51401..36bf52103b 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.html @@ -4,9 +4,9 @@ [class.adf-invalid]="!field.isValid" [class.adf-readonly]="field.readOnly" id="typehead-div" *ngIf="field.isVisible"> - + - - - + [matAutocomplete]="auto"> + + {{item.name}} - - - + + + diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts index 63c629189c..5499e5f39c 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.spec.ts @@ -378,9 +378,9 @@ describe('TypeaheadWidgetComponent', () => { typeaheadWidgetComponent.onKeyUp(keyboardEvent); fixture.detectChanges(); fixture.whenStable().then(() => { - expect(fixture.debugElement.queryAll(By.css('[id="md-option-1"]'))).toBeDefined(); - expect(fixture.debugElement.queryAll(By.css('[id="md-option-2"]'))).toBeDefined(); - expect(fixture.debugElement.queryAll(By.css('[id="md-option-3"]'))).toBeDefined(); + expect(fixture.debugElement.queryAll(By.css('[id="mat-option-1"]'))).toBeDefined(); + expect(fixture.debugElement.queryAll(By.css('[id="mat-option-2"]'))).toBeDefined(); + expect(fixture.debugElement.queryAll(By.css('[id="mat-option-3"]'))).toBeDefined(); }); })); }); diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/unknown/unknown.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/unknown/unknown.widget.ts index 97a560b9fb..3b2d02d5c5 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/unknown/unknown.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/unknown/unknown.widget.ts @@ -24,12 +24,12 @@ import { baseHost , WidgetComponent } from './../widget.component'; @Component({ selector: 'unknown-widget', template: ` - - - error_outline + + + error_outline Unknown type: {{field.type}} - - + + `, styleUrls: ['./unknown.widget.scss'], diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html index 92a77d1cc5..8667c343f3 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html @@ -4,9 +4,9 @@
- - - + + - {{decode(file.name)}} - - - + +
- add + add diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html index 588a1998aa..bec05cb242 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.html @@ -21,8 +21,8 @@ - - + + diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts index f460505527..275b05b10c 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-attachment-list.component.spec.ts @@ -17,7 +17,7 @@ import { NgZone, SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MdProgressSpinnerModule } from '@angular/material'; +import { MatProgressSpinnerModule } from '@angular/material'; import { By } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; import { ActivitiContentService } from 'ng2-activiti-form'; @@ -45,7 +45,7 @@ describe('ProcessAttachmentListComponent', () => { imports: [ CoreModule, DataTableModule, - MdProgressSpinnerModule + MatProgressSpinnerModule ], declarations: [ ProcessAttachmentListComponent diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-comments.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-comments.component.spec.ts index 612636aded..b12747223e 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-comments.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-comments.component.spec.ts @@ -17,7 +17,7 @@ import { DatePipe } from '@angular/common'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MdInputModule } from '@angular/material'; +import { MatInputModule } from '@angular/material'; import { Observable } from 'rxjs/Rx'; import { @@ -45,7 +45,7 @@ describe('ActivitiProcessInstanceComments', () => { imports: [ CoreModule, DataTableModule, - MdInputModule + MatInputModule ], declarations: [ ProcessCommentsComponent, diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.html index 16e178a467..ffed1cd9bd 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/process-filters.component.html @@ -1,9 +1,9 @@
- - + - assignment - {{filter.name}} - - + assignment + {{filter.name}} + +
diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.html index 0953e3a363..6611f0b3d5 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-details.component.html @@ -1,37 +1,37 @@
{{ 'DETAILS.MESSAGES.NONE'|translate }}
- - - {{ getProcessNameOrDescription('medium') }} - - + + + {{ getProcessNameOrDescription('medium') }} + + - + - - + + - - + +
- +
- - + + - - + + - - + + diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.html index 1487c6963d..8189048260 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-header.component.html @@ -1,5 +1,5 @@ - - + + - - + + diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.html b/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.html index bf60e9f55e..b7d9c3c7b5 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.html @@ -1,26 +1,26 @@
-
- + {{ 'DETAILS.LABELS.TASKS_ACTIVE'|translate }} - {{activeTasks?.length}} - + {{activeTasks?.length}} +
- - - assignment -

{{task.name || 'Nameless task'}}

- + + + assignment +

{{task.name || 'Nameless task'}}

+ {{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user: getUserFullName(task.assignee), created: getFormatDate(task.created, 'mediumDate') } }} - - + +
@@ -34,35 +34,35 @@
- - - assignment -

{{ 'DETAILS.LABELS.START_FORM'|translate }}

- + + + assignment +

{{ 'DETAILS.LABELS.START_FORM'|translate }}

+ {{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user:getUserFullName(processInstanceDetails.startedBy), created: getFormatDate(processInstanceDetails.started, 'mediumDate') } }} - - + +
- + {{ 'DETAILS.LABELS.TASKS_COMPLETED'|translate }} - {{completedTasks?.length}} - + {{completedTasks?.length}} +
- - - assignment -

{{task.name || 'Nameless task'}}

- + + + assignment +

{{task.name || 'Nameless task'}}

+ {{ 'DETAILS.LABELS.TASK_SUBTITLE' | translate:{user:getUserFullName(task.assignee), created: getFormatDate(task.created, 'mediumDate') } }} - - + +
@@ -71,15 +71,15 @@
-

{{ 'DETAILS.LABELS.START_FORM'|translate }}

-
+

{{ 'DETAILS.LABELS.START_FORM'|translate }}

+
-
- +
+
diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.spec.ts index fe51194d07..203fcf16ad 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.spec.ts @@ -112,7 +112,7 @@ describe('ProcessInstanceTasksComponent', () => { component.ngOnChanges({ 'processInstanceDetails': change }); let listEl = fixture.debugElement.query(By.css('[data-automation-id="active-tasks"]')); expect(listEl).not.toBeNull(); - expect(listEl.queryAll(By.css('md-list-item')).length).toBe(1); + expect(listEl.queryAll(By.css('mat-list-item')).length).toBe(1); }); }); @@ -124,7 +124,7 @@ describe('ProcessInstanceTasksComponent', () => { fixture.detectChanges(); let listEl = fixture.debugElement.query(By.css('[data-automation-id="completed-tasks"]')); expect(listEl).not.toBeNull(); - expect(listEl.queryAll(By.css('md-list-item')).length).toBe(1); + expect(listEl.queryAll(By.css('mat-list-item')).length).toBe(1); }); }); diff --git a/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.ts b/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.ts index 79fdf86bfa..1ccbbb2329 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/process-instance-tasks.component.ts @@ -17,7 +17,7 @@ import { DatePipe } from '@angular/common'; import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core'; -import { MdDialog } from '@angular/material'; +import { MatDialog } from '@angular/material'; import { TaskDetailsEvent, TaskDetailsModel } from 'ng2-activiti-tasklist'; import { LogService } from 'ng2-alfresco-core'; import { Observable, Observer } from 'rxjs/Rx'; @@ -66,7 +66,7 @@ export class ProcessInstanceTasksComponent implements OnInit, OnChanges { constructor(private activitiProcess: ProcessService, private logService: LogService, - private dialog: MdDialog) { + private dialog: MatDialog) { this.task$ = new Observable(observer => this.taskObserver = observer).share(); this.completedTask$ = new Observable(observer => this.completedTaskObserver = observer).share(); } diff --git a/ng2-components/ng2-activiti-processlist/src/components/processlist.component.html b/ng2-components/ng2-activiti-processlist/src/components/processlist.component.html index ac62ed5b68..d40a97ad3a 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/processlist.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/processlist.component.html @@ -8,11 +8,11 @@ - - + diff --git a/ng2-components/ng2-activiti-processlist/src/components/processlist.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/processlist.component.spec.ts index 4b705b08e4..9c5c51d582 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/processlist.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/processlist.component.spec.ts @@ -17,7 +17,7 @@ import { SimpleChange } from '@angular/core'; import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing'; -import { MdProgressSpinnerModule } from '@angular/material'; +import { MatProgressSpinnerModule } from '@angular/material'; import { Observable } from 'rxjs/Rx'; import { ProcessInstanceListComponent } from './processlist.component'; @@ -41,7 +41,7 @@ describe('ProcessInstanceListComponent', () => { imports: [ CoreModule, DataTableModule, - MdProgressSpinnerModule + MatProgressSpinnerModule ], declarations: [ ProcessInstanceListComponent ], providers: [ diff --git a/ng2-components/ng2-activiti-processlist/src/components/start-process.component.html b/ng2-components/ng2-activiti-processlist/src/components/start-process.component.html index 4d8232a9ab..4832f215b7 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/start-process.component.html +++ b/ng2-components/ng2-activiti-processlist/src/components/start-process.component.html @@ -1,33 +1,35 @@ - - {{'START_PROCESS.FORM.TITLE' | translate}} - - - + + {{'START_PROCESS.FORM.TITLE' | translate}} + + + {{errorMessageId|translate}} - - - - - - {{'START_PROCESS.FORM.TYPE_PLACEHOLDER' | translate}} - - {{ processDef.name }} - - - + + + + + + {{'START_PROCESS.FORM.TYPE_PLACEHOLDER' | translate}} + + {{ processDef.name }} + + + + - + - - - + + + {{'START_PROCESS.NO_PROCESS_DEFINITIONS' | translate}} - - - - - - - \ No newline at end of file + + + + + + + diff --git a/ng2-components/ng2-activiti-processlist/src/components/start-process.component.scss b/ng2-components/ng2-activiti-processlist/src/components/start-process.component.scss index e92ea9c43c..251dfb070e 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/start-process.component.scss +++ b/ng2-components/ng2-activiti-processlist/src/components/start-process.component.scss @@ -7,19 +7,19 @@ .mat-select-trigger { font-size: 14px !important; } - md-input-container { + mat-form-field { width: 100%; } - md-select { + mat-select { width: 100%; padding: 16px 0px 0px 0px; } - md-card-actions { + mat-card-actions { text-align: right; } } &-process-input-container { - md-input-container { + mat-form-field { width: 100%; } } diff --git a/ng2-components/ng2-activiti-processlist/src/components/start-process.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/start-process.component.spec.ts index 51b47dc31e..37a045dea4 100644 --- a/ng2-components/ng2-activiti-processlist/src/components/start-process.component.spec.ts +++ b/ng2-components/ng2-activiti-processlist/src/components/start-process.component.spec.ts @@ -18,10 +18,10 @@ import { DebugElement, SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { - MdButtonModule, - MdCardModule, - MdInputModule, - MdSelectModule + MatButtonModule, + MatCardModule, + MatInputModule, + MatSelectModule } from '@angular/material'; import { ActivitiFormModule, FormService } from 'ng2-activiti-form'; import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; @@ -50,10 +50,10 @@ describe('StartProcessInstanceComponent', () => { imports: [ CoreModule, ActivitiFormModule, - MdButtonModule, - MdCardModule, - MdInputModule, - MdSelectModule + MatButtonModule, + MatCardModule, + MatInputModule, + MatSelectModule ], declarations: [ StartProcessInstanceComponent @@ -120,7 +120,7 @@ describe('StartProcessInstanceComponent', () => { component.ngOnChanges({'appId': change}); fixture.detectChanges(); - let selectElement = fixture.nativeElement.querySelector('md-select'); + let selectElement = fixture.nativeElement.querySelector('mat-select'); expect(selectElement.children.length).toBe(1); }); @@ -130,8 +130,8 @@ describe('StartProcessInstanceComponent', () => { component.processDefinitions = testProcessDefs; fixture.detectChanges(); fixture.whenStable().then(() => { - let selectElement = fixture.nativeElement.querySelector('md-select > .mat-select-trigger'); - let optionElement = fixture.nativeElement.querySelectorAll('md-option'); + let selectElement = fixture.nativeElement.querySelector('mat-select > .mat-select-trigger'); + let optionElement = fixture.nativeElement.querySelectorAll('mat-option'); selectElement.click(); expect(selectElement).not.toBeNull(); expect(selectElement).toBeDefined(); diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/activiti_people.png b/ng2-components/ng2-activiti-tasklist/docs/assets/activiti_people.png deleted file mode 100644 index 42c7c41728..0000000000 Binary files a/ng2-components/ng2-activiti-tasklist/docs/assets/activiti_people.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/adf-comments.png b/ng2-components/ng2-activiti-tasklist/docs/assets/adf-comments.png deleted file mode 100644 index 40a31a3c4d..0000000000 Binary files a/ng2-components/ng2-activiti-tasklist/docs/assets/adf-comments.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/adf-start-task.png b/ng2-components/ng2-activiti-tasklist/docs/assets/adf-start-task.png deleted file mode 100644 index e9ccecce86..0000000000 Binary files a/ng2-components/ng2-activiti-tasklist/docs/assets/adf-start-task.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/adf-task-audit-directive.png b/ng2-components/ng2-activiti-tasklist/docs/assets/adf-task-audit-directive.png deleted file mode 100644 index acf07e2c4a..0000000000 Binary files a/ng2-components/ng2-activiti-tasklist/docs/assets/adf-task-audit-directive.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/adf-task-header.png b/ng2-components/ng2-activiti-tasklist/docs/assets/adf-task-header.png deleted file mode 100644 index 41ed32afb9..0000000000 Binary files a/ng2-components/ng2-activiti-tasklist/docs/assets/adf-task-header.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/how-filter-apps.png b/ng2-components/ng2-activiti-tasklist/docs/assets/how-filter-apps.png deleted file mode 100644 index e50e4f57e1..0000000000 Binary files a/ng2-components/ng2-activiti-tasklist/docs/assets/how-filter-apps.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/how-to-create-accordion-menu.png b/ng2-components/ng2-activiti-tasklist/docs/assets/how-to-create-accordion-menu.png deleted file mode 100644 index ae06d5cd21..0000000000 Binary files a/ng2-components/ng2-activiti-tasklist/docs/assets/how-to-create-accordion-menu.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-double-click-and-close-search.gif b/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-double-click-and-close-search.gif deleted file mode 100644 index 310e36ff97..0000000000 Binary files a/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-double-click-and-close-search.gif and /dev/null differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-double-click-without-close-search.gif b/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-double-click-without-close-search.gif deleted file mode 100644 index 54c03c256c..0000000000 Binary files a/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-double-click-without-close-search.gif and /dev/null differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-single-click-and-close-search.gif b/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-single-click-and-close-search.gif deleted file mode 100644 index e3300f5c1f..0000000000 Binary files a/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-single-click-and-close-search.gif and /dev/null differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-single-click-without-close-search.gif b/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-single-click-without-close-search.gif deleted file mode 100644 index 8e40815a01..0000000000 Binary files a/ng2-components/ng2-activiti-tasklist/docs/assets/involve-people-single-click-without-close-search.gif and /dev/null differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/task-attachment-list.png b/ng2-components/ng2-activiti-tasklist/docs/assets/task-attachment-list.png deleted file mode 100644 index 23d902bfb4..0000000000 Binary files a/ng2-components/ng2-activiti-tasklist/docs/assets/task-attachment-list.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-tasklist/docs/assets/task-create-attachment.png b/ng2-components/ng2-activiti-tasklist/docs/assets/task-create-attachment.png deleted file mode 100644 index f755633f7c..0000000000 Binary files a/ng2-components/ng2-activiti-tasklist/docs/assets/task-create-attachment.png and /dev/null differ diff --git a/ng2-components/ng2-activiti-tasklist/package.json b/ng2-components/ng2-activiti-tasklist/package.json index 009aae6387..c79866c54b 100644 --- a/ng2-components/ng2-activiti-tasklist/package.json +++ b/ng2-components/ng2-activiti-tasklist/package.json @@ -38,18 +38,18 @@ "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/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/flex-layout": "2.0.0-beta.9", - "@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/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", @@ -64,7 +64,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", diff --git a/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.html b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.html index 99cb47f4e7..ba570ed98f 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/apps-list.component.html @@ -1,15 +1,15 @@
- - - touch_app - {{app.name}} - - + + + touch_app + {{app.name}} + +
- -
+

{{app.name | translate}}

-
+

{{app.description}}

-
- done +
+ done
- +
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.html b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.html index bc2009f53f..a9c84fa258 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.html @@ -1,24 +1,24 @@
- + {{ 'TASK_DETAILS.LABELS.CHECKLIST' | translate }} - {{checklist?.length}} - + {{checklist?.length}} + -
- - + + {{check.name}} - - - + +
@@ -27,15 +27,15 @@
-

New Check

- - - - - - - - - +

New Check

+ + + + + + + + +
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.scss index bb6556dd33..c8b2c69367 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.scss +++ b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.scss @@ -6,7 +6,7 @@ font-weight: bolder; } -.mat-input-container { +.mat-form-field { width: 100%; } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.ts index c156e5ed43..a3c60faf04 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/checklist.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core'; -import { MdDialog } from '@angular/material'; +import { MatDialog } from '@angular/material'; import { Observable, Observer } from 'rxjs/Rx'; import { TaskDetailsModel } from '../models/task-details.model'; import { TaskListService } from './../services/tasklist.service'; @@ -64,7 +64,7 @@ export class ChecklistComponent implements OnInit, OnChanges { */ constructor( private activitiTaskList: TaskListService, - private dialog: MdDialog + private dialog: MatDialog ) { this.task$ = new Observable(observer => this.taskObserver = observer).share(); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/comments.component.html b/ng2-components/ng2-activiti-tasklist/src/components/comments.component.html index 08f1e49273..19faccb753 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/comments.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/comments.component.html @@ -3,9 +3,9 @@ {{'TASK_DETAILS.COMMENTS.HEADER' | translate}}({{comments?.length}})
- - - + + +
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/comments.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/comments.component.spec.ts index 164f5b18ac..faf915cd42 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/comments.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/comments.component.spec.ts @@ -25,7 +25,7 @@ import { AppConfigServiceMock } from '../assets/app-config.service.mock'; import { TranslationMock } from '../assets/translation.service.mock'; import { DatePipe } from '@angular/common'; -import { MdInputModule } from '@angular/material'; +import { MatInputModule } from '@angular/material'; import { PeopleProcessService } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; import { TaskListService } from './../services/tasklist.service'; @@ -47,7 +47,7 @@ describe('CommentsComponent', () => { CoreModule, ActivitiFormModule, DataTableModule, - MdInputModule + MatInputModule ], declarations: [ CommentsComponent, diff --git a/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.html b/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.html index 618f92d2cf..757fa98e1a 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/create-task-attachment.component.html @@ -1,12 +1,12 @@ diff --git a/ng2-components/ng2-activiti-tasklist/src/components/material.module.ts b/ng2-components/ng2-activiti-tasklist/src/components/material.module.ts index f97dd838dd..932a745d98 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/material.module.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/material.module.ts @@ -17,36 +17,36 @@ import { NgModule } from '@angular/core'; import { - MdAutocompleteModule, - MdButtonModule, - MdCardModule, - MdChipsModule, - MdDatepickerModule, - MdGridListModule, - MdIconModule, - MdInputModule, - MdNativeDateModule, - MdProgressSpinnerModule, - MdRippleModule, - MdSelectModule, - MdTooltipModule + MatAutocompleteModule, + MatButtonModule, + MatCardModule, + MatChipsModule, + MatDatepickerModule, + MatGridListModule, + MatIconModule, + MatInputModule, + MatNativeDateModule, + MatProgressSpinnerModule, + MatRippleModule, + MatSelectModule, + MatTooltipModule } from '@angular/material'; export function modules() { return [ - MdIconModule, - MdButtonModule, - MdInputModule, - MdCardModule, - MdProgressSpinnerModule, - MdDatepickerModule, - MdNativeDateModule, - MdSelectModule, - MdAutocompleteModule, - MdGridListModule, - MdRippleModule, - MdTooltipModule, - MdChipsModule + MatIconModule, + MatButtonModule, + MatInputModule, + MatCardModule, + MatProgressSpinnerModule, + MatDatepickerModule, + MatNativeDateModule, + MatSelectModule, + MatAutocompleteModule, + MatGridListModule, + MatRippleModule, + MatTooltipModule, + MatChipsModule ]; } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.html b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.html index 9590002e90..38b263acd3 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.html @@ -1,9 +1,9 @@
- - - + + +
- -
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.spec.ts index c28a5e5767..f6f9d0141a 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/people-search.component.spec.ts @@ -16,7 +16,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MdButtonModule, MdInputModule } from '@angular/material'; +import { MatButtonModule, MatInputModule } from '@angular/material'; import { AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core'; import { LightUserRepresentation } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; @@ -56,8 +56,8 @@ describe('PeopleSearchComponent', () => { imports: [ CoreModule, DataTableModule, - MdButtonModule, - MdInputModule + MatButtonModule, + MatInputModule ], declarations: [ PeopleSearchComponent, diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people.component.html b/ng2-components/ng2-activiti-tasklist/src/components/people.component.html index 2346633714..4c96e96296 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/people.component.html @@ -1,5 +1,5 @@ - -
+ +
{{ 'TASK_DETAILS.LABELS.PEOPLE' | translate }} {{ ' (' + people.length + ')' }} @@ -8,7 +8,7 @@ {{ 'TASK_DETAILS.PEOPLE.NONE' | translate }}
- person_add + person_add
@@ -48,4 +48,4 @@
- + diff --git a/ng2-components/ng2-activiti-tasklist/src/components/people.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/people.component.spec.ts index a72f0b5c0e..ab1d4b92d6 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/people.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/people.component.spec.ts @@ -17,7 +17,7 @@ import { NO_ERRORS_SCHEMA } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MdButtonModule, MdInputModule } from '@angular/material'; +import { MatButtonModule, MatInputModule } from '@angular/material'; import { AppConfigService, CoreModule, LogService, TranslationService } from 'ng2-alfresco-core'; import { LightUserRepresentation } from 'ng2-alfresco-core'; import { PeopleProcessService } from 'ng2-alfresco-core'; @@ -58,8 +58,8 @@ describe('PeopleComponent', () => { imports: [ CoreModule, DataTableModule, - MdButtonModule, - MdInputModule + MatButtonModule, + MatInputModule ], declarations: [ PeopleSearchComponent, diff --git a/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.html b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.html index 6e91e6ec30..543fcbc77f 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.html @@ -1,82 +1,86 @@ - - - + + +
{{'START_TASK.FORM.TITLE'|translate}}
- - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + - - - + + +
{{'START_TASK.FORM.DATE.ERROR'|translate}}
- warning + warning
- - - - {{'START_TASK.FORM.LABEL.NONE'|translate}} + + + + + {{'START_TASK.FORM.LABEL.NONE'|translate}} - {{ getDisplayUser(user.firstName, + {{ getDisplayUser(user.firstName, user.lastName, ' ')}} - + - - - - - - - {{'START_TASK.FORM.LABEL.NONE'|translate}} - {{ form.name }} - - - - - - - - + + + + + + + + + {{'START_TASK.FORM.LABEL.NONE'|translate}} + {{ form.name }} + + + + + + + + +
- -
- - - - + + + + diff --git a/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.scss index 970fb4ab09..afffefb708 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.scss +++ b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.scss @@ -39,7 +39,7 @@ width: 90%; } - .adf-md-select { + .adf-mat-select { padding-top: 0px; } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.spec.ts index 608443ac84..baacbf3ce8 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.spec.ts @@ -16,7 +16,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MdButtonModule, MdDatepickerModule, MdGridListModule, MdIconModule, MdInputModule, MdNativeDateModule, MdSelectModule } from '@angular/material'; +import { MatButtonModule, MatDatepickerModule, MatGridListModule, MatIconModule, MatInputModule, MatNativeDateModule, MatSelectModule } from '@angular/material'; import { AppConfigService, CoreModule, PeopleProcessService, TranslationService } from 'ng2-alfresco-core'; import { Observable } from 'rxjs/Rx'; import { AppConfigServiceMock } from '../assets/app-config.service.mock'; @@ -53,13 +53,13 @@ describe('StartTaskComponent', () => { TestBed.configureTestingModule({ imports: [ CoreModule, - MdInputModule, - MdIconModule, - MdButtonModule, - MdDatepickerModule, - MdGridListModule, - MdNativeDateModule, - MdSelectModule + MatInputModule, + MatIconModule, + MatButtonModule, + MatDatepickerModule, + MatGridListModule, + MatNativeDateModule, + MatSelectModule ], declarations: [ StartTaskComponent @@ -357,7 +357,7 @@ describe('StartTaskComponent', () => { let selectElement = fixture.nativeElement.querySelector('#assignee_id'); expect(selectElement).not.toBeNull(); expect(selectElement).toBeDefined(); - expect(selectElement.innerText.trim()).toBe('START_TASK.FORM.LABEL.ASSIGNEE'); + expect(selectElement.attributes['aria-label'].value).toContain('START_TASK.FORM.LABEL.ASSIGNEE'); }); })); @@ -365,7 +365,7 @@ describe('StartTaskComponent', () => { component.forms = fakeForms; fixture.detectChanges(); let selectElement = fixture.nativeElement.querySelector('#form_id'); - expect(selectElement.innerText.trim()).toBe('START_TASK.FORM.LABEL.FORM'); + expect(selectElement.attributes['aria-label'].value).toContain('START_TASK.FORM.LABEL.FORM'); }); it('should get formatted fullname', () => { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.ts index 2f92279b8a..92cd620d3b 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/start-task.component.ts @@ -16,7 +16,7 @@ */ import { Component, EventEmitter, Input, OnInit, Output, ViewEncapsulation } from '@angular/core'; -import { DateAdapter, MD_DATE_FORMATS } from '@angular/material'; +import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material'; import * as moment from 'moment'; import { LightUserRepresentation, LogService, MOMENT_DATE_FORMATS, MomentDateAdapter, PeopleProcessService } from 'ng2-alfresco-core'; @@ -32,7 +32,7 @@ import { TaskListService } from './../services/tasklist.service'; styleUrls: ['./start-task.component.scss'], providers: [ {provide: DateAdapter, useClass: MomentDateAdapter}, - {provide: MD_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS}], + {provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS}], encapsulation: ViewEncapsulation.None }) export class StartTaskComponent implements OnInit { diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html index c401de7c58..71617c8762 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.html @@ -18,8 +18,8 @@ - - + + \ No newline at end of file diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts index 6dcfc3522a..014b1ce1d5 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-attachment-list.component.spec.ts @@ -17,7 +17,7 @@ import { NgZone, SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MdProgressSpinnerModule } from '@angular/material'; +import { MatProgressSpinnerModule } from '@angular/material'; import { By } from '@angular/platform-browser'; import { ActivitiContentService } from 'ng2-activiti-form'; import { AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core'; @@ -46,7 +46,7 @@ describe('TaskAttachmentList', () => { imports: [ CoreModule, DataTableModule, - MdProgressSpinnerModule + MatProgressSpinnerModule ], declarations: [ TaskAttachmentListComponent diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.html b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.html index 775d4c13b1..2edf1e4521 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.html @@ -13,9 +13,9 @@

{{taskDetails.name || 'No name'}}

-
- web - web_asset +
+ web + web_asset
@@ -45,7 +45,7 @@
{{ 'TASK_DETAILS.MESSAGES.CLAIM' | translate }}
- @@ -53,7 +53,7 @@
- clear + clear
@@ -85,14 +85,14 @@ - - + + - - + + @@ -112,14 +112,14 @@
-

{{'TASK_DETAILS.ERROR.TITLE'|translate}}

- +

{{'TASK_DETAILS.ERROR.TITLE'|translate}}

+

{{'TASK_DETAILS.ERROR.DESCRIPTION'|translate}}

- - - - +
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts index 387f48079f..832b9c667b 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.spec.ts @@ -17,7 +17,7 @@ import { NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MdButtonModule, MdInputModule } from '@angular/material'; +import { MatButtonModule, MatInputModule } from '@angular/material'; import { By } from '@angular/platform-browser'; import { Observable } from 'rxjs/Rx'; @@ -63,8 +63,8 @@ describe('TaskDetailsComponent', () => { imports: [ CoreModule, ActivitiFormModule, - MdButtonModule, - MdInputModule + MatButtonModule, + MatInputModule ], declarations: [ TaskDetailsComponent, @@ -266,13 +266,13 @@ describe('TaskDetailsComponent', () => { }); it('should display a dialog to the user when a form error occurs', () => { - let dialogEl = window.document.querySelector('md-dialog-content'); + let dialogEl = window.document.querySelector('mat-dialog-content'); expect(dialogEl).toBeNull(); component.onFormError({}); fixture.detectChanges(); - dialogEl = window.document.querySelector('md-dialog-content'); + dialogEl = window.document.querySelector('mat-dialog-content'); expect(dialogEl).not.toBeNull(); }); diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.ts b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.ts index 4e029a8512..a66de035e3 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-details.component.ts @@ -25,7 +25,7 @@ import { Component, TemplateRef, ViewChild } from '@angular/core'; -import { MdDialog, MdDialogRef } from '@angular/material'; +import { MatDialog, MatDialogRef } from '@angular/material'; import { ContentLinkModel, FormFieldValidator, FormModel, FormOutcomeEvent } from 'ng2-activiti-form'; import { AlfrescoAuthenticationService, CardViewUpdateService, ClickNotification, LogService, UpdateNotification } from 'ng2-alfresco-core'; import { LightUserRepresentation, PeopleProcessService } from 'ng2-alfresco-core'; @@ -138,7 +138,7 @@ export class TaskDetailsComponent implements OnInit, OnChanges { showAssignee: boolean = false; private peopleSearchObserver: Observer; - public errorDialogRef: MdDialogRef>; + public errorDialogRef: MatDialogRef>; peopleSearch$: Observable; @@ -147,7 +147,7 @@ export class TaskDetailsComponent implements OnInit, OnChanges { private peopleProcessService: PeopleProcessService, private logService: LogService, private cardViewUpdateService: CardViewUpdateService, - private dialog: MdDialog) { + private dialog: MatDialog) { this.peopleSearch$ = new Observable(observer => this.peopleSearchObserver = observer).share(); } diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.html b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.html index 82fb04e74b..4bdee988e6 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.html @@ -1,9 +1,9 @@
- - + - assignment - {{filter.name}} - - + assignment + {{filter.name}} + +
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.html b/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.html index bf3b7998ce..47cd6a696d 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/task-header.component.html @@ -1,12 +1,12 @@ - - + + - + - - - - - + + diff --git a/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.html b/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.html index 3cb2676dc9..d0664b2c14 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.html +++ b/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.html @@ -13,11 +13,11 @@ - - + diff --git a/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.spec.ts b/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.spec.ts index 84b0c2a50f..f81f8290ea 100644 --- a/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.spec.ts +++ b/ng2-components/ng2-activiti-tasklist/src/components/tasklist.component.spec.ts @@ -17,7 +17,7 @@ import { SimpleChange } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MdProgressSpinnerModule } from '@angular/material'; +import { MatProgressSpinnerModule } from '@angular/material'; import { AppConfigService, CoreModule, TranslationService } from 'ng2-alfresco-core'; import { DataTableModule } from 'ng2-alfresco-datatable'; import { DataRowEvent, ObjectDataRow, ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; @@ -94,7 +94,7 @@ describe('TaskListComponent', () => { imports: [ CoreModule, DataTableModule, - MdProgressSpinnerModule + MatProgressSpinnerModule ], declarations: [ TaskListComponent diff --git a/ng2-components/ng2-alfresco-core/docs/adf-toolbar-01.png b/ng2-components/ng2-alfresco-core/docs/adf-toolbar-01.png deleted file mode 100644 index ca81330cd2..0000000000 Binary files a/ng2-components/ng2-alfresco-core/docs/adf-toolbar-01.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/docs/adf-toolbar-02.png b/ng2-components/ng2-alfresco-core/docs/adf-toolbar-02.png deleted file mode 100644 index 1e81967f3e..0000000000 Binary files a/ng2-components/ng2-alfresco-core/docs/adf-toolbar-02.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/docs/adf-toolbar-03.png b/ng2-components/ng2-alfresco-core/docs/adf-toolbar-03.png deleted file mode 100644 index 97c19d094e..0000000000 Binary files a/ng2-components/ng2-alfresco-core/docs/adf-toolbar-03.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/docs/adf-toolbar-04.png b/ng2-components/ng2-alfresco-core/docs/adf-toolbar-04.png deleted file mode 100644 index 526349285e..0000000000 Binary files a/ng2-components/ng2-alfresco-core/docs/adf-toolbar-04.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/docs/adf-toolbar-05.png b/ng2-components/ng2-alfresco-core/docs/adf-toolbar-05.png deleted file mode 100644 index 98a00a8984..0000000000 Binary files a/ng2-components/ng2-alfresco-core/docs/adf-toolbar-05.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/docs/adf-toolbar-06.png b/ng2-components/ng2-alfresco-core/docs/adf-toolbar-06.png deleted file mode 100644 index 6b57d21e13..0000000000 Binary files a/ng2-components/ng2-alfresco-core/docs/adf-toolbar-06.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/docs/adf-toolbar-07.png b/ng2-components/ng2-alfresco-core/docs/adf-toolbar-07.png deleted file mode 100644 index 25034ab23e..0000000000 Binary files a/ng2-components/ng2-alfresco-core/docs/adf-toolbar-07.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/docs/assets/activities-infodrawer.png b/ng2-components/ng2-alfresco-core/docs/assets/activities-infodrawer.png deleted file mode 100644 index 3b04068256..0000000000 Binary files a/ng2-components/ng2-alfresco-core/docs/assets/activities-infodrawer.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/docs/assets/adf-custom-view.png b/ng2-components/ng2-alfresco-core/docs/assets/adf-custom-view.png deleted file mode 100644 index 4b99842c33..0000000000 Binary files a/ng2-components/ng2-alfresco-core/docs/assets/adf-custom-view.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/docs/assets/infodrawerlayout.png b/ng2-components/ng2-alfresco-core/docs/assets/infodrawerlayout.png deleted file mode 100644 index 735462a94c..0000000000 Binary files a/ng2-components/ng2-alfresco-core/docs/assets/infodrawerlayout.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/docs/pagination/basic.png b/ng2-components/ng2-alfresco-core/docs/pagination/basic.png deleted file mode 100644 index 9ceb4da7ab..0000000000 Binary files a/ng2-components/ng2-alfresco-core/docs/pagination/basic.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/index.ts b/ng2-components/ng2-alfresco-core/index.ts index 0462c75648..de13796abc 100644 --- a/ng2-components/ng2-alfresco-core/index.ts +++ b/ng2-components/ng2-alfresco-core/index.ts @@ -24,7 +24,6 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; import { CollapsableModule } from './src/components/collapsable/collapsable.module'; import { ContextMenuModule } from './src/components/context-menu/context-menu.module'; -import { PaginationModule } from './src/components/pagination/pagination.module'; import { ToolbarModule } from './src/components/toolbar/toolbar.module'; import { CardViewModule } from './src/components/view/card-view.module'; import { MaterialModule } from './src/material.module'; @@ -125,11 +124,15 @@ import { NodePermissionDirective } from './src/directives/node-permission.direct import { NodeRestoreDirective } from './src/directives/node-restore.directive'; import { UploadDirective } from './src/directives/upload.directive'; +import { InfinitePaginationComponent } from './src/components/pagination/infinite-pagination.component'; +import { PaginationComponent } from './src/components/pagination/pagination.component'; import { FileSizePipe } from './src/pipes/file-size.pipe'; import { MimeTypeIconPipe } from './src/pipes/mime-type-icon.pipe'; import { HighlightPipe } from './src/pipes/text-highlight.pipe'; import { TimeAgoPipe } from './src/pipes/time-ago.pipe'; +export { InfinitePaginationComponent } from './src/components/pagination/infinite-pagination.component'; +export { PaginationComponent } from './src/components/pagination/pagination.component'; export { ContextMenuModule } from './src/components/context-menu/context-menu.module'; export { CardViewModule } from './src/components/view/card-view.module'; export { CollapsableModule } from './src/components/collapsable/collapsable.module'; @@ -240,7 +243,6 @@ export function createTranslateLoader(http: Http, logService: LogService) { }), MaterialModule, AppConfigModule, - PaginationModule, ToolbarModule, ContextMenuModule, CardViewModule, @@ -263,7 +265,9 @@ export function createTranslateLoader(http: Http, logService: LogService) { InfoDrawerButtonsDirective, InfoDrawerContentDirective, CreateFolderDialogComponent, - DownloadZipDialogComponent + DownloadZipDialogComponent, + InfinitePaginationComponent, + PaginationComponent ], providers: [ ...providers(), @@ -289,7 +293,6 @@ export function createTranslateLoader(http: Http, logService: LogService) { ContextMenuModule, CardViewModule, CollapsableModule, - PaginationModule, ToolbarModule, ...pipes(), LogoutDirective, @@ -307,7 +310,9 @@ export function createTranslateLoader(http: Http, logService: LogService) { InfoDrawerLayoutComponent, InfoDrawerTitleDirective, InfoDrawerButtonsDirective, - InfoDrawerContentDirective + InfoDrawerContentDirective, + InfinitePaginationComponent, + PaginationComponent ], entryComponents: [ CreateFolderDialogComponent, diff --git a/ng2-components/ng2-alfresco-core/package.json b/ng2-components/ng2-alfresco-core/package.json index 89a37446bf..ce32131e35 100644 --- a/ng2-components/ng2-alfresco-core/package.json +++ b/ng2-components/ng2-alfresco-core/package.json @@ -43,18 +43,18 @@ "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/compiler-cli": "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/compiler-cli": "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", @@ -67,7 +67,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", diff --git a/ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu-holder.component.ts b/ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu-holder.component.ts index fc687ed48e..5fce6e1e5e 100644 --- a/ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu-holder.component.ts +++ b/ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu-holder.component.ts @@ -18,26 +18,26 @@ import { OverlayContainer } from '@angular/cdk/overlay'; import { ViewportRuler } from '@angular/cdk/scrolling'; import { Component, HostListener, Input, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { MdMenuTrigger } from '@angular/material'; +import { MatMenuTrigger } from '@angular/material'; import { Subscription } from 'rxjs/Rx'; import { ContextMenuService } from './context-menu.service'; @Component({ selector: 'adf-context-menu-holder, context-menu-holder', template: ` - - + + - + ` }) export class ContextMenuHolderComponent implements OnInit, OnDestroy { @@ -50,7 +50,7 @@ export class ContextMenuHolderComponent implements OnInit, OnDestroy { private contextSubscription: Subscription; @Input() showIcons: boolean = false; - @ViewChild(MdMenuTrigger) menuTrigger: MdMenuTrigger; + @ViewChild(MatMenuTrigger) menuTrigger: MatMenuTrigger; @HostListener('contextmenu', ['$event']) onShowContextMenu(event?: MouseEvent) { diff --git a/ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu.module.ts b/ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu.module.ts index f26ac53473..3ea7d6dab3 100644 --- a/ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu.module.ts +++ b/ng2-components/ng2-alfresco-core/src/components/context-menu/context-menu.module.ts @@ -17,7 +17,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { MdButtonModule, MdIconModule, MdMenuModule } from '@angular/material'; +import { MatButtonModule, MatIconModule, MatMenuModule } from '@angular/material'; import { ContextMenuHolderComponent } from './context-menu-holder.component'; import { ContextMenuDirective } from './context-menu.directive'; @@ -26,9 +26,9 @@ import { ContextMenuService } from './context-menu.service'; @NgModule({ imports: [ CommonModule, - MdButtonModule, - MdIconModule, - MdMenuModule + MatButtonModule, + MatIconModule, + MatMenuModule ], declarations: [ ContextMenuHolderComponent, diff --git a/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer-layout.component.scss b/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer-layout.component.scss index 95fec8d433..e233b36a29 100644 --- a/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer-layout.component.scss +++ b/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer-layout.component.scss @@ -16,7 +16,7 @@ font-size: 20px; &-buttons { - md-icon { + mat-icon { cursor: pointer; } } diff --git a/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer.component.html b/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer.component.html index 296e5ae38b..d42bf89de9 100644 --- a/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer.component.html +++ b/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer.component.html @@ -7,13 +7,13 @@ - + - + - + - + diff --git a/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer.md b/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer.md deleted file mode 100644 index bda4ec70de..0000000000 --- a/ng2-components/ng2-alfresco-core/src/components/info-drawer/info-drawer.md +++ /dev/null @@ -1,83 +0,0 @@ -# Info Drawer component(s) - - - - - -- [InfoDrawerLayoutComponent](#infodrawerlayoutcomponent) - * [Example](#example) -- [InfoDrawerComponent](#infodrawercomponent) - * [Properties](#properties) - * [Example](#example-1) - - - - - -The **Info Drawer components** helps you manage your layout when you want a *(tabbable)* sidebar-like design, what you can see below. - -![adf-custom-view](../../../docs/assets/activities-infodrawer.png) - -There are 2 different kind of components what you can choose from: - -- InfoDrawerLayoutComponent -- InfoDrawerComponent - -## InfoDrawerLayoutComponent - -The InfoDrawerLayoutComponent (as the name says) is basically just a layout with css applied on it. In this layout you have 3 regions you can transclude content into: - -- info-drawer-title -- info-drawer-buttons -- info-drawer-content - -![adf-custom-view](../../../docs/assets/infodrawerlayout.png) - -### Example - -```html - -
File info
- -
- clear -
- -
- - Lorem ipsum dolor sit amet... - -
- -``` - -## InfoDrawerComponent - -The InfoDrawerComponent is on top of the InfoDrawerLayoutComponent. This version of the info drawer is supposed to be used if you need tabbing behaviour. You can set a title (if it only contains a string) with the **title** input property. Additionally, It also provides a **currentTab** output property. This component has the same 3 regions as described above, but if you want to leverage the tabbing functionality, you have to use the **adf-info-drawer-tab** component to organize your content. The only input paramter of the adf-info-drawer-tab component is the **"label"**, with you can specify the tab label with. - -### Properties - -| Name | Type | Default | Description | -| --- | --- | --- | --- | -| title | string | null | The title of the info drawer component| -| currentTab | any | null | The current active tab | - -### Example - -```html - -
- clear -
- - - - - - - - - - - -``` \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-core/src/components/pagination/infinite-pagination.component.html b/ng2-components/ng2-alfresco-core/src/components/pagination/infinite-pagination.component.html index 5b1559bb1b..ecb9d8d82d 100644 --- a/ng2-components/ng2-alfresco-core/src/components/pagination/infinite-pagination.component.html +++ b/ng2-components/ng2-alfresco-core/src/components/pagination/infinite-pagination.component.html @@ -1,5 +1,5 @@
- - + data-automation-id="adf-infinite-pagination-spinner">
\ No newline at end of file diff --git a/ng2-components/ng2-alfresco-core/src/components/pagination/infinite-pagination.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/pagination/infinite-pagination.component.spec.ts index aa7897c74d..dc1f4ff468 100644 --- a/ng2-components/ng2-alfresco-core/src/components/pagination/infinite-pagination.component.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/components/pagination/infinite-pagination.component.spec.ts @@ -16,7 +16,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MdDatepickerModule, MdIconModule, MdInputModule, MdNativeDateModule } from '@angular/material'; +import { MatDatepickerModule, MatIconModule, MatInputModule, MatNativeDateModule } from '@angular/material'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { Pagination } from 'alfresco-js-api'; @@ -32,10 +32,10 @@ describe('InfinitePaginationComponent', () => { TestBed.configureTestingModule({ imports: [ NoopAnimationsModule, - MdDatepickerModule, - MdIconModule, - MdInputModule, - MdNativeDateModule + MatDatepickerModule, + MatIconModule, + MatInputModule, + MatNativeDateModule ], declarations: [ InfinitePaginationComponent diff --git a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.html b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.html index fc27aecd06..7da6f043c9 100644 --- a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.html +++ b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.html @@ -18,18 +18,18 @@ {{ pagination.maxItems }} - - + - +
@@ -38,40 +38,40 @@ {{ 'CORE.PAGINATION.TOTAL_PAGES' | translate: { total: pages.length } }} - + - +
diff --git a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.scss b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.scss index 57273a88bc..b66202fa05 100644 --- a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.scss +++ b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.scss @@ -95,7 +95,7 @@ max-height: 250px !important; } - button[md-icon-button] { + button[mat-icon-button] { width: $adf-pagination--icon-button-size; height: $adf-pagination--icon-button-size; line-height: $adf-pagination--icon-button-size; diff --git a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.spec.ts index 548bc7a6db..45916d61dd 100644 --- a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.spec.ts @@ -16,11 +16,13 @@ */ import { NO_ERRORS_SCHEMA } from '@angular/core'; -import { async, TestBed } from '@angular/core/testing'; -import { MaterialModule } from '@angular/material'; - -import { CoreModule } from 'ng2-alfresco-core'; - +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { HttpModule } from '@angular/http'; +import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; +import { MaterialModule } from '../../material.module'; +import { LogService } from '../../services/log.service'; +import { AlfrescoTranslateLoader } from '../../services/translate-loader.service'; +import { TranslationService } from '../../services/translation.service'; import { PaginationComponent } from './pagination.component'; declare let jasmine: any; @@ -38,21 +40,10 @@ class FakePaginationInput { } } -class TestConfig { - testBed: any = null; - - constructor() { - this.testBed = TestBed.configureTestingModule({ - imports: [ - CoreModule, - MaterialModule - ], - schemas: [ NO_ERRORS_SCHEMA ] - }); - } -} - describe('PaginationComponent', () => { + + let fixture: ComponentFixture; + beforeEach(() => { jasmine.Ajax.install(); }); @@ -62,12 +53,28 @@ describe('PaginationComponent', () => { }); beforeEach(async(() => { - const test = new TestConfig(); - - test.testBed - .compileComponents() + TestBed.configureTestingModule({ + imports: [ + HttpModule, + MaterialModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useClass: AlfrescoTranslateLoader + } + }) + ], + declarations: [ + PaginationComponent + ], + providers: [ + TranslationService, + LogService + ], + schemas: [ NO_ERRORS_SCHEMA ] + }).compileComponents() .then(() => { - const fixture = test.testBed.createComponent(PaginationComponent); + fixture = TestBed.createComponent(PaginationComponent); const component: PaginationComponent = fixture.componentInstance; ( component).ngAfterViewInit = jasmine diff --git a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.ts b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.ts index 20123fd72a..df1086e60b 100644 --- a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.ts +++ b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.component.ts @@ -26,7 +26,6 @@ import { } from '@angular/core'; import { Pagination } from 'alfresco-js-api'; -import { TranslationService } from './../../services/translation.service'; import { PaginationQueryParams } from './pagination-query-params.interface'; @Component({ @@ -80,12 +79,6 @@ export class PaginationComponent implements OnInit { @Output('prevPage') onPrevPage: EventEmitter = new EventEmitter(); - constructor(translationService: TranslationService) { - if (translationService) { - translationService.addTranslationFolder('ng2-alfresco-core', 'assets/ng2-alfresco-core'); - } - } - ngOnInit() { if (!this.pagination) { this.pagination = PaginationComponent.DEFAULT_PAGINATION; diff --git a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.md b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.md deleted file mode 100644 index 39a64cc603..0000000000 --- a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.md +++ /dev/null @@ -1,37 +0,0 @@ -# Pagination Component - -## Basic example - -```html - - -``` - -Depending on the pagination data, you should see result similar to the following one: - -![](../../../docs/pagination/basic.png) - -## Properties - -| Name | Type | Default | Description | -| --- | --- | --- | --- | -| pagination | Pagination | | Pagination object | -| supportedPageSizes | Array<number> | [ 25, 50, 100 ] | An array of page sizes | -| change | EventEmitter<PaginationQueryParams> | | Triggered for any action in pagination | -| nextPage | EventEmitter<Pagination> | | Triggered on next page action | -| prevPage | EventEmitter<Pagination> | | Triggered on previous page action | -| changePageSize | EventEmitter<Pagination> | | Triggered on page size change action | -| changePageNumber | EventEmitter<Pagination> | | Triggered on page change action | - -Each event helps to detect the certain action that user have made using the component. - -For `change` event, a [PaginationQueryParams](https://github.com/Alfresco/alfresco-ng2-components/tree/master/ng2-components/ng2-alfresco-core/src/components/pagination/pagination-query-params.ts) (including the query params supported by the REST API, `skipCount` and `maxItems`) is returned. - -For all other events, other than `change`, a new [Pagination object](https://github.com/Alfresco/alfresco-js-api/blob/master/src/alfresco-core-rest-api/docs/Pagination.md) is returned as in the folowing example, with updated properties to be used to query further. diff --git a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.module.ts b/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.module.ts deleted file mode 100644 index 7b0d326ea4..0000000000 --- a/ng2-components/ng2-alfresco-core/src/components/pagination/pagination.module.ts +++ /dev/null @@ -1,42 +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 { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { MaterialModule } from '@angular/material'; - -import { TranslateModule } from '@ngx-translate/core'; - -import { InfinitePaginationComponent } from './infinite-pagination.component'; -import { PaginationComponent } from './pagination.component'; - -@NgModule({ - imports: [ - CommonModule, - TranslateModule, - MaterialModule - ], - declarations: [ - PaginationComponent, - InfinitePaginationComponent - ], - exports: [ - PaginationComponent, - InfinitePaginationComponent - ] -}) -export class PaginationModule {} diff --git a/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-01.png b/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-01.png deleted file mode 100644 index ca81330cd2..0000000000 Binary files a/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-01.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-02.png b/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-02.png deleted file mode 100644 index 1e81967f3e..0000000000 Binary files a/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-02.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-03.png b/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-03.png deleted file mode 100644 index 97c19d094e..0000000000 Binary files a/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-03.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-04.png b/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-04.png deleted file mode 100644 index 526349285e..0000000000 Binary files a/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-04.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-05.png b/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-05.png deleted file mode 100644 index 98a00a8984..0000000000 Binary files a/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-05.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-06.png b/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-06.png deleted file mode 100644 index 6b57d21e13..0000000000 Binary files a/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-06.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-07.png b/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-07.png deleted file mode 100644 index 25034ab23e..0000000000 Binary files a/ng2-components/ng2-alfresco-core/src/components/toolbar/docs/adf-toolbar-07.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.component.html b/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.component.html index 1426aed65b..d03c002276 100644 --- a/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.component.html +++ b/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.component.html @@ -1,6 +1,6 @@ - + {{ title }} - + diff --git a/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.md b/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.md deleted file mode 100644 index 663661c2e6..0000000000 --- a/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.md +++ /dev/null @@ -1,105 +0,0 @@ -# Toolbar Component - -## Basic example - -```html - - - - -``` - -You should see result similar to the following one: - -![](docs/adf-toolbar-01.png) - -## Properties - -| Name | Type | Default | Description | -| --- | --- | --- | --- | -| title | string | | Toolbar title | -| color | string | | Toolbar color, can be changed to empty value (default), `primary`, `accent` or `warn`. | - -## Custom title - -You can use any HTML layout or Angular component as a content of the Title section by using the special `` component instead of the "title" attribute: - -```html - - - - - ... - -``` - -The toolbar should now look similar to the following: - -![](docs/adf-toolbar-02.png) - -## Divider - -You can divide groups of elements with a visual separator ``: - -```html - - - - - - -``` - -## Dropdown menu - -You can use the following example to create a dropdown menu: - -```html - - ... - - - - - - - - -``` - -The code above is based on the `` component from the `@angular/material` library. You can use any custom menu component as well. - -![](docs/adf-toolbar-03.png) - -Once you click the menu button you should see the following menu items as defined earlier: - -![](docs/adf-toolbar-04.png) - -## Custom color - -Besides the default color you can use 'primary', 'accent', or 'warn' values: - -Depending on the overall application theme the colors of the toolbar should change. - -For example: - -![](docs/adf-toolbar-05.png) - -![](docs/adf-toolbar-06.png) - -![](docs/adf-toolbar-07.png) \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.module.ts b/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.module.ts index da68c818ee..e38bc05bbf 100644 --- a/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.module.ts +++ b/ng2-components/ng2-alfresco-core/src/components/toolbar/toolbar.module.ts @@ -17,7 +17,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { MdToolbarModule } from '@angular/material'; +import { MatToolbarModule } from '@angular/material'; import { ToolbarDividerComponent } from './toolbar-divider.component'; import { ToolbarTitleComponent } from './toolbar-title.component'; @@ -26,7 +26,7 @@ import { ToolbarComponent } from './toolbar.component'; @NgModule({ imports: [ CommonModule, - MdToolbarModule + MatToolbarModule ], declarations: [ ToolbarComponent, @@ -34,7 +34,7 @@ import { ToolbarComponent } from './toolbar.component'; ToolbarDividerComponent ], exports: [ - MdToolbarModule, + MatToolbarModule, ToolbarComponent, ToolbarTitleComponent, ToolbarDividerComponent diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.html b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.html index 084a7bdae0..7298477bf2 100644 --- a/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.html +++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.html @@ -4,21 +4,21 @@ {{ property.displayValue }} - {{ property.displayValue }} - - - + - +
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.scss b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.scss index b03e610108..a2cc6155e5 100644 --- a/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.scss +++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.scss @@ -14,14 +14,14 @@ &-dateitem-editable { cursor: pointer; - md-icon { + mat-icon { width: 16px; height: 16px; opacity: 0.5; margin-left: 4px; } - &:hover md-icon { + &:hover mat-icon { opacity: 1; } } diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.spec.ts index 0aa5aff0b0..601cfee44f 100644 --- a/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.spec.ts @@ -16,7 +16,7 @@ */ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { MdDatepickerModule, MdInputModule, MdNativeDateModule } from '@angular/material'; +import { MatDatepickerModule, MatInputModule, MatNativeDateModule } from '@angular/material'; import { By } from '@angular/platform-browser'; import * as moment from 'moment'; import { CardViewDateItemModel } from '../../models/card-view-dateitem.model'; @@ -31,9 +31,9 @@ describe('CardViewDateItemComponent', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - MdDatepickerModule, - MdInputModule, - MdNativeDateModule + MatDatepickerModule, + MatInputModule, + MatNativeDateModule ], declarations: [ CardViewDateItemComponent diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.ts index 2bcbc63494..2b89830c0f 100644 --- a/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.ts +++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-dateitem.component.ts @@ -16,8 +16,8 @@ */ import { Component, Input, OnInit, ViewChild } from '@angular/core'; -import { MdDatepicker } from '@angular/material'; -import { DateAdapter, MD_DATE_FORMATS } from '@angular/material'; +import { MatDatepicker } from '@angular/material'; +import { DateAdapter, MAT_DATE_FORMATS } from '@angular/material'; import * as moment from 'moment'; import { Moment } from 'moment'; import { CardViewDateItemModel } from '../../models/card-view-dateitem.model'; @@ -27,7 +27,7 @@ import { MOMENT_DATE_FORMATS, MomentDateAdapter } from '../../utils/momentDateAd @Component({ providers: [ {provide: DateAdapter, useClass: MomentDateAdapter}, - {provide: MD_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS}], + {provide: MAT_DATE_FORMATS, useValue: MOMENT_DATE_FORMATS}], selector: 'adf-card-view-dateitem', templateUrl: './card-view-dateitem.component.html', styleUrls: ['./card-view-dateitem.component.scss'] @@ -42,8 +42,8 @@ export class CardViewDateItemComponent implements OnInit { @Input() editable: boolean; - @ViewChild(MdDatepicker) - public datepicker: MdDatepicker; + @ViewChild(MatDatepicker) + public datepicker: MatDatepicker; valueDate: Moment; diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view-mapitem.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-mapitem.component.spec.ts index ea06a181d4..6f9fe1fb21 100644 --- a/ng2-components/ng2-alfresco-core/src/components/view/card-view-mapitem.component.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-mapitem.component.spec.ts @@ -18,7 +18,7 @@ import { DebugElement } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; -import { MdDatepickerModule, MdIconModule, MdInputModule, MdNativeDateModule } from '@angular/material'; +import { MatDatepickerModule, MatIconModule, MatInputModule, MatNativeDateModule } from '@angular/material'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { CardViewMapItemModel } from '../../models/card-view-mapitem.model'; @@ -38,10 +38,10 @@ describe('CardViewMapItemComponent', () => { imports: [ FormsModule, NoopAnimationsModule, - MdDatepickerModule, - MdIconModule, - MdInputModule, - MdNativeDateModule + MatDatepickerModule, + MatIconModule, + MatInputModule, + MatNativeDateModule ], declarations: [ CardViewMapItemComponent diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.html b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.html index 50d80a32ea..7508a8f470 100644 --- a/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.html +++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.html @@ -9,34 +9,34 @@
{{ property.displayValue }} - create + create
- + - - + done - done + clear + [attr.data-automation-id]="'card-textitem-reset-' + property.key">clear
diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.scss b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.scss index 43cada5b6d..30fbaf2843 100644 --- a/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.scss +++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.scss @@ -18,7 +18,7 @@ &-textitem-readonly { cursor: pointer; - &:hover md-icon { + &:hover mat-icon { opacity: 1; } } @@ -31,12 +31,12 @@ &-textitem-editable { display: flex; - md-icon:hover { + mat-icon:hover { opacity: 1; cursor: pointer; } - md-input-container { + mat-form-field { width: 100%; } diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.spec.ts index 07ba047d23..4bef78cfe6 100644 --- a/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view-textitem.component.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; -import { MdDatepickerModule, MdIconModule, MdInputModule, MdNativeDateModule } from '@angular/material'; +import { MatDatepickerModule, MatIconModule, MatInputModule, MatNativeDateModule } from '@angular/material'; import { By } from '@angular/platform-browser'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { CardViewTextItemModel } from '../../models/card-view-textitem.model'; @@ -34,10 +34,10 @@ describe('CardViewTextItemComponent', () => { imports: [ FormsModule, NoopAnimationsModule, - MdDatepickerModule, - MdIconModule, - MdInputModule, - MdNativeDateModule + MatDatepickerModule, + MatIconModule, + MatInputModule, + MatNativeDateModule ], declarations: [ CardViewTextItemComponent diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view.component.spec.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view.component.spec.ts index e1c51f325e..4863cd4101 100644 --- a/ng2-components/ng2-alfresco-core/src/components/view/card-view.component.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view.component.spec.ts @@ -17,7 +17,7 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { FormsModule } from '@angular/forms'; -import { MdDatepickerModule, MdIconModule, MdInputModule, MdNativeDateModule } from '@angular/material'; +import { MatDatepickerModule, MatIconModule, MatInputModule, MatNativeDateModule } from '@angular/material'; import { By } from '@angular/platform-browser'; import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing'; import { CardViewDateItemModel } from '../../models/card-view-dateitem.model'; @@ -37,10 +37,10 @@ describe('AdfCardView', () => { beforeEach(async(() => { TestBed.configureTestingModule({ imports: [ - MdDatepickerModule, - MdIconModule, - MdInputModule, - MdNativeDateModule, + MatDatepickerModule, + MatIconModule, + MatInputModule, + MatNativeDateModule, FormsModule ], declarations: [ diff --git a/ng2-components/ng2-alfresco-core/src/components/view/card-view.module.ts b/ng2-components/ng2-alfresco-core/src/components/view/card-view.module.ts index ec294dcd7b..e5f99ee525 100644 --- a/ng2-components/ng2-alfresco-core/src/components/view/card-view.module.ts +++ b/ng2-components/ng2-alfresco-core/src/components/view/card-view.module.ts @@ -18,7 +18,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { MdButtonModule, MdDatepickerModule, MdIconModule, MdInputModule, MdNativeDateModule } from '@angular/material'; +import { MatButtonModule, MatDatepickerModule, MatIconModule, MatInputModule, MatNativeDateModule } from '@angular/material'; import { CardViewContentProxyDirective } from './card-view-content-proxy.directive'; import { CardViewDateItemComponent } from './card-view-dateitem.component'; import { CardViewItemDispatcherComponent } from './card-view-item-dispatcher.component'; @@ -29,11 +29,11 @@ import { CardViewComponent } from './card-view.component'; @NgModule({ imports: [ CommonModule, - MdDatepickerModule, - MdNativeDateModule, - MdInputModule, - MdIconModule, - MdButtonModule, + MatDatepickerModule, + MatNativeDateModule, + MatInputModule, + MatIconModule, + MatButtonModule, FormsModule ], declarations: [ diff --git a/ng2-components/ng2-alfresco-core/src/dialogs/create-folder.dialog.ts b/ng2-components/ng2-alfresco-core/src/dialogs/create-folder.dialog.ts index ee43e657d3..f568f81d70 100644 --- a/ng2-components/ng2-alfresco-core/src/dialogs/create-folder.dialog.ts +++ b/ng2-components/ng2-alfresco-core/src/dialogs/create-folder.dialog.ts @@ -20,15 +20,15 @@ import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector: 'adf-create-folder-dialog', template: ` -

Create a new folder

-
- - - +

Create a new folder

+
+ + +
-
- - +
+ +
`, styles: [ diff --git a/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.html b/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.html index feb674ee5f..768cce4123 100644 --- a/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.html +++ b/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.html @@ -1,10 +1,10 @@ -

{{ 'CORE.DIALOG.DOWNLOAD_ZIP.TITLE' | translate }}

-
- +

{{ 'CORE.DIALOG.DOWNLOAD_ZIP.TITLE' | translate }}

+
+
-
+
-
diff --git a/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.ts b/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.ts index ebd0759d29..0763a909a6 100644 --- a/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.ts +++ b/ng2-components/ng2-alfresco-core/src/dialogs/download-zip.dialog.ts @@ -16,7 +16,7 @@ */ import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; -import { MD_DIALOG_DATA, MdDialogRef } from '@angular/material'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; import { DownloadEntry, MinimalNodeEntity } from 'alfresco-js-api'; import { LogService } from '../services/log.service'; import { AlfrescoApiService } from './../services/alfresco-api.service'; @@ -34,8 +34,8 @@ export class DownloadZipDialogComponent implements OnInit { private cancelled = false; constructor(private apiService: AlfrescoApiService, - private dialogRef: MdDialogRef, - @Inject(MD_DIALOG_DATA) private data: { nodeIds?: string[] }, + private dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) private data: { nodeIds?: string[] }, private logService: LogService) { } diff --git a/ng2-components/ng2-alfresco-core/src/material.module.ts b/ng2-components/ng2-alfresco-core/src/material.module.ts index f4bc67a41c..6a9b9a3d18 100644 --- a/ng2-components/ng2-alfresco-core/src/material.module.ts +++ b/ng2-components/ng2-alfresco-core/src/material.module.ts @@ -17,24 +17,28 @@ import { NgModule } from '@angular/core'; import { - MdButtonModule, - MdDialogModule, - MdInputModule, - MdProgressBarModule, - MdSnackBarModule, - MdTabsModule, - MdToolbarModule + MatButtonModule, + MatDialogModule, + MatIconModule, + MatInputModule, + MatMenuModule, + MatProgressBarModule, + MatSnackBarModule, + MatTabsModule, + MatToolbarModule } from '@angular/material'; export function modules() { return [ - MdButtonModule, - MdDialogModule, - MdInputModule, - MdProgressBarModule, - MdSnackBarModule, - MdToolbarModule, - MdTabsModule + MatButtonModule, + MatDialogModule, + MatInputModule, + MatProgressBarModule, + MatSnackBarModule, + MatToolbarModule, + MatTabsModule, + MatMenuModule, + MatIconModule ]; } diff --git a/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.spec.ts index d9251befe2..3b8942c1a3 100644 --- a/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/alfresco-settings.service.spec.ts @@ -19,9 +19,9 @@ import { async, TestBed } from '@angular/core/testing'; import { AlfrescoApiService } from './alfresco-api.service'; import { AlfrescoSettingsService } from './alfresco-settings.service'; import { AppConfigModule } from './app-config.service'; +import { LogService } from './log.service'; import { StorageService } from './storage.service'; import { UserPreferencesService } from './user-preferences.service'; -import { LogService } from './log.service'; describe('AlfrescoSettingsService', () => { diff --git a/ng2-components/ng2-alfresco-core/src/services/notification.service.spec.ts b/ng2-components/ng2-alfresco-core/src/services/notification.service.spec.ts index 0b4b5c5634..38d86f48ab 100644 --- a/ng2-components/ng2-alfresco-core/src/services/notification.service.spec.ts +++ b/ng2-components/ng2-alfresco-core/src/services/notification.service.spec.ts @@ -15,9 +15,12 @@ * limitations under the License. */ +import { LiveAnnouncer } from '@angular/cdk/a11y'; +import { OVERLAY_PROVIDERS, OverlayModule } from '@angular/cdk/overlay'; import { Component } from '@angular/core'; import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { LiveAnnouncer, MdSnackBar, MdSnackBarModule, OVERLAY_PROVIDERS, OverlayModule } from '@angular/material'; + +import { MatSnackBar, MatSnackBarModule } from '@angular/material'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { NotificationService } from './notification.service'; @@ -29,12 +32,12 @@ describe('NotificationService', () => { imports: [ BrowserAnimationsModule, OverlayModule, - MdSnackBarModule + MatSnackBarModule ], declarations: [ProvidesNotificationServiceComponent], providers: [ NotificationService, - MdSnackBar, + MatSnackBar, OVERLAY_PROVIDERS, LiveAnnouncer ] diff --git a/ng2-components/ng2-alfresco-core/src/services/notification.service.ts b/ng2-components/ng2-alfresco-core/src/services/notification.service.ts index 78e2bb5c40..7b6a3e4d94 100644 --- a/ng2-components/ng2-alfresco-core/src/services/notification.service.ts +++ b/ng2-components/ng2-alfresco-core/src/services/notification.service.ts @@ -16,23 +16,23 @@ */ import { Injectable } from '@angular/core'; -import { MdSnackBar, MdSnackBarRef } from '@angular/material'; +import { MatSnackBar, MatSnackBarRef } from '@angular/material'; @Injectable() export class NotificationService { static DEFAULT_DURATION_MESSAGE: number = 5000; - constructor(public snackbar: MdSnackBar) { + constructor(public snackbar: MatSnackBar) { } - public openSnackMessage(message: string, millisecondsDuration?: number): MdSnackBarRef { + public openSnackMessage(message: string, millisecondsDuration?: number): MatSnackBarRef { return this.snackbar.open(message, null, { duration: millisecondsDuration || NotificationService.DEFAULT_DURATION_MESSAGE }); } - public openSnackMessageAction(message: string, action: string, millisecondsDuration?: number): MdSnackBarRef { + public openSnackMessageAction(message: string, action: string, millisecondsDuration?: number): MatSnackBarRef { return this.snackbar.open(message, action, { duration: millisecondsDuration || NotificationService.DEFAULT_DURATION_MESSAGE }); diff --git a/ng2-components/ng2-alfresco-core/src/utils/momentDateAdapter.ts b/ng2-components/ng2-alfresco-core/src/utils/momentDateAdapter.ts index a04eeae2a7..ef14a4438a 100644 --- a/ng2-components/ng2-alfresco-core/src/utils/momentDateAdapter.ts +++ b/ng2-components/ng2-alfresco-core/src/utils/momentDateAdapter.ts @@ -15,11 +15,11 @@ * limitations under the License. */ -import { DateAdapter, MdDateFormats } from '@angular/material'; +import { DateAdapter, MatDateFormats } from '@angular/material'; import { isMoment, Moment } from 'moment'; import * as moment from 'moment'; -export const MOMENT_DATE_FORMATS: MdDateFormats = { +export const MOMENT_DATE_FORMATS: MatDateFormats = { parse: { dateInput: 'DD/MM/YYYY' }, @@ -205,4 +205,13 @@ export class MomentDateAdapter extends DateAdapter { return date.isValid(); } + toIso8601(date: Moment): string { + return this.clone(date).format(); + } + + fromIso8601(iso8601String: string): Moment | null { + let d = moment(iso8601String, moment.ISO_8601).locale(this.locale); + return this.isValid(d) ? d : null; + } + } diff --git a/ng2-components/ng2-alfresco-datatable/docs/assets/adf-empty-list.png b/ng2-components/ng2-alfresco-datatable/docs/assets/adf-empty-list.png deleted file mode 100644 index 1b07ec298e..0000000000 Binary files a/ng2-components/ng2-alfresco-datatable/docs/assets/adf-empty-list.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-datatable/docs/assets/basic.png b/ng2-components/ng2-alfresco-datatable/docs/assets/basic.png deleted file mode 100644 index 9ceb4da7ab..0000000000 Binary files a/ng2-components/ng2-alfresco-datatable/docs/assets/basic.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-datatable/docs/assets/datatable-actions-console.png b/ng2-components/ng2-alfresco-datatable/docs/assets/datatable-actions-console.png deleted file mode 100644 index ed91a61611..0000000000 Binary files a/ng2-components/ng2-alfresco-datatable/docs/assets/datatable-actions-console.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-datatable/docs/assets/datatable-actions-ui.png b/ng2-components/ng2-alfresco-datatable/docs/assets/datatable-actions-ui.png deleted file mode 100644 index 18a0ed4f40..0000000000 Binary files a/ng2-components/ng2-alfresco-datatable/docs/assets/datatable-actions-ui.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-datatable/docs/assets/datatable-demo.png b/ng2-components/ng2-alfresco-datatable/docs/assets/datatable-demo.png deleted file mode 100644 index 3e227b6021..0000000000 Binary files a/ng2-components/ng2-alfresco-datatable/docs/assets/datatable-demo.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-datatable/docs/assets/datatable-dom-events.png b/ng2-components/ng2-alfresco-datatable/docs/assets/datatable-dom-events.png deleted file mode 100644 index 740eded91f..0000000000 Binary files a/ng2-components/ng2-alfresco-datatable/docs/assets/datatable-dom-events.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-datatable/docs/assets/pagination-demo.png b/ng2-components/ng2-alfresco-datatable/docs/assets/pagination-demo.png deleted file mode 100644 index bd78a01440..0000000000 Binary files a/ng2-components/ng2-alfresco-datatable/docs/assets/pagination-demo.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-datatable/package.json b/ng2-components/ng2-alfresco-datatable/package.json index c3cdb83cab..d1cff43c67 100644 --- a/ng2-components/ng2-alfresco-datatable/package.json +++ b/ng2-components/ng2-alfresco-datatable/package.json @@ -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", diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html index a53e0962a4..1a8418fc48 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.html @@ -10,7 +10,7 @@ - + - - - - + - - + - - - - + diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts index 39696bd295..2e1fac0819 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.spec.ts @@ -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( { checked: true }); + dataTable.onSelectAllClick( { checked: true }); expect(dataTable.isSelectAllChecked).toBeTruthy(); - dataTable.onSelectAllClick( { checked: false }); + dataTable.onSelectAllClick( { checked: false }); expect(dataTable.isSelectAllChecked).toBeFalsy(); }); @@ -454,13 +454,13 @@ describe('DataTable', () => { dataTable.multiselect = true; dataTable.ngAfterContentInit(); - dataTable.onSelectAllClick( { checked: true }); + dataTable.onSelectAllClick( { checked: true }); expect(dataTable.isSelectAllChecked).toBe(true); for (let i = 0; i < rows.length; i++) { expect(rows[i].isSelected).toBe(true); } - dataTable.onSelectAllClick( { checked: false }); + dataTable.onSelectAllClick( { 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( { checked: true }); + dataTable.onSelectAllClick( { checked: true }); expect(dataTable.isSelectAllChecked).toBe(true); }); @@ -483,7 +483,7 @@ describe('DataTable', () => { dataTable.multiselect = false; dataTable.ngAfterContentInit(); - dataTable.onSelectAllClick( { checked: true }); + dataTable.onSelectAllClick( { checked: true }); expect(dataTable.isSelectAllChecked).toBe(true); for (let i = 0; i < rows.length; i++) { expect(rows[i].isSelected).toBe(false); diff --git a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts index 6c5f3274c9..55875746df 100644 --- a/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts +++ b/ng2-components/ng2-alfresco-datatable/src/components/datatable/datatable.component.ts @@ -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); diff --git a/ng2-components/ng2-alfresco-datatable/src/material.module.ts b/ng2-components/ng2-alfresco-datatable/src/material.module.ts index ebfd7c3f19..78905d6b0b 100644 --- a/ng2-components/ng2-alfresco-datatable/src/material.module.ts +++ b/ng2-components/ng2-alfresco-datatable/src/material.module.ts @@ -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 ]; } diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/breadcrumb.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/breadcrumb.png deleted file mode 100644 index 36c745dc5f..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/breadcrumb.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/content-action-disable-delete-button.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/content-action-disable-delete-button.png deleted file mode 100644 index 43d9dff579..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/content-action-disable-delete-button.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/content-action-notification-message.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/content-action-notification-message.png deleted file mode 100644 index e761f10665..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/content-action-notification-message.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/custom-columns.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/custom-columns.png deleted file mode 100644 index 1ba048d759..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/custom-columns.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-action-copymove.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/document-action-copymove.png deleted file mode 100644 index 8325b86928..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-action-copymove.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-action-copymovedialog.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/document-action-copymovedialog.png deleted file mode 100644 index 7f9e0c1ffa..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-action-copymovedialog.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-action-download.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/document-action-download.png deleted file mode 100644 index 05d60793b2..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-action-download.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-actions.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/document-actions.png deleted file mode 100644 index f0fcee4a2f..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-actions.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-custom-icon.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-custom-icon.png deleted file mode 100644 index 487aa1fe4b..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-custom-icon.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-dropdown-list.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-dropdown-list.png deleted file mode 100644 index d8d8b94040..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-dropdown-list.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-tag-template.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-tag-template.png deleted file mode 100644 index 769147a677..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/document-list-tag-template.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/documentLibrary.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/documentLibrary.png deleted file mode 100644 index ee5be8b847..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/documentLibrary.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/empty-folder-template-custom.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/empty-folder-template-custom.png deleted file mode 100644 index f8f18dbb80..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/empty-folder-template-custom.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/empty-folder-template-default.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/empty-folder-template-default.png deleted file mode 100644 index 558b81f300..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/empty-folder-template-default.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/folder-actions.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/folder-actions.png deleted file mode 100644 index 2c698df6ef..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/folder-actions.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/folder-context-menu.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/folder-context-menu.png deleted file mode 100644 index 1907ecd75d..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/folder-context-menu.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/metadata-01.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/metadata-01.png deleted file mode 100644 index fc4d8a0203..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/metadata-01.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/metadata-02.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/metadata-02.png deleted file mode 100644 index 90d652ad91..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/metadata-02.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/metadata-03.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/metadata-03.png deleted file mode 100644 index 724599a763..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/metadata-03.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/responsive-desktop.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/responsive-desktop.png deleted file mode 100644 index da7f0dac32..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/responsive-desktop.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/responsive-mobile.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/responsive-mobile.png deleted file mode 100644 index 933ce1f60b..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/responsive-mobile.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/assets/viewchild.png b/ng2-components/ng2-alfresco-documentlist/docs/assets/viewchild.png deleted file mode 100644 index c9c258dd52..0000000000 Binary files a/ng2-components/ng2-alfresco-documentlist/docs/assets/viewchild.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-documentlist/docs/metadata-indicators.md b/ng2-components/ng2-alfresco-documentlist/docs/metadata-indicators.md deleted file mode 100644 index ff90ae754e..0000000000 --- a/ng2-components/ng2-alfresco-documentlist/docs/metadata-indicators.md +++ /dev/null @@ -1,132 +0,0 @@ -# Walkthrough: adding indicators to clearly highlight information about a node - -Every node object in the document list holds metadata information. -All metadata is stored inside `properties` property. - -Here's an example of basic image-related metadata fetched from the server: - -![](assets/metadata-01.png) - -## Custom column template - -```html - - - - - - ... - - -``` - -We are going to declare a column and bind its value to the entire `properties` object of the underlying node. The column will be using our custom `` component to display icons based on metadata state. - -## MetadataIconsComponent component - -Let's create a simple `MetadataIconsComponent` component with a selector set to `adf-metadata-icons` as shown below: - -```ts -import { Component, Input } from '@angular/core'; - -@Component({ - selector: 'adf-metadata-icons', - template: ` -
- -
- ` -}) -export class MetadataIconsComponent { - - @Input() - metadata: any; - -} -``` - -The component will expose a `metadata` property we can use from the outside and eventually bind data to similar to the following: - -```html - -``` - -As you have seen earlier the DataColumn binds to `properties` property of the node, and maps the runtime value as the `value` local variable within the template. -Next we propagate the `value` reference to the `` component as `metadata` property. - -```html - - - -``` - -So once rendered our component will automatically have access to entire set of node metadata. Let's build some visualization of the `cm:versionLabel` property. - -For demonstration purposes we are going to display several icons if underlying node has version `2.0`, and just a plain text version value for all other versions. - -```html -
- - portrait - photo_filter - rotate_90_degrees_ccw - -
- {{metadata['cm:versionLabel']}} -
-
-``` - -Note: For a list of the icons that can be used with `` component please refer to this resource: [material.io/icons](https://material.io/icons/) - -## Testing component - -You will need to enable `versioning` feature for the Document List to be able to upload multiple versions of the file instead of renaming duplicates. - -Drag and drop any image file to upload it and ensure it has `1.0` displayed in the column: - -![](assets/metadata-02.png) - -Now drop the same file again to upload a new version of the file. -You should now see icons instead of version label. - -![](assets/metadata-03.png) - -You can see on the screenshot above that only files with version `2.0` got extra icons. - -## Conclusion - -The full source code of the component can be found below: - -```ts -import { Component, Input } from '@angular/core'; - -@Component({ - selector: 'adf-metadata-icons', - template: ` -
- - portrait - photo_filter - rotate_90_degrees_ccw - -
- {{metadata['cm:versionLabel']}} -
-
- ` -}) -export class MetadataIconsComponent { - - @Input() - metadata: any; - -} -``` - -You can use this idea to build more complex indication experience based on the actual metadata state. \ No newline at end of file diff --git a/ng2-components/ng2-alfresco-documentlist/package.json b/ng2-components/ng2-alfresco-documentlist/package.json index c4a92a596d..0ed22df7e9 100644 --- a/ng2-components/ng2-alfresco-documentlist/package.json +++ b/ng2-components/ng2-alfresco-documentlist/package.json @@ -42,17 +42,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", @@ -65,7 +65,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", diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/dropdown-breadcrumb.component.html b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/dropdown-breadcrumb.component.html index 750b3cdd3e..e6cc9b530a 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/dropdown-breadcrumb.component.html +++ b/ng2-components/ng2-alfresco-documentlist/src/components/breadcrumb/dropdown-breadcrumb.component.html @@ -5,25 +5,25 @@ class="adf-dropdown-breadcumb-trigger" (click)="open()" data-automation-id="dropdown-breadcrumb-trigger"> - folder + folder chevron_right - - {{ node.name }} - - + + { diff --git a/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.html b/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.html index 83441fada1..650ef20cd2 100644 --- a/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.html +++ b/ng2-components/ng2-alfresco-documentlist/src/components/content-node-selector/content-node-selector.component.html @@ -1,30 +1,30 @@ -
{{title}}
-
- + - clear + data-automation-id="content-node-selector-search-clear">clear - search + data-automation-id="content-node-selector-search-icon">search - + -
+
- - - + +
- + - +
{{ copyrightText }} diff --git a/ng2-components/ng2-alfresco-login/src/components/login.component.scss b/ng2-components/ng2-alfresco-login/src/components/login.component.scss index 409791106f..ee537304ae 100644 --- a/ng2-components/ng2-alfresco-login/src/components/login.component.scss +++ b/ng2-components/ng2-alfresco-login/src/components/login.component.scss @@ -145,7 +145,7 @@ justify-content: center; } - .adf-login-checking-spinner { + mat-spinner { height: 30px !important; width: 20px !important; margin-left: 10px; @@ -196,7 +196,7 @@ opacity: 0.54; } - .mat-input-container .adf-login-password-icon.mat-icon { + .mat-form-field .adf-login-password-icon.mat-icon { color: $text-color-primary; } diff --git a/ng2-components/ng2-alfresco-login/src/material.module.ts b/ng2-components/ng2-alfresco-login/src/material.module.ts index 0b933652c7..59043547f4 100644 --- a/ng2-components/ng2-alfresco-login/src/material.module.ts +++ b/ng2-components/ng2-alfresco-login/src/material.module.ts @@ -17,18 +17,18 @@ import { NgModule } from '@angular/core'; import { - MdCheckboxModule, - MdIconModule, - MdInputModule, - MdProgressSpinnerModule + MatCheckboxModule, + MatIconModule, + MatInputModule, + MatProgressSpinnerModule } from '@angular/material'; export function modules() { return [ - MdCheckboxModule, - MdIconModule, - MdInputModule, - MdProgressSpinnerModule + MatCheckboxModule, + MatIconModule, + MatInputModule, + MatProgressSpinnerModule ]; } diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json index 47072910ce..541c3b8cad 100644 --- a/ng2-components/ng2-alfresco-search/package.json +++ b/ng2-components/ng2-alfresco-search/package.json @@ -42,17 +42,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", @@ -66,7 +66,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", diff --git a/ng2-components/ng2-alfresco-search/src/components/search-control.component.html b/ng2-components/ng2-alfresco-search/src/components/search-control.component.html index 7e7594a7a1..bbd79855a5 100644 --- a/ng2-components/ng2-alfresco-search/src/components/search-control.component.html +++ b/ng2-components/ng2-alfresco-search/src/components/search-control.component.html @@ -1,17 +1,17 @@
- - search + search
- + - +
diff --git a/ng2-components/ng2-alfresco-search/src/components/search-control.component.scss b/ng2-components/ng2-alfresco-search/src/components/search-control.component.scss index c9cdab26eb..52dc389b28 100644 --- a/ng2-components/ng2-alfresco-search/src/components/search-control.component.scss +++ b/ng2-components/ng2-alfresco-search/src/components/search-control.component.scss @@ -16,7 +16,7 @@ max-width: 260px; padding-top: 6px; - .mat-input-container { + .mat-form-field { width: 100%; } diff --git a/ng2-components/ng2-alfresco-social/docs/assets/social1.png b/ng2-components/ng2-alfresco-social/docs/assets/social1.png deleted file mode 100644 index 55984b8db0..0000000000 Binary files a/ng2-components/ng2-alfresco-social/docs/assets/social1.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-social/docs/assets/social2.png b/ng2-components/ng2-alfresco-social/docs/assets/social2.png deleted file mode 100644 index 94cb875c2f..0000000000 Binary files a/ng2-components/ng2-alfresco-social/docs/assets/social2.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-social/package.json b/ng2-components/ng2-alfresco-social/package.json index ec0981446a..ced70f8fbc 100644 --- a/ng2-components/ng2-alfresco-social/package.json +++ b/ng2-components/ng2-alfresco-social/package.json @@ -22,17 +22,17 @@ "url": "https://github.com/Alfresco/alfresco-ng2-components/issues" }, "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", @@ -44,7 +44,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", diff --git a/ng2-components/ng2-alfresco-social/src/components/like.component.html b/ng2-components/ng2-alfresco-social/src/components/like.component.html index 5effea860d..08f5be9b0d 100644 --- a/ng2-components/ng2-alfresco-social/src/components/like.component.html +++ b/ng2-components/ng2-alfresco-social/src/components/like.component.html @@ -2,7 +2,7 @@
- thumb_up + thumb_up
{{likesCounter}}
diff --git a/ng2-components/ng2-alfresco-social/src/components/rating.component.html b/ng2-components/ng2-alfresco-social/src/components/rating.component.html index be21e06683..90885a5a1e 100644 --- a/ng2-components/ng2-alfresco-social/src/components/rating.component.html +++ b/ng2-components/ng2-alfresco-social/src/components/rating.component.html @@ -1,12 +1,12 @@ - - + + - star_rate - - + star_border - + - - + + diff --git a/ng2-components/ng2-alfresco-social/src/material.module.ts b/ng2-components/ng2-alfresco-social/src/material.module.ts index 4ee5cb1db7..6a46faa7f1 100644 --- a/ng2-components/ng2-alfresco-social/src/material.module.ts +++ b/ng2-components/ng2-alfresco-social/src/material.module.ts @@ -17,14 +17,14 @@ import { NgModule } from '@angular/core'; import { - MdIconModule, - MdListModule + MatIconModule, + MatListModule } from '@angular/material'; export function modules() { return [ - MdIconModule, - MdListModule + MatIconModule, + MatListModule ]; } diff --git a/ng2-components/ng2-alfresco-tag/docs/assets/tag1.png b/ng2-components/ng2-alfresco-tag/docs/assets/tag1.png deleted file mode 100644 index e6568ebe25..0000000000 Binary files a/ng2-components/ng2-alfresco-tag/docs/assets/tag1.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-tag/docs/assets/tag2.png b/ng2-components/ng2-alfresco-tag/docs/assets/tag2.png deleted file mode 100644 index b5906e0dbe..0000000000 Binary files a/ng2-components/ng2-alfresco-tag/docs/assets/tag2.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-tag/docs/assets/tag3.png b/ng2-components/ng2-alfresco-tag/docs/assets/tag3.png deleted file mode 100644 index 278c2b9f68..0000000000 Binary files a/ng2-components/ng2-alfresco-tag/docs/assets/tag3.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-tag/package.json b/ng2-components/ng2-alfresco-tag/package.json index 5c31cedc62..d7762935bf 100644 --- a/ng2-components/ng2-alfresco-tag/package.json +++ b/ng2-components/ng2-alfresco-tag/package.json @@ -22,17 +22,17 @@ "url": "https://github.com/Alfresco/alfresco-ng2-components/issues" }, "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", @@ -44,7 +44,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", diff --git a/ng2-components/ng2-alfresco-tag/src/components/material.module.ts b/ng2-components/ng2-alfresco-tag/src/components/material.module.ts index 4aae9d7cef..35cdc0f662 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/material.module.ts +++ b/ng2-components/ng2-alfresco-tag/src/components/material.module.ts @@ -17,12 +17,12 @@ import { NgModule } from '@angular/core'; import { - MdButtonModule, MdChipsModule, MdIconModule, MdInputModule + MatButtonModule, MatChipsModule, MatIconModule, MatInputModule } from '@angular/material'; export function modules() { return [ - MdButtonModule, MdInputModule, MdChipsModule, MdIconModule + MatButtonModule, MatInputModule, MatChipsModule, MatIconModule ]; } diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.html b/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.html index 95f10790de..0fc8f6d3f5 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.html +++ b/ng2-components/ng2-alfresco-tag/src/components/tag-actions.component.html @@ -1,28 +1,28 @@ - - + +
{{currentEntry.entry.tag}}
- delete + delete
- - + + diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.html b/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.html index 9ee0585414..2e591b666c 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.html +++ b/ng2-components/ng2-alfresco-tag/src/components/tag-list.component.html @@ -1,5 +1,5 @@ - - + +
{{currentEntry.entry.tag}}
- - + + diff --git a/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.html b/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.html index 76982223a7..60bec1d61b 100644 --- a/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.html +++ b/ng2-components/ng2-alfresco-tag/src/components/tag-node-list.component.html @@ -1,8 +1,8 @@ - - + + {{currentEntry.entry.tag}} - - + + diff --git a/ng2-components/ng2-alfresco-upload/docs/assets/upload-disable-button.png b/ng2-components/ng2-alfresco-upload/docs/assets/upload-disable-button.png deleted file mode 100644 index 344e330228..0000000000 Binary files a/ng2-components/ng2-alfresco-upload/docs/assets/upload-disable-button.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-upload/docs/assets/upload-notification-message.png b/ng2-components/ng2-alfresco-upload/docs/assets/upload-notification-message.png deleted file mode 100644 index 762f3fab0f..0000000000 Binary files a/ng2-components/ng2-alfresco-upload/docs/assets/upload-notification-message.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-upload/package.json b/ng2-components/ng2-alfresco-upload/package.json index cfc58d07f6..1b61795924 100644 --- a/ng2-components/ng2-alfresco-upload/package.json +++ b/ng2-components/ng2-alfresco-upload/package.json @@ -43,17 +43,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", @@ -66,7 +66,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", diff --git a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html index f291fda98a..f8d72837cf 100644 --- a/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html +++ b/ng2-components/ng2-alfresco-upload/src/components/file-uploading-dialog.component.html @@ -5,15 +5,15 @@ [class.upload-dialog--position-right]="position === 'right'">
- - + - - - + + + ecm-profile-image
{{ecmUser.fullNameDisplay}}
- - + +
{{ecmUser.fullNameDisplay}} @@ -32,20 +32,20 @@
- - - - - - + + + + + + bpm-profile-image
{{bpmUser.fullNameDisplay}}
- - + +
{{ bpmUser.fullNameDisplay }} @@ -58,9 +58,9 @@
- - - - - + + + + + diff --git a/ng2-components/ng2-alfresco-userinfo/src/material.module.ts b/ng2-components/ng2-alfresco-userinfo/src/material.module.ts index 0ad9e1fbd2..6c0bc4cceb 100644 --- a/ng2-components/ng2-alfresco-userinfo/src/material.module.ts +++ b/ng2-components/ng2-alfresco-userinfo/src/material.module.ts @@ -17,18 +17,18 @@ import { NgModule } from '@angular/core'; import { - MdButtonModule, - MdCardModule, - MdMenuModule, - MdTabsModule + MatButtonModule, + MatCardModule, + MatMenuModule, + MatTabsModule } from '@angular/material'; export function modules() { return [ - MdButtonModule, - MdMenuModule, - MdTabsModule, - MdCardModule + MatButtonModule, + MatMenuModule, + MatTabsModule, + MatCardModule ]; } diff --git a/ng2-components/ng2-alfresco-viewer/docs/assets/renditions.png b/ng2-components/ng2-alfresco-viewer/docs/assets/renditions.png deleted file mode 100644 index 02198cbf85..0000000000 Binary files a/ng2-components/ng2-alfresco-viewer/docs/assets/renditions.png and /dev/null differ diff --git a/ng2-components/ng2-alfresco-viewer/package.json b/ng2-components/ng2-alfresco-viewer/package.json index e0866fafc7..a5144b5d35 100644 --- a/ng2-components/ng2-alfresco-viewer/package.json +++ b/ng2-components/ng2-alfresco-viewer/package.json @@ -37,17 +37,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", @@ -60,7 +60,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", diff --git a/ng2-components/ng2-alfresco-viewer/src/components/pdfViewer.component.html b/ng2-components/ng2-alfresco-viewer/src/components/pdfViewer.component.html index 0e019e9a23..292b93a883 100644 --- a/ng2-components/ng2-alfresco-viewer/src/components/pdfViewer.component.html +++ b/ng2-components/ng2-alfresco-viewer/src/components/pdfViewer.component.html @@ -2,7 +2,7 @@
- +
@@ -12,8 +12,8 @@ - @@ -21,17 +21,17 @@
@@ -50,25 +50,25 @@ diff --git a/ng2-components/ng2-alfresco-viewer/src/components/unknown-format/unknown-format.component.html b/ng2-components/ng2-alfresco-viewer/src/components/unknown-format/unknown-format.component.html index 86547bd4cc..7869a2f1cf 100644 --- a/ng2-components/ng2-alfresco-viewer/src/components/unknown-format/unknown-format.component.html +++ b/ng2-components/ng2-alfresco-viewer/src/components/unknown-format/unknown-format.component.html @@ -1,6 +1,6 @@
- wifi_tethering + wifi_tethering
{{'VIEWER.UNKNOWN' | translate}}
diff --git a/ng2-components/ng2-alfresco-viewer/src/components/viewer.component.html b/ng2-components/ng2-alfresco-viewer/src/components/viewer.component.html index 8d491d62c5..1b2c49a3e3 100644 --- a/ng2-components/ng2-alfresco-viewer/src/components/viewer.component.html +++ b/ng2-components/ng2-alfresco-viewer/src/components/viewer.component.html @@ -10,77 +10,77 @@ {{ displayName }} - - - - - - + - - - - - - - - - + - @@ -91,7 +91,7 @@

Loading

- +
@@ -135,18 +135,18 @@
- - - + + + DETAILS - - - - + + + + Activity - - - + + +
diff --git a/ng2-components/ng2-alfresco-viewer/src/components/viewer.component.scss b/ng2-components/ng2-alfresco-viewer/src/components/viewer.component.scss index 84750c3812..d3a782d03c 100644 --- a/ng2-components/ng2-alfresco-viewer/src/components/viewer.component.scss +++ b/ng2-components/ng2-alfresco-viewer/src/components/viewer.component.scss @@ -75,7 +75,7 @@ $adf-viewer-background-color: #f5f5f5; flex-direction: column; height: 85vh; - .md-spinner { + .mat-spinner { margin: 0 auto; } } diff --git a/ng2-components/ng2-alfresco-viewer/src/material.module.ts b/ng2-components/ng2-alfresco-viewer/src/material.module.ts index 587a05b923..267bfa6cb8 100644 --- a/ng2-components/ng2-alfresco-viewer/src/material.module.ts +++ b/ng2-components/ng2-alfresco-viewer/src/material.module.ts @@ -17,28 +17,28 @@ import { NgModule } from '@angular/core'; import { - MdButtonModule, - MdCardModule, - MdDialogModule, - MdIconModule, - MdMenuModule, - MdProgressBarModule, - MdProgressSpinnerModule, - MdTabsModule, - MdTooltipModule + MatButtonModule, + MatCardModule, + MatDialogModule, + MatIconModule, + MatMenuModule, + MatProgressBarModule, + MatProgressSpinnerModule, + MatTabsModule, + MatTooltipModule } from '@angular/material'; export function modules() { return [ - MdButtonModule, - MdCardModule, - MdDialogModule, - MdIconModule, - MdMenuModule, - MdProgressBarModule, - MdProgressSpinnerModule, - MdTabsModule, - MdTooltipModule + MatButtonModule, + MatCardModule, + MatDialogModule, + MatIconModule, + MatMenuModule, + MatProgressBarModule, + MatProgressSpinnerModule, + MatTabsModule, + MatTooltipModule ]; } diff --git a/ng2-components/ng2-alfresco-webscript/package.json b/ng2-components/ng2-alfresco-webscript/package.json index 0c2d166250..dc26ea6ea6 100644 --- a/ng2-components/ng2-alfresco-webscript/package.json +++ b/ng2-components/ng2-alfresco-webscript/package.json @@ -22,17 +22,17 @@ "url": "https://github.com/Alfresco/alfresco-ng2-components/issues" }, "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", @@ -45,7 +45,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", diff --git a/ng2-components/package.json b/ng2-components/package.json index a3df2e6949..9dae1b5b98 100644 --- a/ng2-components/package.json +++ b/ng2-components/package.json @@ -62,18 +62,18 @@ "6": "bpm" }, "dependencies": { - "@angular/animations": "4.3.6", - "@angular/cdk": "2.0.0-beta.10", - "@angular/common": "4.3.6", - "@angular/compiler": "4.3.6", - "@angular/compiler-cli": "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/compiler-cli": "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", @@ -98,7 +98,7 @@ "pdfjs-dist": "1.5.404" }, "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",
- - + - {{errorMsg}} - + {{errorMsg}} +