[incubator-dlab] branch new-datalab-name updated: Changed images to data-lab, fixed spinner animation, changed favicon, other name changes
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch new-datalab-name
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/new-datalab-name by this push:
new dfbf584 Changed images to data-lab, fixed spinner animation, changed
favicon, other name changes
new f104648 Merge remote-tracking branch 'origin/new-datalab-name' into
new-datalab-name
dfbf584 is described below
commit dfbf584aab5ad23a085eee5596e317bfa6ab1d26
Author: Dmytro_Gnatyshyn
AuthorDate: Tue Sep 29 18:41:39 2020 +0300
Changed images to data-lab, fixed spinner animation, changed favicon, other
name changes
---
.../src/main/resources/webapp/angular.json | 4 +-
.../management-grid/management-grid.component.html | 2 +-
.../management-grid/management-grid.component.ts | 4 +-
.../reporting-grid/reporting-grid.component.html | 2 +-
.../cluster-details/cluster-details.component.html | 18 +--
.../cluster-details/cluster-details.component.ts | 2 +-
...utational-resource-create-dialog.component.html | 22 +--
...mputational-resource-create-dialog.component.ts | 14 +-
.../computational-resource-create.model.ts | 4 +-
.../computational-resources-list.component.html| 2 +-
.../create-environment.component.html | 4 +-
.../detail-dialog/detail-dialog.component.html | 4 +-
.../resources-grid/resources-grid.component.html | 10 +-
.../resources/scheduler/scheduler.component.html | 18 +--
.../app/resources/scheduler/scheduler.component.ts | 2 +-
.../confirmation-dialog.component.html | 6 +-
.../confirmation-dialog.component.ts | 2 +-
.../src/app/webterminal/webterminal.component.ts | 2 +-
.../src/main/resources/webapp/src/assets/data.json | 4 +-
.../resources/webapp/src/assets/endpoint-api.json | 4 +-
.../webapp/src/assets/styles/app-loading.scss | 151 +
.../webapp/src/assets/svg/datalab-logo.svg | 2 +-
.../webapp/src/dictionary/aws.dictionary.ts| 8 +-
.../webapp/src/dictionary/azure.dictionary.ts | 6 +-
.../webapp/src/dictionary/gcp.dictionary.ts| 10 +-
.../src/main/resources/webapp/src/favicon.ico | Bin 4286 -> 0 bytes
.../src/main/resources/webapp/src/index.html | 17 ++-
27 files changed, 152 insertions(+), 172 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/angular.json
b/services/self-service/src/main/resources/webapp/angular.json
index 32b79b3..727e98b 100644
--- a/services/self-service/src/main/resources/webapp/angular.json
+++ b/services/self-service/src/main/resources/webapp/angular.json
@@ -110,11 +110,11 @@
"defaultProject": "webapp",
"schematics": {
"@schematics/angular:component": {
- "prefix": "dlab",
+ "prefix": "data-lab",
"styleext": "scss"
},
"@schematics/angular:directive": {
- "prefix": "dlab"
+ "prefix": "data-lab"
}
}
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index 71a20db..fcee724 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -151,7 +151,7 @@
{{ resource.status }}
-
+
pause_circle_outline
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
index ab4bda7..3ee6f9f 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
@@ -300,8 +300,8 @@ export class ManagementGridComponent implements OnInit {
{{cluster.computational_name}}
{{data.action === 'stop' && cluster.image ===
"docker.dlab-dataengine" ? 'Stopped' : 'Terminated'}}
+ 'stopped': (data.action==='stop' &&
cluster.image==='docker
[incubator-dlab] branch new-datalab-name updated: Small fix
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch new-datalab-name
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/new-datalab-name by this push:
new e37b148 Small fix
e37b148 is described below
commit e37b1483fbce96acd59946b1290ba7dab5d214c5
Author: Dmytro_Gnatyshyn
AuthorDate: Tue Sep 29 13:22:31 2020 +0300
Small fix
---
.../src/main/resources/webapp/package-lock.json| 430 ++---
.../src/main/resources/webapp/package.json | 1 +
2 files changed, 370 insertions(+), 61 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/package-lock.json
b/services/self-service/src/main/resources/webapp/package-lock.json
index f8cfcc8..78dee68 100644
--- a/services/self-service/src/main/resources/webapp/package-lock.json
+++ b/services/self-service/src/main/resources/webapp/package-lock.json
@@ -642,6 +642,335 @@
"tslib": "^1.9.0"
}
},
+"@angular/localize": {
+ "version": "9.1.12",
+ "resolved":
"https://registry.npmjs.org/@angular/localize/-/localize-9.1.12.tgz";,
+ "integrity":
"sha512-31OalfES+dLrxN0VXCxxtT5dWoOSlQ40KYmzMS8X+mQ20gy9eFiZK4qf3DEq3JPqRltBMdEDnwR38uGIMAu2gQ==",
+ "requires": {
+"@babel/core": "7.8.3",
+"glob": "7.1.2",
+"yargs": "15.3.0"
+ },
+ "dependencies": {
+"@babel/code-frame": {
+ "version": "7.10.4",
+ "resolved":
"https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz";,
+ "integrity":
"sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+ "requires": {
+"@babel/highlight": "^7.10.4"
+ }
+},
+"@babel/core": {
+ "version": "7.8.3",
+ "resolved":
"https://registry.npmjs.org/@babel/core/-/core-7.8.3.tgz";,
+ "integrity":
"sha512-4XFkf8AwyrEG7Ziu3L2L0Cv+WyY47Tcsp70JFmpftbAA1K7YL/sgE9jh9HyNj08Y/U50ItUchpN0w6HxAoX1rA==",
+ "requires": {
+"@babel/code-frame": "^7.8.3",
+"@babel/generator": "^7.8.3",
+"@babel/helpers": "^7.8.3",
+"@babel/parser": "^7.8.3",
+"@babel/template": "^7.8.3",
+"@babel/traverse": "^7.8.3",
+"@babel/types": "^7.8.3",
+"convert-source-map": "^1.7.0",
+"debug": "^4.1.0",
+"gensync": "^1.0.0-beta.1",
+"json5": "^2.1.0",
+"lodash": "^4.17.13",
+"resolve": "^1.3.2",
+"semver": "^5.4.1",
+"source-map": "^0.5.0"
+ }
+},
+"@babel/generator": {
+ "version": "7.11.6",
+ "resolved":
"https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz";,
+ "integrity":
"sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+ "requires": {
+"@babel/types": "^7.11.5",
+"jsesc": "^2.5.1",
+"source-map": "^0.5.0"
+ }
+},
+"@babel/helper-function-name": {
+ "version": "7.10.4",
+ "resolved":
"https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz";,
+ "integrity":
"sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+ "requires": {
+"@babel/helper-get-function-arity": "^7.10.4",
+"@babel/template": "^7.10.4",
+"@babel/types": "^7.10.4"
+ }
+},
+"@babel/helper-get-function-arity": {
+ "version": "7.10.4",
+ "resolved":
"https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz";,
+ "integrity":
"sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr
[incubator-dlab] branch new-datalab-name updated: Changed names to Data Lab
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch new-datalab-name
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/new-datalab-name by this push:
new 1b97911 Changed names to Data Lab
new 707c5b5 Merge remote-tracking branch 'origin/new-datalab-name' into
new-datalab-name
1b97911 is described below
commit 1b979111e8837d2e6a043431cc2c305cf313cefe
Author: Dmytro_Gnatyshyn
AuthorDate: Mon Sep 28 18:31:45 2020 +0300
Changed names to Data Lab
---
.../backup-dilog/backup-dilog.component.ts | 2 +-
.../manage-environment-dilog.component.ts | 2 +-
.../management/management.component.html | 2 +-
.../ssn-monitor/ssn-monitor.component.ts | 2 +-
.../administration/project/project.component.ts| 2 +-
.../app/administration/roles/roles.component.ts| 2 +-
.../src/app/core/services/progress-bar.service.ts | 2 +-
.../accessnotebookguide.component.html | 10
.../publickeyguide/publickeyguide.component.html | 2 +-
.../webapp/src/app/layout/layout.component.html| 2 +-
.../webapp/src/app/layout/layout.component.ts | 2 +-
.../webapp/src/app/login/login.component.css | 5 +++-
.../webapp/src/app/login/login.component.html | 2 +-
.../webapp/src/app/login/login.component.ts| 2 +-
.../audit/audit-grid/audit-grid.component.ts | 2 +-
.../src/app/reports/audit/audit.component.ts | 20 +--
.../reporting-grid/reporting-grid.component.html | 6 ++---
.../reporting-grid/reporting-grid.component.ts | 2 +-
.../app/reports/reporting/reporting.component.ts | 28 ++--
.../reports/reporting/toolbar/toolbar.component.ts | 2 +-
.../bucket-browser/bucket-browser.component.html | 10
.../bucket-browser/bucket-browser.component.ts | 2 +-
.../buckets-tree/bucket-tree.component.ts | 2 +-
.../folder-tree/folder-tree.component.ts | 2 +-
.../cluster-details/cluster-details.component.html | 2 +-
.../cluster-details/cluster-details.component.ts | 2 +-
...utational-resource-create-dialog.component.html | 2 +-
.../ami-create-dialog.component.ts | 2 +-
.../create-environment.component.html | 2 +-
.../detail-dialog/detail-dialog.component.html | 2 +-
.../install-libraries.component.html | 2 +-
.../manage-ungit/manage-ungit.component.ts | 2 +-
.../src/app/resources/resources.component.ts | 2 +-
.../resources/scheduler/scheduler.component.html | 18 ++---
.../app/resources/scheduler/scheduler.component.ts | 2 +-
.../access-denied/access-denied.component.ts | 2 +-
.../src/app/shared/navbar/navbar.component.html| 2 +-
.../src/app/shared/navbar/navbar.component.scss| 2 +-
.../src/app/shared/navbar/navbar.component.ts | 30 +++---
.../shared/time-picker/time-picker.component.ts| 6 ++---
.../webapp/src/app/swagger/swagger.component.ts| 2 +-
.../src/app/webterminal/webterminal.component.ts | 2 +-
.../webapp/src/assets/styles/app-loading.scss | 6 ++---
.../webapp/src/assets/svg/datalab-logo.svg | 11
.../main/resources/webapp/src/assets/svg/logo.svg | 8 --
.../webapp/src/dictionary/global.dictionary.ts | 4 +--
.../src/main/resources/webapp/src/index.html | 19 +-
47 files changed, 132 insertions(+), 115 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts
index 9bd3a25..fc3c794 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/backup-dilog/backup-dilog.component.ts
@@ -26,7 +26,7 @@ import { BackupOptionsModel } from '../management.model';
import { BackupService } from '../../../core/services';
@Component({
- selector: 'dlab-backup-dilog',
+ selector: 'data-lab-backup-dilog',
templateUrl: './backup-dilog.component.html',
styleUrls: ['./backup-dilog.component.scss']
})
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
index 7f28631..bee378c 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
+++
b/
[incubator-dlab] branch develop updated: [DLAB-2039]: Added endpoint for instances on 'Environment management' (#924)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 1f7aea7 [DLAB-2039]: Added endpoint for instances on 'Environment
management' (#924)
1f7aea7 is described below
commit 1f7aea756a2dbb226dd26564bcefdb50b1cadda8
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Fri Sep 25 17:43:03 2020 +0300
[DLAB-2039]: Added endpoint for instances on 'Environment management' (#924)
[DLAB-2039]: Added endpoint for instances on 'Environment management' page
---
.../management-grid/management-grid.component.html | 18 ++
.../management-grid/management-grid.component.scss | 39 +-
.../management-grid/management-grid.component.ts | 21 +++-
.../administration/management/management.model.ts | 6 +++-
4 files changed, 66 insertions(+), 18 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index 71a20db..e0bb662 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -79,6 +79,18 @@
{{ element.project }}
+
+
+Endpoint
+
+
+filter_list
+more_vert
+
+
+ {{ element.endpoint }}
+
+
Name
@@ -241,6 +253,12 @@
[items]="filterConfiguration.projects"
[model]="filterForm.projects">
+
+
+
+
+
;
allFilteredEnvironmentData: Array;
loading: boolean = false;
- filterConfiguration: ManagementConfigModel = new ManagementConfigModel([],
'', [], [], [], []);
- filterForm: ManagementConfigModel = new ManagementConfigModel([], '', [],
[], [], []);
+ filterConfiguration: ManagementConfigModel = new ManagementConfigModel([],
'', [], [], [], [], []);
+ filterForm: ManagementConfigModel = new ManagementConfigModel([], '', [],
[], [], [], []);
filtering: boolean = false;
collapsedFilterRow: boolean = false;
@@ -62,11 +62,11 @@ export class ManagementGridComponent implements OnInit {
@Output() actionToggle: EventEmitter = new EventEmitter();
@Output() emitSelectedList: EventEmitter = new EventEmitter();
- displayedColumns: string[] = [ 'checkbox', 'user', 'type', 'project',
'shape', 'status', 'resources', 'actions'];
- displayedFilterColumns: string[] = ['checkbox-filter', 'user-filter',
'type-filter', 'project-filter', 'shape-filter', 'status-filter',
'resource-filter', 'actions-filter'];
+ displayedColumns: string[] = [ 'checkbox', 'user', 'type', 'project',
'endpoint', 'shape', 'status', 'resources', 'actions'];
+ displayedFilterColumns: string[] = ['checkbox-filter', 'user-filter',
'type-filter', 'project-filter', 'endpoint-filter', 'shape-filter',
'status-filter', 'resource-filter', 'actions-filter'];
private selected;
private allActiveNotebooks: any;
- private cashedFilterForm: ManagementConfigModel = new
ManagementConfigModel([], '', [], [], [], []);
+ private cashedFilterForm: ManagementConfigModel = new
ManagementConfigModel([], '', [], [], [], [], []);
private isFilterSelected: boolean;
private isFilterChanged: boolean;
@@ -146,6 +146,7 @@ export class ManagementGridComponent implements OnInit {
const isStatus = config.statuses.length > 0 ?
(config.statuses.indexOf(item.status) !== -1) : (config.type !== 'active');
const isShape = config.shapes.length > 0 ?
(config.shapes.indexOf(item.shape) !== -1) : true;
const isProject = config.projects.length > 0 ?
(config.projects.indexOf(item.project) !== -1) : true;
+const isEndpoint = config.endpoints.length > 0 ?
(config.endpoints.indexOf(item.endpoint) !== -1) : true;
const modifiedResources = containsStatus(item.resources,
config.resources);
let isResources = config.resources.length > 0 ? (modifiedResources &&
modifiedResources.length
[incubator-dlab] 02/04: [DLAB-2039]: Added endpoint for instances on 'Environment management' page
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2039
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 40f599ee5fba0e7528e2937fefa1b5a65df51ded
Author: Dmytro_Gnatyshyn
AuthorDate: Fri Sep 25 10:57:29 2020 +0300
[DLAB-2039]: Added endpoint for instances on 'Environment management' page
---
.../management-grid/management-grid.component.html | 18
.../management-grid/management-grid.component.scss | 24 ++
.../management-grid/management-grid.component.ts | 21 +++
.../administration/management/management.model.ts | 6 +-
4 files changed, 51 insertions(+), 18 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index 71a20db..e0bb662 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -79,6 +79,18 @@
{{ element.project }}
+
+
+Endpoint
+
+
+filter_list
+more_vert
+
+
+ {{ element.endpoint }}
+
+
Name
@@ -241,6 +253,12 @@
[items]="filterConfiguration.projects"
[model]="filterForm.projects">
+
+
+
+
+
;
allFilteredEnvironmentData: Array;
loading: boolean = false;
- filterConfiguration: ManagementConfigModel = new ManagementConfigModel([],
'', [], [], [], []);
- filterForm: ManagementConfigModel = new ManagementConfigModel([], '', [],
[], [], []);
+ filterConfiguration: ManagementConfigModel = new ManagementConfigModel([],
'', [], [], [], [], []);
+ filterForm: ManagementConfigModel = new ManagementConfigModel([], '', [],
[], [], [], []);
filtering: boolean = false;
collapsedFilterRow: boolean = false;
@@ -62,11 +62,11 @@ export class ManagementGridComponent implements OnInit {
@Output() actionToggle: EventEmitter = new EventEmitter();
@Output() emitSelectedList: EventEmitter = new EventEmitter();
- displayedColumns: string[] = [ 'checkbox', 'user', 'type', 'project',
'shape', 'status', 'resources', 'actions'];
- displayedFilterColumns: string[] = ['checkbox-filter', 'user-filter',
'type-filter', 'project-filter', 'shape-filter', 'status-filter',
'resource-filter', 'actions-filter'];
+ displayedColumns: string[] = [ 'checkbox', 'user', 'type', 'project',
'endpoint', 'shape', 'status', 'resources', 'actions'];
+ displayedFilterColumns: string[] = ['checkbox-filter', 'user-filter',
'type-filter', 'project-filter', 'endpoint-filter', 'shape-filter',
'status-filter', 'resource-filter', 'actions-filter'];
private selected;
private allActiveNotebooks: any;
- private cashedFilterForm: ManagementConfigModel = new
ManagementConfigModel([], '', [], [], [], []);
+ private cashedFilterForm: ManagementConfigModel = new
ManagementConfigModel([], '', [], [], [], [], []);
private isFilterSelected: boolean;
private isFilterChanged: boolean;
@@ -146,6 +146,7 @@ export class ManagementGridComponent implements OnInit {
const isStatus = config.statuses.length > 0 ?
(config.statuses.indexOf(item.status) !== -1) : (config.type !== 'active');
const isShape = config.shapes.length > 0 ?
(config.shapes.indexOf(item.shape) !== -1) : true;
const isProject = config.projects.length > 0 ?
(config.projects.indexOf(item.project) !== -1) : true;
+const isEndpoint = config.endpoints.length > 0 ?
(config.endpoints.indexOf(item.endpoint) !== -1) : true;
const modifiedResources = containsStatus(item.resources,
config.resources);
let isResources = config.resources.length > 0 ? (modifiedResources &&
modifiedResources.length > 0) : true;
@@ -157,7 +158,7 @@ export class ManagementGridComponent implements OnInit {
isResources = true;
}
-return isUser && isTypeName && isStatus && isShape && isProject &&
isResources;
+return isUser && isTypeName && isStatus && is
[incubator-dlab] 01/04: Merge branch 'develop' of github.com:apache/incubator-dlab into develop
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2039 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit bc4cee37be110c63ad547aca34056c334d45abab Merge: cea86df 34a0f0b Author: Dmytro_Gnatyshyn AuthorDate: Thu Sep 24 15:42:04 2020 +0300 Merge branch 'develop' of github.com:apache/incubator-dlab into develop CONTRIBUTING.md | 2 +- .../src/general/scripts/azure/ssn_terminate.py| 6 +++--- .../src/general/scripts/gcp/ssn_terminate_gcp_resources.py| 2 +- .../epam/dlab/backendapi/resources/dto/UserResourceInfo.java | 2 ++ .../dlab/backendapi/service/impl/EnvironmentServiceImpl.java | 2 ++ .../dlab/backendapi/service/impl/SchedulerJobServiceImpl.java | 11 ++- .../cluster-details/cluster-details.component.html| 2 +- .../webapp/src/app/resources/scheduler/scheduler.component.ts | 4 ++-- .../backendapi/service/impl/EnvironmentServiceImplTest.java | 10 ++ 9 files changed, 24 insertions(+), 17 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 04/04: [DLAB-2039]: Small fix
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2039
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 968b18398db3ad444cac87eaee8d60f45a31e00c
Author: Dmytro_Gnatyshyn
AuthorDate: Fri Sep 25 17:40:02 2020 +0300
[DLAB-2039]: Small fix
---
.../management/management-grid/management-grid.component.scss| 9 +
1 file changed, 9 insertions(+)
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 4fce903..e9162fb 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
@@ -90,31 +90,38 @@
.label-header{
padding-left: 15px;
height: 56px;
+
.ar{
left: 21px;
top: 2px;
}
+
.settings{
min-width: 7%;
}
+
&.mat-column-checkbox{
z-index: 12 !important;
padding-left: 10px;
+
.ar{
position: absolute;
top: 10px;
}
}
+
&.user{
z-index: 11 !important;
}
+
&.type{
z-index: 10 !important;
}
&.project {
z-index: 9 !important;
+
.label {
position: absolute;
}
@@ -122,6 +129,7 @@
&.endpoint {
z-index: 8 !important;
+
.label {
position: absolute;
}
@@ -146,6 +154,7 @@
}
.dashboard_table_body {
+
td:first-child {
cursor: default;
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 03/04: [DLAB-2039]: Added endpoint for instances on 'Environment management' page
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2039
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 66833c0fb6c1229f1cc3a9c361d4e0302589a231
Author: Dmytro_Gnatyshyn
AuthorDate: Fri Sep 25 14:08:02 2020 +0300
[DLAB-2039]: Added endpoint for instances on 'Environment management' page
---
.../management/management-grid/management-grid.component.scss | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
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 d3c8ce0..4fce903 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
@@ -90,7 +90,6 @@
.label-header{
padding-left: 15px;
height: 56px;
-
.ar{
left: 21px;
top: 2px;
@@ -108,6 +107,7 @@
}
&.user{
z-index: 11 !important;
+
}
&.type{
z-index: 10 !important;
@@ -115,10 +115,16 @@
&.project {
z-index: 9 !important;
+.label {
+ position: absolute;
+}
}
&.endpoint {
z-index: 8 !important;
+.label {
+ position: absolute;
+}
}
&.shape {
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2039 created (now 968b183)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2039 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 968b183 [DLAB-2039]: Small fix This branch includes the following new commits: new bc4cee3 Merge branch 'develop' of github.com:apache/incubator-dlab into develop new 40f599e [DLAB-2039]: Added endpoint for instances on 'Environment management' page new 66833c0 [DLAB-2039]: Added endpoint for instances on 'Environment management' page new 968b183 [DLAB-2039]: Small fix The 4 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: [DLAB-1778]: Added localization (#923)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 f7a938a [DLAB-1778]: Added localization (#923)
f7a938a is described below
commit f7a938a62f275c6a44d8a7ff8d6330901400630d
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Fri Sep 25 17:28:47 2020 +0300
[DLAB-1778]: Added localization (#923)
[DLAB-1778] Added localization support
---
.../java/com/epam/dlab/dto/bucket/BucketDTO.java | 2 +-
.../dlab/backendapi/service/BucketService.java | 1 -
.../service/impl/aws/BucketServiceAwsImpl.java | 12 +-
.../service/impl/azure/BucketServiceAzureImpl.java | 5 +-
.../service/impl/gcp/BucketServiceGcpImpl.java | 6 +-
.../src/main/resources/webapp/package-lock.json| 430 ++---
.../src/main/resources/webapp/package.json | 1 +
.../ssn-monitor/ssn-monitor.component.ts | 1 -
.../main/resources/webapp/src/app/app.module.ts| 10 +-
.../pipes/local-currency-pipe}/index.ts| 16 +-
.../local-currency-pipe/local-currency.pipe.ts}| 45 ++-
.../pipes/local-date-pipe}/index.ts| 16 +-
.../core/pipes/local-date-pipe/local-date.pipe.ts} | 24 +-
.../src/app/core/services/localization.service.ts | 56 +++
.../audit/audit-grid/audit-grid.component.html | 2 +-
.../audit/audit-grid/audit-grid.component.ts | 2 +
.../src/app/reports/audit/audit.component.ts | 14 +-
.../webapp/src/app/reports/audit/audit.module.ts | 24 +-
.../reporting-grid/reporting-grid.component.html | 18 +-
.../src/app/reports/reporting/reporting.module.ts | 20 +-
.../bucket-browser/bucket-browser.component.html | 3 +-
.../bucket-browser/bucket-browser.component.ts | 15 +-
.../bucket-browser/bucket-browser.module.ts| 22 +-
.../bucket-browser/bucket-data.service.ts | 61 ++-
.../cluster-details/cluster-details.component.ts | 15 +-
.../cost-details-dialog.component.html | 10 +-
.../exploratory/cost-details-dialog/index.ts | 4 +-
.../detail-dialog/detail-dialog.component.ts | 3 +-
.../resources/scheduler/scheduler.calculations.ts | 8 +
.../resources/scheduler/scheduler.component.html | 8 +-
.../app/resources/scheduler/scheduler.component.ts | 30 +-
.../webapp/src/app/shared/time-picker/index.ts | 3 +-
.../shared/time-picker/time-picker.component.ts| 16 +-
.../main/resources/webapp/src/assets/svg/logo.svg | 3 -
.../src/main/resources/webapp/src/polyfills.ts | 4 +
.../service/impl/BucketServiceImplTest.java| 4 +-
36 files changed, 669 insertions(+), 245 deletions(-)
diff --git
a/services/dlab-model/src/main/java/com/epam/dlab/dto/bucket/BucketDTO.java
b/services/dlab-model/src/main/java/com/epam/dlab/dto/bucket/BucketDTO.java
index 369c866..74e0a8b 100644
--- a/services/dlab-model/src/main/java/com/epam/dlab/dto/bucket/BucketDTO.java
+++ b/services/dlab-model/src/main/java/com/epam/dlab/dto/bucket/BucketDTO.java
@@ -30,5 +30,5 @@ public class BucketDTO {
private final String bucket;
private final String object;
private final String size;
-private final String lastModifiedDate;
+private final long lastModifiedDate;
}
diff --git
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java
index 47b001b..de77e93 100644
---
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java
+++
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/BucketService.java
@@ -27,7 +27,6 @@ import java.io.InputStream;
import java.util.List;
public interface BucketService {
-String DATE_FORMAT = "-MM-dd'T'HH:mm:ss";
List getObjects(String bucket);
diff --git
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/aws/BucketServiceAwsImpl.java
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/aws/BucketServiceAwsImpl.java
index 6c5673d..1657677 100644
---
a/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/aws/BucketServiceAwsImpl.java
+++
b/services/provisioning-service/src/main/java/com/epam/dlab/backendapi/service/impl/aws/BucketServiceAwsImpl.java
@@ -38,8 +38,6 @@ import software.amazon.awssdk.services.s3.model.S3Object;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -141,13 +139,11 @@ public class Bucke
[incubator-dlab] branch DLAB-1778 updated (08f2f60 -> 9414c3b)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-1778 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 08f2f60 [DLAB-2039]: Localization changes add 5e5dac0 [DLAB-1911]: changed variable with azure resource group name used during ssn termination add 7501079 [DLAB-1911]: fixed termination of resource group in case if resource group is predefined add ce213e1 [DLAB-1911]: fixed typo in termination of gcp environment in case if VPC is predefined add 2b9989f Merge pull request #920 from apache/DLAB-1911 add 34a0f0b [DLAB-1101]: Fixed 'Default timezone_offset' is rewritten if switching scheduler types for notebook (#921) add 81cec1d [DLAB-1911]: added "datalab" network tag for new gcp instances so that traffic between them will be allowed by custom security group add 8ca5b37 [DLAB-1911]: made instances on gcp to create with different network tags depending on node type add 6558b76 Merge pull request #922 from apache/DLAB-1911 add 9196dc0 Fixed issue with billing for azure add 9414c3b Merge branch 'develop' into DLAB-1778 No new revisions were added by this update. Summary of changes: infrastructure-provisioning/src/general/lib/gcp/actions_lib.py | 7 ++- .../src/general/scripts/azure/ssn_terminate.py | 6 +++--- .../src/general/scripts/gcp/ssn_terminate_gcp_resources.py | 2 +- .../com/epam/dlab/billing/azure/CalculateBillingServiceImpl.java | 2 ++ .../webapp/src/app/resources/scheduler/scheduler.component.ts | 2 ++ 5 files changed, 14 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 DLAB-1778 updated: [DLAB-2039]: Localization changes
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1778
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1778 by this push:
new 08f2f60 [DLAB-2039]: Localization changes
08f2f60 is described below
commit 08f2f60e6308d4e8674bf6c4f2aafacf8af31ff0
Author: Dmytro_Gnatyshyn
AuthorDate: Fri Sep 25 17:10:45 2020 +0300
[DLAB-2039]: Localization changes
---
.../main/resources/webapp/src/app/app.module.ts| 6 ++---
.../app/core/pipes/local-currency-pipe/index.ts| 2 +-
.../local-currency-pipe/local-currency.pipe.ts | 30 +-
.../core/pipes/local-date-pipe/local-date.pipe.ts | 9 +++
.../src/app/core/services/localization.service.ts | 21 +++
.../audit/audit-grid/audit-grid.component.html | 2 +-
.../audit/audit-grid/audit-grid.component.ts | 2 ++
.../webapp/src/app/reports/audit/audit.module.ts | 4 ++-
.../reporting-grid/reporting-grid.component.html | 4 +--
.../src/app/reports/reporting/reporting.module.ts | 20 ---
.../bucket-browser/bucket-browser.component.html | 2 +-
.../bucket-browser/bucket-browser.module.ts| 22
.../cost-details-dialog.component.html | 8 +++---
.../exploratory/cost-details-dialog/index.ts | 4 ++-
.../webapp/src/app/shared/time-picker/index.ts | 3 ++-
.../shared/time-picker/time-picker.component.ts| 2 +-
16 files changed, 81 insertions(+), 60 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 bc2e14a..a9a9b43 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
@@ -73,9 +73,9 @@
LocalizationService.registerCulture(window.navigator.language);
useClass: HashLocationStrategy,
useValue: '/'
},
-{ provide: LOCALE_ID,
- deps: [LocalizationService],
- useFactory: (localizationService) => localizationService.getLocale() }
+// { provide: LOCALE_ID,
+// deps: [LocalizationService],
+// useFactory: (localizationService) => localizationService.getLocale() }
],
bootstrap: [AppComponent]
})
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/pipes/local-currency-pipe/index.ts
b/services/self-service/src/main/resources/webapp/src/app/core/pipes/local-currency-pipe/index.ts
index d6373bc..43b33ca 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/pipes/local-currency-pipe/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/pipes/local-currency-pipe/index.ts
@@ -27,4 +27,4 @@ import { LocalCurrencyPipe } from './local-currency.pipe';
exports: [LocalCurrencyPipe]
})
-export class KeysPipeModule { }
+export class LocalCurrencyModule { }
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/pipes/local-currency-pipe/local-currency.pipe.ts
b/services/self-service/src/main/resources/webapp/src/app/core/pipes/local-currency-pipe/local-currency.pipe.ts
index 4dde21f..41c2988 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/pipes/local-currency-pipe/local-currency.pipe.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/pipes/local-currency-pipe/local-currency.pipe.ts
@@ -18,15 +18,31 @@
*/
import { Pipe, PipeTransform } from '@angular/core';
+import {formatCurrency, getCurrencySymbol} from '@angular/common';
+import {LocalizationService} from '../../services/localization.service';
-@Pipe({ name: 'keys' })
+@Pipe({ name: 'localcurrency' })
export class LocalCurrencyPipe implements PipeTransform {
- transform(value): any {
-const keys = [];
-for (const key in value) {
- keys.push({ key: key, value: value[key]});
-}
-return keys;
+ constructor(private localizationService: LocalizationService) { }
+ transform(
+value: number,
+currencyCode: string = 'USD',
+display:
+ | 'code'
+ | 'symbol'
+ | 'symbol-narrow'
+ | string
+ | boolean = 'symbol',
+digitsInfo: string = '',
+locale: string = this.localizationService.locale,
+ ): string | null {
+return formatCurrency(
+ value,
+ locale,
+ getCurrencySymbol(currencyCode, 'wide'),
+ currencyCode,
+ digitsInfo,
+);
}
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/pipes/local-date-pipe/local-date.pipe.ts
b/services/self-service/src/main/resources/webapp/src/app/core/pipes/local-date-pipe/local-date.pipe.ts
index 5c623ff..c55953b 100644
---
a/services/self-service/src/mai
[incubator-dlab] branch DLAB-1778 updated: [DLAB-2039]: Fix 'en-Us' key
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1778
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1778 by this push:
new b86329f [DLAB-2039]: Fix 'en-Us' key
b86329f is described below
commit b86329ffd1417322239069316e36884625dab782
Author: Dmytro_Gnatyshyn
AuthorDate: Fri Sep 25 14:44:03 2020 +0300
[DLAB-2039]: Fix 'en-Us' key
---
.../resources/webapp/src/app/core/services/localization.service.ts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/services/localization.service.ts
b/services/self-service/src/main/resources/webapp/src/app/core/services/localization.service.ts
index fc4aca2..dc86448 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/services/localization.service.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/services/localization.service.ts
@@ -43,9 +43,8 @@ export class LocalizationService {
public static registerCulture(culture: string) {
console.log(culture);
-if (culture === 'uk-UA') {
+if (culture === 'uk-UA' || culture === 'en-US') {
culture = culture.substr(0, culture.indexOf('-'));
- console.log('inside', culture);
}
/* webpackInclude: /(uk|sv)\.js$/ */
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1778 updated: [DLAB-2039]: Updated package.json
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1778
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1778 by this push:
new 4a3e19a [DLAB-2039]: Updated package.json
4a3e19a is described below
commit 4a3e19ae4fdce239ae5ff4fd1bb663b7b741b0c9
Author: Dmytro_Gnatyshyn
AuthorDate: Fri Sep 25 14:09:13 2020 +0300
[DLAB-2039]: Updated package.json
---
.../src/main/resources/webapp/package-lock.json| 430 ++---
.../src/main/resources/webapp/package.json | 1 +
2 files changed, 370 insertions(+), 61 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/package-lock.json
b/services/self-service/src/main/resources/webapp/package-lock.json
index f8cfcc8..78dee68 100644
--- a/services/self-service/src/main/resources/webapp/package-lock.json
+++ b/services/self-service/src/main/resources/webapp/package-lock.json
@@ -642,6 +642,335 @@
"tslib": "^1.9.0"
}
},
+"@angular/localize": {
+ "version": "9.1.12",
+ "resolved":
"https://registry.npmjs.org/@angular/localize/-/localize-9.1.12.tgz";,
+ "integrity":
"sha512-31OalfES+dLrxN0VXCxxtT5dWoOSlQ40KYmzMS8X+mQ20gy9eFiZK4qf3DEq3JPqRltBMdEDnwR38uGIMAu2gQ==",
+ "requires": {
+"@babel/core": "7.8.3",
+"glob": "7.1.2",
+"yargs": "15.3.0"
+ },
+ "dependencies": {
+"@babel/code-frame": {
+ "version": "7.10.4",
+ "resolved":
"https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz";,
+ "integrity":
"sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+ "requires": {
+"@babel/highlight": "^7.10.4"
+ }
+},
+"@babel/core": {
+ "version": "7.8.3",
+ "resolved":
"https://registry.npmjs.org/@babel/core/-/core-7.8.3.tgz";,
+ "integrity":
"sha512-4XFkf8AwyrEG7Ziu3L2L0Cv+WyY47Tcsp70JFmpftbAA1K7YL/sgE9jh9HyNj08Y/U50ItUchpN0w6HxAoX1rA==",
+ "requires": {
+"@babel/code-frame": "^7.8.3",
+"@babel/generator": "^7.8.3",
+"@babel/helpers": "^7.8.3",
+"@babel/parser": "^7.8.3",
+"@babel/template": "^7.8.3",
+"@babel/traverse": "^7.8.3",
+"@babel/types": "^7.8.3",
+"convert-source-map": "^1.7.0",
+"debug": "^4.1.0",
+"gensync": "^1.0.0-beta.1",
+"json5": "^2.1.0",
+"lodash": "^4.17.13",
+"resolve": "^1.3.2",
+"semver": "^5.4.1",
+"source-map": "^0.5.0"
+ }
+},
+"@babel/generator": {
+ "version": "7.11.6",
+ "resolved":
"https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz";,
+ "integrity":
"sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+ "requires": {
+"@babel/types": "^7.11.5",
+"jsesc": "^2.5.1",
+"source-map": "^0.5.0"
+ }
+},
+"@babel/helper-function-name": {
+ "version": "7.10.4",
+ "resolved":
"https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz";,
+ "integrity":
"sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==",
+ "requires": {
+"@babel/helper-get-function-arity": "^7.10.4",
+"@babel/template": "^7.10.4",
+"@babel/types": "^7.10.4"
+ }
+},
+"@babel/helper-get-function-arity": {
+ "version": "7.10.4",
+ "resolved":
"https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz";,
+ "integrity":
"sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr
[incubator-dlab] branch develop updated: [DLAB-1101]: Fixed 'Default timezone_offset' is rewritten if switching scheduler types for notebook (#921)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 34a0f0b [DLAB-1101]: Fixed 'Default timezone_offset' is rewritten if
switching scheduler types for notebook (#921)
34a0f0b is described below
commit 34a0f0bceaaf525d9196cddeaf13cf3526f45d28
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Thu Sep 24 15:39:17 2020 +0300
[DLAB-1101]: Fixed 'Default timezone_offset' is rewritten if switching
scheduler types for notebook (#921)
[DLAB-1101]: Fixed 'Default timezone_offset' is rewritten if switching
scheduler types for notebook
---
.../webapp/src/app/resources/scheduler/scheduler.component.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
index c923677..845b9ad 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
@@ -148,6 +148,7 @@ export class SchedulerComponent implements OnInit {
}
public toggleSchedule($event) {
+console.log(this.tzOffset);
this.enableSchedule = $event.checked;
this.timeReqiered = false;
this.allowInheritView = this.destination.type === 'СOMPUTATIONAL' ||
this.checkIsActiveSpark();
@@ -280,11 +281,10 @@ export class SchedulerComponent implements OnInit {
params.start_days_repeat.filter(key =>
(this.selectedStartWeekDays[key.toLowerCase()] = true));
params.stop_days_repeat.filter(key =>
(this.selectedStopWeekDays[key.toLowerCase()] = true));
this.inherit = params.sync_start_required;
- this.tzOffset = params.timezone_offset;
+ this.tzOffset = params.timezone_offset ? params.timezone_offset :
this.tzOffset;
this.startTime = params.start_time ?
SchedulerCalculations.convertTimeFormat(params.start_time) : null;
this.endTime = params.end_time ?
SchedulerCalculations.convertTimeFormat(params.end_time) : null;
this.formInit(params.begin_date, params.finish_date,
params.terminate_datetime);
- console.log();
this.schedulerForm.controls.inactivityTime.setValue(params.max_inactivity ||
this.inactivityLimits.min);
this.enableIdleTime = params.check_inactivity_required;
this.considerInactivity = params.consider_inactivity || false;
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1101]: Fixed 'Default timezone_offset' is rewritten if switching scheduler types for notebook
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1101
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 929c8877c1c338e47c92178ed72a89c1764aadfc
Author: Dmytro_Gnatyshyn
AuthorDate: Thu Sep 24 15:36:17 2020 +0300
[DLAB-1101]: Fixed 'Default timezone_offset' is rewritten if switching
scheduler types for notebook
---
.../webapp/src/app/resources/scheduler/scheduler.component.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
index c923677..845b9ad 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.component.ts
@@ -148,6 +148,7 @@ export class SchedulerComponent implements OnInit {
}
public toggleSchedule($event) {
+console.log(this.tzOffset);
this.enableSchedule = $event.checked;
this.timeReqiered = false;
this.allowInheritView = this.destination.type === 'СOMPUTATIONAL' ||
this.checkIsActiveSpark();
@@ -280,11 +281,10 @@ export class SchedulerComponent implements OnInit {
params.start_days_repeat.filter(key =>
(this.selectedStartWeekDays[key.toLowerCase()] = true));
params.stop_days_repeat.filter(key =>
(this.selectedStopWeekDays[key.toLowerCase()] = true));
this.inherit = params.sync_start_required;
- this.tzOffset = params.timezone_offset;
+ this.tzOffset = params.timezone_offset ? params.timezone_offset :
this.tzOffset;
this.startTime = params.start_time ?
SchedulerCalculations.convertTimeFormat(params.start_time) : null;
this.endTime = params.end_time ?
SchedulerCalculations.convertTimeFormat(params.end_time) : null;
this.formInit(params.begin_date, params.finish_date,
params.terminate_datetime);
- console.log();
this.schedulerForm.controls.inactivityTime.setValue(params.max_inactivity ||
this.inactivityLimits.min);
this.enableIdleTime = params.check_inactivity_required;
this.considerInactivity = params.consider_inactivity || false;
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1101 created (now 929c887)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-1101 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 929c887 [DLAB-1101]: Fixed 'Default timezone_offset' is rewritten if switching scheduler types for notebook This branch includes the following new commits: new 929c887 [DLAB-1101]: Fixed 'Default timezone_offset' is rewritten if switching scheduler types for notebook 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 DLAB-1778 updated: [DLAB-1778]: Fixed date on detail popups
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1778
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1778 by this push:
new 8585dd9 [DLAB-1778]: Fixed date on detail popups
8585dd9 is described below
commit 8585dd972889265aad43ed498a9828e5e7c1255b
Author: Dmytro_Gnatyshyn
AuthorDate: Thu Sep 24 14:10:39 2020 +0300
[DLAB-1778]: Fixed date on detail popups
---
.../webapp/src/app/core/services/localization.service.ts | 4 +++-
.../cluster-details/cluster-details.component.ts | 15 ---
.../exploratory/detail-dialog/detail-dialog.component.ts | 3 ++-
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/services/localization.service.ts
b/services/self-service/src/main/resources/webapp/src/app/core/services/localization.service.ts
index ca4cafd..fc4aca2 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/services/localization.service.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/services/localization.service.ts
@@ -42,8 +42,10 @@ export class LocalizationService {
}
public static registerCulture(culture: string) {
-if (culture.indexOf('-') !== -1) {
+console.log(culture);
+if (culture === 'uk-UA') {
culture = culture.substr(0, culture.indexOf('-'));
+ console.log('inside', culture);
}
/* webpackInclude: /(uk|sv)\.js$/ */
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
index e2892b5..da84112 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
@@ -71,7 +71,8 @@ export class DetailComputationalResourcesComponent implements
OnInit {
this.upTimeInHours = (this.resource.up_time) ?
DateUtils.diffBetweenDatesInHours(this.resource.up_time) : 0;
-this.upTimeSince = (this.resource.up_time) ? new
Date(this.resource.up_time).toString() : '';
+this.upTimeSince = (this.resource.up_time) ?
+ new Date(this.resource.up_time).toString().substr(0, new
Date(this.resource.up_time).toString().indexOf('(')) : '';
this.initFormModel();
if (this.resource.image === 'docker.dlab-dataengine')
this.getClusterConfiguration();
@@ -101,7 +102,13 @@ export class DetailComputationalResourcesComponent
implements OnInit {
public editClusterConfiguration(data): void {
this.dataengineConfigurationService
- .editClusterConfiguration(data.configuration_parameters,
this.environment.project, this.environment.name,
this.resource.computational_name, this.PROVIDER)
+ .editClusterConfiguration(
+data.configuration_parameters,
+this.environment.project,
+this.environment.name,
+this.resource.computational_name,
+this.PROVIDER
+ )
.subscribe(result => {
this.dialogRef.close();
},
@@ -129,7 +136,9 @@ export class DetailComputationalResourcesComponent
implements OnInit {
clusterType: resource.dataEngineType === 'dataengine-service' ? 'Hadoop'
: 'Master'
};
-this.auditService.sendDataToAudit({resource_name:
resource.computational_name, info: JSON.stringify(clusterInfo), type:
'COMPUTE'}).subscribe();
+this.auditService.sendDataToAudit(
+ {resource_name: resource.computational_name, info:
JSON.stringify(clusterInfo), type: 'COMPUTE'}
+ ).subscribe();
}
copyBucketName(url: string) {
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
index a3f55ff..22c4bfa 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
@@ -73,7 +73,8 @@ export class DetailDialogComponent implements OnInit {
this.tooltip = false;
this.upTimeInHours = (this.notebook.time) ?
DateUtils.diffBetweenDatesInHours(this.notebook.time) : 0;
- this.upTimeSince = (this.notebook.time) ? new
Date(this.notebook.time).toString() : '';
+ this.upTimeSince = (this.notebook.time) ?
+
[incubator-dlab] branch DLAB-1778 created (now 0ce159e)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-1778 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 0ce159e Merge localization backend This branch includes the following new commits: new 47db7c7 [DLAB-1778]: Implemented localization new 0ce159e Merge localization backend 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-1778]: Implemented localization
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1778
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 47db7c787bccfdc2a2446b1179713e97a1e6a46b
Author: Dmytro_Gnatyshyn
AuthorDate: Wed Sep 23 21:58:06 2020 +0300
[DLAB-1778]: Implemented localization
---
.../ssn-monitor/ssn-monitor.component.ts | 1 -
.../main/resources/webapp/src/app/app.module.ts| 10 +++-
.../pipes/local-currency-pipe/index.ts}| 31 ---
.../local-currency-pipe/local-currency.pipe.ts}| 27 +++---
.../pipes/local-date-pipe/index.ts}| 31 ---
.../pipes/local-date-pipe/local-date.pipe.ts} | 32 +---
.../src/app/core/services/localization.service.ts | 58
.../audit/audit-grid/audit-grid.component.html | 2 +-
.../src/app/reports/audit/audit.component.ts | 14 +
.../webapp/src/app/reports/audit/audit.module.ts | 22
.../reporting-grid/reporting-grid.component.html | 18 +--
.../bucket-browser/bucket-browser.component.html | 3 +-
.../bucket-browser/bucket-browser.component.ts | 15 ++
.../bucket-browser/bucket-data.service.ts | 61 +++---
.../cost-details-dialog.component.html | 10 ++--
.../resources/scheduler/scheduler.calculations.ts | 8 +++
.../resources/scheduler/scheduler.component.html | 8 +--
.../app/resources/scheduler/scheduler.component.ts | 32
.../shared/time-picker/time-picker.component.ts| 16 +++---
.../main/resources/webapp/src/assets/svg/logo.svg | 3 --
.../src/main/resources/webapp/src/polyfills.ts | 4 ++
21 files changed, 234 insertions(+), 172 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts
index 2791353..b371013 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/ssn-monitor/ssn-monitor.component.ts
@@ -20,7 +20,6 @@
import { Component, OnInit, ViewEncapsulation } from '@angular/core';
import { MatDialogRef } from '@angular/material/dialog';
import { ToastrService } from 'ngx-toastr';
-
import { DICTIONARY } from '../../../../dictionary/global.dictionary';
import { HealthStatusService } from '../../../core/services';
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 91ec87d..bc2e14a 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
@@ -17,7 +17,7 @@
* under the License.
*/
-import { NgModule } from '@angular/core';
+import {LOCALE_ID, NgModule} from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { RouterModule } from '@angular/router';
import { LocationStrategy, HashLocationStrategy } from '@angular/common';
@@ -40,7 +40,9 @@ import { WebterminalModule } from './webterminal';
import { CoreModule } from './core/core.module';
import { SwaggerAPIModule } from './swagger';
import {ReportsModule} from './reports/reports.module';
+import {LocalizationService} from './core/services/localization.service';
+LocalizationService.registerCulture(window.navigator.language);
@NgModule({
declarations: [AppComponent],
@@ -70,7 +72,11 @@ import {ReportsModule} from './reports/reports.module';
provide: LocationStrategy,
useClass: HashLocationStrategy,
useValue: '/'
- }],
+ },
+{ provide: LOCALE_ID,
+ deps: [LocalizationService],
+ useFactory: (localizationService) => localizationService.getLocale() }
+ ],
bootstrap: [AppComponent]
})
export class AppModule { }
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.calculations.ts
b/services/self-service/src/main/resources/webapp/src/app/core/pipes/local-currency-pipe/index.ts
similarity index 52%
copy from
services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.calculations.ts
copy to
services/self-service/src/main/resources/webapp/src/app/core/pipes/local-currency-pipe/index.ts
index 1174e74..d6373bc 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/scheduler.calculations.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/pipes/local-currency-pipe/index.ts
@@ -
[incubator-dlab] 02/02: Merge localization backend
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1778 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 0ce159e13be8a23831f8565b90643f1968a13784 Merge: 47db7c7 457de16 Author: Dmytro_Gnatyshyn AuthorDate: Wed Sep 23 22:02:31 2020 +0300 Merge localization backend CONTRIBUTING.md | 2 +- .../src/main/java/com/epam/dlab/dto/bucket/BucketDTO.java| 2 +- .../java/com/epam/dlab/backendapi/service/BucketService.java | 1 - .../backendapi/service/impl/aws/BucketServiceAwsImpl.java| 12 .../service/impl/azure/BucketServiceAzureImpl.java | 5 ++--- .../backendapi/service/impl/gcp/BucketServiceGcpImpl.java| 6 +- .../epam/dlab/backendapi/resources/dto/UserResourceInfo.java | 2 ++ .../dlab/backendapi/service/impl/EnvironmentServiceImpl.java | 2 ++ .../backendapi/service/impl/SchedulerJobServiceImpl.java | 11 ++- .../cluster-details/cluster-details.component.html | 2 +- .../dlab/backendapi/service/impl/BucketServiceImplTest.java | 4 +++- .../backendapi/service/impl/EnvironmentServiceImplTest.java | 10 ++ 12 files changed, 29 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 develop updated: [DLAB-2044]: Style fix in compute popup (#919)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 53814f9 [DLAB-2044]: Style fix in compute popup (#919)
53814f9 is described below
commit 53814f9112ae85690718ceab75559d58fb5c0f67
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Thu Sep 17 11:51:16 2020 +0300
[DLAB-2044]: Style fix in compute popup (#919)
[DLAB-2044]: Style fix in compute popup
---
.../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 9c3b10e..e69b908 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
@@ -55,7 +55,7 @@
Cluster alias:
-
+
{{resource.computational_name}}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-2044]: Style fix for compute popup
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2044
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f324b845e48c15767cf0fe99bf1c7c6661cfc166
Author: Dmytro_Gnatyshyn
AuthorDate: Thu Sep 17 11:46:30 2020 +0300
[DLAB-2044]: Style fix for compute popup
---
.../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 9c3b10e..e69b908 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
@@ -55,7 +55,7 @@
Cluster alias:
-
+
{{resource.computational_name}}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/02: Merge branch 'develop' of github.com:apache/incubator-dlab into develop
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2044 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit cea86df3fca1968269762f77bbec17fcbf910c40 Merge: 605050e ef4a26a Author: Dmytro_Gnatyshyn AuthorDate: Thu Sep 17 11:28:20 2020 +0300 Merge branch 'develop' of github.com:apache/incubator-dlab into develop .../notification-dialog.component.ts | 27 +++--- .../src/app/shared/navbar/navbar.component.ts | 9 .../webapp/src/assets/styles/_general.scss | 1 + 3 files changed, 24 insertions(+), 13 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2044 created (now f324b84)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2044 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at f324b84 [DLAB-2044]: Style fix for compute popup This branch includes the following new commits: new cea86df Merge branch 'develop' of github.com:apache/incubator-dlab into develop new f324b84 [DLAB-2044]: Style fix for compute popup 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: [DLAB-2043]: Changed message for scheduler reminder (#918)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 ef4a26a [DLAB-2043]: Changed message for scheduler reminder (#918)
ef4a26a is described below
commit ef4a26a4d9702595bbfffb91832532ea088608bb
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Thu Sep 17 11:27:54 2020 +0300
[DLAB-2043]: Changed message for scheduler reminder (#918)
[DLAB-2043]: Changed message for scheduler reminder
---
.../notification-dialog.component.ts | 27 +++---
.../src/app/shared/navbar/navbar.component.ts | 9
.../webapp/src/assets/styles/_general.scss | 1 +
3 files changed, 24 insertions(+), 13 deletions(-)
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 f7c81ac..f46360e 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
@@ -36,25 +36,25 @@ import {Endpoint} from
'../../../administration/project/project.component';
{{ data.item.action.project_name
}} will be terminated.
-
-
- Following notebook servers
-{{
item.exploratory_name}} in project
+
+ Following notebook servers
+{{i === 0 ? '' : ', '}} {{ notebook }} in
project {{ item.project }}
,
will be stopped and all computational resources
will be stopped/terminated
-
-
- Computational resources
- {{ item.computational_name
}} for {{ item.exploratory_name
}} in project {{ item.project }}
+
+
+ Computational resources {{i === 0 ? '' : ', '}}{{ item.computational_name }} for {{ item.exploratory_name
}} in project {{ item.project }}
+
will be stopped
- by a schedule in less than 15
minutes.
+ by a schedule in less than
15 minutes.
@@ -79,7 +79,7 @@ import {Endpoint} from
'../../../administration/project/project.component';
Resource
Project
-
+
Edge node
@@ -104,7 +104,7 @@ import {Endpoint} from
'../../../administration/project/project.component';
Edge node in endpoint
Further status
-
+
{{endpoint.name}}
Terminated
@@ -172,6 +172,7 @@ import {Endpoint} from
'../../../administration/project/project.component';
.bottom-message{padding-top: 15px;}
.table-header{padding-bottom: 10px;}
.alert{text-align: left; line-height: 22px; padding-bottom:
25px;padding-top: 15px;}
+.quota-message{padding-top: 10px}
`]
})
export class NotificationDialogComponent {
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
index dc1a05d..55df3a2 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
@@ -230,6 +230,15 @@ export class NavbarComponent implements OnInit, OnDestroy {
const memo = { notebook: [], cluster: [] };
sheduler_data.map(item => !item.computational_name ?
memo.notebook.push(item) : memo.cluster.push(item));
memo.cluster = memo.cluster.filter(el => !memo.notebook.some(elm =>
el.exploratory_name === elm.exploratory_name));
+memo.notebook = memo.notebook.reduce((acc, v) => {
+ const existedProject = acc.find(el => el.project === v.project);
[incubator-dlab] branch DLAB-2043 created (now 43ff2ea)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2043 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 43ff2ea [DLAB-2043]: Changed message for scheduler reminder This branch includes the following new commits: new 605050e Merge branch 'develop' of github.com:apache/incubator-dlab into develop new 43ff2ea [DLAB-2043]: Changed message for scheduler reminder 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: Merge branch 'develop' of github.com:apache/incubator-dlab into develop
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2043 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 605050e37274b575f8bfaa4540d09899ef761c35 Merge: 85c3c59 23c9230 Author: Dmytro_Gnatyshyn AuthorDate: Wed Sep 16 14:54:36 2020 +0300 Merge branch 'develop' of github.com:apache/incubator-dlab into develop .../install-libraries.component.html | 9 +-- .../install-libraries.component.scss | 74 +++--- .../install-libraries.component.ts | 3 + 3 files changed, 59 insertions(+), 27 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-2043]: Changed message for scheduler reminder
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2043
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 43ff2eae0da850fb665ab3647714603430ebc72f
Author: Dmytro_Gnatyshyn
AuthorDate: Thu Sep 17 11:23:31 2020 +0300
[DLAB-2043]: Changed message for scheduler reminder
---
.../notification-dialog.component.ts | 27 +++---
.../src/app/shared/navbar/navbar.component.ts | 9
.../webapp/src/assets/styles/_general.scss | 1 +
3 files changed, 24 insertions(+), 13 deletions(-)
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 f7c81ac..f46360e 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
@@ -36,25 +36,25 @@ import {Endpoint} from
'../../../administration/project/project.component';
{{ data.item.action.project_name
}} will be terminated.
-
-
- Following notebook servers
-{{
item.exploratory_name}} in project
+
+ Following notebook servers
+{{i === 0 ? '' : ', '}} {{ notebook }} in
project {{ item.project }}
,
will be stopped and all computational resources
will be stopped/terminated
-
-
- Computational resources
- {{ item.computational_name
}} for {{ item.exploratory_name
}} in project {{ item.project }}
+
+
+ Computational resources {{i === 0 ? '' : ', '}}{{ item.computational_name }} for {{ item.exploratory_name
}} in project {{ item.project }}
+
will be stopped
- by a schedule in less than 15
minutes.
+ by a schedule in less than
15 minutes.
@@ -79,7 +79,7 @@ import {Endpoint} from
'../../../administration/project/project.component';
Resource
Project
-
+
Edge node
@@ -104,7 +104,7 @@ import {Endpoint} from
'../../../administration/project/project.component';
Edge node in endpoint
Further status
-
+
{{endpoint.name}}
Terminated
@@ -172,6 +172,7 @@ import {Endpoint} from
'../../../administration/project/project.component';
.bottom-message{padding-top: 15px;}
.table-header{padding-bottom: 10px;}
.alert{text-align: left; line-height: 22px; padding-bottom:
25px;padding-top: 15px;}
+.quota-message{padding-top: 10px}
`]
})
export class NotificationDialogComponent {
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
index dc1a05d..55df3a2 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
@@ -230,6 +230,15 @@ export class NavbarComponent implements OnInit, OnDestroy {
const memo = { notebook: [], cluster: [] };
sheduler_data.map(item => !item.computational_name ?
memo.notebook.push(item) : memo.cluster.push(item));
memo.cluster = memo.cluster.filter(el => !memo.notebook.some(elm =>
el.exploratory_name === elm.exploratory_name));
+memo.notebook = memo.notebook.reduce((acc, v) => {
+ const existedProject = acc.find(el => el.project === v.project);
+ if (existedProject) {
+existedProject.notebook.push(v.exploratory_name);
+ } else {
+acc.push({project: v.project, notebook: [v.exploratory_name]});
+ }
+ return acc;
+}, []);
return memo;
}
diff --git
a/services/self-service/src/mai
[incubator-dlab] branch develop updated: [DLAB-2055]: Fixed errors on library popup (#916)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 23c9230 [DLAB-2055]: Fixed errors on library popup (#916)
23c9230 is described below
commit 23c92307f24bc61bfcceee12d860032948d7638f
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Wed Sep 16 14:51:31 2020 +0300
[DLAB-2055]: Fixed errors on library popup (#916)
[DLAB-2055]: Fixed errors on library popup
---
.../exploratory/install-libraries/install-libraries.component.ts | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
index 7c9dec1..f47a6c3 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
@@ -426,6 +426,9 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
}
private getMatchedLibs() {
+if (this.lib.name.length < 2) {
+ return;
+}
this.model.getLibrariesList(this.group, this.lib.name.toLowerCase())
.pipe(
takeUntil(this.unsubscribe$)
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2047 updated (404be0d -> de91462)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2047 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 404be0d [DLAB-2047]: Made fixed size for library management popup add de91462 [DLAB-2055]: Fixed errors on library popup No new revisions were added by this update. Summary of changes: .../exploratory/install-libraries/install-libraries.component.ts | 3 +++ 1 file changed, 3 insertions(+) - 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-2047]: Made fixed size for library management popup (#915)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 feb89f1 [DLAB-2047]: Made fixed size for library management popup
(#915)
feb89f1 is described below
commit feb89f15144884f07680def1d2b725645d484206
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Wed Sep 16 12:53:04 2020 +0300
[DLAB-2047]: Made fixed size for library management popup (#915)
[DLAB-2047]: Made fixed size for library management popup
---
.../install-libraries.component.html | 9 +--
.../install-libraries.component.scss | 74 +++---
2 files changed, 56 insertions(+), 27 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
index a1b8e7e..0ac1432 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
@@ -206,7 +206,7 @@
-
+
Name
@@ -361,13 +361,14 @@
-
-No matches found
-
+
You have no libraries installed
+
+ No matches found
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
index 3403fe1..3c60199 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
@@ -30,7 +30,7 @@
flex: initial;
justify-content: center;
flex-direction: initial;
- margin-bottom: 25px;
+ margin-bottom: 10px;
bottom: 30px;
left: 0;
right: 0;
@@ -72,7 +72,7 @@
.install-libraries {
height: 100%;
- padding-bottom: 130px;
+ padding-bottom: 110px;
.dialog-header {
padding-left: 25px;
@@ -349,7 +349,7 @@ mat-chip.mat-chip:not(.mat-basic-chip) {
}
.libs-info {
- padding: 0 20px;
+ padding: 0 25px;
display: flex;
flex: 1 1 auto;
min-height: 0;
@@ -369,16 +369,32 @@ mat-chip.mat-chip:not(.mat-basic-chip) {
}
}
-
.mat-list {
width: 100%;
+overflow-y: auto;
+overflow-x: overlay;
+position: relative;
+height: 350px;
+padding-top: 0;
+margin-top: 8px;
+
+.list-header{
+ line-height: 40px;
+ position: sticky;
+ top: 0;
+ z-index: 99;
+ background-color: #fff;
+}
-.scrollingList {
- max-height: 300px;
- height: 80%;
- overflow-y: auto;
- overflow-x: overlay;
+.filter-row{
+ position: sticky;
+ top: 56px;
+ z-index: 99;
+ background-color: #fff;
+}
+
+.scrollingList {
.info {
p {
text-align: center;
@@ -600,28 +616,40 @@ mat-chip.mat-chip:not(.mat-basic-chip) {
}
}
- @media screen and (min-width: 1281px) {
+@media screen and (max-height: 840px) {
.libs-info {
-height: 60%;
-
.mat-list {
- .scrollingList {
-max-height: 300px;
-height: 80%;
- }
+ height: 250px;
+
}
}
}
-@media screen and (max-height: 800px) {
- .libs-info {
-height: 50%;
+ @media screen and (max-height: 720px) {
+.libs-info {
+ .mat-list {
+height: 200px;
+ }
+}
+ }
+
+@media screen and (max-height: 640px) {
+
+ .aligner>div.actions {
+margin-bottom: 0;
+ }
+ .install-libraries {
+padding-bottom: 90px;
+ }
+
+ .libs-info {
.mat-list {
- .scrollingList {
-max-height: 140px;
-height: 60%;
- }
+ height: 160px;
}
}
+
+ .message {
+padding: 10px 20px;
+ }
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/03: Merge remote-tracking branch 'origin/develop' into develop
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2047 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 85c3c59231584771c801218bffb2b539b63395e6 Merge: 459066c d9f8d49 Author: Dmytro_Gnatyshyn AuthorDate: Tue Sep 15 17:26:34 2020 +0300 Merge remote-tracking branch 'origin/develop' into develop .../src/general/lib/os/debian/notebook_lib.py | 14 +++--- 1 file changed, 7 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 DLAB-2047 created (now 404be0d)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2047 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 404be0d [DLAB-2047]: Made fixed size for library management popup This branch includes the following new commits: new 85c3c59 Merge remote-tracking branch 'origin/develop' into develop new 4adad68 [DLAB-2047]: Made fixed size for library management popup new 404be0d [DLAB-2047]: Made fixed size for library management popup The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 03/03: [DLAB-2047]: Made fixed size for library management popup
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2047
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 404be0d3e6b6195cfb9087efbc0a5f3b36d4bd95
Author: Dmytro_Gnatyshyn
AuthorDate: Wed Sep 16 12:44:22 2020 +0300
[DLAB-2047]: Made fixed size for library management popup
---
.../install-libraries.component.html | 7 +--
.../install-libraries.component.scss | 55 +-
2 files changed, 36 insertions(+), 26 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
index fcf8bcd..0ac1432 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
@@ -361,13 +361,14 @@
-
-No matches found
-
+
You have no libraries installed
+
+ No matches found
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
index c93e5fb..3c60199 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
@@ -30,7 +30,7 @@
flex: initial;
justify-content: center;
flex-direction: initial;
- margin-bottom: 25px;
+ margin-bottom: 10px;
bottom: 30px;
left: 0;
right: 0;
@@ -72,7 +72,7 @@
.install-libraries {
height: 100%;
- padding-bottom: 130px;
+ padding-bottom: 110px;
.dialog-header {
padding-left: 25px;
@@ -349,7 +349,7 @@ mat-chip.mat-chip:not(.mat-basic-chip) {
}
.libs-info {
- padding: 0 20px;
+ padding: 0 25px;
display: flex;
flex: 1 1 auto;
min-height: 0;
@@ -369,13 +369,14 @@ mat-chip.mat-chip:not(.mat-basic-chip) {
}
}
-
.mat-list {
width: 100%;
overflow-y: auto;
overflow-x: overlay;
position: relative;
-max-height: 350px;
+height: 350px;
+padding-top: 0;
+margin-top: 8px;
.list-header{
line-height: 40px;
@@ -394,10 +395,6 @@ mat-chip.mat-chip:not(.mat-basic-chip) {
.scrollingList {
- //max-height: 300px;
- //height: 80%;
-
-
.info {
p {
text-align: center;
@@ -619,28 +616,40 @@ mat-chip.mat-chip:not(.mat-basic-chip) {
}
}
- @media screen and (min-width: 1281px) {
+@media screen and (max-height: 840px) {
.libs-info {
-height: 60%;
-
.mat-list {
- .scrollingList {
-max-height: 300px;
-height: 80%;
- }
+ height: 250px;
+
}
}
}
-@media screen and (max-height: 800px) {
- .libs-info {
-height: 50%;
+ @media screen and (max-height: 720px) {
+.libs-info {
+ .mat-list {
+height: 200px;
+ }
+}
+ }
+@media screen and (max-height: 640px) {
+
+ .aligner>div.actions {
+margin-bottom: 0;
+ }
+
+ .install-libraries {
+padding-bottom: 90px;
+ }
+
+ .libs-info {
.mat-list {
- .scrollingList {
-max-height: 140px;
-height: 60%;
- }
+ height: 160px;
}
}
+
+ .message {
+padding: 10px 20px;
+ }
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/03: [DLAB-2047]: Made fixed size for library management popup
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2047
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 4adad68e185af26e05e9e29984a271b15a0947a6
Author: Dmytro_Gnatyshyn
AuthorDate: Wed Sep 16 09:28:33 2020 +0300
[DLAB-2047]: Made fixed size for library management popup
---
.../install-libraries.component.html | 2 +-
.../install-libraries.component.scss | 27 ++
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
index a1b8e7e..fcf8bcd 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
@@ -206,7 +206,7 @@
-
+
Name
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
index 3403fe1..c93e5fb 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
@@ -372,12 +372,31 @@ mat-chip.mat-chip:not(.mat-basic-chip) {
.mat-list {
width: 100%;
+overflow-y: auto;
+overflow-x: overlay;
+position: relative;
+max-height: 350px;
+
+.list-header{
+ line-height: 40px;
+ position: sticky;
+ top: 0;
+ z-index: 99;
+ background-color: #fff;
+}
+
+.filter-row{
+ position: sticky;
+ top: 56px;
+ z-index: 99;
+ background-color: #fff;
+}
+
.scrollingList {
- max-height: 300px;
- height: 80%;
- overflow-y: auto;
- overflow-x: overlay;
+ //max-height: 300px;
+ //height: 80%;
+
.info {
p {
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated (aae9674 -> fb9382a)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from aae9674 [DLAB-2049]: Fixed clicking the same sort icon should not change value position in grid (#910) add fb9382a [DLAB-2048]: Fixed billing details on list of resources (#912) No new revisions were added by this update. Summary of changes: .../cost-details-dialog/cost-details-dialog.component.scss | 14 +++--- 1 file changed, 11 insertions(+), 3 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2048 created (now 459066c)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2048 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 459066c [DLAB-2050]: Fixed billing details on list of resources This branch includes the following new commits: new 6329348 Merge remote-tracking branch 'origin/develop' into develop new 459066c [DLAB-2050]: Fixed billing details on list of resources 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: Merge remote-tracking branch 'origin/develop' into develop
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2048 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 63293485113cafb39c0ac6b3a7a243781ac04ea4 Merge: e1eb9a7 aae9674 Author: Dmytro_Gnatyshyn AuthorDate: Tue Sep 15 13:51:05 2020 +0300 Merge remote-tracking branch 'origin/develop' into develop CONTRIBUTING.md| 2 +- .../src/general/conf/dlab.ini | 2 +- .../src/general/files/aws/rstudio_description.json | 2 +- .../general/files/azure/rstudio_description.json | 2 +- .../src/general/files/gcp/rstudio_description.json | 2 +- .../dlab/backendapi/domain/NotebookTemplate.java | 2 +- .../dlab/backendapi/service/TagServiceImpl.java| 3 +- .../management-grid/management-grid.component.html | 2 +- .../management-grid/management-grid.component.scss | 19 -- .../reporting-grid/reporting-grid.component.ts | 7 +++ .../backendapi/service/TagServiceImplTest.java | 70 ++ 11 files changed, 99 insertions(+), 14 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-2050]: Fixed billing details on list of resources
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2048
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 459066c1b691d83926786605a1805e447da1
Author: Dmytro_Gnatyshyn
AuthorDate: Tue Sep 15 17:14:05 2020 +0300
[DLAB-2050]: Fixed billing details on list of resources
---
.../cost-details-dialog/cost-details-dialog.component.scss | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss
index a9d081a..ea0c2b4 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss
@@ -32,24 +32,32 @@
.billing-detail {
.service {
-width: 30%;
+width: 35%;
}
.resource-type,
.cost-currency {
-width: 10%;
+width: 11%;
}
.resource-name,
.usage-date-start,
.usage-date-end {
-width: 20%;
overflow: hidden;
text-overflow: ellipsis;
padding-right: 10px;
white-space: nowrap;
}
+ .resource-name{
+width: 20%;
+ }
+
+ .usage-date-start,
+ .usage-date-end{
+width: 17%;
+ }
+
.wide-name-field {
width: 25%;
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2048 created (now 459066c)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2048 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 459066c [DLAB-2050]: Fixed billing details on list of resources This branch includes the following new commits: new 6329348 Merge remote-tracking branch 'origin/develop' into develop new 459066c [DLAB-2050]: Fixed billing details on list of resources 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-2050]: Fixed billing details on list of resources
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2048
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 459066c1b691d83926786605a1805e447da1
Author: Dmytro_Gnatyshyn
AuthorDate: Tue Sep 15 17:14:05 2020 +0300
[DLAB-2050]: Fixed billing details on list of resources
---
.../cost-details-dialog/cost-details-dialog.component.scss | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss
index a9d081a..ea0c2b4 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss
@@ -32,24 +32,32 @@
.billing-detail {
.service {
-width: 30%;
+width: 35%;
}
.resource-type,
.cost-currency {
-width: 10%;
+width: 11%;
}
.resource-name,
.usage-date-start,
.usage-date-end {
-width: 20%;
overflow: hidden;
text-overflow: ellipsis;
padding-right: 10px;
white-space: nowrap;
}
+ .resource-name{
+width: 20%;
+ }
+
+ .usage-date-start,
+ .usage-date-end{
+width: 17%;
+ }
+
.wide-name-field {
width: 25%;
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/02: Merge remote-tracking branch 'origin/develop' into develop
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2048 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 63293485113cafb39c0ac6b3a7a243781ac04ea4 Merge: e1eb9a7 aae9674 Author: Dmytro_Gnatyshyn AuthorDate: Tue Sep 15 13:51:05 2020 +0300 Merge remote-tracking branch 'origin/develop' into develop CONTRIBUTING.md| 2 +- .../src/general/conf/dlab.ini | 2 +- .../src/general/files/aws/rstudio_description.json | 2 +- .../general/files/azure/rstudio_description.json | 2 +- .../src/general/files/gcp/rstudio_description.json | 2 +- .../dlab/backendapi/domain/NotebookTemplate.java | 2 +- .../dlab/backendapi/service/TagServiceImpl.java| 3 +- .../management-grid/management-grid.component.html | 2 +- .../management-grid/management-grid.component.scss | 19 -- .../reporting-grid/reporting-grid.component.ts | 7 +++ .../backendapi/service/TagServiceImplTest.java | 70 ++ 11 files changed, 99 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: [DLAB-2049]: Fixed clicking the same sort icon should not change value position in grid (#910)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 aae9674 [DLAB-2049]: Fixed clicking the same sort icon should not
change value position in grid (#910)
aae9674 is described below
commit aae96746b03884de57c604e9ea80e2b4ee67d541
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Tue Sep 15 13:43:26 2020 +0300
[DLAB-2049]: Fixed clicking the same sort icon should not change value
position in grid (#910)
[DLAB-2049]: Fixed clicking the same sort icon should not change value
position in the grid
---
.../reports/reporting/reporting-grid/reporting-grid.component.ts | 7 +++
1 file changed, 7 insertions(+)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
index 6172a78..29e8ed2 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
@@ -58,6 +58,8 @@ export class ReportingGridComponent implements OnInit,
AfterViewInit {
isFilterSelected: boolean;
isFilterChanged: boolean;
public isScrollButtonsVisible: boolean;
+ public previousItem: string;
+ public previousDirection: string;
@ViewChild('nameFilter', { static: false }) filter;
@ViewChild('tableWrapper', { static: false }) tableWrapper;
@@ -121,7 +123,12 @@ export class ReportingGridComponent implements OnInit,
AfterViewInit {
}
sortBy(sortItem, direction) {
+ if (this.previousItem === sortItem && this.previousDirection === direction) {
+return;
+ }
let report: Array;
+ this.previousItem = sortItem;
+ this.previousDirection = direction;
if (direction === 'down') {
report = this.reportData.sort((a, b) => {
if (a[sortItem] === null) a[sortItem] = '';
-
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-2050]: Fixed space between compute status and icon should not change if expand head grid (#909)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 78af148 [DLAB-2050]: Fixed space between compute status and icon
should not change if expand head grid (#909)
78af148 is described below
commit 78af148aa8faee5af2e89b8734148e3ac7a82368
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Tue Sep 15 13:41:42 2020 +0300
[DLAB-2050]: Fixed space between compute status and icon should not change
if expand head grid (#909)
[DLAB-2050]: Fixed space between compute status and icon should not change
if expand head grid
---
.../management-grid/management-grid.component.html| 2 +-
.../management-grid/management-grid.component.scss| 19 ++-
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index fcb6901..71a20db 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -231,7 +231,7 @@
-
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 40b7bf1..5c4c62b 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
@@ -49,6 +49,9 @@
.shape {
width: 17% !important;
+ .label{
+position: absolute;
+ }
}
.status {
@@ -56,7 +59,7 @@
}
.type {
- width: 13%;
+ width: 11%;
}
.resources {
@@ -124,6 +127,7 @@
&.actions {
z-index: 5 !important;
+min-width: 100px !important;
}
}
@@ -143,10 +147,6 @@
}
}
-.source .resource-wrap .resource-name .detailed-link {
- cursor: default !important;
-}
-
table.management {
width: 100%;
@@ -189,6 +189,15 @@ table.management {
padding: 40px;
text-align: center;
}
+
+ .source .resource-wrap {
+.resource-actions{
+ padding-right: 0;
+}
+.resource-name .detailed-link {
+ cursor: default !important;
+}
+ }
}
.computation{
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-2050]: Fixed space between compute status and icon should not change if expand head grid
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2050
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 921bf8ec2fee076b5b162be29117b54e89f1d81d
Author: Dmytro_Gnatyshyn
AuthorDate: Tue Sep 15 13:39:28 2020 +0300
[DLAB-2050]: Fixed space between compute status and icon should not change
if expand head grid
---
.../management-grid/management-grid.component.html| 2 +-
.../management-grid/management-grid.component.scss| 19 ++-
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index fcb6901..71a20db 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -231,7 +231,7 @@
-
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 40b7bf1..5c4c62b 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
@@ -49,6 +49,9 @@
.shape {
width: 17% !important;
+ .label{
+position: absolute;
+ }
}
.status {
@@ -56,7 +59,7 @@
}
.type {
- width: 13%;
+ width: 11%;
}
.resources {
@@ -124,6 +127,7 @@
&.actions {
z-index: 5 !important;
+min-width: 100px !important;
}
}
@@ -143,10 +147,6 @@
}
}
-.source .resource-wrap .resource-name .detailed-link {
- cursor: default !important;
-}
-
table.management {
width: 100%;
@@ -189,6 +189,15 @@ table.management {
padding: 40px;
text-align: center;
}
+
+ .source .resource-wrap {
+.resource-actions{
+ padding-right: 0;
+}
+.resource-name .detailed-link {
+ cursor: default !important;
+}
+ }
}
.computation{
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2050 created (now 921bf8e)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2050 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 921bf8e [DLAB-2050]: Fixed space between compute status and icon should not change if expand head grid This branch includes the following new commits: new 921bf8e [DLAB-2050]: Fixed space between compute status and icon should not change if expand head 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] 01/02: Merge remote-tracking branch 'origin/develop' into develop
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2049 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit e1eb9a736d29b7f2a25a8bbead4f1faa7f9ea612 Merge: d5a5713 8886492 Author: Dmytro_Gnatyshyn AuthorDate: Mon Sep 14 17:10:09 2020 +0300 Merge remote-tracking branch 'origin/develop' into develop infrastructure-provisioning/src/general/conf/dlab.ini | 2 +- .../src/general/files/aws/rstudio_description.json | 2 +- .../src/general/files/azure/rstudio_description.json| 2 +- .../src/general/files/gcp/rstudio_description.json | 2 +- .../src/general/lib/os/debian/notebook_lib.py | 17 ++--- .../src/rstudio/scripts/configure_rstudio_node.py | 2 +- .../epam/dlab/backendapi/domain/NotebookTemplate.java | 2 +- .../management-grid/management-grid.component.html | 8 .../management-grid/management-grid.component.scss | 5 + .../reporting-grid/reporting-grid.component.html| 2 +- .../reporting-grid/reporting-grid.component.ts | 2 -- .../install-libraries/install-libraries.component.html | 1 + .../resources-grid/resources-grid.component.html| 2 +- 13 files changed, 28 insertions(+), 21 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-2049]: Fixed clicking the same sort icon should not change value position in grid
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2049
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b7d16b68441de618ced98d7c19ee301f7eb29b2e
Author: Dmytro_Gnatyshyn
AuthorDate: Tue Sep 15 13:19:50 2020 +0300
[DLAB-2049]: Fixed clicking the same sort icon should not change value
position in grid
---
.../reports/reporting/reporting-grid/reporting-grid.component.ts | 7 +++
1 file changed, 7 insertions(+)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
index 6172a78..29e8ed2 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
@@ -58,6 +58,8 @@ export class ReportingGridComponent implements OnInit,
AfterViewInit {
isFilterSelected: boolean;
isFilterChanged: boolean;
public isScrollButtonsVisible: boolean;
+ public previousItem: string;
+ public previousDirection: string;
@ViewChild('nameFilter', { static: false }) filter;
@ViewChild('tableWrapper', { static: false }) tableWrapper;
@@ -121,7 +123,12 @@ export class ReportingGridComponent implements OnInit,
AfterViewInit {
}
sortBy(sortItem, direction) {
+ if (this.previousItem === sortItem && this.previousDirection === direction) {
+return;
+ }
let report: Array;
+ this.previousItem = sortItem;
+ this.previousDirection = direction;
if (direction === 'down') {
report = this.reportData.sort((a, b) => {
if (a[sortItem] === null) a[sortItem] = '';
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2049 created (now b7d16b6)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2049 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at b7d16b6 [DLAB-2049]: Fixed clicking the same sort icon should not change value position in grid This branch includes the following new commits: new e1eb9a7 Merge remote-tracking branch 'origin/develop' into develop new b7d16b6 [DLAB-2049]: Fixed clicking the same sort icon should not change value position in grid 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: [DLAB-2045]: Removed unnecessary console.logs (#905)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 5e51544 [DLAB-2045]: Removed unnecessary console.logs (#905)
5e51544 is described below
commit 5e51544e20b007ce8ee4b6d8a610c5b500b5fb3d
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Mon Sep 14 14:46:05 2020 +0300
[DLAB-2045]: Removed unnecessary console.logs (#905)
[DLAB-2045]: Removed unnecessary console.logs
---
.../app/reports/reporting/reporting-grid/reporting-grid.component.ts| 2 --
1 file changed, 2 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
index 51e8581..6172a78 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
@@ -110,7 +110,6 @@ export class ReportingGridComponent implements OnInit,
AfterViewInit {
refreshData(fullReport, report) {
this.reportData = [...report];
this.fullReport = fullReport;
-console.log(fullReport);
this.checkFilters();
}
@@ -188,7 +187,6 @@ export class ReportingGridComponent implements OnInit,
AfterViewInit {
}
private checkMaxRight() {
-console.log('check');
if (this.reportData && this.reportData.length < 5) {
const arg = this.pageWrapper.nativeElement.offsetWidth - 15 +
this.pageWrapper.nativeElement.scrollLeft + 2 <=
this.table._elementRef.nativeElement.offsetWidth;
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2045 created (now b76f10a)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2045 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at b76f10a [DLAB-2045]: Removed unnecessary console.logs This branch includes the following new commits: new b76f10a [DLAB-2045]: Removed unnecessary console.logs 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-2045]: Removed unnecessary console.logs
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2045
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b76f10aac2e580df59185536af2b8f71a55901d2
Author: Dmytro_Gnatyshyn
AuthorDate: Mon Sep 14 14:43:31 2020 +0300
[DLAB-2045]: Removed unnecessary console.logs
---
.../app/reports/reporting/reporting-grid/reporting-grid.component.ts| 2 --
1 file changed, 2 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
index 51e8581..6172a78 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
@@ -110,7 +110,6 @@ export class ReportingGridComponent implements OnInit,
AfterViewInit {
refreshData(fullReport, report) {
this.reportData = [...report];
this.fullReport = fullReport;
-console.log(fullReport);
this.checkFilters();
}
@@ -188,7 +187,6 @@ export class ReportingGridComponent implements OnInit,
AfterViewInit {
}
private checkMaxRight() {
-console.log('check');
if (this.reportData && this.reportData.length < 5) {
const arg = this.pageWrapper.nativeElement.offsetWidth - 15 +
this.pageWrapper.nativeElement.scrollLeft + 2 <=
this.table._elementRef.nativeElement.offsetWidth;
-
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-2045]: Fixed issue with filtering by name on all filters (#903)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 29cac26 [DLAB-2045]: Fixed issue with filtering by name on all
filters (#903)
29cac26 is described below
commit 29cac262597f45ec8a2e8951eb1481c7784c6a57
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Mon Sep 14 13:10:36 2020 +0300
[DLAB-2045]: Fixed issue with filtering by name on all filters (#903)
[DLAB-2045]: Fixed issue with filtering by name on all filters
---
.../management/management-grid/management-grid.component.html | 8
.../management/management-grid/management-grid.component.scss | 5 +
.../reporting/reporting-grid/reporting-grid.component.html| 2 +-
.../install-libraries/install-libraries.component.html| 1 +
.../app/resources/resources-grid/resources-grid.component.html| 2 +-
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index 1235be3..fcb6901 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -232,7 +232,7 @@
+ [value]="filterForm.type" (input)="filterForm.type =
$event.target['value']" (keyup)="checkFilters()"/>
@@ -277,11 +277,11 @@
-
-
+
To start working, please, create new environment
-No
matches found
+No matches found
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 9d9f4b5..40b7bf1 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
@@ -184,6 +184,11 @@ table.management {
padding-left: 15px;
}
}
+
+ .info{
+padding: 40px;
+text-align: center;
+ }
}
.computation{
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
index 1d6ffaf..081c711 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
@@ -199,7 +199,7 @@
+ [value]="filtered?.dlab_id"
(input)="filteredReportData.dlab_id = $event.target['value']"
(keyup)="checkFilters()"/>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
index 8caee40..a1b8e7e 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
@@ -251,6 +251,7 @@
placeholder="Filter by library name"
[value]="filterModel.name"
(input)="filterModel.name = $event.target['value']"
+ (keyup)="checkFilters()"
type="text"
class="form-control filter-field"
/>
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 0e14343..c29bf51 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid
[incubator-dlab] 01/02: Merge remote-tracking branch 'origin/develop' into develop
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2045
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d5a5713af1f1c4391ccbc0871202687719e8c7c1
Merge: f2fb35e 443bdff
Author: Dmytro_Gnatyshyn
AuthorDate: Mon Sep 14 12:39:00 2020 +0300
Merge remote-tracking branch 'origin/develop' into develop
.../src/general/lib/azure/actions_lib.py | 25 +++--
.../src/general/lib/os/debian/common_lib.py| 10 +-
.../java/com/epam/dlab/backendapi/dao/BaseDAO.java | 49 +
.../com/epam/dlab/backendapi/dao/IndexCreator.java | 1 -
.../backendapi/resources/EndpointResource.java | 69 +
.../dlab/backendapi/resources/ProjectResource.java | 115 +
.../webapp/src/app/administration/project/index.ts | 20 ++--
.../project-list/project-list.component.html | 2 +-
.../project/project-list/project-list.component.ts | 3 +-
.../administration/project/project.component.html | 6 +-
.../administration/project/project.component.ts| 1 +
.../webapp/src/app/administration/roles/index.ts | 18 ++--
.../app/administration/roles/roles.component.html | 3 +-
.../app/administration/roles/roles.component.ts| 3 +-
...utational-resource-create-dialog.component.html | 2 +-
.../create-environment.component.html | 49 +
.../create-environment.component.scss | 4 +
.../create-environment.component.ts| 3 +
.../install-libraries.component.ts | 2 +-
.../main/resources/webapp/src/app/shared/index.ts | 1 +
.../src/app/shared/{ => inform-message}/index.ts | 13 ++-
.../inform-message.component.css} | 16 ++-
.../inform-message/inform-message.component.html | 21
.../inform-message.component.ts} | 24 -
24 files changed, 261 insertions(+), 199 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-2045]: Fixed issue with filtering by name on all filters
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2045
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f3611b748a684801bf5e5155a8dc041abd8b1f8f
Author: Dmytro_Gnatyshyn
AuthorDate: Mon Sep 14 13:07:26 2020 +0300
[DLAB-2045]: Fixed issue with filtering by name on all filters
---
.../management/management-grid/management-grid.component.html | 8
.../management/management-grid/management-grid.component.scss | 5 +
.../reporting/reporting-grid/reporting-grid.component.html| 2 +-
.../install-libraries/install-libraries.component.html| 1 +
.../app/resources/resources-grid/resources-grid.component.html| 2 +-
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index 1235be3..fcb6901 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -232,7 +232,7 @@
+ [value]="filterForm.type" (input)="filterForm.type =
$event.target['value']" (keyup)="checkFilters()"/>
@@ -277,11 +277,11 @@
-
-
+
To start working, please, create new environment
-No
matches found
+No matches found
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 9d9f4b5..40b7bf1 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
@@ -184,6 +184,11 @@ table.management {
padding-left: 15px;
}
}
+
+ .info{
+padding: 40px;
+text-align: center;
+ }
}
.computation{
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
index 1d6ffaf..081c711 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
@@ -199,7 +199,7 @@
+ [value]="filtered?.dlab_id"
(input)="filteredReportData.dlab_id = $event.target['value']"
(keyup)="checkFilters()"/>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
index 8caee40..a1b8e7e 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
@@ -251,6 +251,7 @@
placeholder="Filter by library name"
[value]="filterModel.name"
(input)="filterModel.name = $event.target['value']"
+ (keyup)="checkFilters()"
type="text"
class="form-control filter-field"
/>
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 0e14343..c29bf51 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
@@ -259,7 +259,7 @@
+[value]="filterForm.name" (input)="filterForm.name =
$event.target['value']&quo
[incubator-dlab] branch DLAB-2045 created (now f3611b7)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2045 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at f3611b7 [DLAB-2045]: Fixed issue with filtering by name on all filters This branch includes the following new commits: new d5a5713 Merge remote-tracking branch 'origin/develop' into develop new f3611b7 [DLAB-2045]: Fixed issue with filtering by name on all filters 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: [DLAB-2030]: Added hint/message for different cases (#902)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 443bdff [DLAB-2030]: Added hint/message for different cases (#902)
443bdff is described below
commit 443bdff342bb2bacca468dd3bc941b0d883ad230
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Mon Sep 14 12:37:48 2020 +0300
[DLAB-2030]: Added hint/message for different cases (#902)
[DLAB-2030]: Added hint/message for different cases
---
.../webapp/src/app/administration/project/index.ts | 20 +
.../administration/project/project.component.html | 4 +-
.../administration/project/project.component.ts| 1 +
.../webapp/src/app/administration/roles/index.ts | 18
.../app/administration/roles/roles.component.html | 3 +-
.../app/administration/roles/roles.component.ts| 3 +-
...utational-resource-create-dialog.component.html | 2 +-
.../create-environment.component.html | 49 ++
.../create-environment.component.scss | 4 ++
.../create-environment.component.ts| 3 ++
.../main/resources/webapp/src/app/shared/index.ts | 1 +
.../src/app/shared/{ => inform-message}/index.ts | 13 --
.../inform-message.component.css} | 16 +--
.../inform-message/inform-message.component.html | 21 ++
.../inform-message.component.ts} | 24 +--
15 files changed, 134 insertions(+), 48 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
index 609ea59..8e57f0f 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
@@ -31,17 +31,19 @@ import { ProjectListComponent } from
'./project-list/project-list.component';
import { ProjectComponent, EditProjectComponent } from './project.component';
import { ProjectDataService } from './project-data.service';
import {BubbleModule} from "../../shared/bubble";
+import {InformMessageModule} from '../../shared/inform-message';
@NgModule({
- imports: [
-CommonModule,
-FormsModule,
-ReactiveFormsModule,
-MaterialModule,
-FormControlsModule,
-UnderscorelessPipeModule,
-BubbleModule
- ],
+imports: [
+CommonModule,
+FormsModule,
+ReactiveFormsModule,
+MaterialModule,
+FormControlsModule,
+UnderscorelessPipeModule,
+BubbleModule,
+InformMessageModule
+],
declarations: [ProjectComponent, EditProjectComponent, ProjectFormComponent,
ProjectListComponent],
entryComponents: [EditProjectComponent],
providers: [ProjectDataService],
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
index 2b6f48d..76f0be1 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
@@ -46,7 +46,7 @@
-
+
@@ -54,4 +54,6 @@
+
+
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 d1b172e..bd45793 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
@@ -52,6 +52,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
healthStatus: any;
activeFiltering: boolean = false;
resources: any = [];
+ noPermissionMessage: string = 'You are not assigned to any project.';
private subscriptions: Subscription = new Subscription();
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/index.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/index.ts
index d0c57cc..28c16e2 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/index.ts
@@ -25,17 +25,19 @@ import { MaterialModule } from
'../../shared/material.module';
import { FormControlsModule } from '../../shared/form
[incubator-dlab] 03/03: [DLAB-2030]: Added hint/message for different cases
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2030
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d4e500f45844aa3c6a6c28cfe825c4e4f9a993fa
Author: Dmytro_Gnatyshyn
AuthorDate: Mon Sep 14 12:34:01 2020 +0300
[DLAB-2030]: Added hint/message for different cases
---
...utational-resource-create-dialog.component.html | 2 +-
.../create-environment.component.html | 49 ++
.../create-environment.component.scss | 4 ++
.../create-environment.component.ts| 3 ++
4 files changed, 39 insertions(+), 19 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 62ab6af..d8835fe 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
@@ -233,7 +233,7 @@
-Compute creations are not available.Please, check your
permissions.
+Compute creations are not available. Please, check your
permissions.
Compute data is processing
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 1fd27d6..f12a3f2 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
@@ -60,24 +60,30 @@
-
Select template
-
-
-
-
- {{
template.exploratory_environment_versions[0].template_name }}
-
-Templates list is empty
-
-
-
-keyboard_arrow_down
-
-
+
+
+
+
+
+{{
template.exploratory_environment_versions[0].template_name }}
+
+ Templates list is empty
+
+
+
+ keyboard_arrow_down
+
+
+
@@ -118,10 +124,16 @@
Instance size
-
+
+
Select instance size
-
@@ -133,6 +145,7 @@
keyboard_arrow_down
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.scss
index f02436e..a324aa2 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.scss
@@ -68,6 +68,10 @@
overflow-y: auto;
}
+.form-field-wrapper{
+ width: 100%;
+}
+
@-moz-document url-prefix() {
.create-environment form {
padding-bottom: 30px;
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts
index 4ae38ad..8ca54d1 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts
@@ -48,6 +48,7 @@ export class ExploratoryEnvironmentCreateComponent implements
OnInit {
resourceGrid: any;
images: Array;
maxNotebookLength: number = 14;
+ public areShapes: boolean;
@ViewChild('configurationNode', { static: false }) con
[incubator-dlab] 01/03: added hint to project and roles page
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2030
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit ce7a97bea89fb6f799f079060785d0e38099bdc0
Author: Dmytro_Gnatyshyn
AuthorDate: Mon Sep 14 10:23:59 2020 +0300
added hint to project and roles page
---
.../webapp/src/app/administration/project/index.ts | 20 ++
.../administration/project/project.component.ts| 1 +
.../webapp/src/app/administration/roles/index.ts | 18
.../app/administration/roles/roles.component.html | 3 ++-
.../app/administration/roles/roles.component.ts| 3 ++-
.../main/resources/webapp/src/app/shared/index.ts | 1 +
.../src/app/shared/{ => inform-message}/index.ts | 13 +---
.../inform-message.component.css} | 16 ---
.../inform-message/inform-message.component.html | 21 +++
.../inform-message.component.ts} | 24 +++---
10 files changed, 92 insertions(+), 28 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
index 609ea59..8e57f0f 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/index.ts
@@ -31,17 +31,19 @@ import { ProjectListComponent } from
'./project-list/project-list.component';
import { ProjectComponent, EditProjectComponent } from './project.component';
import { ProjectDataService } from './project-data.service';
import {BubbleModule} from "../../shared/bubble";
+import {InformMessageModule} from '../../shared/inform-message';
@NgModule({
- imports: [
-CommonModule,
-FormsModule,
-ReactiveFormsModule,
-MaterialModule,
-FormControlsModule,
-UnderscorelessPipeModule,
-BubbleModule
- ],
+imports: [
+CommonModule,
+FormsModule,
+ReactiveFormsModule,
+MaterialModule,
+FormControlsModule,
+UnderscorelessPipeModule,
+BubbleModule,
+InformMessageModule
+],
declarations: [ProjectComponent, EditProjectComponent, ProjectFormComponent,
ProjectListComponent],
entryComponents: [EditProjectComponent],
providers: [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 d1b172e..bd45793 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
@@ -52,6 +52,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
healthStatus: any;
activeFiltering: boolean = false;
resources: any = [];
+ noPermissionMessage: string = 'You are not assigned to any project.';
private subscriptions: Subscription = new Subscription();
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/index.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/index.ts
index d0c57cc..28c16e2 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/index.ts
@@ -25,17 +25,19 @@ import { MaterialModule } from
'../../shared/material.module';
import { FormControlsModule } from '../../shared/form-controls';
import { RolesComponent, ConfirmDeleteUserAccountDialogComponent } from
'./roles.component';
import { GroupNameValidationDirective } from
'./group-name-validarion.directive';
+import {InformMessageModule} from '../../shared/inform-message';
@NgModule({
- imports: [
-CommonModule,
-FormsModule,
-ReactiveFormsModule,
-MaterialModule,
-FormControlsModule
- ],
+imports: [
+CommonModule,
+FormsModule,
+ReactiveFormsModule,
+MaterialModule,
+FormControlsModule,
+InformMessageModule
+],
declarations: [RolesComponent, ConfirmDeleteUserAccountDialogComponent,
GroupNameValidationDirective],
entryComponents: [ConfirmDeleteUserAccountDialogComponent],
exports: [RolesComponent]
})
-export class RolesModule { }
\ No newline at end of file
+export class RolesModule { }
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html
[incubator-dlab] 02/03: added hint to project and roles page
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2030 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 2fd110de25df7712c0967677edff5dc76da2f0e1 Author: Dmytro_Gnatyshyn AuthorDate: Mon Sep 14 10:24:09 2020 +0300 added hint to project and roles page --- .../webapp/src/app/administration/project/project.component.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html index 98ea6aa..0765e2c 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html @@ -46,7 +46,7 @@ - + @@ -54,4 +54,6 @@ + + - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2030 created (now d4e500f)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2030 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at d4e500f [DLAB-2030]: Added hint/message for different cases This branch includes the following new commits: new ce7a97b added hint to project and roles page new 2fd110d added hint to project and roles page new d4e500f [DLAB-2030]: Added hint/message for different cases The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch develop updated: [DLAB-2033]: Prevented possibility to edit project for admin per project (#899)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 a4b0fdd [DLAB-2033]: Prevented possibility to edit project for admin
per project (#899)
a4b0fdd is described below
commit a4b0fdd5a27912cf80df9652d4c0db157079984c
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Fri Sep 11 13:52:26 2020 +0300
[DLAB-2033]: Prevented possibility to edit project for admin per project
(#899)
[DLAB-2033]: Prevented possibility to edit project for admin per project
---
.../administration/project/project-list/project-list.component.html| 2 +-
.../app/administration/project/project-list/project-list.component.ts | 3 ++-
.../webapp/src/app/administration/project/project.component.html | 2 +-
.../exploratory/install-libraries/install-libraries.component.ts | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-list/project-list.component.html
index ef03098..ef82f31 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
@@ -89,7 +89,7 @@
Terminate edge node
-
+
mode_edit
Edit project
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 9238b7f..5d20373 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
@@ -17,7 +17,7 @@
* under the License.
*/
-import {Component, OnInit, Output, EventEmitter, OnDestroy, Inject} from
'@angular/core';
+import {Component, OnInit, Output, EventEmitter, OnDestroy, Inject, Input}
from '@angular/core';
import { ToastrService } from 'ngx-toastr';
import { MatTableDataSource } from '@angular/material/table';
import { Subscription } from 'rxjs';
@@ -42,6 +42,7 @@ export class ProjectListComponent implements OnInit,
OnDestroy {
dataSource: Project[] | any = [];
projectList: Project[];
+ @Input() isProjectAdmin: boolean;
@Output() editItem: EventEmitter<{}> = new EventEmitter();
@Output() toggleStatus: EventEmitter<{}> = new EventEmitter();
private subscriptions: Subscription = new Subscription();
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
index 98ea6aa..2b6f48d 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.html
@@ -51,7 +51,7 @@
-
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
index 811a0f9..7c9dec1 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
@@ -439,7 +439,7 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
this.getMatchedLibs();
});
}
-this.autoComplete = 'NONE';
+this.autoComplete = libs.autoComplete;
this.filteredList = libs.libraries;
this.filteredList.forEach(lib => {
lib.isInSelectedList = this.model.selectedLibs.some(el =>
el.name.toLowerCase() === lib.name.toLowerCase());
-
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-2026]: Made behavior of filter actions the same on all pages. Fixed minor bugs on library and bucket browser (#896)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 2833202 [DLAB-2026]: Made behavior of filter actions the same on all
pages. Fixed minor bugs on library and bucket browser (#896)
2833202 is described below
commit 28332025f15a6bc90fd0420a580cdee2f0055ede
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Tue Sep 8 17:15:08 2020 +0300
[DLAB-2026]: Made behavior of filter actions the same on all pages. Fixed
minor bugs on library and bucket browser (#896)
[DLAB-2026]: Made behavior of filter actions the same on all pages.Fixed
minor bugs on library and bucket browser
---
.../management-grid/management-grid.component.html | 4 +-
.../management-grid/management-grid.component.ts | 9
.../resources/webapp/src/app/app.routing.module.ts | 1 -
.../convert-action-pipe/convert-action.pipe.ts | 5 ++-
.../audit/audit-grid/audit-grid.component.html | 4 +-
.../audit/audit-grid/audit-grid.component.ts | 9 +++-
.../reporting-grid/reporting-grid.component.html | 17
.../reporting-grid/reporting-grid.component.scss | 17
.../reporting-grid/reporting-grid.component.ts | 36 +---
.../folder-tree/folder-tree.component.ts | 6 ++-
.../install-libraries/filter-libs.model.ts | 4 +-
.../install-libraries.component.html | 12 +++---
.../install-libraries.component.scss | 34 ++-
.../install-libraries.component.ts | 49 --
.../resources-grid/resources-grid.component.html | 4 +-
.../resources-grid/resources-grid.component.scss | 2 +-
.../resources-grid/resources-grid.component.ts | 18 +++-
.../src/app/resources/resources.component.html | 2 +-
.../multi-select-dropdown.component.html | 4 +-
.../resources/webapp/src/assets/styles/_theme.scss | 4 +-
20 files changed, 150 insertions(+), 91 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index 8d2df70..1235be3 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -262,12 +262,12 @@
-
+
close
+[disabled]="!isFilterChanged">
done
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
index fa2a37f..ab4bda7 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
@@ -67,6 +67,8 @@ export class ManagementGridComponent implements OnInit {
private selected;
private allActiveNotebooks: any;
private cashedFilterForm: ManagementConfigModel = new
ManagementConfigModel([], '', [], [], [], []);
+ private isFilterSelected: boolean;
+ private isFilterChanged: boolean;
constructor(
private healthStatusService: HealthStatusService,
@@ -101,6 +103,12 @@ export class ManagementGridComponent implements OnInit {
public onUpdate($event): void {
this.filterForm[$event.type] = $event.model;
+this.checkFilters();
+ }
+
+ private checkFilters() {
+this.isFilterChanged = JSON.stringify(this.cashedFilterForm) !==
JSON.stringify(this.filterForm);
+this.isFilterSelected = Object.keys(this.filterForm).filter(v =>
this.filterForm[v].length > 0).length > 0;
}
public toggleFilterRow(): void {
@@ -157,6 +165,7 @@ export class ManagementGridComponent implements OnInit {
.filter(v => v.name &&
(v.status === 'running' || v.status === 'stopped') &&
!this.clustersInProgress(v.resources));
+this.checkFilters();
}
getEnvironmentDataCopy() {
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 81663d4..31f955c 100644
---
a/services/self-service/src/main/resources/webapp/src/app
[incubator-dlab] 02/02: [DLAB-2026]: Made behavior of filter actions the same on all pages.Fixed minor bugs on library and bucket browser
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2026
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 4bc3938f19b196d8adb67502b4223b1dbae18904
Author: Dmytro_Gnatyshyn
AuthorDate: Tue Sep 8 17:12:43 2020 +0300
[DLAB-2026]: Made behavior of filter actions the same on all pages.Fixed
minor bugs on library and bucket browser
---
.../management-grid/management-grid.component.html | 4 +-
.../management-grid/management-grid.component.ts | 9
.../resources/webapp/src/app/app.routing.module.ts | 1 -
.../convert-action-pipe/convert-action.pipe.ts | 5 ++-
.../audit/audit-grid/audit-grid.component.html | 4 +-
.../audit/audit-grid/audit-grid.component.ts | 9 +++-
.../reporting-grid/reporting-grid.component.html | 17
.../reporting-grid/reporting-grid.component.scss | 17
.../reporting-grid/reporting-grid.component.ts | 36 +---
.../folder-tree/folder-tree.component.ts | 6 ++-
.../install-libraries/filter-libs.model.ts | 4 +-
.../install-libraries.component.html | 12 +++---
.../install-libraries.component.scss | 34 ++-
.../install-libraries.component.ts | 49 --
.../resources-grid/resources-grid.component.html | 4 +-
.../resources-grid/resources-grid.component.scss | 2 +-
.../resources-grid/resources-grid.component.ts | 18 +++-
.../src/app/resources/resources.component.html | 2 +-
.../multi-select-dropdown.component.html | 4 +-
.../resources/webapp/src/assets/styles/_theme.scss | 4 +-
20 files changed, 150 insertions(+), 91 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index 8d2df70..1235be3 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -262,12 +262,12 @@
-
+
close
+[disabled]="!isFilterChanged">
done
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
index fa2a37f..ab4bda7 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
@@ -67,6 +67,8 @@ export class ManagementGridComponent implements OnInit {
private selected;
private allActiveNotebooks: any;
private cashedFilterForm: ManagementConfigModel = new
ManagementConfigModel([], '', [], [], [], []);
+ private isFilterSelected: boolean;
+ private isFilterChanged: boolean;
constructor(
private healthStatusService: HealthStatusService,
@@ -101,6 +103,12 @@ export class ManagementGridComponent implements OnInit {
public onUpdate($event): void {
this.filterForm[$event.type] = $event.model;
+this.checkFilters();
+ }
+
+ private checkFilters() {
+this.isFilterChanged = JSON.stringify(this.cashedFilterForm) !==
JSON.stringify(this.filterForm);
+this.isFilterSelected = Object.keys(this.filterForm).filter(v =>
this.filterForm[v].length > 0).length > 0;
}
public toggleFilterRow(): void {
@@ -157,6 +165,7 @@ export class ManagementGridComponent implements OnInit {
.filter(v => v.name &&
(v.status === 'running' || v.status === 'stopped') &&
!this.clustersInProgress(v.resources));
+this.checkFilters();
}
getEnvironmentDataCopy() {
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 81663d4..31f955c 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
@@ -32,7 +32,6 @@ import { ManagementComponent } from
'./administration/management/management.comp
import { ProjectComponent } from './administration/project/project.component';
import { RolesComponent } from './administration/roles/roles.component';
import { Swagger
[incubator-dlab] 01/02: Merge branch 'develop' of github.com:apache/incubator-dlab into develop
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2026 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 069f5d002fec6f15ccbaadcd76c92887c0f21463 Merge: 5e65b5f 4b4ef05 Author: Dmytro_Gnatyshyn AuthorDate: Fri Sep 4 17:55:19 2020 +0300 Merge branch 'develop' of github.com:apache/incubator-dlab into develop .../src/general/lib/aws/actions_lib.py | 5 +- .../src/general/lib/azure/actions_lib.py | 5 +- .../src/general/lib/gcp/actions_lib.py | 5 +- .../src/general/lib/os/redhat/notebook_lib.py | 2 +- .../general/scripts/os/common_configure_spark.py | 43 ++--- .../service/impl/EnvironmentServiceImpl.java | 25 ++- .../install-libraries.component.ts | 3 +- .../backendapi/resources/ProjectResourceTest.java | 30 .../service/impl/EnvironmentServiceImplTest.java | 195 ++--- 9 files changed, 248 insertions(+), 65 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2026 created (now 4bc3938)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2026 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 4bc3938 [DLAB-2026]: Made behavior of filter actions the same on all pages.Fixed minor bugs on library and bucket browser This branch includes the following new commits: new 069f5d0 Merge branch 'develop' of github.com:apache/incubator-dlab into develop new 4bc3938 [DLAB-2026]: Made behavior of filter actions the same on all pages.Fixed minor bugs on library and bucket browser 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: [DLAB-2023]: Removed r package for Spark Standalone on DeepLearning (#892)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 4b4ef05 [DLAB-2023]: Removed r package for Spark Standalone on
DeepLearning (#892)
4b4ef05 is described below
commit 4b4ef055c396dd6bb4b5e3dc24e994fcc163b30f
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Fri Sep 4 17:54:42 2020 +0300
[DLAB-2023]: Removed r package for Spark Standalone on DeepLearning (#892)
[DLAB-2023]: Removed r package for Spark Standalone on DeepLearning
---
.../exploratory/install-libraries/install-libraries.component.ts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
index a614c30..99abb96 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
@@ -162,8 +162,7 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
public filterGroups(groupsList) {
const CURRENT_TEMPLATE = this.notebook.template_name.toLowerCase();
-
-if (CURRENT_TEMPLATE.indexOf('jupyter with tensorflow') !== -1) {
+if (CURRENT_TEMPLATE.indexOf('jupyter with tensorflow') !== -1 ||
CURRENT_TEMPLATE.indexOf('deep learning') !== -1) {
const filtered = groupsList.filter(group => group !== 'r_pkg');
return SortUtils.libGroupsSort(filtered);
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-2023]: Removed r package for Spark Standalone on DeepLearning
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2023
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 44de27edc5dbc3e79f641bafb4a57304b9a76cc5
Author: Dmytro_Gnatyshyn
AuthorDate: Fri Sep 4 17:52:37 2020 +0300
[DLAB-2023]: Removed r package for Spark Standalone on DeepLearning
---
.../exploratory/install-libraries/install-libraries.component.ts | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
index a614c30..99abb96 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
@@ -162,8 +162,7 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
public filterGroups(groupsList) {
const CURRENT_TEMPLATE = this.notebook.template_name.toLowerCase();
-
-if (CURRENT_TEMPLATE.indexOf('jupyter with tensorflow') !== -1) {
+if (CURRENT_TEMPLATE.indexOf('jupyter with tensorflow') !== -1 ||
CURRENT_TEMPLATE.indexOf('deep learning') !== -1) {
const filtered = groupsList.filter(group => group !== 'r_pkg');
return SortUtils.libGroupsSort(filtered);
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2023 created (now 44de27e)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2023 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 44de27e [DLAB-2023]: Removed r package for Spark Standalone on DeepLearning This branch includes the following new commits: new 44de27e [DLAB-2023]: Removed r package for Spark Standalone on DeepLearning 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: [DLAB-2022]: Fixed allocation to another folder during refresh (#889)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 02c9bf0 [DLAB-2022]: Fixed allocation to another folder during
refresh (#889)
02c9bf0 is described below
commit 02c9bf05108502c7d3504db812943062758ac82d
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Fri Sep 4 17:00:12 2020 +0300
[DLAB-2022]: Fixed allocation to another folder during refresh (#889)
[DLAB-2022]: Fixed issue with allocation to another folder during refresh
---
.../resources/webapp/src/app/core/services/bucket-browser.service.ts | 1 +
.../src/app/resources/bucket-browser/bucket-browser.component.html| 4 ++--
.../app/resources/bucket-browser/folder-tree/folder-tree.component.ts | 4 +++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
b/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
index 45982eb..f412a00 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
@@ -34,6 +34,7 @@ export class TodoItemFlatNode {
item: string;
level: number;
expandable: boolean;
+ obj: string;
}
@Injectable({
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
index 3255628..03c8f03 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
@@ -190,8 +190,8 @@
{{file.object?.size | convertFileSize}}
-
- {{file.object?.lastModifiedDate}}
+ {{convertDate(file.object?.lastModifiedDate) |
date: 'dd/MM/ hh:mm:ss aa' }}
+
{{file.progress || 0}}%
Downloading...
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts
index cd7d199..7003a33 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts
@@ -77,7 +77,8 @@ export class FolderTreeComponent implements OnDestroy {
const subject = this.dataSource._flattenedData;
const subjectData = subject.getValue();
if (this.selectedFolder) {
-this.selectedFolder = subjectData.filter(v => v.item ===
this.selectedFolder.item && v.level === this.selectedFolder.level)[0];
+this.selectedFolder = subjectData.find(v => v.item ===
this.selectedFolder.item &&
+ v.level === this.selectedFolder.level && v.obj ===
this.selectedFolder.obj);
}
this.expandAllParents(this.selectedFolder || subjectData[0]);
this.showItem(this.selectedFolder || subjectData[0]);
@@ -115,6 +116,7 @@ export class FolderTreeComponent implements OnDestroy {
flatNode.item = node.item;
flatNode.level = level;
flatNode.expandable = !!node.children;
+flatNode.obj = node.object.object;
this.flatNodeMap.set(flatNode, node);
this.nestedNodeMap.set(node, flatNode);
return flatNode;
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/02: Merge remote-tracking branch 'origin/develop' into develop
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2022 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 507fa541d5c178bcfa99ed7aa21b41acaf67e8c7 Merge: 74e2025 6d252f2 Author: Dmytro_Gnatyshyn AuthorDate: Wed Sep 2 17:32:25 2020 +0300 Merge remote-tracking branch 'origin/develop' into develop .../webapp/src/app/administration/management/management.component.html | 2 +- .../webapp/src/app/administration/management/management.component.ts | 3 ++- 2 files changed, 3 insertions(+), 2 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-2022]: Fixed allocation to another folder during refresh
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2022
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 5e65b5fd0d4b702f0a82d5fe8e903e6da01a7958
Author: Dmytro_Gnatyshyn
AuthorDate: Fri Sep 4 16:56:16 2020 +0300
[DLAB-2022]: Fixed allocation to another folder during refresh
---
.../resources/webapp/src/app/core/services/bucket-browser.service.ts | 1 +
.../src/app/resources/bucket-browser/bucket-browser.component.html| 4 ++--
.../app/resources/bucket-browser/folder-tree/folder-tree.component.ts | 4 +++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
b/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
index 45982eb..f412a00 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/services/bucket-browser.service.ts
@@ -34,6 +34,7 @@ export class TodoItemFlatNode {
item: string;
level: number;
expandable: boolean;
+ obj: string;
}
@Injectable({
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
index 3255628..03c8f03 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html
@@ -190,8 +190,8 @@
{{file.object?.size | convertFileSize}}
-
- {{file.object?.lastModifiedDate}}
+ {{convertDate(file.object?.lastModifiedDate) |
date: 'dd/MM/ hh:mm:ss aa' }}
+
{{file.progress || 0}}%
Downloading...
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts
index cd7d199..7003a33 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/folder-tree/folder-tree.component.ts
@@ -77,7 +77,8 @@ export class FolderTreeComponent implements OnDestroy {
const subject = this.dataSource._flattenedData;
const subjectData = subject.getValue();
if (this.selectedFolder) {
-this.selectedFolder = subjectData.filter(v => v.item ===
this.selectedFolder.item && v.level === this.selectedFolder.level)[0];
+this.selectedFolder = subjectData.find(v => v.item ===
this.selectedFolder.item &&
+ v.level === this.selectedFolder.level && v.obj ===
this.selectedFolder.obj);
}
this.expandAllParents(this.selectedFolder || subjectData[0]);
this.showItem(this.selectedFolder || subjectData[0]);
@@ -115,6 +116,7 @@ export class FolderTreeComponent implements OnDestroy {
flatNode.item = node.item;
flatNode.level = level;
flatNode.expandable = !!node.children;
+flatNode.obj = node.object.object;
this.flatNodeMap.set(flatNode, node);
this.nestedNodeMap.set(node, flatNode);
return flatNode;
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2022 created (now 5e65b5f)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2022 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 5e65b5f [DLAB-2022]: Fixed allocation to another folder during refresh This branch includes the following new commits: new 507fa54 Merge remote-tracking branch 'origin/develop' into develop new 5e65b5f [DLAB-2022]: Fixed allocation to another folder during refresh 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: [DLAB-2019]: Allowed to stop notebook if at least one instance is in running status during multiple choice (#886)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 6d252f2 [DLAB-2019]: Allowed to stop notebook if at least one
instance is in running status during multiple choice (#886)
6d252f2 is described below
commit 6d252f2f166ad9feedd8efcf97c1f6696c6a2ba6
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Wed Sep 2 17:32:02 2020 +0300
[DLAB-2019]: Allowed to stop notebook if at least one instance is in
running status during multiple choice (#886)
[DLAB-2019]: Allowed to stop notebook if at least one instance is in
running status during multiple choice
---
.../webapp/src/app/administration/management/management.component.html | 2 +-
.../webapp/src/app/administration/management/management.component.ts | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html
index 187a3ee..3bd9aa8 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html
@@ -38,7 +38,7 @@
type="button" class="butt action-menu-item"
[ngClass]="{'disabled': selectedRunning.length === 0 ||
selectedStopped.length !== 0 }"
mat-raised-button
-[disabled]="selectedRunning.length === 0 ||
selectedStopped.length !== 0"
+[disabled]="selectedRunning.length === 0"
(click)="resourseAction('stop');$event.stopPropagation()"
>
Stop
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
index 55ac108..8a54eea 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
@@ -226,8 +226,9 @@ export class ManagementComponent implements OnInit {
result && this.manageEnvironmentAction({ action, environment, resource
});
});
} else {
- const notebooks = this.selected.length ? this.selected : [environment];
+ let notebooks = this.selected.length ? this.selected : [environment];
if (action === 'stop') {
+notebooks = notebooks.filter(note => note.status !== 'stopped');
this.dialog.open(ReconfirmationDialogComponent, {
data: { notebooks: notebooks, type: 'notebook', action },
width: '550px', panelClass: 'error-modalbox'
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2019 created (now 95318f5)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2019 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 95318f5 [DLAB-2019]: Allowed to stop notebook if at least one instance is in running status during multiple choice This branch includes the following new commits: new 74e2025 Merge remote-tracking branch 'origin/develop' into develop new 95318f5 [DLAB-2019]: Allowed to stop notebook if at least one instance is in running status during multiple choice 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-2019]: Allowed to stop notebook if at least one instance is in running status during multiple choice
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2019
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 95318f590c055a6ad04961a4a5d5b77176a7cdb7
Author: Dmytro_Gnatyshyn
AuthorDate: Wed Sep 2 17:29:31 2020 +0300
[DLAB-2019]: Allowed to stop notebook if at least one instance is in
running status during multiple choice
---
.../webapp/src/app/administration/management/management.component.html | 2 +-
.../webapp/src/app/administration/management/management.component.ts | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html
index 187a3ee..3bd9aa8 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html
@@ -38,7 +38,7 @@
type="button" class="butt action-menu-item"
[ngClass]="{'disabled': selectedRunning.length === 0 ||
selectedStopped.length !== 0 }"
mat-raised-button
-[disabled]="selectedRunning.length === 0 ||
selectedStopped.length !== 0"
+[disabled]="selectedRunning.length === 0"
(click)="resourseAction('stop');$event.stopPropagation()"
>
Stop
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
index 55ac108..8a54eea 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.ts
@@ -226,8 +226,9 @@ export class ManagementComponent implements OnInit {
result && this.manageEnvironmentAction({ action, environment, resource
});
});
} else {
- const notebooks = this.selected.length ? this.selected : [environment];
+ let notebooks = this.selected.length ? this.selected : [environment];
if (action === 'stop') {
+notebooks = notebooks.filter(note => note.status !== 'stopped');
this.dialog.open(ReconfirmationDialogComponent, {
data: { notebooks: notebooks, type: 'notebook', action },
width: '550px', panelClass: 'error-modalbox'
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/02: Merge remote-tracking branch 'origin/develop' into develop
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2019 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 74e2025209ecbe5c72aff706a1b28418d8d40e36 Merge: 7d4f352 bff0f47 Author: Dmytro_Gnatyshyn AuthorDate: Wed Sep 2 15:47:52 2020 +0300 Merge remote-tracking branch 'origin/develop' into develop .../general/scripts/aws/jupyterlab_configure.py| 2 +- .../general/scripts/gcp/jupyterlab_configure.py| 2 +- .../detail-dialog/detail-dialog.component.html | 38 -- .../service/SecurityServiceImplTest.java | 134 + 4 files changed, 167 insertions(+), 9 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: [DLAB-2020]: Minor changes about library installation (#885)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 bff0f47 [DLAB-2020]: Minor changes about library installation (#885)
bff0f47 is described below
commit bff0f47701f0cad9fb1d24c65059931550499356
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Wed Sep 2 15:46:56 2020 +0300
[DLAB-2020]: Minor changes about library installation (#885)
[DLAB-2020]: Minor changes about library installation
---
.../webapp/src/app/core/pipes/highlight.pipe.ts| 2 +-
.../install-libraries.component.html | 4 ++--
.../install-libraries.component.ts | 26 --
3 files changed, 12 insertions(+), 20 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/pipes/highlight.pipe.ts
b/services/self-service/src/main/resources/webapp/src/app/core/pipes/highlight.pipe.ts
index 7bad3a9..652ff58 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/pipes/highlight.pipe.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/pipes/highlight.pipe.ts
@@ -24,7 +24,7 @@ import {PipeTransform, Pipe} from '@angular/core';
@Pipe({ name: 'highlight' })
export class HighLightPipe implements PipeTransform {
transform(text: string, search: string): string {
-return search ? text.replace(new RegExp(search, 'i'), `${search}`) : text;
+return search ? text.replace(new RegExp(search, 'i'), `${text.match(new RegExp(search, 'i'))[0]}`) : text;
}
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
index c54f165..a13eebc 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
@@ -121,8 +121,8 @@
[ngClass]="{'not-allow': lib.name?.length < 2
|| (autoComplete === 'ENABLED' && !isLibSelected )
|| this.selectedLib?.isInSelectedList ||
isVersionInvalid || autoComplete === 'UPDATING'}"
-
- matTooltip="Library is in selected list"
matTooltipPosition="above"
[matTooltipDisabled]="!this.selectedLib?.isInSelectedList"
+ [matTooltip]="this.selectedLib?.isInSelectedList ?
'Library is in selected list' : 'Please select library from autocomplete'"
+ matTooltipPosition="above"
[matTooltipDisabled]="(!this.selectedLib?.isInSelectedList && isLibSelected) ||
lib.name?.length < 2 || !this.selectedLib?.isInSelectedList && autoComplete ===
'NONE'"
>
lib.filteredStatus.some(status => status.status === 'installing'));
if (this.installingInProgress) {
-// window.clearTimeout(this.loadLibsTimer);
-// this.loadLibsTimer = window.setTimeout(() =>
this.getInstalledLibrariesList(), 1);
-timer(1).pipe(take(1)).subscribe(v =>
this.getInstalledLibrariesList());
+timer(this.INSTALLATION_IN_PROGRESS_CHECK).pipe(take(1)).subscribe(v
=> this.getInstalledLibrariesList());
}
-const source = timer(1000);
-
-const subscribe = source.subscribe(val => console.log(val));
-
-console.log(source);
-console.log(subscribe);
-}
+ }
public reinstallLibrary(item, lib) {
const retry = [{ group: lib.group, name: lib.name, version: lib.version }];
@@ -361,7 +357,6 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
} else {
this.libs_uploaded = false;
this.uploading = true;
- // this.clear = window.setTimeout(() => this.uploadLibGroups(),
this.CHECK_GROUPS_TIMEOUT);
timer(this.CHECK_GROUPS_TIMEOUT).pipe(take(1)).subscribe(() =>
this.uploadLibGroups());
}
}
@@ -454,9 +449,6 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
this.model.selectedLibs = [];
this.filteredList = [];
this.groupsList = [];
-
-clearTimeout(this.clear);
-clearTimeout(this.loadLibsTimer);
this.selectorsReset(true);
}
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2020 created (now 7d4f352)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2020 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 7d4f352 [DLAB-2020]: Minor changes about library installation This branch includes the following new commits: new 7d4f352 [DLAB-2020]: Minor changes about library installation 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-2020]: Minor changes about library installation
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2020
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 7d4f352c6b494d37f6c615b2f234e0d4f0567467
Author: Dmytro_Gnatyshyn
AuthorDate: Wed Sep 2 15:44:31 2020 +0300
[DLAB-2020]: Minor changes about library installation
---
.../webapp/src/app/core/pipes/highlight.pipe.ts| 2 +-
.../install-libraries.component.html | 4 ++--
.../install-libraries.component.ts | 26 --
3 files changed, 12 insertions(+), 20 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/pipes/highlight.pipe.ts
b/services/self-service/src/main/resources/webapp/src/app/core/pipes/highlight.pipe.ts
index 7bad3a9..652ff58 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/pipes/highlight.pipe.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/pipes/highlight.pipe.ts
@@ -24,7 +24,7 @@ import {PipeTransform, Pipe} from '@angular/core';
@Pipe({ name: 'highlight' })
export class HighLightPipe implements PipeTransform {
transform(text: string, search: string): string {
-return search ? text.replace(new RegExp(search, 'i'), `${search}`) : text;
+return search ? text.replace(new RegExp(search, 'i'), `${text.match(new RegExp(search, 'i'))[0]}`) : text;
}
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
index c54f165..a13eebc 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
@@ -121,8 +121,8 @@
[ngClass]="{'not-allow': lib.name?.length < 2
|| (autoComplete === 'ENABLED' && !isLibSelected )
|| this.selectedLib?.isInSelectedList ||
isVersionInvalid || autoComplete === 'UPDATING'}"
-
- matTooltip="Library is in selected list"
matTooltipPosition="above"
[matTooltipDisabled]="!this.selectedLib?.isInSelectedList"
+ [matTooltip]="this.selectedLib?.isInSelectedList ?
'Library is in selected list' : 'Please select library from autocomplete'"
+ matTooltipPosition="above"
[matTooltipDisabled]="(!this.selectedLib?.isInSelectedList && isLibSelected) ||
lib.name?.length < 2 || !this.selectedLib?.isInSelectedList && autoComplete ===
'NONE'"
>
lib.filteredStatus.some(status => status.status === 'installing'));
if (this.installingInProgress) {
-// window.clearTimeout(this.loadLibsTimer);
-// this.loadLibsTimer = window.setTimeout(() =>
this.getInstalledLibrariesList(), 1);
-timer(1).pipe(take(1)).subscribe(v =>
this.getInstalledLibrariesList());
+timer(this.INSTALLATION_IN_PROGRESS_CHECK).pipe(take(1)).subscribe(v
=> this.getInstalledLibrariesList());
}
-const source = timer(1000);
-
-const subscribe = source.subscribe(val => console.log(val));
-
-console.log(source);
-console.log(subscribe);
-}
+ }
public reinstallLibrary(item, lib) {
const retry = [{ group: lib.group, name: lib.name, version: lib.version }];
@@ -361,7 +357,6 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
} else {
this.libs_uploaded = false;
this.uploading = true;
- // this.clear = window.setTimeout(() => this.uploadLibGroups(),
this.CHECK_GROUPS_TIMEOUT);
timer(this.CHECK_GROUPS_TIMEOUT).pipe(take(1)).subscribe(() =>
this.uploadLibGroups());
}
}
@@ -454,9 +449,6 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
this.model.selectedLibs = [];
this.filteredList = [];
this.groupsList = [];
-
-clearTimeout(this.clear);
-clearTimeout(this.loadLibsTimer);
this.selectorsReset(true);
}
-
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-2015]: Removed Ungit link for Apache Zeppelin on 'Environment management' page (#883)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 89c4de1 [DLAB-2015]: Removed Ungit link for Apache Zeppelin on
'Environment management' page (#883)
89c4de1 is described below
commit 89c4de1f6da6b57015ff62199d7a4eff14413b2f
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Tue Sep 1 17:35:58 2020 +0300
[DLAB-2015]: Removed Ungit link for Apache Zeppelin on 'Environment
management' page (#883)
[DLAB-2015]: Removed Ungit link for Apache Zeppelin on 'Environment
management' page
---
.../detail-dialog/detail-dialog.component.html | 38 ++
1 file changed, 31 insertions(+), 7 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 61e3ab2..038fc28 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
@@ -43,13 +43,37 @@
Open following URL(s) in your browser to access this box:
-
- {{item.description}}:
-
- {{item.url}}{{notebook.name}}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.description}}:
+
+ {{item.url}}
+
+
+
+content_copy
+
+
+
+
+
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/02: Merge branch 'develop' of github.com:apache/incubator-dlab into develop
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2016 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 941516ff5a454d82c1876e833e9d1ecb49895ed0 Merge: 5342439 c7dacbe Author: Dmytro_Gnatyshyn AuthorDate: Tue Sep 1 17:08:39 2020 +0300 Merge branch 'develop' of github.com:apache/incubator-dlab into develop USER_GUIDE.md | 2 +- doc/notebook_list_libs.png | Bin 20684 -> 32756 bytes .../install-libraries.component.ts | 21 ++- .../backendapi/resources/AuditResourceTest.java| 88 + .../backendapi/resources/ProjectResourceTest.java | 210 + 5 files changed, 235 insertions(+), 86 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-2015]: Removed Ungit link for Apache Zeppelin on 'Environment management' page
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2016
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 81573aedc7e5de7ab38cb8cf1428c4541c7017e7
Author: Dmytro_Gnatyshyn
AuthorDate: Tue Sep 1 17:33:47 2020 +0300
[DLAB-2015]: Removed Ungit link for Apache Zeppelin on 'Environment
management' page
---
.../detail-dialog/detail-dialog.component.html | 38 ++
1 file changed, 31 insertions(+), 7 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 61e3ab2..038fc28 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
@@ -43,13 +43,37 @@
Open following URL(s) in your browser to access this box:
-
- {{item.description}}:
-
- {{item.url}}{{notebook.name}}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.description}}:
+
+ {{item.url}}
+
+
+
+content_copy
+
+
+
+
+
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2016 created (now 81573ae)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2016 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 81573ae [DLAB-2015]: Removed Ungit link for Apache Zeppelin on 'Environment management' page This branch includes the following new commits: new 941516f Merge branch 'develop' of github.com:apache/incubator-dlab into develop new 81573ae [DLAB-2015]: Removed Ungit link for Apache Zeppelin on 'Environment management' 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 DLAB-2015 created (now 7b7a8d1)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2015 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 7b7a8d1 upd No new revisions were added by this update. - 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-2015]: Updated image for available group lib list receiving (#881)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 0fb6daa2e [DLAB-2015]: Updated image for available group lib list
receiving (#881)
0fb6daa2e is described below
commit 0fb6daa2e59323c7d2d3d4a8a93dff8141addd85
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Tue Sep 1 13:50:34 2020 +0300
[DLAB-2015]: Updated image for available group lib list receiving (#881)
[DLAB-2015]: [User guide]: Updated image for available group lib list
receiving
---
doc/notebook_list_libs.png | Bin 20684 -> 32756 bytes
.../install-libraries.component.ts | 21 ++---
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/doc/notebook_list_libs.png b/doc/notebook_list_libs.png
index fea4d47..437c9fb 100644
Binary files a/doc/notebook_list_libs.png and b/doc/notebook_list_libs.png
differ
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
index 28afa05..94d7666 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
@@ -124,7 +124,7 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
this.libs_uploaded = false;
this.uploading = true;
-setTimeout(() =>
this.librariesInstallationService.getGroupsList(this.notebook.project,
this.notebook.name, this.model.computational_name)
+this.librariesInstallationService.getGroupsList(this.notebook.project,
this.notebook.name, this.model.computational_name)
.pipe(
takeUntil(this.unsubscribe$),
)
@@ -140,8 +140,7 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
this.group_select && this.group_select.setDefaultOptions(
this.groupsList, 'Select group', 'group_lib', null, 'list',
this.groupsListMap);
},
-error => this.toastr.error(error.message || 'Groups list loading
failed!', 'Oops!')), 1000);
-
+error => this.toastr.error(error.message || 'Groups list loading
failed!', 'Oops!'));
}
private getResourcesList() {
@@ -289,9 +288,16 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
public isInstallingInProgress(): void {
this.installingInProgress = this.notebookLibs.some(lib =>
lib.filteredStatus.some(status => status.status === 'installing'));
if (this.installingInProgress) {
-window.clearTimeout(this.loadLibsTimer);
-this.loadLibsTimer = window.setTimeout(() =>
this.getInstalledLibrariesList(), 1);
+// window.clearTimeout(this.loadLibsTimer);
+// this.loadLibsTimer = window.setTimeout(() =>
this.getInstalledLibrariesList(), 1);
+timer(1).pipe(take(1)).subscribe(v =>
this.getInstalledLibrariesList());
}
+const source = timer(1000);
+
+const subscribe = source.subscribe(val => console.log(val));
+
+console.log(source);
+console.log(subscribe);
}
public reinstallLibrary(item, lib) {
@@ -355,7 +361,8 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
} else {
this.libs_uploaded = false;
this.uploading = true;
- this.clear = window.setTimeout(() => this.uploadLibGroups(),
this.CHECK_GROUPS_TIMEOUT);
+ // this.clear = window.setTimeout(() => this.uploadLibGroups(),
this.CHECK_GROUPS_TIMEOUT);
+ timer(this.CHECK_GROUPS_TIMEOUT).pipe(take(1)).subscribe(() =>
this.uploadLibGroups());
}
}
@@ -411,7 +418,7 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
)
.subscribe((libs: GetLibrary) => {
if (libs.autoComplete === 'UPDATING') {
- timer(50).pipe(
+ timer(5000).pipe(
take(1)
).subscribe(_ => {
this.getMatchedLibs();
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 03/04: [DLAB-2015]: [User guide]: Updated image for available group lib list receiving
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2015
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit ea7d673e982cc3d2a7e83479c93e3d281c2cd00b
Author: Dmytro_Gnatyshyn
AuthorDate: Tue Sep 1 13:47:47 2020 +0300
[DLAB-2015]: [User guide]: Updated image for available group lib list
receiving
---
.../install-libraries.component.ts | 21 ++---
1 file changed, 14 insertions(+), 7 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
index 28afa05..94d7666 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.ts
@@ -124,7 +124,7 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
this.libs_uploaded = false;
this.uploading = true;
-setTimeout(() =>
this.librariesInstallationService.getGroupsList(this.notebook.project,
this.notebook.name, this.model.computational_name)
+this.librariesInstallationService.getGroupsList(this.notebook.project,
this.notebook.name, this.model.computational_name)
.pipe(
takeUntil(this.unsubscribe$),
)
@@ -140,8 +140,7 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
this.group_select && this.group_select.setDefaultOptions(
this.groupsList, 'Select group', 'group_lib', null, 'list',
this.groupsListMap);
},
-error => this.toastr.error(error.message || 'Groups list loading
failed!', 'Oops!')), 1000);
-
+error => this.toastr.error(error.message || 'Groups list loading
failed!', 'Oops!'));
}
private getResourcesList() {
@@ -289,9 +288,16 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
public isInstallingInProgress(): void {
this.installingInProgress = this.notebookLibs.some(lib =>
lib.filteredStatus.some(status => status.status === 'installing'));
if (this.installingInProgress) {
-window.clearTimeout(this.loadLibsTimer);
-this.loadLibsTimer = window.setTimeout(() =>
this.getInstalledLibrariesList(), 1);
+// window.clearTimeout(this.loadLibsTimer);
+// this.loadLibsTimer = window.setTimeout(() =>
this.getInstalledLibrariesList(), 1);
+timer(1).pipe(take(1)).subscribe(v =>
this.getInstalledLibrariesList());
}
+const source = timer(1000);
+
+const subscribe = source.subscribe(val => console.log(val));
+
+console.log(source);
+console.log(subscribe);
}
public reinstallLibrary(item, lib) {
@@ -355,7 +361,8 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
} else {
this.libs_uploaded = false;
this.uploading = true;
- this.clear = window.setTimeout(() => this.uploadLibGroups(),
this.CHECK_GROUPS_TIMEOUT);
+ // this.clear = window.setTimeout(() => this.uploadLibGroups(),
this.CHECK_GROUPS_TIMEOUT);
+ timer(this.CHECK_GROUPS_TIMEOUT).pipe(take(1)).subscribe(() =>
this.uploadLibGroups());
}
}
@@ -411,7 +418,7 @@ export class InstallLibrariesComponent implements OnInit,
OnDestroy {
)
.subscribe((libs: GetLibrary) => {
if (libs.autoComplete === 'UPDATING') {
- timer(50).pipe(
+ timer(5000).pipe(
take(1)
).subscribe(_ => {
this.getMatchedLibs();
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 04/04: upd
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2015 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 7b7a8d1e813e14ac12b7762f4861a389adeba70e Author: Dmytro_Gnatyshyn AuthorDate: Tue Sep 1 13:48:11 2020 +0300 upd --- doc/notebook_list_libs.png | Bin 20684 -> 32756 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/doc/notebook_list_libs.png b/doc/notebook_list_libs.png index fea4d47..437c9fb 100644 Binary files a/doc/notebook_list_libs.png and b/doc/notebook_list_libs.png differ - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 01/04: Merge branch 'develop' of github.com:apache/incubator-dlab into develop
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2015 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 3a591554c004c3cfbc6d7a719baa7eef1f3bbeaf Merge: 47ed005 1aeff4f Author: Dmytro_Gnatyshyn AuthorDate: Mon Aug 31 17:33:21 2020 +0300 Merge branch 'develop' of github.com:apache/incubator-dlab into develop .../src/general/files/aws/tensor_Dockerfile| 1 + .../general/files/azure/deeplearning_Dockerfile| 1 + .../src/general/files/azure/tensor_Dockerfile | 1 + .../src/general/files/gcp/deeplearning_Dockerfile | 1 + .../src/general/files/gcp/tensor_Dockerfile| 1 + .../os/deeplearning_dataengine_create_configs.py | 45 +- .../os/deeplearning_install_dataengine_kernels.py | 9 +- .../scripts/os/tensor_dataengine_create_configs.py | 45 +- .../os/tensor_install_dataengine_kernels.py| 9 +- .../terraform/bin/deploy/provisioning.yml | 2 +- .../terraform/gcp/endpoint/provisioning.yml| 2 +- services/provisioning-service/provisioning.yml | 2 +- .../AutoCompleteEnum.java} | 14 +- .../dlab/backendapi/domain/ExploratoryLibList.java | 4 +- .../resources/InfrastructureInfoResource.java | 2 +- .../resources/dto/LibraryAutoCompleteDTO.java | 3 +- .../resources/dto/ProjectInfrastructureInfo.java | 4 + .../service/InfrastructureInfoService.java | 2 +- .../service/impl/BillingServiceImpl.java | 49 +- .../impl/InfrastructureInfoServiceImpl.java| 86 ++- .../manage-environment-dilog.component.ts | 2 - .../audit/audit-grid/audit-grid.component.html | 2 +- .../audit/audit-grid/audit-grid.component.scss | 8 +- .../reporting-grid/reporting-grid.component.html | 489 .../reporting-grid/reporting-grid.component.scss | 38 +- .../reporting-grid/reporting-grid.component.ts | 59 +- .../app/reports/reporting/reporting.component.ts | 9 +- .../install-libraries.component.html | 27 +- .../install-libraries.component.scss | 1 + .../install-libraries.component.ts | 23 +- .../src/app/shared/navbar/navbar.component.html| 1 - .../src/app/shared/navbar/navbar.component.ts | 16 +- .../webapp/src/assets/styles/_general.scss | 34 ++ .../src/main/resources/webapp/src/styles.scss | 5 +- .../resources/InfrastructureInfoResourceTest.java | 19 +- .../service/impl/BillingServiceImplTest.java | 619 - .../impl/InfrastructureInfoServiceImplTest.java| 387 + 37 files changed, 1599 insertions(+), 423 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2015 created (now 7b7a8d1)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2015 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 7b7a8d1 upd This branch includes the following new commits: new 3a59155 Merge branch 'develop' of github.com:apache/incubator-dlab into develop new 5342439 Merge branch 'develop' of github.com:apache/incubator-dlab into develop new ea7d673 [DLAB-2015]: [User guide]: Updated image for available group lib list receiving new 7b7a8d1 upd The 4 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/04: Merge branch 'develop' of github.com:apache/incubator-dlab into develop
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2015 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 53424398b1dfa6560a3406ac2277dbb978448e13 Merge: 3a59155 f91c779 Author: Dmytro_Gnatyshyn AuthorDate: Tue Sep 1 13:18:23 2020 +0300 Merge branch 'develop' of github.com:apache/incubator-dlab into develop pom.xml | 3 +++ 1 file changed, 3 insertions(+) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-2006 updated (3ab0bd7 -> 6904661)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2006 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 3ab0bd7 [DLAB-2006]: [Billing][Audit]:Set of grid issues add f81c974 [DLAB-2006]: [Billing][Audit]:Set of grid issues add 6904661 [DLAB-2006]: Small fix No new revisions were added by this update. Summary of changes: .../app/reports/reporting/reporting-grid/reporting-grid.component.ts| 1 - .../resources/webapp/src/app/reports/reporting/reporting.component.ts | 2 +- 2 files changed, 1 insertion(+), 2 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: [DLAB-1998]: Prevented lib installation during the process of available libs receiving (#880)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 1aeff4f [DLAB-1998]: Prevented lib installation during the process of
available libs receiving (#880)
1aeff4f is described below
commit 1aeff4f9c1071165775fe95f2d1acc9ac1991148
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Mon Aug 31 17:32:40 2020 +0300
[DLAB-1998]: Prevented lib installation during the process of available
libs receiving (#880)
[DLAB-1998]: Prevented lib installation during the process of available
libs receiving
---
.../manage-environment-dilog.component.ts | 2 -
.../audit/audit-grid/audit-grid.component.html | 2 +-
.../audit/audit-grid/audit-grid.component.scss | 8 +-
.../reporting-grid/reporting-grid.component.html | 489 +++--
.../reporting-grid/reporting-grid.component.scss | 38 +-
.../reporting-grid/reporting-grid.component.ts | 59 ++-
.../app/reports/reporting/reporting.component.ts | 9 +-
.../install-libraries.component.html | 27 +-
.../install-libraries.component.scss | 1 +
.../install-libraries.component.ts | 23 +-
.../src/app/shared/navbar/navbar.component.html| 1 -
.../src/app/shared/navbar/navbar.component.ts | 16 +-
.../webapp/src/assets/styles/_general.scss | 34 ++
.../src/main/resources/webapp/src/styles.scss | 5 +-
14 files changed, 418 insertions(+), 296 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
index 0c42312..7f28631 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
@@ -60,8 +60,6 @@ export class ManageEnvironmentComponent implements OnInit {
public onFormChange() {
this.manageUsersForm.valueChanges.subscribe(value => {
this.isFormChanged = JSON.stringify(this.initialFormState) ===
JSON.stringify(this.manageUsersForm.value);
- console.log(JSON.stringify(this.initialFormState));
- console.log(JSON.stringify(this.manageUsersForm.value));
if ((this.getCurrentTotalValue() && this.getCurrentTotalValue() >=
this.getCurrentUsersTotal())) {
this.manageUsersForm.controls['projects']['controls'].forEach(v => {
v.controls['budget'].errors &&
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
index cfdaa59..2a57cdf 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
@@ -17,7 +17,7 @@
~ under the License.
-->
-
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
index 493e094..28b26bb 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
@@ -20,9 +20,13 @@
.audit-table-wrapper {
width: 100%;
max-height: calc(100vh - 130px);
- overflow: auto;
+ overflow: visible;
box-shadow: 0 3px 5px -1px rgba(0,0,0,.2), 0 6px 10px 0 rgba(0,0,0,.14), 0
1px 18px 0 rgba(0,0,0,.12);
+ &.scroll{
+overflow: auto;
+ }
+
.audit {
width: 100%;
min-width: 1100px;
@@ -303,7 +307,7 @@
.table-footer {
position: sticky;
- bottom: 0;
+ bottom: -1px;
background: inherit;
border-top: 1px solid #E0E0E0;
transform: translateY(-1px);
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
index 1481d53..5fc1301 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
+++
b/servi
[incubator-dlab] 03/04: Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-2006
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2006 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 8d78968186dc783650ec78bdc627fc0058c84557 Merge: 3da4beb 01b0ecb Author: Dmytro_Gnatyshyn AuthorDate: Mon Aug 31 13:00:54 2020 +0300 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-2006 .../src/general/files/aws/tensor_Dockerfile| 1 + .../general/files/azure/deeplearning_Dockerfile| 1 + .../src/general/files/azure/tensor_Dockerfile | 1 + .../src/general/files/gcp/deeplearning_Dockerfile | 1 + .../src/general/files/gcp/tensor_Dockerfile| 1 + .../os/deeplearning_dataengine_create_configs.py | 45 +- .../os/deeplearning_install_dataengine_kernels.py | 9 +- .../scripts/os/tensor_dataengine_create_configs.py | 45 +- .../os/tensor_install_dataengine_kernels.py| 9 +- .../terraform/bin/deploy/provisioning.yml | 2 +- .../terraform/gcp/endpoint/provisioning.yml| 2 +- services/provisioning-service/provisioning.yml | 2 +- .../AutoCompleteEnum.java} | 14 +- .../dlab/backendapi/domain/ExploratoryLibList.java | 4 +- .../resources/dto/LibraryAutoCompleteDTO.java | 3 +- .../service/impl/BillingServiceImpl.java | 62 +-- .../service/impl/BillingServiceImplTest.java | 619 - 17 files changed, 748 insertions(+), 73 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 02/04: [DLAB-2006]: [Billing][Audit]:Set of grid issues
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2006
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 3da4beba25673f7ed45d0a057f975c87b883b3fb
Author: Dmytro_Gnatyshyn
AuthorDate: Mon Aug 31 12:57:17 2020 +0300
[DLAB-2006]: [Billing][Audit]:Set of grid issues
---
.../audit/audit-grid/audit-grid.component.html | 2 +-
.../audit/audit-grid/audit-grid.component.scss | 8 +++--
.../reporting-grid/reporting-grid.component.html | 10 +++
.../reporting-grid/reporting-grid.component.scss | 23 ++-
.../reporting-grid/reporting-grid.component.ts | 34 ++
.../app/reports/reporting/reporting.component.ts | 7 -
.../src/app/shared/navbar/navbar.component.html| 1 -
.../src/app/shared/navbar/navbar.component.ts | 16 --
.../webapp/src/assets/styles/_general.scss | 26 +
9 files changed, 94 insertions(+), 33 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
index cfdaa59..2a57cdf 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html
@@ -17,7 +17,7 @@
~ under the License.
-->
-
+
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
index 493e094..28b26bb 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss
@@ -20,9 +20,13 @@
.audit-table-wrapper {
width: 100%;
max-height: calc(100vh - 130px);
- overflow: auto;
+ overflow: visible;
box-shadow: 0 3px 5px -1px rgba(0,0,0,.2), 0 6px 10px 0 rgba(0,0,0,.14), 0
1px 18px 0 rgba(0,0,0,.12);
+ &.scroll{
+overflow: auto;
+ }
+
.audit {
width: 100%;
min-width: 1100px;
@@ -303,7 +307,7 @@
.table-footer {
position: sticky;
- bottom: 0;
+ bottom: -1px;
background: inherit;
border-top: 1px solid #E0E0E0;
transform: translateY(-1px);
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
index 1481d53..4464991 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
@@ -17,8 +17,8 @@
~ under the License.
-->
-
-
+
+
@@ -256,7 +256,7 @@
close
-
+
done
@@ -279,7 +279,7 @@
-
+
keyboard_arrow_left
@@ -290,7 +290,7 @@
(click)="sctollTo('right')"
[ngClass]="{'not-allowed': !isMaxRight }"
>
-keyboard_arrow_right
+keyboard_arrow_right
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss
index 253d354..9f60383 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss
@@ -21,24 +21,17 @@
width: 100%;
display: block;
max-height: calc(100vh - 130px);
- overflow: auto;
+ overflow: unset;
position: relative;
scroll-behavior: smooth;
box-shadow: 0 3px 5px -1px rgba(0,0,0,.2), 0 6px 10px 0 rgba(0,0,0,.14), 0
1px 18px 0 rgba(0,0,0,.12);
+ &.scroll{
+overflow: auto;
+ }
}
.wrapper{
position: relative;
-
- .buttons{
-position: absolute;
-display: flex;
-justify-content: space-around;
-z-index: 1000;
-bottom: 9px;
-left: 0;
-right: 0;
-
button{
background-color: #fff;
box-shadow: none;
@@ -50,7 +43,7 @@
}
}
}
-}
+
.reporting {
@@ -273,7 +266,7 @@
.table-footer{
position: sticky;
-bottom: 0;
+bottom: -1px;
background: inherit;
borde
[incubator-dlab] branch DLAB-2006 created (now 3ab0bd7)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-2006 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 3ab0bd7 [DLAB-2006]: [Billing][Audit]:Set of grid issues This branch includes the following new commits: new 47ed005 Merge branch 'develop' of github.com:apache/incubator-dlab into develop new 3da4beb [DLAB-2006]: [Billing][Audit]:Set of grid issues new 8d78968 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-2006 new 3ab0bd7 [DLAB-2006]: [Billing][Audit]:Set of grid issues The 4 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/04: Merge branch 'develop' of github.com:apache/incubator-dlab into develop
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-2006 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git commit 47ed00529a79ade8c3ff338564f3f5771216fccc Merge: 8aff266 d26be3e Author: Dmytro_Gnatyshyn AuthorDate: Thu Aug 27 10:24:20 2020 +0300 Merge branch 'develop' of github.com:apache/incubator-dlab into develop .../src/general/lib/azure/actions_lib.py | 36 -- .../com/epam/dlab/backendapi/dao/AuditDAOImpl.java | 7 +++-- .../audit/audit-grid/audit-grid.component.ts | 1 + .../src/app/reports/audit/audit.component.ts | 2 +- 4 files changed, 33 insertions(+), 13 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] 04/04: [DLAB-2006]: [Billing][Audit]:Set of grid issues
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-2006
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 3ab0bd761549b5109f7da50bcb352f7fd336b4cd
Author: Dmytro_Gnatyshyn
AuthorDate: Mon Aug 31 17:19:26 2020 +0300
[DLAB-2006]: [Billing][Audit]:Set of grid issues
---
.../manage-environment-dilog.component.ts | 2 -
.../reporting-grid/reporting-grid.component.html | 489 +++--
.../reporting-grid/reporting-grid.component.scss | 15 +-
.../reporting-grid/reporting-grid.component.ts | 28 +-
.../install-libraries.component.html | 27 +-
.../install-libraries.component.scss | 1 +
.../install-libraries.component.ts | 23 +-
.../webapp/src/assets/styles/_general.scss | 10 +-
.../src/main/resources/webapp/src/styles.scss | 5 +-
9 files changed, 331 insertions(+), 269 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
index 0c42312..7f28631 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/manage-environment/manage-environment-dilog.component.ts
@@ -60,8 +60,6 @@ export class ManageEnvironmentComponent implements OnInit {
public onFormChange() {
this.manageUsersForm.valueChanges.subscribe(value => {
this.isFormChanged = JSON.stringify(this.initialFormState) ===
JSON.stringify(this.manageUsersForm.value);
- console.log(JSON.stringify(this.initialFormState));
- console.log(JSON.stringify(this.manageUsersForm.value));
if ((this.getCurrentTotalValue() && this.getCurrentTotalValue() >=
this.getCurrentUsersTotal())) {
this.manageUsersForm.controls['projects']['controls'].forEach(v => {
v.controls['budget'].errors &&
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
index 4464991..5fc1301 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
@@ -16,282 +16,285 @@
~ specific language governing permissions and limitations
~ under the License.
-->
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Resource name
-
-
-filter_list
-more_vert
-
-
-
- {{element.dlabId}}
-
-
+
+
+ Resource name
+
+
+filter_list
+more_vert
+
+
+
+ {{element.dlabId}}
+
+
-
-
+
+
-
-
-
-
-
- User
-
+
+
+
+
+
+ User
+
-
-
-filter_list
-more_vert
-
-
-
- {{element.user}}
-
-
+
+
+filter_list
+more_vert
+
+
+
+ {{element.user}}
+
+
-
-
+
+
-
-
-
-
-
- Project
-
+
+
+
+
+
+ Project
+
-
-
-filter_list
-more_vert
-
-
-
- {{element.project}}
-
-
+
+
+filter_list
+more_vert
+
+
+
+ {{element.project}}
+
+
-
-
- Resource Type
-
-
-filter_list
-more_vert
-
-
-
- {{element.resource_type |
titlecase}}
-
-
+
+
+ Resource Type
+
+
[incubator-dlab] branch develop updated: [DLAB-2008]: Fixed filter by calendar issue on the audit page (#876)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn 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 d26be3e [DLAB-2008]: Fixed filter by calendar issue on the audit page
(#876)
d26be3e is described below
commit d26be3e0e43504bce61733a3c94752a4d6f4232b
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Wed Aug 26 18:07:16 2020 +0300
[DLAB-2008]: Fixed filter by calendar issue on the audit page (#876)
[DLAB-2008]: Fixed filter by calendar issue on the audit page
---
.../webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts | 1 +
.../src/main/resources/webapp/src/app/reports/audit/audit.component.ts | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
index 95a36d6..e3010ec 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
@@ -107,6 +107,7 @@ export class AuditGridComponent implements OnInit {
public setAvaliblePeriod(period): void {
this.filterAuditData.date_start = period.start_date;
this.filterAuditData.date_end = period.end_date;
+this.buildAuditGrid(true);
}
public toggleFilterRow(): void {
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.component.ts
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.component.ts
index af3919d..14a99be 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.component.ts
@@ -39,7 +39,7 @@ import {MAT_DIALOG_DATA, MatDialogRef} from
'@angular/material/dialog';
-
+
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
