Merge branch 'master' into fix-dash-sizing

Author: aaron-steinfeld

projects/components/src/combo-box/combo-box-api.ts

@@ -1,6 +1,7 @@
 export interface ComboBoxOption<TValue = string> {
   text: string;
   value: TValue;
+  tooltip?: string;
 }
 
 export interface ComboBoxResult<TValue = string> {

projects/components/src/combo-box/combo-box.component.ts

@@ -85,6 +85,7 @@ import { ComboBoxMode, ComboBoxOption, ComboBoxResult } from './combo-box-api';
             *ngFor="let option of this.filteredOptions; index as i"
             [class.selected]="this.highlightedOptionIndex === i"
             (click)="this.onOptionClick(option)"
+            [htcTooltip]="option.tooltip ? option.tooltip : ''"
             class="popover-item"
           >
             <div [innerHtml]="option.text | htcHighlight: this.text"></div>

projects/components/src/combo-box/combo-box.module.ts

@@ -5,10 +5,11 @@ import { FormattingModule } from '@hypertrace/common';
 import { ButtonModule } from '../button/button.module';
 import { IconModule } from '../icon/icon.module';
 import { PopoverModule } from '../popover/popover.module';
+import { TooltipModule } from '../tooltip/tooltip.module';
 import { ComboBoxComponent } from './combo-box.component';
 
 @NgModule({
-  imports: [CommonModule, PopoverModule, IconModule, FormsModule, FormattingModule, ButtonModule],
+  imports: [CommonModule, PopoverModule, IconModule, FormsModule, FormattingModule, ButtonModule, TooltipModule],
   declarations: [ComboBoxComponent],
   exports: [ComboBoxComponent]
 })

projects/distributed-tracing/src/shared/components/filter-bar/filter/filter.component.ts

@@ -106,7 +106,8 @@ export class FilterComponent implements OnInit, OnChanges {
   private mapToComboBoxOption(filter: IncompleteFilter): ComboBoxOption<IncompleteFilter> {
     return {
       text: filter.userString,
-      value: filter
+      value: filter,
+      tooltip: `${filter.userString} (${filter.field})`
     };
   }
 }