[incubator-dlab] 01/05: [DLAB-652]: added asign project parameter to model
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 ba52e723ad89cbf9fc1346b56e3708cd79849ede
Author: Andriana Kovalyshyn
AuthorDate: Tue Jun 25 17:07:07 2019 +0300
[DLAB-652]: added asign project parameter to model
---
.../webapp/src/app/administration/management/management.model.ts | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts
index 51ab721..641e098 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts
@@ -32,9 +32,9 @@ export class EnvironmentModel {
export class BackupOptionsModel {
constructor(
public configFiles: Array,
-public keys: Array,
-public certificates: Array,
-public jars: Array,
+public keys: Array,
+public certificates: Array,
+public jars: Array,
public databaseBackup: boolean,
public logsBackup: boolean
) { }
@@ -55,4 +55,5 @@ export interface GeneralEnvironmentStatus {
billingQuoteUsed: number;
list_resources: any;
status: string;
+ projectAssigned: boolean;
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/05: [DLAB-652]: disabled environment creation if user not assignet to any project
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 6ba580a8c58183936d3e79793c9e2b6f969a6757 Author: Andriana Kovalyshyn AuthorDate: Tue Jun 25 17:08:52 2019 +0300 [DLAB-652]: disabled environment creation if user not assignet to any project --- .../main/resources/webapp/src/app/resources/resources.component.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html index be44a59..c4fdad8 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html @@ -19,7 +19,8 @@ - + addCreate new @@ -41,4 +42,4 @@ - \ No newline at end of file + - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch feature/projects updated (d90deeb -> a881ecc)
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 d90deeb Merge pull request #128 from bodnarmykola/DLAB-748 new ba52e72 [DLAB-652]: added asign project parameter to model new 6ba580a [DLAB-652]: disabled environment creation if user not assignet to any project new 4ccff54 [DLAB-652]: added check assignment to project; add inform dialog fading new 5ef0b61 [DLAB-652]: update health status check after applying action new a881ecc 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: .../administration/management/management.model.ts | 7 ++-- .../app/administration/roles/roles.component.ts| 43 -- .../src/app/resources/resources.component.html | 5 ++- .../src/app/shared/navbar/navbar.component.html| 3 +- .../src/app/shared/navbar/navbar.component.ts | 43 +- 5 files changed, 58 insertions(+), 43 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 03/05: [DLAB-652]: added check assignment to project; add inform dialog fading
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 4ccff545714b764142131caa81dd000c8ec6ea64
Author: Andriana Kovalyshyn
AuthorDate: Tue Jun 25 17:16:08 2019 +0300
[DLAB-652]: added check assignment to project; add inform dialog fading
---
.../src/app/shared/navbar/navbar.component.html| 3 +-
.../src/app/shared/navbar/navbar.component.ts | 43 +-
2 files changed, 27 insertions(+), 19 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 b7eec53..10abf9c 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
@@ -35,8 +35,7 @@
radio_button_checked
-
-
+
info
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
index 18b8f0d..af6958d 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
@@ -70,6 +70,7 @@ export class NavbarComponent implements OnInit, OnDestroy {
this.subscriptions.add(this.healthStatusService.statusData.subscribe(result => {
this.healthStatus = result;
result.status && this.checkQuoteUsed(this.healthStatus);
+ result.status && !result.projectAssigned &&
this.checkAssignment(this.healthStatus);
}));
this.subscriptions.add(timer(0,
this.CHECK_ACTIVE_SCHEDULE_TIMEOUT).subscribe(() =>
this.refreshSchedulerData()));
this.currentUserName = this.getUserName();
@@ -102,7 +103,7 @@ export class NavbarComponent implements OnInit, OnDestroy {
public emitQuotes(alert, user_quota?, total_quota?): void {
const dialogRef: MatDialogRef =
this.dialog.open(NotificationDialogComponent, {
- data: { template: this.selectQuotesAlert(alert, user_quota,
total_quota), type: 'message' },
+ data: { template: this.selectAlert(alert, user_quota, total_quota),
type: 'message' },
width: '550px'
});
dialogRef.afterClosed().subscribe(() => {
@@ -124,22 +125,27 @@ export class NavbarComponent implements OnInit, OnDestroy
{
}
}
+ private checkAssignment(params): void {
+if (this.dialog.openDialogs.length > 0) return;
+this.emitQuotes('permissions');
+ }
+
private refreshSchedulerData(): void {
-
this.schedulerService.getActiveSchcedulersData(this.CHECK_ACTIVE_SCHEDULE_PERIOD).subscribe((list:
Array) => {
-if (list.length) {
- if (this.dialog.openDialogs.length > 0) return;
- const filteredData = this.groupSchedulerData(list);
- this.dialog.open(NotificationDialogComponent, {
-data: { template: filteredData, type: 'list' },
-width: '550px'
- });
-}
+
this.schedulerService.getActiveSchcedulersData(this.CHECK_ACTIVE_SCHEDULE_PERIOD).subscribe((list:
Array) => {
+ if (list.length) {
+if (this.dialog.openDialogs.length > 0) return;
+const filteredData = this.groupSchedulerData(list);
+this.dialog.open(NotificationDialogComponent, {
+ data: { template: filteredData, type: 'list' },
+ width: '550px'
+});
+ }
});
}
private groupSchedulerData(sheduler_data) {
const memo = { notebook: [], cluster: [] };
-sheduler_data.map(item => !item.computational_name ?
memo.notebook.push(item) : memo.cluster.push(item));
+sheduler_data.map(item => !item.computational_name ?
memo.notebook.push(item) : memo.cluster.push(item));
memo.cluster = memo.cluster.filter(el => !memo.notebook.some(elm =>
el.exploratory_name === elm.exploratory_name));
return memo;
}
@@ -153,24 +159,27 @@ export class NavbarComponent implements OnInit, OnDestroy
{
});
}
- private selectQuotesAlert(type: string, user_quota?: number, total_quota?:
number): string {
+ private selectAlert(type: string, user_quota?: number, total_quota?:
number): string {
const alerts = {
- user_exceed: `Dear ${ this.currentUserName },
+ user_exceed: `Dear ${this.currentUserName},
DLab cloud infrastructure usage quota associated with your user has
been exceeded.
All your analytical environment will be stopped. To proceed working
with environment,
request increase of user quota from DLab administrator.`,
- total_exceed: `Dear ${ this.currentUserName },
+ total_exceed:
[incubator-dlab] 05/05: Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects
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 a881ecc1b23502407f44a250267117fd888e20e2
Merge: 5ef0b61 d90deeb
Author: Andriana Kovalyshyn
AuthorDate: Tue Jun 25 17:17:54 2019 +0300
Merge branch 'feature/projects' of github.com:apache/incubator-dlab into
feature/projects
.../src/base/scripts/install_user_key.py | 5 +-
.../edge/scripts/configure_nginx_reverse_proxy.py | 3 +-
.../{dataengine-service.conf => emr.conf} | 0
.../src/edge/templates/nginx.conf | 8 +-
.../src/general/api/check_inactivity.py| 4 +-
.../src/general/api/configure.py | 4 +-
.../src/general/api/create.py | 4 +-
.../src/general/api/create_image.py| 4 +-
.../src/general/api/git_creds.py | 4 +-
.../src/general/api/install_libs.py| 4 +-
.../src/general/api/list_libs.py | 8 +-
.../src/general/api/reconfigure_spark.py | 4 +-
.../src/general/api/recreate.py| 4 +-
.../src/general/api/reupload_key.py| 4 +-
.../src/general/api/start.py | 4 +-
.../src/general/api/status.py | 4 +-
.../src/general/api/stop.py| 4 +-
.../src/general/api/terminate.py | 4 +-
.../src/general/api/terminate_image.py | 4 +-
.../src/general/files/aws/base_Dockerfile | 3 +-
.../src/general/files/aws/edge_description.json| 4 -
.../aws/{edge_Dockerfile => project_Dockerfile}| 4 +-
.../src/general/files/aws/project_description.json | 4 +
.../src/general/lib/os/debian/edge_lib.py | 2 +-
.../src/general/lib/os/redhat/edge_lib.py | 2 +-
.../scripts/aws/common_create_notebook_image.py| 8 +-
...common_notebook_configure_dataengine-service.py | 8 +-
.../aws/common_notebook_configure_dataengine.py| 6 +-
.../general/scripts/aws/common_prepare_notebook.py | 15 +-
.../general/scripts/aws/common_start_notebook.py | 2 +-
.../general/scripts/aws/common_stop_notebook.py| 4 +-
.../scripts/aws/common_terminate_notebook.py | 4 +-
.../scripts/aws/dataengine-service_configure.py| 16 +-
.../scripts/aws/dataengine-service_create.py | 18 +-
.../scripts/aws/dataengine-service_install_libs.py | 2 +-
.../scripts/aws/dataengine-service_list_libs.py| 2 +-
.../scripts/aws/dataengine-service_prepare.py | 18 +-
.../scripts/aws/dataengine-service_terminate.py| 4 +-
.../general/scripts/aws/dataengine_configure.py| 16 +-
.../src/general/scripts/aws/dataengine_prepare.py | 14 +-
.../src/general/scripts/aws/dataengine_start.py| 6 +-
.../src/general/scripts/aws/dataengine_stop.py | 6 +-
.../general/scripts/aws/dataengine_terminate.py| 6 +-
.../general/scripts/aws/deeplearning_configure.py | 12 +-
.../scripts/aws/edge_associate_elastic_ip.py | 2 +-
.../src/general/scripts/aws/edge_configure.py | 63 ++--
.../src/general/scripts/aws/edge_start.py | 4 +-
.../src/general/scripts/aws/edge_status.py | 2 +-
.../src/general/scripts/aws/edge_stop.py | 4 +-
.../src/general/scripts/aws/jupyter_configure.py | 12 +-
.../jupyter_dataengine-service_create_configs.py | 4 +-
.../jupyter_install_dataengine-service_kernels.py | 4 +-
.../aws/{edge_prepare.py => project_prepare.py}| 378 +++--
.../{edge_terminate.py => project_terminate.py}| 46 +--
.../src/general/scripts/aws/rstudio_configure.py | 12 +-
.../rstudio_dataengine-service_create_configs.py | 2 +-
.../rstudio_install_dataengine-service_kernels.py | 4 +-
.../src/general/scripts/aws/ssn_configure.py | 2 +-
.../scripts/aws/tensor-rstudio_configure.py| 14 +-
.../src/general/scripts/aws/tensor_configure.py| 14 +-
.../src/general/scripts/aws/zeppelin_configure.py | 12 +-
.../zeppelin_dataengine-service_create_configs.py | 6 +-
.../zeppelin_install_dataengine-service_kernels.py | 6 +-
.../general/scripts/os/common_clean_instance.py| 4 +-
.../general/scripts/os/dataengine_install_libs.py | 2 +-
.../src/general/scripts/os/dataengine_list_libs.py | 2 +-
.../scripts/os/dataengine_reconfigure_spark.py | 2 +-
.../src/general/scripts/os/notebook_git_creds.py | 2 +-
.../scripts/os/notebook_inactivity_check.py| 4 +-
.../general/scripts/os/notebook_install_libs.py| 2 +-
.../src/general/scripts/os/notebook_list_libs.py | 2 +-
.../scripts/os/notebook_reconfigure_spark.py | 2 +-
.../fabfile.py}| 59 ++--
.../scripts/configure_http_proxy.py} | 36 +-
[incubator-dlab] 04/05: [DLAB-652]: update health status check after applying action
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 5ef0b61c768a11783ae3b807e7e854fe58b010bf
Author: Andriana Kovalyshyn
AuthorDate: Tue Jun 25 17:17:35 2019 +0300
[DLAB-652]: update health status check after applying action
---
.../app/administration/roles/roles.component.ts| 43 --
1 file changed, 24 insertions(+), 19 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 16e5a67..a47c9ee 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
@@ -44,7 +44,7 @@ export class RolesComponent implements OnInit {
public healthStatus: any;
public delimitersRegex = /[-_]?/g;
public groupnamePattern = new RegExp(/^[a-zA-Z0-9_\-]+$/);
-
+
stepperView: boolean = false;
displayedColumns: string[] = ['name', 'roles', 'users', 'actions'];
@Output() manageRolesGroupAction: EventEmitter<{}> = new EventEmitter();
@@ -57,8 +57,8 @@ export class RolesComponent implements OnInit {
) { }
ngOnInit() {
- this.openManageRolesDialog();
- this.getEnvironmentHealthStatus();
+this.openManageRolesDialog();
+this.getEnvironmentHealthStatus();
}
openManageRolesDialog() {
@@ -68,12 +68,12 @@ export class RolesComponent implements OnInit {
this.roles = roles;
this.rolesList = roles.map(role => role.description);
this.updateGroupData(groups);
-
+
this.stepperView = false;
},
error => this.toastr.error(error.message, 'Oops!'));
},
-error => this.toastr.error(error.message, 'Oops!'));
+ error => this.toastr.error(error.message, 'Oops!'));
}
getGroupsData() {
@@ -89,15 +89,16 @@ export class RolesComponent implements OnInit {
public manageAction(action: string, type: string, item?: any, value?) {
if (action === 'create') {
this.manageRolesGroups(
-{ action, type, value: {
- name: this.setupGroup,
- users: this.setupUser ? this.setupUser.split(',').map(elem =>
elem.trim()) : [],
- roleIds: this.extractIds(this.roles, this.setupRoles)
-}
- });
+{
+ action, type, value: {
+name: this.setupGroup,
+users: this.setupUser ? this.setupUser.split(',').map(elem =>
elem.trim()) : [],
+roleIds: this.extractIds(this.roles, this.setupRoles)
+ }
+});
this.stepperView = false;
} else if (action === 'delete') {
- const data = (type === 'users') ? {group: item.group, user: value} :
{group: item.group, id: item};
+ const data = (type === 'users') ? { group: item.group, user: value } : {
group: item.group, id: item };
const dialogRef: MatDialogRef =
this.dialog.open(
ConfirmDeleteUserAccountDialogComponent,
{ data: data, width: '550px', panelClass: 'error-modalbox' }
@@ -106,17 +107,21 @@ export class RolesComponent implements OnInit {
dialogRef.afterClosed().subscribe(result => {
if (result) {
const emitValue = (type === 'users')
-? {action, type, id: item.name, value: { user: value, group:
item.group }}
-: {action, type, id: item.name, value: item.group} ;
+? { action, type, id: item.name, value: { user: value, group:
item.group } }
+: { action, type, id: item.name, value: item.group };
this.manageRolesGroups(emitValue);
}
});
} else if (action === 'update') {
- this.manageRolesGroups({action, type, value: {
-name: item.group,
-roleIds: this.extractIds(this.roles, item.selected_roles),
-users: item.users || [] }});
+ this.manageRolesGroups({
+action, type, value: {
+ name: item.group,
+ roleIds: this.extractIds(this.roles, item.selected_roles),
+ users: item.users || []
+}
+ });
}
+this.getEnvironmentHealthStatus();
this.resetDialog();
}
@@ -151,7 +156,7 @@ export class RolesComponent implements OnInit {
default:
}
}
-
+
public extractIds(sourceList, target) {
return sourceList.reduce((acc, item) => {
target.includes(item.description) && acc.push(item._id);
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch feature/projects updated (fafb734 -> d90deeb)
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a change to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from fafb734 DLAB-000 added project service to provision conf
new 21a9bb0 DLAB-608 changed error message for scheduler validation
new f904b85 project creatin (subnet creation)
new 898cf49 project creatin (subnet creation) (project_Dockerfile added)
new b8846a4 project creatin (subnet creation) (ssn_configure.py updated)
new 070eb58 project creatin (subnet creation) (project_description.json
added)
new 883293a project creatin (subnet creation) (/project_prepare.py fixed)
new 2d53c68 project creatin (subnet creation) (/project_prepare.py fixed)
new 6fbb237 project creatin (subnet creation) (/project_prepare.py fixed)
new 08d5273 project creatin (subnet creation) (/project_prepare.py fixed)
new 381d656 project creatin (subnet creation) (/project_prepare.py fixed;
create.py fixed)
new f8049c5 project creatin (/project_prepare.py fixed;
edge_associate_elastic_ip.py fixed; project_Dockerfile fixed)
new 962891d project creatin (/project_prepare.py fixed)
new ec4422e Merge branch 'myDLAB-748' into DLAB-748
new bf6c325 fabfile updated edge_configure updated project_prepare fixed
project_terminate created
new a1a60ba proxy setting updated user key uploading updated
new 90fc211 project terminate updated
new ea20f10 create.py fixed adge_associate_elastic_ip.py fixed
new 12c7d8d project_name instead edge_user_name fixed
new f63b446 project_name instead edge_user_name fixed in api and others
new cadbaf3 bug fixed
new f4b18fc project termination bug fixed
new d90deeb Merge pull request #128 from bodnarmykola/DLAB-748
The 6215 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:
.../src/base/scripts/install_user_key.py | 5 +-
.../edge/scripts/configure_nginx_reverse_proxy.py | 3 +-
.../{dataengine-service.conf => emr.conf} | 0
.../src/edge/templates/nginx.conf | 8 +-
.../src/general/api/check_inactivity.py| 4 +-
.../src/general/api/configure.py | 4 +-
.../src/general/api/create.py | 4 +-
.../src/general/api/create_image.py| 4 +-
.../src/general/api/git_creds.py | 4 +-
.../src/general/api/install_libs.py| 4 +-
.../src/general/api/list_libs.py | 8 +-
.../src/general/api/reconfigure_spark.py | 4 +-
.../src/general/api/recreate.py| 4 +-
.../src/general/api/reupload_key.py| 4 +-
.../src/general/api/start.py | 4 +-
.../src/general/api/status.py | 4 +-
.../src/general/api/stop.py| 4 +-
.../src/general/api/terminate.py | 4 +-
.../src/general/api/terminate_image.py | 4 +-
.../src/general/files/aws/base_Dockerfile | 3 +-
.../src/general/files/aws/edge_description.json| 4 -
.../aws/{edge_Dockerfile => project_Dockerfile}| 4 +-
.../src/general/files/aws/project_description.json | 4 +
.../src/general/lib/os/debian/edge_lib.py | 2 +-
.../src/general/lib/os/redhat/edge_lib.py | 2 +-
.../scripts/aws/common_create_notebook_image.py| 8 +-
...common_notebook_configure_dataengine-service.py | 8 +-
.../aws/common_notebook_configure_dataengine.py| 6 +-
.../general/scripts/aws/common_prepare_notebook.py | 15 +-
.../general/scripts/aws/common_start_notebook.py | 2 +-
.../general/scripts/aws/common_stop_notebook.py| 4 +-
.../scripts/aws/common_terminate_notebook.py | 4 +-
.../scripts/aws/dataengine-service_configure.py| 16 +-
.../scripts/aws/dataengine-service_create.py | 18 +-
.../scripts/aws/dataengine-service_install_libs.py | 2 +-
.../scripts/aws/dataengine-service_list_libs.py| 2 +-
.../scripts/aws/dataengine-service_prepare.py | 18 +-
.../scripts/aws/dataengine-service_terminate.py| 4 +-
.../general/scripts/aws/dataengine_configure.py| 16 +-
.../src/general/scripts/aws/dataengine_prepare.py | 14 +-
.../src/general/scripts/aws/dataengine_start.py| 6 +-
.../src/general/scripts/aws/dataengine_stop.py | 6 +-
.../general/scripts/aws/dataengine_terminate.py| 6 +-
.../general/scripts/aws/deeplearning_configure.py | 12 +-
.../scripts/aws/edge_associate_elastic_ip.py | 2 +-
.../src/general/scripts/aws/edge_configure.py | 63 ++--
.../src/general/scripts/aws/edge_start.py | 4 +-
[incubator-dlab] branch DLAB-667 updated: [DLAB-667] Added key_name and cluster_name variables[AWS]
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-667
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-667 by this push:
new 25ba035 [DLAB-667] Added key_name and cluster_name variables[AWS]
25ba035 is described below
commit 25ba035ce0893c4c740ee483f953ace4dc3f215e
Author: Dyoma33
AuthorDate: Tue Jun 25 16:20:39 2019 +0300
[DLAB-667] Added key_name and cluster_name variables[AWS]
---
infrastructure-provisioning/terraform/main/main.tf | 3 +++
.../terraform/main/variables.tf| 4
.../terraform/modules/data_engine/instance.tf | 22 --
.../terraform/modules/data_engine/variables.tf | 4
.../terraform/modules/notebook/instance.tf | 1 +
.../terraform/modules/notebook/variables.tf| 2 ++
6 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/infrastructure-provisioning/terraform/main/main.tf
b/infrastructure-provisioning/terraform/main/main.tf
index 11abc1e..d2996d9 100644
--- a/infrastructure-provisioning/terraform/main/main.tf
+++ b/infrastructure-provisioning/terraform/main/main.tf
@@ -33,6 +33,7 @@ module "notebook" {
product = "${var.product_name}"
ami = "${var.ami}"
instance_type= "${var.instance_type}"
+ key_name = "${var.key_name}"
}
module "data_engine" {
@@ -48,6 +49,8 @@ module "data_engine" {
product = "${var.product_name}"
ami = "${var.ami}"
instance_type= "${var.instance_type}"
+ key_name = "${var.key_name}"
+ cluster_name = "${var.cluster_name}"
slave_count = "${var.slave_count}"
}
diff --git a/infrastructure-provisioning/terraform/main/variables.tf
b/infrastructure-provisioning/terraform/main/variables.tf
index 9783e9e..ce056e7 100644
--- a/infrastructure-provisioning/terraform/main/variables.tf
+++ b/infrastructure-provisioning/terraform/main/variables.tf
@@ -34,6 +34,10 @@ variable "ami" {}
variable "instance_type" {}
+variable "key_name" {}
+
+variable "cluster_name" {}
+
variable "slave_count" {}
variable "source_instance_id" {}
\ No newline at end of file
diff --git
a/infrastructure-provisioning/terraform/modules/data_engine/instance.tf
b/infrastructure-provisioning/terraform/modules/data_engine/instance.tf
index 6f2e55e..95a8ccc 100644
--- a/infrastructure-provisioning/terraform/modules/data_engine/instance.tf
+++ b/infrastructure-provisioning/terraform/modules/data_engine/instance.tf
@@ -1,22 +1,23 @@
locals {
- node_name= "${var.project_tag}-de-${var.notebook_name}-Spark"
- dataengine_notebook_name = "${var.project_tag}-nb-${var.notebook_name}"
+ cluster_name=
"${var.project_tag}-de-${var.notebook_name}-${var.cluster_name}"
+ notebook_name = "${var.project_tag}-nb-${var.notebook_name}"
}
resource "aws_instance" "master" {
ami = "${var.ami}"
instance_type= "${var.instance_type}"
+ key_name = "${var.key_name}"
subnet_id= "${var.aws_subnet_id}"
security_groups = ["${var.nb-sg_id}"]
iam_instance_profile = "${var.iam_profile_name}"
tags = {
-Name = "${local.node_name}-m"
+Name = "${local.cluster_name}-m"
Type = "master"
-dataengine_notebook_name = "${local.dataengine_notebook_name}"
-"${var.project_tag}-Tag" = "${local.node_name}-m"
+dataengine_notebook_name = "${local.notebook_name}"
+"${var.project_tag}-Tag" = "${local.cluster_name}-m"
User_tag = "${var.user_tag}"
Endpoint_Tag = "${var.endpoint_tag}"
-"user:tag" = "${var.project_tag}:${local.node_name}"
+"user:tag" = "${var.project_tag}:${local.cluster_name}"
Custom_Tag = "${var.custom_tag}"
}
}
@@ -26,17 +27,18 @@ resource "aws_instance" "slave" {
count = "${var.slave_count}"
ami = "${var.ami}"
instance_type= "${var.instance_type}"
+ key_name = "${var.key_name}"
subnet_id= "${var.aws_subnet_id}"
security_groups = ["${var.nb-sg_id}"]
iam_instance_profile = "${var.iam_profile_name}"
tags = {
-Name = "${local.node_name}-s${count.index + 1}"
+Name = "${local.cluster_name}-s${count.index + 1}"
Type = "slave"
-dataengine_notebook_name = "${local.dataengine_notebook_name}"
-"${var.project_tag}-Tag" = "${local.node_name}-s${count.index + 1}"
+dataengine_notebook_name = "${local.notebook_name}"
+"${var.project_tag}-Tag" = "${local.cluster_name}-s${count.index + 1}"
User_tag = "${var.user_tag}"
Endpoint_Tag = "${var.endpoint_tag}"
-"user:tag" =
[incubator-dlab] 05/05: DLAB-000 added project service to provision conf
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a commit to branch feature/projects in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit fafb73435d95481191d761285a987830ba36a493 Author: bhliva AuthorDate: Tue Jun 25 16:10:20 2019 +0300 DLAB-000 added project service to provision conf --- .../main/java/com/epam/dlab/backendapi/modules/ProductionModule.java | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java index 3ba4d42..bfaac79 100644 --- a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java +++ b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/modules/ProductionModule.java @@ -29,9 +29,11 @@ import com.epam.dlab.backendapi.core.commands.CommandExecutor; import com.epam.dlab.backendapi.core.commands.ICommandExecutor; import com.epam.dlab.backendapi.core.response.handlers.dao.CallbackHandlerDao; import com.epam.dlab.backendapi.core.response.handlers.dao.FileSystemCallbackHandlerDao; -import com.epam.dlab.backendapi.service.RestoreCallbackHandlerService; import com.epam.dlab.backendapi.service.CheckInactivityService; +import com.epam.dlab.backendapi.service.ProjectService; +import com.epam.dlab.backendapi.service.RestoreCallbackHandlerService; import com.epam.dlab.backendapi.service.impl.CheckInactivityServiceImpl; +import com.epam.dlab.backendapi.service.impl.ProjectServiceImpl; import com.epam.dlab.backendapi.service.impl.RestoreCallbackHandlerServiceImpl; import com.epam.dlab.constants.ServiceConsts; import com.epam.dlab.mongo.MongoService; @@ -75,5 +77,6 @@ public class ProductionModule extends ModuleBase
[incubator-dlab] 04/05: DLAB-818 fixed bug connected with resource creation
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 06d3b1dc8de00432825c0bf7472d6acc6b9ea22a
Author: bhliva
AuthorDate: Tue Jun 25 16:09:07 2019 +0300
DLAB-818 fixed bug connected with resource creation
---
.../dlab/rest/mappers/ValidationExceptionMapper.java| 2 +-
.../java/com/epam/dlab/backendapi/dao/ProjectDAO.java | 3 +++
.../com/epam/dlab/backendapi/dao/ProjectDAOImpl.java| 17 +
.../com/epam/dlab/backendapi/domain/ProjectDTO.java | 2 ++
.../epam/dlab/backendapi/resources/ProjectResource.java | 17 +
.../epam/dlab/backendapi/service/ProjectService.java| 1 +
.../backendapi/service/impl/ProjectServiceImpl.java | 5 +
.../core/services/applicationServiceFacade.service.ts | 8
.../webapp/src/app/core/services/project.service.ts | 10 +-
.../create-environment/create-environment.component.ts | 6 +-
10 files changed, 68 insertions(+), 3 deletions(-)
diff --git
a/services/dlab-webapp-common/src/main/java/com/epam/dlab/rest/mappers/ValidationExceptionMapper.java
b/services/dlab-webapp-common/src/main/java/com/epam/dlab/rest/mappers/ValidationExceptionMapper.java
index 49ce81f..700ce4d 100644
---
a/services/dlab-webapp-common/src/main/java/com/epam/dlab/rest/mappers/ValidationExceptionMapper.java
+++
b/services/dlab-webapp-common/src/main/java/com/epam/dlab/rest/mappers/ValidationExceptionMapper.java
@@ -36,7 +36,7 @@ public class ValidationExceptionMapper implements
ExceptionMapper
ConstraintMessage.getMessage(violation, invocable))
- .collect(Collectors.joining());
+
.collect(Collectors.joining(","));
return Response.status(Response.Status.BAD_REQUEST)
.entity(new
ErrorDTO(Response.Status.BAD_REQUEST.getStatusCode(), errors))
.type(MediaType.APPLICATION_JSON)
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java
index 35cfd1b..2e2ab55 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAO.java
@@ -1,5 +1,6 @@
package com.epam.dlab.backendapi.dao;
+import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.backendapi.domain.ProjectDTO;
import com.epam.dlab.dto.base.project.ProjectEdgeInfo;
@@ -10,6 +11,8 @@ import java.util.Set;
public interface ProjectDAO {
List getProjects();
+ List getUserProjects(UserInfo userInfo);
+
void create(ProjectDTO projectDTO);
void updateStatus(String projectName, ProjectDTO.Status status);
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
index c3a6752..dd89e5d 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/dao/ProjectDAOImpl.java
@@ -1,8 +1,11 @@
package com.epam.dlab.backendapi.dao;
+import com.epam.dlab.auth.UserInfo;
import com.epam.dlab.backendapi.domain.ProjectDTO;
import com.epam.dlab.dto.base.project.ProjectEdgeInfo;
import com.google.common.collect.Iterables;
+import com.google.common.collect.Sets;
+import com.google.inject.Inject;
import com.mongodb.BasicDBObject;
import com.mongodb.client.result.UpdateResult;
import org.bson.Document;
@@ -22,12 +25,26 @@ public class ProjectDAOImpl extends BaseDAO implements
ProjectDAO {
private static final String STATUS_FIELD = "status";
private static final String EDGE_INFO_FIELD = "edgeInfo";
+ private final UserGroupDao userGroupDao;
+
+ @Inject
+ public ProjectDAOImpl(UserGroupDao userGroupDao) {
+ this.userGroupDao = userGroupDao;
+ }
+
+
@Override
public List getProjects() {
return find(PROJECTS_COLLECTION, ProjectDTO.class);
}
@Override
+ public List getUserProjects(UserInfo userInfo) {
+ return find(PROJECTS_COLLECTION, in(GROUPS,
Sets.union(userGroupDao.getUserGroups(userInfo.getName()),
+ userInfo.getRoles())),
ProjectDTO.class);
+ }
+
+ @Override
public void create(ProjectDTO projectDTO) {
insertOne(PROJECTS_COLLECTION, projectDTO);
}
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/domain/ProjectDTO.java
index
[incubator-dlab] 03/05: Merge remote-tracking branch 'origin/feature/projects' into feature/projects
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a commit to branch feature/projects in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit b7177c6f7d9b10032bbea73baf132aa34575693a Merge: f93b7c3 214a9ac Author: bhliva AuthorDate: Tue Jun 25 14:22:03 2019 +0300 Merge remote-tracking branch 'origin/feature/projects' into feature/projects .../project-form/project-form.component.html | 14 ++-- .../project/project-form/project-form.component.ts | 4 +- .../resources/webapp/src/assets/styles/_theme.scss | 85 +- 3 files changed, 91 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/05: DLAB-745, 746 introduced edge per project
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 22583969384fe31db44f434b14a3753a91673b4f
Author: bhliva
AuthorDate: Mon Jun 24 15:17:07 2019 +0300
DLAB-745, 746 introduced edge per project
---
.../java/com/epam/dlab/dto/ProjectCreateDTO.java | 15 ++
.../dlab/dto/base/project/CreateProjectResult.java | 15 ++
.../dlab/dto/base/project/ProjectEdgeInfo.java | 28 ++
.../backendapi/ProvisioningServiceApplication.java | 1 +
.../core/commands/CommandExecutorMockAsync.java| 4 +-
.../response/handlers/ProjectCallbackHandler.java | 45 +
.../backendapi/modules/ProvisioningDevModule.java | 3 ++
.../dlab/backendapi/resources/ProjectResource.java | 31
.../dlab/backendapi/service/ProjectService.java| 9
.../service/impl/ProjectServiceImpl.java | 59 ++
.../mock_response/gcp/project_create.json | 56
.../dlab/backendapi/SelfServiceApplication.java| 4 +-
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 5 ++
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 21
.../epam/dlab/backendapi/domain/ProjectDTO.java| 10
.../dlab/backendapi/resources/ProjectResource.java | 5 +-
.../resources/callback/ProjectCallback.java| 46 +
.../dlab/backendapi/service/ProjectService.java| 2 +-
.../service/impl/ProjectServiceImpl.java | 34 -
.../InfrastructureTemplateServiceBaseTest.java | 6 +--
20 files changed, 388 insertions(+), 11 deletions(-)
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/ProjectCreateDTO.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/ProjectCreateDTO.java
new file mode 100644
index 000..a5ec693
--- /dev/null
+++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/ProjectCreateDTO.java
@@ -0,0 +1,15 @@
+package com.epam.dlab.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
+import lombok.Data;
+
+@Data
+@Builder
+public class ProjectCreateDTO extends ResourceBaseDTO {
+ private final String key;
+ @JsonProperty("project_name")
+ private final String name;
+ @JsonProperty("project_tag")
+ private final String tag;
+}
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/CreateProjectResult.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/CreateProjectResult.java
new file mode 100644
index 000..3059b0e
--- /dev/null
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/CreateProjectResult.java
@@ -0,0 +1,15 @@
+package com.epam.dlab.dto.base.project;
+
+import com.epam.dlab.dto.StatusBaseDTO;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class CreateProjectResult extends StatusBaseDTO {
+ private ProjectEdgeInfo edgeInfo;
+ @JsonProperty("project_name")
+ private String projectName;
+
+}
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java
new file mode 100644
index 000..0bf1c20
--- /dev/null
+++
b/services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java
@@ -0,0 +1,28 @@
+package com.epam.dlab.dto.base.project;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class ProjectEdgeInfo {
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
+ private String id;
+
+ @JsonProperty("instance_id")
+ private String instanceId;
+
+ @JsonProperty
+ private String hostname;
+
+ @JsonProperty("public_ip")
+ private String publicIp;
+
+ @JsonProperty
+ private String ip;
+
+ @JsonProperty("key_name")
+ private String keyName;
+}
diff --git
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/ProvisioningServiceApplication.java
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/ProvisioningServiceApplication.java
index 4f063c6..2353f2d 100644
---
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/ProvisioningServiceApplication.java
+++
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/ProvisioningServiceApplication.java
@@ -102,6 +102,7 @@ public class ProvisioningServiceApplication extends
Application {
private void action(String user, DockerAction action) {
String
[incubator-dlab] branch feature/projects updated (214a9ac -> fafb734)
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a change to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 214a9ac [DLAB-740]: key uploading fixes
new 2258396 DLAB-745, 746 introduced edge per project
new f93b7c3 Merge remote-tracking branch 'origin/feature/projects' into
feature/projects
new b7177c6 Merge remote-tracking branch 'origin/feature/projects' into
feature/projects
new 06d3b1d DLAB-818 fixed bug connected with resource creation
new fafb734 DLAB-000 added project service to provision conf
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:
.../java/com/epam/dlab/dto/ProjectCreateDTO.java | 15 ++
.../dlab/dto/base/project/CreateProjectResult.java | 15 ++
.../dlab/dto/base/project/ProjectEdgeInfo.java | 28 ++
.../rest/mappers/ValidationExceptionMapper.java| 2 +-
.../backendapi/ProvisioningServiceApplication.java | 1 +
.../core/commands/CommandExecutorMockAsync.java| 4 +-
.../response/handlers/ProjectCallbackHandler.java | 45 +
.../dlab/backendapi/modules/ProductionModule.java | 5 +-
.../backendapi/modules/ProvisioningDevModule.java | 3 ++
.../dlab/backendapi/resources/ProjectResource.java | 31
.../dlab/backendapi/service/ProjectService.java| 9
.../service/impl/ProjectServiceImpl.java | 59 ++
.../gcp/{edge_create.json => project_create.json} | 5 +-
.../dlab/backendapi/SelfServiceApplication.java| 4 +-
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 8 +++
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 38 ++
.../epam/dlab/backendapi/domain/ProjectDTO.java| 12 +
.../dlab/backendapi/resources/ProjectResource.java | 22 +++-
.../resources/callback/ProjectCallback.java| 46 +
.../dlab/backendapi/service/ProjectService.java| 3 +-
.../service/impl/ProjectServiceImpl.java | 39 +-
.../services/applicationServiceFacade.service.ts | 8 +++
.../src/app/core/services/project.service.ts | 10 +++-
.../create-environment.component.ts| 6 ++-
.../InfrastructureTemplateServiceBaseTest.java | 6 +--
25 files changed, 407 insertions(+), 17 deletions(-)
create mode 100644
services/dlab-model/src/main/java/com/epam/dlab/dto/ProjectCreateDTO.java
create mode 100644
services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/CreateProjectResult.java
create mode 100644
services/dlab-model/src/main/java/com/epam/dlab/dto/base/project/ProjectEdgeInfo.java
create mode 100644
services/provisioning-service/src/main/java/com/epam/dlab/backendapi/core/response/handlers/ProjectCallbackHandler.java
create mode 100644
services/provisioning-service/src/main/java/com/epam/dlab/backendapi/resources/ProjectResource.java
create mode 100644
services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/ProjectService.java
create mode 100644
services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
copy
services/provisioning-service/src/main/resources/mock_response/gcp/{edge_create.json
=> project_create.json} (96%)
create mode 100644
services/self-service/src/main/java/com/epam/dlab/backendapi/resources/callback/ProjectCallback.java
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/05: Merge remote-tracking branch 'origin/feature/projects' into feature/projects
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a commit to branch feature/projects in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit f93b7c31367e820be8a2ab00c14fae0bc91645dd Merge: 2258396 a3af707 Author: bhliva AuthorDate: Mon Jun 24 15:19:08 2019 +0300 Merge remote-tracking branch 'origin/feature/projects' into feature/projects .../management-grid/management-grid.component.html | 8 +-- .../project-list/project-list.component.html | 16 -- .../project-list/project-list.component.scss | 9 ...mputational-resource-create-dialog.component.ts | 18 --- .../computational-resource-create.model.ts | 12 +++-- .../create-environment.component.html | 58 ++ .../create-environment.component.ts| 12 ++--- .../detail-dialog/detail-dialog.component.html | 4 +- .../resources-grid/resources-grid.component.html | 2 +- .../resources-grid/resources-grid.model.ts | 8 ++- 10 files changed, 97 insertions(+), 50 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch feature/projects updated: [DLAB-740]: key uploading fixes
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
The following commit(s) were added to refs/heads/feature/projects by this push:
new 214a9ac [DLAB-740]: key uploading fixes
214a9ac is described below
commit 214a9ac58b1c3018a66b92d2bb2b0ca959be9c7d
Author: Andriana Kovalyshyn
AuthorDate: Tue Jun 25 13:08:20 2019 +0300
[DLAB-740]: key uploading fixes
---
.../project-form/project-form.component.html | 14 ++--
.../project/project-form/project-form.component.ts | 4 +-
.../resources/webapp/src/assets/styles/_theme.scss | 85 +-
3 files changed, 91 insertions(+), 12 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
index 7adb299..052bcd8 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
@@ -30,17 +30,19 @@
- help_outlineWhere can I get public key?
+
+help_outlineWhere can I get
public key?
-
+
Upload
-
+
-
- {{ keyLabel }}
+
+
+{{ keyLabel }}
@@ -107,7 +109,7 @@
Clear
keyboard_arrow_leftBack
+class="material-icons">keyboard_arrow_leftBack
Nextkeyboard_arrow_right
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 8f1fde0..3c2627b 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,7 +100,7 @@ export class ProjectFormComponent implements OnInit {
public onFileChange($event) {
const reader = new FileReader();
-if($event.target.files && $event.target.files.length) {
+if ($event.target.files && $event.target.files.length) {
const [file] = $event.target.files;
reader.readAsDataURL(file);
@@ -123,6 +123,7 @@ export class ProjectFormComponent implements OnInit {
private initFormModel(): void {
this.projectForm = this._fb.group({
+ 'key': ['', Validators.required],
'name': ['', Validators.compose([Validators.required,
Validators.pattern(PATTERNS.namePattern), this.checkDuplication.bind(this)])],
'endpoints': [[], Validators.required],
'tag': ['', Validators.compose([Validators.required,
Validators.pattern(PATTERNS.namePattern)])],
@@ -142,7 +143,6 @@ export class ProjectFormComponent implements OnInit {
}
private getLabel(file: File): string {
-debugger;
return file ? !this.accessKeyValid ? 'Public key is required.' : file.name
: '';
}
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 7ddacce..4945879 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
@@ -28,11 +28,13 @@
font-size: 15px;
font-family: 'Open Sans', sans-serif;
color: #577289;
+
i {
margin: 0 5px 0 0;
font-size: 20px;
vertical-align: sub;
}
+
span {
i {
margin: 0 5px 0 0;
@@ -40,27 +42,34 @@
vertical-align: sub;
}
}
+
&.mini {
width: 80px;
}
+
&.action {
width: 140px;
}
+
&.butt-success {
background-color: #49af38;
margin-left: 25px;
color: #fff;
+
&.mini {
margin-left: 5px;
width: 80px;
}
}
+
&.butt-create {
color: #35afd5;
- &:disabled{
-color: #577289!important;
+
+ &:disabled {
+color: #577289 !important;
}
}
+
&:disabled {
cursor: not-allowed;
opacity: 0.6;
@@ -78,14 +87,18 @@
font-size: 15px;
font-weight: 300;
box-shadow: 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0,
0.14), 0 1px 5px 0
