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/08/09 11:02:57 UTC
[incubator-dlab] branch DLAB-829 created (now 5bcb779)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-829
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 5bcb779 [DLAB-829]: changed error handling messages in project form templates
This branch includes the following new commits:
new 171dfc4 [DLAB-829]: added max project name constant per cloud to dictionary
new 51c0498 [DLAB-829]: changed model validation
new 5bcb779 [DLAB-829]: changed error handling messages in project form templates
The 3 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] 02/03: [DLAB-829]: changed model validation
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-829
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 51c0498d0889992dced5e7f49ab91ef3e02df741
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Aug 9 13:02:03 2019 +0200
[DLAB-829]: changed model validation
---
.../administration/project/project-form/project-form.component.ts | 5 ++++-
1 file changed, 4 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 26d50c5..62e6287 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
@@ -26,6 +26,7 @@ import { ProjectService, RolesGroupsService, EndpointService } from '../../../co
import { ProjectDataService } from '../project-data.service';
import { CheckUtils, PATTERNS } from '../../../core/util';
import { Project } from '../project.component';
+import { DICTIONARY } from '../../../../dictionary/global.dictionary';
@Component({
selector: 'project-form',
@@ -34,6 +35,8 @@ import { Project } from '../project.component';
})
export class ProjectFormComponent implements OnInit {
+ readonly DICTIONARY = DICTIONARY;
+
public projectForm: FormGroup;
public groupsList: any = [];
public endpointsList: any = [];
@@ -178,6 +181,6 @@ export class ProjectFormComponent implements OnInit {
}
private providerMaxLength(control) {
- return control.value.length <= 50 ? null : { limit: true };
+ return control.value.length <= DICTIONARY.max_project_name_length ? null : { limit: true };
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/03: [DLAB-829]: changed error handling messages
in project form templates
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-829
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 5bcb77934ec7b34266889d2bb705bee093dc2133
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Aug 9 13:02:45 2019 +0200
[DLAB-829]: changed error handling messages in project form templates
---
.../project/project-form/project-form.component.html | 11 ++++++-----
.../project/project-form/project-form.component.scss | 4 ++--
.../src/app/administration/project/project.component.ts | 2 +-
3 files changed, 9 insertions(+), 8 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 d6523e8..1432013 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
@@ -59,7 +59,7 @@
<div class="form-block">
<div>
- <div class="control-group">
+ <div class="control-group m-bott-10">
<label class="label">Project name</label>
<div class="control">
<input type="text" formControlName="name" placeholder="Enter project name"
@@ -70,22 +70,23 @@
&& !projectForm?.controls.name.hasError('duplication')
&& !projectForm?.controls.name.hasError('limit')
&& projectForm?.controls.name.dirty">
- Project name can only contain letters, numbers, hyphens and '_' but can not end with special
+ Project name can only
+ contain letters, numbers, hyphens and '_' but can not end with special
characters
</span>
<span class="error" *ngIf="projectForm?.controls.name.hasError('limit')">
- Project name cannot exceed 50 characters
+ Project name cannot be longer than {{ DICTIONARY.max_project_name_length}} characters
</span>
</div>
</div>
- <div class="control-group">
+ <div class="control-group m-bott-10">
<label class="label">Project tag</label>
<div class="control">
<input type="text" formControlName="tag" placeholder="dlab-{ project name }"
[ngClass]="{ 'not-allowed' : item }">
</div>
</div>
- <div class="control-group">
+ <div class="control-group m-bott-10">
<label class="label">Endpoints</label>
<div class="control selector-wrapper">
<mat-form-field>
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss
index fde3783..2284ad2 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss
@@ -24,7 +24,7 @@
flex-direction: column;
display: flex;
justify-content: space-between;
- height: 210px;
+ height: 240px;
}
.mat-raised-button {
@@ -38,7 +38,7 @@
.error {
position: absolute;
right: 0;
- bottom: 2px;
+ bottom: -2px;
font-family: 'Open Sans', sans-serif;
font-weight: 300;
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
index 261b4d9..6cdb2bc 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
@@ -132,7 +132,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
`,
styles: [`
.content { color: #718ba6; padding: 0; font-size: 14px; font-weight: 400; margin: 0; overflow: hidden; }
- .edit-form { height: 380px; overflow: hidden; }
+ .edit-form { height: 410px; overflow: hidden; }
`]
})
export class EditProjectComponent {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/03: [DLAB-829]: added max project name constant
per cloud to dictionary
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-829
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 171dfc4e3feaeddb2dde401db827570adb41b2f8
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Aug 9 13:01:21 2019 +0200
[DLAB-829]: added max project name constant per cloud to dictionary
---
.../webapp/src/dictionary/aws.dictionary.ts | 3 +-
.../webapp/src/dictionary/azure.dictionary.ts | 3 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 177 +++++++++++----------
3 files changed, 93 insertions(+), 90 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
index c87b95a..6302f35 100644
--- a/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
+++ b/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
@@ -78,7 +78,8 @@ export const NAMING_CONVENTION = {
'instance_number': 'Total node number',
'master_node_shape': 'dataengine_instance_shape',
'total_instance_number': 'dataengine_instance_count',
- }
+ },
+ 'max_project_name_length': 40
};
export class ReportingConfigModel {
diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts
index 66f73f8..17a2403 100644
--- a/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts
+++ b/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts
@@ -79,7 +79,8 @@ export const NAMING_CONVENTION = {
'instance_number': 'Total node number',
'master_node_shape': 'dataengine_instance_shape',
'total_instance_number': 'dataengine_instance_count'
- }
+ },
+ 'max_project_name_length': 30
};
export class ReportingConfigModel {
diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts
index f6ef295..e477161 100644
--- a/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts
+++ b/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts
@@ -18,100 +18,101 @@
*/
export const NAMING_CONVENTION = {
- 'cloud_provider': 'gcp',
- 'use_ldap': true,
- 'notebook_instance_size': 'Instance type',
- 'personal_storage': 'Data bucket',
- 'collaboration_storage': 'Collaboration bucket',
- 'account': '',
- 'container': '',
- 'data_engine': 'Deploy Spark Server / Deploy Dataproc',
- 'image': 'Not available',
- 'data_engine_master_instance_size': 'Master machine type',
- 'data_engine_slave_instance_size': 'Slave machine type',
+ 'cloud_provider': 'gcp',
+ 'use_ldap': true,
+ 'notebook_instance_size': 'Instance type',
+ 'personal_storage': 'Data bucket',
+ 'collaboration_storage': 'Collaboration bucket',
+ 'account': '',
+ 'container': '',
+ 'data_engine': 'Deploy Spark Server / Deploy Dataproc',
+ 'image': 'Not available',
+ 'data_engine_master_instance_size': 'Master machine type',
+ 'data_engine_slave_instance_size': 'Slave machine type',
- 'master_node_shape': 'master_node_shape',
- 'slave_node_shape': 'slave_node_shape',
- 'total_instance_number': 'total_instance_number',
+ 'master_node_shape': 'master_node_shape',
+ 'slave_node_shape': 'slave_node_shape',
+ 'total_instance_number': 'total_instance_number',
- 'spot_instance': 'Preemptible worker nodes',
- 'cluster_version': 'dataproc_version',
- 'billing': {
- 'resourceName': 'resource_name',
- 'cost': 'cost',
- 'costTotal': 'cost_total',
- 'currencyCode': 'currency_code',
- 'dateFrom': 'usage_date_start',
- 'dateTo': 'usage_date_end',
- 'service': 'product',
- 'service_filter_key': 'product',
- 'type': 'resource_type',
- 'resourceType': 'dlab_resource_type',
- 'instance_size': 'shape',
- 'dlabId': 'dlab_id'
- },
- 'service': 'Product',
- 'type': 'Resource',
- 'instance_size': 'Type',
- 'computational_resource': 'Computational resources',
- 'user_storage_account_name': '',
- 'shared_storage_account_name': '',
- 'bucket_name': 'user_own_bucket_name',
- 'shared_bucket_name': 'shared_bucket_name',
- 'datalake_name': '',
- 'datalake_user_directory_name': '',
- 'datalake_shared_directory_name': '',
- 'docker.dlab-dataengine-service': {
- 'total_instance_number_min': 'min_instance_count',
- 'total_instance_number_max': 'max_instance_count',
- 'min_emr_spot_instance_bid_pct': 'min_emr_spot_instance_bid_pct',
- 'max_emr_spot_instance_bid_pct': 'max_emr_spot_instance_bid_pct',
- 'data_engine_master_instance_size': 'Master machine type',
- 'data_engine_slave_instance_size': 'Slave machine type',
- 'instance_number': 'Total machine count',
- 'master_instance_number': 'Master node count',
- 'slave_instance_number': 'Worker node count',
- 'master_node_shape': 'master_node_shape',
- 'slave_node_shape': 'slave_node_shape',
- 'total_instance_number': 'total_master_instance_number',
- 'total_slave_instance_number': 'total_slave_instance_number',
- },
- 'docker.dlab-dataengine': {
- 'total_instance_number_min': 'min_spark_instance_count',
- 'total_instance_number_max': 'max_spark_instance_count',
- 'data_engine_master_instance_size': 'Machine type',
- 'instance_number': 'Total machine number',
- 'master_instance_number': 'Master machine number',
- 'master_node_shape': 'dataengine_instance_shape',
- 'total_instance_number': 'dataengine_instance_count',
- }
+ 'spot_instance': 'Preemptible worker nodes',
+ 'cluster_version': 'dataproc_version',
+ 'billing': {
+ 'resourceName': 'resource_name',
+ 'cost': 'cost',
+ 'costTotal': 'cost_total',
+ 'currencyCode': 'currency_code',
+ 'dateFrom': 'usage_date_start',
+ 'dateTo': 'usage_date_end',
+ 'service': 'product',
+ 'service_filter_key': 'product',
+ 'type': 'resource_type',
+ 'resourceType': 'dlab_resource_type',
+ 'instance_size': 'shape',
+ 'dlabId': 'dlab_id'
+ },
+ 'service': 'Product',
+ 'type': 'Resource',
+ 'instance_size': 'Type',
+ 'computational_resource': 'Computational resources',
+ 'user_storage_account_name': '',
+ 'shared_storage_account_name': '',
+ 'bucket_name': 'user_own_bucket_name',
+ 'shared_bucket_name': 'shared_bucket_name',
+ 'datalake_name': '',
+ 'datalake_user_directory_name': '',
+ 'datalake_shared_directory_name': '',
+ 'docker.dlab-dataengine-service': {
+ 'total_instance_number_min': 'min_instance_count',
+ 'total_instance_number_max': 'max_instance_count',
+ 'min_emr_spot_instance_bid_pct': 'min_emr_spot_instance_bid_pct',
+ 'max_emr_spot_instance_bid_pct': 'max_emr_spot_instance_bid_pct',
+ 'data_engine_master_instance_size': 'Master machine type',
+ 'data_engine_slave_instance_size': 'Slave machine type',
+ 'instance_number': 'Total machine count',
+ 'master_instance_number': 'Master node count',
+ 'slave_instance_number': 'Worker node count',
+ 'master_node_shape': 'master_node_shape',
+ 'slave_node_shape': 'slave_node_shape',
+ 'total_instance_number': 'total_master_instance_number',
+ 'total_slave_instance_number': 'total_slave_instance_number',
+ },
+ 'docker.dlab-dataengine': {
+ 'total_instance_number_min': 'min_spark_instance_count',
+ 'total_instance_number_max': 'max_spark_instance_count',
+ 'data_engine_master_instance_size': 'Machine type',
+ 'instance_number': 'Total machine number',
+ 'master_instance_number': 'Master machine number',
+ 'master_node_shape': 'dataengine_instance_shape',
+ 'total_instance_number': 'dataengine_instance_count',
+ },
+ 'max_project_name_length': 10
};
export class ReportingConfigModel {
- static getDefault(): ReportingConfigModel {
- return new ReportingConfigModel([], [], [], [], [], '', '', '');
- }
+ static getDefault(): ReportingConfigModel {
+ return new ReportingConfigModel([], [], [], [], [], '', '', '');
+ }
- constructor(
- public user: Array<string>,
- public product: Array<string>,
- public resource_type: Array<string>,
- public status: Array<string>,
- public shape: Array<string>,
- public date_start: string,
- public date_end: string,
- public dlab_id: string
- ) { }
+ constructor(
+ public user: Array<string>,
+ public product: Array<string>,
+ public resource_type: Array<string>,
+ public status: Array<string>,
+ public shape: Array<string>,
+ public date_start: string,
+ public date_end: string,
+ public dlab_id: string
+ ) { }
- defaultConfigurations(): void {
- this.user = [];
- this.product = [];
- this.resource_type = [];
- this.status = [];
- this.shape = [];
- this.date_start = '';
- this.date_end = '';
- this.dlab_id = '';
- }
+ defaultConfigurations(): void {
+ this.user = [];
+ this.product = [];
+ this.resource_type = [];
+ this.status = [];
+ this.shape = [];
+ this.date_start = '';
+ this.date_end = '';
+ this.dlab_id = '';
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org