Revert HParams: Stop fetching hparams data using run effects (#6561) (#6571)

## Motivation for features / changes
#6561 created issues when syncing internally. When we discovered the
problem we tried to patch forward twice
 * #6566 
 * #6568

There was a couple of issues.
 * Improper support for tuples internally.
* Internally `forkJoin` and `zip` work differently, it's not document
how though.
* The unapproved screenshot changes in
[cl/563231334](http://cl/563231334)

Googlers see [cl/563516101](http://cl/563516101) for confidence this
ACTUALLY fixes the sync.

Author: rileyajones

tensorboard/webapp/app_routing/types.ts

@@ -38,21 +38,6 @@ export enum RouteKind {
   NOT_SET,
 }
 
-export type DashboardRoute =
-  | RouteKind.EXPERIMENT
-  | RouteKind.COMPARE_EXPERIMENT
-  | RouteKind.CARD;
-
-export function isDashboardRoute(
-  routeKind: RouteKind
-): routeKind is DashboardRoute {
-  return (
-    routeKind === RouteKind.EXPERIMENT ||
-    routeKind === RouteKind.COMPARE_EXPERIMENT ||
-    routeKind === RouteKind.CARD
-  );
-}
-
 export const DEFAULT_EXPERIMENT_ID = 'defaultExperimentId';
 
 /**

tensorboard/webapp/runs/effects/runs_effects.ts

@@ -15,27 +15,24 @@ limitations under the License.
 import {Injectable} from '@angular/core';
 import {Actions, createEffect, ofType} from '@ngrx/effects';
 import {Store} from '@ngrx/store';
-import {combineLatest, forkJoin, merge, Observable, of, throwError} from 'rxjs';
+import {forkJoin, merge, Observable, of, throwError} from 'rxjs';
 import {
   catchError,
   distinctUntilChanged,
   filter,
   map,
   mergeMap,
-  switchMap,
   take,
   tap,
   withLatestFrom,
 } from 'rxjs/operators';
 import {areSameRouteKindAndExperiments} from '../../app_routing';
 import {navigated} from '../../app_routing/actions';
-import {RouteKind, isDashboardRoute} from '../../app_routing/types';
+import {RouteKind} from '../../app_routing/types';
 import {State} from '../../app_state';
 import * as coreActions from '../../core/actions';
 import {
   getActiveRoute,
-  getRouteKind,
-  getEnableHparamsInTimeSeries,
   getExperimentIdsFromRoute,
   getRuns,
   getRunsLoadState,
@@ -209,7 +206,7 @@ export class RunsEffects {
           }
           return this.maybeWaitForRunsAndGetRuns(experimentId);
         });
-        return combineLatest(fetchOrGetRuns);
+        return forkJoin(fetchOrGetRuns);
       }),
       map((runsAndMedataList) => {
         const newRunsAndMetadata = {} as ExperimentIdToRunsAndMetadata;
@@ -267,35 +264,15 @@ export class RunsEffects {
     );
   }
 
-  private maybeFetchHparamsMetadata(
-    experimentId: string
-  ): Observable<HparamsAndMetadata> {
-    return combineLatest([
-      this.store.select(getEnableHparamsInTimeSeries),
-      this.store.select(getRouteKind),
-    ]).pipe(
-      switchMap(([hparamsInTimeSeries, routeKind]) => {
-        if (hparamsInTimeSeries && isDashboardRoute(routeKind)) {
-          return of({
-            hparamSpecs: [],
-            metricSpecs: [],
-            runToHparamsAndMetrics: {},
-          });
-        }
-        return this.runsDataSource.fetchHparamsMetadata(experimentId);
-      })
-    );
-  }
-
   private fetchRunsForExperiment(experimentId: string): Observable<{
     fromRemote: true;
     experimentId: string;
     runs: Run[];
     metadata: HparamsAndMetadata;
   }> {
-    return combineLatest([
+    return forkJoin([
       this.runsDataSource.fetchRuns(experimentId),
-      this.maybeFetchHparamsMetadata(experimentId),
+      this.runsDataSource.fetchHparamsMetadata(experimentId),
     ]).pipe(
       map(([runs, metadata]) => {
         return {

tensorboard/webapp/runs/effects/runs_effects_test.ts

@@ -28,9 +28,7 @@ import {State} from '../../app_state';
 import * as coreActions from '../../core/actions';
 import {
   getActiveRoute,
-  getEnableHparamsInTimeSeries,
   getExperimentIdsFromRoute,
-  getRouteKind,
   getRuns,
   getRunsLoadState,
 } from '../../selectors';
@@ -64,7 +62,6 @@ describe('runs_effects', () => {
   let dispatchSpy: jasmine.Spy;
   let actualActions: Action[];
   let selectSpy: jasmine.Spy;
-  let fetchHparamsSpy: jasmine.Spy;
 
   function flushFetchRuns(requestIndex: number, runs: Run[]) {
     expect(fetchRunsSubjects.length).toBeGreaterThan(requestIndex);
@@ -116,8 +113,7 @@ describe('runs_effects', () => {
     });
 
     fetchHparamsMetadataSubjects = [];
-    fetchHparamsSpy = spyOn(runsDataSource, 'fetchHparamsMetadata');
-    fetchHparamsSpy.and.callFake(() => {
+    spyOn(runsDataSource, 'fetchHparamsMetadata').and.callFake(() => {
       const subject = new ReplaySubject<HparamsAndMetadata>(1);
       fetchHparamsMetadataSubjects.push(subject);
       return subject;
@@ -235,15 +231,6 @@ describe('runs_effects', () => {
       });
     });
 
-    it('does not fetch hparam data when enableHparamsInTimeSeries is true when on a dashboard route', () => {
-      store.overrideSelector(getEnableHparamsInTimeSeries, true);
-      store.overrideSelector(getRouteKind, RouteKind.EXPERIMENT);
-      store.refreshState();
-
-      action.next(actions.runTableShown({experimentIds: ['a']}));
-      expect(fetchHparamsSpy).not.toHaveBeenCalled();
-    });
-
     it('fires FAILED action when failed to fetch runs', () => {
       action.next(actions.runTableShown({experimentIds: ['a']}));
       const expectedExperimentId = 'a';