Remove enableHparamsInTimeSeries feature flag (#6758)

bmd3k · web-flow · commit 4bae55c39d3c · 2024-03-05T09:22:51.000-05:00
The feature has been launched.
diff --git a/tensorboard/webapp/feature_flag/store/feature_flag_metadata.ts b/tensorboard/webapp/feature_flag/store/feature_flag_metadata.ts
@@ -115,11 +115,6 @@ export const FeatureFlagMetadataMap: FeatureFlagMetadataMapType<FeatureFlags> =
       queryParamOverride: 'enableScalarColumnContextMenus',
       parseValue: parseBoolean,
     },
-    enableHparamsInTimeSeries: {
-      defaultValue: true,
-      queryParamOverride: 'enableHparamsInTimeSeries',
-      parseValue: parseBoolean,
-    },
     enableSuggestedCards: {
       defaultValue: false,
       queryParamOverride: 'enableSuggestedCards',
diff --git a/tensorboard/webapp/feature_flag/store/feature_flag_selectors.ts b/tensorboard/webapp/feature_flag/store/feature_flag_selectors.ts
@@ -153,10 +153,3 @@ export const getIsScalarColumnContextMenusEnabled = createSelector(
     return flags.enableScalarColumnContextMenus;
   }
 );
-
-export const getEnableHparamsInTimeSeries = createSelector(
-  getFeatureFlags,
-  (flags: FeatureFlags): boolean => {
-    return flags.enableHparamsInTimeSeries;
-  }
-);
diff --git a/tensorboard/webapp/feature_flag/store/feature_flag_selectors_test.ts b/tensorboard/webapp/feature_flag/store/feature_flag_selectors_test.ts
@@ -365,28 +365,4 @@ describe('feature_flag_selectors', () => {
       expect(selectors.getIsMetricsImageSupportEnabled(state)).toEqual(true);
     });
   });
-
-  describe('#getEnableHparamsInTimeSeries', () => {
-    it('returns true when enableHparamsInTimeSeries is true', () => {
-      let state = buildState(
-        buildFeatureFlagState({
-          defaultFlags: buildFeatureFlag({
-            enableHparamsInTimeSeries: true,
-          }),
-        })
-      );
-      expect(selectors.getEnableHparamsInTimeSeries(state)).toBeTrue();
-    });
-
-    it('returns false when enableHparamsInTimeSeries is false', () => {
-      let state = buildState(
-        buildFeatureFlagState({
-          defaultFlags: buildFeatureFlag({
-            enableHparamsInTimeSeries: false,
-          }),
-        })
-      );
-      expect(selectors.getEnableHparamsInTimeSeries(state)).toBeFalse();
-    });
-  });
 });
