resolve circular dependency issue

rileyajones · rileyajones · commit e3ce6e70234c · 2023-01-06T22:24:43.000Z
diff --git a/WORKSPACE b/WORKSPACE
@@ -24,11 +24,11 @@ http_archive(
 load("@bazel_skylib//lib:versions.bzl", "versions")
 
 versions.check(
+    # TODO(https://github.com/tensorflow/tensorboard/issues/6115): Support building TensorBoard with Bazel version >= 6.0.0
+    maximum_bazel_version = "5.4.0",
     # Keep this version in sync with:
     #  * The BAZEL environment variable defined in .github/workflows/ci.yml, which is used for CI and nightly builds.
     minimum_bazel_version = "4.2.2",
-    # TODO(https://github.com/tensorflow/tensorboard/issues/6115): Support building TensorBoard with Bazel version >= 6.0.0
-    maximum_bazel_version = "5.4.0",
 )
 
 http_archive(
diff --git a/tensorboard/webapp/metrics/BUILD b/tensorboard/webapp/metrics/BUILD
@@ -35,7 +35,6 @@ tf_ts_library(
     ],
     deps = [
         ":internal_types",
-        "//tensorboard/webapp/metrics/store:types",
     ],
 )
 
@@ -46,7 +45,6 @@ tf_ts_library(
     ],
     visibility = ["//tensorboard/webapp/metrics:__subpackages__"],
     deps = [
-        "//tensorboard/webapp/persistent_settings/_data_source:types",
         "//tensorboard/webapp/widgets/card_fob:types",
         "//tensorboard/webapp/widgets/histogram:types",
     ],
diff --git a/tensorboard/webapp/metrics/actions/BUILD b/tensorboard/webapp/metrics/actions/BUILD
@@ -10,7 +10,7 @@ tf_ts_library(
         "index.ts",
     ],
     deps = [
-        "//tensorboard/webapp/metrics:internal_types",
+        "//tensorboard/webapp/metrics:types",
         "//tensorboard/webapp/metrics/data_source",
         "//tensorboard/webapp/metrics/views/card_renderer:scalar_card_types",
         "//tensorboard/webapp/util:dom",
diff --git a/tensorboard/webapp/metrics/actions/index.ts b/tensorboard/webapp/metrics/actions/index.ts
@@ -29,7 +29,7 @@ import {
   PluginType,
   TooltipSort,
   XAxisType,
-} from '../internal_types';
+} from '../types';
 import {
   ColumnHeader,
   SortingInfo,
diff --git a/tensorboard/webapp/metrics/internal_types.ts b/tensorboard/webapp/metrics/internal_types.ts
@@ -15,7 +15,6 @@ limitations under the License.
 import {TimeSelection} from '../widgets/card_fob/card_fob_types';
 import {HistogramMode} from '../widgets/histogram/histogram_types';
 
-export {TooltipSort} from '../persistent_settings/_data_source/types';
 export {HistogramMode, TimeSelection};
 
 export enum PluginType {
diff --git a/tensorboard/webapp/metrics/store/BUILD b/tensorboard/webapp/metrics/store/BUILD
@@ -18,7 +18,7 @@ tf_ts_library(
         "//tensorboard/webapp/app_routing:types",
         "//tensorboard/webapp/app_routing/actions",
         "//tensorboard/webapp/core/actions",
-        "//tensorboard/webapp/metrics:internal_types",
+        "//tensorboard/webapp/metrics:types",
         "//tensorboard/webapp/metrics:utils",
         "//tensorboard/webapp/metrics/actions",
         "//tensorboard/webapp/metrics/data_source",
@@ -68,7 +68,7 @@ tf_ts_library(
     ],
     deps = [
         "//tensorboard/webapp/app_routing:namespaced_state_reducer_helper",
-        "//tensorboard/webapp/metrics:internal_types",
+        "//tensorboard/webapp/metrics:types",
         "//tensorboard/webapp/metrics/data_source",
         "//tensorboard/webapp/metrics/views/card_renderer:scalar_card_types",
         "//tensorboard/webapp/types",
@@ -92,8 +92,8 @@ tf_ts_library(
         "//tensorboard/webapp/app_routing:types",
         "//tensorboard/webapp/app_routing/actions",
         "//tensorboard/webapp/core/actions",
-        "//tensorboard/webapp/metrics:internal_types",
         "//tensorboard/webapp/metrics:test_lib",
+        "//tensorboard/webapp/metrics:types",
         "//tensorboard/webapp/metrics/actions",
         "//tensorboard/webapp/metrics/data_source",
         "//tensorboard/webapp/persistent_settings",
diff --git a/tensorboard/webapp/metrics/store/metrics_reducers.ts b/tensorboard/webapp/metrics/store/metrics_reducers.ts
@@ -44,7 +44,7 @@ import {
   SCALARS_SMOOTHING_MIN,
   TooltipSort,
   URLDeserializedState,
-} from '../internal_types';
+} from '../types';
 import {groupCardIdWithMetdata} from '../utils';
 import {ColumnHeaderType} from '../views/card_renderer/scalar_card_types';
 import {
diff --git a/tensorboard/webapp/metrics/store/metrics_reducers_test.ts b/tensorboard/webapp/metrics/store/metrics_reducers_test.ts
@@ -26,13 +26,6 @@ import {
   ScalarStepDatum,
   TagMetadata as DataSourceTagMetadata,
 } from '../data_source';
-import {
-  CardId,
-  CardMetadata,
-  HistogramMode,
-  TooltipSort,
-  XAxisType,
-} from '../internal_types';
 import {
   buildDataSourceTagMetadata,
   buildMetricsSettingsState,
@@ -46,6 +39,13 @@ import {
   createScalarStepData,
   createTimeSeriesData,
 } from '../testing';
+import {
+  CardId,
+  CardMetadata,
+  HistogramMode,
+  TooltipSort,
+  XAxisType,
+} from '../types';
 import {reducers} from './metrics_reducers';
 import {getCardId, getPinnedCardId} from './metrics_store_internal_utils';
 import {
diff --git a/tensorboard/webapp/metrics/store/metrics_selectors.ts b/tensorboard/webapp/metrics/store/metrics_selectors.ts
@@ -29,7 +29,7 @@ import {
   TimeSelection,
   TooltipSort,
   XAxisType,
-} from '../internal_types';
+} from '../types';
 import {ColumnHeader} from '../views/card_renderer/scalar_card_types';
 import * as storeUtils from './metrics_store_internal_utils';
 import {
diff --git a/tensorboard/webapp/metrics/store/metrics_selectors_test.ts b/tensorboard/webapp/metrics/store/metrics_selectors_test.ts
@@ -15,7 +15,6 @@ limitations under the License.
 import {DataLoadState} from '../../types/data';
 import {nextElementId} from '../../util/dom';
 import {PluginType} from '../data_source';
-import {HistogramMode, TooltipSort, XAxisType} from '../internal_types';
 import {
   appStateFromMetricsState,
   buildMetricsSettingsState,
@@ -26,6 +25,7 @@ import {
   createScalarStepData,
   createTimeSeriesData,
 } from '../testing';
+import {HistogramMode, TooltipSort, XAxisType} from '../types';
 import * as selectors from './metrics_selectors';
 
 describe('metrics selectors', () => {
diff --git a/tensorboard/webapp/metrics/store/metrics_types.ts b/tensorboard/webapp/metrics/store/metrics_types.ts
@@ -35,7 +35,7 @@ import {
   TimeSelection,
   TooltipSort,
   XAxisType,
-} from '../internal_types';
+} from '../types';
 import {ColumnHeader} from '../views/card_renderer/scalar_card_types';
 
 export const METRICS_FEATURE_KEY = 'metrics';
diff --git a/tensorboard/webapp/metrics/types.ts b/tensorboard/webapp/metrics/types.ts
@@ -13,3 +13,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 export * from './internal_types';
+
+// When adding a new value to the enum, please implement the deserializer on
+// data_source/metrics_data_source.ts.
+// When editing a value of the enum, please write a backward compatible
+// deserializer in tensorboard/webapp/metrics/store/metrics_reducers.ts
+export enum TooltipSort {
+  DEFAULT = 'default',
+  ALPHABETICAL = 'alphabetical',
+  ASCENDING = 'ascending',
+  DESCENDING = 'descending',
+  NEAREST = 'nearest',
+  NEAREST_Y = 'nearest_Y',
+}
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
@@ -137,7 +137,7 @@
       <tbody>
         <ng-container
           *ngFor="
-            let datum of getCursorAwareTooltipData(tooltipData, 
+            let datum of getCursorAwareTooltipData(tooltipData,
               cursorLocationInDataCoord, cursorLocation);
             trackBy: trackByTooltipDatum
           "
diff --git a/tensorboard/webapp/persistent_settings/_data_source/BUILD b/tensorboard/webapp/persistent_settings/_data_source/BUILD
@@ -10,6 +10,7 @@ tf_ng_module(
     ],
     deps = [
         ":types",
+        "//tensorboard/webapp/metrics:types",
         "@npm//@angular/core",
         "@npm//@ngrx/store",
         "@npm//rxjs",
@@ -21,6 +22,9 @@ tf_ng_module(
     srcs = [
         "types.ts",
     ],
+    deps = [
+        "//tensorboard/webapp/metrics:types",
+    ],
 )
 
 tf_ng_module(
@@ -48,6 +52,7 @@ tf_ng_module(
         ":_data_source",
         ":types",
         "//tensorboard/webapp/angular:expect_angular_core_testing",
+        "//tensorboard/webapp/metrics:types",
         "@npm//@angular/core",
         "@npm//@types/jasmine",
         "@npm//rxjs",
diff --git a/tensorboard/webapp/persistent_settings/_data_source/persistent_settings_data_source_test.ts b/tensorboard/webapp/persistent_settings/_data_source/persistent_settings_data_source_test.ts
@@ -15,18 +15,14 @@ limitations under the License.
 import {Injectable} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 import {firstValueFrom} from 'rxjs';
+import {TooltipSort} from '../../metrics/types';
 import {
   OSSSettingsConverter,
   PersistentSettingsDataSourceImpl,
   SettingsConverter,
   TEST_ONLY,
 } from './persistent_settings_data_source';
-import {
-  BackendSettings,
-  PersistableSettings,
-  ThemeValue,
-  TooltipSort,
-} from './types';
+import {BackendSettings, PersistableSettings, ThemeValue} from './types';
 
 describe('persistent_settings data_source test', () => {
   let getItemSpy: jasmine.Spy;
diff --git a/tensorboard/webapp/persistent_settings/_data_source/types.ts b/tensorboard/webapp/persistent_settings/_data_source/types.ts
@@ -13,25 +13,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+import {TooltipSort} from '../../metrics/types';
+
 export enum ThemeValue {
   BROWSER_DEFAULT = 'browser_default',
   LIGHT = 'light',
   DARK = 'dark',
 }
 
-// When adding a new value to the enum, please implement the deserializer on
-// data_source/metrics_data_source.ts.
-// When editing a value of the enum, please write a backward compatible
-// deserializer in tensorboard/webapp/metrics/store/metrics_reducers.ts
-export enum TooltipSort {
-  DEFAULT = 'default',
-  ALPHABETICAL = 'alphabetical',
-  ASCENDING = 'ascending',
-  DESCENDING = 'descending',
-  NEAREST = 'nearest',
-  NEAREST_Y = 'nearest_Y',
-}
-
 /**
  * Global settings that the backend remembers. `declare`d so properties do not
  * get mangled or mangled differently when a version compiler changes.
