Skip to content

Custom date range overflowing with page level time ranges #1499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 25, 2022
Merged

Custom date range overflowing with page level time ranges #1499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
baa13e1
fix: overflow for data range
Christian862 Mar 22, 2022
7f8ab4b
refactor: requested changes
Christian862 Mar 23, 2022
4b0e15f
fix: overflow for data range
Christian862 Mar 22, 2022
c0ff17d
refactor: requested changes
Christian862 Mar 23, 2022
36af83c
Merge branch 'DateRangeOverflowing' of github.com:hypertrace/hypertra…
Christian862 Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion projects/components/src/page-time-range/page-time-range.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,23 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
import { ActivatedRoute, UrlSegment } from '@angular/router';
import { LoggerService, NavigationService, PageTimeRangePreferenceService, TimeRange } from '@hypertrace/common';
import { isNil } from 'lodash-es';
import { PopoverRelativePositionLocation } from '../popover/popover';

@Component({
selector: 'ht-page-time-range',
template: ` <ht-time-range (timeRangeSelected)="this.onTimeRangeSelected($event)"></ht-time-range> `,
template: `
<ht-time-range
[dropdownLocationPreference]="this.dropdownLocationPreference"
(timeRangeSelected)="this.onTimeRangeSelected($event)"
></ht-time-range>
`,
changeDetection: ChangeDetectionStrategy.OnPush
})
export class PageTimeRangeComponent {
public readonly dropdownLocationPreference: PopoverRelativePositionLocation[] = [
PopoverRelativePositionLocation.BelowRightAligned
];

public constructor(
private readonly pageTimeRangePreferenceService: PageTimeRangePreferenceService,
private readonly navigationService: NavigationService,
Expand Down
17 changes: 15 additions & 2 deletions projects/components/src/time-range/time-range.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ChangeDetectionStrategy, Component, EventEmitter, NgZone, Output } from '@angular/core';
import { ChangeDetectionStrategy, Component, EventEmitter, Input, NgZone, Output } from '@angular/core';
import { IconType } from '@hypertrace/assets-library';
import {
FixedTimeRange,
Expand All @@ -12,6 +12,7 @@ import { concat, EMPTY, interval, Observable, of, timer } from 'rxjs';
import { map, startWith } from 'rxjs/operators';
import { ButtonRole, ButtonSize } from '../button/button';
import { IconSize } from '../icon/icon-size';
import { PopoverRelativePositionLocation } from '../popover/popover';
import { PopoverRef } from '../popover/popover-ref';

@Component({
Expand All @@ -21,7 +22,11 @@ import { PopoverRef } from '../popover/popover-ref';
template: `
<div class="time-range" *ngIf="this.timeRange$ | async as timeRange">
<div class="time-range-selector">
<ht-popover (popoverOpen)="this.onPopoverOpen($event)" [closeOnNavigate]="false">
<ht-popover
(popoverOpen)="this.onPopoverOpen($event)"
[closeOnNavigate]="false"
[locationPreferences]="this.dropdownLocationPreference"
>
<ht-popover-trigger>
<div class="trigger">
<ht-icon class="trigger-icon" icon="${IconType.Calendar}" size="${IconSize.Medium}"></ht-icon>
Expand Down Expand Up @@ -67,6 +72,14 @@ import { PopoverRef } from '../popover/popover-ref';
`
})
export class TimeRangeComponent {
@Input()
public dropdownLocationPreference: PopoverRelativePositionLocation[] = [
PopoverRelativePositionLocation.BelowLeftAligned,
PopoverRelativePositionLocation.BelowRightAligned,
PopoverRelativePositionLocation.AboveLeftAligned,
PopoverRelativePositionLocation.AboveRightAligned
];

public timeRange$: Observable<TimeRange> = this.timeRangeService.getTimeRangeAndChanges();

private popoverRef: PopoverRef | undefined;
Expand Down