rebase + depend on legacy mat slider

tensorflow · Sep 21, 2023 · 0b7f39b · 0b7f39b
1 parent 2f038f4
commit 0b7f39b
Show file tree

Hide file tree

Showing 19 changed files with 117 additions and 131 deletions.
diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/BUILD b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/BUILD
@@ -20,8 +20,8 @@ tf_ng_module(
         "//tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store",
         "//tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store:types",
         "//tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_button",
         "//tensorboard/webapp/angular:expect_angular_legacy_material_slider",
+        "//tensorboard/webapp/angular:expect_angular_material_button",
         "@npm//@angular/common",
         "@npm//@angular/core",
         "@npm//@ngrx/store",

diff --git a/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_module.ts b/tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_module.ts
@@ -15,7 +15,7 @@ limitations under the License.
 
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
-import {MatLegacyButtonModule} from '@angular/material/legacy-button';
+import {MatButtonModule} from '@angular/material/button';
 import {MatLegacySliderModule} from '@angular/material/legacy-slider';
 import {ExecutionDataModule} from '../execution_data/execution_data_module';
 import {TimelineComponent} from './timeline_component';
@@ -26,7 +26,7 @@ import {TimelineContainer} from './timeline_container';
   imports: [
     CommonModule,
     ExecutionDataModule,
-    MatLegacyButtonModule,
+    MatButtonModule,
     MatLegacySliderModule,
   ],
   // TODO(cais): The following two providers are meant to make the mat-slider

diff --git a/tensorboard/webapp/alert/views/BUILD b/tensorboard/webapp/alert/views/BUILD
@@ -26,8 +26,8 @@ tf_ng_module(
         "//tensorboard/webapp/alert:types",
         "//tensorboard/webapp/alert/store",
         "//tensorboard/webapp/alert/store:types",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_button",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_snackbar",
+        "//tensorboard/webapp/angular:expect_angular_material_button",
+        "//tensorboard/webapp/angular:expect_angular_material_snackbar",
         "//tensorboard/webapp/util:string",
         "@npm//@angular/common",
         "@npm//@angular/core",
@@ -49,8 +49,8 @@ tf_ts_library(
         "//tensorboard/webapp/alert/store:testing",
         "//tensorboard/webapp/angular:expect_angular_cdk_overlay",
         "//tensorboard/webapp/angular:expect_angular_core_testing",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_button",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_snackbar",
+        "//tensorboard/webapp/angular:expect_angular_material_button",
+        "//tensorboard/webapp/angular:expect_angular_material_snackbar",
         "//tensorboard/webapp/angular:expect_angular_platform_browser_animations",
         "//tensorboard/webapp/angular:expect_ngrx_store_testing",
         "@npm//@angular/core",

diff --git a/tensorboard/webapp/angular/BUILD b/tensorboard/webapp/angular/BUILD
@@ -71,7 +71,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/autocomplete dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_autocomplete",
+    name = "expect_angular_material_autocomplete",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -87,15 +87,6 @@ tf_ts_library(
     ],
 )
 
-# This is a dummy rule used as a @angular/material/legacy_checkbox dependency.
-tf_ts_library(
-    name = "expect_angular_legacy_material_checkbox",
-    srcs = [],
-    deps = [
-        "@npm//@angular/material",
-    ],
-)
-
 # This is a dummy rule used as a @angular/material/checkbox/testing dependency.
 tf_ts_library(
     name = "expect_angular_material_checkbox_testing",
@@ -107,7 +98,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/button dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_button",
+    name = "expect_angular_material_button",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -125,7 +116,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/chips dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_chips",
+    name = "expect_angular_material_chips",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -134,7 +125,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/dialog dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_dialog",
+    name = "expect_angular_material_dialog",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -143,7 +134,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/dialog/testing dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_dialog_testing",
+    name = "expect_angular_material_dialog_testing",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -152,7 +143,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/expansion dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_expansion",
+    name = "expect_angular_material_expansion",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -161,7 +152,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/expansion dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_form_field",
+    name = "expect_angular_material_form_field",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -188,7 +179,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/input dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_input",
+    name = "expect_angular_material_input",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -197,7 +188,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/menu dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_menu",
+    name = "expect_angular_material_menu",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -206,7 +197,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/menu/testing dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_menu_testing",
+    name = "expect_angular_material_menu_testing",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -215,7 +206,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/paginator dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_paginator",
+    name = "expect_angular_material_paginator",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -224,7 +215,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/progress_spinner dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_progress_spinner",
+    name = "expect_angular_material_progress_spinner",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -233,7 +224,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/select dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_select",
+    name = "expect_angular_material_select",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -242,7 +233,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/select/testing dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_select_testing",
+    name = "expect_angular_material_select_testing",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -251,7 +242,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/slide_toggle dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_slide_toggle",
+    name = "expect_angular_material_slide_toggle",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -269,7 +260,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/snackbar dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_snackbar",
+    name = "expect_angular_material_snackbar",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -287,7 +278,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/table dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_table",
+    name = "expect_angular_material_table",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -296,7 +287,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/tabs dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_tabs",
+    name = "expect_angular_material_tabs",
     srcs = [],
     deps = [
         "@npm//@angular/material",
@@ -314,7 +305,7 @@ tf_ts_library(
 
 # This is a dummy rule used as a @angular/material/tooltip dependency.
 tf_ts_library(
-    name = "expect_angular_legacy_material_tooltip",
+    name = "expect_angular_material_tooltip",
     srcs = [],
     deps = [
         "@npm//@angular/material",

diff --git a/tensorboard/webapp/core/views/BUILD b/tensorboard/webapp/core/views/BUILD
@@ -17,7 +17,7 @@ tf_ng_module(
     ],
     assets = [":layout_styles"],
     deps = [
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_button",
+        "//tensorboard/webapp/angular:expect_angular_material_button",
         "//tensorboard/webapp/angular:expect_angular_material_icon",
         "//tensorboard/webapp/core:state",
         "//tensorboard/webapp/core:types",

diff --git a/tensorboard/webapp/feature_flag/views/BUILD b/tensorboard/webapp/feature_flag/views/BUILD
@@ -24,7 +24,7 @@ tf_ng_module(
         ":feature_flag_dialog",
         "//tensorboard/webapp:app_state",
         "//tensorboard/webapp/angular:expect_angular_cdk_overlay",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_dialog",
+        "//tensorboard/webapp/angular:expect_angular_material_dialog",
         "//tensorboard/webapp/feature_flag/actions",
         "//tensorboard/webapp/feature_flag/store",
         "@npm//@angular/common",
@@ -48,8 +48,8 @@ tf_ng_module(
     ],
     deps = [
         "//tensorboard/webapp:app_state",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_button",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_select",
+        "//tensorboard/webapp/angular:expect_angular_material_button",
+        "//tensorboard/webapp/angular:expect_angular_material_select",
         "//tensorboard/webapp/feature_flag:types",
         "//tensorboard/webapp/feature_flag/actions",
         "//tensorboard/webapp/feature_flag/store",
@@ -76,8 +76,8 @@ tf_ng_module(
         "//tensorboard/webapp/angular:expect_angular_cdk_testing",
         "//tensorboard/webapp/angular:expect_angular_cdk_testing_testbed",
         "//tensorboard/webapp/angular:expect_angular_core_testing",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_dialog",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_dialog_testing",
+        "//tensorboard/webapp/angular:expect_angular_material_dialog",
+        "//tensorboard/webapp/angular:expect_angular_material_dialog_testing",
         "//tensorboard/webapp/angular:expect_angular_platform_browser_animations",
         "//tensorboard/webapp/angular:expect_ngrx_store_testing",
         "//tensorboard/webapp/feature_flag:types",

diff --git a/tensorboard/webapp/header/BUILD b/tensorboard/webapp/header/BUILD
@@ -37,11 +37,11 @@ tf_ng_module(
     ],
     deps = [
         "//tensorboard/webapp:selectors",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_button",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_menu",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_select",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_tabs",
+        "//tensorboard/webapp/angular:expect_angular_material_button",
         "//tensorboard/webapp/angular:expect_angular_material_icon",
+        "//tensorboard/webapp/angular:expect_angular_material_menu",
+        "//tensorboard/webapp/angular:expect_angular_material_select",
+        "//tensorboard/webapp/angular:expect_angular_material_tabs",
         "//tensorboard/webapp/angular:expect_angular_material_toolbar",
         "//tensorboard/webapp/core",
         "//tensorboard/webapp/core/actions",
@@ -70,10 +70,10 @@ tf_ts_library(
         "//tensorboard/webapp:selectors",
         "//tensorboard/webapp/angular:expect_angular_cdk_overlay",
         "//tensorboard/webapp/angular:expect_angular_core_testing",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_button",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_menu",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_select",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_tabs",
+        "//tensorboard/webapp/angular:expect_angular_material_button",
+        "//tensorboard/webapp/angular:expect_angular_material_menu",
+        "//tensorboard/webapp/angular:expect_angular_material_select",
+        "//tensorboard/webapp/angular:expect_angular_material_tabs",
         "//tensorboard/webapp/angular:expect_angular_material_toolbar",
         "//tensorboard/webapp/angular:expect_angular_platform_browser_animations",
         "//tensorboard/webapp/angular:expect_ngrx_store_testing",

diff --git a/tensorboard/webapp/metrics/views/card_renderer/BUILD b/tensorboard/webapp/metrics/views/card_renderer/BUILD
@@ -61,10 +61,10 @@ tf_ng_module(
     deps = [
         "//tensorboard/webapp:app_state",
         "//tensorboard/webapp:selectors",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_button",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_dialog",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_input",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_select",
+        "//tensorboard/webapp/angular:expect_angular_material_button",
+        "//tensorboard/webapp/angular:expect_angular_material_dialog",
+        "//tensorboard/webapp/angular:expect_angular_material_input",
+        "//tensorboard/webapp/angular:expect_angular_material_select",
         "//tensorboard/webapp/feature_flag/directives",
         "//tensorboard/webapp/metrics:types",
         "//tensorboard/webapp/metrics/data_source",
@@ -106,9 +106,9 @@ tf_ng_module(
         ":vis_linked_time_selection_warning",
         "//tensorboard/webapp:app_state",
         "//tensorboard/webapp:selectors",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_button",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_progress_spinner",
+        "//tensorboard/webapp/angular:expect_angular_material_button",
         "//tensorboard/webapp/angular:expect_angular_material_icon",
+        "//tensorboard/webapp/angular:expect_angular_material_progress_spinner",
         "//tensorboard/webapp/metrics:types",
         "//tensorboard/webapp/metrics/actions",
         "//tensorboard/webapp/metrics/data_source",
@@ -155,10 +155,10 @@ tf_ng_module(
         ":utils",
         ":vis_linked_time_selection_warning",
         "//tensorboard/webapp:app_state",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_button",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_progress_spinner",
         "//tensorboard/webapp/angular:expect_angular_legacy_material_slider",
+        "//tensorboard/webapp/angular:expect_angular_material_button",
         "//tensorboard/webapp/angular:expect_angular_material_icon",
+        "//tensorboard/webapp/angular:expect_angular_material_progress_spinner",
         "//tensorboard/webapp/feature_flag/directives",
         "//tensorboard/webapp/metrics:types",
         "//tensorboard/webapp/metrics/actions",
@@ -332,11 +332,11 @@ tf_ng_module(
         "//tensorboard/webapp:app_state",
         "//tensorboard/webapp:selectors",
         "//tensorboard/webapp/angular:expect_angular_cdk_overlay",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_button",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_dialog",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_menu",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_progress_spinner",
+        "//tensorboard/webapp/angular:expect_angular_material_button",
+        "//tensorboard/webapp/angular:expect_angular_material_dialog",
         "//tensorboard/webapp/angular:expect_angular_material_icon",
+        "//tensorboard/webapp/angular:expect_angular_material_menu",
+        "//tensorboard/webapp/angular:expect_angular_material_progress_spinner",
         "//tensorboard/webapp/experiments:types",
         "//tensorboard/webapp/feature_flag/store",
         "//tensorboard/webapp/metrics:types",
@@ -449,13 +449,13 @@ tf_ts_library(
         "//tensorboard/webapp:selectors",
         "//tensorboard/webapp/angular:expect_angular_cdk_overlay",
         "//tensorboard/webapp/angular:expect_angular_core_testing",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_button",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_dialog",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_input",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_menu",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_progress_spinner",
-        "//tensorboard/webapp/angular:expect_angular_legacy_material_select",
         "//tensorboard/webapp/angular:expect_angular_legacy_material_slider",
+        "//tensorboard/webapp/angular:expect_angular_material_button",
+        "//tensorboard/webapp/angular:expect_angular_material_dialog",
+        "//tensorboard/webapp/angular:expect_angular_material_input",
+        "//tensorboard/webapp/angular:expect_angular_material_menu",
+        "//tensorboard/webapp/angular:expect_angular_material_progress_spinner",
+        "//tensorboard/webapp/angular:expect_angular_material_select",
         "//tensorboard/webapp/angular:expect_angular_platform_browser_animations",
         "//tensorboard/webapp/angular:expect_ngrx_store_testing",
         "//tensorboard/webapp/experiments:types",