Skip to content

Commit b316347

Browse files
JamesHollyerJamesHollyer
committed
rebase + depend on legacy mat slider
1 parent 2f038f4 commit b316347

File tree

19 files changed

+116
-131
lines changed

19 files changed

+116
-131
lines changed

‎tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ tf_ng_module(
2020
"//tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store",
2121
"//tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/store:types",
2222
"//tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/execution_data",
23-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
2423
"//tensorboard/webapp/angular:expect_angular_legacy_material_slider",
24+
"//tensorboard/webapp/angular:expect_angular_material_button",
2525
"@npm//@angular/common",
2626
"@npm//@angular/core",
2727
"@npm//@ngrx/store",

‎tensorboard/plugins/debugger_v2/tf_debugger_v2_plugin/views/timeline/timeline_module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ limitations under the License.
1515

1616
import {CommonModule} from '@angular/common';
1717
import {NgModule} from '@angular/core';
18-
import {MatLegacyButtonModule} from '@angular/material/legacy-button';
18+
import {MatButtonModule} from '@angular/material/button';
1919
import {MatLegacySliderModule} from '@angular/material/legacy-slider';
2020
import {ExecutionDataModule} from '../execution_data/execution_data_module';
2121
import {TimelineComponent} from './timeline_component';
@@ -26,7 +26,7 @@ import {TimelineContainer} from './timeline_container';
2626
imports: [
2727
CommonModule,
2828
ExecutionDataModule,
29-
MatLegacyButtonModule,
29+
MatButtonModule,
3030
MatLegacySliderModule,
3131
],
3232
// TODO(cais): The following two providers are meant to make the mat-slider

‎tensorboard/webapp/alert/views/BUILD

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ tf_ng_module(
2626
"//tensorboard/webapp/alert:types",
2727
"//tensorboard/webapp/alert/store",
2828
"//tensorboard/webapp/alert/store:types",
29-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
30-
"//tensorboard/webapp/angular:expect_angular_legacy_material_snackbar",
29+
"//tensorboard/webapp/angular:expect_angular_material_button",
30+
"//tensorboard/webapp/angular:expect_angular_material_snackbar",
3131
"//tensorboard/webapp/util:string",
3232
"@npm//@angular/common",
3333
"@npm//@angular/core",
@@ -49,8 +49,8 @@ tf_ts_library(
4949
"//tensorboard/webapp/alert/store:testing",
5050
"//tensorboard/webapp/angular:expect_angular_cdk_overlay",
5151
"//tensorboard/webapp/angular:expect_angular_core_testing",
52-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
53-
"//tensorboard/webapp/angular:expect_angular_legacy_material_snackbar",
52+
"//tensorboard/webapp/angular:expect_angular_material_button",
53+
"//tensorboard/webapp/angular:expect_angular_material_snackbar",
5454
"//tensorboard/webapp/angular:expect_angular_platform_browser_animations",
5555
"//tensorboard/webapp/angular:expect_ngrx_store_testing",
5656
"@npm//@angular/core",

‎tensorboard/webapp/angular/BUILD

+19-28
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ tf_ts_library(
7171

7272
# This is a dummy rule used as a @angular/material/autocomplete dependency.
7373
tf_ts_library(
74-
name = "expect_angular_legacy_material_autocomplete",
74+
name = "expect_angular_material_autocomplete",
7575
srcs = [],
7676
deps = [
7777
"@npm//@angular/material",
@@ -87,15 +87,6 @@ tf_ts_library(
8787
],
8888
)
8989

90-
# This is a dummy rule used as a @angular/material/legacy_checkbox dependency.
91-
tf_ts_library(
92-
name = "expect_angular_legacy_material_checkbox",
93-
srcs = [],
94-
deps = [
95-
"@npm//@angular/material",
96-
],
97-
)
98-
9990
# This is a dummy rule used as a @angular/material/checkbox/testing dependency.
10091
tf_ts_library(
10192
name = "expect_angular_material_checkbox_testing",
@@ -107,7 +98,7 @@ tf_ts_library(
10798

10899
# This is a dummy rule used as a @angular/material/button dependency.
109100
tf_ts_library(
110-
name = "expect_angular_legacy_material_button",
101+
name = "expect_angular_material_button",
111102
srcs = [],
112103
deps = [
113104
"@npm//@angular/material",
@@ -125,7 +116,7 @@ tf_ts_library(
125116

126117
# This is a dummy rule used as a @angular/material/chips dependency.
127118
tf_ts_library(
128-
name = "expect_angular_legacy_material_chips",
119+
name = "expect_angular_material_chips",
129120
srcs = [],
130121
deps = [
131122
"@npm//@angular/material",
@@ -134,7 +125,7 @@ tf_ts_library(
134125

135126
# This is a dummy rule used as a @angular/material/dialog dependency.
136127
tf_ts_library(
137-
name = "expect_angular_legacy_material_dialog",
128+
name = "expect_angular_material_dialog",
138129
srcs = [],
139130
deps = [
140131
"@npm//@angular/material",
@@ -143,7 +134,7 @@ tf_ts_library(
143134

144135
# This is a dummy rule used as a @angular/material/dialog/testing dependency.
145136
tf_ts_library(
146-
name = "expect_angular_legacy_material_dialog_testing",
137+
name = "expect_angular_material_dialog_testing",
147138
srcs = [],
148139
deps = [
149140
"@npm//@angular/material",
@@ -152,7 +143,7 @@ tf_ts_library(
152143

153144
# This is a dummy rule used as a @angular/material/expansion dependency.
154145
tf_ts_library(
155-
name = "expect_angular_legacy_material_expansion",
146+
name = "expect_angular_material_expansion",
156147
srcs = [],
157148
deps = [
158149
"@npm//@angular/material",
@@ -161,7 +152,7 @@ tf_ts_library(
161152

162153
# This is a dummy rule used as a @angular/material/expansion dependency.
163154
tf_ts_library(
164-
name = "expect_angular_legacy_material_form_field",
155+
name = "expect_angular_material_form_field",
165156
srcs = [],
166157
deps = [
167158
"@npm//@angular/material",
@@ -188,7 +179,7 @@ tf_ts_library(
188179

189180
# This is a dummy rule used as a @angular/material/input dependency.
190181
tf_ts_library(
191-
name = "expect_angular_legacy_material_input",
182+
name = "expect_angular_material_input",
192183
srcs = [],
193184
deps = [
194185
"@npm//@angular/material",
@@ -197,7 +188,7 @@ tf_ts_library(
197188

198189
# This is a dummy rule used as a @angular/material/menu dependency.
199190
tf_ts_library(
200-
name = "expect_angular_legacy_material_menu",
191+
name = "expect_angular_material_menu",
201192
srcs = [],
202193
deps = [
203194
"@npm//@angular/material",
@@ -206,7 +197,7 @@ tf_ts_library(
206197

207198
# This is a dummy rule used as a @angular/material/menu/testing dependency.
208199
tf_ts_library(
209-
name = "expect_angular_legacy_material_menu_testing",
200+
name = "expect_angular_material_menu_testing",
210201
srcs = [],
211202
deps = [
212203
"@npm//@angular/material",
@@ -215,7 +206,7 @@ tf_ts_library(
215206

216207
# This is a dummy rule used as a @angular/material/paginator dependency.
217208
tf_ts_library(
218-
name = "expect_angular_legacy_material_paginator",
209+
name = "expect_angular_material_paginator",
219210
srcs = [],
220211
deps = [
221212
"@npm//@angular/material",
@@ -224,7 +215,7 @@ tf_ts_library(
224215

225216
# This is a dummy rule used as a @angular/material/progress_spinner dependency.
226217
tf_ts_library(
227-
name = "expect_angular_legacy_material_progress_spinner",
218+
name = "expect_angular_material_progress_spinner",
228219
srcs = [],
229220
deps = [
230221
"@npm//@angular/material",
@@ -233,7 +224,7 @@ tf_ts_library(
233224

234225
# This is a dummy rule used as a @angular/material/select dependency.
235226
tf_ts_library(
236-
name = "expect_angular_legacy_material_select",
227+
name = "expect_angular_material_select",
237228
srcs = [],
238229
deps = [
239230
"@npm//@angular/material",
@@ -242,7 +233,7 @@ tf_ts_library(
242233

243234
# This is a dummy rule used as a @angular/material/select/testing dependency.
244235
tf_ts_library(
245-
name = "expect_angular_legacy_material_select_testing",
236+
name = "expect_angular_material_select_testing",
246237
srcs = [],
247238
deps = [
248239
"@npm//@angular/material",
@@ -251,7 +242,7 @@ tf_ts_library(
251242

252243
# This is a dummy rule used as a @angular/material/slide_toggle dependency.
253244
tf_ts_library(
254-
name = "expect_angular_legacy_material_slide_toggle",
245+
name = "expect_angular_material_slide_toggle",
255246
srcs = [],
256247
deps = [
257248
"@npm//@angular/material",
@@ -269,7 +260,7 @@ tf_ts_library(
269260

270261
# This is a dummy rule used as a @angular/material/snackbar dependency.
271262
tf_ts_library(
272-
name = "expect_angular_legacy_material_snackbar",
263+
name = "expect_angular_material_snackbar",
273264
srcs = [],
274265
deps = [
275266
"@npm//@angular/material",
@@ -287,7 +278,7 @@ tf_ts_library(
287278

288279
# This is a dummy rule used as a @angular/material/table dependency.
289280
tf_ts_library(
290-
name = "expect_angular_legacy_material_table",
281+
name = "expect_angular_material_table",
291282
srcs = [],
292283
deps = [
293284
"@npm//@angular/material",
@@ -296,7 +287,7 @@ tf_ts_library(
296287

297288
# This is a dummy rule used as a @angular/material/tabs dependency.
298289
tf_ts_library(
299-
name = "expect_angular_legacy_material_tabs",
290+
name = "expect_angular_material_tabs",
300291
srcs = [],
301292
deps = [
302293
"@npm//@angular/material",
@@ -314,7 +305,7 @@ tf_ts_library(
314305

315306
# This is a dummy rule used as a @angular/material/tooltip dependency.
316307
tf_ts_library(
317-
name = "expect_angular_legacy_material_tooltip",
308+
name = "expect_angular_material_tooltip",
318309
srcs = [],
319310
deps = [
320311
"@npm//@angular/material",

‎tensorboard/webapp/core/views/BUILD

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ tf_ng_module(
1717
],
1818
assets = [":layout_styles"],
1919
deps = [
20-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
20+
"//tensorboard/webapp/angular:expect_angular_material_button",
2121
"//tensorboard/webapp/angular:expect_angular_material_icon",
2222
"//tensorboard/webapp/core:state",
2323
"//tensorboard/webapp/core:types",

‎tensorboard/webapp/feature_flag/views/BUILD

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ tf_ng_module(
2424
":feature_flag_dialog",
2525
"//tensorboard/webapp:app_state",
2626
"//tensorboard/webapp/angular:expect_angular_cdk_overlay",
27-
"//tensorboard/webapp/angular:expect_angular_legacy_material_dialog",
27+
"//tensorboard/webapp/angular:expect_angular_material_dialog",
2828
"//tensorboard/webapp/feature_flag/actions",
2929
"//tensorboard/webapp/feature_flag/store",
3030
"@npm//@angular/common",
@@ -48,8 +48,8 @@ tf_ng_module(
4848
],
4949
deps = [
5050
"//tensorboard/webapp:app_state",
51-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
52-
"//tensorboard/webapp/angular:expect_angular_legacy_material_select",
51+
"//tensorboard/webapp/angular:expect_angular_material_button",
52+
"//tensorboard/webapp/angular:expect_angular_material_select",
5353
"//tensorboard/webapp/feature_flag:types",
5454
"//tensorboard/webapp/feature_flag/actions",
5555
"//tensorboard/webapp/feature_flag/store",
@@ -76,8 +76,8 @@ tf_ng_module(
7676
"//tensorboard/webapp/angular:expect_angular_cdk_testing",
7777
"//tensorboard/webapp/angular:expect_angular_cdk_testing_testbed",
7878
"//tensorboard/webapp/angular:expect_angular_core_testing",
79-
"//tensorboard/webapp/angular:expect_angular_legacy_material_dialog",
80-
"//tensorboard/webapp/angular:expect_angular_legacy_material_dialog_testing",
79+
"//tensorboard/webapp/angular:expect_angular_material_dialog",
80+
"//tensorboard/webapp/angular:expect_angular_material_dialog_testing",
8181
"//tensorboard/webapp/angular:expect_angular_platform_browser_animations",
8282
"//tensorboard/webapp/angular:expect_ngrx_store_testing",
8383
"//tensorboard/webapp/feature_flag:types",

‎tensorboard/webapp/header/BUILD

+8-8
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ tf_ng_module(
3737
],
3838
deps = [
3939
"//tensorboard/webapp:selectors",
40-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
41-
"//tensorboard/webapp/angular:expect_angular_legacy_material_menu",
42-
"//tensorboard/webapp/angular:expect_angular_legacy_material_select",
43-
"//tensorboard/webapp/angular:expect_angular_legacy_material_tabs",
40+
"//tensorboard/webapp/angular:expect_angular_material_button",
4441
"//tensorboard/webapp/angular:expect_angular_material_icon",
42+
"//tensorboard/webapp/angular:expect_angular_material_menu",
43+
"//tensorboard/webapp/angular:expect_angular_material_select",
44+
"//tensorboard/webapp/angular:expect_angular_material_tabs",
4545
"//tensorboard/webapp/angular:expect_angular_material_toolbar",
4646
"//tensorboard/webapp/core",
4747
"//tensorboard/webapp/core/actions",
@@ -70,10 +70,10 @@ tf_ts_library(
7070
"//tensorboard/webapp:selectors",
7171
"//tensorboard/webapp/angular:expect_angular_cdk_overlay",
7272
"//tensorboard/webapp/angular:expect_angular_core_testing",
73-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
74-
"//tensorboard/webapp/angular:expect_angular_legacy_material_menu",
75-
"//tensorboard/webapp/angular:expect_angular_legacy_material_select",
76-
"//tensorboard/webapp/angular:expect_angular_legacy_material_tabs",
73+
"//tensorboard/webapp/angular:expect_angular_material_button",
74+
"//tensorboard/webapp/angular:expect_angular_material_menu",
75+
"//tensorboard/webapp/angular:expect_angular_material_select",
76+
"//tensorboard/webapp/angular:expect_angular_material_tabs",
7777
"//tensorboard/webapp/angular:expect_angular_material_toolbar",
7878
"//tensorboard/webapp/angular:expect_angular_platform_browser_animations",
7979
"//tensorboard/webapp/angular:expect_ngrx_store_testing",

‎tensorboard/webapp/metrics/views/card_renderer/BUILD

+18-18
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@ tf_ng_module(
6161
deps = [
6262
"//tensorboard/webapp:app_state",
6363
"//tensorboard/webapp:selectors",
64-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
65-
"//tensorboard/webapp/angular:expect_angular_legacy_material_dialog",
66-
"//tensorboard/webapp/angular:expect_angular_legacy_material_input",
67-
"//tensorboard/webapp/angular:expect_angular_legacy_material_select",
64+
"//tensorboard/webapp/angular:expect_angular_material_button",
65+
"//tensorboard/webapp/angular:expect_angular_material_dialog",
66+
"//tensorboard/webapp/angular:expect_angular_material_input",
67+
"//tensorboard/webapp/angular:expect_angular_material_select",
6868
"//tensorboard/webapp/feature_flag/directives",
6969
"//tensorboard/webapp/metrics:types",
7070
"//tensorboard/webapp/metrics/data_source",
@@ -106,9 +106,9 @@ tf_ng_module(
106106
":vis_linked_time_selection_warning",
107107
"//tensorboard/webapp:app_state",
108108
"//tensorboard/webapp:selectors",
109-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
110-
"//tensorboard/webapp/angular:expect_angular_legacy_material_progress_spinner",
109+
"//tensorboard/webapp/angular:expect_angular_material_button",
111110
"//tensorboard/webapp/angular:expect_angular_material_icon",
111+
"//tensorboard/webapp/angular:expect_angular_material_progress_spinner",
112112
"//tensorboard/webapp/metrics:types",
113113
"//tensorboard/webapp/metrics/actions",
114114
"//tensorboard/webapp/metrics/data_source",
@@ -155,10 +155,10 @@ tf_ng_module(
155155
":utils",
156156
":vis_linked_time_selection_warning",
157157
"//tensorboard/webapp:app_state",
158-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
159-
"//tensorboard/webapp/angular:expect_angular_legacy_material_progress_spinner",
160158
"//tensorboard/webapp/angular:expect_angular_legacy_material_slider",
159+
"//tensorboard/webapp/angular:expect_angular_material_button",
161160
"//tensorboard/webapp/angular:expect_angular_material_icon",
161+
"//tensorboard/webapp/angular:expect_angular_material_progress_spinner",
162162
"//tensorboard/webapp/feature_flag/directives",
163163
"//tensorboard/webapp/metrics:types",
164164
"//tensorboard/webapp/metrics/actions",
@@ -332,11 +332,11 @@ tf_ng_module(
332332
"//tensorboard/webapp:app_state",
333333
"//tensorboard/webapp:selectors",
334334
"//tensorboard/webapp/angular:expect_angular_cdk_overlay",
335-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
336-
"//tensorboard/webapp/angular:expect_angular_legacy_material_dialog",
337-
"//tensorboard/webapp/angular:expect_angular_legacy_material_menu",
338-
"//tensorboard/webapp/angular:expect_angular_legacy_material_progress_spinner",
335+
"//tensorboard/webapp/angular:expect_angular_material_button",
336+
"//tensorboard/webapp/angular:expect_angular_material_dialog",
339337
"//tensorboard/webapp/angular:expect_angular_material_icon",
338+
"//tensorboard/webapp/angular:expect_angular_material_menu",
339+
"//tensorboard/webapp/angular:expect_angular_material_progress_spinner",
340340
"//tensorboard/webapp/experiments:types",
341341
"//tensorboard/webapp/feature_flag/store",
342342
"//tensorboard/webapp/metrics:types",
@@ -449,13 +449,13 @@ tf_ts_library(
449449
"//tensorboard/webapp:selectors",
450450
"//tensorboard/webapp/angular:expect_angular_cdk_overlay",
451451
"//tensorboard/webapp/angular:expect_angular_core_testing",
452-
"//tensorboard/webapp/angular:expect_angular_legacy_material_button",
453-
"//tensorboard/webapp/angular:expect_angular_legacy_material_dialog",
454-
"//tensorboard/webapp/angular:expect_angular_legacy_material_input",
455-
"//tensorboard/webapp/angular:expect_angular_legacy_material_menu",
456-
"//tensorboard/webapp/angular:expect_angular_legacy_material_progress_spinner",
457-
"//tensorboard/webapp/angular:expect_angular_legacy_material_select",
458452
"//tensorboard/webapp/angular:expect_angular_legacy_material_slider",
453+
"//tensorboard/webapp/angular:expect_angular_material_button",
454+
"//tensorboard/webapp/angular:expect_angular_material_dialog",
455+
"//tensorboard/webapp/angular:expect_angular_material_input",
456+
"//tensorboard/webapp/angular:expect_angular_material_menu",
457+
"//tensorboard/webapp/angular:expect_angular_material_progress_spinner",
458+
"//tensorboard/webapp/angular:expect_angular_material_select",
459459
"//tensorboard/webapp/angular:expect_angular_platform_browser_animations",
460460
"//tensorboard/webapp/angular:expect_ngrx_store_testing",
461461
"//tensorboard/webapp/experiments:types",

0 commit comments

Comments
 (0)