[ADF-1518] Update material2 beta 10 and angular 4.3.6 (#2304)

* ignore pkg lock * update pkg json * date picker update material beta.10 * isDateInstance moment adapter * style and datepicker update material2 beta 10 * update test dateitem to beta10 * regenerate style files * use material icons web font * fix data range material 2 beta 10 * minors cleaning * recreate styles * remove unused componentHandler var * fix failing test checkbox
2025-07-31 17:38:48 +00:00 · 2017-09-15 11:39:27 +01:00
parent ab9fbda53f
commit 3c1729b960
55 changed files with 4928 additions and 2761 deletions
--- a/ng2-components/ng2-activiti-analytics/package.json
+++ b/ng2-components/ng2-activiti-analytics/package.json
@@ -32,19 +32,19 @@
    "url": "https://github.com/Alfresco/alfresco-ng2-components/issues"
  },
  "dependencies": {
-    "@angular/animations": "4.2.5",
-    "@angular/cdk": "2.0.0-beta.8",
-    "@angular/common": "4.2.5",
-    "@angular/compiler": "4.2.5",
-    "@angular/core": "4.2.5",
-    "@angular/forms": "4.2.5",
-    "@angular/http": "4.2.5",
-    "@angular/material": "2.0.0-beta.8",
-    "@angular/platform-browser": "4.2.5",
-    "@angular/platform-browser-dynamic": "4.2.5",
-    "@angular/router": "4.2.5",
+    "@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",
    "@ngx-translate/core": "7.0.0",
-    "alfresco-js-api": "^1.8.0-beta1",
+    "alfresco-js-api": "1.8.0",
    "chart.js": "2.5.0",
    "core-js": "2.4.1",
    "hammerjs": "2.0.8",
@@ -56,7 +56,7 @@
    "reflect-metadata": "0.1.10",
    "rxjs": "5.1.0",
    "systemjs": "0.19.27",
-    "zone.js": "0.8.4"
+    "zone.js": "0.8.12"
  },
  "devDependencies": {
    "@types/hammerjs": "2.0.34",
@@ -67,7 +67,7 @@
    "autoprefixer": "6.5.4",
    "codelyzer": "3.1.2",
    "copy-webpack-plugin": "4.0.1",
-    "css-loader": "0.23.1",
+    "css-loader": "0.25.0",
    "css-to-string-loader": "0.1.2",
    "cssnano": "3.8.1",
    "extract-text-webpack-plugin": "2.0.0-rc.3",
--- a/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/analytics-report-parameters.component.spec.ts
@@ -215,7 +215,7 @@ describe('AnalyticsReportParametersComponent', () => {
        it('Should render a checkbox with the value true when the definition parameter type is \'boolean\' ', (done) => {
            component.onSuccessReportParams.subscribe(() => {
                fixture.detectChanges();
-                let checkElement: any = element.querySelector('#input-typeFiltering');
+                let checkElement: any = element.querySelector('#typeFiltering-input');
                expect(checkElement.checked).toBeTruthy();
                done();
            });
--- 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
@@ -1,9 +1,9 @@
 <label>{{field.nameKey | translate}}</label><br>
 <div [formGroup]="dateRange">
-    <small *ngIf="isStartDateGreaterThanEndDate()" class="adf-text-danger">
+    <small *ngIf="isStartDateGreaterThanEndDate()" class="adf-date-range-analytics-text-danger">
       {{'DATE-WIDGET.MESSAGES.START-LESS-THAN-END-DATE' | translate}}
    </small>
-    <small *ngIf="isStartDateEmpty()" class="adf-text-danger">
+    <small *ngIf="isStartDateEmpty()" class="adf-date-range-analytics-text-danger">
       {{'DATE-WIDGET.MESSAGES.START-DATE-REQUIRED' | translate}}
    </small>

@@ -15,39 +15,39 @@
                            [min]="minDate"
                            [max]="maxDate"
                            formControlName="startDate"
-                            [mdDatepicker]="startDatePicker"
+                            [mdDatepicker]="startDate"
                            [value]="startDatePicker"
                            (keydown)="true"
+                            (dateChange)="onGroupValueChanged()"
                            placeholder="{{'DATE-WIDGET.START-DATE' | translate}}"
                            id="startDate_id"
                            required>
-                        <button mdSuffix [mdDatepickerToggle]="startDatePicker"></button>
+                        <md-datepicker-toggle mdSuffix [for]="startDate" ></md-datepicker-toggle>
                    </md-input-container>
                    <md-datepicker
-                        #startDatePicker
-                        [touchUi]="true"
-                        (selectedChanged)="onGroupValueChanged()">
+                        #startDate
+                        [touchUi]="true">
                    </md-datepicker>
                </md-grid-tile>
                <md-grid-tile>
-                    <md-input-container class="adf-start-task-input-container">
+                    <md-input-container>
                        <input
                            mdInput
                            [min]="minDate"
                            [max]="maxDate"
                            formControlName="endDate"
-                            [mdDatepicker]="endDatePicker"
+                            [mdDatepicker]="endDate"
                            [value]="endDatePicker"
                            (keydown)="true"
+                            (dateChange)="onGroupValueChanged()"
                            placeholder="{{'DATE-WIDGET.END-DATE' | translate}}"
                            id="endDate_id"
                            required>
-                        <button mdSuffix [mdDatepickerToggle]="endDatePicker"></button>
+                        <md-datepicker-toggle mdSuffix [for]="endDate" ></md-datepicker-toggle>
                    </md-input-container>
                    <md-datepicker
-                        #endDatePicker
-                        [touchUi]="true"
-                        (selectedChanged)="onGroupValueChanged()">
+                        #endDate
+                        [touchUi]="true">
                    </md-datepicker>
                </md-grid-tile>
            </md-grid-list>
--- a/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.scss
+++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/date-range/date-range.widget.scss
@@ -1,7 +1,7 @@
-.adf-text-danger {
-    color: #D8000C;
+@mixin mat-analytics-date-range-widget-theme($theme) {
+    $warn: map-get($theme, warn);

-    .mat-input-container {
-        width: 80% !important;
+    .adf-date-range-analytics-text-danger {
+        color: mat-color($warn);
    }
 }
--- 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
@@ -47,8 +47,8 @@ export class DateRangeWidgetComponent implements OnInit {

    minDate: Moment;
    maxDate: Moment;
-    startDatePicker: Moment;
-    endDatePicker: Moment;
+    startDatePicker: Moment = moment();
+    endDatePicker: Moment = moment();

    constructor(public dateAdapter: DateAdapter<Moment>) {
    }
--- a/ng2-components/ng2-activiti-analytics/src/components/widgets/widget.component.ts
+++ b/ng2-components/ng2-activiti-analytics/src/components/widgets/widget.component.ts
@@ -15,14 +15,9 @@
 * limitations under the License.
 */

-import { AfterViewInit, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
+import { EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';

-let componentHandler: any;
-
-/**
- * Base widget component.
- */
-export class WidgetComponent implements AfterViewInit, OnChanges {
+export class WidgetComponent implements OnChanges {

    @Input()
    field: any;
@@ -52,17 +47,4 @@ export class WidgetComponent implements AfterViewInit, OnChanges {
        this.fieldChanged.emit(field);
    }

-    ngAfterViewInit() {
-        this.setupMaterialComponents(componentHandler);
-    }
-
-    setupMaterialComponents(handler?: any): boolean {
-        // workaround for MDL issues with dynamic components
-        if (handler) {
-            handler.upgradeAllRegistered();
-            return true;
-        }
-        return false;
-    }
-
 }
--- a/ng2-components/ng2-activiti-analytics/styles/index.scss
+++ b/ng2-components/ng2-activiti-analytics/styles/index.scss
@@ -1,5 +1,7 @@
@import '../src/components/analytics-report-list.component';
+@import '../src/components/widgets/date-range/date-range.widget';

@mixin alfresco-activity-analytics-theme($theme) {
    @include mat-analytics-report-list-theme($theme);
+    @include mat-analytics-date-range-widget-theme($theme);
 }