Skip to content

Commit 7f4eb27

Browse files
authored
Dedicated yaml tab for Trials (#2034)
* frontend: Create a yaml tab for Trials (#2011) * Create a dedicated yaml tab for Trials. Signed-off-by: Elena Zioga <[email protected]> * frontend: Rename components * Rename trial-modal component to trial-details. * Rename trial-modal-overview component to trial-overview. Signed-off-by: Elena Zioga <[email protected]> Signed-off-by: Elena Zioga <[email protected]>
1 parent b123dbf commit 7f4eb27

23 files changed

+142
-63
lines changed

pkg/new-ui/v1beta1/frontend/src/app/app-routing.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Routes, RouterModule } from '@angular/router';
33
import { ExperimentsComponent } from './pages/experiments/experiments.component';
44
import { ExperimentDetailsComponent } from './pages/experiment-details/experiment-details.component';
55
import { ExperimentCreationComponent } from './pages/experiment-creation/experiment-creation.component';
6-
import { TrialModalComponent } from './pages/experiment-details/trials-table/trial-modal/trial-modal.component';
6+
import { TrialDetailsComponent } from './pages/experiment-details/trials-table/trial-details/trial-details.component';
77

88
const routes: Routes = [
99
{ path: '', component: ExperimentsComponent },
@@ -14,7 +14,7 @@ const routes: Routes = [
1414
{ path: 'new', component: ExperimentCreationComponent },
1515
{
1616
path: 'experiment/:experimentName/trial/:trialName',
17-
component: TrialModalComponent,
17+
component: TrialDetailsComponent,
1818
},
1919
];
2020

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,19 @@
3535
<div class="tab-height-fix">
3636
<mat-tab-group dynamicHeight animationDuration="0ms">
3737
<mat-tab label="OVERVIEW">
38-
<app-trial-modal-overview
39-
[trialName]="trialName"
40-
[experimentName]="experimentName"
41-
[trial]="trialDetails"
42-
></app-trial-modal-overview>
38+
<ng-template matTabContent>
39+
<app-trial-overview
40+
[trialName]="trialName"
41+
[experimentName]="experimentName"
42+
[trial]="trialDetails"
43+
></app-trial-overview>
44+
</ng-template>
45+
</mat-tab>
46+
47+
<mat-tab label="YAML">
48+
<ng-template matTabContent>
49+
<app-trial-yaml [trialJson]="trialDetails"></app-trial-yaml>
50+
</ng-template>
4351
</mat-tab>
4452
</mat-tab-group>
4553
</div>
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ReactiveFormsModule } from '@angular/forms';
44
import { MatSnackBarModule } from '@angular/material/snack-bar';
55
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
66

7-
import { TrialModalComponent } from './trial-modal.component';
7+
import { TrialDetailsComponent } from './trial-details.component';
88
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
99
import { KWABackendService } from 'src/app/services/backend.service';
1010
import { of } from 'rxjs';
@@ -23,9 +23,9 @@ NamespaceServiceStub = {
2323
getSelectedNamespace: () => of(),
2424
};
2525

26-
describe('TrialModalComponent', () => {
27-
let component: TrialModalComponent;
28-
let fixture: ComponentFixture<TrialModalComponent>;
26+
describe('TrialDetailsComponent', () => {
27+
let component: TrialDetailsComponent;
28+
let fixture: ComponentFixture<TrialDetailsComponent>;
2929
let activatedRouteSpy;
3030

3131
beforeEach(
@@ -47,7 +47,7 @@ describe('TrialModalComponent', () => {
4747
BrowserAnimationsModule,
4848
TitleActionsToolbarModule,
4949
],
50-
declarations: [TrialModalComponent],
50+
declarations: [TrialDetailsComponent],
5151
providers: [
5252
{ provide: ActivatedRoute, useValue: activatedRouteSpy },
5353
{ provide: Router, useValue: {} },
@@ -59,7 +59,7 @@ describe('TrialModalComponent', () => {
5959
);
6060

6161
beforeEach(() => {
62-
fixture = TestBed.createComponent(TrialModalComponent);
62+
fixture = TestBed.createComponent(TrialDetailsComponent);
6363
component = fixture.componentInstance;
6464
fixture.detectChanges();
6565
});
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ interface ChartPoint {
1717
}
1818

1919
@Component({
20-
selector: 'app-trial-modal',
21-
templateUrl: './trial-modal.component.html',
22-
styleUrls: ['./trial-modal.component.scss'],
20+
selector: 'app-trial-details',
21+
templateUrl: './trial-details.component.html',
22+
styleUrls: ['./trial-details.component.scss'],
2323
})
24-
export class TrialModalComponent implements OnInit {
24+
export class TrialDetailsComponent implements OnInit {
2525
trialName: string;
2626
namespace: string;
2727
dataLoaded: boolean;
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,9 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
77
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
88
import { MatTooltipModule } from '@angular/material/tooltip';
99
import { MatTabsModule } from '@angular/material/tabs';
10-
import { TrialModalOverviewModule } from './overview/trial-modal-overview.module';
11-
import { TrialModalComponent } from './trial-modal.component';
10+
import { TrialOverviewModule } from './trial-overview/trial-overview.module';
11+
import { TrialDetailsComponent } from './trial-details.component';
12+
import { TrialYamlModule } from './trial-yaml/trial-yaml.module';
1213

1314
import {
1415
TitleActionsToolbarModule,
@@ -17,9 +18,9 @@ import {
1718
} from 'kubeflow';
1819

1920
@NgModule({
20-
declarations: [TrialModalComponent],
21+
declarations: [TrialDetailsComponent],
2122
imports: [
22-
TrialModalOverviewModule,
23+
TrialOverviewModule,
2324
CommonModule,
2425
MatTableModule,
2526
MatProgressSpinnerModule,
@@ -32,7 +33,8 @@ import {
3233
LoadingSpinnerModule,
3334
PanelModule,
3435
TitleActionsToolbarModule,
36+
TrialYamlModule,
3537
],
36-
exports: [TrialModalComponent],
38+
exports: [TrialDetailsComponent],
3739
})
38-
export class TrialModalModule {}
40+
export class TrialDetailsModule {}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { NgModule } from '@angular/core';
2+
import { ConditionsTableModule, DetailsListModule } from 'kubeflow';
3+
import { TrialMetricsComponent } from './metrics.component';
4+
5+
@NgModule({
6+
declarations: [TrialMetricsComponent],
7+
imports: [ConditionsTableModule, DetailsListModule],
8+
exports: [TrialMetricsComponent],
9+
})
10+
export class TrialMetricsModule {}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
22
import { MatSnackBarModule } from '@angular/material/snack-bar';
33
import { ConditionsTableModule, DetailsListModule } from 'kubeflow';
44

5-
import { TrialModalMetricsComponent } from './metrics.component';
5+
import { TrialMetricsComponent } from './metrics.component';
66

7-
describe('TrialModalMetricsComponent', () => {
8-
let component: TrialModalMetricsComponent;
9-
let fixture: ComponentFixture<TrialModalMetricsComponent>;
7+
describe('TrialMetricsComponent', () => {
8+
let component: TrialMetricsComponent;
9+
let fixture: ComponentFixture<TrialMetricsComponent>;
1010

1111
beforeEach(async(() => {
1212
TestBed.configureTestingModule({
13-
declarations: [TrialModalMetricsComponent],
13+
declarations: [TrialMetricsComponent],
1414
imports: [ConditionsTableModule, DetailsListModule, MatSnackBarModule],
1515
}).compileComponents();
1616
}));
1717

1818
beforeEach(() => {
19-
fixture = TestBed.createComponent(TrialModalMetricsComponent);
19+
fixture = TestBed.createComponent(TrialMetricsComponent);
2020
component = fixture.componentInstance;
2121
fixture.detectChanges();
2222
});
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Component, Input } from '@angular/core';
44
selector: 'app-metrics-overview',
55
templateUrl: './metrics.component.html',
66
})
7-
export class TrialModalMetricsComponent {
7+
export class TrialMetricsComponent {
88
@Input() name: string;
99
@Input() latest: string;
1010
@Input() max: string;

0 commit comments

Comments
 (0)