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/05/23 14:12:58 UTC
[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-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 06/09: added project form wrapper in case of
rendering check
Posted by an...@apache.org.
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 <An...@epam.com>
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 @@
<div></div>
</div>
-<project-form></project-form>
+<mat-card class="base-retreat project-form">
+ <project-form></project-form>
+</mat-card>
+
<project-list></project-list>
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-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 04/09: added analyser tool
Posted by an...@apache.org.
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 <An...@epam.com>
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=="
},
+ "gzip-size": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-5.1.1.tgz",
+ "integrity": "sha512-FNHi6mmoHvs1mxZAds4PpdCS6QG8B4C1krxJsMutgxl5t3+GlRTzzI3NEkifXx2pVsOvJdOGSmIgDhQ55FwdPA==",
+ "dev": true,
+ "requires": {
+ "duplexer": "0.1.1",
+ "pify": "4.0.1"
+ },
+ "dependencies": {
+ "pify": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+ "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+ "dev": true
+ }
+ }
+ },
"handle-thing": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
@@ -5309,6 +5375,12 @@
"integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
"dev": true
},
+ "hoopy": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/hoopy/-/hoopy-0.1.4.tgz",
+ "integrity": "sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ==",
+ "dev": true
+ },
"hosted-git-info": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
@@ -7845,6 +7917,12 @@
"mimic-fn": "1.2.0"
}
},
+ "opener": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/opener/-/opener-1.5.1.tgz",
+ "integrity": "sha512-goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA==",
+ "dev": true
+ },
"opn": {
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
@@ -10317,6 +10395,12 @@
"glob": "7.1.2"
}
},
+ "tryer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
+ "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==",
+ "dev": true
+ },
"ts-node": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-2.0.0.tgz",
@@ -12043,6 +12127,76 @@
}
}
},
+ "webpack-bundle-analyzer": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-3.3.2.tgz",
+ "integrity": "sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==",
+ "dev": true,
+ "requires": {
+ "acorn": "6.0.7",
+ "acorn-walk": "6.1.1",
+ "bfj": "6.1.1",
+ "chalk": "2.4.2",
+ "commander": "2.20.0",
+ "ejs": "2.6.1",
+ "express": "4.16.4",
+ "filesize": "3.6.1",
+ "gzip-size": "5.1.1",
+ "lodash": "4.17.11",
+ "mkdirp": "0.5.1",
+ "opener": "1.5.1",
+ "ws": "6.2.1"
+ },
+ "dependencies": {
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.3"
+ }
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "commander": {
+ "version": "2.20.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+ "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
+ "dev": true
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "lodash": {
+ "version": "4.17.11",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
+ "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
+ }
+ },
"webpack-core": {
"version": "0.6.9",
"resolved": "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.9.tgz",
@@ -13543,6 +13697,15 @@
"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
"dev": true
},
+ "ws": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+ "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+ "dev": true,
+ "requires": {
+ "async-limiter": "1.0.0"
+ }
+ },
"xhr2": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz",
diff --git a/services/self-service/src/main/resources/webapp/package.json b/services/self-service/src/main/resources/webapp/package.json
index 2154b3c..4ab494b 100644
--- a/services/self-service/src/main/resources/webapp/package.json
+++ b/services/self-service/src/main/resources/webapp/package.json
@@ -9,8 +9,9 @@
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
- "build.dev": "ng build --build-optimizer=false",
- "build.prod": "ng build --prod"
+ "build.dev": "ng build --build-optimizer=false --stats-json",
+ "build.prod": "ng build --prod --stats-json",
+ "analyse": "webpack-bundle-analyzer dist/stats.json"
},
"private": true,
"dependencies": {
@@ -48,6 +49,7 @@
"node-sass": "^4.7.2",
"ts-node": "~2.0.0",
"tslint": "^5.15.0",
- "typescript": "^3.2.4"
+ "typescript": "^3.2.4",
+ "webpack-bundle-analyzer": "^3.3.2"
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 05/09: changed control type for endpoints;
added service call
Posted by an...@apache.org.
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 <An...@epam.com>
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.
-->
-<mat-card class="base-retreat project-form">
- <form [formGroup]="projectForm" novalidate>
- <mat-horizontal-stepper #stepper class="stepper ani">
- <mat-step>
- <ng-template matStepLabel>Project</ng-template>
- <section class="inner-step mat-reset">
+<form [formGroup]="projectForm" novalidate>
+ <mat-horizontal-stepper #stepper class="stepper ani">
+ <mat-step>
+ <ng-template matStepLabel>Project</ng-template>
+ <section class="inner-step mat-reset">
- <div class="form-block">
- <div class="control-group">
- <label class="label">Project name</label>
- <div class="control">
- <input type="text" formControlName="project_name" placeholder="Enter project name"
- (blur)="generateProjectTag($event)">
- </div>
+ <div class="form-block">
+ <div class="control-group">
+ <label class="label">Project name</label>
+ <div class="control">
+ <input type="text" formControlName="project_name" placeholder="Enter project name"
+ (blur)="generateProjectTag($event)">
</div>
- <div class="control-group">
- <label class="label">Endpoint name</label>
- <div class="control">
- <input type="text" formControlName="endpoint_name" placeholder="Enter endpoint name">
- </div>
+ </div>
+ <!-- <div class="control-group">
+ <label class="label">Endpoint name</label>
+ <div class="control">
+ <input type="text" formControlName="endpoints_list" placeholder="Enter endpoint name">
</div>
- <div class="control-group">
- <label class="label">Project tag</label>
- <div class="control">
- <input type="text" formControlName="project_tag" placeholder="dlab-{ project name }">
+ </div> -->
+ <div class="control-group">
+ <div class="selector-wrapper">
+ <mat-form-field>
+ <mat-select multiple formControlName="endpoints_list" placeholder="Select endpoint name">
+ <mat-option class="multiple-select" disabled>
+ <a class="select ani" (click)="selectOptions(list, 'all')">
+ <i class="material-icons">playlist_add_check</i> All
+ </a>
+ <a class="deselect ani" (click)="selectOptions(list)">
+ <i class="material-icons">clear</i> None
+ </a>
+ </mat-option>
+ <mat-option *ngFor="let group of endpointsList" [value]="group">
+ {{ group }}
+ </mat-option>
+ </mat-select>
+ <button class="caret">
+ <i class="material-icons">keyboard_arrow_down</i>
+ </button>
+ </mat-form-field>
</div>
</div>
- <div class="text-center m-bott-10">
- <button mat-raised-button type="button" class="butt" (click)="reset()">Clear</button>
- <button mat-raised-button type="button" class="butt next" matStepperNext>Next<i class="material-icons">keyboard_arrow_right</i></button>
+
+ <div class="control-group">
+ <label class="label">Project tag</label>
+ <div class="control">
+ <input type="text" formControlName="project_tag" placeholder="dlab-{ project name }">
</div>
</div>
+ <div class="text-center m-bott-10">
+ <button mat-raised-button type="button" class="butt" (click)="reset()">Clear</button>
+ <button mat-raised-button type="button" class="butt next" matStepperNext>Next<i
+ class="material-icons">keyboard_arrow_right</i></button>
+ </div>
+ </div>
- </section>
- </mat-step>
- <mat-step>
- <ng-template matStepLabel>Users</ng-template>
- <div class="inner-step mat-reset">
- <div class="form-block">
- <div class="control-group">
- <div class="selector-wrapper">
- <mat-form-field>
- <mat-select multiple formControlName="users_group" placeholder="Select user groups">
- <mat-option class="multiple-select" disabled>
- <a class="select ani" (click)="selectOptions('all')">
- <i class="material-icons">playlist_add_check</i> All
- </a>
- <a class="deselect ani" (click)="selectOptions()">
- <i class="material-icons">clear</i> None
- </a>
- </mat-option>
- <mat-option *ngFor="let group of groupsList" [value]="group">
- {{ group }}
- </mat-option>
- </mat-select>
- <button class="caret">
- <i class="material-icons">keyboard_arrow_down</i>
- </button>
- </mat-form-field>
- </div>
- </div>
- <div class="text-center m-bott-10">
- <button mat-raised-button type="button" class="butt" (click)="reset()">Clear</button>
- <button mat-raised-button matStepperPrevious class="butt"><i class="material-icons">keyboard_arrow_left</i>Back</button>
- <button mat-raised-button type="button" class="butt butt-success" [disabled]="!projectForm.valid"
- (click)="createProject(projectForm.value)">Create</button>
+ </section>
+ </mat-step>
+ <mat-step>
+ <ng-template matStepLabel>Users</ng-template>
+ <div class="inner-step mat-reset">
+ <div class="form-block">
+ <div class="control-group">
+ <div class="selector-wrapper">
+ <mat-form-field>
+ <mat-select multiple formControlName="users_group" placeholder="Select user groups">
+ <mat-option class="multiple-select" disabled>
+ <a class="select ani" (click)="selectOptions(groupsList, 'users_group', 'all')">
+ <i class="material-icons">playlist_add_check</i> All
+ </a>
+ <a class="deselect ani" (click)="selectOptions(groupsList, 'users_group')">
+ <i class="material-icons">clear</i> None
+ </a>
+ </mat-option>
+ <mat-option *ngFor="let group of groupsList" [value]="group">
+ {{ group }}
+ </mat-option>
+ </mat-select>
+ <button class="caret">
+ <i class="material-icons">keyboard_arrow_down</i>
+ </button>
+ </mat-form-field>
</div>
</div>
+ <div class="text-center m-bott-10">
+ <button mat-raised-button type="button" class="butt" (click)="reset()">Clear</button>
+ <button mat-raised-button matStepperPrevious class="butt"><i
+ class="material-icons">keyboard_arrow_left</i>Back</button>
+ <button mat-raised-button type="button" class="butt butt-success" [disabled]="!projectForm.valid"
+ (click)="createProject(projectForm.value)">Create</button>
+ </div>
</div>
- </mat-step>
- </mat-horizontal-stepper>
- </form>
-</mat-card>
\ No newline at end of file
+ </div>
+ </mat-step>
+ </mat-horizontal-stepper>
+</form>
\ 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,
private _fb: FormBuilder,
private projectService: ProjectService,
- private rolesService: RolesGroupsService
+ private rolesService: RolesGroupsService,
+ private endpointService: EndpointService
) { }
ngOnInit() {
this.initFormModel();
this.getGroupsData();
+ this.getEndpointsData();
}
public createProject(data) {
- // let parameters = {...data, users: this.setupGroupsList };
console.log(data);
this.projectService.createProject(data).subscribe(response => {
@@ -66,17 +67,17 @@ export class ProjectFormComponent implements OnInit {
this.projectForm.controls.project_tag.setValue(user_tag.toLowerCase());
}
- public selectOptions(select) {
+ public selectOptions(list, key, select?) {
debugger;
- this.projectForm.controls.users_group.setValue(select ? this.groupsList : []);
+ this.projectForm.controls[key].setValue(select ? list : []);
}
private initFormModel(): void {
this.projectForm = this._fb.group({
'project_name': ['', Validators.required],
- 'endpoint_name': ['', Validators.required],
+ 'endpoints_list': [[], Validators.required],
'project_tag': ['', Validators.required],
- 'users_group': [[]]
+ 'users_group': [[], Validators.required]
});
}
@@ -84,7 +85,7 @@ export class ProjectFormComponent implements OnInit {
this.projectForm = this._fb.group({
'project_name': [item.project_name, Validators.required],
- 'endpoint_name': [item.endpoint_name,Validators.required],
+ 'endpoints_list': [item.endpoints_list,Validators.required],
'project_tag': [item.project_tag, Validators.required],
'users_list': [item.users_list, Validators.required]
});
@@ -95,4 +96,10 @@ export class ProjectFormComponent implements OnInit {
(list: any) => this.groupsList = list.map(el => el.group),
error => this.toastr.error(error.message, 'Oops!'));
}
+
+ private getEndpointsData() {
+ this.endpointService.getEndpointsData().subscribe(
+ list => this.endpointsList = list,
+ error => this.toastr.error(error.message, 'Oops!'));
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/09: added endpoint.service to get list
Posted by an...@apache.org.
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 <An...@epam.com>
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 0000000..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-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 07/09: mock dource data to render data grid
Posted by an...@apache.org.
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 f7ffeff2b8bc33407d479bc1e017b145d5f16713
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu May 23 17:04:24 2019 +0300
mock dource data to render data grid
---
.../project/project-list/project-list.component.html | 4 ++--
.../project/project-list/project-list.component.ts | 20 +++++++++-----------
2 files changed, 11 insertions(+), 13 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 f3cbe38..267343d 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
@@ -25,9 +25,9 @@
<td mat-cell *matCellDef="let element"> {{element.project_name}} </td>
</ng-container>
- <ng-container matColumnDef="endpoint_name">
+ <ng-container matColumnDef="endpoints_list">
<th mat-header-cell *matHeaderCellDef> Endpoint name </th>
- <td mat-cell *matCellDef="let element"> {{element.endpoint_name}} </td>
+ <td mat-cell *matCellDef="let element"> {{element.endpoints_list}} </td>
</ng-container>
<ng-container matColumnDef="project_tag">
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 1f238f3..04c59c8 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
@@ -19,13 +19,12 @@
import { Component, OnInit } from '@angular/core';
import { ToastrService } from 'ngx-toastr';
- import {MatTableDataSource} from '@angular/material';
+ import { MatTableDataSource } from '@angular/material';
+ import { ProjectDataService } from '../project-data.service';
import { ProjectService } from '../../../core/services';
import { Project } from '../project.component';
- import { data } from './data';
-
@Component({
selector: 'project-list',
templateUrl: './project-list.component.html',
@@ -33,12 +32,14 @@
})
export class ProjectListComponent implements OnInit {
- displayedColumns: string[] = ['project_name', 'endpoint_name', 'project_tag', 'actions'];
- dataSource: any;
+ displayedColumns: string[] = ['project_name', 'endpoints_list', 'project_tag', 'actions'];
+ dataSource: Project[] | any;
constructor(
public toastr: ToastrService,
- private projectService: ProjectService) { }
+ private projectDataService: ProjectDataService,
+ private projectService: ProjectService
+ ) { }
ngOnInit() {
@@ -55,10 +56,7 @@ export class ProjectListComponent implements OnInit {
private getProjectsList() {
// Project[] type
- this.dataSource = new MatTableDataSource(data.projects);
-
- this.projectService.getProjectsList().subscribe(
- (response: any) => this.dataSource = response,
- error => this.toastr.error(error.message || 'Receiving list failed!', 'Oops!'));
+ debugger;
+ this.dataSource = new MatTableDataSource(this.projectDataService.getProjects)
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 09/09: fixed dialogs styles; extended classes
Posted by an...@apache.org.
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 <An...@epam.com>
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.
-->
-<div modalClass="ami-dialog modal-sm">
- <header>
+<div class="ami-dialog dialog-box">
+ <header class="dialog-header">
<h4 class="modal-title" id="myModalLabel">Create {{ DICTIONARY.image }}</h4>
+ <button type="button" class="close" (click)="dialogRef.close()">×</button>
</header>
- <div class="modal-content">
+ <div class="dialog-content">
<div class="content-box" *ngIf="notebook">
<form [formGroup]="createAMIForm" novalidate>
<div class="control-group">
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 @@
<header class="dialog-header header-white">
<button type="button" class="close" (click)="dialogRef.close()">×</button>
</header>
- <div class="modal-content">
+ <div class="dialog-content">
<div *ngIf="data">
<table class="detail-header">
<tr>
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.
-->
-<div modalClass="modal-lg">
- <header>
+<div class="dialog-box">
+ <header class="dialog-header">
<h4 class="modal-title" id="myModalLabel">Create analytical tool</h4>
+ <button type="button" class="close" (click)="dialogRef.close()">×</button>
</header>
- <div class="modal-content">
+ <div class="dialog-content">
<div class="content-box">
<form [formGroup]="createExploratoryEnvironmentForm"
(submit)="createExploratoryEnvironment_btnClick($event, createExploratoryEnvironmentForm.value)"
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
index e752cae..a219233 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
@@ -17,12 +17,12 @@
~ under the License.
-->
-<div #bindDialog modalClass="install-libraries modal-xl">
- <header>
- <h4 class="modal-title" id="myModalLabel">Manage
- <b>{{ notebook?.name }}</b> Libraries</h4>
+<div class="install-libraries dialog-box">
+ <header class="dialog-header">
+ <h4 class="modal-title" id="myModalLabel">Manage <b>{{ notebook?.name }}</b> Libraries</h4>
+ <button type="button" class="close" (click)="dialogRef.close()">×</button>
</header>
- <div class="modal-content">
+ <div class="dialog-content">
<div class="aligner">
<div class="info" *ngIf="notebook?.status !== 'running'">
<p class=" message">Cannot install libraries: Exploratory
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html
index a8a46dd..4f94b88 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html
@@ -17,11 +17,12 @@
~ under the License.
-->
-<div modalClass="manage-ungit modal-xxl">
- <header>
+<div class="manage-ungit dialog-box">
+ <header class="dialog-header">
<h4 class="modal-title" id="myModalLabel">Manage Git Credentials</h4>
+ <button type="button" class="close" (click)="dialogRef.close()">×</button>
</header>
- <div class="manage-ungit modal-content">
+ <div class="manage-ungit dialog-content">
<mat-tab-group mat-stretch-tabs #tabGroup class="content-box">
<mat-tab label="LIST">
<button mat-raised-button class="butt add-creds" (click)="tabGroup.selectedIndex = 1">
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
index e6b4676..bf08ec5 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
@@ -288,7 +288,7 @@ export class ResourcesGridComponent implements OnInit {
printCostDetails(data): void {
// this.costDetailsDialog.open({ isFooter: false }, data);
- this.dialog.open(CostDetailsDialogComponent, { data: data })
+ this.dialog.open(CostDetailsDialogComponent, { data: data, panelClass: 'modal-lg' })
.afterClosed().subscribe(() => this.buildGrid());
}
@@ -297,7 +297,7 @@ export class ResourcesGridComponent implements OnInit {
this.notebookName = data.name;
// this.computationalResourceModal.open({ isFooter: false }, data, this.environments);
- this.dialog.open(ComputationalResourceCreateDialogComponent, { data: { notebook: data, full_list: this.environments}})
+ this.dialog.open(ComputationalResourceCreateDialogComponent, { data: { notebook: data, full_list: this.environments}, panelClass: 'modal-xxl'})
.afterClosed().subscribe(() => this.buildGrid());
} else if (action === 'run') {
this.userResourceService
@@ -310,14 +310,14 @@ export class ResourcesGridComponent implements OnInit {
} else if (action === 'terminate') {
this.confirmationDialog.open({ isFooter: false }, data, ConfirmationDialogType.TerminateExploratory);
} else if (action === 'install') {
- this.dialog.open(InstallLibrariesComponent, { data: data })
+ this.dialog.open(InstallLibrariesComponent, { data: data, panelClass: 'modal-fullscreen' })
.afterClosed().subscribe(() => this.buildGrid());
} else if (action === 'schedule') {
// this.scheduler.open({ isFooter: false }, data, 'EXPLORATORY');
- this.dialog.open(SchedulerComponent, { data: {notebook: data, type: 'EXPLORATORY'} })
+ this.dialog.open(SchedulerComponent, { data: {notebook: data, type: 'EXPLORATORY'}, panelClass: 'modal-xl-s' })
.afterClosed().subscribe(() => this.buildGrid());
} else if (action === 'ami') {
- this.dialog.open(AmiCreateDialogComponent, { data: data })
+ this.dialog.open(AmiCreateDialogComponent, { data: data, panelClass: 'modal-sm' })
.afterClosed().subscribe(() => this.buildGrid());
}
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
index e0c71a0..fd44bcf 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
@@ -76,7 +76,7 @@ export class ResourcesComponent implements OnInit, OnDestroy {
if (this.userUploadAccessKeyState === HTTP_STATUS_CODES.OK) {
// if (!this.createAnalyticalModal.isOpened) this.createAnalyticalModal.open({ isFooter: false });
- this.dialog.open(ExploratoryEnvironmentCreateComponent, { data: this.resourcesGrid })
+ this.dialog.open(ExploratoryEnvironmentCreateComponent, { data: this.resourcesGrid, panelClass: 'modal-lg' })
.afterClosed().subscribe(() => this.refreshGrid());
} else {
this.userAccessKeyService.initialUserAccessKeyCheck();
@@ -100,7 +100,7 @@ export class ResourcesComponent implements OnInit, OnDestroy {
public manageUngit(): void {
// if (!this.manageUngitDialog.isOpened)
// this.manageUngitDialog.open({ isFooter: false });
- this.dialog.open(ManageUngitComponent)
+ this.dialog.open(ManageUngitComponent, {panelClass: 'modal-xxl'})
.afterClosed().subscribe(() => this.refreshGrid());
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
index 8d6ad16..fc6c9b6 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.html
@@ -17,16 +17,17 @@
~ under the License.
-->
-<div modalClass="scheduler-dialog modal-xl-s">
- <header>
+<div modalClass="scheduler-dialog dialog-box">
+ <header class="dialog-header">
<h4 class="modal-title">Scheduler
<span *ngIf="destination">for
<b *ngIf="destination.type === 'EXPLORATORY'; else resource">{{ destination.name }}</b>
<ng-template #resource><b>{{ destination.computational_name }}</b></ng-template>
</span>
</h4>
+ <button type="button" class="close" (click)="dialogRef.close()">×</button>
</header>
- <div class="modal-content">
+ <div class="dialog-content">
<div *ngIf="destination" class="content-box">
<form [formGroup]="schedulerForm">
<div class="enable-schedule">
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss
index 267fb39..6a6fc02 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss
@@ -237,3 +237,24 @@
padding-left: 45px !important;
}
}
+
+.modal-content {
+ display: block;
+ position: relative;
+ background-color: #fff;
+ -webkit-background-clip: padding-box;
+ background-clip: padding-box;
+ border: 1px solid rgba(0,0,0,.2);
+ border-radius: 3px;
+ outline: 0;
+ -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5);
+ box-shadow: 0 3px 9px rgba(0,0,0,.5);
+ .danger_color {
+ padding-left: 5px;
+ font-size: 12px;
+ display: inline-block;
+ font-family: 'Open Sans', sans-serif;
+ font-weight: 300;
+ border-color: #d9534f !important;
+ }
+}
\ No newline at end of file
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 6c3f9bb..d27cd73 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
@@ -26,6 +26,7 @@
.modal-xl-s { width: 660px; }
.modal-xl { width: 900px; }
.modal-xxl { width: 1000px; }
+ .modal-fullscreen { width: 100vw; height: 100vh;}
mat-dialog-container {
&.mat-dialog-container {
@@ -176,24 +177,3 @@ mat-dialog-container {
.content-box {
padding: 25px 30px 35px;
}
-
-// .modal-content {
-// display: block;
-// position: relative;
-// background-color: #fff;
-// -webkit-background-clip: padding-box;
-// background-clip: padding-box;
-// border: 1px solid rgba(0,0,0,.2);
-// border-radius: 3px;
-// outline: 0;
-// -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5);
-// box-shadow: 0 3px 9px rgba(0,0,0,.5);
-// .danger_color {
-// padding-left: 5px;
-// font-size: 12px;
-// display: inline-block;
-// font-family: 'Open Sans', sans-serif;
-// font-weight: 300;
-// border-color: #d9534f !important;
-// }
-// }
\ No newline at end of file
diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss
index 3650353..58269fa 100644
--- a/services/self-service/src/main/resources/webapp/src/styles.scss
+++ b/services/self-service/src/main/resources/webapp/src/styles.scss
@@ -22,10 +22,10 @@
@import './assets/fonts/Material_Icons/material-icons.css';
@import './assets/fonts/Open_Sans/open-sans.css';
-@import './assets/styles/_reset.scss';
-@import './assets/styles/_general.scss';
-@import './assets/styles/_theme.scss';
-@import './assets/styles/_dialogs.scss';
+@import '_reset.scss';
+@import '_general.scss';
+@import '_theme.scss';
+@import '_dialogs.scss';
.mat-tab-label {
font-family: 'Open Sans', sans-serif !important;
@@ -136,7 +136,7 @@ mat-chip.mat-chip strong {
text-align: center;
}
.info {
- font-size: 16px;
+ font-size: 15px;
font-weight: 300;
color: #35afd5;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/09: added project-data.service
Posted by an...@apache.org.
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 <An...@epam.com>
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 @@
<header class="dialog-header header-white">
<button type="button" class="close" (click)="dialogRef.close()">×</button>
</header>
- <div class="modal-content">
+ <div class="dialog-content">
<div *ngIf="resource">
<table class="detail-header">
<tr>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/09: provide variables reference to config file
Posted by an...@apache.org.
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 <An...@epam.com>
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 0000000..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-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 08/09: endpoint.service methods added
Posted by an...@apache.org.
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 <An...@epam.com>
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<string>;
@@ -532,6 +533,11 @@ export class ApplicationServiceFacade {
this.requestRegistry.Item(ApplicationServiceFacade.PROJECT),
null);
}
+ public buildGetEndpointsData(): Observable<any> {
+ return this.buildRequest(RequestMethod.Get,
+ this.requestRegistry.Item(ApplicationServiceFacade.ENDPOINT),
+ null);
+ }
private setupRegistry(): void {
this.requestRegistry = new Dictionary<string>();
@@ -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-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org