[01/50] [abbrv] ambari git commit: AMBARI-22503 Log Search UI: refine time range picker. (ababiichuk)
Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21674 d43882d1a -> f02eb4e18 AMBARI-22503 Log Search UI: refine time range picker. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bce0bd8f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bce0bd8f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bce0bd8f Branch: refs/heads/branch-feature-AMBARI-21674 Commit: bce0bd8f9424828d0d43ad5e427dff7259496e64 Parents: 5d421b7 Author: ababiichukAuthored: Wed Nov 22 19:54:00 2017 +0200 Committer: ababiichuk Committed: Thu Nov 23 00:47:34 2017 +0200 -- .../date-picker/date-picker.component.spec.ts | 2 ++ .../date-picker/date-picker.component.ts| 35 +--- .../time-range-picker.component.html| 6 ++-- .../time-range-picker.component.ts | 12 --- .../src/app/services/logs-container.service.ts | 20 --- .../src/assets/i18n/en.json | 4 ++- 6 files changed, 61 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/bce0bd8f/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts -- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts index e6c0bfe..dfd9711 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts @@ -18,6 +18,7 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing'; import {StoreModule} from '@ngrx/store'; +import * as moment from 'moment-timezone'; import {AppSettingsService, appSettings} from '@app/services/storage/app-settings.service'; import {DatePickerComponent} from './date-picker.component'; @@ -42,6 +43,7 @@ describe('DatePickerComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(DatePickerComponent); component = fixture.componentInstance; +component.time = moment(); fixture.detectChanges(); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/bce0bd8f/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts -- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts index efb5e34..e33d71e 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts @@ -16,8 +16,11 @@ * limitations under the License. */ -import {Component, OnInit, OnDestroy, Output, EventEmitter, ViewChild, ElementRef} from '@angular/core'; +import { + Component, OnInit, OnChanges, OnDestroy, SimpleChanges, Input, Output, EventEmitter, ViewChild, ElementRef +} from '@angular/core'; import * as $ from 'jquery'; +import {Moment} from 'moment-timezone'; import '@vendor/js/bootstrap-datetimepicker.min'; import {AppSettingsService} from '@app/services/storage/app-settings.service'; @@ -25,10 +28,10 @@ import {AppSettingsService} from '@app/services/storage/app-settings.service'; selector: 'date-picker', templateUrl: './date-picker.component.html' }) -export class DatePickerComponent implements OnInit, OnDestroy { +export class DatePickerComponent implements OnInit, OnChanges, OnDestroy { constructor(private appSettings: AppSettingsService) { -appSettings.getParameter('timeZone').subscribe(value => { +appSettings.getParameter('timeZone').subscribe((value: string): void => { this.destroyDatePicker(); this.timeZone = value; if (this.datePickerElement) { @@ -37,14 +40,27 @@ export class DatePickerComponent implements OnInit, OnDestroy { }); } - ngOnInit() { + ngOnInit(): void { this.createDatePicker(); } - ngOnDestroy() { + ngOnChanges(changes: SimpleChanges): void { +if (changes.hasOwnProperty('time') && this.datePickerElement) { + this.setTime(changes.time.currentValue); +} + } + + ngOnDestroy(): void { this.destroyDatePicker(); } + /** + * Value of time input field passed from parent component + * @type {Moment} + */ + @Input() + time: Moment; + @Output() timeChange: EventEmitter = new
[29/49] ambari git commit: AMBARI-22503 Log Search UI: refine time range picker. (ababiichuk)
AMBARI-22503 Log Search UI: refine time range picker. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bce0bd8f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bce0bd8f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bce0bd8f Branch: refs/heads/branch-feature-AMBARI-20859 Commit: bce0bd8f9424828d0d43ad5e427dff7259496e64 Parents: 5d421b7 Author: ababiichukAuthored: Wed Nov 22 19:54:00 2017 +0200 Committer: ababiichuk Committed: Thu Nov 23 00:47:34 2017 +0200 -- .../date-picker/date-picker.component.spec.ts | 2 ++ .../date-picker/date-picker.component.ts| 35 +--- .../time-range-picker.component.html| 6 ++-- .../time-range-picker.component.ts | 12 --- .../src/app/services/logs-container.service.ts | 20 --- .../src/assets/i18n/en.json | 4 ++- 6 files changed, 61 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/bce0bd8f/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts -- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts index e6c0bfe..dfd9711 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts @@ -18,6 +18,7 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing'; import {StoreModule} from '@ngrx/store'; +import * as moment from 'moment-timezone'; import {AppSettingsService, appSettings} from '@app/services/storage/app-settings.service'; import {DatePickerComponent} from './date-picker.component'; @@ -42,6 +43,7 @@ describe('DatePickerComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(DatePickerComponent); component = fixture.componentInstance; +component.time = moment(); fixture.detectChanges(); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/bce0bd8f/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts -- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts index efb5e34..e33d71e 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts @@ -16,8 +16,11 @@ * limitations under the License. */ -import {Component, OnInit, OnDestroy, Output, EventEmitter, ViewChild, ElementRef} from '@angular/core'; +import { + Component, OnInit, OnChanges, OnDestroy, SimpleChanges, Input, Output, EventEmitter, ViewChild, ElementRef +} from '@angular/core'; import * as $ from 'jquery'; +import {Moment} from 'moment-timezone'; import '@vendor/js/bootstrap-datetimepicker.min'; import {AppSettingsService} from '@app/services/storage/app-settings.service'; @@ -25,10 +28,10 @@ import {AppSettingsService} from '@app/services/storage/app-settings.service'; selector: 'date-picker', templateUrl: './date-picker.component.html' }) -export class DatePickerComponent implements OnInit, OnDestroy { +export class DatePickerComponent implements OnInit, OnChanges, OnDestroy { constructor(private appSettings: AppSettingsService) { -appSettings.getParameter('timeZone').subscribe(value => { +appSettings.getParameter('timeZone').subscribe((value: string): void => { this.destroyDatePicker(); this.timeZone = value; if (this.datePickerElement) { @@ -37,14 +40,27 @@ export class DatePickerComponent implements OnInit, OnDestroy { }); } - ngOnInit() { + ngOnInit(): void { this.createDatePicker(); } - ngOnDestroy() { + ngOnChanges(changes: SimpleChanges): void { +if (changes.hasOwnProperty('time') && this.datePickerElement) { + this.setTime(changes.time.currentValue); +} + } + + ngOnDestroy(): void { this.destroyDatePicker(); } + /** + * Value of time input field passed from parent component + * @type {Moment} + */ + @Input() + time: Moment; + @Output() timeChange: EventEmitter = new EventEmitter(); @@ -60,6 +76,7 @@ export class DatePickerComponent implements OnInit, OnDestroy {
ambari git commit: AMBARI-22503 Log Search UI: refine time range picker. (ababiichuk)
Repository: ambari Updated Branches: refs/heads/trunk 5d421b7ab -> bce0bd8f9 AMBARI-22503 Log Search UI: refine time range picker. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bce0bd8f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bce0bd8f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bce0bd8f Branch: refs/heads/trunk Commit: bce0bd8f9424828d0d43ad5e427dff7259496e64 Parents: 5d421b7 Author: ababiichukAuthored: Wed Nov 22 19:54:00 2017 +0200 Committer: ababiichuk Committed: Thu Nov 23 00:47:34 2017 +0200 -- .../date-picker/date-picker.component.spec.ts | 2 ++ .../date-picker/date-picker.component.ts| 35 +--- .../time-range-picker.component.html| 6 ++-- .../time-range-picker.component.ts | 12 --- .../src/app/services/logs-container.service.ts | 20 --- .../src/assets/i18n/en.json | 4 ++- 6 files changed, 61 insertions(+), 18 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/bce0bd8f/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts -- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts index e6c0bfe..dfd9711 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.spec.ts @@ -18,6 +18,7 @@ import {async, ComponentFixture, TestBed} from '@angular/core/testing'; import {StoreModule} from '@ngrx/store'; +import * as moment from 'moment-timezone'; import {AppSettingsService, appSettings} from '@app/services/storage/app-settings.service'; import {DatePickerComponent} from './date-picker.component'; @@ -42,6 +43,7 @@ describe('DatePickerComponent', () => { beforeEach(() => { fixture = TestBed.createComponent(DatePickerComponent); component = fixture.componentInstance; +component.time = moment(); fixture.detectChanges(); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/bce0bd8f/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts -- diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts index efb5e34..e33d71e 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/date-picker/date-picker.component.ts @@ -16,8 +16,11 @@ * limitations under the License. */ -import {Component, OnInit, OnDestroy, Output, EventEmitter, ViewChild, ElementRef} from '@angular/core'; +import { + Component, OnInit, OnChanges, OnDestroy, SimpleChanges, Input, Output, EventEmitter, ViewChild, ElementRef +} from '@angular/core'; import * as $ from 'jquery'; +import {Moment} from 'moment-timezone'; import '@vendor/js/bootstrap-datetimepicker.min'; import {AppSettingsService} from '@app/services/storage/app-settings.service'; @@ -25,10 +28,10 @@ import {AppSettingsService} from '@app/services/storage/app-settings.service'; selector: 'date-picker', templateUrl: './date-picker.component.html' }) -export class DatePickerComponent implements OnInit, OnDestroy { +export class DatePickerComponent implements OnInit, OnChanges, OnDestroy { constructor(private appSettings: AppSettingsService) { -appSettings.getParameter('timeZone').subscribe(value => { +appSettings.getParameter('timeZone').subscribe((value: string): void => { this.destroyDatePicker(); this.timeZone = value; if (this.datePickerElement) { @@ -37,14 +40,27 @@ export class DatePickerComponent implements OnInit, OnDestroy { }); } - ngOnInit() { + ngOnInit(): void { this.createDatePicker(); } - ngOnDestroy() { + ngOnChanges(changes: SimpleChanges): void { +if (changes.hasOwnProperty('time') && this.datePickerElement) { + this.setTime(changes.time.currentValue); +} + } + + ngOnDestroy(): void { this.destroyDatePicker(); } + /** + * Value of time input field passed from parent component + * @type {Moment} + */ + @Input() + time: Moment; + @Output() timeChange: EventEmitter = new EventEmitter(); @@ -60,6 +76,7 @@ export