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/07/02 12:09:59 UTC
[incubator-dlab] branch feature/projects updated (cb60569 ->
595c24f)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from cb60569 Merge pull request #131 from bodnarmykola/DLAB-748
new 4e8562d [DLAB-828]: reset key label on form clear
new 2e04372 [DLAB-828]: fixed issue with uploading key after form reinit
new f368f01 [DLAB-827]: cut group name on confirmation dialog for termination
new 3653ab3 [DLAB-827]: unify scrollers
new 595c24f Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects
The 5 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.
Summary of changes:
.../project/project-form/project-form.component.ts | 5 ++-
.../app/administration/roles/roles.component.ts | 13 +++---
.../src/app/shared/navbar/navbar.component.html | 2 +-
.../src/main/resources/webapp/src/styles.scss | 47 +++++++++++++++++++---
4 files changed, 51 insertions(+), 16 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/05: [DLAB-828]: reset key label on form clear
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 4e8562dc8fcad4d30352b3353ee4e05d7b8993d3
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Jul 1 15:17:02 2019 +0300
[DLAB-828]: reset key label on form clear
---
.../app/administration/project/project-form/project-form.component.ts | 1 +
1 file changed, 1 insertion(+)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
index c3f7297..05d079c 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
@@ -89,6 +89,7 @@ export class ProjectFormComponent implements OnInit {
}
public reset() {
+ this.keyLabel = '';
this.initFormModel();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/05: [DLAB-828]: fixed issue with uploading key
after form reinit
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 2e04372a361b492b8dc4fa9925c69f7d0462688a
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue Jul 2 12:01:45 2019 +0300
[DLAB-828]: fixed issue with uploading key after form reinit
---
.../app/administration/project/project-form/project-form.component.ts | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
index 05d079c..c56b84a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.ts
@@ -100,8 +100,9 @@ export class ProjectFormComponent implements OnInit {
public onFileChange($event) {
const reader = new FileReader();
+ const files = $event.target.files;
- if ($event.target.files && $event.target.files.length) {
+ if (files && files.length) {
const [file] = $event.target.files;
reader.readAsBinaryString(file);
@@ -112,6 +113,7 @@ export class ProjectFormComponent implements OnInit {
this.accessKeyValid = this.isValidKey(file.name);
this.keyLabel = this.getLabel(file);
+ $event.target.value = '';
this.cd.markForCheck();
};
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/05: [DLAB-827]: cut group name on confirmation
dialog for termination
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f368f01f24d4a137973a7c4d765373045bef3ecb
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue Jul 2 12:04:22 2019 +0300
[DLAB-827]: cut group name on confirmation dialog for termination
---
.../webapp/src/app/administration/roles/roles.component.ts | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
index a47c9ee..eb5d902 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
@@ -23,6 +23,7 @@ import { MatDialog, MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { ToastrService } from 'ngx-toastr';
import { RolesGroupsService, HealthStatusService } from '../../core/services';
+import { CheckUtils } from '../../core/util';
import { DICTIONARY } from '../../../dictionary/global.dictionary';
@Component({
@@ -173,11 +174,11 @@ export class RolesComponent implements OnInit {
}
public groupValidarion(): ValidatorFn {
-
const duplicateList: any = this.groupsData.map(item => item.group);
return <ValidatorFn>((control: FormControl) => {
- if (control.value && duplicateList.includes(this.delimitersFiltering(control.value)))
+ if (control.value && duplicateList.includes(CheckUtils.delimitersFiltering(control.value))) {
return { duplicate: true };
+ }
if (control.value && !this.groupnamePattern.test(control.value))
return { patterns: true };
@@ -190,10 +191,6 @@ export class RolesComponent implements OnInit {
return o1.toLowerCase() === o2.toLowerCase();
}
- public delimitersFiltering(resource): string {
- return resource.replace(this.delimitersRegex, '').toString().toLowerCase();
- }
-
public resetDialog() {
this.stepperView = false;
this.setupGroup = '';
@@ -229,7 +226,7 @@ export class RolesComponent implements OnInit {
</div>
<div mat-dialog-content class="content">
<p *ngIf="data.user">User <strong>{{ data.user }}</strong> will be deleted from <strong>{{ data.group }}</strong> group.</p>
- <p *ngIf="data.id">Group <strong>{{ data.group }}</strong> will be decommissioned.</p>
+ <p *ngIf="data.id">Group <strong class="ellipsis group-name">{{ data.group }}</strong> will be decommissioned.</p>
<p class="m-top-20"><strong>Do you want to proceed?</strong></p>
</div>
<div class="text-center">
@@ -237,7 +234,7 @@ export class RolesComponent implements OnInit {
<button type="button" class="butt butt-success" mat-raised-button (click)="dialogRef.close(true)">Yes</button>
</div>
`,
- styles: []
+ styles: [`.group-name { max-width: 96%; display: inline-block; }`]
})
export class ConfirmDeleteUserAccountDialogComponent {
constructor(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 04/05: [DLAB-827]: unify scrollers
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 3653ab318a35d4e1a9feba671373e277623ff72d
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue Jul 2 15:09:16 2019 +0300
[DLAB-827]: unify scrollers
---
.../src/app/shared/navbar/navbar.component.html | 2 +-
.../src/main/resources/webapp/src/styles.scss | 47 +++++++++++++++++++---
2 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
index c5a424f..ceb18f0 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
@@ -101,7 +101,7 @@
</nav>
</mat-nav-list>
</mat-sidenav>
- <mat-sidenav-content [style.margin-left]="isExpanded ? '220px' : '60px'">
+ <mat-sidenav-content id="scrolling" [style.margin-left]="isExpanded ? '220px' : '60px'">
<router-outlet></router-outlet>
</mat-sidenav-content>
</mat-sidenav-container>
diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss
index bffb5bd..ed72357 100644
--- a/services/self-service/src/main/resources/webapp/src/styles.scss
+++ b/services/self-service/src/main/resources/webapp/src/styles.scss
@@ -47,10 +47,12 @@
background-color: rgba(53, 175, 213, 0.11) !important;
color: #577289;
}
+
.mat-tab-header-pagination.mat-tab-header-pagination-after,
.mat-tab-header-pagination.mat-tab-header-pagination-before {
display: none !important;
}
+
.mat-drawer-container {
height: calc(100% - 48px);
}
@@ -61,6 +63,7 @@ mat-chip.mat-chip {
font-size: 14px;
padding: 8px 18px;
}
+
mat-chip.mat-chip a {
display: inline-block;
width: 12px;
@@ -89,10 +92,12 @@ mat-chip.mat-chip strong {
margin-right: 15px;
float: right;
}
+
.rotate {
-webkit-animation: spin 2s linear infinite;
animation: spin 2s linear infinite;
}
+
.status {
text-transform: capitalize;
}
@@ -127,6 +132,7 @@ mat-chip.mat-chip strong {
color: #f1696e;
font-size: 12px;
}
+
.not-allowed {
cursor: not-allowed !important;
user-select: none;
@@ -143,6 +149,7 @@ mat-chip.mat-chip strong {
padding: 40px 20px;
text-align: center;
}
+
.info {
font-size: 15px;
font-weight: 300;
@@ -167,6 +174,7 @@ mat-chip.mat-chip strong {
0% {
-webkit-transform: rotate(0deg);
}
+
100% {
-webkit-transform: rotate(360deg);
}
@@ -176,6 +184,7 @@ mat-chip.mat-chip strong {
0% {
transform: rotate(0deg);
}
+
100% {
transform: rotate(360deg);
}
@@ -235,10 +244,12 @@ mat-chip.mat-chip strong {
}
/* IE can just show/hide with no transition */
-@media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
+@media all and (-ms-high-contrast: none),
+(-ms-high-contrast: active) {
.tooltip-wrap .tooltip {
display: none;
}
+
.tooltip-wrap:hover .tooltip {
display: block;
}
@@ -259,32 +270,43 @@ input[type='number'] {
.text-center {
text-align: center !important;
}
+
.text-right {
text-align: right;
}
+
.m-top-10 {
margin-top: 10px;
}
+
.m-top-15 {
margin-top: 15px;
}
+
.m-top-20 {
margin-top: 20px;
}
+
.m-top-30 {
margin-top: 30px;
}
+
.m-bott-10 {
margin-bottom: 10px;
}
+
.m-top-10p {
margin-top: 10%;
}
-.ml-10 { margin-left: 10px; }
+
+.ml-10 {
+ margin-left: 10px;
+}
.full-height {
height: 100%;
}
+
.ani {
transition: all .35s ease-in-out;
}
@@ -295,6 +317,7 @@ input[type='number'] {
align-items: center;
justify-content: center;
height: 100%;
+
.content {
text-align: center;
}
@@ -302,7 +325,8 @@ input[type='number'] {
#scrolling::-webkit-scrollbar,
.list-selected mat-chip-list .mat-chip-list-wrapper::-webkit-scrollbar {
- width: 6px;
+ width: 5px;
+ height: 5px;
}
#scrolling::-webkit-scrollbar-track,
@@ -327,6 +351,7 @@ input[type='number'] {
color: #fff;
background: #e2747d;
word-break: break-word;
+
span {
position: absolute;
top: -12px;
@@ -346,20 +371,22 @@ input[type='number'] {
white-space: nowrap;
overflow: hidden;
}
+
.capitalize {
text-transform: capitalize;
}
.overlay-container {
#toast-container {
- > div.toast {
- box-shadow: 0 3px 1px -2px rgba(0,0,0,.2), 0 2px 2px 0 rgba(0,0,0,.14), 0 1px 5px 0 rgba(0,0,0,.12);
+ >div.toast {
+ box-shadow: 0 3px 1px -2px rgba(0, 0, 0, .2), 0 2px 2px 0 rgba(0, 0, 0, .14), 0 1px 5px 0 rgba(0, 0, 0, .12);
border-radius: 2px;
background-color: #fff;
padding: 12px 20px;
overflow: inherit;
margin: 0 0 15px;
font-size: 14px;
+
&::before {
position: absolute;
left: -15px;
@@ -371,32 +398,40 @@ input[type='number'] {
padding: 7px;
box-sizing: border-box;
border-radius: 50%;
- box-shadow: 0 3px 1px -2px rgba(0,0,0,.2), 0 2px 2px 0 rgba(0,0,0,.14), 0 1px 5px 0 rgba(0,0,0,.12);
+ box-shadow: 0 3px 1px -2px rgba(0, 0, 0, .2), 0 2px 2px 0 rgba(0, 0, 0, .14), 0 1px 5px 0 rgba(0, 0, 0, .12);
}
+
&.toast-success {
background-image: none;
color: #49af38;
+
&::before {
content: "done";
}
}
+
&.toast-error {
background-image: none;
color: #e2747d;
+
&::before {
content: "priority_high";
}
}
+
&.toast-info {
background-image: none;
color: #35afd5;
+
&::before {
content: "priority_high";
}
}
+
&.toast-warning {
background-image: none;
color: #f7b500;
+
&::before {
content: "priority_high";
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 05/05: Merge branch 'feature/projects' of
github.com:apache/incubator-dlab into feature/projects
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 595c24f388f9df4258628b3164164e3cbf2c1251
Merge: 3653ab3 cb60569
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue Jul 2 15:09:40 2019 +0300
Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects
infrastructure-provisioning/src/edge/fabfile.py | 147 ++++---
.../src/general/lib/os/debian/edge_lib.py | 4 +-
.../src/general/lib/os/redhat/edge_lib.py | 4 +-
.../src/general/scripts/aws/project_prepare.py | 6 +
.../src/general/scripts/aws/ssn_configure.py | 1 +
.../src/general/scripts/gcp/project_prepare.py | 467 +++++++++++++++++++++
.../src/general/scripts/gcp/ssn_configure.py | 2 +-
.../scripts/configure_nginx_reverse_proxy.py | 17 +-
.../src/project/templates/nginx.conf | 20 +-
...CreateProjectResult.java => ProjectResult.java} | 2 +-
.../dlab/dto/{ => project}/ProjectCreateDTO.java | 3 +-
.../epam/dlab/dto/project/ProjectTerminateDTO.java | 13 +
.../response/handlers/ProjectCallbackHandler.java | 12 +-
.../dlab/backendapi/resources/ProjectResource.java | 12 +-
.../dlab/backendapi/service/ProjectService.java | 4 +-
.../service/impl/ProjectServiceImpl.java | 22 +-
.../mock_response/gcp/project_terminate.json | 12 +
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 +-
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 9 +-
.../epam/dlab/backendapi/domain/ProjectDTO.java | 12 +-
.../dlab/backendapi/resources/ProjectResource.java | 6 +-
.../resources/callback/ProjectCallback.java | 14 +-
.../dlab/backendapi/service/ProjectService.java | 3 +-
.../service/impl/ProjectServiceImpl.java | 25 +-
24 files changed, 680 insertions(+), 139 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org