From b3163475cb187df8359a26556e01cf3c098a06c4 Mon Sep 17 00:00:00 2001 From: jameshollyer Date: Wed, 20 Sep 2023 20:36:01 +0000 Subject: [PATCH] rebase + depend on legacy mat slider --- .../views/timeline/BUILD | 2 +- .../views/timeline/timeline_module.ts | 4 +- tensorboard/webapp/alert/views/BUILD | 8 ++-- tensorboard/webapp/angular/BUILD | 47 ++++++++----------- tensorboard/webapp/core/views/BUILD | 2 +- tensorboard/webapp/feature_flag/views/BUILD | 10 ++-- tensorboard/webapp/header/BUILD | 16 +++---- .../webapp/metrics/views/card_renderer/BUILD | 36 +++++++------- .../webapp/metrics/views/main_view/BUILD | 12 ++--- .../webapp/metrics/views/right_pane/BUILD | 10 ++-- .../right_pane/scalar_column_editor/BUILD | 6 +-- .../webapp/notification_center/_views/BUILD | 10 ++-- .../webapp/runs/views/runs_table/BUILD | 32 ++++++------- tensorboard/webapp/settings/_views/BUILD | 16 +++---- .../webapp/theme/_tb_theme.template.scss | 6 --- tensorboard/webapp/widgets/data_table/BUILD | 6 +-- tensorboard/webapp/widgets/dropdown/BUILD | 6 +-- tensorboard/webapp/widgets/filter_input/BUILD | 4 +- .../widgets/line_chart_v2/sub_view/BUILD | 14 +++--- 19 files changed, 116 insertions(+), 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 index 9123b0529ae..c998b03958b 100644 --- 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 index e69fa2625b5..097d7b018dd 100644 --- 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 index b8ec01fa2f3..78e359b7917 100644 --- 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 index a769eb7382b..5c710b161a7 100644 --- 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 index 5230e45c8a7..511c16191bb 100644 --- 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 index ea089c2fb18..d2c9a10f86a 100644 --- 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 index 535a4b0fa89..5502ba956bf 100644 --- 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 index 5d6cad6ff65..7076578ebcd 100644 --- 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", diff --git a/tensorboard/webapp/metrics/views/main_view/BUILD b/tensorboard/webapp/metrics/views/main_view/BUILD index aadfccfca45..a0a2f17691a 100644 --- a/tensorboard/webapp/metrics/views/main_view/BUILD +++ b/tensorboard/webapp/metrics/views/main_view/BUILD @@ -137,12 +137,12 @@ tf_ng_module( "//tensorboard/webapp:app_state", "//tensorboard/webapp:selectors", "//tensorboard/webapp/angular:expect_angular_cdk_scrolling", - "//tensorboard/webapp/angular:expect_angular_legacy_material_autocomplete", - "//tensorboard/webapp/angular:expect_angular_legacy_material_button", - "//tensorboard/webapp/angular:expect_angular_legacy_material_input", - "//tensorboard/webapp/angular:expect_angular_legacy_material_progress_spinner", + "//tensorboard/webapp/angular:expect_angular_material_autocomplete", + "//tensorboard/webapp/angular:expect_angular_material_button", "//tensorboard/webapp/angular:expect_angular_material_button_toggle", "//tensorboard/webapp/angular:expect_angular_material_icon", + "//tensorboard/webapp/angular:expect_angular_material_input", + "//tensorboard/webapp/angular:expect_angular_material_progress_spinner", "//tensorboard/webapp/customization", "//tensorboard/webapp/metrics:types", "//tensorboard/webapp/metrics:utils", @@ -185,8 +185,8 @@ tf_ts_library( "//tensorboard/webapp/angular:expect_angular_cdk_overlay", "//tensorboard/webapp/angular:expect_angular_cdk_scrolling", "//tensorboard/webapp/angular:expect_angular_core_testing", - "//tensorboard/webapp/angular:expect_angular_legacy_material_autocomplete", - "//tensorboard/webapp/angular:expect_angular_legacy_material_button", + "//tensorboard/webapp/angular:expect_angular_material_autocomplete", + "//tensorboard/webapp/angular:expect_angular_material_button", "//tensorboard/webapp/angular:expect_angular_platform_browser_animations", "//tensorboard/webapp/angular:expect_ngrx_store_testing", "//tensorboard/webapp/app_routing", diff --git a/tensorboard/webapp/metrics/views/right_pane/BUILD b/tensorboard/webapp/metrics/views/right_pane/BUILD index 68a3eb589cf..2153af26025 100644 --- a/tensorboard/webapp/metrics/views/right_pane/BUILD +++ b/tensorboard/webapp/metrics/views/right_pane/BUILD @@ -27,12 +27,12 @@ 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_checkbox", - "//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_button_toggle", + "//tensorboard/webapp/angular:expect_angular_material_checkbox", "//tensorboard/webapp/angular:expect_angular_material_icon", + "//tensorboard/webapp/angular:expect_angular_material_select", "//tensorboard/webapp/feature_flag", "//tensorboard/webapp/metrics:types", "//tensorboard/webapp/metrics/actions", @@ -58,10 +58,10 @@ tf_ts_library( "//tensorboard/webapp:app_state", "//tensorboard/webapp:selectors", "//tensorboard/webapp/angular:expect_angular_core_testing", - "//tensorboard/webapp/angular:expect_angular_legacy_material_checkbox", - "//tensorboard/webapp/angular:expect_angular_legacy_material_select", "//tensorboard/webapp/angular:expect_angular_legacy_material_slider", "//tensorboard/webapp/angular:expect_angular_material_button_toggle", + "//tensorboard/webapp/angular:expect_angular_material_checkbox", + "//tensorboard/webapp/angular:expect_angular_material_select", "//tensorboard/webapp/angular:expect_angular_platform_browser_animations", "//tensorboard/webapp/angular:expect_ngrx_store_testing", "//tensorboard/webapp/metrics:types", diff --git a/tensorboard/webapp/metrics/views/right_pane/scalar_column_editor/BUILD b/tensorboard/webapp/metrics/views/right_pane/scalar_column_editor/BUILD index eaf9997903e..e24c73fd1b4 100644 --- a/tensorboard/webapp/metrics/views/right_pane/scalar_column_editor/BUILD +++ b/tensorboard/webapp/metrics/views/right_pane/scalar_column_editor/BUILD @@ -26,8 +26,8 @@ tf_ng_module( deps = [ "//tensorboard/webapp:app_state", "//tensorboard/webapp:selectors", - "//tensorboard/webapp/angular:expect_angular_legacy_material_checkbox", - "//tensorboard/webapp/angular:expect_angular_legacy_material_tabs", + "//tensorboard/webapp/angular:expect_angular_material_checkbox", + "//tensorboard/webapp/angular:expect_angular_material_tabs", "//tensorboard/webapp/metrics:types", "//tensorboard/webapp/metrics/actions", "//tensorboard/webapp/metrics/store", @@ -50,7 +50,7 @@ tf_ts_library( ":scalar_column_editor", "//tensorboard/webapp:app_state", "//tensorboard/webapp/angular:expect_angular_core_testing", - "//tensorboard/webapp/angular:expect_angular_legacy_material_tabs", + "//tensorboard/webapp/angular:expect_angular_material_tabs", "//tensorboard/webapp/angular:expect_angular_platform_browser_animations", "//tensorboard/webapp/angular:expect_ngrx_store_testing", "//tensorboard/webapp/metrics/actions", diff --git a/tensorboard/webapp/notification_center/_views/BUILD b/tensorboard/webapp/notification_center/_views/BUILD index 4954a5de09d..2ca9ee2ffe9 100644 --- a/tensorboard/webapp/notification_center/_views/BUILD +++ b/tensorboard/webapp/notification_center/_views/BUILD @@ -29,9 +29,9 @@ 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_menu", + "//tensorboard/webapp/angular:expect_angular_material_button", "//tensorboard/webapp/angular:expect_angular_material_icon", + "//tensorboard/webapp/angular:expect_angular_material_menu", "//tensorboard/webapp/notification_center/_redux", "//tensorboard/webapp/notification_center/_redux:actions", "//tensorboard/webapp/notification_center/_redux:types", @@ -54,9 +54,9 @@ tf_ts_library( ":_views", "//tensorboard/webapp:app_state", "//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_snackbar", + "//tensorboard/webapp/angular:expect_angular_material_button", + "//tensorboard/webapp/angular:expect_angular_material_menu", + "//tensorboard/webapp/angular:expect_angular_material_snackbar", "//tensorboard/webapp/angular:expect_angular_platform_browser_animations", "//tensorboard/webapp/angular:expect_ngrx_store_testing", "//tensorboard/webapp/notification_center/_redux", diff --git a/tensorboard/webapp/runs/views/runs_table/BUILD b/tensorboard/webapp/runs/views/runs_table/BUILD index 475344b18b0..4d936d8af1d 100644 --- a/tensorboard/webapp/runs/views/runs_table/BUILD +++ b/tensorboard/webapp/runs/views/runs_table/BUILD @@ -81,17 +81,17 @@ tf_ng_module( "//tensorboard/webapp:selectors", "//tensorboard/webapp/alert", "//tensorboard/webapp/alert/actions", - "//tensorboard/webapp/angular:expect_angular_legacy_material_button", - "//tensorboard/webapp/angular:expect_angular_legacy_material_checkbox", - "//tensorboard/webapp/angular:expect_angular_legacy_material_dialog", - "//tensorboard/webapp/angular:expect_angular_legacy_material_form_field", - "//tensorboard/webapp/angular:expect_angular_legacy_material_input", - "//tensorboard/webapp/angular:expect_angular_legacy_material_menu", - "//tensorboard/webapp/angular:expect_angular_legacy_material_paginator", - "//tensorboard/webapp/angular:expect_angular_legacy_material_progress_spinner", - "//tensorboard/webapp/angular:expect_angular_legacy_material_table", + "//tensorboard/webapp/angular:expect_angular_material_button", + "//tensorboard/webapp/angular:expect_angular_material_checkbox", + "//tensorboard/webapp/angular:expect_angular_material_dialog", + "//tensorboard/webapp/angular:expect_angular_material_form_field", "//tensorboard/webapp/angular:expect_angular_material_icon", + "//tensorboard/webapp/angular:expect_angular_material_input", + "//tensorboard/webapp/angular:expect_angular_material_menu", + "//tensorboard/webapp/angular:expect_angular_material_paginator", + "//tensorboard/webapp/angular:expect_angular_material_progress_spinner", "//tensorboard/webapp/angular:expect_angular_material_sort", + "//tensorboard/webapp/angular:expect_angular_material_table", "//tensorboard/webapp/app_routing", "//tensorboard/webapp/app_routing:types", "//tensorboard/webapp/core/actions", @@ -140,14 +140,14 @@ tf_ts_library( "//tensorboard/webapp/alert/actions", "//tensorboard/webapp/angular:expect_angular_cdk_overlay", "//tensorboard/webapp/angular:expect_angular_core_testing", - "//tensorboard/webapp/angular:expect_angular_legacy_material_checkbox", - "//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_paginator", - "//tensorboard/webapp/angular:expect_angular_legacy_material_progress_spinner", - "//tensorboard/webapp/angular:expect_angular_legacy_material_table", + "//tensorboard/webapp/angular:expect_angular_material_checkbox", + "//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_paginator", + "//tensorboard/webapp/angular:expect_angular_material_progress_spinner", "//tensorboard/webapp/angular:expect_angular_material_sort", + "//tensorboard/webapp/angular:expect_angular_material_table", "//tensorboard/webapp/angular:expect_angular_platform_browser_animations", "//tensorboard/webapp/angular:expect_angular_platform_browser_dynamic_testing", "//tensorboard/webapp/angular:expect_ngrx_store_testing", diff --git a/tensorboard/webapp/settings/_views/BUILD b/tensorboard/webapp/settings/_views/BUILD index 7c23e752d5e..3e6f5f53243 100644 --- a/tensorboard/webapp/settings/_views/BUILD +++ b/tensorboard/webapp/settings/_views/BUILD @@ -18,11 +18,11 @@ tf_ng_module( ], deps = [ "//tensorboard/webapp:tb_polymer_interop_types", - "//tensorboard/webapp/angular:expect_angular_legacy_material_button", - "//tensorboard/webapp/angular:expect_angular_legacy_material_checkbox", - "//tensorboard/webapp/angular:expect_angular_legacy_material_dialog", - "//tensorboard/webapp/angular:expect_angular_legacy_material_input", + "//tensorboard/webapp/angular:expect_angular_material_button", + "//tensorboard/webapp/angular:expect_angular_material_checkbox", + "//tensorboard/webapp/angular:expect_angular_material_dialog", "//tensorboard/webapp/angular:expect_angular_material_icon", + "//tensorboard/webapp/angular:expect_angular_material_input", "//tensorboard/webapp/settings/_redux", "//tensorboard/webapp/types", "@npm//@angular/common", @@ -44,11 +44,11 @@ tf_ts_library( ":_views", "//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_checkbox", - "//tensorboard/webapp/angular:expect_angular_legacy_material_dialog", - "//tensorboard/webapp/angular:expect_angular_legacy_material_input", + "//tensorboard/webapp/angular:expect_angular_material_button", + "//tensorboard/webapp/angular:expect_angular_material_checkbox", + "//tensorboard/webapp/angular:expect_angular_material_dialog", "//tensorboard/webapp/angular:expect_angular_material_icon", + "//tensorboard/webapp/angular:expect_angular_material_input", "//tensorboard/webapp/angular:expect_angular_platform_browser_animations", "//tensorboard/webapp/angular:expect_angular_platform_browser_dynamic_testing", "//tensorboard/webapp/angular:expect_ngrx_store_testing", diff --git a/tensorboard/webapp/theme/_tb_theme.template.scss b/tensorboard/webapp/theme/_tb_theme.template.scss index 3e4a15dc5a4..60a85d5da06 100644 --- a/tensorboard/webapp/theme/_tb_theme.template.scss +++ b/tensorboard/webapp/theme/_tb_theme.template.scss @@ -265,10 +265,7 @@ $tb-dark-theme: map_merge( // TODO(JamesHollyer): remove legacy component themes once all components // are migrated. @include mat.core(); -<<<<<<< HEAD @include mat.all-legacy-component-typographies(); -======= ->>>>>>> 7169a2fc3 (Angular Component Migration) @include mat.all-component-typographies(); // Include all theme-styles for the components based on the current theme. @include mat.all-component-themes($tb-theme); @@ -307,11 +304,8 @@ $tb-dark-theme: map_merge( } } -<<<<<<< HEAD // TODO(JamesHollyer): remove legacy component themes once all components // are migrated. -======= ->>>>>>> 7169a2fc3 (Angular Component Migration) @include mat.all-component-themes($tb-dark-theme); @include mat.all-legacy-component-themes($tb-dark-theme); } diff --git a/tensorboard/webapp/widgets/data_table/BUILD b/tensorboard/webapp/widgets/data_table/BUILD index 035ace3794e..773be63f419 100644 --- a/tensorboard/webapp/widgets/data_table/BUILD +++ b/tensorboard/webapp/widgets/data_table/BUILD @@ -83,7 +83,7 @@ tf_ng_module( ":data_table_header", ":filter_dialog", ":types", - "//tensorboard/webapp/angular:expect_angular_legacy_material_button", + "//tensorboard/webapp/angular:expect_angular_material_button", "//tensorboard/webapp/angular:expect_angular_material_icon", "//tensorboard/webapp/metrics/views/card_renderer:scalar_card_types", "//tensorboard/webapp/widgets/custom_modal", @@ -125,9 +125,9 @@ tf_ng_module( ], deps = [ ":types", - "//tensorboard/webapp/angular:expect_angular_legacy_material_button", - "//tensorboard/webapp/angular:expect_angular_legacy_material_input", + "//tensorboard/webapp/angular:expect_angular_material_button", "//tensorboard/webapp/angular:expect_angular_material_icon", + "//tensorboard/webapp/angular:expect_angular_material_input", "@npm//@angular/common", "@npm//@angular/core", "@npm//@angular/forms", diff --git a/tensorboard/webapp/widgets/dropdown/BUILD b/tensorboard/webapp/widgets/dropdown/BUILD index 444abca4b25..2e915ea4834 100644 --- a/tensorboard/webapp/widgets/dropdown/BUILD +++ b/tensorboard/webapp/widgets/dropdown/BUILD @@ -24,7 +24,7 @@ tf_ng_module( ":dropdown_styles", ], deps = [ - "//tensorboard/webapp/angular:expect_angular_legacy_material_select", + "//tensorboard/webapp/angular:expect_angular_material_select", "@npm//@angular/common", "@npm//@angular/core", ], @@ -38,8 +38,8 @@ tf_ts_library( ":dropdown", "//tensorboard/webapp/angular:expect_angular_cdk_testing_testbed", "//tensorboard/webapp/angular:expect_angular_core_testing", - "//tensorboard/webapp/angular:expect_angular_legacy_material_select", - "//tensorboard/webapp/angular:expect_angular_legacy_material_select_testing", + "//tensorboard/webapp/angular:expect_angular_material_select", + "//tensorboard/webapp/angular:expect_angular_material_select_testing", "//tensorboard/webapp/angular:expect_angular_platform_browser_animations", "@npm//@angular/core", "@npm//@angular/platform-browser", diff --git a/tensorboard/webapp/widgets/filter_input/BUILD b/tensorboard/webapp/widgets/filter_input/BUILD index b4b41bd3f36..ec87ba1909f 100644 --- a/tensorboard/webapp/widgets/filter_input/BUILD +++ b/tensorboard/webapp/widgets/filter_input/BUILD @@ -21,7 +21,7 @@ tf_ng_module( ":filter_input_component_styles", ], deps = [ - "//tensorboard/webapp/angular:expect_angular_legacy_material_autocomplete", + "//tensorboard/webapp/angular:expect_angular_material_autocomplete", "//tensorboard/webapp/angular:expect_angular_material_icon", "@npm//@angular/common", "@npm//@angular/core", @@ -38,7 +38,7 @@ tf_ts_library( ":filter_input", "//tensorboard/webapp/angular:expect_angular_cdk_overlay", "//tensorboard/webapp/angular:expect_angular_core_testing", - "//tensorboard/webapp/angular:expect_angular_legacy_material_autocomplete", + "//tensorboard/webapp/angular:expect_angular_material_autocomplete", "//tensorboard/webapp/angular:expect_angular_platform_browser_animations", "//tensorboard/webapp/testing:dom", "//tensorboard/webapp/testing:mat_icon", diff --git a/tensorboard/webapp/widgets/line_chart_v2/sub_view/BUILD b/tensorboard/webapp/widgets/line_chart_v2/sub_view/BUILD index 69375080763..130ef7f42d7 100644 --- a/tensorboard/webapp/widgets/line_chart_v2/sub_view/BUILD +++ b/tensorboard/webapp/widgets/line_chart_v2/sub_view/BUILD @@ -39,10 +39,10 @@ tf_ng_module( deps = [ ":internal_types", "//tensorboard/webapp/angular:expect_angular_cdk_overlay", - "//tensorboard/webapp/angular:expect_angular_legacy_material_button", - "//tensorboard/webapp/angular:expect_angular_legacy_material_input", - "//tensorboard/webapp/angular:expect_angular_legacy_material_menu", + "//tensorboard/webapp/angular:expect_angular_material_button", "//tensorboard/webapp/angular:expect_angular_material_icon", + "//tensorboard/webapp/angular:expect_angular_material_input", + "//tensorboard/webapp/angular:expect_angular_material_menu", "//tensorboard/webapp/third_party:d3", "//tensorboard/webapp/util:dom", "//tensorboard/webapp/widgets/line_chart_v2/lib:public_types", @@ -76,10 +76,10 @@ tf_ts_library( "//tensorboard/webapp/angular:expect_angular_cdk_overlay", "//tensorboard/webapp/angular:expect_angular_cdk_testing_testbed", "//tensorboard/webapp/angular:expect_angular_core_testing", - "//tensorboard/webapp/angular:expect_angular_legacy_material_button", - "//tensorboard/webapp/angular:expect_angular_legacy_material_input", - "//tensorboard/webapp/angular:expect_angular_legacy_material_menu", - "//tensorboard/webapp/angular:expect_angular_legacy_material_menu_testing", + "//tensorboard/webapp/angular:expect_angular_material_button", + "//tensorboard/webapp/angular:expect_angular_material_input", + "//tensorboard/webapp/angular:expect_angular_material_menu", + "//tensorboard/webapp/angular:expect_angular_material_menu_testing", "//tensorboard/webapp/angular:expect_angular_platform_browser_animations", "//tensorboard/webapp/testing:mat_icon", "//tensorboard/webapp/widgets/line_chart_v2/lib:public_types",