Skip to content

Commit 1e9832c

Browse files
JamesHollyerrileyajones
authored andcommitted
HParam UI: display the displayName (tensorflow#6359)
## Motivation for features / changes In tensorflow#6346 we added a displayName attribute to the ColumnHeader. This PR uses that name to be displayed in the headers. ## Technical description of changes I removed lots of headers from a test since now we do not need to test that each type has the proper text displayed.
1 parent b861c2e commit 1e9832c

File tree

3 files changed

+6
-105
lines changed

3 files changed

+6
-105
lines changed

tensorboard/webapp/widgets/data_table/data_table_header_component.ng.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
<div *ngSwitchDefault class="extra-right-padding"></div>
2929

3030
<span [ngClass]="getSpecialTypeClasses(header.type)"
31-
>{{ getHeaderTextColumn(header.type) }}</span
31+
>{{ header.displayName }}</span
3232
>
3333
</div>

tensorboard/webapp/widgets/data_table/data_table_header_component.ts

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -29,49 +29,6 @@ export class DataTableHeaderComponent {
2929
@Input() header!: ColumnHeader;
3030
ColumnHeaderType = ColumnHeaderType;
3131

32-
getHeaderTextColumn(columnHeader: ColumnHeaderType): string {
33-
switch (columnHeader) {
34-
case ColumnHeaderType.RUN:
35-
return 'Run';
36-
case ColumnHeaderType.VALUE:
37-
return 'Value';
38-
case ColumnHeaderType.STEP:
39-
return 'Step';
40-
case ColumnHeaderType.TIME:
41-
return 'Time';
42-
case ColumnHeaderType.RELATIVE_TIME:
43-
return 'Relative';
44-
case ColumnHeaderType.SMOOTHED:
45-
return 'Smoothed';
46-
case ColumnHeaderType.VALUE_CHANGE:
47-
return 'Value';
48-
case ColumnHeaderType.START_STEP:
49-
return 'Start Step';
50-
case ColumnHeaderType.END_STEP:
51-
return 'End Step';
52-
case ColumnHeaderType.START_VALUE:
53-
return 'Start Value';
54-
case ColumnHeaderType.END_VALUE:
55-
return 'End Value';
56-
case ColumnHeaderType.MIN_VALUE:
57-
return 'Min';
58-
case ColumnHeaderType.MAX_VALUE:
59-
return 'Max';
60-
case ColumnHeaderType.PERCENTAGE_CHANGE:
61-
return '%';
62-
case ColumnHeaderType.STEP_AT_MAX:
63-
return 'Step at Max';
64-
case ColumnHeaderType.STEP_AT_MIN:
65-
return 'Step at Min';
66-
case ColumnHeaderType.MEAN:
67-
return 'Mean';
68-
case ColumnHeaderType.RAW_CHANGE:
69-
return 'Real Value';
70-
default:
71-
return '';
72-
}
73-
}
74-
7532
getSpecialTypeClasses(columnHeader: ColumnHeaderType) {
7633
switch (columnHeader) {
7734
case ColumnHeaderType.STEP_AT_MIN:

tensorboard/webapp/widgets/data_table/data_table_test.ts

Lines changed: 5 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -113,60 +113,12 @@ describe('data table', () => {
113113
displayName: 'Run',
114114
enabled: true,
115115
},
116-
{
117-
type: ColumnHeaderType.STEP,
118-
name: 'step',
119-
displayName: 'Step',
120-
enabled: true,
121-
},
122-
{
123-
type: ColumnHeaderType.RELATIVE_TIME,
124-
name: 'relativeTime',
125-
displayName: 'Relative',
126-
enabled: true,
127-
},
128116
{
129117
type: ColumnHeaderType.VALUE_CHANGE,
130118
name: 'valueChanged',
131119
displayName: 'Value',
132120
enabled: true,
133121
},
134-
{
135-
type: ColumnHeaderType.START_STEP,
136-
name: 'startStep',
137-
displayName: 'Start Step',
138-
enabled: true,
139-
},
140-
{
141-
type: ColumnHeaderType.END_STEP,
142-
name: 'endStep',
143-
displayName: 'End Step',
144-
enabled: true,
145-
},
146-
{
147-
type: ColumnHeaderType.START_VALUE,
148-
name: 'startValue',
149-
displayName: 'Start Value',
150-
enabled: true,
151-
},
152-
{
153-
type: ColumnHeaderType.END_VALUE,
154-
name: 'endValue',
155-
displayName: 'End Value',
156-
enabled: true,
157-
},
158-
{
159-
type: ColumnHeaderType.MIN_VALUE,
160-
name: 'minValue',
161-
displayName: 'Min',
162-
enabled: true,
163-
},
164-
{
165-
type: ColumnHeaderType.MAX_VALUE,
166-
name: 'maxValue',
167-
displayName: 'Max',
168-
enabled: true,
169-
},
170122
{
171123
type: ColumnHeaderType.PERCENTAGE_CHANGE,
172124
name: 'percentageChanged',
@@ -188,27 +140,19 @@ describe('data table', () => {
188140
expect(headerElements[0].nativeElement.innerText).toBe('');
189141
expect(headerElements[1].nativeElement.innerText).toBe('Value');
190142
expect(headerElements[2].nativeElement.innerText).toBe('Run');
191-
expect(headerElements[3].nativeElement.innerText).toBe('Step');
192-
expect(headerElements[4].nativeElement.innerText).toBe('Relative');
193-
expect(headerElements[5].nativeElement.innerText).toBe('Value');
143+
expect(headerElements[3].nativeElement.innerText).toBe('Value');
194144
expect(
195-
headerElements[5]
145+
headerElements[3]
196146
.queryAll(By.css('mat-icon'))[0]
197147
.nativeElement.getAttribute('svgIcon')
198148
).toBe('change_history_24px');
199-
expect(headerElements[6].nativeElement.innerText).toBe('Start Step');
200-
expect(headerElements[7].nativeElement.innerText).toBe('End Step');
201-
expect(headerElements[8].nativeElement.innerText).toBe('Start Value');
202-
expect(headerElements[9].nativeElement.innerText).toBe('End Value');
203-
expect(headerElements[10].nativeElement.innerText).toBe('Min');
204-
expect(headerElements[11].nativeElement.innerText).toBe('Max');
205-
expect(headerElements[12].nativeElement.innerText).toBe('%');
149+
expect(headerElements[4].nativeElement.innerText).toBe('%');
206150
expect(
207-
headerElements[12]
151+
headerElements[4]
208152
.queryAll(By.css('mat-icon'))[0]
209153
.nativeElement.getAttribute('svgIcon')
210154
).toBe('change_history_24px');
211-
expect(headerElements[13].nativeElement.innerText).toBe('Smoothed');
155+
expect(headerElements[5].nativeElement.innerText).toBe('Smoothed');
212156
});
213157

214158
it('displays data in order', () => {

0 commit comments

Comments
 (0)