You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2021/02/19 16:10:14 UTC
[incubator-datalab] branch DATALAB-2229 updated (b64ae6b -> 04670c6)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DATALAB-2229
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from b64ae6b [DATALAB-2229]: Small fix
add c8b6ca1 [DATALAB-2182]: Refactored UI code (#1018)
add 745e74b [DATALAB-2229]: Multiple endpoints support for Configuration page (#1080)
new 2f521fc Merge branch 'develop' of github.com:apache/incubator-dlab into DATALAB-2229
new 04670c6 [DATALAB-2229]: Small fix
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/resources/webapp/angular.json | 2 +-
.../configuration/configuration.component.html | 12 +-
.../configuration/configuration.component.scss | 3 +-
.../configuration/configuration.component.ts | 2 +-
.../src/app/administration/configuration/index.ts | 24 +-
.../src/app/administration/management/index.ts | 26 +-
.../management-grid/management-grid.component.html | 28 +-
.../management-grid/management-grid.component.scss | 6 +
.../management-grid/management-grid.component.ts | 10 +-
.../project/project-list/project-list.component.ts | 37 +--
.../convert-action-pipe/convert-action.pipe.ts | 1 +
.../src/app/core/services/localization.service.ts | 10 +-
.../src/app/core/services/progress-bar.service.ts | 9 +-
.../webapp/src/app/core/util/checkUtils.ts | 1 -
.../compareUtils.ts} | 31 +-
.../audit/audit-grid/audit-grid.component.html | 16 +-
.../audit/audit-grid/audit-grid.component.ts | 12 +-
.../src/app/reports/audit/audit.component.ts | 10 +-
.../reporting-grid/reporting-grid.component.scss | 12 +
.../reporting-grid/reporting-grid.component.ts | 6 +-
.../app/reports/reporting/reporting.component.ts | 2 +-
.../bucket-browser/bucket-browser.component.html | 28 +-
.../bucket-browser/bucket-browser.component.scss | 291 ++-----------------
.../bucket-browser/bucket-browser.component.ts | 91 +++---
.../bucket-browser/bucket-browser.module.ts | 6 +-
.../bucket-confirmation-dialog.component.html | 15 +-
.../bucket-confirmation-dialog.component.scss | 2 +-
.../bucket-confirmation-dialog.component.ts | 2 +-
.../bucket-browser/bucket-data.service.ts | 104 +++----
.../buckets-tree/bucket-tree.component.ts | 9 +-
.../bucket-browser/upload-window.component.scss | 196 +++++++++++++
.../install-libraries.component.html | 2 +-
.../install-libraries.component.scss | 318 +++++++--------------
.../install-libraries.component.ts | 37 +--
.../libraries-info.component.scss | 261 +++++++++++++++++
.../resources-grid/resources-grid.component.html | 3 +-
.../resources-grid/resources-grid.component.scss | 16 +-
.../resources-grid/resources-grid.component.ts | 38 +--
.../checkbox/checkbox.component.css} | 5 +-
.../checkbox.component.html} | 6 +-
.../checkbox.component.ts} | 28 +-
.../shared/{inform-message => checkbox}/index.ts | 8 +-
.../webapp/src/app/shared/form-controls/index.ts | 18 +-
.../multi-level-select-dropdown.component.html | 69 +++--
.../multi-level-select-dropdown.component.scss | 7 +-
.../multi-level-select-dropdown.component.ts | 18 +-
.../src/app/shared/navbar/navbar.component.html | 3 +-
.../src/app/shared/navbar/navbar.component.ts | 25 +-
.../webapp/src/assets/styles/_dialogs.scss | 8 -
.../resources/webapp/src/assets/styles/_theme.scss | 19 +-
50 files changed, 1014 insertions(+), 879 deletions(-)
copy services/self-service/src/main/resources/webapp/src/app/core/{pipes/convert-file-size/convert-file-size.pipe.ts => util/compareUtils.ts} (56%)
create mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/upload-window.component.scss
create mode 100644 services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/libraries-info.component.scss
copy services/self-service/src/main/resources/webapp/src/app/{core/collections/index.ts => shared/checkbox/checkbox.component.css} (94%)
copy services/self-service/src/main/resources/webapp/src/app/shared/{inform-message/inform-message.component.html => checkbox/checkbox.component.html} (79%)
copy services/self-service/src/main/resources/webapp/src/app/shared/{inform-message/inform-message.component.ts => checkbox/checkbox.component.ts} (60%)
copy services/self-service/src/main/resources/webapp/src/app/shared/{inform-message => checkbox}/index.ts (84%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/02: [DATALAB-2229]: Small fix
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2229
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 04670c68d207524161c1f700ae9dedfabc202e84
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Feb 19 18:09:39 2021 +0200
[DATALAB-2229]: Small fix
[DATALAB-2297]: Fixed total sum sell on billing on Firefox
---
.../reporting-grid/reporting-grid.component.scss | 12 ++++++++
.../bucket-browser/bucket-browser.component.ts | 32 ++++++++++++++--------
2 files changed, 32 insertions(+), 12 deletions(-)
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 63cecf3..34a85e9 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
@@ -397,3 +397,15 @@
bottom: 3px;
}
}
+
+@-moz-document url-prefix() {
+ .totaL-item {
+ &.scrollbar-right{
+ right: 8px !important;
+ }
+
+ &.scrollbar-bottom{
+ bottom: 8px !important;
+ }
+ }
+}
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts
index 98bd2a3..6a6aacd 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.ts
@@ -153,7 +153,7 @@ export class BucketBrowserComponent implements OnInit, OnDestroy {
const files = fullFilesList.filter(v => v.size < this.maxFileSize);
const toBigFile = fullFilesList.length !== files.length;
const toMany = files.length > 50;
- if (files.length > 50) {
+ if (toMany) {
files.length = 50;
}
if (toBigFile || toMany) {
@@ -193,15 +193,22 @@ export class BucketBrowserComponent implements OnInit, OnDestroy {
let askForAll = true;
let skipAll = false;
- const folderFiles = this.folderItems.filter(v => !v.children).map(v => v.item);
+ const folderFiles = this.folderItems.reduce((existFiles, item) => {
+ if (!item.children) {
+ existFiles.push(item.item);
+ }
+ return existFiles;
+ }, []);
+
for (const file of files) {
- const existFile = folderFiles.filter(v => v === file['name'])[0];
+ const existFile = folderFiles.find(v => v === file['name']);
const uploadItem = {
name: file['name'],
file: file,
size: file.size,
path: this.path,
};
+
if (existFile && askForAll) {
const result = await this.openResolveDialog(existFile);
if (result) {
@@ -223,7 +230,7 @@ export class BucketBrowserComponent implements OnInit, OnDestroy {
setTimeout(() => {
const element = document.querySelector('#upload-list');
element && element.scrollIntoView({ block: 'end', behavior: 'smooth' });
- }, 0);
+ }, 10);
}
async openResolveDialog(existFile) {
@@ -273,15 +280,15 @@ export class BucketBrowserComponent implements OnInit, OnDestroy {
.afterClosed().subscribe((res) => {
res && file.subscr.unsubscribe();
res && this.addedFiles.splice(this.addedFiles.indexOf(file), 1);
- this.isFileUploading = !!this.addedFiles.filter(v => v.status === 'uploading').length;
+ this.isFileUploading = this.addedFiles.some(v => v.status === 'uploading');
this.sendFile();
}, () => {
- this.isFileUploading = !!this.addedFiles.filter(v => v.status === 'uploading').length;
+ this.isFileUploading = this.addedFiles.some(v => v.status === 'uploading');
this.sendFile();
});
} else {
this.addedFiles.splice(this.addedFiles.indexOf(file), 1);
- this.isFileUploading = !!this.addedFiles.filter(v => v.status === 'uploading').length;
+ this.isFileUploading = this.addedFiles.some(v => v.status === 'uploading');
this.sendFile();
}
}
@@ -296,6 +303,7 @@ export class BucketBrowserComponent implements OnInit, OnDestroy {
formData.append('endpoint', this.endpoint);
formData.append('file', file.file);
file.status = 'waiting';
+
file.request = this.bucketBrowserService.uploadFile(formData);
this.sendFile(file);
}
@@ -304,7 +312,7 @@ export class BucketBrowserComponent implements OnInit, OnDestroy {
const waitUploading = this.addedFiles.filter(v => v.status === 'waiting');
const uploading = this.addedFiles.filter(v => v.status === 'uploading');
this.isQueueFull = !!waitUploading.length;
- this.isFileUploading = !!this.addedFiles.filter(v => v.status === 'uploading').length;
+ this.isFileUploading = this.addedFiles.some(v => v.status === 'uploading');
// console.log((this.getTokenValidTime() / 1000 / 60 ).toFixed(0) + ' minutes');
if ((this.refreshTokenLimit > this.getTokenValidTime()) && !this.isTokenRefreshing) {
this.refreshToken();
@@ -314,8 +322,8 @@ export class BucketBrowserComponent implements OnInit, OnDestroy {
file = waitUploading[0];
}
file.status = 'uploading';
- this.isFileUploading = !!this.addedFiles.filter(v => v.status === 'uploading').length;
- this.isQueueFull = !!this.addedFiles.filter(v => v.status === 'waiting').length;
+ this.isFileUploading = this.addedFiles.some(v => v.status === 'uploading');
+ this.isQueueFull = this.addedFiles.some(v => v.status === 'waiting');
file.subscr = file.request.subscribe((event: any) => {
if (event.type === HttpEventType.UploadProgress) {
file.progress = Math.round(95 * event.loaded / event.total);
@@ -330,14 +338,14 @@ export class BucketBrowserComponent implements OnInit, OnDestroy {
window.clearInterval(file.interval);
file.status = 'uploaded';
delete file.request;
- this.sendFile(this.addedFiles.filter(v => v.status === 'waiting')[0]);
+ this.sendFile(this.addedFiles.find(v => v.status === 'waiting'));
this.bucketDataService.refreshBucketdata(this.bucketName, this.endpoint);
}
}, error => {
window.clearInterval(file.interval);
file.status = 'failed';
delete file.request;
- this.sendFile(this.addedFiles.filter(v => v.status === 'waiting')[0]);
+ this.sendFile(this.addedFiles.find(v => v.status === 'waiting'));
}
);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/02: Merge branch 'develop' of
github.com:apache/incubator-dlab into DATALAB-2229
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2229
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 2f521fc40e0793caf4cdd1d1c92238fe636b44a5
Merge: b64ae6b 745e74b
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Feb 19 17:16:36 2021 +0200
Merge branch 'develop' of github.com:apache/incubator-dlab into DATALAB-2229
.../src/main/resources/webapp/angular.json | 2 +-
.../configuration/configuration.component.html | 12 +-
.../configuration/configuration.component.scss | 3 +-
.../configuration/configuration.component.ts | 2 +-
.../src/app/administration/configuration/index.ts | 24 +-
.../src/app/administration/management/index.ts | 26 +-
.../management-grid/management-grid.component.html | 28 +-
.../management-grid/management-grid.component.scss | 6 +
.../management-grid/management-grid.component.ts | 10 +-
.../project/project-list/project-list.component.ts | 37 +--
.../convert-action-pipe/convert-action.pipe.ts | 1 +
.../src/app/core/services/localization.service.ts | 10 +-
.../src/app/core/services/progress-bar.service.ts | 9 +-
.../webapp/src/app/core/util/checkUtils.ts | 1 -
.../compareUtils.ts} | 32 +--
.../audit/audit-grid/audit-grid.component.html | 16 +-
.../audit/audit-grid/audit-grid.component.ts | 12 +-
.../src/app/reports/audit/audit.component.ts | 10 +-
.../reporting-grid/reporting-grid.component.ts | 6 +-
.../app/reports/reporting/reporting.component.ts | 2 +-
.../bucket-browser/bucket-browser.component.html | 28 +-
.../bucket-browser/bucket-browser.component.scss | 291 ++-----------------
.../bucket-browser/bucket-browser.component.ts | 59 ++--
.../bucket-browser/bucket-browser.module.ts | 6 +-
.../bucket-confirmation-dialog.component.html | 15 +-
.../bucket-confirmation-dialog.component.scss | 2 +-
.../bucket-confirmation-dialog.component.ts | 2 +-
.../bucket-browser/bucket-data.service.ts | 104 +++----
.../buckets-tree/bucket-tree.component.ts | 9 +-
.../bucket-browser/upload-window.component.scss | 196 +++++++++++++
.../install-libraries.component.html | 2 +-
.../install-libraries.component.scss | 318 +++++++--------------
.../install-libraries.component.ts | 37 +--
.../libraries-info.component.scss | 261 +++++++++++++++++
.../resources-grid/resources-grid.component.html | 3 +-
.../resources-grid/resources-grid.component.scss | 16 +-
.../resources-grid/resources-grid.component.ts | 38 +--
.../checkbox/checkbox.component.css} | 14 +-
.../app/shared/checkbox/checkbox.component.html | 23 ++
.../checkbox/checkbox.component.ts} | 29 +-
.../checkbox/index.ts} | 26 +-
.../webapp/src/app/shared/form-controls/index.ts | 18 +-
.../multi-level-select-dropdown.component.html | 69 +++--
.../multi-level-select-dropdown.component.scss | 7 +-
.../multi-level-select-dropdown.component.ts | 18 +-
.../src/app/shared/navbar/navbar.component.html | 3 +-
.../src/app/shared/navbar/navbar.component.ts | 25 +-
.../webapp/src/assets/styles/_dialogs.scss | 8 -
.../resources/webapp/src/assets/styles/_theme.scss | 19 +-
49 files changed, 1008 insertions(+), 887 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org