Skip to content

Commit 5d6aaa5

Browse files
authored
Column Customization: Fix up settings button (#6306)
* Motivation for features / changes Fixes up the button in settings which opens the editor. This change makes it an actual button with an edit icon. It also adds some functionality to highlight the button when the editor is open. ![2023-04-14_12-37-31 (1)](https://user-images.githubusercontent.com/8672809/232139904-fd6337b8-ee8e-424e-93c6-1496c0408675.gif)
1 parent c56f958 commit 5d6aaa5

File tree

3 files changed

+29
-25
lines changed

3 files changed

+29
-25
lines changed

tensorboard/webapp/metrics/views/right_pane/right_pane_test.ts

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -556,30 +556,26 @@ describe('metrics right_pane', () => {
556556
);
557557
});
558558

559-
it('renders left cheron when slideout is closed', () => {
559+
it('renders without toggle-opened class when slideout is closed', () => {
560560
store.overrideSelector(selectors.isMetricsSlideoutMenuOpen, false);
561561
const fixture = TestBed.createComponent(SettingsViewContainer);
562562
fixture.detectChanges();
563563

564564
expect(
565-
fixture.debugElement
566-
.query(By.css('.column-edit-menu-toggle'))
567-
.query(By.css('mat-icon'))
568-
.nativeElement.getAttribute('svgIcon')
569-
).toBe('chevron_left_24px');
565+
fixture.debugElement.query(By.css('.column-edit-menu-toggle'))
566+
.nativeElement
567+
).not.toHaveClass('toggle-opened');
570568
});
571569

572-
it('renders right cheron when slideout is open', () => {
570+
it('renders with toggle-opened class when slideout is open', () => {
573571
store.overrideSelector(selectors.isMetricsSlideoutMenuOpen, true);
574572
const fixture = TestBed.createComponent(SettingsViewContainer);
575573
fixture.detectChanges();
576574

577575
expect(
578-
fixture.debugElement
579-
.query(By.css('.column-edit-menu-toggle'))
580-
.query(By.css('mat-icon'))
581-
.nativeElement.getAttribute('svgIcon')
582-
).toBe('chevron_right_24px');
576+
fixture.debugElement.query(By.css('.column-edit-menu-toggle'))
577+
.nativeElement
578+
).toHaveClass('toggle-opened');
583579
});
584580
});
585581
});

tensorboard/webapp/metrics/views/right_pane/settings_view_component.ng.html

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,15 @@ <h3 class="section-title">General</h3>
5858
>Link by step {{getLinkedTimeSelectionStartStep()}}
5959
</mat-checkbox>
6060
</div>
61-
<div
61+
<button
62+
mat-button
6263
*ngIf="isScalarColumnCustomizationEnabled"
63-
class="column-edit-menu-toggle"
64+
[ngClass]="{'column-edit-menu-toggle':true, 'toggle-opened': isSlideOutMenuOpen}"
6465
(click)="onSlideOutToggled.emit()"
6566
>
66-
<mat-icon
67-
*ngIf="!isSlideOutMenuOpen"
68-
svgIcon="chevron_left_24px"
69-
></mat-icon>
70-
<mat-icon
71-
*ngIf="isSlideOutMenuOpen"
72-
svgIcon="chevron_right_24px"
73-
></mat-icon>
74-
Open Column Edit Control
75-
</div>
67+
<mat-icon svgIcon="edit_24px"></mat-icon>
68+
Edit Table Columns
69+
</button>
7670
</div>
7771

7872
<div class="control-row card-width">

tensorboard/webapp/metrics/views/right_pane/settings_view_component.scss

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,23 @@ mat-slider {
101101
align-items: center;
102102
display: flex;
103103
cursor: pointer;
104+
font-size: inherit;
105+
height: 28px;
106+
padding-left: 5px;
107+
padding-right: 12px;
108+
&.mat-button-wrapper {
109+
display: inline-flex;
110+
align-items: center;
111+
}
112+
&.toggle-opened {
113+
background-color: mat.get-color-from-palette(mat.$grey-palette, 200);
114+
@include tb-dark-theme {
115+
background-color: mat.get-color-from-palette(mat.$grey-palette, 800);
116+
}
117+
}
104118
mat-icon {
105-
height: 15px;
106119
width: 15px;
120+
margin-right: 6px;
107121
}
108122
}
109123

0 commit comments

Comments
 (0)