Skip to content

Commit a0bf9ba

Browse files
Fix data table styling and fob dismiss button
- Move data table and expand button inside .superimposed-card div so they inherit the card's background color, border, and padding - Wire up onStepSelectorToggled in the container to clear the local time selection, so the (x) button on the fob actually dismisses it and hides the data table Co-authored-by: Samuel <samuel@knutsen.co>
1 parent c9e688b commit a0bf9ba

2 files changed

Lines changed: 46 additions & 41 deletions

File tree

tensorbored/webapp/metrics/views/card_renderer/superimposed_card_component.ng.html

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -194,48 +194,48 @@
194194
</table>
195195
</ng-template>
196196
</div>
197-
</div>
198-
<ng-container *ngIf="showDataTable()">
199-
<div
200-
#dataTableContainer
201-
[ngClass]="{
202-
'data-table-container': true,
203-
'expanded': tableExpanded
204-
}"
205-
>
206-
<scalar-card-data-table
207-
[chartMetadataMap]="chartMetadataMap"
208-
[dataSeries]="dataSeries"
209-
[stepOrLinkedTimeSelection]="stepOrLinkedTimeSelection"
210-
[columnHeaders]="columnHeaders"
211-
[sortingInfo]="sortingInfo"
212-
[columnCustomizationEnabled]="false"
213-
[columnContextMenusEnabled]="false"
214-
[smoothingEnabled]="smoothingEnabled"
215-
[columnFilters]="emptyColumnFilters"
216-
[runToHparamMap]="emptyRunToHparamMap"
217-
[selectableColumns]="emptySelectableColumns"
218-
[numColumnsLoaded]="0"
219-
[numColumnsToLoad]="0"
220-
(sortDataBy)="sortDataBy($event)"
221-
>
222-
</scalar-card-data-table>
223-
</div>
224-
<div class="bottom-area">
225-
<button
226-
*ngIf="canExpandTable()"
227-
mat-icon-button
228-
class="expand-button"
229-
aria-label="Expand Table"
230-
[title]="shouldExpandTable() ? 'Expand Table' : 'Collapse Table'"
231-
(click)="toggleTableExpanded()"
197+
<ng-container *ngIf="showDataTable()">
198+
<div
199+
#dataTableContainer
200+
[ngClass]="{
201+
'data-table-container': true,
202+
'expanded': tableExpanded
203+
}"
232204
>
233-
<mat-icon
234-
[svgIcon]="shouldExpandTable() ? 'expand_more_24px' : 'expand_less_24px'"
235-
></mat-icon>
236-
</button>
237-
</div>
238-
</ng-container>
205+
<scalar-card-data-table
206+
[chartMetadataMap]="chartMetadataMap"
207+
[dataSeries]="dataSeries"
208+
[stepOrLinkedTimeSelection]="stepOrLinkedTimeSelection"
209+
[columnHeaders]="columnHeaders"
210+
[sortingInfo]="sortingInfo"
211+
[columnCustomizationEnabled]="false"
212+
[columnContextMenusEnabled]="false"
213+
[smoothingEnabled]="smoothingEnabled"
214+
[columnFilters]="emptyColumnFilters"
215+
[runToHparamMap]="emptyRunToHparamMap"
216+
[selectableColumns]="emptySelectableColumns"
217+
[numColumnsLoaded]="0"
218+
[numColumnsToLoad]="0"
219+
(sortDataBy)="sortDataBy($event)"
220+
>
221+
</scalar-card-data-table>
222+
</div>
223+
<div class="bottom-area">
224+
<button
225+
*ngIf="canExpandTable()"
226+
mat-icon-button
227+
class="expand-button"
228+
aria-label="Expand Table"
229+
[title]="shouldExpandTable() ? 'Expand Table' : 'Collapse Table'"
230+
(click)="toggleTableExpanded()"
231+
>
232+
<mat-icon
233+
[svgIcon]="shouldExpandTable() ? 'expand_more_24px' : 'expand_less_24px'"
234+
></mat-icon>
235+
</button>
236+
</div>
237+
</ng-container>
238+
</div>
239239
<ng-template
240240
#lineChartCustomXAxisVis
241241
let-viewExtent="viewExtent"

tensorbored/webapp/metrics/views/card_renderer/superimposed_card_container.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ import {getFilteredRenderableRunsIds} from '../main_view/common_selectors';
129129
(onYAxisScaleChanged)="onYAxisScaleChanged($event)"
130130
(onXAxisScaleChanged)="onXAxisScaleChanged($event)"
131131
(onTimeSelectionChanged)="onTimeSelectionChanged($event)"
132+
(onStepSelectorToggled)="onStepSelectorToggled()"
132133
(onFullWidthChanged)="fullWidthChanged.emit($event)"
133134
(onFullHeightChanged)="fullHeightChanged.emit($event)"
134135
observeIntersection
@@ -636,6 +637,10 @@ export class SuperimposedCardContainer implements OnInit, OnDestroy {
636637
this.localTimeSelectionSubject.next(event.timeSelection);
637638
}
638639

640+
onStepSelectorToggled() {
641+
this.localTimeSelectionSubject.next(undefined);
642+
}
643+
639644
onViewBoxChange(viewBox: Extent | null) {
640645
this.userViewBoxSubject.next(viewBox);
641646
}

0 commit comments

Comments
 (0)