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 426c30b SUBMARINE-665. Close button not works when creating
environment
426c30b is described below
commit 426c30b70b0ad3e9a292e42d576a47c0528d680d
Author: kobe860219 <[email protected]>
AuthorDate: Tue Oct 27 14:53:53 2020 +0800
SUBMARINE-665. Close button not works when creating environment
### What is this PR for?
Fix bug of closing button not works when creating environment.
### What type of PR is it?
[Bug Fix]
### Todos
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-665
### How should this be tested?
https://travis-ci.org/github/kobe860219/submarine/builds/739198377
### 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: kobe860219 <[email protected]>
Closes #441 from kobe860219/SUBMARINE-665 and squashes the following
commits:
de58f4f [kobe860219] SUBMARINE-665. Close button not works when creating
environment
---
.../pages/workbench/environment/environment.component.html | 2 +-
.../experiment-customized-form.component.html | 12 ++++++------
.../experiment-customized-form.component.ts | 1 -
.../app/pages/workbench/experiment/experiment.component.html | 10 +++++-----
4 files changed, 12 insertions(+), 13 deletions(-)
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/environment/environment.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/environment/environment.component.html
index aa8a84d..3c9fdd7 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/environment/environment.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/environment/environment.component.html
@@ -118,7 +118,7 @@
</div>
</nz-layout>
-<nz-modal [(nzVisible)]="isVisible" nzTitle="Create Environment"
[nzWidth]="700">
+<nz-modal [(nzVisible)]="isVisible" nzTitle="Create Environment"
[nzWidth]="700" (nzOnCancel)="isVisible = false">
<div *nzModalFooter>
<button nz-button nzType="default" (click)="closeModal()">Cancel</button>
<button id="go" nz-button nzType="primary" [disabled]="checkStatus()"
(click)="createEnvironment()">Create</button>
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-customized-form/experiment-customized-form.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-customized-form/experiment-customized-form.component.html
index ef6d23d..c9afe7c 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-customized-form/experiment-customized-form.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-customized-form/experiment-customized-form.component.html
@@ -26,7 +26,7 @@
</div>
<div>
<form [formGroup]="experiment">
- <div [ngSwitch]="step" style="margin-top: 30px">
+ <div [ngSwitch]="step" style="margin-top: 30px;">
<div *ngSwitchCase="0" id="firstStep">
<div class="single-field-group">
<label for="experimentName">
@@ -86,10 +86,10 @@
</div>
</ng-template>
</div>
- <div style="margin-bottom: 10px">
+ <div style="margin-bottom: 10px;">
<button
nz-button
- style="display: block; margin: auto"
+ style="display: block; margin: auto;"
id="advancedBtn"
nzType="default"
(click)="ADVANCED = !ADVANCED"
@@ -127,11 +127,11 @@
<ul formArrayName="envs" class="list-container">
<ng-container *ngFor="let env of envs.controls; index as i">
<li [formGroupName]="i" class="input-group">
- <div style="margin-left: 30%">
+ <div style="margin-left: 30%;">
<label for="key{{ i }}">Key</label>
<input nz-input name="key{{ i }}" placeholder="Key"
formControlName="key" id="key{{ i }}" />
</div>
- <div style="margin-left: 0">
+ <div style="margin-left: 0;">
<label for="value{{ i }}">Value</label>
<input nz-input name="value{{ i }}" placeholder="Value"
formControlName="value" id="value{{ i }}" />
</div>
@@ -151,7 +151,7 @@
</div>
</ng-container>
</ul>
- <button nz-button id="env-btn" style="display: block; margin: auto"
nzType="primary" (click)="onCreateEnv()">
+ <button nz-button id="env-btn" style="display: block; margin: auto;"
nzType="primary" (click)="onCreateEnv()">
Add new environment variable
</button>
<br />
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-customized-form/experiment-customized-form.component.ts
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-customized-form/experiment-customized-form.component.ts
index bab2c8c..bae3d7f 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-customized-form/experiment-customized-form.component.ts
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-customized-form/experiment-customized-form.component.ts
@@ -320,7 +320,6 @@ export class ExperimentCustomizedFormComponent implements
OnInit, OnDestroy {
* Construct spec for new experiment creation
*/
constructSpec(): ExperimentSpec {
-
// Construct the spec
const meta: ExperimentMeta = {
name: this.experimentName.value.toLowerCase(),
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment.component.html
index ecde659..4436cef 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment.component.html
@@ -17,7 +17,7 @@
~ under the License.
-->
-<nz-layout style="margin: -24px -24px 16px">
+<nz-layout style="margin: -24px -24px 16px;">
<nz-layout class="inner-layout">
<div id="experimentOuter">
<nz-breadcrumb>
@@ -50,7 +50,7 @@
</nz-radio-group>
<nz-input-group
nzSearch
- style="width: 300px; margin-top: 15px; margin-left: 10px;
margin-right: 5px"
+ style="width: 300px; margin-top: 15px; margin-left: 10px;
margin-right: 5px;"
[nzAddOnAfter]="suffixIconButton"
>
<input type="text" nz-input placeholder="input search text" />
@@ -63,7 +63,7 @@
nz-button
id="openExperiment"
nzType="primary"
- style="margin-right: 5px; margin-bottom: 15px; margin-top: 15px"
+ style="margin-right: 5px; margin-bottom: 15px; margin-top: 15px;"
(click)="initModal('create')"
>
<i nz-icon nzType="plus"></i>
@@ -72,7 +72,7 @@
<button
nz-button
nzType="primary"
- style="margin-bottom: 15px; margin-top: 15px"
+ style="margin-bottom: 15px; margin-top: 15px;"
nz-popconfirm
nzTitle="Confirm to delete?"
nzCancelText="Cancel"
@@ -171,7 +171,7 @@
>
{{ modalProps.okText }}
</button>
- <button *ngIf="modalProps.currentStep > 0" nz-button nzType="default"
style="float: left" (click)="prevForm()">
+ <button *ngIf="modalProps.currentStep > 0" nz-button nzType="default"
style="float: left;" (click)="prevForm()">
Prev Step
</button>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
