[incubator-dlab] branch develop updated (a76b0e7 -> 7420727)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from a76b0e7 Merge pull request #499 from apache/DLAB-1388 add 765527f [DLAB-1399]:Removed extra vertical scrollbar during pages switching new 7420727 Merge pull request #500 from apache/DLAB-1399 The 1 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: .../main/resources/webapp/src/app/shared/navbar/navbar.component.scss | 2 -- .../src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #500 from apache/DLAB-1399
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 742072794693dd382d7394d88dbd759ed85c7f97 Merge: a76b0e7 765527f Author: Andriana Kovalyshyn AuthorDate: Mon Dec 23 16:33:14 2019 +0200 Merge pull request #500 from apache/DLAB-1399 [DLAB-1399]:Removed extra vertical scrollbar during pages switching .../main/resources/webapp/src/app/shared/navbar/navbar.component.scss | 2 -- .../src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (c32c02e -> a76b0e7)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from c32c02e [DLAB-1410] Added shared images functionality (#498) add 36fad2b [DLAB-1388]:Removed extra warning after assigning user to a project new a76b0e7 Merge pull request #499 from apache/DLAB-1388 The 1 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: .../main/resources/webapp/src/app/shared/navbar/navbar.component.ts| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #499 from apache/DLAB-1388
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit a76b0e70b17f01279c04f99a3cfcc24feb322c81 Merge: c32c02e 36fad2b Author: Andriana Kovalyshyn AuthorDate: Mon Dec 23 13:18:09 2019 +0200 Merge pull request #499 from apache/DLAB-1388 [DLAB-1388]:Removed extra warning after assigning user to a project .../main/resources/webapp/src/app/shared/navbar/navbar.component.ts| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1410 updated: [DLAB-1112]: edit sharedImageEnabled value on edit
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1410
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1410 by this push:
new adbefdc [DLAB-1112]: edit sharedImageEnabled value on edit
adbefdc is described below
commit adbefdc6b5b1f420999e7cc01149a32bd388b2d7
Author: Andriana Kovalyshyn
AuthorDate: Fri Dec 20 16:10:28 2019 +0200
[DLAB-1112]: edit sharedImageEnabled value on edit
---
.../app/administration/project/project-form/project-form.component.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 c22988a..b89a51f 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
@@ -153,7 +153,7 @@ export class ProjectFormComponent implements OnInit {
});
}
- public editSpecificProject(item: Project) {
+ public editSpecificProject(item) {
let endpoints = item.endpoints.map((item: any) => item.name);
this.projectForm = this._fb.group({
@@ -162,7 +162,7 @@ export class ProjectFormComponent implements OnInit {
'endpoints': [endpoints],
'tag': [item.tag, Validators.required],
'groups': [item.groups, Validators.required],
- 'shared_image_enabled': [item.shared_image_enabled, Validators.required]
+ 'shared_image_enabled': [item.sharedImageEnabled, Validators.required]
});
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1410 updated: [DLAB-1112]: added shared ami controls to project create/edit form
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1410
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1410 by this push:
new e6d3c61 [DLAB-1112]: added shared ami controls to project create/edit
form
e6d3c61 is described below
commit e6d3c614177d5d859feb102fe435cd5af9f42b93
Author: Andriana Kovalyshyn
AuthorDate: Fri Dec 20 13:29:15 2019 +0200
[DLAB-1112]: added shared ami controls to project create/edit form
---
.../project/project-form/project-form.component.html | 9 +++--
.../project/project-form/project-form.component.ts | 5 ++---
.../webapp/src/app/administration/project/project.component.ts | 2 +-
3 files changed, 6 insertions(+), 10 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 4f3730a..cf2ab5a 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
@@ -160,14 +160,11 @@
-
-
-
-
+
Clear
keyboard_arrow_leftBack
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 afbd3c2..c22988a 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
@@ -141,7 +141,6 @@ export class ProjectFormComponent implements OnInit {
this.projectForm.controls[key].setValue(select ? filter : []);
}
- // TODO: return shared_image_enabled properties after back-end part will be
fully completed
private initFormModel(): void {
this.projectForm = this._fb.group({
@@ -150,7 +149,7 @@ export class ProjectFormComponent implements OnInit {
'endpoints': [[], Validators.required],
'tag': ['', Validators.compose([Validators.required,
Validators.pattern(PATTERNS.projectName)])],
'groups': [[], Validators.required],
- // 'shared_image_enabled': [false, Validators.required]
+ 'shared_image_enabled': [false, Validators.required]
});
}
@@ -163,7 +162,7 @@ export class ProjectFormComponent implements OnInit {
'endpoints': [endpoints],
'tag': [item.tag, Validators.required],
'groups': [item.groups, Validators.required],
- // 'shared_image_enabled': [item.shared_image_enabled,
Validators.required]
+ 'shared_image_enabled': [item.shared_image_enabled, Validators.required]
});
}
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 a501ccc..da7c986 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
@@ -38,7 +38,7 @@ export interface Project {
endpoints: Endpoint[];
tag: string;
groups: string[];
- // shared_image_enabled?: boolean;
+ shared_image_enabled?: boolean;
}
@Component({
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (4752539 -> 44e6ead)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 4752539 Merge pull request #496 from apache/DLAB-1239 add 7346c1a [DLAB-1397]: typo fixes new 44e6ead Merge pull request #497 from apache/DLAB-1397 The 1 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: .../computational/cluster-details/cluster-details.component.html| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #497 from apache/DLAB-1397
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 44e6ead8159e3030605a131d35e39a1a6d0de1c3 Merge: 4752539 7346c1a Author: Andriana Kovalyshyn AuthorDate: Thu Dec 19 16:33:04 2019 +0200 Merge pull request #497 from apache/DLAB-1397 [DLAB-1397]: fix reconfiguration spark for Data Engine .../computational/cluster-details/cluster-details.component.html| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1397]: typo fixes
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-1397 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 7346c1a553283f90e702159e177141fdca626113 Author: Andriana Kovalyshyn AuthorDate: Thu Dec 19 16:31:34 2019 +0200 [DLAB-1397]: typo fixes --- .../computational/cluster-details/cluster-details.component.html| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7436d0b..41c145e 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 @@ -109,7 +109,7 @@ Cluster configurations - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1397 created (now 7346c1a)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1397 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 7346c1a [DLAB-1397]: typo fixes This branch includes the following new commits: new 7346c1a [DLAB-1397]: typo fixes The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #496 from apache/DLAB-1239
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 475253949d959638053a649ce4b2d251950997f4 Merge: 4cdba58 c8b6763 Author: Andriana Kovalyshyn AuthorDate: Thu Dec 19 16:20:44 2019 +0200 Merge pull request #496 from apache/DLAB-1239 DLAB-1239]: Swagger UI integration in DLab .../src/main/resources/webapp/angular.json | 8 +- .../src/main/resources/webapp/package-lock.json| 75 +++--- .../src/main/resources/webapp/package.json | 5 +- .../main/resources/webapp/src/app/app.module.ts| 2 + .../resources/webapp/src/app/app.routing.module.ts | 5 + .../src/app/core/directives/scrollTo.directive.ts | 2 +- .../app/reporting/toolbar/toolbar.component.html | 5 +- ...oolbar.component.css => toolbar.component.scss} | 115 - .../src/app/reporting/toolbar/toolbar.component.ts | 22 ++-- .../src/app/shared/navbar/navbar.component.html| 57 +- .../src/app/shared/navbar/navbar.component.scss| 24 + .../scrollTo.directive.ts => swagger/index.ts} | 26 ++--- .../webapp/src/app/swagger/swagger.component.html | 20 .../swagger.component.scss}| 20 +--- .../swagger.component.ts} | 35 --- .../webapp/src/assets/svg/swagger-logo.svg | 8 ++ 16 files changed, 256 insertions(+), 173 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (4cdba58 -> 4752539)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 4cdba58 Merge pull request #495 from apache/DLAB-1402
add 9487828 [DLAB-1239]: added swagger to core
add 04e193d [DLAB-1239]: Swagger UI integration in DLab added
add 528ebfb Merge branch 'develop' of github.com:apache/incubator-dlab
into DLAB-1239
add b2ca611 [DLAB-1239]: Swagger UI integration in DLab navigation
add c8b6763 [DLAB-1239]: Swagger module separation
new 4752539 Merge pull request #496 from apache/DLAB-1239
The 1 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 | 8 +-
.../src/main/resources/webapp/package-lock.json| 75 +++---
.../src/main/resources/webapp/package.json | 5 +-
.../main/resources/webapp/src/app/app.module.ts| 2 +
.../resources/webapp/src/app/app.routing.module.ts | 5 +
.../src/app/core/directives/scrollTo.directive.ts | 2 +-
.../app/reporting/toolbar/toolbar.component.html | 5 +-
...oolbar.component.css => toolbar.component.scss} | 115 -
.../src/app/reporting/toolbar/toolbar.component.ts | 22 ++--
.../src/app/shared/navbar/navbar.component.html| 57 +-
.../src/app/shared/navbar/navbar.component.scss| 24 +
.../pipes/underscoreless-pipe => swagger}/index.ts | 12 ++-
.../swagger.component.html}| 2 +-
.../index.ts => swagger/swagger.component.scss}| 4 +-
.../swagger.component.ts} | 29 --
.../webapp/src/assets/svg/swagger-logo.svg | 8 ++
16 files changed, 233 insertions(+), 142 deletions(-)
rename
services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/{toolbar.component.css
=> toolbar.component.scss} (66%)
copy
services/self-service/src/main/resources/webapp/src/app/{core/pipes/underscoreless-pipe
=> swagger}/index.ts (82%)
copy
services/self-service/src/main/resources/webapp/src/app/{layout/layout.component.html
=> swagger/swagger.component.html} (96%)
copy
services/self-service/src/main/resources/webapp/src/app/{core/collections/index.ts
=> swagger/swagger.component.scss} (95%)
copy
services/self-service/src/main/resources/webapp/src/app/{layout/layout.component.ts
=> swagger/swagger.component.ts} (61%)
create mode 100644
services/self-service/src/main/resources/webapp/src/assets/svg/swagger-logo.svg
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (8163664 -> 4cdba58)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 8163664 [DLAB-1406] Added validation for endpoint disconnection in case if saving related resources add 5a66a6d [1402] Conveyed edge node on confirmation dialog add a25ffd0 [1402] Conveyed edge node on confirmation dialog add 49310a5 [DLAB-1402] Fixed termination condition add 02e919a [1402] removed consolelog new 4cdba58 Merge pull request #495 from apache/DLAB-1402 The 1 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: .../management/endpoints/endpoints.component.ts| 53 ++ .../services/applicationServiceFacade.service.ts | 6 +++ .../src/app/core/services/endpoint.service.ts | 8 .../notification-dialog.component.ts | 10 ++-- 4 files changed, 44 insertions(+), 33 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #495 from apache/DLAB-1402
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 4cdba58f858606dd7b04f374d217c004fa13a205 Merge: 8163664 02e919a Author: Andriana Kovalyshyn AuthorDate: Thu Dec 19 16:06:43 2019 +0200 Merge pull request #495 from apache/DLAB-1402 [Dlab 1402] Conveyed edge node on confirmation dialog .../management/endpoints/endpoints.component.ts| 53 ++ .../services/applicationServiceFacade.service.ts | 6 +++ .../src/app/core/services/endpoint.service.ts | 8 .../notification-dialog.component.ts | 10 ++-- 4 files changed, 44 insertions(+), 33 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1239 updated: [DLAB-1239]: Swagger module separation
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1239
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1239 by this push:
new c8b6763 [DLAB-1239]: Swagger module separation
c8b6763 is described below
commit c8b67635895144ec17a4c3e4c692c4b0bbec143d
Author: Andriana Kovalyshyn
AuthorDate: Thu Dec 19 16:04:08 2019 +0200
[DLAB-1239]: Swagger module separation
---
.../main/resources/webapp/src/app/app.module.ts| 5 +-
.../app/reporting/toolbar/toolbar.component.html | 5 +-
...oolbar.component.css => toolbar.component.scss} | 115 -
.../src/app/reporting/toolbar/toolbar.component.ts | 22 ++--
.../main/resources/webapp/src/app/swagger/index.ts | 32 ++
5 files changed, 115 insertions(+), 64 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/app.module.ts
b/services/self-service/src/main/resources/webapp/src/app/app.module.ts
index aaa125e..e23e14a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/app.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/app.module.ts
@@ -40,10 +40,10 @@ import { ReportingModule } from
'./reporting/reporting.module';
import { AdministrationModule } from './administration/administration.module';
import { WebterminalModule } from './webterminal';
import { CoreModule } from './core/core.module';
-import { SwaggerComponent } from './swagger/swagger.component';
+import { SwaggerAPIModule } from './swagger';
@NgModule({
- declarations: [AppComponent, SwaggerComponent],
+ declarations: [AppComponent],
imports: [
BrowserModule,
BrowserAnimationsModule,
@@ -58,6 +58,7 @@ import { SwaggerComponent } from
'./swagger/swagger.component';
ReportingModule,
AdministrationModule,
WebterminalModule,
+SwaggerAPIModule,
RouterModule,
AppRoutingModule,
CoreModule.forRoot(),
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.html
b/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.html
index e425338..9c0b9c0 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.html
@@ -16,11 +16,12 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
+
Service base name: {{
reportData.service_base_name }}
- Resource tag ID:
{{ reportData.tag_resource_id }}
+ Resource tag ID:
+{{ reportData.tag_resource_id }}
Available reporting period from:
{{ availablePeriodFrom | date }}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.css
b/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.scss
similarity index 66%
rename from
services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.css
rename to
services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.scss
index 5e82739..c273eab 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.css
+++
b/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.scss
@@ -17,108 +17,123 @@
* under the License.
*/
-section {
-display: flex;
-justify-content: space-between;
-font-weight: 300;
-}
-section > div {
+section.toolbar {
+ display: flex;
+ justify-content: space-between;
+ font-weight: 300;
+
+ >div {
width: 33%;
-}
-section > div:nth-child(2) {
+ }
+
+ >div:nth-child(2) {
text-align: center;
-}
-section > div:nth-child(3) {
+ }
+
+ >div:nth-child(3) {
text-align: right;
-}
+ }
-.action-butt {
+ .action-butt {
align-self: center;
-}
-.action-butt button:first-child{
-margin-right: 10px;
-}
+ }
-.action-butt .butt-report-range {
+ button {
+&:first-child {
+ margin-right: 10px;
+}
+ }
+
+ .butt-report-range {
width: 240px;
margin-right: 10px;
-}
+ }
-.general {
+ .general {
font-size: 13px;
-}
-.general div span {
-width: 190px;
-display: inline-block;
+
+div {
+ span {
+width: 190px;
+display: inline-block;
+ }
+}
+ }
}
- /* daterangepicker themes */
+/* daterangepicker themes */
#range-picker {
-margin-top: 5px;
+ margin-top: 5px;
}
+
#range-picker path#Shape {
-fill: #36afd5;
+ fill: #36afd5;
}
#range-picker .ng-daterangepicker,
#range-picker .ng-daterangepicker.is-active,
#range-picker .ng-daterangepicker .
[incubator-dlab] 02/02: [DLAB-1239]: Swagger UI integration in DLab navigation
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1239
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b2ca6110cf23108b4e819e7724206ec22f0d959c
Author: Andriana Kovalyshyn
AuthorDate: Thu Dec 19 15:42:30 2019 +0200
[DLAB-1239]: Swagger UI integration in DLab navigation
---
.../src/app/shared/navbar/navbar.component.html| 57 +-
.../src/app/shared/navbar/navbar.component.scss| 24 +
.../webapp/src/assets/svg/swagger-logo.svg | 8 +++
3 files changed, 65 insertions(+), 24 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
index f8e8ef6..ca89f33 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
@@ -68,36 +68,45 @@
-
- List of Resources
- dashboard
-
-
- Administration
+
+
+List of Resources
+dashboard
+
+
+Administration
-
-Roles
-account_box
+
+ Roles
+ account_box
+
+
+ Projects
+ dns
+
+
+ Environment Management
+ settings
+
-
-Projects
-dns
+Billing Report
+account_balance_wallet
-
+
+
-Environment Management
-settings
+
+Cloud endpoint API
-
-
- Billing Report
- account_balance_wallet
-
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
index 49b8ffc..fd4d6b7 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
@@ -168,6 +168,10 @@ a.nav-item {
color: #577289 !important;
outline: none;
+ span {
+vertical-align: middle;
+ }
+
i {
vertical-align: middle;
padding-left: 8px;
@@ -286,6 +290,26 @@ a.nav-item {
transform: translateY(-4px) translateX(6px) rotate(-45deg);
}
+mat-sidenav {
+
+ mat-nav-list {
+height: 100%;
+
+nav {
+ height: 100%;
+ display: flex;
+ justify-content: space-between;
+ flex-direction: column;
+
+ .swagger-logo {
+vertical-align: middle;
+width: 30px;
+padding: 0 2px 0 5px;
+ }
+}
+ }
+}
+
mat-sidenav-content {
&.mat-drawer-content {
transition: all 0.35s ease-out;
diff --git
a/services/self-service/src/main/resources/webapp/src/assets/svg/swagger-logo.svg
b/services/self-service/src/main/resources/webapp/src/assets/svg/swagger-logo.svg
new file mode 100644
index 000..cb85281
--- /dev/null
+++
b/services/self-service/src/main/resources/webapp/src/assets/svg/swagger-logo.svg
@@ -0,0 +1,8 @@
+
+http://www.w3.org/2000/svg"; xmlns:xlink="http://www.w3.org/1999/xlink";
preserveAspectRatio="xMidYMid">
+
+
[incubator-dlab] branch DLAB-1239 updated (04e193d -> b2ca611)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1239 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 04e193d [DLAB-1239]: Swagger UI integration in DLab added add 8950437 [DLAB-1372]: prevent actions for superset and jupyter lab according statuses add 102ad16 [DLAB-1371]: fixed issue with permission info message appearing add ab2432b Merge pull request #481 from apache/DLAB-1372 add d425183 [DLAB-1373] Fixed issue with permissions for user during instances creation add 2aa79ef [DLAB-1363] - SSO on Azure fixed add 7a66479 Merge pull request #482 from apache/DLAB-1363 add 3626d5f [DLAB-448] Added possibility of filtering list of installed libraries add fc88a27 [DLAB-448] Added possibility of filtering list of installed libraries add 4f4112f Merge pull request #484 from apache/DLAB-448 add 8eb9afd [DLAB-1363] - SSO implementation, EDGE node egress rules for AWS and Azure fixed add faa2a1a Merge pull request #485 from apache/DLAB-1363 add 8b5ff32 [DLAB-1326] Implemented proxy configuration for docker add 1df52e1 [DLAB-1326] Implemented proxy configuration for docker add a417a96 Merge pull request #467 from apache/develop add 35247bb Merge remote-tracking branch 'origin/DLAB-1326' into DLAB-1326 add 46b1bd8 [DLAB-1326] Implemented proxy configuration for docker add e7cec67 Merge pull request #471 from apache/develop add f96e0f2 Merge remote-tracking branch 'origin/DLAB-1326' into DLAB-1326 add 835a667 [DLAB-1326] Refactored Superset deployment scripts add ee3a8c5 Merge pull request #483 from apache/DLAB-1326 add 3befbd1 [DLAB-1363] - SSO and Superset fixed for keycloak auth via any url add 637500d Merge pull request #486 from apache/DLAB-1363 add c43816a Updated LICENSE and build.properties add cb598e4 [DLAB-1381]: Libraries management bugs fixing add d02fec7 [DLAB-1381]: Fixed issues with libraries filter add d274482 Merge pull request #490 from apache/DLAB-1381 add c2e24a4 [DLAB-1376]: Added local endpoint check add 2177315 [DLAB-1376]: Added local endpoint check add 934719b Merge pull request #491 from apache/DLAB-1376 add 57d92d6 [DLAB-1386]: Fixed issues with libraries filter add ac2913e Merge pull request #492 from apache/DLAB-1386 add 8ce3d97 [DLAB-1383] Updated RELEASE_NOTES.md add 87ad55a [Dlab 1321]: Conveyed all resources which will be terminated on confirmation dialog (#493) add a002db4 [1400] Altered information message for endpoint management add 20229ba Merge pull request #494 from apache/DLAB-1400 add f650f54 [DLAB-1401] Created endpoint for endpoint resources add 8163664 [DLAB-1406] Added validation for endpoint disconnection in case if saving related resources new 528ebfb Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1239 new b2ca611 [DLAB-1239]: Swagger UI integration in DLab navigation The 2 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: LICENSE| 26 +--- RELEASE_NOTES.md | 94 --- build.properties | 2 +- .../src/general/lib/os/debian/edge_lib.py | 4 +- .../src/general/lib/os/fab.py | 61 ++-- .../general/scripts/aws/jupyterlab_configure.py| 20 +++ .../src/general/scripts/aws/project_prepare.py | 32 ++-- .../src/general/scripts/azure/edge_configure.py| 2 +- .../src/general/scripts/azure/project_prepare.py | 2 +- .../general/scripts/gcp/jupyterlab_configure.py| 21 +++ .../src/general/scripts/gcp/superset_configure.py | 65 +++- ...iner_start.py => configure_proxy_for_docker.py} | 42 +++-- .../scripts/os/jupyterlab_container_start.py | 4 +- .../superset_start.py} | 29 ++-- .../scripts/configure_jupyterlab_node.py | 2 +- .../src/project/templates/conf.d/proxy.conf| 2 +- .../src/project/templates/nginx.conf | 2 + .../superset/scripts/configure_superset_node.py| 2 +- .../src/superset/templates/id_provider.json| 10 +- .../src/superset/templates/superset_config.py | 2 +- .../epam/dlab/backendapi/dao/ExploratoryDAO.java | 30 +++- .../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 + .../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 5 + .../backendapi/domain/EndpointResourcesDTO.java} | 14 +- .../backendapi/resources/EndpointResource.java | 21 ++- .../dlab/backend
[incubator-dlab] 01/02: Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1239
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-1239 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 528ebfba9c3e6d5626fa62d75368d438242e3481 Merge: 04e193d 8163664 Author: Andriana Kovalyshyn AuthorDate: Thu Dec 19 12:07:27 2019 +0200 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1239 LICENSE| 26 +--- RELEASE_NOTES.md | 94 --- build.properties | 2 +- .../src/general/lib/os/debian/edge_lib.py | 4 +- .../src/general/lib/os/fab.py | 61 ++-- .../general/scripts/aws/jupyterlab_configure.py| 20 +++ .../src/general/scripts/aws/project_prepare.py | 32 ++-- .../src/general/scripts/azure/edge_configure.py| 2 +- .../src/general/scripts/azure/project_prepare.py | 2 +- .../general/scripts/gcp/jupyterlab_configure.py| 21 +++ .../src/general/scripts/gcp/superset_configure.py | 65 +++- ...iner_start.py => configure_proxy_for_docker.py} | 42 +++-- .../scripts/os/jupyterlab_container_start.py | 4 +- ...terlab_container_start.py => superset_start.py} | 27 ++-- .../scripts/configure_jupyterlab_node.py | 2 +- .../src/project/templates/conf.d/proxy.conf| 2 +- .../src/project/templates/nginx.conf | 2 + .../superset/scripts/configure_superset_node.py| 2 +- .../src/superset/templates/id_provider.json| 10 +- .../src/superset/templates/superset_config.py | 2 +- .../epam/dlab/backendapi/dao/ExploratoryDAO.java | 30 +++- .../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 + .../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 5 + .../backendapi/domain/EndpointResourcesDTO.java} | 23 ++- .../backendapi/resources/EndpointResource.java | 21 ++- .../dlab/backendapi/service/EndpointService.java | 10 +- .../dlab/backendapi/service/ProjectService.java| 4 + .../service/impl/EndpointServiceImpl.java | 51 +- .../impl/InfrastructureTemplateServiceBase.java| 6 +- .../service/impl/ProjectServiceImpl.java | 43 -- .../management/endpoints/endpoints.component.ts| 45 -- .../manage-environment-dilog.component.ts | 4 +- ...utational-resource-create-dialog.component.html | 6 +- ...mputational-resource-create-dialog.component.ts | 2 +- .../install-libraries/filter-libs.model.ts}| 30 ++-- .../install-libraries.component.html | 115 -- .../install-libraries.component.scss | 108 ++--- .../install-libraries.component.ts | 53 ++- .../resources-grid/resources-grid.component.html | 4 +- .../resources-grid/resources-grid.component.ts | 1 - .../shared/form-controls/dropdowns.component.scss | 4 +- .../multi-select-dropdown.component.html | 2 +- .../modal-dialog/notification-dialog/index.ts | 3 +- .../notification-dialog.component.ts | 172 + .../webapp/src/assets/styles/_dialogs.scss | 8 +- .../InfrastructureTemplateServiceBaseTest.java | 9 +- 46 files changed, 795 insertions(+), 388 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1239]: added swagger to core
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1239
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 9487828f231c454d9c8f366d2fa016801939d081
Author: Andriana Kovalyshyn
AuthorDate: Thu Dec 19 12:05:51 2019 +0200
[DLAB-1239]: added swagger to core
---
.../src/main/resources/webapp/angular.json | 8 ++-
.../src/main/resources/webapp/package-lock.json| 75 --
.../src/main/resources/webapp/package.json | 5 +-
3 files changed, 49 insertions(+), 39 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/angular.json
b/services/self-service/src/main/resources/webapp/angular.json
index 95c1cc0..32b79b3 100644
--- a/services/self-service/src/main/resources/webapp/angular.json
+++ b/services/self-service/src/main/resources/webapp/angular.json
@@ -26,14 +26,18 @@
},
"src/styles.scss",
"src/assets/styles/app-loading.scss",
- "node_modules/ngx-toastr/toastr.css"
+ "node_modules/ngx-toastr/toastr.css",
+ "node_modules/swagger-ui-dist/swagger-ui.css"
],
"stylePreprocessorOptions": {
"includePaths": [
"src/assets/styles"
]
},
-"scripts": []
+"scripts": [
+ "node_modules/swagger-ui-dist/swagger-ui-bundle.js",
+ "node_modules/swagger-ui-dist/swagger-ui-standalone-preset.js"
+]
},
"configurations": {
"production": {
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 9b9ab8c..f8cfcc8 100644
--- a/services/self-service/src/main/resources/webapp/package-lock.json
+++ b/services/self-service/src/main/resources/webapp/package-lock.json
@@ -4945,7 +4945,7 @@
"dependencies": {
"abbrev": {
"version": "1.1.1",
- "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
"dev": true,
"optional": true
@@ -4959,14 +4959,14 @@
},
"aproba": {
"version": "1.2.0",
- "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz";,
+ "resolved": false,
"integrity":
"sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
"dev": true,
"optional": true
},
"are-we-there-yet": {
"version": "1.1.5",
- "resolved":
"https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz";,
+ "resolved": false,
"integrity":
"sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
"dev": true,
"optional": true,
@@ -4977,14 +4977,14 @@
},
"balanced-match": {
"version": "1.0.0",
- "resolved":
"https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz";,
+ "resolved": false,
"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
- "resolved":
"https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz";,
+ "resolved": false,
"integrity":
"sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"optional": true,
@@ -4995,7 +4995,7 @@
},
"chownr": {
"version": "1.1.1",
- "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz";,
+ "resolved": false,
"integrity":
"sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
"dev": true,
"optional": true
@@ -5030,7 +5030,7 @@
[incubator-dlab] 02/02: [DLAB-1239]: Swagger UI integration in DLab added
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1239
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 04e193dd0f8d8bfcbf633b426d3e2466ac584b93
Author: Andriana Kovalyshyn
AuthorDate: Thu Dec 19 12:06:54 2019 +0200
[DLAB-1239]: Swagger UI integration in DLab added
---
.../main/resources/webapp/src/app/app.module.ts| 3 +-
.../resources/webapp/src/app/app.routing.module.ts | 5
.../src/app/core/directives/scrollTo.directive.ts | 2 +-
.../webapp/src/app/swagger/swagger.component.html | 20 +
.../swagger.component.scss}| 20 +
.../swagger.component.ts} | 35 ++
6 files changed, 51 insertions(+), 34 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/app.module.ts
b/services/self-service/src/main/resources/webapp/src/app/app.module.ts
index 680ae7c..aaa125e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/app.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/app.module.ts
@@ -40,9 +40,10 @@ import { ReportingModule } from
'./reporting/reporting.module';
import { AdministrationModule } from './administration/administration.module';
import { WebterminalModule } from './webterminal';
import { CoreModule } from './core/core.module';
+import { SwaggerComponent } from './swagger/swagger.component';
@NgModule({
- declarations: [AppComponent],
+ declarations: [AppComponent, SwaggerComponent],
imports: [
BrowserModule,
BrowserAnimationsModule,
diff --git
a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
index 0473332..3c8ae3f 100644
---
a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
@@ -31,6 +31,7 @@ import { WebterminalComponent } from
'./webterminal/webterminal.component';
import { ManagementComponent } from
'./administration/management/management.component';
import { ProjectComponent } from './administration/project/project.component';
import { RolesComponent } from './administration/roles/roles.component';
+import { SwaggerComponent } from './swagger/swagger.component';
import { AuthorizationGuard, CheckParamsGuard, CloudProviderGuard, AdminGuard
} from './core/services';
@@ -67,6 +68,10 @@ const routes: Routes = [{
component: ManagementComponent,
canActivate: [AuthorizationGuard, AdminGuard]
}, {
+ path: 'swagger',
+ component: SwaggerComponent,
+ canActivate: [AuthorizationGuard]
+}, {
path: 'help/publickeyguide',
component: PublicKeyGuideComponent,
canActivate: [AuthorizationGuard]
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/directives/scrollTo.directive.ts
b/services/self-service/src/main/resources/webapp/src/app/core/directives/scrollTo.directive.ts
index 08560b2..fb6e0c3 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/directives/scrollTo.directive.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/directives/scrollTo.directive.ts
@@ -24,7 +24,7 @@ import { Directive } from '@angular/core';
selector: '[scrollTo]'
})
export class ScrollDirective {
- constructor(private elRef: ElementRef) {}
+ constructor(private elRef: ElementRef) { }
@Input()
set scrollTo(condition) {
diff --git
a/services/self-service/src/main/resources/webapp/src/app/swagger/swagger.component.html
b/services/self-service/src/main/resources/webapp/src/app/swagger/swagger.component.html
new file mode 100644
index 000..467bfb5
--- /dev/null
+++
b/services/self-service/src/main/resources/webapp/src/app/swagger/swagger.component.html
@@ -0,0 +1,20 @@
+
+
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/directives/scrollTo.directive.ts
b/services/self-service/src/main/resources/webapp/src/app/swagger/swagger.component.scss
similarity index 67%
copy from
services/self-service/src/main/resources/webapp/src/app/core/directives/scrollTo.directive.ts
copy to
services/self-service/src/main/resources/webapp/src/app/swagger/swagger.component.scss
index 08560b2..3d56d22 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/directives/scrollTo.directive.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/swagger/swagger.component.scss
@@ -1,4 +1,4 @@
-/*
+/*!
* 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
@@ -16
[incubator-dlab] branch DLAB-1239 created (now 04e193d)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1239 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 04e193d [DLAB-1239]: Swagger UI integration in DLab added This branch includes the following new commits: new 9487828 [DLAB-1239]: added swagger to core new 04e193d [DLAB-1239]: Swagger UI integration in DLab added The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #494 from apache/DLAB-1400
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 20229ba8c21c04ecc265822dcb8b9eac7236b15f Merge: 87ad55a a002db4 Author: Andriana Kovalyshyn AuthorDate: Wed Dec 18 13:17:17 2019 +0200 Merge pull request #494 from apache/DLAB-1400 [1400] Altered information message for endpoint management .../management/endpoints/endpoints.component.ts | 6 +++--- .../app/administration/project/project.component.ts | 2 +- .../notification-dialog.component.ts | 19 +-- 3 files changed, 13 insertions(+), 14 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (87ad55a -> 20229ba)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 87ad55a [Dlab 1321]: Conveyed all resources which will be terminated on confirmation dialog (#493) add a002db4 [1400] Altered information message for endpoint management new 20229ba Merge pull request #494 from apache/DLAB-1400 The 1 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: .../management/endpoints/endpoints.component.ts | 6 +++--- .../app/administration/project/project.component.ts | 2 +- .../notification-dialog.component.ts | 19 +-- 3 files changed, 13 insertions(+), 14 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (934719b -> ac2913e)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 934719b Merge pull request #491 from apache/DLAB-1376 add 57d92d6 [DLAB-1386]: Fixed issues with libraries filter new ac2913e Merge pull request #492 from apache/DLAB-1386 The 1 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: .../install-libraries/install-libraries.component.html| 10 -- .../install-libraries/install-libraries.component.ts | 11 +++ .../multi-select-dropdown.component.html | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #492 from apache/DLAB-1386
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit ac2913ea377da3ced5895034bc793e76186fb39d Merge: 934719b 57d92d6 Author: Andriana Kovalyshyn AuthorDate: Fri Dec 13 15:56:31 2019 +0200 Merge pull request #492 from apache/DLAB-1386 [DLAB-1386]: Fixed issues with libraries filter .../install-libraries/install-libraries.component.html| 10 -- .../install-libraries/install-libraries.component.ts | 11 +++ .../multi-select-dropdown.component.html | 2 +- 3 files changed, 16 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (c43816a -> d274482)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from c43816a Updated LICENSE and build.properties add cb598e4 [DLAB-1381]: Libraries management bugs fixing add d02fec7 [DLAB-1381]: Fixed issues with libraries filter new d274482 Merge pull request #490 from apache/DLAB-1381 The 1 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: .../install-libraries.component.html | 15 .../install-libraries.component.scss | 41 -- .../install-libraries.component.ts | 15 3 files changed, 46 insertions(+), 25 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #490 from apache/DLAB-1381
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit d274482be3b17a3e6f1bce80910c3f37e947b5f9 Merge: c43816a d02fec7 Author: Andriana Kovalyshyn AuthorDate: Thu Dec 12 13:21:54 2019 +0200 Merge pull request #490 from apache/DLAB-1381 [DLAB-1381]: Fixed issues with libraries filter .../install-libraries.component.html | 15 .../install-libraries.component.scss | 41 -- .../install-libraries.component.ts | 15 3 files changed, 46 insertions(+), 25 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/03: [DLAB-1364]: replace labels
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch gh-pages in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 9873efc87c6922f7aedcd08652176aa48adf5cbd Author: Andriana Kovalyshyn AuthorDate: Wed Dec 11 11:38:36 2019 +0200 [DLAB-1364]: replace labels --- index.html | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 0546d89..e4dea74 100755 --- a/index.html +++ b/index.html @@ -623,15 +623,11 @@ +alt="Similar user experience across AWS, GCP, and Azure clouds" /> -Secured access to personal exploratory environment - -Gateway node to access analytical environment through secured tunnel -Private key for identity control and encryption - + Similar user experience across AWS, GCP, and Azure clouds - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch gh-pages updated (206745a -> 735e91f)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch gh-pages in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 206745a [DLAB-1377]: Fixed initial slider is not loaded until user uses scrollbar on promotion page new 9873efc [DLAB-1364]: replace labels new 664c148 Merge branch 'gh-pages' of github.com:apache/incubator-dlab into gh-pages new 735e91f [DLAB-1364]: replace labels The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: index.html | 19 +++ 1 file changed, 7 insertions(+), 12 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 03/03: [DLAB-1364]: replace labels
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch gh-pages in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 735e91f9a59af4ff78f90d9115df1c3f9c6811b8 Author: Andriana Kovalyshyn AuthorDate: Wed Dec 11 12:18:29 2019 +0200 [DLAB-1364]: replace labels --- index.html | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 97b8222..fd43cf4 100755 --- a/index.html +++ b/index.html @@ -530,12 +530,12 @@ -Customizable authentication +Unified single sign-on experience between cloud -Similar user experience across AWS, GCP, and Azure clouds +Similar user experience across clouds -Project level collaboration environment across multiple Clouds +Project level collaboration across сlouds @@ -600,13 +600,12 @@ +alt="Unified single sign-on experience between cloud and on-premise tools" /> -Customizable authentication +Unified single sign-on experience between cloud and on-premise tools -Unified single sign-on experience between cloud and on-premise tools SAML and OAuth2.0 support - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/03: Merge branch 'gh-pages' of github.com:apache/incubator-dlab into gh-pages
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch gh-pages in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 664c14800239f0b579a3df784b200352185fe1ef Merge: 9873efc 206745a Author: Andriana Kovalyshyn AuthorDate: Wed Dec 11 11:38:51 2019 +0200 Merge branch 'gh-pages' of github.com:apache/incubator-dlab into gh-pages dist/main.js | 2 +- index.html | 4 src/js/init.js | 4 +++- 3 files changed, 4 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #484 from apache/DLAB-448
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 4f4112f5600be47e4588726dabf9be017df59193 Merge: 7a66479 fc88a27 Author: Andriana Kovalyshyn AuthorDate: Tue Dec 10 10:21:10 2019 +0200 Merge pull request #484 from apache/DLAB-448 [DLAB-448]: Added possibility of filtering list of installed libraries .../install-libraries/filter-libs.model.ts | 36 .../install-libraries.component.html | 96 -- .../install-libraries.component.scss | 69 +--- .../install-libraries.component.ts | 47 +++ .../shared/form-controls/dropdowns.component.scss | 4 +- .../webapp/src/assets/styles/_dialogs.scss | 8 +- 6 files changed, 239 insertions(+), 21 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (7a66479 -> 4f4112f)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 7a66479 Merge pull request #482 from apache/DLAB-1363
add 3626d5f [DLAB-448] Added possibility of filtering list of installed
libraries
add fc88a27 [DLAB-448] Added possibility of filtering list of installed
libraries
new 4f4112f Merge pull request #484 from apache/DLAB-448
The 1 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:
.../install-libraries/filter-libs.model.ts}| 22 +++--
.../install-libraries.component.html | 96 --
.../install-libraries.component.scss | 69 +---
.../install-libraries.component.ts | 47 +++
.../shared/form-controls/dropdowns.component.scss | 4 +-
.../webapp/src/assets/styles/_dialogs.scss | 8 +-
6 files changed, 213 insertions(+), 33 deletions(-)
copy
services/self-service/src/main/resources/webapp/src/app/resources/{resources-grid/filter-configuration.model.ts
=> exploratory/install-libraries/filter-libs.model.ts} (72%)
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch gh-pages updated: [DLAB-1364]: updated screens on promo
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/gh-pages by this push:
new ed69556 [DLAB-1364]: updated screens on promo
ed69556 is described below
commit ed6955649a38a73dcfe9f2d6cfa47b67c646ab37
Author: Andriana Kovalyshyn
AuthorDate: Mon Dec 9 14:36:15 2019 +0200
[DLAB-1364]: updated screens on promo
---
index.html | 16
src/images/features/clouds_schema.png | Bin 0 -> 219617 bytes
.../{create-resource.png => create-cluster.png}| Bin
src/images/features/create-resource.png| Bin 185889 -> 194112 bytes
src/images/features/projects_page.png | Bin 0 -> 125809 bytes
src/images/features/upload-key.png | Bin 63240 -> 0 bytes
src/images/features/upload_key.png | Bin 129596 -> 0 bytes
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/index.html b/index.html
index d2761df..0546d89 100755
--- a/index.html
+++ b/index.html
@@ -112,8 +112,8 @@
Play ►
-
-
+
+
@@ -139,9 +139,9 @@
Play ►
-
-
+
+
@@ -583,7 +583,7 @@
Role permissions administration
-
Project level collaboration environment across
multiple Clouds
@@ -622,7 +622,7 @@
-
@@ -874,7 +874,7 @@
-
diff --git a/src/images/features/clouds_schema.png
b/src/images/features/clouds_schema.png
new file mode 100644
index 000..9b71dec
Binary files /dev/null and b/src/images/features/clouds_schema.png differ
diff --git a/src/images/features/create-resource.png
b/src/images/features/create-cluster.png
similarity index 100%
copy from src/images/features/create-resource.png
copy to src/images/features/create-cluster.png
diff --git a/src/images/features/create-resource.png
b/src/images/features/create-resource.png
index 2038b08..3a3a8ee 100644
Binary files a/src/images/features/create-resource.png and
b/src/images/features/create-resource.png differ
diff --git a/src/images/features/projects_page.png
b/src/images/features/projects_page.png
new file mode 100644
index 000..437fd2f
Binary files /dev/null and b/src/images/features/projects_page.png differ
diff --git a/src/images/features/upload-key.png
b/src/images/features/upload-key.png
deleted file mode 100644
index 931b471..000
Binary files a/src/images/features/upload-key.png and /dev/null differ
diff --git a/src/images/features/upload_key.png
b/src/images/features/upload_key.png
deleted file mode 100644
index 942c51e..000
Binary files a/src/images/features/upload_key.png and /dev/null differ
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (4bdfcc1 -> ab2432b)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 4bdfcc1 Merge pull request #480 from apache/DLAB-1363 add 8950437 [DLAB-1372]: prevent actions for superset and jupyter lab according statuses add 102ad16 [DLAB-1371]: fixed issue with permission info message appearing new ab2432b Merge pull request #481 from apache/DLAB-1372 The 1 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: .../computational-resource-create-dialog.component.html | 6 +++--- .../computational-resource-create-dialog.component.ts | 2 +- .../src/app/resources/resources-grid/resources-grid.component.html | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #481 from apache/DLAB-1372
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit ab2432bf91c8ba93497a7cf89ecf8898906b9eb5 Merge: 4bdfcc1 102ad16 Author: Andriana Kovalyshyn AuthorDate: Mon Dec 9 12:57:36 2019 +0200 Merge pull request #481 from apache/DLAB-1372 [DLAB-1372]: prevent actions for superset and jupyterlab .../computational-resource-create-dialog.component.html | 6 +++--- .../computational-resource-create-dialog.component.ts | 2 +- .../src/app/resources/resources-grid/resources-grid.component.html | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1371]: fixed issue with permission info message appearing
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1372
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 102ad161d04173a8b0e06698fd8f7ab4996e531f
Author: Andriana Kovalyshyn
AuthorDate: Mon Dec 9 12:56:13 2019 +0200
[DLAB-1371]: fixed issue with permission info message appearing
---
.../computational-resource-create-dialog.component.html | 6 +++---
.../computational-resource-create-dialog.component.ts | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
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 22b13ab..457b4ed 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
@@ -79,7 +79,7 @@
&&
resourceForm?.controls['cluster_alias_name'].dirty
&&
!resourceForm?.controls['cluster_alias_name'].hasError('duplication')">
Cluster name cannot be longer than
{{DICTIONARY.max_cluster_name_length}} characters
-and can only contain letters, numbers, hyphens and '_' but
can not end with special
+ and can only contain letters, numbers, hyphens and '_' but
can not end with special
characters
@@ -231,8 +231,8 @@
- Computational resource
creations are not available.Please, check
-your permissions.
+
+Computational resource creations are not available.Please, check
your permissions.
Computational resource data is processing
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
index fea565f..7f29002 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
@@ -240,7 +240,6 @@ export class ComputationalResourceCreateDialogComponent
implements OnInit {
this.selectedImage = clusterTypes[0];
if (this.selectedImage) {
- this.loading = false;
this._ref.detectChanges();
this.filterShapes();
@@ -248,6 +247,7 @@ export class ComputationalResourceCreateDialogComponent
implements OnInit {
this.getComputationalResourceLimits();
}
+this.loading = false;
}, () => this.loading = false);
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1372]: prevent actions for superset and jupyter lab according statuses
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1372
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 8950437518a466e68c197edf19365c2e958658dd
Author: Andriana Kovalyshyn
AuthorDate: Mon Dec 9 12:31:30 2019 +0200
[DLAB-1372]: prevent actions for superset and jupyter lab according statuses
---
.../src/app/resources/resources-grid/resources-grid.component.html| 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
index e3b5fa5..78e3977 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
@@ -144,7 +144,9 @@
+ [ngClass]="{ 'disabled': element.status.toLowerCase() ===
'creating'
+ || (element.image === 'docker.dlab-superset' && element.status
!== 'running' && element.status !== 'stopped')
+ || (element.image === 'docker.dlab-jupyterlab' && element.status
!== 'running' && element.status !== 'stopped') }">
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1372 created (now 102ad16)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1372 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 102ad16 [DLAB-1371]: fixed issue with permission info message appearing This branch includes the following new commits: new 8950437 [DLAB-1372]: prevent actions for superset and jupyter lab according statuses new 102ad16 [DLAB-1371]: fixed issue with permission info message appearing The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch gh-pages updated: [DLAB-1364]: updated sliders content
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch gh-pages in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git The following commit(s) were added to refs/heads/gh-pages by this push: new b67c83c [DLAB-1364]: updated sliders content b67c83c is described below commit b67c83c65e355cf7005977aa9fcd0503852eef33 Author: Andriana Kovalyshyn AuthorDate: Mon Dec 9 11:28:04 2019 +0200 [DLAB-1364]: updated sliders content --- index.html | 1564 ++ package-lock.json| 18 +- src/style/style.scss |7 +- 3 files changed, 824 insertions(+), 765 deletions(-) diff --git a/index.html b/index.html index 9b3b145..d2761df 100755 --- a/index.html +++ b/index.html @@ -7,13 +7,13 @@ +content="width=device-width, initial-scale=1.0, user-scalable=no, minimal-ui, minimum-scale=1.0, maximum-scale=1.0" /> +content="DLab is a self-service Web Console, used to create and manage exploratory environments. It allows teams to spin up analytical environments with best of breed open-source tools just with a single click of the mouse." /> +content="DLab is a self-service Web Console, used to create and manage exploratory environments. It allows teams to spin up analytical environments with best of breed open-source tools just with a single click of the mouse." /> http://dlab.opensource.epam.com/"; /> http://dlab.opensource.epam.com/./src/images/background/login-background.jpg"; /> @@ -23,883 +23,937 @@ - - - - - - - - + + + + + + + + + + + + + + + + + +Documents + + +https://github.com/apache/incubator-dlab/blob/master/README.md"; +target="_blank">DLab Overview + + +https://github.com/apache/incubator-dlab/blob/master/USER_GUIDE.md"; +target="_blank">User Guide + + + + +Apache + +https://www.apache.org/events/current-event"; target="_blank">Events +https://www.apache.org/foundation/thanks.html"; target="_blank">Thanks +https://www.apache.org/licenses/"; target="_blank">License +https://www.apache.org/security/"; target="_blank">Security +https://www.apache.org/foundation/sponsorship.html"; +target="_blank">Sponsorship +https://www.apache.org/"; target="_blank">Foundation + + + + + + + + +https://twitter.com/CommunityDlab"; +target="_blank"> +https://www.youtube.com/c/DLabCommunity"; +target="_blank"> +https://github.com/apache/incubator-dlab"; +target="_blank"> + + + + + +Get Started + + + + +Essential toolset for analytics + +Self-service, fail-safe exploratory environment for collaborative data science workflow +Get Started - - - - - - - - -Documents - - -https://github.com/apache/incubator-dlab/blob/master/README.md"; - target="_blank">DLab Overview - -
[incubator-dlab] 01/01: Merge pull request #479 from apache/DLAB-1337
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit efcb046eb04e7b638fc1465772f137fd9906a1e7 Merge: e3805ed 5fc1d4e Author: Andriana Kovalyshyn AuthorDate: Thu Dec 5 16:22:24 2019 +0200 Merge pull request #479 from apache/DLAB-1337 [DLAB-1337] Enhancement for 'List of resource pages' and other small … .../management-grid/management-grid.component.ts | 4 ++-- .../src/app/administration/project/project.component.ts| 4 ++-- .../webapp/src/app/administration/roles/roles.component.ts | 6 +++--- .../computational-resources-list.component.scss| 4 +++- .../computational-resources-list.component.ts | 14 +++--- .../install-libraries/install-libraries.component.html | 2 +- .../install-libraries/install-libraries.component.scss | 5 - .../resources/resources-grid/resources-grid.component.ts | 1 - .../confirmation-dialog/confirmation-dialog.component.html | 4 ++-- .../notification-dialog/notification-dialog.component.ts | 8 ++-- .../self-service/src/main/resources/webapp/src/styles.scss | 1 + 11 files changed, 31 insertions(+), 22 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (e3805ed -> efcb046)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from e3805ed Merge pull request #478 from apache/DLAB-1366 add 5fc1d4e [DLAB-1337] Enhancement for 'List of resource pages' and other small fixes new efcb046 Merge pull request #479 from apache/DLAB-1337 The 1 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: .../management-grid/management-grid.component.ts | 4 ++-- .../src/app/administration/project/project.component.ts| 4 ++-- .../webapp/src/app/administration/roles/roles.component.ts | 6 +++--- .../computational-resources-list.component.scss| 4 +++- .../computational-resources-list.component.ts | 14 +++--- .../install-libraries/install-libraries.component.html | 2 +- .../install-libraries/install-libraries.component.scss | 5 - .../resources/resources-grid/resources-grid.component.ts | 1 - .../confirmation-dialog/confirmation-dialog.component.html | 4 ++-- .../notification-dialog/notification-dialog.component.ts | 8 ++-- .../self-service/src/main/resources/webapp/src/styles.scss | 1 + 11 files changed, 31 insertions(+), 22 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (425dca7 -> e3805ed)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 425dca7 Merge pull request #475 from apache/DLAB-1339 add fe8acf2 [DLAB-1366]: bucket labels changed add d35cf2b [DLAB-1366]: cleanup tags on billing page add 89623b1 [DLAB-1366]: cleanup tags on billing page new e3805ed Merge pull request #478 from apache/DLAB-1366 The 1 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: .../management-grid/management-grid.component.scss | 2 +- .../reporting-grid/reporting-grid.component.html | 27 -- .../reporting-grid/reporting-grid.component.scss | 4 ++-- .../reporting-grid/reporting-grid.component.ts | 4 ++-- .../webapp/src/dictionary/aws.dictionary.ts| 4 ++-- .../webapp/src/dictionary/azure.dictionary.ts | 4 ++-- .../webapp/src/dictionary/gcp.dictionary.ts| 4 ++-- 7 files changed, 11 insertions(+), 38 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #478 from apache/DLAB-1366
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit e3805ed0b536c2d1ef25b9773bccdd81c0fc2366 Merge: 425dca7 89623b1 Author: Andriana Kovalyshyn AuthorDate: Thu Dec 5 14:36:21 2019 +0200 Merge pull request #478 from apache/DLAB-1366 [DLAB-1366]: bucket labels changed; cleanup tags on billing page .../management-grid/management-grid.component.scss | 2 +- .../reporting-grid/reporting-grid.component.html | 27 -- .../reporting-grid/reporting-grid.component.scss | 4 ++-- .../reporting-grid/reporting-grid.component.ts | 4 ++-- .../webapp/src/dictionary/aws.dictionary.ts| 4 ++-- .../webapp/src/dictionary/azure.dictionary.ts | 4 ++-- .../webapp/src/dictionary/gcp.dictionary.ts| 4 ++-- 7 files changed, 11 insertions(+), 38 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1366 updated: [DLAB-1366]: cleanup tags on billing page
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1366
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1366 by this push:
new 89623b1 [DLAB-1366]: cleanup tags on billing page
89623b1 is described below
commit 89623b1bc3e93c9ca38094232753d691b2670dea
Author: Andriana Kovalyshyn
AuthorDate: Thu Dec 5 14:35:29 2019 +0200
[DLAB-1366]: cleanup tags on billing page
---
.../src/app/reporting/reporting-grid/reporting-grid.component.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
index 4aa2f53..d303723 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
@@ -42,8 +42,8 @@ export class ReportingGridComponent implements OnInit {
@Output() filterReport: EventEmitter<{}> = new EventEmitter();
@Output() resetRangePicker: EventEmitter = new EventEmitter();
- displayedColumns: string[] = ['name', 'user', 'project', 'type', 'status',
'shape', 'service', 'charge']; //'tags'
- displayedFilterColumns: string[] = ['name-filter', 'user-filter',
'project-filter', 'type-filter', 'status-filter', 'shape-filter',
'service-filter', 'actions']; //'tags-filter'
+ displayedColumns: string[] = ['name', 'user', 'project', 'type', 'status',
'shape', 'service', 'charge'];
+ displayedFilterColumns: string[] = ['name-filter', 'user-filter',
'project-filter', 'type-filter', 'status-filter', 'shape-filter',
'service-filter', 'actions'];
ngOnInit() { }
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1366]: bucket labels changed
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1366
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit fe8acf29bd6eaba8800f9cb85fe2d55a467b137e
Author: Andriana Kovalyshyn
AuthorDate: Thu Dec 5 14:18:40 2019 +0200
[DLAB-1366]: bucket labels changed
---
.../src/main/resources/webapp/src/dictionary/aws.dictionary.ts| 4 ++--
.../src/main/resources/webapp/src/dictionary/azure.dictionary.ts | 4 ++--
.../src/main/resources/webapp/src/dictionary/gcp.dictionary.ts| 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
b/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
index 64c1b6c..a37445f 100644
---
a/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
+++
b/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
@@ -21,8 +21,8 @@ export const NAMING_CONVENTION = {
'cloud_provider': 'aws',
'use_ldap': true,
'notebook_instance_size': 'Instance shape',
-'personal_storage': 'Shared bucket',
-'collaboration_storage': 'Shared project bucket',
+'personal_storage': 'Project bucket',
+'collaboration_storage': 'Shared endpoint bucket',
'account': '',
'container': '',
'data_engine': 'Deploy Spark Server / Deploy EMR',
diff --git
a/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts
b/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts
index fd178c5..819c181 100644
---
a/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts
+++
b/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts
@@ -21,8 +21,8 @@ export const NAMING_CONVENTION = {
'cloud_provider': 'azure',
'use_ldap': true,
'notebook_instance_size': 'Virtual machine size',
-'personal_storage': 'Shared bucket',
-'collaboration_storage': 'Shared project bucket',
+'personal_storage': 'Project bucket',
+'collaboration_storage': 'Shared endpoint bucket',
'account': 'Account:',
'container': 'Container:',
'data_engine': 'Deploy Spark Server / Deploy HDInsight',
diff --git
a/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts
b/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts
index 554e5ee..10d7cf2 100644
---
a/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts
+++
b/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts
@@ -21,8 +21,8 @@ export const NAMING_CONVENTION = {
'cloud_provider': 'gcp',
'use_ldap': true,
'notebook_instance_size': 'Instance type',
-'personal_storage': 'Shared bucket',
-'collaboration_storage': 'Shared project bucket',
+'personal_storage': 'Project bucket',
+'collaboration_storage': 'Shared endpoint bucket',
'account': '',
'container': '',
'data_engine': 'Deploy Spark Server / Deploy Dataproc',
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1366]: cleanup tags on billing page
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1366
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d35cf2b5897f0b36dd74d901f6d1e78daf2b97dd
Author: Andriana Kovalyshyn
AuthorDate: Thu Dec 5 14:33:22 2019 +0200
[DLAB-1366]: cleanup tags on billing page
---
.../management-grid/management-grid.component.scss | 2 +-
.../reporting-grid/reporting-grid.component.html | 27 --
.../reporting-grid/reporting-grid.component.scss | 4 ++--
.../reporting-grid/reporting-grid.component.ts | 4 ++--
4 files changed, 5 insertions(+), 32 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
index 30515a5..8f6f183 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
@@ -31,7 +31,7 @@
}
.shape {
- width: 16% !important;
+ width: 18% !important;
}
.status {
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
index 141ca6b..f9bf7cf 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
@@ -129,30 +129,6 @@
-
-
- Tags
-
-
-
-
-{{ element.tags.endpoint_tag }}
-
-
-{{ element.tags.custom_tag }}
-
-
-{{ element.tags.user_tag }}
-
-
-{{ element.tags.project_tag }}
-
-
-
-
-
-
Service Charges
@@ -214,9 +190,6 @@
[model]="filteredReportData[DICTIONARY.billing.service_filter_key]">
-
-
-
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
index 4f870cd..b4a0c36 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
@@ -39,7 +39,7 @@
td {
font-size: 13px;
- padding-left: 5px;
+ padding-left: 15px;
&.info {
z-index: 1 !important;
@@ -147,7 +147,7 @@
display: inline-block;
padding-top: 15px;
vertical-align: super !important;
- padding-left: 5px;
+ padding-left: 15px;
}
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
index 3a904fd..4aa2f53 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
@@ -42,8 +42,8 @@ export class ReportingGridComponent implements OnInit {
@Output() filterReport: EventEmitter<{}> = new EventEmitter();
@Output() resetRangePicker: EventEmitter = new EventEmitter();
- displayedColumns: string[] = ['name', 'user', 'project', 'type', 'status',
'shape', 'service', 'tags', 'charge'];
- displayedFilterColumns: string[] = ['name-filter', 'user-filter',
'project-filter', 'type-filter', 'status-filter', 'shape-filter',
'service-filter', 'tags-filter', 'actions'];
+ displayedColumns: string[] = ['name', 'user', 'project', 'type', 'status',
'shape', 'service', 'charge']; //'tags'
+ displayedFilterColumns: string[] = ['name-filter', 'user-filter',
'project-filter', 'type-filter', 'status-filter', 'shape-filter',
'service-filter', 'actions']; //'tags-filter'
ngOnInit() { }
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1366 created (now d35cf2b)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1366 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at d35cf2b [DLAB-1366]: cleanup tags on billing page This branch includes the following new commits: new fe8acf2 [DLAB-1366]: bucket labels changed new d35cf2b [DLAB-1366]: cleanup tags on billing page The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (c7411d4 -> 81c86ed)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from c7411d4 Merge pull request #473 from apache/DLAB-1305 add 1fe7bba [DLAB-1358]: adjusted confirmation messages for edge node on projects list new 81c86ed Merge pull request #474 from apache/DLAB-1358 The 1 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/app/administration/project/project.component.ts| 3 +-- .../notification-dialog/notification-dialog.component.ts | 14 -- .../resources/webapp/src/assets/styles/_variables.scss | 2 ++ .../self-service/src/main/resources/webapp/src/styles.scss | 8 +--- 4 files changed, 16 insertions(+), 11 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #474 from apache/DLAB-1358
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 81c86eda268bf6952375babc18aa0610ea53f655 Merge: c7411d4 1fe7bba Author: Andriana Kovalyshyn AuthorDate: Wed Dec 4 15:51:01 2019 +0200 Merge pull request #474 from apache/DLAB-1358 [DLAB-1358]: adjusted confirmation messages for edge node on projects list .../src/app/administration/project/project.component.ts| 3 +-- .../notification-dialog/notification-dialog.component.ts | 14 -- .../resources/webapp/src/assets/styles/_variables.scss | 2 ++ .../self-service/src/main/resources/webapp/src/styles.scss | 8 +--- 4 files changed, 16 insertions(+), 11 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1358 created (now 1fe7bba)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1358 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 1fe7bba [DLAB-1358]: adjusted confirmation messages for edge node on projects list This branch includes the following new commits: new 1fe7bba [DLAB-1358]: adjusted confirmation messages for edge node on projects list The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1358]: adjusted confirmation messages for edge node on projects list
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1358
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 1fe7bbae3561417d1a477e324e666c9ad6cf902a
Author: Andriana Kovalyshyn
AuthorDate: Wed Dec 4 15:49:51 2019 +0200
[DLAB-1358]: adjusted confirmation messages for edge node on projects list
---
.../src/app/administration/project/project.component.ts| 3 +--
.../notification-dialog/notification-dialog.component.ts | 14 --
.../resources/webapp/src/assets/styles/_variables.scss | 2 ++
.../self-service/src/main/resources/webapp/src/styles.scss | 8 +---
4 files changed, 16 insertions(+), 11 deletions(-)
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 a14969d..1669152 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
@@ -115,12 +115,11 @@ export class ProjectComponent implements OnInit,
OnDestroy {
public toggleStatus($event) {
const data = { 'project_name': $event.project.name, endpoint:
$event.endpoint.name };
-
if ($event.action === 'stop' || $event.action === 'terminate') {
this.dialog.open(NotificationDialogComponent, {
data: {
type: 'confirmation',
- template: `Endpoint ${$event.endpoint.name} will be
${$event.action === 'stop' ? 'stopped' : 'terminated'}`,
+ template: `Edge node in endpoint ${$event.endpoint.name} will
be ${$event.action === 'stop' ? 'stopped' : 'terminated'} for
${$event.project.name}`,
item: $event.endpoint, action: $event.action === 'stop' ? 'stopped'
: 'terminated'
}, panelClass: 'modal-sm'
})
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
index c14dfed..40e7b65 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
@@ -58,13 +58,13 @@ import { MatDialogRef, MAT_DIALOG_DATA } from
'@angular/material/dialog';
{{ data.item.name }} will be {{ data.action ||
'decommissioned' }}.
-
-
-Endpoint
+
+
+Edge node in endpoint
Further status
-
+
{{endpoint.name}}
Terminated
@@ -90,9 +90,11 @@ import { MatDialogRef, MAT_DIALOG_DATA } from
'@angular/material/dialog';
header a:hover i { color: #35afd5; cursor: pointer; }
.plur { font-style: normal; }
.label-name { display: inline-block; width: 100% }
-.scrolling-content{overflow-y: auto; max-height: 200px;}
-.endpoint { width: 70%;text-align: left;}
+.scrolling-content{overflow-y: auto; max-height: 200px; }
+.endpoint { width: 70%; text-align: left; color: #577289;}
.status { width: 30%;text-align: right;}
+.label { font-size: 15px; font-weight: 500; font-family: "Open
Sans",sans-serif;}
+.node { font-weight: 300;}
`]
})
export class NotificationDialogComponent {
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
index ebfdfb1..63d8202 100644
---
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
@@ -23,3 +23,5 @@ $modal-header-color: #f6fafe;
$brand-color: #4ab8dc;
$blue-grey-color: #718ba6;
$dark-grey-color: #455c74;
+
+$default-font-size: 14px;
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 a4a32c0..1305465 100644
--- a/services/self-service/src/main/resources/webapp/src/styles.scss
+++ b/services/self-service/src/main/resources/webapp/src/styles.scss
@@ -27,6 +27,10 @@
@import '_theme.scss';
@import '_dialogs.scss';
+.sans {
+ font-family: 'Open Sans',
[incubator-dlab] branch develop updated (fcd4915 -> c7411d4)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from fcd4915 [DLAB-1271] Added PROJECT column to billing export add c8300ef [DLAB-1305]: prevent actions for superset template add a42d403 [DLAB-1305]: prevent spark configuration for superset add 167e9ec [DLAB-1305]: prevent actions and spark configuration for JupyterLab template new c7411d4 Merge pull request #473 from apache/DLAB-1305 The 1 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: .../cluster-details/cluster-details.component.html | 7 +++-- .../create-environment.component.html | 32 -- .../detail-dialog/detail-dialog.component.html | 23 .../detail-dialog/detail-dialog.component.scss | 17 +--- .../resources-grid/resources-grid.component.html | 11 .../webapp/src/assets/styles/_dialogs.scss | 2 +- .../webapp/src/assets/styles/_variables.scss | 2 +- 7 files changed, 48 insertions(+), 46 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #473 from apache/DLAB-1305
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit c7411d4f73bd946a296119467c8fc67c7f70bb94 Merge: fcd4915 167e9ec Author: Andriana Kovalyshyn AuthorDate: Wed Dec 4 14:20:53 2019 +0200 Merge pull request #473 from apache/DLAB-1305 [DLAB-1305]: prevent actions and spark configuration for JupyterLab and superset .../cluster-details/cluster-details.component.html | 7 +++-- .../create-environment.component.html | 32 -- .../detail-dialog/detail-dialog.component.html | 23 .../detail-dialog/detail-dialog.component.scss | 17 +--- .../resources-grid/resources-grid.component.html | 11 .../webapp/src/assets/styles/_dialogs.scss | 2 +- .../webapp/src/assets/styles/_variables.scss | 2 +- 7 files changed, 48 insertions(+), 46 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1305 updated: [DLAB-1305]: prevent actions and spark configuration for JupyterLab template
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1305
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1305 by this push:
new 167e9ec [DLAB-1305]: prevent actions and spark configuration for
JupyterLab template
167e9ec is described below
commit 167e9ec0786610bcab105806834d85cac181b8f1
Author: Andriana Kovalyshyn
AuthorDate: Wed Dec 4 14:18:02 2019 +0200
[DLAB-1305]: prevent actions and spark configuration for JupyterLab template
---
.../computational/cluster-details/cluster-details.component.html | 7 +--
.../create-environment/create-environment.component.html | 2 +-
.../exploratory/detail-dialog/detail-dialog.component.html | 2 +-
.../exploratory/detail-dialog/detail-dialog.component.scss | 6 --
.../src/app/resources/resources-grid/resources-grid.component.html | 7 ---
.../src/main/resources/webapp/src/assets/styles/_dialogs.scss | 2 +-
.../src/main/resources/webapp/src/assets/styles/_variables.scss| 2 +-
7 files changed, 17 insertions(+), 11 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 f80b44f..7436d0b 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
@@ -106,8 +106,11 @@
-
+
Cluster configurations
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
index ebe7b24..0606e54 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
@@ -152,7 +152,7 @@
+*ngIf="currentTemplate?.image !== 'docker.dlab-zeppelin' &&
currentTemplate?.image !== 'docker.dlab-superset' && currentTemplate?.image !==
'docker.dlab-jupyterlab'">
Spark configurations
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 537aba1..2aaa4b5 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
@@ -95,7 +95,7 @@
+[hidden]="notebook.status !== 'running' || notebook.image ===
'docker.dlab-superset' || notebook.image === 'docker.dlab-jupyterlab'">
Cluster configurations
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
index 4919ce4..2849ce0 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
@@ -17,6 +17,8 @@
* under the License.
*/
+@import '_variables.scss';
+
.scroll-box {
max-height: 65vh;
overflow-y: auto;
@@ -32,7 +34,7 @@
white-space: nowrap;
padding-left: 7px;
font-weight: 600;
- color: #577289;
+ color: $blue-grey-color;
}
}
}
@@ -83,5 +85,5 @@
.bucket-info {
padding-left: 7px;
font-weight: 600;
- color: #455c74;
+ color: $blue-grey-color;
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
index 27df81b..e3b5fa5 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resou
[incubator-dlab] branch DLAB-1305 created (now a42d403)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1305 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at a42d403 [DLAB-1305]: prevent spark configuration for superset This branch includes the following new commits: new c8300ef [DLAB-1305]: prevent actions for superset template new a42d403 [DLAB-1305]: prevent spark configuration for superset The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1305]: prevent spark configuration for superset
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1305
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a42d403609efe4fa5a39f12516986fa47b1cffdd
Author: Andriana Kovalyshyn
AuthorDate: Wed Dec 4 12:55:48 2019 +0200
[DLAB-1305]: prevent spark configuration for superset
---
.../create-environment.component.html | 32 --
.../detail-dialog/detail-dialog.component.scss | 13 +++--
2 files changed, 22 insertions(+), 23 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
index 4d09b9f..ebe7b24 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
@@ -30,8 +30,8 @@
Select project
-
-
+
+
{{ project.name }}
Projects list is empty
@@ -48,7 +48,8 @@
Select endpoint
-
+
{{ endpoint }}
@@ -67,7 +68,8 @@
Select template
-
+
{{
template.exploratory_environment_versions[0].template_name }}
@@ -123,7 +125,8 @@
Select {{ DICTIONARY.notebook_instance_size
}}
-
+
{{ list_item.Size
}} {{ list_item.Type }}
@@ -148,7 +151,8 @@
-
+
Spark configurations
@@ -160,14 +164,14 @@
parameters is not in a valid format
-
-Spark default configuration for Apache Zeppelin can not be
changed from DLab UI. Currently it can be
- done directly through Apache Zeppelin interpreter menu.
- For more details please refer for Apache Zeppelin https://zeppelin.apache.org/docs/0.8.0/usage/interpreter/overview.html";
target="_blank">official
-documentation.
-
-
+
+
+Spark default configuration for Apache Zeppelin can not be changed
from DLab UI. Currently it can be
+done directly through Apache Zeppelin interpreter menu.
+For more details please refer for Apache Zeppelin https://zeppelin.apache.org/docs/0.8.0/usage/interpreter/overview.html";
target="_blank">official
+ documentation.
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
index c8ee3c0..4919ce4 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
@@ -25,14 +25,14 @@
.links_block {
- > p {
+ >p {
display: flex;
.description {
white-space: nowrap;
padding-left: 7px;
font-weight: 600;
- color: #455c74;
+ color: #577289;
}
}
}
@@ -46,6 +46,7 @@
margin: 10px 0;
}
}
+
span {
&.danger_color {
@@ -79,14 +80,8 @@
}
}
-.bucket-info{
+.bucket-info {
padding-left: 7px;
font-weight: 600;
color: #455c74;
}
-
-
-
-
-
-
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1305]: prevent actions for superset template
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1305
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit c8300ef2d986058c4f4ff8f277ce0071227b2772
Author: Andriana Kovalyshyn
AuthorDate: Wed Dec 4 12:07:59 2019 +0200
[DLAB-1305]: prevent actions for superset template
---
.../cluster-details/cluster-details.component.html | 2 +-
.../detail-dialog/detail-dialog.component.html | 23 +++---
.../resources-grid/resources-grid.component.html | 10 --
3 files changed, 16 insertions(+), 19 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 453061c..f80b44f 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
@@ -107,7 +107,7 @@
+ *ngIf="resource.image === 'docker.dlab-dataengine' &&
resource.status === 'running' && environment.image !== 'docker.dlab-zeppelin'
&& environment.image === 'docker.dlab-superset'">
Cluster configurations
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 96c4f91..537aba1 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
@@ -48,25 +48,23 @@
{{item.description}}:
-
+
{{item.url}}
-Node User: {{ notebook.username }}
-Password: {{ notebook.password }}
+Node User: {{ notebook.username }}
+Password: {{ notebook.password }}
{{ DICTIONARY.personal_storage }}:
{{ DICTIONARY.account }}
{{ notebook.account_name}}
- {{ DICTIONARY.container }} {{ notebook.bucket_name }}
+ {{ DICTIONARY.container }} {{ notebook.bucket_name }}
{{ DICTIONARY.collaboration_storage }}:
@@ -82,7 +80,8 @@
Data Lake Store Account: {{
notebook.datalake_name }}
Personal folder: {{
notebook.datalake_directory }}
-Collaboration folder: {{
notebook.datalake_shared_directory }}
+Collaboration folder: {{
notebook.datalake_shared_directory }}
+
@@ -96,7 +95,7 @@
+[hidden]="notebook.status !== 'running' || notebook.image ===
'docker.dlab-superset'">
Cluster configurations
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
index f7c7cd8..27df81b 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
@@ -181,10 +181,8 @@
Terminate
-
+
memory
Add compute
@@ -195,11 +193,11 @@
+ *ngIf="element.status === 'running' &&
DICTIONARY.cloud_provider !== 'gcp' && element.image !==
'docker.dlab-superset'">
view_module
Create {{ DICTIONARY.image }}
-
+
developer_board
Manage libraries
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #472 from apache/DLAB-1215
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit d6544cbb93a1829cc0879f1d8c14c8515f405666 Merge: 49e111f 55b9922 Author: Andriana Kovalyshyn AuthorDate: Tue Dec 3 15:17:54 2019 +0200 Merge pull request #472 from apache/DLAB-1215 [DLAB-1215]: added tags to billing report data grid .../reporting-grid/reporting-grid.component.html | 31 ++- .../reporting-grid/reporting-grid.component.scss | 45 +- .../reporting-grid/reporting-grid.component.ts | 4 +- 3 files changed, 74 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (49e111f -> d6544cb)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 49e111f [DLAB-1334] Error handling improvement for project actions add 7f27f1a [DLAB-1215]: added tags to billing report data grid add 55b9922 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1215 new d6544cb Merge pull request #472 from apache/DLAB-1215 The 1 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: .../reporting-grid/reporting-grid.component.html | 31 ++- .../reporting-grid/reporting-grid.component.scss | 45 +- .../reporting-grid/reporting-grid.component.ts | 4 +- 3 files changed, 74 insertions(+), 6 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1215 updated (7f27f1a -> 55b9922)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1215 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 7f27f1a [DLAB-1215]: added tags to billing report data grid add d198d51 Updated link in README add f0c39f3 [DLAB-1331] Remove credentials from RStudio/Rstudio with TensorFlow add 49e111f [DLAB-1334] Error handling improvement for project actions new 55b9922 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1215 The 1 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: README.md | 2 +- .../epam/dlab/backendapi/dao/ExploratoryDAO.java | 5 ++-- .../service/impl/ProjectServiceImpl.java | 28 -- 3 files changed, 18 insertions(+), 17 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1215
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-1215 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 55b99224a70054bf431bc9af209afb7d5a2d3c68 Merge: 7f27f1a 49e111f Author: Andriana Kovalyshyn AuthorDate: Tue Dec 3 15:14:34 2019 +0200 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1215 README.md | 2 +- .../epam/dlab/backendapi/dao/ExploratoryDAO.java | 5 ++-- .../service/impl/ProjectServiceImpl.java | 28 -- 3 files changed, 18 insertions(+), 17 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1215]: added tags to billing report data grid
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1215
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 7f27f1a1ad6d46589c474343cd268a04196268bc
Author: Andriana Kovalyshyn
AuthorDate: Tue Dec 3 15:14:18 2019 +0200
[DLAB-1215]: added tags to billing report data grid
---
.../reporting-grid/reporting-grid.component.html | 31 ++-
.../reporting-grid/reporting-grid.component.scss | 45 +-
.../reporting-grid/reporting-grid.component.ts | 4 +-
3 files changed, 74 insertions(+), 6 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
index c6f6020..141ca6b 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
@@ -20,7 +20,7 @@
-
+
Environment name
@@ -129,6 +129,30 @@
+
+
+ Tags
+
+
+
+
+{{ element.tags.endpoint_tag }}
+
+
+{{ element.tags.custom_tag }}
+
+
+{{ element.tags.user_tag }}
+
+
+{{ element.tags.project_tag }}
+
+
+
+
+
+
Service Charges
@@ -144,7 +168,7 @@
-
+
@@ -190,6 +214,9 @@
[model]="filteredReportData[DICTIONARY.billing.service_filter_key]">
+
+
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
index e4caf44..4f870cd 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
@@ -69,32 +69,73 @@
.th_shape {
width: 10%;
+min-width: 150px;
}
.th_user,
.env_name,
- .service {
+ .service,
+ .tags {
width: 15%;
+min-width: 150px;
overflow: hidden;
word-wrap: break-word;
}
+ .tags {
+.label {
+ padding-top: 0;
+}
+ }
+
+ .service {
+min-width: 175px;
+ }
+
.env_name {
width: 16%;
+min-width: 200px;
}
.th_type {
width: 12%;
+min-width: 200px;
}
.th_status {
width: 8%;
+min-width: 150px;
}
.th_charges {
width: 8%;
+min-width: 110px;
padding-right: 15px;
text-align: right;
+
+.label {
+ padding-top: 0;
+}
+ }
+
+ .th_project {
+min-width: 150px;
+ }
+
+ .tags-col {
+padding: 5px;
+
+mat-chip {
+ min-height: 20px;
+ padding: 5px 10px;
+ font-size: 13px;
+ max-width: 110px !important;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ display: inline-block;
+ line-height: 10px;
+ margin: 2px;
+}
}
.mat-column-charge {
@@ -104,7 +145,7 @@
.header-row {
.label {
display: inline-block;
- padding-top: 10px;
+ padding-top: 15px;
vertical-align: super !important;
padding-left: 5px;
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
index d303723..3a904fd 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
@@ -42,8 +42,8 @@ export class ReportingGridComponent implements OnInit {
@Output() filterReport: EventEmitter<{}> = new EventEmitter();
@Output() resetRangePicker: EventEmitter = new EventEmitter();
- displayedColumns: string[] = ['name', 'user', 'project', 'type', 'status',
'shape', 'service', 'charge'];
- displayedFilterColumns: string[] = ['name-filter', 'user-filter',
'project-filter', 'type-filter', 'status-filter', 'shape-filter',
'service-filter', 'actions'];
+ displayedColumns: string[] = ['name', 'user', 'project', 'type', 'status',
'
[incubator-dlab] branch DLAB-1215 created (now 7f27f1a)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1215 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 7f27f1a [DLAB-1215]: added tags to billing report data grid This branch includes the following new commits: new 7f27f1a [DLAB-1215]: added tags to billing report data grid The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch v2.2-RC1 updated: updated License
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch v2.2-RC1 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git The following commit(s) were added to refs/heads/v2.2-RC1 by this push: new d3f47cf updated License d3f47cf is described below commit d3f47cf359151978189c3200dc6c58bc640fce4f Author: Andriana Kovalyshyn AuthorDate: Mon Dec 2 16:41:26 2019 +0200 updated License --- LICENSE | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/LICENSE b/LICENSE index 83162ee..94f6985 100644 --- a/LICENSE +++ b/LICENSE @@ -225,13 +225,8 @@ Apache 2.0 licenses The following components are provided under the Apache 2.0 License. See project link for details. -(Apache 2.0 License) MongoDB Java Driver - org.mongodb:mongo-java-driver (http://mongodb.github.io/mongo-java-driver/3.2/driver) -(Apache 2.0 License) Dropwizard (https://github.com/dropwizard/dropwizard) -(Apache 2.0 License) Dropwizard Template Config (https://github.com/tkrille/dropwizard-template-config) -(Apache 2.0 License) directory server (https://github.com/apache/directory-server) -(Apache 2.0 License) jackson (https://github.com/FasterXML/jackson) -(Apache 2.0 License) aws java sdk (https://github.com/aws/aws-sdk-java) -(Apache 2.0 License) boto3 (https://github.com/boto/boto3) +(Apache 2.0 License) Material design icons (https://github.com/google/material-design-icons) +(Apache 2.0 License) Google Fonts Files, Open Sans (https://github.com/google/fonts/tree/master/apache/opensans) PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2 licenses - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (9bdd6f1 -> 5d91479)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 9bdd6f1 Merge pull request #469 from apache/DLAB-1339 add ff77076 [DLAB-1341]: changed edge node statuses on project add 97c896c [DLAB-1341]: changed endpoint actions confirmation add f37710f Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1341 new 5d91479 Merge pull request #470 from apache/DLAB-1341 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../project/project-list/project-list.component.html | 9 +++-- .../project/project-list/project-list.component.ts | 4 +--- .../src/app/administration/project/project.component.ts | 1 + .../computational-resources-list.component.scss | 1 + .../notification-dialog/notification-dialog.component.ts | 12 .../main/resources/webapp/src/assets/styles/_dialogs.scss| 9 +++-- .../main/resources/webapp/src/assets/styles/_variables.scss | 4 +++- 7 files changed, 20 insertions(+), 20 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #470 from apache/DLAB-1341
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 5d91479606f7e0fca7ff0d1083f3a749a3c5ece8 Merge: 9bdd6f1 f37710f Author: Andriana Kovalyshyn AuthorDate: Mon Dec 2 16:30:04 2019 +0200 Merge pull request #470 from apache/DLAB-1341 [DLAB-1341]: changed edge node statuses on project .../project/project-list/project-list.component.html | 9 +++-- .../project/project-list/project-list.component.ts | 4 +--- .../src/app/administration/project/project.component.ts | 1 + .../computational-resources-list.component.scss | 1 + .../notification-dialog/notification-dialog.component.ts | 12 .../main/resources/webapp/src/assets/styles/_dialogs.scss| 9 +++-- .../main/resources/webapp/src/assets/styles/_variables.scss | 4 +++- 7 files changed, 20 insertions(+), 20 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1341 updated (97c896c -> f37710f)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1341 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 97c896c [DLAB-1341]: changed endpoint actions confirmation add f1ea462 [DLAB-1339] - Superset starting fails (previous it was stopped) fixed add 9bdd6f1 Merge pull request #469 from apache/DLAB-1339 new f37710f Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1341 The 1 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/superset/scripts/configure_superset_node.py | 15 +++ 1 file changed, 15 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1341
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-1341 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit f37710f726552355f996a099859257b66a241e2a Merge: 97c896c 9bdd6f1 Author: Andriana Kovalyshyn AuthorDate: Mon Dec 2 16:25:32 2019 +0200 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1341 .../src/superset/scripts/configure_superset_node.py | 15 +++ 1 file changed, 15 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1341]: changed endpoint actions confirmation
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1341
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 97c896c52b6cb3a945bb2dd2390069bc63e1c8bd
Author: Andriana Kovalyshyn
AuthorDate: Mon Dec 2 16:25:13 2019 +0200
[DLAB-1341]: changed endpoint actions confirmation
---
.../project/project-list/project-list.component.ts | 4 +---
.../src/app/administration/project/project.component.ts | 1 +
.../computational-resources-list.component.scss | 1 +
.../notification-dialog/notification-dialog.component.ts | 12
.../main/resources/webapp/src/assets/styles/_dialogs.scss| 9 +++--
.../main/resources/webapp/src/assets/styles/_variables.scss | 4 +++-
6 files changed, 17 insertions(+), 14 deletions(-)
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 f7235e6..ddc5acb 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
@@ -23,7 +23,6 @@ import { MatTableDataSource } from '@angular/material/table';
import { Subscription } from 'rxjs';
import { ProjectDataService } from '../project-data.service';
-import { ProjectService } from '../../../core/services';
import { Project, Endpoint } from '../project.component';
import { CheckUtils } from '../../../core/util';
@@ -46,8 +45,7 @@ export class ProjectListComponent implements OnInit,
OnDestroy {
constructor(
public toastr: ToastrService,
-private projectDataService: ProjectDataService,
-private projectService: ProjectService
+private projectDataService: ProjectDataService
) { }
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 762a004..a14969d 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
@@ -120,6 +120,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
this.dialog.open(NotificationDialogComponent, {
data: {
type: 'confirmation',
+ template: `Endpoint ${$event.endpoint.name} will be
${$event.action === 'stop' ? 'stopped' : 'terminated'}`,
item: $event.endpoint, action: $event.action === 'stop' ? 'stopped'
: 'terminated'
}, panelClass: 'modal-sm'
})
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
index 1fa5923..f80009f 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
@@ -67,6 +67,7 @@
.schedule {
cursor: pointer;
+ margin-top: 5px;
&.not-allowed {
pointer-events: none;
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
index 8e673c1..c14dfed 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
@@ -49,10 +49,15 @@ import { MatDialogRef, MAT_DIALOG_DATA } from
'@angular/material/dialog';
-
-
- {{ data.item.name }} will be {{ data.action ||
'decommissioned' }}.
+
+
+
+
+
+{{ data.item.name }} will be {{ data.action ||
'decommissioned' }}.
+
+
Endpoint
@@
[incubator-dlab] branch DLAB-1341 created (now 97c896c)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1341 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 97c896c [DLAB-1341]: changed endpoint actions confirmation This branch includes the following new commits: new ff77076 [DLAB-1341]: changed edge node statuses on project new 97c896c [DLAB-1341]: changed endpoint actions confirmation The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1341]: changed edge node statuses on project
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1341
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit ff7707634638000141a56d38dd26b3b21091bc3a
Author: Andriana Kovalyshyn
AuthorDate: Mon Dec 2 14:07:29 2019 +0200
[DLAB-1341]: changed edge node statuses on project
---
.../project/project-list/project-list.component.html | 9 +++--
1 file changed, 3 insertions(+), 6 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 70f2025..de8741a 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
@@ -35,12 +35,9 @@
Endpoint
- Endpoint status
+ Edge node status
-
no
details
@@ -51,8 +48,8 @@
{{ endpoint.name }}
- {{
toEndpointStatus(endpoint.status).toLowerCase() }}
+ {{
endpoint.status.toLowerCase() }}
[incubator-dlab] branch develop updated (bb436eb -> 7b746c9)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from bb436eb Merge pull request #463 from DG1202/Dlab-1319,1257 add 69bac8d [DLAB-1294]: list statuses check on active filtering extended add 0e888a9 [DLAB-1312]: info messages changed add 2770760 [DLAB-1112]: added shared image usage parameter on project creation add 6bb3dac [DLAB-1112][ON HOLD]: shared image usage parameter on project creation add d2f5905 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1112 add 7b746c9 Merge pull request #465 from apache/DLAB-1112 No new revisions were added by this update. Summary of changes: .../manage-environment-dilog.component.html| 4 ++-- .../project/project-form/project-form.component.html | 14 -- .../project/project-form/project-form.component.ts | 8 ++-- .../src/app/administration/project/project.component.ts| 1 + .../main/resources/webapp/src/app/core/util/sortUtils.ts | 2 +- 5 files changed, 22 insertions(+), 7 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1112
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-1112 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit d2f59054e3825fcc2583e68fe5694d286c28e5b5 Merge: 6bb3dac bb436eb Author: Andriana Kovalyshyn AuthorDate: Fri Nov 29 15:26:49 2019 +0200 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1112 .../src/general/scripts/aws/edge_configure.py | 2 +- .../src/general/scripts/aws/project_prepare.py | 7 +++ .../src/general/scripts/aws/project_terminate.py| 21 + .../reporting-grid/reporting-grid.component.scss| 1 + .../cluster-details/cluster-details.component.html | 4 ++-- .../computational-resources-list.component.html | 3 +-- .../computational-resources-list.component.scss | 6 +- .../detail-dialog/detail-dialog.component.html | 5 ++--- .../detail-dialog/detail-dialog.component.scss | 21 +++-- .../manage-ungit/manage-ungit.component.ts | 4 ++-- .../resources-grid/resources-grid.component.html| 5 ++--- .../webapp/src/app/shared/material.module.ts| 14 -- .../notification-dialog.component.ts| 8 .../webapp/src/assets/styles/_dialogs.scss | 9 + 14 files changed, 80 insertions(+), 30 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1112 updated (6bb3dac -> d2f5905)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1112 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 6bb3dac [DLAB-1112][ON HOLD]: shared image usage parameter on project creation add 03fefb5 [AWS] SSO configuretion fixed and keycloak clients for project removing added add 5082c87 [AWS] SSO configuretion fixed and keycloak clients for project removing added add 525835a Merge pull request #461 from bodnarmykola/notebooks-sso add e3533d6 [DLAB-1332] Fixed minor links altering and data labels delay on modal dialogs add 1692c19 Merge pull request #462 from DG1202/DLAB-1332 add 9884f19 [DLAB-1319, 1257] Fixed alignment on Environment Management and padding in billing grid add bb436eb Merge pull request #463 from DG1202/Dlab-1319,1257 new d2f5905 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1112 The 1 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/general/scripts/aws/edge_configure.py | 2 +- .../src/general/scripts/aws/project_prepare.py | 7 +++ .../src/general/scripts/aws/project_terminate.py| 21 + .../reporting-grid/reporting-grid.component.scss| 1 + .../cluster-details/cluster-details.component.html | 4 ++-- .../computational-resources-list.component.html | 3 +-- .../computational-resources-list.component.scss | 6 +- .../detail-dialog/detail-dialog.component.html | 5 ++--- .../detail-dialog/detail-dialog.component.scss | 21 +++-- .../manage-ungit/manage-ungit.component.ts | 4 ++-- .../resources-grid/resources-grid.component.html| 5 ++--- .../webapp/src/app/shared/material.module.ts| 14 -- .../notification-dialog.component.ts| 8 .../webapp/src/assets/styles/_dialogs.scss | 9 + 14 files changed, 80 insertions(+), 30 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1112 updated: [DLAB-1112][ON HOLD]: shared image usage parameter on project creation
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-1112 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git The following commit(s) were added to refs/heads/DLAB-1112 by this push: new 6bb3dac [DLAB-1112][ON HOLD]: shared image usage parameter on project creation 6bb3dac is described below commit 6bb3dacd1c06b8a0ed54adf5f34c69a4db2a3358 Author: Andriana Kovalyshyn AuthorDate: Fri Nov 29 15:26:25 2019 +0200 [DLAB-1112][ON HOLD]: shared image usage parameter on project creation --- .../administration/project/project-form/project-form.component.html | 6 -- .../administration/project/project-form/project-form.component.ts | 6 -- .../webapp/src/app/administration/project/project.component.ts | 2 +- 3 files changed, 9 insertions(+), 5 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 07c1582..4f3730a 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 @@ -160,11 +160,13 @@ - + + + Clear
[incubator-dlab] branch DLAB-1112 updated: [DLAB-1112]: added shared image usage parameter on project creation
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1112
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1112 by this push:
new 2770760 [DLAB-1112]: added shared image usage parameter on project
creation
2770760 is described below
commit 277076060eaf86b1a42cd63f6c67b3dca2dd2172
Author: Andriana Kovalyshyn
AuthorDate: Fri Nov 29 15:19:17 2019 +0200
[DLAB-1112]: added shared image usage parameter on project creation
---
.../project/project-form/project-form.component.html | 12 ++--
.../project/project-form/project-form.component.ts | 6 --
.../src/app/administration/project/project.component.ts | 1 +
3 files changed, 15 insertions(+), 4 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 497b928..07c1582 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
@@ -92,7 +92,8 @@
Endpoints
-
+
playlist_add_check All
@@ -136,7 +137,8 @@
Groups
-
+
playlist_add_check All
@@ -158,6 +160,12 @@
+
+
+Use shared image
+
+
+
Clear
keyboard_arrow_leftBack
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 009456c..8bfae94 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
@@ -147,7 +147,8 @@ export class ProjectFormComponent implements OnInit {
'name': ['', Validators.compose([Validators.required,
Validators.pattern(PATTERNS.projectName), this.checkDuplication.bind(this),
this.providerMaxLength.bind(this)])],
'endpoints': [[], Validators.required],
'tag': ['', Validators.compose([Validators.required,
Validators.pattern(PATTERNS.projectName)])],
- 'groups': [[], Validators.required]
+ 'groups': [[], Validators.required],
+ 'shared_image_enabled': [false, Validators.required]
});
}
@@ -159,7 +160,8 @@ export class ProjectFormComponent implements OnInit {
'name': [item.name, Validators.required],
'endpoints': [endpoints],
'tag': [item.tag, Validators.required],
- 'groups': [item.groups, Validators.required]
+ 'groups': [item.groups, Validators.required],
+ 'shared_image_enabled': [item.shared_image_enabled, Validators.required]
});
}
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 9c7dae6..50c7b80 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
@@ -38,6 +38,7 @@ export interface Project {
endpoints: Endpoint[];
tag: string;
groups: string[];
+ shared_image_enabled?: boolean;
}
@Component({
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated: [DLAB-1319, 1257] Fixed alignment on Environment Management and padding in billing grid
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 9884f19 [DLAB-1319, 1257] Fixed alignment on Environment Management
and padding in billing grid
new bb436eb Merge pull request #463 from DG1202/Dlab-1319,1257
9884f19 is described below
commit 9884f19e66c635ee439060b631892b03828c9ca8
Author: Dmytro Gnatyshyn
AuthorDate: Fri Nov 29 14:45:09 2019 +0200
[DLAB-1319, 1257] Fixed alignment on Environment Management and padding in
billing grid
---
.../src/app/reporting/reporting-grid/reporting-grid.component.scss | 1 +
.../computational-resources-list.component.scss | 6 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
index 27773e2..e4caf44 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
@@ -39,6 +39,7 @@
td {
font-size: 13px;
+ padding-left: 5px;
&.info {
z-index: 1 !important;
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
index a64244f..1fa5923 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
@@ -27,6 +27,7 @@
display: flex;
justify-content: space-between;
height: 26px;
+ align-items: center;
.resource-name {
width: 55%;
@@ -77,7 +78,8 @@
}
.start-stop-action {
-
+ display: flex;
+ align-items: center;
font-size: 18px;
color: #36afd5;
@@ -93,6 +95,8 @@
.remove_butt {
cursor: pointer;
color: #ef5c4b;
+ display: flex;
+ align-items: center;
&.disabled {
color: #f5d3d3;
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1112 created (now 0e888a9)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1112 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 0e888a9 [DLAB-1312]: info messages changed This branch includes the following new commits: new 69bac8d [DLAB-1294]: list statuses check on active filtering extended new 0e888a9 [DLAB-1312]: info messages changed The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1312]: info messages changed
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-1112 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 0e888a9ef782692cabacedf734258d5a6d930d86 Author: Andriana Kovalyshyn AuthorDate: Fri Nov 29 13:33:05 2019 +0200 [DLAB-1312]: info messages changed --- .../manage-environment/manage-environment-dilog.component.html| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html index b14b333..b95a91f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.html @@ -56,7 +56,7 @@ pause_circle_outline - pause_circle_outline @@ -68,7 +68,7 @@ phonelink_off - phonelink_off - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1294]: list statuses check on active filtering extended
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1112
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 69bac8d48d987ddcd9128cceabda584574f78d65
Author: Andriana Kovalyshyn
AuthorDate: Fri Nov 29 13:30:04 2019 +0200
[DLAB-1294]: list statuses check on active filtering extended
---
.../src/main/resources/webapp/src/app/core/util/sortUtils.ts| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/util/sortUtils.ts
b/services/self-service/src/main/resources/webapp/src/app/core/util/sortUtils.ts
index 3d8d04f..fe003f7 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/util/sortUtils.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/util/sortUtils.ts
@@ -25,7 +25,7 @@ export class SortUtils {
}
public static activeStatuses(): String[] {
-return ['running', 'stopping', 'stopped', 'creating', 'configuring',
'starting', 'creating image'];
+return ['running', 'stopping', 'stopped', 'creating', 'configuring',
'reconfiguring', 'starting', 'creating image'];
}
public static shapesSort(shapesJson) {
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated: [DLAB-1332] Fixed minor links altering and data labels delay on modal dialogs
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new e3533d6 [DLAB-1332] Fixed minor links altering and data labels delay
on modal dialogs
new 1692c19 Merge pull request #462 from DG1202/DLAB-1332
e3533d6 is described below
commit e3533d66c773becac95c4777e99c5b6999b3dda5
Author: Dmytro Gnatyshyn
AuthorDate: Fri Nov 29 13:07:54 2019 +0200
[DLAB-1332] Fixed minor links altering and data labels delay on modal
dialogs
---
.../cluster-details/cluster-details.component.html | 4 ++--
.../computational-resources-list.component.html | 3 +--
.../detail-dialog/detail-dialog.component.html | 5 ++---
.../detail-dialog/detail-dialog.component.scss | 21 +++--
.../manage-ungit/manage-ungit.component.ts | 4 ++--
.../resources-grid/resources-grid.component.html| 5 ++---
.../webapp/src/app/shared/material.module.ts| 14 --
.../notification-dialog.component.ts| 8
.../webapp/src/assets/styles/_dialogs.scss | 9 +
9 files changed, 45 insertions(+), 28 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 fc24a94..453061c 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
@@ -98,8 +98,8 @@
Up time {{upTimeInHours}} hour(s) since
{{upTimeSince || "not specified."}}
-
- {{ item.description }}:
+
+ {{ item.description }}:
{{ item.url }}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html
index 0b9e110..1b0a139 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.html
@@ -25,8 +25,7 @@
-
+
{{resource.computational_name}}
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 4e33a8f..96c4f91 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
@@ -51,7 +51,6 @@
-Node User: {{ notebook.username }}
-Password: {{ notebook.password }}
+Node User: {{ notebook.username }}
+Password: {{ notebook.password }}
{{ DICTIONARY.personal_storage }}:
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
index a858e05..c8ee3c0 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
@@ -30,8 +30,9 @@
.description {
white-space: nowrap;
- padding-right: 5px;
+ padding-left: 7px;
font-weight: 600;
+ color: #455c74;
}
}
}
@@ -75,17 +76,17 @@
bottom: -16px;
right: 0;
}
-
-.bucket-info{
- padding-left: 7px;
- font-weight: 600;
-}
-
-.strong{
- font-weight: 600;
-}
}
}
+.bucket-info{
+ padding-left: 7px;
+ font-weight: 600;
+ color: #455c74;
+}
+
+
+
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.ts
b/services/se
[incubator-dlab] branch develop updated (707e47f -> 2bc5e6f)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 707e47f Merge pull request #459 from bodnarmykola/notebooks-sso add 1ce5c1f [DLAB-1297]: fixed initial login issue add 94520fb Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1297 new 2bc5e6f Merge pull request #460 from apache/DLAB-1297 The 1 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: .../resources/webapp/src/app/core/interceptors/error.interceptor.ts | 2 +- .../webapp/src/app/core/services/applicationSecurity.service.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #460 from apache/DLAB-1297
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 2bc5e6f544b655f5394b784b4b11c79ac31451a2 Merge: 707e47f 94520fb Author: Andriana Kovalyshyn AuthorDate: Fri Nov 29 10:37:44 2019 +0200 Merge pull request #460 from apache/DLAB-1297 [DLAB-1297][Authentication]: fixed initial login issue .../resources/webapp/src/app/core/interceptors/error.interceptor.ts | 2 +- .../webapp/src/app/core/services/applicationSecurity.service.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1297
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-1297 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 94520fbe87fc510c26bc17aadba05bc43ebdf354 Merge: 1ce5c1f 707e47f Author: Andriana Kovalyshyn AuthorDate: Fri Nov 29 10:23:29 2019 +0200 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1297 .../src/general/files/aws/base_Dockerfile | 2 +- .../src/general/files/azure/base_Dockerfile| 2 +- .../src/general/lib/os/debian/edge_lib.py | 61 .../src/general/scripts/aws/edge_configure.py | 14 +++- .../src/general/scripts/azure/edge_configure.py| 19 - .../src/general/scripts/gcp/edge_configure.py | 17 - .../src/project/scripts/configure_keycloak.py | 83 ++ .../scripts/configure_nginx_reverse_proxy.py | 11 +-- .../src/project/templates/conf.d/proxy.conf| 22 +- .../src/project/templates/nginx.conf | 16 ++--- .../service/impl/ProjectServiceImpl.java | 36 ++ 11 files changed, 230 insertions(+), 53 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1297 updated (1ce5c1f -> 94520fb)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1297 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 1ce5c1f [DLAB-1297]: fixed initial login issue add 2036c26 Merge branch 'develop' of C:\Users\Mykola_Bodnar1\Documents\DLab\incubator-dlab with conflicts. add cde3403 Merge pull request #27 from apache/develop add bdac58d Merge remote-tracking branch 'origin/develop' into develop add 8f0a7a9 SSO implementing add d11e5a3 SSO implementing add 9cd0f2d SSO bugs fixing add b6455d5 SSO bugs fixed add cb52717 SSO nginx config fixed add 6af33db SSO nginx config fixed add d497551 SSO added for Azure and AWS add 8b77cc1 SSO for notebooks implemented add 6a4a7af merge conflict fixed add bf50025 Merge pull request #28 from apache/develop add 85afc5b Merge remote-tracking branch 'origin/notebooks-sso' into notebook-sso add f207298 Merge pull request #458 from bodnarmykola/notebooks-sso add 12f3845 [DLAB-1316, DLAB-1314] Fixed issues with stopping/terminating actions on manage environment popup add 5f11c8e merge conflict fixed add 707e47f Merge pull request #459 from bodnarmykola/notebooks-sso new 94520fb Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1297 The 1 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/general/files/aws/base_Dockerfile | 2 +- .../src/general/files/azure/base_Dockerfile| 2 +- .../src/general/lib/os/debian/edge_lib.py | 61 .../src/general/scripts/aws/edge_configure.py | 14 +++- .../src/general/scripts/azure/edge_configure.py| 19 - .../src/general/scripts/gcp/edge_configure.py | 17 - .../src/project/scripts/configure_keycloak.py | 83 ++ .../scripts/configure_nginx_reverse_proxy.py | 11 +-- .../src/project/templates/conf.d/proxy.conf| 22 +- .../src/project/templates/nginx.conf | 16 ++--- .../service/impl/ProjectServiceImpl.java | 36 ++ 11 files changed, 230 insertions(+), 53 deletions(-) create mode 100644 infrastructure-provisioning/src/project/scripts/configure_keycloak.py - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1297 created (now 1ce5c1f)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch DLAB-1297 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 1ce5c1f [DLAB-1297]: fixed initial login issue This branch includes the following new commits: new 1ce5c1f [DLAB-1297]: fixed initial login issue The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1297]: fixed initial login issue
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1297
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 1ce5c1fbfc58cd9190e8a96528d915a8f80282d4
Author: Andriana Kovalyshyn
AuthorDate: Thu Nov 28 17:45:36 2019 +0200
[DLAB-1297]: fixed initial login issue
---
.../resources/webapp/src/app/core/interceptors/error.interceptor.ts | 2 +-
.../webapp/src/app/core/services/applicationSecurity.service.ts | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/interceptors/error.interceptor.ts
b/services/self-service/src/main/resources/webapp/src/app/core/interceptors/error.interceptor.ts
index 6246158..4ae3899 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/interceptors/error.interceptor.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/interceptors/error.interceptor.ts
@@ -90,7 +90,7 @@ import { HTTP_STATUS_CODES } from '../util';
}
private handleBadRequest(error, request: HttpRequest, next:
HttpHandler) {
-if (error.url.split('?')[0].endsWith('refresh'))
this.routingService.redirectToLoginPage();
+if (error.url.indexOf('refresh') > -1)
this.routingService.redirectToLoginPage();
return next.handle(request);
}
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationSecurity.service.ts
b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationSecurity.service.ts
index a55c667..1bcd4f8 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationSecurity.service.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationSecurity.service.ts
@@ -71,8 +71,8 @@ export class ApplicationSecurityService {
}
public refreshToken() {
-const refreshTocken = `/${this.storage.getRefreshToken()}`;
-return this.serviceFacade.buildRefreshToken(refreshTocken)
+const refreshToken = `/${this.storage.getRefreshToken()}`;
+return this.serviceFacade.buildRefreshToken(refreshToken)
.pipe(
tap((tokens) => this.storage.storeTokens(tokens)));
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch v2.2-RC1 updated: [DLAB-1297]: fixed initial login issue
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch v2.2-RC1
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/v2.2-RC1 by this push:
new a56035e [DLAB-1297]: fixed initial login issue
new b337dac Merge branch 'v2.2-RC1' of github.com:apache/incubator-dlab
into v2.2-RC1
a56035e is described below
commit a56035e5170c32bed1ab811d3a6ddc343eb6cc63
Author: Andriana Kovalyshyn
AuthorDate: Thu Nov 28 14:38:50 2019 +0200
[DLAB-1297]: fixed initial login issue
---
.../resources/webapp/src/app/core/interceptors/error.interceptor.ts | 2 +-
.../webapp/src/app/core/services/applicationSecurity.service.ts | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/interceptors/error.interceptor.ts
b/services/self-service/src/main/resources/webapp/src/app/core/interceptors/error.interceptor.ts
index e1b8039..4ae3899 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/interceptors/error.interceptor.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/interceptors/error.interceptor.ts
@@ -90,7 +90,7 @@ import { HTTP_STATUS_CODES } from '../util';
}
private handleBadRequest(error, request: HttpRequest, next:
HttpHandler) {
-if (!error.url.split('?')[0].endsWith('maven'))
this.routingService.redirectToLoginPage();
+if (error.url.indexOf('refresh') > -1)
this.routingService.redirectToLoginPage();
return next.handle(request);
}
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationSecurity.service.ts
b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationSecurity.service.ts
index a55c667..1bcd4f8 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationSecurity.service.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationSecurity.service.ts
@@ -71,8 +71,8 @@ export class ApplicationSecurityService {
}
public refreshToken() {
-const refreshTocken = `/${this.storage.getRefreshToken()}`;
-return this.serviceFacade.buildRefreshToken(refreshTocken)
+const refreshToken = `/${this.storage.getRefreshToken()}`;
+return this.serviceFacade.buildRefreshToken(refreshToken)
.pipe(
tap((tokens) => this.storage.storeTokens(tokens)));
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated: [DLAB-1323] Fixed data labels delay on modal dialogs
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 237bd26 [DLAB-1323] Fixed data labels delay on modal dialogs
new 9f55038 Merge pull request #457 from DG1202/DLAB-1323
237bd26 is described below
commit 237bd26e1dcd48357898703be27cb08a20cabd2f
Author: Dmytro Gnatyshyn
AuthorDate: Thu Nov 28 13:25:39 2019 +0200
[DLAB-1323] Fixed data labels delay on modal dialogs
---
.../detail-dialog/detail-dialog.component.html | 20 ++--
.../detail-dialog/detail-dialog.component.scss | 21 +
2 files changed, 31 insertions(+), 10 deletions(-)
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 4aee5fa..4e33a8f 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
@@ -47,7 +47,7 @@
Open following URL(s) in your browser to access this box:
-{{item.description}}:
+{{item.description}}:
-Node User: {{
notebook.username }}
-Password: {{
notebook.password }}
+Node User: {{ notebook.username }}
+Password: {{ notebook.password }}
{{ DICTIONARY.personal_storage }}:
{{ DICTIONARY.account }}
-{{ notebook.account_name}}
- {{ DICTIONARY.container }}
{{ notebook.bucket_name }}
+{{ notebook.account_name}}
+ {{ DICTIONARY.container }} {{ notebook.bucket_name }}
{{ DICTIONARY.collaboration_storage }}:
{{ DICTIONARY.account }}
-{{ notebook.shared_account_name}}
+{{
notebook.shared_account_name}}
{{ DICTIONARY.container }}
-{{ notebook.shared_bucket_name }}
+{{ notebook.shared_bucket_name
}}
Data Lake Store:
-Data Lake Store Account: {{
notebook.datalake_name }}
-Personal folder: {{
notebook.datalake_directory }}
-Collaboration folder: {{
notebook.datalake_shared_directory }}
+Data Lake Store Account: {{
notebook.datalake_name }}
+Personal folder: {{
notebook.datalake_directory }}
+Collaboration folder: {{
notebook.datalake_shared_directory }}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
index d28993f..a858e05 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.scss
@@ -24,11 +24,14 @@
}
.links_block {
+
> p {
display: flex;
+
.description {
white-space: nowrap;
padding-right: 5px;
+ font-weight: 600;
}
}
}
@@ -36,12 +39,14 @@
.checkbox-group {
position: relative;
padding: 5px;
+
label {
input[type="checkbox"] {
margin: 10px 0;
}
}
span {
+
&.danger_color {
position: absolute;
bottom: -20px;
@@ -49,10 +54,12 @@
}
}
}
+
.config-details {
text-align: left;
position: relative;
height: 280px;
+
textarea {
height: 100%;
resize: none;
@@ -60,11 +67,25 @@
line-height: 1.5;
font-family: Consolas, monospace;
}
+
span {
+
.danger_color {
position: absolute;
bottom: -16px;
right: 0;
}
+
+.bucket-info{
+ padding-left: 7px;
+ font-weight: 600;
+}
+
+.strong{
+ font-weight: 600;
+}
}
}
+
+
+
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch gh-pages updated: social displaying fixes
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/gh-pages by this push:
new 5de5c5e social displaying fixes
5de5c5e is described below
commit 5de5c5e9f51c0c9270b2c56b77797e844ba7dfca
Author: Andriana Kovalyshyn
AuthorDate: Thu Nov 28 12:30:01 2019 +0200
social displaying fixes
---
dist/app.css | 2 +-
style/style.css | 26 ++--
style/style.scss | 385 +--
3 files changed, 334 insertions(+), 79 deletions(-)
diff --git a/dist/app.css b/dist/app.css
index 26641b4..8ee58da 100755
--- a/dist/app.css
+++ b/dist/app.css
@@ -1,4 +1,4 @@
.lightSpeedOutRight.goAway,.wiggle.go{-webkit-animation-timing-function:ease-in}.flip.go,.flipInX.go{-webkit-backface-visibility:visible!important}.animated{-webkit-animation-duration:1s;animation-duration:1s;-webkit-animation-fill-mode:both;animation-fill-mode:both}.slow,.slower{-webkit-animation-fill-mode:both}.slow{-webkit-animation-duration:1.5s;animation-duration:1.5s;animation-fill-mode:both}.slower{-webkit-animation-duration:2s;animation-duration:2s;animation-fill-mode:both}.slowe
[...]
@font-face{font-family:'Open
Sans';src:url(data:application/font-woff2;charset=utf-8;base64,d09GMgABAMhwABIB02wAAMgFAAEAP0ZGVE0cGh4b/FwchUQGYACIbgiBKgmPNBEQCoWMNIS8cQuOWAABNgIkA50kBCAFjTEHvgUMgjpbFKORA1XHbs/4J0ZR6RxbCxYAWPrralzDNgWftTsdm/jpqTNflHAF26Z1rDerGPr/ZmRk//87koUcev+p+0+CAFSLTrduA2FuiNHggsmFwXMdERtrS9fHUho4iWFwtBEmEweOjjzGjMlSmkUXlbKsLu+rOSg2DI+I2Cak+zPtZinh4dMsIvygn/EUr9AZTY1amaryxehK15pc4a6SWjbTzEwzYpM7Lv26Ouzy7a6Rcjzx7QfVIqhknaHfMJyrcLhy
[...]
.swiper-slide,.swiper-wrapper{width:100%;height:100%;position:relative}.swiper-container{margin-left:auto;margin-right:auto;position:relative;overflow:hidden;z-index:1}.swiper-container-no-flexbox
.swiper-slide{float:left}.swiper-container-vertical>.swiper-wrapper{-webkit-box-orient:vertical;-moz-box-orient:vertical;-ms-flex-direction:column;-webkit-flex-direction:column;flex-direction:column}.swiper-wrapper{z-index:1;display:-webkit-box;display:-moz-box;display:-ms-flexbox;display:-webk
[...]
-.fullframe,.hidden{height:0;overflow:hidden}.hidden,a>img{border:0}#wrap,.fullframe,.hidden,form
textarea{overflow:hidden}.h100,html>body{min-height:100vh}:focus,a{outline:0}.content-desc,.we-solve{text-align:center}.social
li a,a:hover,header nav>ul>li
a{text-decoration:none}*{-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;-o-box-sizing:border-box;box-sizing:border-box;min-width:1px;padding:0;margin:0}article,
[...]
\ No newline at end of file
+.fullframe,.hidden{height:0;overflow:hidden}.hidden,a>img{border:0}#wrap,.fullframe,.hidden,form
textarea{overflow:hidden}.h100,html>body{min-height:100vh}:focus,a{outline:0}.content-desc,.we-solve{text-align:center}.social
li a,a:hover,header nav>ul>li
a{text-decoration:none}*{-webkit-tap-highlight-color:rgba(0,0,0,0);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;-o-box-sizing:border-box;box-sizing:border-box;min-width:1px;padding:0;margin:0}article,
[...]
\ No newline at end of file
diff --git a/style/style.css b/style/style.css
index fecf5b4..56b6856 100755
--- a/style/style.css
+++ b/style/style.css
@@ -244,7 +244,8 @@ html {
color: #3C4349;
opacity: 1; }
-.ani, header nav > ul > li.has-children > a::before, header nav > ul >
li.has-children > a::after, header nav > ul > li .sub-menu, .controls-slider
.controls-nav mark, .controls-slider .mac-wrap .swiper-slide video, h2.heading,
.we-solve article div, .we-solve article div svg g[stroke*="#"], .we-solve
article div p, .features .mac-screen-wrap .screen-slider-thumbs .swiper-slide,
.social li, .overlay .overlay-wrap .sources div .git-ref, .overlay
.overlay-wrap .sources div .apache-ref {
+.ani, header nav > ul > li.has-children > a::before, header nav > ul >
li.has-children > a::after, header nav > ul > li .sub-menu, .controls-slider
.controls-nav mark, .controls-slider .mac-wrap .swiper-slide video, h2.heading,
.we-solve article div, .we-solve article div svg g[stroke*="#"], .we-solve
article div p, .features .mac-screen-wrap .screen-slider-thumbs .swiper-slide,
.social li, .overlay .overlay-wrap .sources div .git-ref,
+.overlay .overlay-wrap .sources div .apache-ref {
-webkit-transition: all 0.5s ease;
-moz-transition: all 0.5s ease;
-ms-transition: all 0.5s ease;
@@ -1135,16 +1136,19 @@ footer {
margin: 0 auto;
margin-bottom: 40px;
height: 96px; }
-.overlay .overlay-wrap .sources div .git-ref, .overlay .overlay-wrap
.sources div .apache-ref {
+
[incubator-dlab] branch gh-pages updated: [DLAB-1309]: copyright loading fixes
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/gh-pages by this push:
new 345fe6e [DLAB-1309]: copyright loading fixes
new f081ad1 Merge branch 'gh-pages' of github.com:apache/incubator-dlab
into gh-pages
345fe6e is described below
commit 345fe6ed78951f0c4a786b91d9e0bf9180b29109
Author: Andriana Kovalyshyn
AuthorDate: Wed Nov 27 22:26:13 2019 +0200
[DLAB-1309]: copyright loading fixes
---
dist/app.js | 2 +-
html/index.html | 5 +++--
index.html | 2 +-
js/init.js | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/dist/app.js b/dist/app.js
index 7ce2566..49c1967 100755
--- a/dist/app.js
+++ b/dist/app.js
@@ -6,4 +6,4 @@
;y.params.loop&&(t+=y.loopedSlides),y.slideTo(t)},y.updateClickedSlide=function(a){var
t=n(a,"."+y.params.slideClass),s=!1;if(t)for(var
r=0;rhttps://www.apache.org/security/";
target="_blank">Security
https://www.apache.org/foundation/sponsorship.html";
target="_blank">Sponsorship
-https://www.apache.org/";
target="_blank">Foundation
+https://www.apache.org/";
target="_blank">Foundation
+
@@ -853,7 +854,7 @@
-Copyright © 2018-2019 The Apache Software Foundation.
+Copyright © 2018- The Apache
Software Foundation.
Apache DLab and DLab feather logo are trademarks of
The Apache Software Foundation
diff --git a/index.html b/index.html
index 0a4dc70..308db14 100755
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-DLab | Essential toolset for
analytics
[incubator-dlab] 01/01: Merge pull request #456 from apache/revert-454-gh-pages
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch gh-pages in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit a9e81876cc657c6ec9f25142d8764a387ea7df98 Merge: 967d893 ec25c5c Author: Andriana Kovalyshyn AuthorDate: Wed Nov 27 22:17:32 2019 +0200 Merge pull request #456 from apache/revert-454-gh-pages Revert "[DLAB-1309] Fixed issues on promotion page" dist/app.js | 6 +++--- html/index.html | 2 +- index.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch gh-pages updated (967d893 -> a9e8187)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch gh-pages in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 967d893 Merge pull request #454 from DG1202/gh-pages add ec25c5c Revert "[DLAB-1309] Fixed issues on promotion page" new a9e8187 Merge pull request #456 from apache/revert-454-gh-pages The 1 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: dist/app.js | 6 +++--- html/index.html | 2 +- index.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Revert "[DLAB-1309] Fixed issues on promotion page"
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch revert-454-gh-pages
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit ec25c5ce481f0150684e0eccd20ddfc0e0b64880
Author: Andriana Kovalyshyn
AuthorDate: Wed Nov 27 22:13:20 2019 +0200
Revert "[DLAB-1309] Fixed issues on promotion page"
---
dist/app.js | 6 +++---
html/index.html | 2 +-
index.html | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dist/app.js b/dist/app.js
index 7cba714..7ce2566 100755
--- a/dist/app.js
+++ b/dist/app.js
@@ -1,9 +1,9 @@
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof
module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw
new Error("jQuery requires a window with a document");return
t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){"use
strict";function n(e,t){t=t||ne;var
n=t.createElement("script");n.text=e,t.head.appendChild(n).parentNode.removeChild(n)}function
r(e){var t=!!e&&"length"in
e&&e.length,n=ge.type(e);return"function"!==n&&!ge.i [...]
+;return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return
e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!w.pseudos.empty(e)},header:function(e){return
de.test(e.nodeName)},input:function(e){return
pe.test(e.nodeName)},button:function(e){var
t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(
[...]
+;for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||ge.dequeue(this,e)})},finish:function(e){return!1!==e&&(e=e||"fx"),this.each(function(){var
t,n=Oe.get(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=ge.timers,a=r?r.length:0;for(n.finish=!0,ge.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t=n&&s-(e.data("appear-top-offset")||0)<=n+o.height [...]
!function(){"use strict";var e,a=function(t,s){function r(e){return
Math.floor(e)}function i(){var
e=y.params.autoplay,a=y.slides.eq(y.activeIndex);a.attr("data-swiper-autoplay")&&(e=a.attr("data-swiper-autoplay")||y.params.autoplay),y.autoplayTimeoutId=setTimeout(function(){y.params.loop?(y.fixLoop(),y._slideNext(),y.emit("onAutoplay",y)):y.isEnd?s.autoplayStopOnLast?y.stopAutoplay():(y._slideTo(0),y.emit("onAutoplay",y)):(y._slideNext(),y.emit("onAutoplay",y))},e)}function
n(a,t){var s [...]
;y.params.loop&&(t+=y.loopedSlides),y.slideTo(t)},y.updateClickedSlide=function(a){var
t=n(a,"."+y.params.slideClass),s=!1;if(t)for(var
r=0;r
-Copyright © 2018- The Apache Software
Foundation.
+Copyright © 2018-2019 The Apache Software Foundation.
Apache DLab and DLab feather logo are trademarks of
The Apache Software Foundation
diff --git a/index.html b/index.html
index 77a9001..0a4dc70 100755
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-DLab | Essential toolset for
analytics
[incubator-dlab] branch revert-454-gh-pages created (now ec25c5c)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch revert-454-gh-pages in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at ec25c5c Revert "[DLAB-1309] Fixed issues on promotion page" This branch includes the following new commits: new ec25c5c Revert "[DLAB-1309] Fixed issues on promotion page" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (9c7c51b -> 839cd74)
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 9c7c51b Merge pull request #453 from apache/DLAB-1303 add 2124bae updated active statuses list add 148026d updated active statuses list new 839cd74 Merge pull request #455 from apache/DLAB-846 The 1 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/src/app/core/util/sortUtils.ts| 2 +- .../modal-dialog/notification-dialog/notification-dialog.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: Merge pull request #455 from apache/DLAB-846
This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 839cd7448dcc2f63251840ccc9bf3d23aa25ce10 Merge: 9c7c51b 148026d Author: Andriana Kovalyshyn AuthorDate: Wed Nov 27 16:55:16 2019 +0200 Merge pull request #455 from apache/DLAB-846 [Dlab-846]: updated active statuses list .../src/main/resources/webapp/src/app/core/util/sortUtils.ts| 2 +- .../modal-dialog/notification-dialog/notification-dialog.component.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-846 updated: updated active statuses list
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-846
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-846 by this push:
new 148026d updated active statuses list
148026d is described below
commit 148026d7507e5b4a60ac363b7d7dc7ce31170fc8
Author: Andriana Kovalyshyn
AuthorDate: Wed Nov 27 16:53:54 2019 +0200
updated active statuses list
---
.../modal-dialog/notification-dialog/notification-dialog.component.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
index 6e3278a..74382c5 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
@@ -53,7 +53,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from
'@angular/material/dialog';
{{ data.item.name }} will be {{ data.action ||
'decommissioned' }}.
-
+
Endpoint
Further status
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch gh-pages updated: [DLAB-1309] Fixed issues on promotion page
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/gh-pages by this push:
new d5db6f2 [DLAB-1309] Fixed issues on promotion page
new 967d893 Merge pull request #454 from DG1202/gh-pages
d5db6f2 is described below
commit d5db6f268468729b0ada2e70dd5648114a365125
Author: Dmytro Gnatyshyn
AuthorDate: Wed Nov 27 16:33:15 2019 +0200
[DLAB-1309] Fixed issues on promotion page
---
dist/app.js | 6 +++---
html/index.html | 2 +-
index.html | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dist/app.js b/dist/app.js
index 7ce2566..7cba714 100755
--- a/dist/app.js
+++ b/dist/app.js
@@ -1,9 +1,9 @@
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof
module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw
new Error("jQuery requires a window with a document");return
t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){"use
strict";function n(e,t){t=t||ne;var
n=t.createElement("script");n.text=e,t.head.appendChild(n).parentNode.removeChild(n)}function
r(e){var t=!!e&&"length"in
e&&e.length,n=ge.type(e);return"function"!==n&&!ge.i [...]
-;return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return
e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!w.pseudos.empty(e)},header:function(e){return
de.test(e.nodeName)},input:function(e){return
pe.test(e.nodeName)},button:function(e){var
t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(
[...]
-;for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||ge.dequeue(this,e)})},finish:function(e){return!1!==e&&(e=e||"fx"),this.each(function(){var
t,n=Oe.get(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=ge.timers,a=r?r.length:0;for(n.finish=!0,ge.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t=n&&s-(e.data("appear-top-offset")||0)<=n+o.height [...]
!function(){"use strict";var e,a=function(t,s){function r(e){return
Math.floor(e)}function i(){var
e=y.params.autoplay,a=y.slides.eq(y.activeIndex);a.attr("data-swiper-autoplay")&&(e=a.attr("data-swiper-autoplay")||y.params.autoplay),y.autoplayTimeoutId=setTimeout(function(){y.params.loop?(y.fixLoop(),y._slideNext(),y.emit("onAutoplay",y)):y.isEnd?s.autoplayStopOnLast?y.stopAutoplay():(y._slideTo(0),y.emit("onAutoplay",y)):(y._slideNext(),y.emit("onAutoplay",y))},e)}function
n(a,t){var s [...]
;y.params.loop&&(t+=y.loopedSlides),y.slideTo(t)},y.updateClickedSlide=function(a){var
t=n(a,"."+y.params.slideClass),s=!1;if(t)for(var
r=0;r
-Copyright © 2018-2019 The Apache Software Foundation.
+Copyright © 2018- The Apache Software
Foundation.
Apache DLab and DLab feather logo are trademarks of
The Apache Software Foundation
diff --git a/index.html b/index.html
index 0a4dc70..77a9001 100755
--- a/index.html
+++ b/index.html
@@ -1 +1 @@
-DLab | Essential toolset for
analytics
