This is an automated email from the ASF dual-hosted git repository.
jiwq 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 488ee3f SUBMARINE-602. [WEB] Fix some bugs in workspace page
488ee3f is described below
commit 488ee3fe1974b00da260f1c9f63be8e0c194415b
Author: kevin85421 <[email protected]>
AuthorDate: Tue Aug 18 11:27:53 2020 +0800
SUBMARINE-602. [WEB] Fix some bugs in workspace page
### What is this PR for?
Fix some bugs in workspace page
1. Remove the unknown white block
<img width="1278" alt="attachment_1"
src="https://user-images.githubusercontent.com/20109646/90467306-7e3b5780-e146-11ea-82a0-89e5d975102a.png";>
2. (1) Implement the function of "click close icon" (2) Move the next step
button
<img width="1045" alt="attachment_2"
src="https://user-images.githubusercontent.com/20109646/90467312-82677500-e146-11ea-83c9-7295b3cae610.png";>
3. Move the previous button and next button
<img width="1046" alt="attachment_3"
src="https://user-images.githubusercontent.com/20109646/90467318-8398a200-e146-11ea-983a-d8170140377c.png";>
4. Move the previous button, save button and notebook button
<img width="1044" alt="attachment_4"
src="https://user-images.githubusercontent.com/20109646/90467320-84313880-e146-11ea-9a93-c1b2ef1a8160.png";>
### What type of PR is it?
[Bug Fix]
### Todos
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-602
### How should this be tested?
https://travis-ci.org/github/kevin85421/hadoop-submarine
### Screenshots (if appropriate)
**Updated screenshot**
<img width="1280" alt="ζͺε 2020-08-20 δΈε11 59 03"
src="https://user-images.githubusercontent.com/20109646/90796358-cf636b00-e341-11ea-8cb2-5b6a9a843c3a.png";>
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: kevin85421 <[email protected]>
Closes #380 from kevin85421/SUBMARINE-602 and squashes the following
commits:
f27c53f [kevin85421] SUBMARINE-602. [WEB] Fix some bugs in workspace page
---
.../new-project-page.component.html | 29 +++++++++++++++++-----
.../new-project-page/new-project-page.component.ts | 3 +--
.../workspace/project/project.component.html | 26 ++++---------------
3 files changed, 29 insertions(+), 29 deletions(-)
diff --git
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workspace/project/new-project-page/new-project-page.component.html
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workspace/project/new-project-page/new-project-page.component.html
index 956ed42..d4ac35e 100644
---
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workspace/project/new-project-page/new-project-page.component.html
+++
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workspace/project/new-project-page/new-project-page.component.html
@@ -22,7 +22,7 @@
</button>
<br />
<h1 style="margin-left: 30px;">Create New Project</h1>
-<div style="padding-left: 300px; padding-right: 300px;">
+<div style="padding-left: 100px; padding-right: 100px;">
<nz-steps [nzCurrent]="current">
<nz-step nzTitle="Basic Information"></nz-step>
<nz-step nzTitle="Initial Project"></nz-step>
@@ -114,7 +114,13 @@
</form>
<div class="centerDiv">
<br />
- <button nz-button nzType="primary" [disabled]="!f.valid"
(click)="current = current + 1">
+ <button
+ style="margin-bottom: 10px;"
+ nz-button
+ nzType="primary"
+ [disabled]="!f.valid"
+ (click)="current = current + 1"
+ >
Next Step
</button>
</div>
@@ -186,10 +192,16 @@
<div class="centerDiv">
<br *ngIf="initialState !== 1" />
- <button nz-button nzType="default" (click)="current = current - 1">
+ <button
+ style="margin-right: 5px; margin-bottom: 10px;"
+ nz-button
+ nzType="default"
+ (click)="current = current - 1"
+ >
Previous Step
</button>
<button
+ style="margin-left: 5px; margin-bottom: 10px;"
nz-button
nzType="primary"
[disabled]="initialState === 1 && !templateType"
@@ -225,13 +237,18 @@
</nz-table>
<div class="centerDiv">
<br />
- <button nz-button nzType="default" (click)="current = current - 1"
style="margin: 3px;">
+ <button nz-button nzType="default" (click)="current = current - 1"
style="margin-bottom: 10px;">
Previous Step
</button>
- <button nz-button nzType="primary" (click)="done()" style="margin: 3px;">
+ <button
+ nz-button
+ nzType="primary"
+ (click)="done()"
+ style="margin-bottom: 10px; margin-right: 10px; margin-left: 10px;"
+ >
Save
</button>
- <button nz-button nzType="primary" (click)="openNotebook()"
[disabled]="true" style="margin: 3px;">
+ <button nz-button nzType="primary" (click)="openNotebook()"
[disabled]="true" style="margin-bottom: 10px;">
Open in Notebook
</button>
</div>
diff --git
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workspace/project/new-project-page/new-project-page.component.ts
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workspace/project/new-project-page/new-project-page.component.ts
index aee324a..58da6ac 100644
---
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workspace/project/new-project-page/new-project-page.component.ts
+++
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workspace/project/new-project-page/new-project-page.component.ts
@@ -96,7 +96,7 @@ export class NewProjectPageComponent implements OnInit {
}
clearProject() {
- this.closeProjectPage.emit(true);
+ this.closeProjectPage.emit(false);
}
refreshCheck(template) {
@@ -128,7 +128,6 @@ export class NewProjectPageComponent implements OnInit {
console.log(project);
this.addProject.emit(project);
}
-
// TODO(jasoonn): open in notebook
openNotebook() {}
}
diff --git
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workspace/project/project.component.html
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workspace/project/project.component.html
index 0ff929c..7c3de78 100644
---
a/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workspace/project/project.component.html
+++
b/submarine-workbench/workbench-web-ng/src/app/pages/workbench/workspace/project/project.component.html
@@ -23,7 +23,7 @@
<div id="addProjectbtn">
<button nz-button nzBlock (click)="newProject = true">+ Add New
Project</button>
</div>
- <div id="projectTagDiv">
+ <div *ngIf="existProjects.length > 0" id="projectTagDiv">
<div nz-row [nzGutter]="12" nzType="flex" nzJustify="start">
<div *ngFor="let project of existProjects" nz-col [nzSpan]="8"
id="projectDiv">
<nz-card
@@ -81,30 +81,14 @@
</ng-template>
</nz-card>
</div>
- <nz-card>
- <ng-template #actionEdit>
- <i nz-icon nzType="edit"></i>
- Edit
- </ng-template>
- <ng-template #actionDownload>
- <i nz-icon nzType="download"></i>
- Download
- </ng-template>
- <ng-template #actionSetting>
- <i nz-icon nzType="setting"></i>
- Setting
- </ng-template>
- <ng-template #actionDelete>
- <i nz-icon nzType="delete"></i>
- Delete
- </ng-template>
- </nz-card>
</div>
</div>
</div>
<div *ngIf="newProject" id="projectNewDivOuter">
<div id="projectNewDivInner">
- <submarine-new-project-page
(addProject)="addProject($event)"></submarine-new-project-page>
- <!-- <app-new-project-page
(closeProjectPage)="newProject=false;"></app-new-project-page> -->
+ <submarine-new-project-page
+ (closeProjectPage)="newProject = false"
+ (addProject)="addProject($event)"
+ ></submarine-new-project-page>
</div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
![https://user-images.githubusercontent.com/20109646/90467306-7e3b5780-e146-11ea-82a0-89e5d975102a.png"](https://user-images.githubusercontent.com/20109646/90467306-7e3b5780-e146-11ea-82a0-89e5d975102a.png"){kind=link}
![https://user-images.githubusercontent.com/20109646/90467312-82677500-e146-11ea-83c9-7295b3cae610.png"](https://user-images.githubusercontent.com/20109646/90467312-82677500-e146-11ea-83c9-7295b3cae610.png"){kind=link}
![https://user-images.githubusercontent.com/20109646/90467318-8398a200-e146-11ea-983a-d8170140377c.png"](https://user-images.githubusercontent.com/20109646/90467318-8398a200-e146-11ea-983a-d8170140377c.png"){kind=link}
![https://user-images.githubusercontent.com/20109646/90467320-84313880-e146-11ea-9a93-c1b2ef1a8160.png"](https://user-images.githubusercontent.com/20109646/90467320-84313880-e146-11ea-9a93-c1b2ef1a8160.png"){kind=link}
![https://user-images.githubusercontent.com/20109646/90796358-cf636b00-e341-11ea-8cb2-5b6a9a843c3a.png"](https://user-images.githubusercontent.com/20109646/90796358-cf636b00-e341-11ea-8cb2-5b6a9a843c3a.png"){kind=link}