[incubator-dlab] branch project_grid updated: fixed dialogs styles; extended classes
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/project_grid by this push:
new 471218e fixed dialogs styles; extended classes
471218e is described below
commit 471218e1af56ffb84f7461ff5e8018e082cc877c
Author: Andriana Kovalyshyn
AuthorDate: Thu May 23 17:49:48 2019 +0300
fixed dialogs styles; extended classes
---
.../cluster-details/cluster-details.component.html | 2 +-
.../computational-resource-create-dialog.component.html| 10 --
.../ami-create-dialog/ami-create-dialog.component.html | 4 ++--
.../exploratory/detail-dialog/detail-dialog.component.html | 2 +-
.../exploratory-environment-create-dialog.component.html | 4 ++--
.../install-libraries/install-libraries.component.html | 4 ++--
.../src/app/resources/manage-ungit/manage-ungit.component.html | 4 ++--
.../src/app/resources/scheduler/scheduler.component.html | 2 +-
.../src/main/resources/webapp/src/assets/styles/_dialogs.scss | 2 +-
9 files changed, 16 insertions(+), 18 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
index d341eb7..a131587 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
@@ -17,7 +17,7 @@
~ under the License.
-->
-
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
index 704de73..0ffd41c 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
@@ -17,11 +17,12 @@
~ under the License.
-->
-
-
+
+
Add computational resources
+
-
+
-
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html
index e9474fe..cc817fe 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html
@@ -17,9 +17,9 @@
~ under the License.
-->
-
+
-Create {{ DICTIONARY.image
}}
+Create {{ DICTIONARY.image }}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
index 1efa05a..fce60ad 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
@@ -17,7 +17,7 @@
~ under the License.
-->
-
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html
index 0e92d01..45ee4bf 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html
@@ -17,9 +17,9 @@
~ under the License.
-->
-
+
-Create analytical tool
[incubator-dlab] 02/09: added endpoint.service to get list
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit cac09f9059d95422460bcd882d1158dd66a4a29a
Author: Andriana Kovalyshyn
AuthorDate: Thu May 23 16:57:01 2019 +0300
added endpoint.service to get list
---
.../resources/webapp/src/app/core/core.module.ts | 2 ++
.../src/app/core/services/endpoint.service.ts | 42 ++
2 files changed, 44 insertions(+)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts
b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts
index afb2ce1..0280665 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts
@@ -38,6 +38,7 @@ import { RolesGroupsService } from
'./services/rolesManagement.service';
import { DataengineConfigurationService } from
'./services/dataengineConfiguration.service';
import { StorageService } from './services/storage.service';
import { ProjectService } from './services/project.service';
+import { EndpointService } from './services/endpoint.service';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
@@ -73,6 +74,7 @@ export class CoreModule {
DataengineConfigurationService,
StorageService,
ProjectService,
+EndpointService,
{ provide: MatDialogRef, useValue: {} },
{ provide: MAT_DIALOG_DATA, useValue: [] }
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/services/endpoint.service.ts
b/services/self-service/src/main/resources/webapp/src/app/core/services/endpoint.service.ts
new file mode 100644
index 000..91caed7
--- /dev/null
+++
b/services/self-service/src/main/resources/webapp/src/app/core/services/endpoint.service.ts
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { catchError, map } from 'rxjs/operators';
+
+import { ErrorUtils } from '../util';
+import { ApplicationServiceFacade } from './applicationServiceFacade.service';
+
+@Injectable()
+export class EndpointService {
+
+ constructor(
+private applicationServiceFacade: ApplicationServiceFacade
+ ) { }
+
+ public getEndpointsData(): Observable<{}> {
+return this.applicationServiceFacade
+ .buildGetEndpointsData()
+ .pipe(
+map(response => response),
+catchError(ErrorUtils.handleServiceError));
+ }
+}
+
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 05/09: changed control type for endpoints; added service call
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d537007031ebae8e1b7e1363ebdd8e2fd7e63250
Author: Andriana Kovalyshyn
AuthorDate: Thu May 23 17:02:02 2019 +0300
changed control type for endpoints; added service call
---
.../project-form/project-form.component.html | 147 -
.../project/project-form/project-form.component.ts | 27 ++--
2 files changed, 102 insertions(+), 72 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 371dae8..a579ace 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
@@ -17,76 +17,99 @@
~ under the License.
-->
-
-
-
-
-Project
-
+
+
+
+ Project
+
-
-
- Project name
-
-
-
+
+
+Project name
+
+
-
- Endpoint name
-
-
-
+
+
+
+
+
+
+
+
+playlist_add_checkAll
+
+
+clearNone
+
+
+
+ {{ group }}
+
+
+
+keyboard_arrow_down
+
+
-
- Clear
- Nextkeyboard_arrow_right
+
+
+Project tag
+
+
+
+Clear
+Nextkeyboard_arrow_right
+
+
-
-
-
-Users
-
-
-
-
-
-
-
-
- playlist_add_checkAll
-
-
- clearNone
-
-
-
-{{ group }}
-
-
-
- keyboard_arrow_down
-
-
-
-
-
- Clear
- keyboard_arrow_leftBack
- Create
+
+
+
+ Users
+
+
+
+
+
+
+
+
+ playlist_add_checkAll
+
+
+ clearNone
+
+
+
+{{ group }}
+
+
+
+ keyboard_arrow_down
+
+
+
+Clear
+keyboard_arrow_leftBack
+Create
+
-
-
-
-
\ No newline at end of file
+
+
+
+
\ No newline at end of file
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 b6650a8..f1f936f 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
@@ -21,7 +21,7 @@
import { FormGroup, FormBuilder, Validators } from '@angular/forms';
import { ToastrService } from 'ngx-toastr';
- import { ProjectService,RolesGroupsService } from '../../../core/services';
+ import { ProjectService,RolesGroupsService, EndpointService } from
'../../../core/services';
import { Project } from '../project.component';
@Component({
@@ -32,23 +32,24 @@
export class ProjectFormComponent implements OnInit {
public projectForm: FormGroup;
- public groupsList: any;
- public setupGroupsList = [];
+ public groupsList: any = [];
+ public endpointsList: any = [];
constructor(
public toastr: ToastrService,
[incubator-dlab] 08/09: endpoint.service methods added
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d8898c1ef76a3762094fee149550d4e905ea44b7
Author: Andriana Kovalyshyn
AuthorDate: Thu May 23 17:05:36 2019 +0300
endpoint.service methods added
---
.../src/app/core/services/applicationServiceFacade.service.ts | 7 +++
.../src/main/resources/webapp/src/app/core/services/index.ts | 1 +
2 files changed, 8 insertions(+)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
index 5085056..c9b176c 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
@@ -69,6 +69,7 @@ export class ApplicationServiceFacade {
private static readonly DOWNLOAD_REPORT = 'download_report';
private static readonly SETTINGS = 'settings';
private static readonly PROJECT = 'project';
+ private static readonly ENDPOINT = 'endpoint';
private accessTokenKey: string = 'access_token';
private requestRegistry: Dictionary;
@@ -532,6 +533,11 @@ export class ApplicationServiceFacade {
this.requestRegistry.Item(ApplicationServiceFacade.PROJECT),
null);
}
+ public buildGetEndpointsData(): Observable {
+return this.buildRequest(RequestMethod.Get,
+ this.requestRegistry.Item(ApplicationServiceFacade.ENDPOINT),
+ null);
+ }
private setupRegistry(): void {
this.requestRegistry = new Dictionary();
@@ -608,6 +614,7 @@ export class ApplicationServiceFacade {
// project
this.requestRegistry.Add(ApplicationServiceFacade.PROJECT, '/api/project');
+this.requestRegistry.Add(ApplicationServiceFacade.ENDPOINT,
'/api/endpoint');
}
private buildRequest(method: RequestMethod, url: string, body: any, opt?) {
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts
b/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts
index 1bf598c..803fd9d 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/services/index.ts
@@ -36,3 +36,4 @@ export * from './rolesManagement.service';
export * from './dataengineConfiguration.service';
export * from './storage.service';
export * from './project.service';
+export * from './endpoint.service';
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 03/09: provide variables reference to config file
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 9288943bcc59834a0677d6438c8308b884265401
Author: Andriana Kovalyshyn
AuthorDate: Thu May 23 16:58:03 2019 +0300
provide variables reference to config file
---
.../src/main/resources/webapp/angular.json | 5 +
.../webapp/src/assets/styles/_variables.scss | 23 ++
2 files changed, 28 insertions(+)
diff --git a/services/self-service/src/main/resources/webapp/angular.json
b/services/self-service/src/main/resources/webapp/angular.json
index 6e27247..1b5825f 100644
--- a/services/self-service/src/main/resources/webapp/angular.json
+++ b/services/self-service/src/main/resources/webapp/angular.json
@@ -28,6 +28,11 @@
"src/styles.scss",
"node_modules/ngx-toastr/toastr.css"
],
+"stylePreprocessorOptions": {
+ "includePaths": [
+"src/assets/styles"
+ ]
+},
"scripts": [
]
},
diff --git
a/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss
b/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss
new file mode 100644
index 000..538128b
--- /dev/null
+++
b/services/self-service/src/main/resources/webapp/src/assets/styles/_variables.scss
@@ -0,0 +1,23 @@
+/*!
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+$modal-text-color: #718aa5;
+$modal-header-color: #f6fafe;
+
+$brand-color: #4ab8dc;
\ 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] 06/09: added project form wrapper in case of rendering check
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit e40ba21f00801adf0ead217cd36939ec406bc441
Author: Andriana Kovalyshyn
AuthorDate: Thu May 23 17:03:23 2019 +0300
added project form wrapper in case of rendering check
---
.../webapp/src/app/administration/project/project.component.html | 5 -
.../webapp/src/app/administration/project/project.component.ts| 8 +---
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
index 9434da0..b942896 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
@@ -27,5 +27,8 @@
-
+
+
+
+
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 727e46b..1baea70 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
@@ -18,10 +18,11 @@
*/
import { Component, OnInit } from '@angular/core';
+import { ProjectDataService } from './project-data.service';
export interface Project {
project_name: string;
- endpoint_name: string;
+ endpoints_list: string[];
project_tag: string;
users_list: string[];
}
@@ -32,10 +33,11 @@ export interface Project {
styleUrls: ['./project.component.scss']
})
export class ProjectComponent implements OnInit {
-
- constructor() { }
+ projectsList: Project[] = [];
+ constructor(private projectDataService: ProjectDataService) { }
ngOnInit() {
+this.projectsList = this.projectDataService.getProjects;
}
createProject() {
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch project_grid updated (5a81d01 -> 29a76a0)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 5a81d01 added view to groups list control; stepper control changes
new 62c401c added project-data.service
new cac09f9 added endpoint.service to get list
new 9288943 provide variables reference to config file
new 42d075e added analyser tool
new d537007 changed control type for endpoints; added service call
new e40ba21 added project form wrapper in case of rendering check
new f7ffeff mock dource data to render data grid
new d8898c1 endpoint.service methods added
new 29a76a0 fixed dialogs styles; extended classes
The 9 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/main/resources/webapp/angular.json | 5 +
.../src/main/resources/webapp/package-lock.json| 163 +
.../src/main/resources/webapp/package.json | 8 +-
.../webapp/src/app/administration/project/index.ts | 2 +
.../project/project-data.service.ts} | 35 +++--
.../project-form/project-form.component.html | 147 +++
.../project/project-form/project-form.component.ts | 27 ++--
.../project-list/project-list.component.html | 4 +-
.../project/project-list/project-list.component.ts | 20 ++-
.../administration/project/project.component.html | 5 +-
.../administration/project/project.component.ts| 8 +-
.../resources/webapp/src/app/core/core.module.ts | 2 +
.../services/applicationServiceFacade.service.ts | 7 +
...illingReport.service.ts => endpoint.service.ts} | 20 +--
.../webapp/src/app/core/services/index.ts | 1 +
.../cluster-details/cluster-details.component.html | 2 +-
.../computational-resources-list.component.ts | 2 +-
.../ami-create-dialog.component.html | 7 +-
.../detail-dialog/detail-dialog.component.html | 2 +-
...ratory-environment-create-dialog.component.html | 7 +-
.../install-libraries.component.html | 10 +-
.../manage-ungit/manage-ungit.component.html | 7 +-
.../resources-grid/resources-grid.component.ts | 10 +-
.../src/app/resources/resources.component.ts | 4 +-
.../resources/scheduler/scheduler.component.html | 7 +-
.../app/shared/modal-dialog/modal.component.scss | 21 +++
.../webapp/src/assets/styles/_dialogs.scss | 22 +--
.../webapp/src/assets/styles/_variables.scss} | 8 +-
.../src/main/resources/webapp/src/styles.scss | 10 +-
29 files changed, 396 insertions(+), 177 deletions(-)
copy
services/self-service/src/main/resources/webapp/src/app/{core/services/appRouting.service.ts
=> administration/project/project-data.service.ts} (60%)
copy
services/self-service/src/main/resources/webapp/src/app/core/services/{billingReport.service.ts
=> endpoint.service.ts} (73%)
copy
services/{dlab-webapp-common/src/main/java/com/epam/dlab/validation/GcpValidation.java
=> self-service/src/main/resources/webapp/src/assets/styles/_variables.scss}
(90%)
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 09/09: fixed dialogs styles; extended classes
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 29a76a04645368aca5a4ea0458a1b3451c3b9da0
Author: Andriana Kovalyshyn
AuthorDate: Thu May 23 17:12:46 2019 +0300
fixed dialogs styles; extended classes
---
.../computational-resources-list.component.ts | 2 +-
.../ami-create-dialog.component.html | 7 ---
.../detail-dialog/detail-dialog.component.html | 2 +-
...ratory-environment-create-dialog.component.html | 7 ---
.../install-libraries.component.html | 10 +-
.../manage-ungit/manage-ungit.component.html | 7 ---
.../resources-grid/resources-grid.component.ts | 10 +-
.../src/app/resources/resources.component.ts | 4 ++--
.../resources/scheduler/scheduler.component.html | 7 ---
.../app/shared/modal-dialog/modal.component.scss | 21 +
.../webapp/src/assets/styles/_dialogs.scss | 22 +-
.../src/main/resources/webapp/src/styles.scss | 10 +-
12 files changed, 57 insertions(+), 52 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
index 4004adf..89e3992 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
@@ -88,7 +88,7 @@ export class ComputationalResourcesListComponent {
openScheduleDialog(resource) {
// this.clusterScheduler.open({ isFooter: false }, this.environment,
'СOMPUTATIONAL', resource);
-this.dialog.open(SchedulerComponent, { data: {notebook: this.environment,
type: 'СOMPUTATIONAL', resource} })
+this.dialog.open(SchedulerComponent, { data: {notebook: this.environment,
type: 'СOMPUTATIONAL', resource}, panelClass: 'modal-xl-s' })
.afterClosed().subscribe(() => this.rebuildGrid());
}
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html
index 2fe3ecf..e9474fe 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/ami-create-dialog.component.html
@@ -17,11 +17,12 @@
~ under the License.
-->
-
-
+
+
Create {{ DICTIONARY.image
}}
+
-
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
index 4420236..1efa05a 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
@@ -21,7 +21,7 @@
-
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html
index 20625dc..0e92d01 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/exploratory-environment-create-dialog/exploratory-environment-create-dialog.component.html
@@ -17,11 +17,12 @@
~ under the License.
-->
-
-
+
+
Create analytical tool
+
-
+
-
-
-Manage
- {{ notebook?.name }} Libraries
+
+
+Manage {{ notebook?.name
}} Libraries
+
-
+
Cannot install libraries: Exploratory
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html
[incubator-dlab] 01/09: added project-data.service
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 62c401c6a603d2d9c5bf8d2b08a76c3c9e761340
Author: Andriana Kovalyshyn
AuthorDate: Thu May 23 16:55:47 2019 +0300
added project-data.service
---
.../webapp/src/app/administration/project/index.ts | 2 +
.../project/{index.ts => project-data.service.ts} | 55 --
.../cluster-details/cluster-details.component.html | 2 +-
3 files changed, 34 insertions(+), 25 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
index f04584c..4dfc82f 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
@@ -28,6 +28,7 @@ import { ProjectFormComponent } from
'./project-form/project-form.component';
import { ProjectListComponent } from './project-list/project-list.component';
import { ProjectComponent } from './project.component';
+import { ProjectDataService } from './project-data.service';
@NgModule({
imports: [
@@ -38,6 +39,7 @@ import { ProjectComponent } from './project.component';
FormControlsModule
],
declarations: [ProjectComponent, ProjectFormComponent, ProjectListComponent],
+ providers: [ProjectDataService],
exports: [ProjectComponent]
})
export class ProjectModule { }
\ No newline at end of file
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts
similarity index 51%
copy from
services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
copy to
services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts
index f04584c..1bba48a 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-data.service.ts
@@ -17,27 +17,34 @@
* under the License.
*/
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-
-import { MaterialModule } from '../../shared/material.module';
-import { FormControlsModule } from '../../shared/form-controls';
-
-import { ProjectFormComponent } from './project-form/project-form.component';
-import { ProjectListComponent } from './project-list/project-list.component';
-
-import { ProjectComponent } from './project.component';
-
-@NgModule({
- imports: [
-CommonModule,
-FormsModule,
-ReactiveFormsModule,
-MaterialModule,
-FormControlsModule
- ],
- declarations: [ProjectComponent, ProjectFormComponent, ProjectListComponent],
- exports: [ProjectComponent]
-})
-export class ProjectModule { }
\ No newline at end of file
+import { Injectable } from '@angular/core';
+
+import { ProjectService } from '../../core/services';
+import { Project } from './project.component';
+
+import { data } from './project-list/data';
+@Injectable()
+export class ProjectDataService {
+ dataSource: any;
+ // Project[];
+
+ constructor(private projectService: ProjectService) {
+this.getProjectsList();
+ }
+
+ get getProjects() {
+return this.dataSource;
+ }
+
+ public updateProjects() {
+this.getProjectsList();
+ }
+
+ private getProjectsList() {
+this.dataSource = data.projects;
+
+
+this.projectService.getProjectsList().subscribe(
+ (response: any) => this.dataSource = data.projects);
+ }
+}
\ No newline at end of file
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
index ef38a47..d341eb7 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
@@ -21,7 +21,7 @@
-
+
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 04/09: added analyser tool
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 42d075efbb2c45d10939d43ab167882e4860aa41
Author: Andriana Kovalyshyn
AuthorDate: Thu May 23 16:58:42 2019 +0300
added analyser tool
---
.../src/main/resources/webapp/package-lock.json| 163 +
.../src/main/resources/webapp/package.json | 8 +-
2 files changed, 168 insertions(+), 3 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/package-lock.json
b/services/self-service/src/main/resources/webapp/package-lock.json
index 3a6aa79..74c3766 100644
--- a/services/self-service/src/main/resources/webapp/package-lock.json
+++ b/services/self-service/src/main/resources/webapp/package-lock.json
@@ -1857,6 +1857,12 @@
"integrity":
"sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==",
"dev": true
},
+"acorn-walk": {
+ "version": "6.1.1",
+ "resolved":
"https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.1.1.tgz;,
+ "integrity":
"sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==",
+ "dev": true
+},
"agentkeepalive": {
"version": "3.5.2",
"resolved":
"https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz;,
@@ -2124,6 +2130,12 @@
"integrity": "sha1-NhIfhFwFeBct5Bmpfb6x0W7DRUI=",
"dev": true
},
+"async-limiter": {
+ "version": "1.0.0",
+ "resolved":
"https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz;,
+ "integrity":
"sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+ "dev": true
+},
"asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz;,
@@ -2360,6 +2372,18 @@
"tweetnacl": "0.14.5"
}
},
+"bfj": {
+ "version": "6.1.1",
+ "resolved": "https://registry.npmjs.org/bfj/-/bfj-6.1.1.tgz;,
+ "integrity":
"sha512-+GUNvzHR4nRyGybQc2WpNJL4MJazMuvf92ueIyA0bIkPRwhhQu3IfZQ2PSoVPpCBJfmoSdOxu5rnotfFLlvYRQ==",
+ "dev": true,
+ "requires": {
+"bluebird": "3.5.1",
+"check-types": "7.4.0",
+"hoopy": "0.1.4",
+"tryer": "1.0.1"
+ }
+},
"big.js": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz;,
@@ -2758,6 +2782,12 @@
"integrity":
"sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
"dev": true
},
+"check-types": {
+ "version": "7.4.0",
+ "resolved":
"https://registry.npmjs.org/check-types/-/check-types-7.4.0.tgz;,
+ "integrity":
"sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==",
+ "dev": true
+},
"chokidar": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz;,
@@ -3658,6 +3688,12 @@
"resolved": "https://registry.npmjs.org/domino/-/domino-2.1.1.tgz;,
"integrity":
"sha512-fqoTi6oQ881wYRENIEmz78hKVoc3X9HqVpklo419yxzebys6dtU5c83iVh3UYvvexPFdAuwlDYCsUM9//CrMMg=="
},
+"duplexer": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz;,
+ "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
+ "dev": true
+},
"duplexify": {
"version": "3.7.1",
"resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz;,
@@ -3686,6 +3722,12 @@
"integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
"dev": true
},
+"ejs": {
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz;,
+ "integrity":
"sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==",
+ "dev": true
+},
"electron-to-chromium": {
"version": "1.3.113",
"resolved":
"https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.113.tgz;,
@@ -4243,6 +4285,12 @@
"integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
"dev": true
},
+"filesize": {
+ "version": "3.6.1",
+ "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz;,
+ "integrity":
"sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==",
+ "dev": true
+},
"fill-range": {
"version": "2.2.3",
"resolved":
"https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz;,
@@ -5120,6 +5168,24 @@
"resolved":
"https://registry.npmjs.org/guacamole-common-js/-/guacamole-common-js-1.0.0-b.tgz;,
"integrity":
"sha512-DLEy7yBQvwwJ4xoWfj1Z+DLOKCy5zwW4ELdpDeYKVWZMpBegbGGwI5qWb61b3aT7KBWsF6DRJHviPlcFHUdMRA=="
},
+
[incubator-dlab] 01/07: added project tag generation on name focus out
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 72c166e99d6d31ac5d834a0f3baad47c35866af3
Author: Andriana Kovalyshyn
AuthorDate: Wed May 22 14:37:57 2019 +0300
added project tag generation on name focus out
---
.../project/project-form/project-form.component.html| 5 +++--
.../project/project-form/project-form.component.ts | 13 +
2 files changed, 12 insertions(+), 6 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 04903ce..7579adf 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
@@ -28,7 +28,8 @@
Project name
-
+
@@ -40,7 +41,7 @@
Project tag
-
+
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 b5a0861..5da71d8 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
@@ -45,22 +45,27 @@ export class ProjectFormComponent implements OnInit {
public createProject(data) {
console.log(data);
-this.projectService.createProject().subscribe(response => {
+this.projectService.createProject(data).subscribe(response => {
response && this.toastr.success('Project created successfully!',
'Success!');
this.reset();
}, error => this.toastr.error(error.message || 'Project creation failed!',
'Oops!'));
}
public reset() {
-this.initFormModel()
+this.initFormModel();
+ }
+
+ public generateProjectTag($event) {
+let user_tag = `dlab-${ $event.target.value }`;
+this.projectForm.controls.project_tag.setValue(user_tag.toLowerCase());
}
private initFormModel(): void {
this.projectForm = this._fb.group({
'project_name': ['', Validators.required],
'endpoint_name': ['', Validators.required],
- 'project_tag': [[], Validators.required],
- 'users_list': ['dlab-']
+ 'project_tag': ['dlab-', Validators.required],
+ 'users_group': [[]]
});
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/07: fixed detailed dialogs styles; added variables
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 0859f8bfeb028bec28dfb174398605fd84867a0e
Author: Andriana Kovalyshyn
AuthorDate: Wed May 22 18:09:19 2019 +0300
fixed detailed dialogs styles; added variables
---
.../cluster-details/cluster-details.component.html| 6 --
.../computational-resources-list.component.ts | 2 +-
.../exploratory/detail-dialog/detail-dialog.component.html| 2 +-
.../src/main/resources/webapp/src/assets/styles/_dialogs.scss | 11 +++
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
index 7420257..ef38a47 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
@@ -17,8 +17,10 @@
~ under the License.
-->
-
-
+
+
+
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
index 713b5ce..4004adf 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
@@ -82,7 +82,7 @@ export class ComputationalResourcesListComponent {
detailComputationalResources(environment, resource): void {
// this.detailComputationalResource.open({ isFooter: false }, environment,
resource);
-this.dialog.open(DetailComputationalResourcesComponent, { data: {
environment, resource }})
+this.dialog.open(DetailComputationalResourcesComponent, { data: {
environment, resource }, panelClass: 'modal-sm'})
.afterClosed().subscribe(() => this.rebuildGrid());
};
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
index c90af34..4420236 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
@@ -17,7 +17,7 @@
~ under the License.
-->
-
+
diff --git
a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
index 4a21f02..6c3f9bb 100644
---
a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
+++
b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
@@ -17,6 +17,8 @@
* under the License.
*/
+ @import '_variables.scss';
+
.modal-xs { width: 375px; }
.modal-sm { width: 525px; }
.modal-md { width: 545px; }
@@ -29,10 +31,11 @@ mat-dialog-container {
&.mat-dialog-container {
padding: 0;
border-radius: 0;
-.box {
+.dialog-box {
+ color: $modal-text-color;
.dialog-header {
padding-left: 30px;
-background: #f6fafe;
+background: $modal-header-color;
height: 50px;
line-height: 50px;
position: relative;
@@ -45,7 +48,7 @@ mat-dialog-container {
font-weight: 600;
color: #455c74;
font-size: 18px;
- background: #f6fafe;
+ background: $modal-header-color;
i {
vertical-align: middle;
}
@@ -152,7 +155,7 @@ mat-dialog-container {
}
}
.info-label {
-font-size: 16px;
+font-size: 15px;
margin-top: 20px;
}
.control-label {
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch project_grid updated (8a1cfaf -> 5a81d01)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch project_grid in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 8a1cfaf fixed general styles for steppers new 72c166e added project tag generation on name focus out new 0859f8b fixed detailed dialogs styles; added variables new 19d84b2 passed data as project creation params to service new d696f0e added actions placeholders to project list new 136c004 added groups list select with ability check/delete all new 1ef8fb6 added view to groups list control new 5a81d01 added view to groups list control; stepper control changes The 7 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-form/project-form.component.html | 49 +-- .../project-form/project-form.component.scss | 9 +- .../project/project-form/project-form.component.ts | 34 ++-- .../project-list/project-list.component.html | 12 ++- .../project/project-list/project-list.component.ts | 10 ++- .../services/applicationServiceFacade.service.ts | 4 +- .../src/app/core/services/project.service.ts | 4 +- .../cluster-details/cluster-details.component.html | 6 +- .../computational-resources-list.component.ts | 2 +- .../detail-dialog/detail-dialog.component.html | 2 +- .../webapp/src/assets/styles/_dialogs.scss | 11 ++- .../resources/webapp/src/assets/styles/_theme.scss | 97 +- 12 files changed, 204 insertions(+), 36 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 06/07: added view to groups list control
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 1ef8fb66c2d86502d3da989be34aba9a089cf7d3
Author: Andriana Kovalyshyn
AuthorDate: Thu May 23 14:55:20 2019 +0300
added view to groups list control
---
.../project-form/project-form.component.html | 44 ++
1 file changed, 37 insertions(+), 7 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 7579adf..371dae8 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
@@ -17,12 +17,12 @@
~ under the License.
-->
-
+
Project
-
+
@@ -44,17 +44,47 @@
+
+ Clear
+ Nextkeyboard_arrow_right
+
Users
-
-
- Clear
- Create
+
+
+
+
+
+
+
+
+ playlist_add_checkAll
+
+
+ clearNone
+
+
+
+{{ group }}
+
+
+
+ keyboard_arrow_down
+
+
+
+
+
+ Clear
+ keyboard_arrow_leftBack
+ Create
+
+
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 03/07: passed data as project creation params to service
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 19d84b271b43047e07861df944f8ee35427dc1a8
Author: Andriana Kovalyshyn
AuthorDate: Wed May 22 18:11:16 2019 +0300
passed data as project creation params to service
---
.../webapp/src/app/core/services/applicationServiceFacade.service.ts | 4 ++--
.../main/resources/webapp/src/app/core/services/project.service.ts| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
index 3d1fced..5085056 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
@@ -522,10 +522,10 @@ export class ApplicationServiceFacade {
null);
}
- public buildCreateProject(): Observable {
+ public buildCreateProject(data): Observable {
return this.buildRequest(RequestMethod.Post,
this.requestRegistry.Item(ApplicationServiceFacade.PROJECT),
- null);
+ data);
}
public buildGetProjectsList(): Observable {
return this.buildRequest(RequestMethod.Get,
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts
b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts
index c15f126..2f33dcc 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts
@@ -28,9 +28,9 @@ import { ErrorUtils } from '../util';
export class ProjectService {
constructor(private applicationServiceFacade: ApplicationServiceFacade) { }
- public createProject(): Observable<{}> {
+ public createProject(data): Observable<{}> {
return this.applicationServiceFacade
- .buildCreateProject()
+ .buildCreateProject(data)
.pipe(
map(response => response),
catchError(ErrorUtils.handleServiceError));
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 04/07: added actions placeholders to project list
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch project_grid
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d696f0ec9496f9c9f345b56526f40c82ac01598c
Author: Andriana Kovalyshyn
AuthorDate: Wed May 22 18:12:32 2019 +0300
added actions placeholders to project list
---
.../project/project-list/project-list.component.html | 12 +---
.../project/project-list/project-list.component.ts | 10 +-
2 files changed, 18 insertions(+), 4 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
index b9877ef..f3cbe38 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
@@ -36,10 +36,16 @@
- Action
-
-more_vert
+
+
+
+ mode_edit
+
+
+ delete_forever
+
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts
index 57bc9a4..1f238f3 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.ts
@@ -45,7 +45,15 @@ export class ProjectListComponent implements OnInit {
this.getProjectsList();
}
- getProjectsList() {
+ public editProject(item: Project[]) {
+debugger;
+ }
+
+ public deleteProject(item: Project[]) {
+debugger;
+ }
+
+ private getProjectsList() {
// Project[] type
this.dataSource = new MatTableDataSource(data.projects);
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-657 updated: increase size of storage device for aws(alrd in dev)
This is an automated email from the ASF dual-hosted git repository.
ioleksandr pushed a commit to branch DLAB-657
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-657 by this push:
new ff12848 increase size of storage device for aws(alrd in dev)
ff12848 is described below
commit ff128487489e74f5d531962038f53f97ea449e5d
Author: Oleksandr_Isniuk
AuthorDate: Thu May 23 14:38:24 2019 +0300
increase size of storage device for aws(alrd in dev)
---
infrastructure-provisioning/src/general/lib/aws/actions_lib.py | 8
1 file changed, 8 insertions(+)
diff --git a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
index 9fe4482..d8e00f3 100644
--- a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
@@ -436,6 +436,14 @@ def create_instance(definitions, instance_tag,
primary_disk_size=12):
elif definitions.instance_class == 'ssn':
get_iam_profile(definitions.iam_profile)
instances = ec2.create_instances(ImageId=definitions.ami_id,
MinCount=1, MaxCount=1,
+ BlockDeviceMappings=[
+ {
+ "DeviceName": "/dev/sda1",
+ "Ebs":
+ {
+ "VolumeSize":
int(primary_disk_size)
+ }
+ }],
KeyName=definitions.key_name,
SecurityGroupIds=security_groups_ids,
InstanceType=definitions.instance_type,
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
