diff --git a/pkg/new-ui/v1beta1/frontend/src/app/app-routing.module.ts b/pkg/new-ui/v1beta1/frontend/src/app/app-routing.module.ts index 544bb34657c..01fc3337261 100644 --- a/pkg/new-ui/v1beta1/frontend/src/app/app-routing.module.ts +++ b/pkg/new-ui/v1beta1/frontend/src/app/app-routing.module.ts @@ -3,7 +3,7 @@ import { Routes, RouterModule } from '@angular/router'; import { ExperimentsComponent } from './pages/experiments/experiments.component'; import { ExperimentDetailsComponent } from './pages/experiment-details/experiment-details.component'; import { ExperimentCreationComponent } from './pages/experiment-creation/experiment-creation.component'; -import { TrialModalComponent } from './pages/experiment-details/trials-table/trial-modal/trial-modal.component'; +import { TrialDetailsComponent } from './pages/experiment-details/trials-table/trial-details/trial-details.component'; const routes: Routes = [ { path: '', component: ExperimentsComponent }, @@ -14,7 +14,7 @@ const routes: Routes = [ { path: 'new', component: ExperimentCreationComponent }, { path: 'experiment/:experimentName/trial/:trialName', - component: TrialModalComponent, + component: TrialDetailsComponent, }, ]; diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/trial-modal.component.html b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-details.component.html similarity index 75% rename from pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/trial-modal.component.html rename to pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-details.component.html index d0bf1817c17..c7989d57dd6 100644 --- a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/trial-modal.component.html +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-details.component.html @@ -35,11 +35,19 @@
- + + + + + + + + +
diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/trial-modal.component.scss b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-details.component.scss similarity index 100% rename from pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/trial-modal.component.scss rename to pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-details.component.scss diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/trial-modal.component.spec.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-details.component.spec.ts similarity index 85% rename from pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/trial-modal.component.spec.ts rename to pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-details.component.spec.ts index 59f4dd1ce1b..d6f7d44ea07 100644 --- a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/trial-modal.component.spec.ts +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-details.component.spec.ts @@ -4,7 +4,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { TrialModalComponent } from './trial-modal.component'; +import { TrialDetailsComponent } from './trial-details.component'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { KWABackendService } from 'src/app/services/backend.service'; import { of } from 'rxjs'; @@ -23,9 +23,9 @@ NamespaceServiceStub = { getSelectedNamespace: () => of(), }; -describe('TrialModalComponent', () => { - let component: TrialModalComponent; - let fixture: ComponentFixture; +describe('TrialDetailsComponent', () => { + let component: TrialDetailsComponent; + let fixture: ComponentFixture; let activatedRouteSpy; beforeEach( @@ -47,7 +47,7 @@ describe('TrialModalComponent', () => { BrowserAnimationsModule, TitleActionsToolbarModule, ], - declarations: [TrialModalComponent], + declarations: [TrialDetailsComponent], providers: [ { provide: ActivatedRoute, useValue: activatedRouteSpy }, { provide: Router, useValue: {} }, @@ -59,7 +59,7 @@ describe('TrialModalComponent', () => { ); beforeEach(() => { - fixture = TestBed.createComponent(TrialModalComponent); + fixture = TestBed.createComponent(TrialDetailsComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/trial-modal.component.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-details.component.ts similarity index 97% rename from pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/trial-modal.component.ts rename to pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-details.component.ts index fe655c11e47..e222ce4dbef 100644 --- a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/trial-modal.component.ts +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-details.component.ts @@ -17,11 +17,11 @@ interface ChartPoint { } @Component({ - selector: 'app-trial-modal', - templateUrl: './trial-modal.component.html', - styleUrls: ['./trial-modal.component.scss'], + selector: 'app-trial-details', + templateUrl: './trial-details.component.html', + styleUrls: ['./trial-details.component.scss'], }) -export class TrialModalComponent implements OnInit { +export class TrialDetailsComponent implements OnInit { trialName: string; namespace: string; dataLoaded: boolean; diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/trial-modal.module.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-details.module.ts similarity index 71% rename from pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/trial-modal.module.ts rename to pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-details.module.ts index 5c50cf9cce7..a32cb7ef323 100644 --- a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/trial-modal.module.ts +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-details.module.ts @@ -7,8 +7,9 @@ import { NgxChartsModule } from '@swimlane/ngx-charts'; import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { MatTooltipModule } from '@angular/material/tooltip'; import { MatTabsModule } from '@angular/material/tabs'; -import { TrialModalOverviewModule } from './overview/trial-modal-overview.module'; -import { TrialModalComponent } from './trial-modal.component'; +import { TrialOverviewModule } from './trial-overview/trial-overview.module'; +import { TrialDetailsComponent } from './trial-details.component'; +import { TrialYamlModule } from './trial-yaml/trial-yaml.module'; import { TitleActionsToolbarModule, @@ -17,9 +18,9 @@ import { } from 'kubeflow'; @NgModule({ - declarations: [TrialModalComponent], + declarations: [TrialDetailsComponent], imports: [ - TrialModalOverviewModule, + TrialOverviewModule, CommonModule, MatTableModule, MatProgressSpinnerModule, @@ -32,7 +33,8 @@ import { LoadingSpinnerModule, PanelModule, TitleActionsToolbarModule, + TrialYamlModule, ], - exports: [TrialModalComponent], + exports: [TrialDetailsComponent], }) -export class TrialModalModule {} +export class TrialDetailsModule {} diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/metrics/metrics.component.html b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/metrics/metrics.component.html similarity index 100% rename from pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/metrics/metrics.component.html rename to pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/metrics/metrics.component.html diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/metrics/metrics.component.module.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/metrics/metrics.component.module.ts new file mode 100644 index 00000000000..8140a06f6b6 --- /dev/null +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/metrics/metrics.component.module.ts @@ -0,0 +1,10 @@ +import { NgModule } from '@angular/core'; +import { ConditionsTableModule, DetailsListModule } from 'kubeflow'; +import { TrialMetricsComponent } from './metrics.component'; + +@NgModule({ + declarations: [TrialMetricsComponent], + imports: [ConditionsTableModule, DetailsListModule], + exports: [TrialMetricsComponent], +}) +export class TrialMetricsModule {} diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/metrics/metrics.component.spec.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/metrics/metrics.component.spec.ts similarity index 62% rename from pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/metrics/metrics.component.spec.ts rename to pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/metrics/metrics.component.spec.ts index bb499c93dd3..a09954309c6 100644 --- a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/metrics/metrics.component.spec.ts +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/metrics/metrics.component.spec.ts @@ -2,21 +2,21 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { ConditionsTableModule, DetailsListModule } from 'kubeflow'; -import { TrialModalMetricsComponent } from './metrics.component'; +import { TrialMetricsComponent } from './metrics.component'; -describe('TrialModalMetricsComponent', () => { - let component: TrialModalMetricsComponent; - let fixture: ComponentFixture; +describe('TrialMetricsComponent', () => { + let component: TrialMetricsComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [TrialModalMetricsComponent], + declarations: [TrialMetricsComponent], imports: [ConditionsTableModule, DetailsListModule, MatSnackBarModule], }).compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(TrialModalMetricsComponent); + fixture = TestBed.createComponent(TrialMetricsComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/metrics/metrics.component.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/metrics/metrics.component.ts similarity index 85% rename from pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/metrics/metrics.component.ts rename to pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/metrics/metrics.component.ts index 33bb66513b9..55cc735d101 100644 --- a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/metrics/metrics.component.ts +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/metrics/metrics.component.ts @@ -4,7 +4,7 @@ import { Component, Input } from '@angular/core'; selector: 'app-metrics-overview', templateUrl: './metrics.component.html', }) -export class TrialModalMetricsComponent { +export class TrialMetricsComponent { @Input() name: string; @Input() latest: string; @Input() max: string; diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/trial-modal-overview.component.html b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/trial-overview.component.html similarity index 100% rename from pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/trial-modal-overview.component.html rename to pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/trial-overview.component.html diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/trial-modal-overview.component.spec.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/trial-overview.component.spec.ts similarity index 75% rename from pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/trial-modal-overview.component.spec.ts rename to pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/trial-overview.component.spec.ts index a0fc77e1397..f77e072f153 100644 --- a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/trial-modal-overview.component.spec.ts +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/trial-overview.component.spec.ts @@ -6,30 +6,30 @@ import { DetailsListModule, HeadingSubheadingRowModule, } from 'kubeflow'; -import { TrialModalMetricsModule } from './metrics/metrics.component.module'; +import { TrialMetricsModule } from './metrics/metrics.component.module'; -import { TrialModalOverviewComponent } from './trial-modal-overview.component'; +import { TrialOverviewComponent } from './trial-overview.component'; -describe('TrialModalOverviewComponent', () => { - let component: TrialModalOverviewComponent; - let fixture: ComponentFixture; +describe('TrialOverviewComponent', () => { + let component: TrialOverviewComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [TrialModalOverviewComponent], + declarations: [TrialOverviewComponent], imports: [ CommonModule, ConditionsTableModule, DetailsListModule, HeadingSubheadingRowModule, - TrialModalMetricsModule, + TrialMetricsModule, MatSnackBarModule, ], }).compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(TrialModalOverviewComponent); + fixture = TestBed.createComponent(TrialOverviewComponent); component = fixture.componentInstance; component.trial = { status: { diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/trial-modal-overview.component.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/trial-overview.component.ts similarity index 94% rename from pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/trial-modal-overview.component.ts rename to pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/trial-overview.component.ts index bdeb334b66b..daf32f5b83f 100644 --- a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/trial-modal-overview.component.ts +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/trial-overview.component.ts @@ -10,11 +10,11 @@ import { TrialK8s } from 'src/app/models/trial.k8s.model'; import { numberToExponential } from 'src/app/shared/utils'; @Component({ - selector: 'app-trial-modal-overview', - templateUrl: './trial-modal-overview.component.html', + selector: 'app-trial-overview', + templateUrl: './trial-overview.component.html', changeDetection: ChangeDetectionStrategy.OnPush, }) -export class TrialModalOverviewComponent implements OnChanges { +export class TrialOverviewComponent implements OnChanges { status: string; statusIcon: string; completionTime: string; diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/trial-modal-overview.module.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/trial-overview.module.ts similarity index 50% rename from pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/trial-modal-overview.module.ts rename to pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/trial-overview.module.ts index cfa3fbda241..3771620b1c2 100644 --- a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/trial-modal-overview.module.ts +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-overview/trial-overview.module.ts @@ -5,18 +5,18 @@ import { DetailsListModule, HeadingSubheadingRowModule, } from 'kubeflow'; -import { TrialModalMetricsModule } from './metrics/metrics.component.module'; -import { TrialModalOverviewComponent } from './trial-modal-overview.component'; +import { TrialMetricsModule } from './metrics/metrics.component.module'; +import { TrialOverviewComponent } from './trial-overview.component'; @NgModule({ - declarations: [TrialModalOverviewComponent], + declarations: [TrialOverviewComponent], imports: [ CommonModule, ConditionsTableModule, DetailsListModule, HeadingSubheadingRowModule, - TrialModalMetricsModule, + TrialMetricsModule, ], - exports: [TrialModalOverviewComponent], + exports: [TrialOverviewComponent], }) -export class TrialModalOverviewModule {} +export class TrialOverviewModule {} diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.component.html b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.component.html new file mode 100644 index 00000000000..03e719bbd4a --- /dev/null +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.component.html @@ -0,0 +1,6 @@ + diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.component.scss b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.component.scss new file mode 100644 index 00000000000..b2ed3b0dddd --- /dev/null +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.component.scss @@ -0,0 +1,4 @@ +:host { + display: block; + overflow: auto; +} diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.component.spec.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.component.spec.ts new file mode 100644 index 00000000000..eba5bbbff30 --- /dev/null +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.component.spec.ts @@ -0,0 +1,30 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { NoopAnimationsModule } from '@angular/platform-browser/animations'; +import { CommonModule } from '@angular/common'; + +import { EditorModule } from 'kubeflow'; +import { TrialYamlComponent } from './trial-yaml.component'; + +describe('TrialYamlComponent', () => { + let component: TrialYamlComponent; + let fixture: ComponentFixture; + + beforeEach( + waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [CommonModule, NoopAnimationsModule, EditorModule], + declarations: [TrialYamlComponent], + }).compileComponents(); + }), + ); + + beforeEach(() => { + fixture = TestBed.createComponent(TrialYamlComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.component.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.component.ts new file mode 100644 index 00000000000..1249ff24ff8 --- /dev/null +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.component.ts @@ -0,0 +1,17 @@ +import { Component, Input } from '@angular/core'; +import { TrialK8s } from 'src/app/models/trial.k8s.model'; +import { dump } from 'js-yaml'; + +@Component({ + selector: 'app-trial-yaml', + templateUrl: './trial-yaml.component.html', + styleUrls: ['./trial-yaml.component.scss'], +}) +export class TrialYamlComponent { + public yaml = ''; + + @Input() + set trialJson(trial: TrialK8s) { + this.yaml = dump(trial); + } +} diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.module.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.module.ts new file mode 100644 index 00000000000..40eda0ff2fe --- /dev/null +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-details/trial-yaml/trial-yaml.module.ts @@ -0,0 +1,12 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { TrialYamlComponent } from './trial-yaml.component'; +import { EditorModule } from 'kubeflow'; + +@NgModule({ + declarations: [TrialYamlComponent], + imports: [CommonModule, EditorModule], + exports: [TrialYamlComponent], +}) +export class TrialYamlModule {} diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/metrics/metrics.component.module.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/metrics/metrics.component.module.ts deleted file mode 100644 index 4c3ac97cac7..00000000000 --- a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trial-modal/overview/metrics/metrics.component.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NgModule } from '@angular/core'; -import { ConditionsTableModule, DetailsListModule } from 'kubeflow'; -import { TrialModalMetricsComponent } from './metrics.component'; - -@NgModule({ - declarations: [TrialModalMetricsComponent], - imports: [ConditionsTableModule, DetailsListModule], - exports: [TrialModalMetricsComponent], -}) -export class TrialModalMetricsModule {} diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trials-table.component.html b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trials-table.component.html index 74890613f74..7b215a83e2b 100644 --- a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trials-table.component.html +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trials-table.component.html @@ -23,7 +23,7 @@ {{ element[i] }} diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trials-table.component.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trials-table.component.ts index 03b9e228b66..5828ce08ddf 100644 --- a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trials-table.component.ts +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trials-table.component.ts @@ -57,7 +57,7 @@ export class TrialsTableComponent implements OnChanges { } } - openTrialModal(name: string) { + openTrialDetails(name: string) { this.router.navigate([`/experiment/${this.experimentName}/trial/${name}`]); } diff --git a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trials-table.module.ts b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trials-table.module.ts index 19d3d7fc379..4c9eebf99e8 100644 --- a/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trials-table.module.ts +++ b/pkg/new-ui/v1beta1/frontend/src/app/pages/experiment-details/trials-table/trials-table.module.ts @@ -8,8 +8,8 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; import { TrialsTableComponent } from './trials-table.component'; import { MatTooltipModule } from '@angular/material/tooltip'; -import { TrialModalComponent } from './trial-modal/trial-modal.component'; -import { TrialModalModule } from './trial-modal/trial-modal.module'; +import { TrialDetailsComponent } from './trial-details/trial-details.component'; +import { TrialDetailsModule } from './trial-details/trial-details.module'; @NgModule({ declarations: [TrialsTableComponent], @@ -21,9 +21,9 @@ import { TrialModalModule } from './trial-modal/trial-modal.module'; MatIconModule, NgxChartsModule, MatTooltipModule, - TrialModalModule, + TrialDetailsModule, ], - entryComponents: [TrialModalComponent], + entryComponents: [TrialDetailsComponent], exports: [TrialsTableComponent], }) export class TrialsTableModule {}