You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/09/10 13:26:46 UTC
[incubator-dlab] branch DLAB-1066 created (now 70d6a45)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-1066
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 70d6a45 added project parameter to ami request on notebook creation
This branch includes the following new commits:
new a3c3e23 [DLAB-1066]: endpoint grid alignment
new 70d6a45 added project parameter to ami request on notebook creation
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1066]: endpoint grid alignment
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1066
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a3c3e236a85ba7a9b7ffd2f9717dfba9a198dbe7
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue Sep 10 16:25:21 2019 +0300
[DLAB-1066]: endpoint grid alignment
---
.../resources-grid/resources-grid.component.scss | 11 +++--------
.../main/resources/webapp/src/assets/styles/_theme.scss | 17 +++++------------
2 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
index 9d1aae2..1562e67 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.scss
@@ -111,14 +111,6 @@ tr.detail-row {
height: 0;
}
-tr.element-row:not(.expanded-row):hover {
- // background: #777;
-}
-
-tr.element-row:not(.expanded-row):active {
- // background: #efefef;
-}
-
.element-row td {
border-bottom-width: 0;
}
@@ -278,6 +270,9 @@ tr.element-row:not(.expanded-row):active {
text-align: center;
/* margin-top: 2px; */
cursor: pointer;
+ position: absolute;
+ top: 5px;
+ right: 15px;
}
.data-grid .list-menu li {
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
index 320f3a0..3d4ee1b 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
@@ -293,13 +293,6 @@ span.mat-slide-toggle-content {
}
.mat-reset {
- .mat-form-field-type-mat-select:not(.mat-form-field-disabled) {
- .mat-form-field-flex {
- // line-height: 1;
- // padding-top: 2px;
- }
- }
-
.mat-form-field {
.mat-form-field-wrapper {
overflow: hidden;
@@ -574,16 +567,16 @@ mat-horizontal-stepper {
.mat-cell {
word-break: break-all;
vertical-align: top;
- padding: 10px 5px;
+ padding: 15px 5px 10px 5px;
+
+ td {
+ vertical-align: baseline;
+ }
}
tr.mat-footer-row {
font-weight: bold;
}
-
- // .mat-table-sticky {
- // border-top: 1px solid #e0e0e0;
- // }
}
mat-tab-group.mat-tab-group {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: added project parameter to ami request on
notebook creation
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1066
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 70d6a458b10e0c0501d43521795638650e419621
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue Sep 10 16:26:36 2019 +0300
added project parameter to ami request on notebook creation
---
.../management/endpoints/endpoints.component.scss | 17 +++++++++++++++++
.../src/app/core/services/userResource.service.ts | 4 ++--
.../create-environment/create-environment.component.ts | 2 +-
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
index f6851ee..3b5418e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
@@ -20,13 +20,16 @@
.content-box {
padding: 10px 30px 30px;
height: 400px;
+
.split {
display: flex;
flex-direction: column;
justify-content: space-between;
height: 100%;
+
form {
padding: 20px 10px;
+
.control-group {
.error {
position: absolute;
@@ -38,30 +41,44 @@
}
}
}
+
.action-group {
text-align: center;
}
+
.endpoints {
height: 265px;
+
table {
width: 100%;
+
+ tr {
+ td {
+ vertical-align: middle;
+ }
+ }
+
.actions {
color: #607d8b;
width: 10%;
text-align: center;
+
span {
transition: all .5s ease-in-out;
cursor: pointer;
+
.mat-icon {
font-size: 18px;
padding-top: 5px;
}
+
&:hover {
color: darken(#607d8b, 10%);
}
}
}
}
+
.content {
p {
margin-bottom: 30px;
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/userResource.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/userResource.service.ts
index 0cb102c..b7aa70b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/userResource.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/userResource.service.ts
@@ -143,8 +143,8 @@ export class UserResourceService {
catchError(ErrorUtils.handleServiceError));
}
- public getUserImages(image): Observable<{}> {
- const body = `?docker_image=${image}`;
+ public getUserImages(image, project): Observable<{}> {
+ const body = `?docker_image=${image}&project=${project}`;
return this.applicationServiceFacade
.buildGetUserImages(body)
.pipe(
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts
index 58ffab2..dd8a7f3 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts
@@ -118,7 +118,7 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit {
}
private getImagesList() {
- this.userResourceService.getUserImages(this.currentTemplate.image)
+ this.userResourceService.getUserImages(this.currentTemplate.image, this.createExploratoryForm.controls['project'].value)
.subscribe((res: any) => this.images = res.filter(el => el.status === 'CREATED'),
error => this.toastr.error(error.message || 'Images list loading failed!', 'Oops!'));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org