diff --git a/tensorboard/webapp/feature_flag/types.ts b/tensorboard/webapp/feature_flag/types.ts
@@ -47,8 +47,6 @@ export interface FeatureFlags {
   enableScalarColumnCustomization: boolean;
   // Allows users to manipulate Scalar Card Table columns using context menus.
   enableScalarColumnContextMenus: boolean;
-  // Adds hparam columns to the runs table and the scalar card data table.
-  enableHparamsInTimeSeries: boolean;
   // Adds a new section at the top of the time series metrics view
   // containing suggested cards based on the users previous interactions.
   enableSuggestedCards: boolean;
diff --git a/tensorboard/webapp/feature_flag/views/feature_flag_dialog_test.ts b/tensorboard/webapp/feature_flag/views/feature_flag_dialog_test.ts
@@ -239,7 +239,7 @@ describe('feature_flag_dialog_container', () => {
     beforeEach(() => {
       store.overrideSelector(getDefaultFeatureFlags, {
         defaultEnableDarkMode: true,
-        enableHparamsInTimeSeries: true,
+        enableSuggestedCards: true,
         inColab: false,
         forceSvg: true,
       } as FeatureFlags);
@@ -277,7 +277,7 @@ describe('feature_flag_dialog_container', () => {
       expect(component.querySelectorAll('tr').length).toEqual(3);
 
       store.overrideSelector(getOverriddenFeatureFlags, {
-        showFlags: 'Hparams',
+        showFlags: 'Suggested',
       });
       store.refreshState();
       fixture.detectChanges();
diff --git a/tensorboard/webapp/hparams/_redux/hparams_effects.ts b/tensorboard/webapp/hparams/_redux/hparams_effects.ts
@@ -38,7 +38,6 @@ import {HttpErrorResponse} from '../../webapp_data_source/tb_http_client';
 import * as hparamsActions from './hparams_actions';
 import {HparamsDataSource} from './hparams_data_source';
 import {HparamAndMetricSpec, SessionGroup} from '../types';
-import {getEnableHparamsInTimeSeries} from '../../feature_flag/store/feature_flag_selectors';
 import {RouteKind} from '../../app_routing/types';
 
 /**
@@ -71,15 +70,9 @@ export class HparamsEffects {
   /** @export */
   loadHparamsData$ = createEffect(() => {
     return merge(this.navigated$, this.loadHparamsOnReload$).pipe(
-      withLatestFrom(
-        this.store.select(getEnableHparamsInTimeSeries),
-        this.store.select(getActiveRoute)
-      ),
-      filter(
-        ([, getEnableHparamsInTimeSeries]) => getEnableHparamsInTimeSeries
-      ),
+      withLatestFrom(this.store.select(getActiveRoute)),
       filter(
-        ([, , activeRoute]) =>
+        ([, activeRoute]) =>
           activeRoute?.routeKind === RouteKind.EXPERIMENT ||
           activeRoute?.routeKind === RouteKind.COMPARE_EXPERIMENT
       ),
diff --git a/tensorboard/webapp/hparams/_redux/hparams_effects_test.ts b/tensorboard/webapp/hparams/_redux/hparams_effects_test.ts
@@ -111,7 +111,6 @@ describe('hparams effects', () => {
       effects.loadHparamsData$.subscribe((action) => {
         actualActions.push(action);
       });
-      store.overrideSelector(selectors.getEnableHparamsInTimeSeries, true);
       store.overrideSelector(selectors.getActiveRoute, {
         routeKind: RouteKind.EXPERIMENT,
         params: {},
@@ -122,16 +121,6 @@ describe('hparams effects', () => {
       store.refreshState();
     });
 
-    it('does not dispatch requests when enableHparamsInTimeSeries is false', () => {
-      store.overrideSelector(selectors.getEnableHparamsInTimeSeries, false);
-      store.refreshState();
-
-      action.next(appRoutingActions.navigated({} as any));
-      expect(dataSource.fetchExperimentInfo).not.toHaveBeenCalled();
-      expect(dataSource.fetchSessionGroups).not.toHaveBeenCalled();
-      expect(actualActions).toEqual([]);
-    });
-
     it('does not dispatch requests when on experiments route', () => {
       store.overrideSelector(selectors.getActiveRoute, {
         routeKind: RouteKind.EXPERIMENTS,
diff --git a/tensorboard/webapp/metrics/views/card_renderer/scalar_card_component.ng.html b/tensorboard/webapp/metrics/views/card_renderer/scalar_card_component.ng.html
@@ -200,7 +200,6 @@
       [columnCustomizationEnabled]="columnCustomizationEnabled"
       [columnContextMenusEnabled]="columnContextMenusEnabled"
       [smoothingEnabled]="smoothingEnabled"
-      [hparamsEnabled]="hparamsEnabled"
       [columnFilters]="columnFilters"
       [runToHparamMap]="runToHparamMap"
       [selectableColumns]="selectableColumns"
diff --git a/tensorboard/webapp/metrics/views/card_renderer/scalar_card_component.ts b/tensorboard/webapp/metrics/views/card_renderer/scalar_card_component.ts
@@ -112,7 +112,6 @@ export class ScalarCardComponent<Downloader> {
   @Input() userViewBox!: Extent | null;
   @Input() columnHeaders!: ColumnHeader[];
   @Input() rangeEnabled!: boolean;
-  @Input() hparamsEnabled?: boolean;
   @Input() columnFilters!: Map<string, DiscreteFilter | IntervalFilter>;
   @Input() selectableColumns!: ColumnHeader[];
   @Input() runToHparamMap!: RunToHparamMap;
diff --git a/tensorboard/webapp/metrics/views/card_renderer/scalar_card_container.ts b/tensorboard/webapp/metrics/views/card_renderer/scalar_card_container.ts
@@ -39,7 +39,6 @@ import {State} from '../../../app_state';
 import {ExperimentAlias} from '../../../experiments/types';
 import {actions as hparamsActions} from '../../../hparams';
 import {
-  getEnableHparamsInTimeSeries,
   getForceSvgFeatureFlag,
   getIsScalarColumnContextMenusEnabled,
   getIsScalarColumnCustomizationEnabled,
@@ -190,7 +189,6 @@ function areSeriesEqual(
       [userViewBox]="userViewBox$ | async"
       [columnHeaders]="columnHeaders$ | async"
       [rangeEnabled]="rangeEnabled$ | async"
-      [hparamsEnabled]="hparamsEnabled$ | async"
       [columnFilters]="columnFilters$ | async"
       [runToHparamMap]="runToHparamMap$ | async"
       [selectableColumns]="selectableColumns$ | async"
@@ -515,7 +513,6 @@ export class ScalarCardContainer implements CardRenderer, OnInit, OnDestroy {
       }),
       combineLatestWith(
         this.store.select(getCurrentRouteRunSelection),
-        this.store.select(getEnableHparamsInTimeSeries),
         this.store.select(getFilteredRenderableRunsIds),
         this.store.select(getRunColorMap),
         this.store.select(getMetricsScalarSmoothing)
@@ -529,7 +526,6 @@ export class ScalarCardContainer implements CardRenderer, OnInit, OnDestroy {
         ([
           namedPartitionedSeries,
           runSelectionMap,
-          hparamsInTimeSeriesEnabled,
           renderableRuns,
           colorMap,
           smoothing,
@@ -558,7 +554,7 @@ export class ScalarCardContainer implements CardRenderer, OnInit, OnDestroy {
               visible: Boolean(
                 runSelectionMap &&
                   runSelectionMap.get(runId) &&
-                  (!hparamsInTimeSeriesEnabled || renderableRuns.has(runId))
+                  renderableRuns.has(runId)
               ),
               color: colorMap[runId] ?? '#fff',
               aux: false,
@@ -616,8 +612,6 @@ export class ScalarCardContainer implements CardRenderer, OnInit, OnDestroy {
       getMetricsCardRangeSelectionEnabled(this.cardId)
     );
 
-    this.hparamsEnabled$ = this.store.select(getEnableHparamsInTimeSeries);
-
     this.runToHparamMap$ = this.store.select(getRunToHparamMap);
 
     this.selectableColumns$ = this.store.select(getSelectableColumns);
diff --git a/tensorboard/webapp/metrics/views/card_renderer/scalar_card_data_table.ng.html b/tensorboard/webapp/metrics/views/card_renderer/scalar_card_data_table.ng.html
@@ -32,7 +32,6 @@
         *ngIf="header.enabled && (header.type !== ColumnHeaderType.SMOOTHED || smoothingEnabled)"
         [header]="header"
         [sortingInfo]="sortingInfo"
-        [hparamsEnabled]="hparamsEnabled"
         [disableContextMenu]="!columnContextMenusEnabled"
       ></tb-data-table-header-cell> </ng-container
   ></ng-container>
diff --git a/tensorboard/webapp/metrics/views/card_renderer/scalar_card_data_table.ts b/tensorboard/webapp/metrics/views/card_renderer/scalar_card_data_table.ts
@@ -59,7 +59,6 @@ export class ScalarCardDataTable {
   @Input() columnCustomizationEnabled!: boolean;
   @Input() columnContextMenusEnabled!: boolean;
   @Input() smoothingEnabled!: boolean;
-  @Input() hparamsEnabled?: boolean;
   @Input() columnFilters!: Map<string, DiscreteFilter | IntervalFilter>;
   @Input() selectableColumns!: ColumnHeader[];
   @Input() runToHparamMap!: RunToHparamMap;
diff --git a/tensorboard/webapp/metrics/views/card_renderer/scalar_card_test.ts b/tensorboard/webapp/metrics/views/card_renderer/scalar_card_test.ts
@@ -4005,8 +4005,6 @@ describe('scalar card', () => {
           new Set(['run1'])
         );
 
-        store.overrideSelector(selectors.getEnableHparamsInTimeSeries, true);
-
         store.overrideSelector(
           hparamsSelectors.getDashboardDisplayedHparamColumns,
           [
@@ -4036,7 +4034,7 @@ describe('scalar card', () => {
         });
       });
 
-      it('filters runs by hparam when enableHparamsInTimeSeries is true', fakeAsync(() => {
+      it('filters runs by hparam', fakeAsync(() => {
         const fixture = createComponent('card1');
         const scalarCardDataTable = fixture.debugElement.query(
           By.directive(ScalarCardDataTable)
@@ -4049,21 +4047,6 @@ describe('scalar card', () => {
         expect(data[0].run).toEqual('run1');
       }));
 
-      it('does not filter runs by hparam when enableHparamsInTimeSeries is false', fakeAsync(() => {
-        store.overrideSelector(selectors.getEnableHparamsInTimeSeries, false);
-        const fixture = createComponent('card1');
-        const scalarCardDataTable = fixture.debugElement.query(
-          By.directive(ScalarCardDataTable)
-        );
-
-        const data =
-          scalarCardDataTable.componentInstance.getTimeSelectionTableData();
-
-        expect(data.length).toEqual(2);
-        expect(data[0].run).toEqual('run1');
-        expect(data[1].run).toEqual('run2');
-      }));
-
       it('shows hparam values for selected hparam columns', fakeAsync(() => {
         store.overrideSelector(
           commonSelectors.getFilteredRenderableRunsIds,
diff --git a/tensorboard/webapp/metrics/views/metrics_container.ts b/tensorboard/webapp/metrics/views/metrics_container.ts
@@ -14,18 +14,14 @@ limitations under the License.
 ==============================================================================*/
 import {ChangeDetectionStrategy, Component} from '@angular/core';
 import {Store} from '@ngrx/store';
-import {getEnableHparamsInTimeSeries} from '../../feature_flag/store/feature_flag_selectors';
 import {State} from '../../app_state';
 import {getRunsTableFullScreen} from '../../core/store/core_selectors';
 
 @Component({
   selector: 'metrics-dashboard',
   template: `
     <tb-dashboard-layout>
-      <runs-selector
-        [showHparamsAndMetrics]="showHparamsAndMetrics$ | async"
-        sidebar
-      ></runs-selector>
+      <runs-selector sidebar></runs-selector>
       <metrics-main-view
         main
         *ngIf="!(runsTableFullScreen$ | async)"
@@ -36,7 +32,6 @@ import {getRunsTableFullScreen} from '../../core/store/core_selectors';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class MetricsDashboardContainer {
-  showHparamsAndMetrics$ = this.store.select(getEnableHparamsInTimeSeries);
   runsTableFullScreen$ = this.store.select(getRunsTableFullScreen);
 
   constructor(readonly store: Store<State>) {}
diff --git a/tensorboard/webapp/metrics/views/metrics_container_test.ts b/tensorboard/webapp/metrics/views/metrics_container_test.ts
@@ -18,7 +18,6 @@ import {By} from '@angular/platform-browser';
 import {Store} from '@ngrx/store';
 import {MockStore} from '@ngrx/store/testing';
 import {State} from '../../app_state';
-import {getEnableHparamsInTimeSeries} from '../../feature_flag/store/feature_flag_selectors';
 import {RunsSelectorContainer} from '../../runs/views/runs_selector/runs_selector_container';
 import {provideMockTbStore} from '../../testing/utils';
 import {MetricsDashboardContainer} from './metrics_container';
@@ -45,32 +44,11 @@ describe('metrics view', () => {
   });
 
   it('renders', () => {
-    store.overrideSelector(getEnableHparamsInTimeSeries, false);
     const fixture = TestBed.createComponent(MetricsDashboardContainer);
     fixture.detectChanges();
     expect(fixture.debugElement.query(By.css('runs-selector'))).not.toBeNull();
   });
 
-  it('enables hparamsAndMetrics when enableHparamsInTimeSeries is true', () => {
-    store.overrideSelector(getEnableHparamsInTimeSeries, true);
-    const fixture = TestBed.createComponent(MetricsDashboardContainer);
-    fixture.detectChanges();
-    expect(
-      fixture.debugElement.query(By.css('runs-selector')).componentInstance
-        .showHparamsAndMetrics
-    ).toBeTrue();
-  });
-
-  it('disables hparamsAndMetrics when enableHparamsInTimeSeries is false', () => {
-    store.overrideSelector(getEnableHparamsInTimeSeries, false);
-    const fixture = TestBed.createComponent(MetricsDashboardContainer);
-    fixture.detectChanges();
-    expect(
-      fixture.debugElement.query(By.css('runs-selector')).componentInstance
-        .showHparamsAndMetrics
-    ).toBeFalse();
-  });
-
   it('hides main view when the runs table is full screen is true', () => {
     store.overrideSelector(getRunsTableFullScreen, true);
     const fixture = TestBed.createComponent(MetricsDashboardContainer);
diff --git a/tensorboard/webapp/runs/views/runs_selector/runs_selector_component.ts b/tensorboard/webapp/runs/views/runs_selector/runs_selector_component.ts
@@ -21,7 +21,6 @@ import {RunsTableColumn} from '../runs_table/types';
     <runs-table
       [columns]="columns"
       [experimentIds]="experimentIds"
-      [showHparamsAndMetrics]="showHparamsAndMetrics"
     ></runs-table>
   `,
   styles: [
@@ -35,6 +34,5 @@ import {RunsTableColumn} from '../runs_table/types';
 })
 export class RunsSelectorComponent {
   @Input() experimentIds!: string[];
-  @Input() showHparamsAndMetrics?: boolean;
   @Input() columns!: RunsTableColumn[];
 }
diff --git a/tensorboard/webapp/runs/views/runs_selector/runs_selector_container.ts b/tensorboard/webapp/runs/views/runs_selector/runs_selector_container.ts
@@ -25,14 +25,11 @@ import {RunsTableColumn} from '../runs_table/types';
     <runs-selector-component
       [experimentIds]="experimentIds$ | async"
       [columns]="columns$ | async"
-      [showHparamsAndMetrics]="showHparamsAndMetrics"
     ></runs-selector-component>
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class RunsSelectorContainer {
-  @Input() showHparamsAndMetrics?: boolean;
-
   readonly experimentIds$ = this.store
     .select(getExperimentIdsFromRoute)
     .pipe(map((experimentIdsOrNull) => experimentIdsOrNull ?? []));
diff --git a/tensorboard/webapp/runs/views/runs_table/runs_data_table.ng.html b/tensorboard/webapp/runs/views/runs_table/runs_data_table.ng.html
@@ -42,7 +42,6 @@
         <tb-data-table-header-cell
           [header]="header"
           [sortingInfo]="sortingInfo"
-          [hparamsEnabled]="true"
           [ngClass]="['table-column-' + header.name]"
         >
           <ng-container [ngSwitch]="header.name">
diff --git a/tensorboard/webapp/runs/views/runs_table/runs_table_container.ts b/tensorboard/webapp/runs/views/runs_table/runs_table_container.ts
@@ -138,7 +138,6 @@ export class RunsTableContainer implements OnInit, OnDestroy {
   columns: RunsTableColumn[] = [RunsTableColumn.RUN_NAME];
 
   @Input() experimentIds!: string[];
-  @Input() showHparamsAndMetrics = false;
 
   regexFilter$ = this.store.select(getRunSelectorRegexFilter);
   runsColumns$ = this.store.select(getGroupedRunsTableHeaders);
diff --git a/tensorboard/webapp/widgets/data_table/header_cell_component.ts b/tensorboard/webapp/widgets/data_table/header_cell_component.ts
@@ -33,7 +33,6 @@ import {BehaviorSubject} from 'rxjs';
 export class HeaderCellComponent {
   @Input() header!: ColumnHeader;
   @Input() sortingInfo!: SortingInfo;
-  @Input() hparamsEnabled?: boolean = false;
   @Input() disableContextMenu?: boolean = false;
 
   @Output() dragStart = new EventEmitter<ColumnHeader>();
