Skip to content

HParam UI: display the displayName #6359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JamesHollyer merged 1 commit into from
May 3, 2023
Merged

HParam UI: display the displayName #6359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tensorboard/webapp/widgets/data_table/data_table_header_component.ng.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
<div *ngSwitchDefault class="extra-right-padding"></div>

<span [ngClass]="getSpecialTypeClasses(header.type)"
>{{ getHeaderTextColumn(header.type) }}</span
>{{ header.displayName }}</span
>
</div>
43 changes: 0 additions & 43 deletions tensorboard/webapp/widgets/data_table/data_table_header_component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,49 +29,6 @@ export class DataTableHeaderComponent {
@Input() header!: ColumnHeader;
ColumnHeaderType = ColumnHeaderType;

getHeaderTextColumn(columnHeader: ColumnHeaderType): string {
switch (columnHeader) {
case ColumnHeaderType.RUN:
return 'Run';
case ColumnHeaderType.VALUE:
return 'Value';
case ColumnHeaderType.STEP:
return 'Step';
case ColumnHeaderType.TIME:
return 'Time';
case ColumnHeaderType.RELATIVE_TIME:
return 'Relative';
case ColumnHeaderType.SMOOTHED:
return 'Smoothed';
case ColumnHeaderType.VALUE_CHANGE:
return 'Value';
case ColumnHeaderType.START_STEP:
return 'Start Step';
case ColumnHeaderType.END_STEP:
return 'End Step';
case ColumnHeaderType.START_VALUE:
return 'Start Value';
case ColumnHeaderType.END_VALUE:
return 'End Value';
case ColumnHeaderType.MIN_VALUE:
return 'Min';
case ColumnHeaderType.MAX_VALUE:
return 'Max';
case ColumnHeaderType.PERCENTAGE_CHANGE:
return '%';
case ColumnHeaderType.STEP_AT_MAX:
return 'Step at Max';
case ColumnHeaderType.STEP_AT_MIN:
return 'Step at Min';
case ColumnHeaderType.MEAN:
return 'Mean';
case ColumnHeaderType.RAW_CHANGE:
return 'Real Value';
default:
return '';
}
}

getSpecialTypeClasses(columnHeader: ColumnHeaderType) {
switch (columnHeader) {
case ColumnHeaderType.STEP_AT_MIN:
Expand Down
66 changes: 5 additions & 61 deletions tensorboard/webapp/widgets/data_table/data_table_test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,60 +113,12 @@ describe('data table', () => {
displayName: 'Run',
enabled: true,
},
{
type: ColumnHeaderType.STEP,
name: 'step',
displayName: 'Step',
enabled: true,
},
{
type: ColumnHeaderType.RELATIVE_TIME,
name: 'relativeTime',
displayName: 'Relative',
enabled: true,
},
Comment on lines -116 to -127
Copy link
Contributor

@rileyajones rileyajones May 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason you are removing these from the mocks?

Copy link
Contributor Author

@JamesHollyer JamesHollyer May 3, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to test that all of these display the correct text as all it does now is display the displayText. We do not need to test that it displays the displayText that many times.

{
type: ColumnHeaderType.VALUE_CHANGE,
name: 'valueChanged',
displayName: 'Value',
enabled: true,
},
{
type: ColumnHeaderType.START_STEP,
name: 'startStep',
displayName: 'Start Step',
enabled: true,
},
{
type: ColumnHeaderType.END_STEP,
name: 'endStep',
displayName: 'End Step',
enabled: true,
},
{
type: ColumnHeaderType.START_VALUE,
name: 'startValue',
displayName: 'Start Value',
enabled: true,
},
{
type: ColumnHeaderType.END_VALUE,
name: 'endValue',
displayName: 'End Value',
enabled: true,
},
{
type: ColumnHeaderType.MIN_VALUE,
name: 'minValue',
displayName: 'Min',
enabled: true,
},
{
type: ColumnHeaderType.MAX_VALUE,
name: 'maxValue',
displayName: 'Max',
enabled: true,
},
{
type: ColumnHeaderType.PERCENTAGE_CHANGE,
name: 'percentageChanged',
Expand All @@ -188,27 +140,19 @@ describe('data table', () => {
expect(headerElements[0].nativeElement.innerText).toBe('');
expect(headerElements[1].nativeElement.innerText).toBe('Value');
expect(headerElements[2].nativeElement.innerText).toBe('Run');
expect(headerElements[3].nativeElement.innerText).toBe('Step');
expect(headerElements[4].nativeElement.innerText).toBe('Relative');
expect(headerElements[5].nativeElement.innerText).toBe('Value');
expect(headerElements[3].nativeElement.innerText).toBe('Value');
expect(
headerElements[5]
headerElements[3]
.queryAll(By.css('mat-icon'))[0]
.nativeElement.getAttribute('svgIcon')
).toBe('change_history_24px');
expect(headerElements[6].nativeElement.innerText).toBe('Start Step');
expect(headerElements[7].nativeElement.innerText).toBe('End Step');
expect(headerElements[8].nativeElement.innerText).toBe('Start Value');
expect(headerElements[9].nativeElement.innerText).toBe('End Value');
expect(headerElements[10].nativeElement.innerText).toBe('Min');
expect(headerElements[11].nativeElement.innerText).toBe('Max');
expect(headerElements[12].nativeElement.innerText).toBe('%');
expect(headerElements[4].nativeElement.innerText).toBe('%');
expect(
headerElements[12]
headerElements[4]
.queryAll(By.css('mat-icon'))[0]
.nativeElement.getAttribute('svgIcon')
).toBe('change_history_24px');
expect(headerElements[13].nativeElement.innerText).toBe('Smoothed');
expect(headerElements[5].nativeElement.innerText).toBe('Smoothed');
});

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