This is an automated email from the ASF dual-hosted git repository.
liuxun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 9de3847 SUBMARINE-535. Update experiment service in workbench
9de3847 is described below
commit 9de3847434bacda46385b8fd09320fa273fda070
Author: pingsutw <[email protected]>
AuthorDate: Sat Jun 20 15:39:46 2020 +0800
SUBMARINE-535. Update experiment service in workbench
### What is this PR for?
Because of SUBMARINE-499 refactors experiment spec, we should update the
corresponding REST API in the experiment service.
### What type of PR is it?
[Refactoring]
### Todos
* [ ] - Task
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-535
### How should this be tested?
https://travis-ci.org/github/pingsutw/hadoop-submarine/builds/700304338
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: pingsutw <[email protected]>
Closes #322 from pingsutw/SUBMARINE-535 and squashes the following commits:
d84920b [pingsutw] SUBMARINE-535. Update experiment service in workbench
---
.../src/app/interfaces/experiment-info.ts | 2 +-
.../experiment-info/experiment-info.component.html | 6 +++---
.../experiment-info/experiment-info.component.ts | 4 ++--
.../workbench/experiment/experiment.component.html | 21 ++++++++++++---------
.../workbench/experiment/experiment.component.ts | 14 ++++++--------
.../app/pages/workbench/workbench-routing.module.ts | 3 +--
.../src/app/services/experiment.service.ts | 12 ++++++------
7 files changed, 31 insertions(+), 31 deletions(-)
diff --git
a/submarine-workbench/workbench-web-ng/src/app/interfaces/experiment-info.ts
b/submarine-workbench/workbench-web-ng/src/app/interfaces/experiment-info.ts
index 8f7227c..b449e14 100644
--- a/submarine-workbench/workbench-web-ng/src/app/interfaces/experiment-info.ts
+++ b/submarine-workbench/workbench-web-ng/src/app/interfaces/experiment-info.ts
@@ -20,7 +20,7 @@
import { ExperimentSpec } from '@submarine/interfaces/experiment-spec';
export class ExperimentInfo {
- jobId: string;
+ experimentId: string;
name: string;
uid: string;
status: string;
diff --git
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment-info/experiment-info.component.html
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment-info/experiment-info.component.html
index 19ee5ea..8038ef1 100644
---
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment-info/experiment-info.component.html
+++
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment-info/experiment-info.component.html
@@ -41,7 +41,7 @@
<tbody>
<tr>
<td>{{ experimentInfo.name }}</td>
- <td>{{ experimentInfo.jobId }}</td>
+ <td>{{ experimentInfo.experimentId }}</td>
<td>{{ experimentInfo.createdTime }}</td>
<td>{{ experimentInfo.runningTime }}</td>
<td>{{ experimentInfo.finishedTime }}</td>
@@ -88,7 +88,7 @@
</li>
<li nz-menu-item (click)="currentState = 1">
<i nz-icon nzType="bars" nzTheme="outline"></i>
- Hyper parameters
+ Parameters
</li>
<li nz-menu-item (click)="currentState = 2">
<i nz-icon nzType="appstore" nzTheme="outline"></i>
@@ -96,7 +96,7 @@
</li>
<li nz-menu-item (click)="currentState = 3">
<i nz-icon nzType="desktop" nzTheme="outline"></i>
- Outpus
+ Outputs
</li>
</ul>
</nz-sider>
diff --git
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment-info/experiment-info.component.ts
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment-info/experiment-info.component.ts
index 11c6d90..c6dae0e 100644
---
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment-info/experiment-info.component.ts
+++
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment-info/experiment-info.component.ts
@@ -19,8 +19,8 @@
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
-import { ExperimentService } from '../../../../services/experiment.service';
import { ExperimentInfo } from '@submarine/interfaces/experiment-info';
+import { ExperimentService } from '@submarine/services/experiment.service';
import { NzMessageService } from 'ng-zorro-antd';
@Component({
@@ -42,7 +42,7 @@ export class ExperimentInfoComponent implements OnInit {
) {}
ngOnInit() {
- this.experimentID = this.route.snapshot.params['id'];
+ this.experimentID = this.route.snapshot.params.id;
this.experimentService.querySpecificExperiment(this.experimentID).subscribe(
(item) => {
this.experimentInfo = item;
diff --git
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment.component.html
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment.component.html
index af15b9f..4096e88 100644
---
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment.component.html
+++
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment.component.html
@@ -45,7 +45,7 @@
<nz-radio-group [(ngModel)]="showExperiment"
(ngModelChange)="showChange()">
<label nz-radio-button nzValue="All">All</label>
<label nz-radio-button nzValue="Own">Owned By Me</label>
- <label nz-radio-button nzValue="Access">Accessable By Me</label>
+ <label nz-radio-button nzValue="Access">Accessible By Me</label>
</nz-radio-group>
<nz-input-group
nzSearch
@@ -86,8 +86,8 @@
<tr *ngFor="let data of basicTable.data">
<td>{{ data.name }}</td>
<td>
- <a [routerLink]="['info', data.jobId]" (click)="experimentID =
data.jobId; isInfo = true">
- {{ data.jobId }}
+ <a [routerLink]="['info', data.experimentId]"
(click)="experimentID = data.experimentId; isInfo = true">
+ {{ data.experimentId }}
</a>
</td>
<td>{{ data.createdTime }}</td>
@@ -174,6 +174,7 @@
<span class="red-star">*</span>
Experiment Name:
</label>
+ <label for="experimentName"></label>
<input
type="text"
id="experimentName"
@@ -187,12 +188,14 @@
<span class="red-star">*</span>
Description:
</label>
- <textarea
- rows="6"
- class="form-control"
- style="margin-top: 32px; width: 350px;"
- formControlName="description"
- ></textarea>
+ <label>
+ <textarea
+ rows="6"
+ class="form-control"
+ style="margin-top: 32px; width: 350px;"
+ formControlName="description"
+ ></textarea>
+ </label>
</div>
</div>
<div *ngSwitchCase="1" id="page2">
diff --git
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment.component.ts
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment.component.ts
index bd6aca7..298ff82 100644
---
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment.component.ts
+++
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/experiment/experiment.component.ts
@@ -19,10 +19,10 @@
import { Component, OnInit } from '@angular/core';
import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { ActivatedRoute, NavigationStart, Router } from '@angular/router';
import { ExperimentInfo } from '@submarine/interfaces/experiment-info';
import { ExperimentService } from '@submarine/services/experiment.service';
import { NzMessageService } from 'ng-zorro-antd';
-import { ActivatedRoute, Params, Router, NavigationStart } from
'@angular/router';
@Component({
selector: 'submarine-experiment',
@@ -31,7 +31,7 @@ import { ActivatedRoute, Params, Router, NavigationStart }
from '@angular/router
})
export class ExperimentComponent implements OnInit {
experimentList: ExperimentInfo[] = [];
- //About experiment information
+ // About experiment information
isInfo = false;
experimentID: string;
@@ -53,6 +53,7 @@ export class ExperimentComponent implements OnInit {
constructor(
private experimentService: ExperimentService,
private nzMessageService: NzMessageService,
+ private route: ActivatedRoute,
private router: Router
) {}
@@ -67,11 +68,8 @@ export class ExperimentComponent implements OnInit {
scheduleCycle: new FormControl('Month')
});
this.fetchExperimentList();
- if (this.router.url === '/workbench/experiment') {
- this.isInfo = false;
- } else {
- this.isInfo = true;
- }
+ this.isInfo = this.router.url !== '/workbench/experiment';
+ this.experimentID = this.route.snapshot.params.id;
this.router.events.subscribe((val) => {
if (val instanceof NavigationStart) {
console.log(val.url);
@@ -106,7 +104,7 @@ export class ExperimentComponent implements OnInit {
});
}
onDeleteExperiment(data: ExperimentInfo) {
- this.experimentService.deleteExperiment(data.jobId).subscribe(
+ this.experimentService.deleteExperiment(data.experimentId).subscribe(
() => {
this.nzMessageService.success('Delete user success!');
this.fetchExperimentList();
diff --git
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workbench-routing.module.ts
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workbench-routing.module.ts
index b60e737..4426341 100644
---
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workbench-routing.module.ts
+++
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workbench-routing.module.ts
@@ -22,12 +22,11 @@ import { RouterModule, Routes } from '@angular/router';
import { ExperimentComponent } from
'@submarine/pages/workbench/experiment/experiment.component';
import { WorkbenchComponent } from
'@submarine/pages/workbench/workbench.component';
import { DataComponent } from './data/data.component';
+import { ExperimentInfoComponent } from
'./experiment/experiment-info/experiment-info.component';
import { HomeComponent } from './home/home.component';
import { InterpreterComponent } from './interpreter/interpreter.component';
import { ModelComponent } from './model/model.component';
import { WorkspaceComponent } from './workspace/workspace.component';
-import { ExperimentInfo } from '@submarine/interfaces/experiment-info';
-import { ExperimentInfoComponent } from
'./experiment/experiment-info/experiment-info.component';
const routes: Routes = [
{
diff --git
a/submarine-workbench/workbench-web-ng/src/app/services/experiment.service.ts
b/submarine-workbench/workbench-web-ng/src/app/services/experiment.service.ts
index c0617df..cb8b267 100644
---
a/submarine-workbench/workbench-web-ng/src/app/services/experiment.service.ts
+++
b/submarine-workbench/workbench-web-ng/src/app/services/experiment.service.ts
@@ -32,7 +32,7 @@ export class ExperimentService {
constructor(private baseApi: BaseApiService, private httpClient: HttpClient)
{}
fetchExperimentList(): Observable<ExperimentInfo[]> {
- const apiUrl = this.baseApi.getRestApi('/v1/jobs');
+ const apiUrl = this.baseApi.getRestApi('/v1/experiment');
return this.httpClient.get<Rest<ExperimentInfo[]>>(apiUrl).pipe(
switchMap((res) => {
if (res.success) {
@@ -46,7 +46,7 @@ export class ExperimentService {
}
querySpecificExperiment(id: string): Observable<ExperimentInfo> {
- const apiUrl = this.baseApi.getRestApi('/v1/jobs/' + id);
+ const apiUrl = this.baseApi.getRestApi('/v1/experiment/' + id);
return this.httpClient.get<Rest<ExperimentInfo>>(apiUrl).pipe(
switchMap((res) => {
if (res.success) {
@@ -59,7 +59,7 @@ export class ExperimentService {
}
createExperiment(experimentSpec): Observable<ExperimentInfo> {
- const apiUrl = this.baseApi.getRestApi('/v1/jobs');
+ const apiUrl = this.baseApi.getRestApi('/v1/experiment');
return this.httpClient.post<Rest<ExperimentInfo>>(apiUrl,
experimentSpec).pipe(
switchMap((res) => {
if (res.success) {
@@ -72,7 +72,7 @@ export class ExperimentService {
}
editExperiment(experimentSpec): Observable<ExperimentInfo> {
- const apiUrl = this.baseApi.getRestApi('/v1/jobs');
+ const apiUrl = this.baseApi.getRestApi('/v1/experiment');
return this.httpClient.patch<Rest<ExperimentInfo>>(apiUrl,
experimentSpec).pipe(
switchMap((res) => {
if (res.success) {
@@ -85,7 +85,7 @@ export class ExperimentService {
}
deleteExperiment(id: string): Observable<ExperimentInfo> {
- const apiUrl = this.baseApi.getRestApi('/v1/jobs/' + id);
+ const apiUrl = this.baseApi.getRestApi('/v1/experiment/' + id);
return this.httpClient.delete<Rest<any>>(apiUrl).pipe(
switchMap((res) => {
if (res.success) {
@@ -98,7 +98,7 @@ export class ExperimentService {
}
getExperimentLog(id: string): Observable<any> {
- const apiUrl = this.baseApi.getRestApi('/v1/jobs/logs/' + id);
+ const apiUrl = this.baseApi.getRestApi('/v1/experiment/logs/' + id);
return this.httpClient.get<Rest<any>>(apiUrl).pipe(
switchMap((res) => {
if (res.success) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
