Skip to content

Commit

Permalink
frontend: Rename components
Browse files Browse the repository at this point in the history
* Rename trial-modal component to trial-details.
* Rename trial-modal-overview component to trial-overview.

Signed-off-by: Elena Zioga <[email protected]>
  • Loading branch information
elenzio9 committed Nov 22, 2022
1 parent 1cbecf3 commit 36cc535
Show file tree
Hide file tree
Showing 21 changed files with 58 additions and 58 deletions.
4 changes: 2 additions & 2 deletions pkg/new-ui/v1beta1/frontend/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 },
Expand All @@ -14,7 +14,7 @@ const routes: Routes = [
{ path: 'new', component: ExperimentCreationComponent },
{
path: 'experiment/:experimentName/trial/:trialName',
component: TrialModalComponent,
component: TrialDetailsComponent,
},
];

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
<mat-tab-group dynamicHeight animationDuration="0ms">
<mat-tab label="OVERVIEW">
<ng-template matTabContent>
<app-trial-modal-overview
<app-trial-overview
[trialName]="trialName"
[experimentName]="experimentName"
[trial]="trialDetails"
></app-trial-modal-overview>
></app-trial-overview>
</ng-template>
</mat-tab>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -23,9 +23,9 @@ NamespaceServiceStub = {
getSelectedNamespace: () => of(),
};

describe('TrialModalComponent', () => {
let component: TrialModalComponent;
let fixture: ComponentFixture<TrialModalComponent>;
describe('TrialDetailsComponent', () => {
let component: TrialDetailsComponent;
let fixture: ComponentFixture<TrialDetailsComponent>;
let activatedRouteSpy;

beforeEach(
Expand All @@ -47,7 +47,7 @@ describe('TrialModalComponent', () => {
BrowserAnimationsModule,
TitleActionsToolbarModule,
],
declarations: [TrialModalComponent],
declarations: [TrialDetailsComponent],
providers: [
{ provide: ActivatedRoute, useValue: activatedRouteSpy },
{ provide: Router, useValue: {} },
Expand All @@ -59,7 +59,7 @@ describe('TrialModalComponent', () => {
);

beforeEach(() => {
fixture = TestBed.createComponent(TrialModalComponent);
fixture = TestBed.createComponent(TrialDetailsComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ 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 {
Expand All @@ -18,9 +18,9 @@ import {
} from 'kubeflow';

@NgModule({
declarations: [TrialModalComponent],
declarations: [TrialDetailsComponent],
imports: [
TrialModalOverviewModule,
TrialOverviewModule,
CommonModule,
MatTableModule,
MatProgressSpinnerModule,
Expand All @@ -35,6 +35,6 @@ import {
TitleActionsToolbarModule,
TrialYamlModule,
],
exports: [TrialModalComponent],
exports: [TrialDetailsComponent],
})
export class TrialModalModule {}
export class TrialDetailsModule {}
Original file line number Diff line number Diff line change
@@ -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 {}
Original file line number Diff line number Diff line change
Expand Up @@ -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<TrialModalMetricsComponent>;
describe('TrialMetricsComponent', () => {
let component: TrialMetricsComponent;
let fixture: ComponentFixture<TrialMetricsComponent>;

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();
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<TrialModalOverviewComponent>;
describe('TrialOverviewComponent', () => {
let component: TrialOverviewComponent;
let fixture: ComponentFixture<TrialOverviewComponent>;

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: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand All @@ -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 {}

0 comments on commit 36cc535

Please sign in to comment.