Merge branch 'main' into exit-calls

itssharmasandeep · web-flow · commit b0c8c466b41b · 2021-04-14T14:05:12.000+05:30
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,3 +1,3 @@
 plugins {
-  id("org.hypertrace.docker-publish-plugin") version "0.8.1"
+  id("org.hypertrace.docker-publish-plugin") version "0.9.0"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,13 +35,13 @@
     "@angular/platform-browser": "^11.2.0",
     "@angular/platform-browser-dynamic": "^11.2.0",
     "@angular/router": "^11.2.0",
-    "@apollo/client": "^3.3.13",
+    "@apollo/client": "^3.3.14",
     "@hypertrace/hyperdash": "^1.2.1",
     "@hypertrace/hyperdash-angular": "^2.5.0",
     "@types/d3-hierarchy": "^2.0.0",
     "@types/d3-transition": "1.1.5",
     "apollo-angular": "^2.4.0",
-    "core-js": "^3.9.1",
+    "core-js": "^3.10.1",
     "d3-array": "^2.12.0",
     "d3-axis": "^2.1.0",
     "d3-brush": "^1.1.6",
@@ -62,17 +62,17 @@
     "iso8601-duration": "^1.3.0",
     "lodash-es": "^4.17.21",
     "rxjs": "~6.6.7",
-    "tslib": "^2.1.0",
+    "tslib": "^2.2.0",
     "uuid": "^8.3.2",
     "zone.js": "^0.11.4"
   },
   "devDependencies": {
     "@angular-builders/jest": "^11.1.1",
     "@angular-devkit/build-angular": "~0.1102.7",
-    "@angular/cli": "11.2.6",
+    "@angular/cli": "11.2.8",
     "@angular/compiler-cli": "~11.2.0",
     "@angular/language-service": "~11.2.6",
-    "@commitlint/cli": "^12.0.1",
+    "@commitlint/cli": "^12.1.1",
     "@commitlint/config-conventional": "^12.0.1",
     "@compodoc/compodoc": "^1.1.11",
     "@ngneat/spectator": "^7.1.0",
diff --git a/projects/common/src/utilities/coercers/date-coercer.test.ts b/projects/common/src/utilities/coercers/date-coercer.test.ts
@@ -46,8 +46,8 @@ describe('Date coercer', () => {
     expect(basicCoercer.coerce(0)).toBeUndefined();
     expect(basicCoercer.coerce('2009-04-11T16:33:47.046Z')).toBeUndefined();
     expect(basicCoercer.coerce('2019-04-11T16:33:47.046Z')).toBeDefined();
-    // This will fail in 2021 too, just bump the year
-    expect(basicCoercer.coerce('2031-04-11T16:33:47.046Z')).toBeUndefined();
+    // This will fail in 2022 too, just bump the year
+    expect(basicCoercer.coerce('2032-04-11T16:33:47.046Z')).toBeUndefined();
   });
 
   test('rejects non dates', () => {
diff --git a/projects/common/src/utilities/formatters/string/display-string.pipe.ts b/projects/common/src/utilities/formatters/string/display-string.pipe.ts
@@ -5,7 +5,7 @@ import { displayString } from './string-formatter';
   name: 'htDisplayString'
 })
 export class DisplayStringPipe implements PipeTransform {
-  public transform(value: unknown): string {
-    return displayString(value);
+  public transform(value: unknown, defaultValueOnEmpty: string = '-'): string {
+    return displayString(value, defaultValueOnEmpty);
   }
 }
diff --git a/projects/common/src/utilities/formatters/string/string-formatter.test.ts b/projects/common/src/utilities/formatters/string/string-formatter.test.ts
@@ -16,6 +16,21 @@ describe('String formatter', () => {
     expect(displayString(false)).toBe('false');
   });
 
+  test('can convert to display string with default empty value', () => {
+    // tslint:disable-next-line: no-null-keyword
+    expect(displayString(null, 'none')).toBe('none');
+    expect(displayString('null', 'none')).toBe('none');
+    expect(displayString(undefined, 'none')).toBe('none');
+    expect(displayString('', 'none')).toBe('');
+    expect(displayString('value', 'none')).toBe('value');
+    expect(displayString(15, 'none')).toBe('15');
+    expect(displayString({}, 'none')).toBe('Object');
+    expect(displayString([undefined], 'none')).toBe('[none]');
+    expect(displayString(() => 'hi', 'none')).toBe('Function');
+    expect(displayString(Symbol('test symbol'), 'none')).toBe('Symbol(test symbol)');
+    expect(displayString(false, 'none')).toBe('false');
+  });
+
   test('creates string array correctly from comma separated list', () => {
     expect(getStringsFromCommaSeparatedList('first,second,   third   ')).toEqual(
       expect.arrayContaining(['first', 'second', 'third'])
diff --git a/projects/common/src/utilities/formatters/string/string-formatter.ts b/projects/common/src/utilities/formatters/string/string-formatter.ts
@@ -1,13 +1,15 @@
-export const displayString = (provided?: unknown): string => {
+export const displayString = (provided?: unknown, defaultValueOnEmpty: string = '-'): string => {
   if (provided === null || provided === 'null') {
-    return '-';
+    return defaultValueOnEmpty;
   }
 
   switch (typeof provided) {
     case 'object':
-      return Array.isArray(provided) ? `[${provided.map(displayString).join(', ')}]` : 'Object';
+      return Array.isArray(provided)
+        ? `[${provided.map(value => displayString(value, defaultValueOnEmpty)).join(', ')}]`
+        : 'Object';
     case 'undefined':
-      return '-';
+      return defaultValueOnEmpty;
     case 'function':
       return 'Function';
     case 'string':
diff --git a/projects/components/src/menu-dropdown/menu-item/menu-item.component.test.ts b/projects/components/src/menu-dropdown/menu-item/menu-item.component.test.ts
@@ -16,14 +16,15 @@ describe('Menu Item Component', () => {
 
   test('should display icon and label as expected', fakeAsync(() => {
     const spectator = createHost(
-      '<ht-menu-item [icon]="icon" [label]="label" [iconColor]="iconColor"></ht-menu-item>',
+      '<ht-menu-item [icon]="icon" [label]="label" [labelColor]="labelColor" [iconColor]="iconColor"></ht-menu-item>',
       {
-        hostProps: { icon: IconType.MoreHorizontal, label: 'Item', iconColor: Color.Gray1 }
+        hostProps: { icon: IconType.MoreHorizontal, label: 'Item', labelColor: Color.Gray1, iconColor: Color.Gray1 }
       }
     );
     expect(spectator.query('.menu-item')).toExist();
     expect(spectator.query('.icon')).toExist();
     expect(spectator.query('.label')).toHaveText('Item');
+    expect((spectator.query('.label') as HTMLSpanElement)?.style.color).toEqual('rgb(244, 245, 245)');
     expect(spectator.query(IconComponent)?.icon).toBe(IconType.MoreHorizontal);
     expect(spectator.query(IconComponent)?.color).toBe(Color.Gray1);
   }));
diff --git a/projects/components/src/menu-dropdown/menu-item/menu-item.component.ts b/projects/components/src/menu-dropdown/menu-item/menu-item.component.ts
@@ -15,7 +15,7 @@ import { IconSize } from '../../icon/icon-size';
         size="${IconSize.Small}"
         [color]="this.iconColor"
       ></ht-icon>
-      <span class="label">{{ this.label }}</span>
+      <span class="label" [ngStyle]="{ color: this.labelColor ? this.labelColor : '' }">{{ this.label }}</span>
     </div></ht-event-blocker
   >`
 })
@@ -29,6 +29,9 @@ export class MenuItemComponent {
   @Input()
   public iconColor?: string;
 
+  @Input()
+  public labelColor?: string;
+
   @Input()
   public disabled?: boolean;
 
diff --git a/projects/dashboards/src/model/time-duration/time-duration.model.ts b/projects/dashboards/src/model/time-duration/time-duration.model.ts
@@ -19,7 +19,15 @@ export class TimeDurationModel {
     // tslint:disable-next-line: no-object-literal-type-assertion
     type: {
       key: ENUM_TYPE.type,
-      values: [TimeUnit.Millisecond, TimeUnit.Second, TimeUnit.Minute, TimeUnit.Hour, TimeUnit.Week, TimeUnit.Month]
+      values: [
+        TimeUnit.Millisecond,
+        TimeUnit.Second,
+        TimeUnit.Minute,
+        TimeUnit.Hour,
+        TimeUnit.Day,
+        TimeUnit.Week,
+        TimeUnit.Month
+      ]
     } as EnumPropertyTypeInstance
   })
   public unit!: TimeUnit;
diff --git a/projects/distributed-tracing/src/shared/graphql/request/builders/argument/graphql-argument-builder.test.ts b/projects/distributed-tracing/src/shared/graphql/request/builders/argument/graphql-argument-builder.test.ts
@@ -68,9 +68,9 @@ describe('Graphql Argument Builder', () => {
     );
   });
 
-  test('construct arguments for entity type correctly', () => {
-    expect(argBuilder.forTraceType('entity-type')).toEqual(
-      expect.objectContaining({ name: 'type', value: new GraphQlEnumArgument('entity-type') })
+  test('construct arguments for entity scope correctly', () => {
+    expect(argBuilder.forScope('entity-type')).toEqual(
+      expect.objectContaining({ name: 'scope', value: 'entity-type' })
     );
   });
 
diff --git a/projects/distributed-tracing/src/shared/graphql/request/builders/argument/graphql-argument-builder.ts b/projects/distributed-tracing/src/shared/graphql/request/builders/argument/graphql-argument-builder.ts
@@ -1,5 +1,4 @@
 import { GraphQlArgument, GraphQlEnumArgument } from '@hypertrace/graphql-client';
-import { EntityType } from '@hypertrace/observability';
 import { GraphQlFilter } from '../../../model/schema/filter/graphql-filter';
 import { GraphQlSortBySpecification } from '../../../model/schema/sort/graphql-sort-by-specification';
 import { GraphQlTimeRange } from '../../../model/schema/timerange/graphql-time-range';
@@ -75,7 +74,7 @@ export class GraphQlArgumentBuilder {
     };
   }
 
-  public forEntityType(type: EntityType): GraphQlArgument {
-    return { name: 'type', value: new GraphQlEnumArgument(type) };
+  public forScope(scope: string): GraphQlArgument {
+    return { name: 'scope', value: scope };
   }
 }
diff --git a/projects/observability/src/shared/components/interval-select/interval-select.component.ts b/projects/observability/src/shared/components/interval-select/interval-select.component.ts
@@ -54,8 +54,9 @@ export class IntervalSelectComponent implements OnChanges {
     }
   }
 
-  public onIntervalChange(value: IntervalValue): void {
-    this.intervalChange.next(value);
+  public onIntervalChange(interval: IntervalValue): void {
+    this.interval = interval;
+    this.intervalChange.next(interval);
   }
 
   public isDisabledOrUnselectable(): boolean {
diff --git a/projects/observability/src/shared/dashboard/widgets/charts/cartesian-widget/cartesian-widget-renderer.component.test.ts b/projects/observability/src/shared/dashboard/widgets/charts/cartesian-widget/cartesian-widget-renderer.component.test.ts
@@ -8,6 +8,7 @@ import {
   TimeUnit
 } from '@hypertrace/common';
 import { LoadAsyncModule } from '@hypertrace/components';
+import { TimeDurationModel } from '@hypertrace/dashboards';
 import { mockDashboardWidgetProviders } from '@hypertrace/dashboards/testing';
 import { ModelApi } from '@hypertrace/hyperdash';
 import { runFakeRxjs } from '@hypertrace/test-utils';
@@ -25,7 +26,8 @@ describe('Cartesian widget renderer component', () => {
       mockProvider(IntervalDurationService, {
         getAvailableIntervalsForTimeRange: () => [
           new TimeDuration(1, TimeUnit.Minute),
-          new TimeDuration(3, TimeUnit.Minute)
+          new TimeDuration(3, TimeUnit.Minute),
+          new TimeDuration(1, TimeUnit.Hour)
         ],
         getExactMatch: (duration: TimeDuration, availableDurations: TimeDuration[]): TimeDuration | undefined =>
           availableDurations.find(availableDuration => duration.equals(availableDuration))
@@ -138,6 +140,39 @@ describe('Cartesian widget renderer component', () => {
     expect(spectator.component.selectedInterval).toEqual('AUTO');
   });
 
+  test('sets default interval to use with selectable interval options', () => {
+    const mockTimeDurationModel = new TimeDurationModel();
+    mockTimeDurationModel.value = 1;
+    mockTimeDurationModel.unit = TimeUnit.Hour;
+
+    const mockModel = cartesianModelFactory({
+      defaultInterval: mockTimeDurationModel,
+      series: [seriesFactory({}, fetcherFactory([])), seriesFactory({}, fetcherFactory([]))]
+    });
+    const spectator = buildComponent({
+      providers: [...mockDashboardWidgetProviders(mockModel)]
+    });
+
+    expect(spectator.component.selectedInterval).toEqual(expect.objectContaining({ value: 1, unit: TimeUnit.Hour }));
+  });
+
+  test('sets default interval without any interval selector options', () => {
+    const mockTimeDurationModel = new TimeDurationModel();
+    mockTimeDurationModel.value = 3;
+    mockTimeDurationModel.unit = TimeUnit.Minute;
+
+    const mockModel = cartesianModelFactory({
+      defaultInterval: mockTimeDurationModel,
+      selectableInterval: false,
+      series: [seriesFactory({}, fetcherFactory([])), seriesFactory({}, fetcherFactory([]))]
+    });
+    const spectator = buildComponent({
+      providers: [...mockDashboardWidgetProviders(mockModel)]
+    });
+
+    expect(spectator.component.selectedInterval).toEqual(expect.objectContaining({ value: 3, unit: TimeUnit.Minute }));
+  });
+
   test('provides expected interval options', () => {
     const mockModel = cartesianModelFactory({
       series: [seriesFactory({}, fetcherFactory([]))]
@@ -148,7 +183,8 @@ describe('Cartesian widget renderer component', () => {
     expect(spectator.component.intervalOptions).toEqual([
       'AUTO',
       new TimeDuration(1, TimeUnit.Minute),
-      new TimeDuration(3, TimeUnit.Minute)
+      new TimeDuration(3, TimeUnit.Minute),
+      new TimeDuration(1, TimeUnit.Hour)
     ]);
   });
 
@@ -163,7 +199,9 @@ describe('Cartesian widget renderer component', () => {
       providers: [...mockDashboardWidgetProviders(mockModel)]
     });
     const originalDataObservable = spectator.component.data$;
+
     spectator.component.onIntervalChange(new TimeDuration(3, TimeUnit.Minute));
+
     expect(fetcher.getData).toHaveBeenLastCalledWith(new TimeDuration(3, TimeUnit.Minute));
     expect(originalDataObservable).not.toBe(spectator.component.data$);
     spectator.component.onIntervalChange('AUTO');
diff --git a/projects/observability/src/shared/dashboard/widgets/charts/cartesian-widget/cartesian-widget-renderer.component.ts b/projects/observability/src/shared/dashboard/widgets/charts/cartesian-widget/cartesian-widget-renderer.component.ts
@@ -58,13 +58,13 @@ export class CartesianWidgetRendererComponent<TSeriesInterval> extends Interacti
     return this.model.getDataFetcher().pipe(
       tap(fetcher => {
         this.fetcher = fetcher;
+        const defaultInterval = this.model.defaultInterval?.getDuration();
+
+        const intervalOptions = this.buildIntervalOptions();
+        this.selectedInterval = this.getBestIntervalMatch(intervalOptions, this.selectedInterval ?? defaultInterval);
 
         if (this.intervalSupported()) {
-          this.intervalOptions = this.buildIntervalOptions();
-          this.selectedInterval = this.getBestIntervalMatch(this.intervalOptions, this.selectedInterval);
-        } else {
-          this.intervalOptions = undefined;
-          this.selectedInterval = undefined;
+          this.intervalOptions = intervalOptions; // The only thing this flag controls is whether options are available (and thus, the selector)
         }
       }),
       switchMap(() => this.buildDataObservable())
diff --git a/projects/observability/src/shared/dashboard/widgets/charts/cartesian-widget/cartesian-widget.model.ts b/projects/observability/src/shared/dashboard/widgets/charts/cartesian-widget/cartesian-widget.model.ts
@@ -1,9 +1,10 @@
 import { ColorPaletteKey, ColorService, forkJoinSafeEmpty, TimeDuration } from '@hypertrace/common';
-import { EnumPropertyTypeInstance, ENUM_TYPE } from '@hypertrace/dashboards';
+import { EnumPropertyTypeInstance, ENUM_TYPE, TimeDurationModel } from '@hypertrace/dashboards';
 import {
   BOOLEAN_PROPERTY,
   Model,
   ModelApi,
+  ModelModelPropertyTypeInstance,
   ModelProperty,
   ModelPropertyType,
   NUMBER_PROPERTY,
@@ -102,6 +103,16 @@ export class CartesianWidgetModel<TInterval> {
   })
   public selectableInterval: boolean = true;
 
+  @ModelProperty({
+    key: 'default-interval',
+    required: false,
+    // tslint:disable-next-line: no-object-literal-type-assertion
+    type: {
+      key: ModelPropertyType.TYPE
+    } as ModelModelPropertyTypeInstance
+  })
+  public defaultInterval?: TimeDurationModel;
+
   @ModelProperty({
     key: 'show-summary',
     displayName: 'Show Summary',
diff --git a/projects/observability/src/shared/graphql/request/builders/argument/graphql-observability-argument-builder.ts b/projects/observability/src/shared/graphql/request/builders/argument/graphql-observability-argument-builder.ts
@@ -13,13 +13,6 @@ import { GraphQlIntervalUnit } from '../../../model/schema/interval/graphql-inte
 import { convertToGraphQlIntervalUnit } from '../specification/metric/metric-interval-unit-converter';
 
 export class GraphQlObservabilityArgumentBuilder extends GraphQlArgumentBuilder {
-  public forEntityType(type: EntityType): GraphQlArgument {
-    return {
-      name: 'type',
-      value: new GraphQlEnumArgument(type)
-    };
-  }
-
   public forIncludeInactive(includeInactive?: boolean): GraphQlArgument[] {
     return includeInactive !== undefined ? [{ name: 'includeInactive', value: includeInactive }] : [];
   }
diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/entities-graphql-query-builder.service.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/entities-graphql-query-builder.service.ts
@@ -34,7 +34,7 @@ export class EntitiesGraphqlQueryBuilderService {
 
   public buildRequestArguments(request: GraphQlEntitiesRequest): GraphQlArgument[] {
     return [
-      this.argBuilder.forEntityType(request.entityType),
+      this.argBuilder.forScope(request.entityType),
       this.argBuilder.forLimit(request.limit),
       this.argBuilder.forTimeRange(request.timeRange),
       ...this.argBuilder.forOffset(request.offset),
diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/entities-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/entities-graphql-query-handler.service.test.ts
@@ -77,7 +77,7 @@ describe('Entities graphql query handler', () => {
   ): GraphQlSelection => ({
     path: 'entities',
     arguments: [
-      { name: 'type', value: new GraphQlEnumArgument(entityType) },
+      { name: 'scope', value: entityType },
       { name: 'limit', value: limit },
       {
         name: 'between',
@@ -201,7 +201,7 @@ describe('Entities graphql query handler', () => {
     expect(spectator.service.convertRequest(requestWithAvgrates)).toEqual({
       path: 'entities',
       arguments: [
-        { name: 'type', value: new GraphQlEnumArgument(ObservabilityEntityType.Service) },
+        { name: 'scope', value: ObservabilityEntityType.Service },
         { name: 'limit', value: 30 },
         {
           name: 'between',
@@ -327,7 +327,7 @@ describe('Entities graphql query handler', () => {
     expect(spectator.service.convertRequest(requestWithAvgrates)).toEqual({
       path: 'entities',
       arguments: [
-        { name: 'type', value: new GraphQlEnumArgument(ObservabilityEntityType.Service) },
+        { name: 'scope', value: ObservabilityEntityType.Service },
         { name: 'limit', value: 30 },
         {
           name: 'between',
diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/interactions/interactions-graphql-query-handler.service.test.ts
@@ -73,7 +73,7 @@ describe('Interactions graphql query handler', () => {
     expect(spectator.service.convertRequest(buildRequest())).toEqual({
       path: 'entities',
       arguments: [
-        { name: 'type', value: new GraphQlEnumArgument(ObservabilityEntityType.Backend) },
+        { name: 'scope', value: ObservabilityEntityType.Backend },
         { name: 'limit', value: 1 },
         {
           name: 'between',
diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service.test.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service.test.ts
@@ -242,7 +242,7 @@ describe('Entity topology graphql query handler', () => {
     expect(spectator.service.convertRequest(request)).toEqual({
       path: 'entities',
       arguments: [
-        { name: 'type', value: new GraphQlEnumArgument(ObservabilityEntityType.Service) },
+        { name: 'scope', value: ObservabilityEntityType.Service },
         { name: 'limit', value: 100 },
         {
           name: 'between',
diff --git a/projects/observability/src/shared/graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service.ts b/projects/observability/src/shared/graphql/request/handlers/entities/query/topology/entity-topology-graphql-query-handler.service.ts
diff --git a/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`plugins {`
`2`		`- id("org.hypertrace.docker-publish-plugin") version "0.8.1"`
	`2`	`+ id("org.hypertrace.docker-publish-plugin") version "0.9.0"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import { displayString } from './string-formatter';`
`5`	`5`	`name: 'htDisplayString'`
`6`	`6`	`})`
`7`	`7`	`export class DisplayStringPipe implements PipeTransform {`
`8`		`- public transform(value: unknown): string {`
`9`		`- return displayString(value);`
	`8`	`+ public transform(value: unknown, defaultValueOnEmpty: string = '-'): string {`
	`9`	`+ return displayString(value, defaultValueOnEmpty);`
`10`	`10`	`}`
`11`	`11`	`}`