[incubator-dlab] branch develop updated: [DLAB-1775]: Fixed bugs, changed file uploading (#720)
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 cc42dcc [DLAB-1775]: Fixed bugs, changed file uploading (#720)
cc42dcc is described below
commit cc42dccfbf2989aa9e372e508318c1e502c644bc
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Mon May 4 19:49:01 2020 +0300
[DLAB-1775]: Fixed bugs, changed file uploading (#720)
---
.../resources/webapp/src/app/core/util/patterns.ts | 1 +
.../bucket-browser/bucket-browser.component.html | 138 +
.../bucket-browser/bucket-browser.component.scss | 170 -
.../bucket-browser/bucket-browser.component.ts | 52 +--
.../bucket-browser/bucket-data.service.ts | 33 ++--
.../folder-tree/folder-tree.component.html | 25 ++-
.../folder-tree/folder-tree.component.scss | 64 +++-
.../folder-tree/folder-tree.component.ts | 48 +-
.../detail-dialog/detail-dialog.component.html | 8 +-
.../detail-dialog/detail-dialog.component.scss | 10 +-
.../webapp/src/assets/styles/_dialogs.scss | 7 +
11 files changed, 453 insertions(+), 103 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
index ac9137f..cf8bfd3 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
@@ -24,5 +24,6 @@ export const PATTERNS = {
url: '[a-zA-Z0-9.://%#&\\.@:%-_\+~#=]*\.[^\s]*[a-zA-Z0-9]/+',
nodeCountPattern: '^[1-9]\\d*$',
integerRegex: '^[0-9]*$',
+ folderRegex: `[A-Za-z0-9]+$`,
fullUrl:
/^(http?|ftp|https):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+([.:])(\d{4}|com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*\/$/
};
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 1de656e..1514359 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
@@ -23,11 +23,12 @@
+
-
-
+
+
Add file
@@ -36,96 +37,113 @@
mat-raised-button
type="button"
class="butt action"
- (click)="folderTreeComponent.addNewItem(selectedFolder, '', false)"
- [disabled]="!this.bucketStatus.upload"
+ (click)="createFolder(selectedFolder)"
+ [disabled]="!this.bucketStatus.upload || allDisable"
>
Create folder
+
+
+Delete
+
+
+
+
+
+ Download
+
+
+
+
+
-Bucket path:
{{path}}
+Bucket path:
{{path}}
-
+
-
+
+
+Name
+Size
+Last modified
+
+
+
+
-
-
- folder{{file.item}}
-
-
-
-
+
+ folder{{file.item}}
+ -
+ -
+
+
+
-
+
-
+
-{{file.item}}
+{{file.item}}
- {{file.size.size}}
- {{file.size.lastModifiedDate }}
+ {{file.size?.size}}
+ {{file.size?.lastModifiedDate }}
-
-
-
-
-
-
- {{file.item}}
- {{file.size}}MB
-
-
-
- close
-
Close
-
-
- Download
-
-
-
-
-Delete
-
-
-
- Upload
-
+
+
+ Upload files
+
+
+
+
+ {{file.name}}
+ {{file.path}}
+ {{file.size}}MB
+
+Upload
+
+Uploaded
+Uploading
error
+
+
[incubator-dlab] branch DLAB-1775 updated (3c76206 -> ac6021a)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-1775 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 3c76206 [DLAB-1775]: Fixed bugs, changed file uploading add a5276a8 fixed build bug (#712) add c0a93ab Updated NOTICE add 7eeb71c updated copyright add ac6021a Merge branch 'develop' into DLAB-1775 No new revisions were added by this update. Summary of changes: NOTICE | 2 +- .../scripts/deploy_keycloak/templates/nginx.conf| 21 + .../terraform/bin/deploy/__init__.py| 20 .../src/app/core/services/progress-bar.service.ts | 19 +++ .../webapp/src/app/core/util/http-methods.ts| 20 +++- .../bucket-browser/bucket-browser.component.ts | 1 + .../edge-action-dialog.component.ts | 19 +++ 7 files changed, 100 insertions(+), 2 deletions(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-1775 created (now 3c76206)
This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a change to branch DLAB-1775 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 3c76206 [DLAB-1775]: Fixed bugs, changed file uploading This branch includes the following new commits: new 3c76206 [DLAB-1775]: Fixed bugs, changed file uploading 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-1775]: Fixed bugs, changed file uploading
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1775
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 3c76206ec4ce05f8703d0e6322ffd608dfe51c41
Author: Dmytro Gnatyshyn
AuthorDate: Mon May 4 19:45:22 2020 +0300
[DLAB-1775]: Fixed bugs, changed file uploading
---
.../resources/webapp/src/app/core/util/patterns.ts | 1 +
.../bucket-browser/bucket-browser.component.html | 138 +
.../bucket-browser/bucket-browser.component.scss | 170 -
.../bucket-browser/bucket-browser.component.ts | 53 +--
.../bucket-browser/bucket-data.service.ts | 33 ++--
.../folder-tree/folder-tree.component.html | 25 ++-
.../folder-tree/folder-tree.component.scss | 64 +++-
.../folder-tree/folder-tree.component.ts | 48 +-
.../detail-dialog/detail-dialog.component.html | 8 +-
.../detail-dialog/detail-dialog.component.scss | 10 +-
.../webapp/src/assets/styles/_dialogs.scss | 7 +
11 files changed, 453 insertions(+), 104 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
index ac9137f..cf8bfd3 100644
---
a/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/core/util/patterns.ts
@@ -24,5 +24,6 @@ export const PATTERNS = {
url: '[a-zA-Z0-9.://%#&\\.@:%-_\+~#=]*\.[^\s]*[a-zA-Z0-9]/+',
nodeCountPattern: '^[1-9]\\d*$',
integerRegex: '^[0-9]*$',
+ folderRegex: `[A-Za-z0-9]+$`,
fullUrl:
/^(http?|ftp|https):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+([.:])(\d{4}|com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*\/$/
};
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 1de656e..1514359 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
@@ -23,11 +23,12 @@
+
-
-
+
+
Add file
@@ -36,96 +37,113 @@
mat-raised-button
type="button"
class="butt action"
- (click)="folderTreeComponent.addNewItem(selectedFolder, '', false)"
- [disabled]="!this.bucketStatus.upload"
+ (click)="createFolder(selectedFolder)"
+ [disabled]="!this.bucketStatus.upload || allDisable"
>
Create folder
+
+
+Delete
+
+
+
+
+
+ Download
+
+
+
+
+
-Bucket path:
{{path}}
+Bucket path:
{{path}}
-
+
-
+
+
+Name
+Size
+Last modified
+
+
+
+
-
-
- folder{{file.item}}
-
-
-
-
+
+ folder{{file.item}}
+ -
+ -
+
+
+
-
+
-
+
-{{file.item}}
+{{file.item}}
- {{file.size.size}}
- {{file.size.lastModifiedDate }}
+ {{file.size?.size}}
+ {{file.size?.lastModifiedDate }}
-
-
-
-
-
-
- {{file.item}}
- {{file.size}}MB
-
-
-
- close
-
Close
-
-
- Download
-
-
-
-
-Delete
-
-
-
- Upload
-
+
+
+ Upload files
+
+
+
+
+ {{file.name}}
+ {{file.path}}
+ {{file.size}}MB
+
+Upload
+
+Uploaded
+Uploading
error
+
+ close
+
+
+
Please wait until DLab loads bucket: {{data.bucket}}...
-
diff --git
[incubator-dlab] branch audit updated: Added audit support for projects
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch audit
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/audit by this push:
new 28ed0cb Added audit support for projects
28ed0cb is described below
commit 28ed0cbf82651b376f667e034fa54246abcf69fd
Author: Oleh Fuks
AuthorDate: Mon May 4 17:47:10 2020 +0300
Added audit support for projects
---
services/self-service/self-service.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/services/self-service/self-service.yml
b/services/self-service/self-service.yml
index a5e2c15..f4117ff 100644
--- a/services/self-service/self-service.yml
+++ b/services/self-service/self-service.yml
@@ -52,7 +52,7 @@ roleDefaultAccess: true
billingSchedulerEnabled: false
# Set to true to enable audit
auditEnabled: true
- # Name of configuration file for billing report.
+# Name of configuration file for billing report.
<#if DEV_MODE == "true">
billingConfFile: ${sys['user.dir']}/../billing/billing.yml
<#else>
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch audit created (now e688b73)
This is an automated email from the ASF dual-hosted git repository. ofuks pushed a change to branch audit in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at e688b73 Added audit support for projects This branch includes the following new commits: new e688b73 Added audit support for projects 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: Added audit support for projects
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch audit
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit e688b732aa1f87bbff80544ca44b0045a9e951c9
Author: Oleh Fuks
AuthorDate: Mon May 4 17:44:34 2020 +0300
Added audit support for projects
---
services/self-service/self-service.yml | 6 +-
.../com/epam/dlab/backendapi/annotation/Audit.java | 33 +++
.../com/epam/dlab/backendapi/annotation/Info.java | 30 +++
.../dlab/backendapi/annotation/ResourceName.java | 30 +++
.../conf/SelfServiceApplicationConfiguration.java | 7 ++
.../com/epam/dlab/backendapi/dao/AuditDAO.java | 26 ++
.../com/epam/dlab/backendapi/dao/AuditDAOImpl.java | 31 +++
.../java/com/epam/dlab/backendapi/dao/BaseDAO.java | 2 +
.../dlab/backendapi/domain/AuditActionEnum.java| 24 +
.../AuditCreateDTO.java} | 42 ++---
.../com/epam/dlab/backendapi/domain/AuditDTO.java | 32 +++
.../backendapi/interceptor/AuditInterceptor.java | 100 +
.../backendapi/modules/CloudProviderModule.java| 11 ++-
.../epam/dlab/backendapi/modules/DevModule.java| 6 ++
.../dlab/backendapi/modules/ProductionModule.java | 6 ++
.../dlab/backendapi/resources/ProjectResource.java | 8 +-
.../resources/dto/HealthStatusPageDTO.java | 2 +
.../epam/dlab/backendapi/service/AuditService.java | 26 ++
.../dlab/backendapi/service/ProjectService.java| 5 +-
.../backendapi/service/impl/AuditServiceImpl.java | 39
.../impl/InfrastructureInfoServiceImpl.java| 1 +
.../service/impl/ProjectServiceImpl.java | 95
22 files changed, 499 insertions(+), 63 deletions(-)
diff --git a/services/self-service/self-service.yml
b/services/self-service/self-service.yml
index df92c25..a5e2c15 100644
--- a/services/self-service/self-service.yml
+++ b/services/self-service/self-service.yml
@@ -50,8 +50,10 @@ roleDefaultAccess: true
# Set to true to enable the scheduler of billing report.
billingSchedulerEnabled: false
-# Name of configuration file for billing report.
-<#if DEV_MODE == "true">
+# Set to true to enable audit
+auditEnabled: true
+ # Name of configuration file for billing report.
+ <#if DEV_MODE == "true">
billingConfFile: ${sys['user.dir']}/../billing/billing.yml
<#else>
billingConfFile: ${DLAB_CONF_DIR}/billing.yml
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/Audit.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/Audit.java
new file mode 100644
index 000..d6bd5e9
--- /dev/null
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/Audit.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package com.epam.dlab.backendapi.annotation;
+
+import com.epam.dlab.backendapi.domain.AuditActionEnum;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Audit {
+AuditActionEnum action();
+}
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/Info.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/Info.java
new file mode 100644
index 000..44ca32b
--- /dev/null
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/annotation/Info.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the
[incubator-dlab] branch DLAB-515 updated: [DLAB-515]: Notebooks deploing fixed/Hrrps_proxy added
This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DLAB-515
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-515 by this push:
new da70c67 [DLAB-515]: Notebooks deploing fixed/Hrrps_proxy added
da70c67 is described below
commit da70c673e51199438c950c1022508d2ce37f5ba7
Author: bodnarmykola
AuthorDate: Mon May 4 11:30:30 2020 +0300
[DLAB-515]: Notebooks deploing fixed/Hrrps_proxy added
---
.../src/general/conf/dlab.ini | 14 +++
.../src/general/lib/os/debian/notebook_lib.py | 45 ++
.../general/scripts/aws/common_prepare_notebook.py | 2 +-
3 files changed, 38 insertions(+), 23 deletions(-)
diff --git a/infrastructure-provisioning/src/general/conf/dlab.ini
b/infrastructure-provisioning/src/general/conf/dlab.ini
index c0b8f43..805b33e 100644
--- a/infrastructure-provisioning/src/general/conf/dlab.ini
+++ b/infrastructure-provisioning/src/general/conf/dlab.ini
@@ -62,7 +62,7 @@ allowed_ip_cidr = '0.0.0.0/0'
network_type = public
### Additional tags in format 'Key1:Value1;Key2:Value2'
# additional_tags =
-pip_version = 9.0.3
+pip_version = 20.1
### Billing tag key
billing_tag_key = product
### Billing tag value
@@ -231,7 +231,7 @@ hadoop_version = 2.7
### Version of Jupyter to be installed on notebook
jupyter_version = 6.0.2
### Version of TensorFlow to be installed on notebook
-tensorflow_version = 1.8.0
+tensorflow_version = 2.1.0
### Version of Zeppelin to be installed on notebook
zeppelin_version = 0.8.2
### Version of Rstudio to be installed on notebook
@@ -245,7 +245,7 @@ multiple_clusters = false
### R China mirror
r_mirror = http://mirror.lzu.edu.cn/CRAN/
### NVidia driver version for Tensor/DeepLearning notebooks
-nvidia_version = 440.64.00
+nvidia_version = 418.126.02
### Caffe library version for DeepLearning notebook
caffe_version = 1.0
### Caffe2 library version for DeepLearning notebook
@@ -262,13 +262,13 @@ keras_version = 2.1.6
### Theano library version for Tensor/DeepLearning notebook
theano_version = 1.0.3
### Version of CUDA
-cuda_version = 10.2
+cuda_version = 10.1
### Name of CUDA file
-cuda_file_name = cuda_10.2.89_440.33.01_linux.run
+cuda_file_name = cuda_10.1.243_418.87.00_linux.run
### Version of CUDNN
cudnn_version = 7.6.5
### Name of CUDNN file
-cudnn_file_name = cudnn-10.2-linux-x64-v7.6.5.tgz
+cudnn_file_name = cudnn-10.1-linux-x64-v7.6.5.32.tgz
### R enabled on Jupyter/Zeppelin notebook
r_enabled = true
### Temporary fixed python libraries due to dependencies
@@ -277,7 +277,7 @@ ipykernel_version = 4.8.2
### Version of ungit if previous needed. Use latest as default.
ungit_version = 1.4.36
### Numpy version
-numpy_version = 1.14.3
+numpy_version = 1.18.3
### Apache Ivy version
ivy_version = 2.4.0
### Matplotlib version
diff --git
a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
index f6af16d..b4b6576 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -140,9 +140,9 @@ def install_rstudio(os_user, local_spark_path,
rstudio_pass, rstudio_version):
sudo('''echo 'Sys.setenv(https_proxy = \"{}\")' >>
/home/{}/.Rprofile'''.format(https_proxy, os_user))
sudo('rstudio-server start')
sudo('echo "{0}:{1}" | chpasswd'.format(os_user, rstudio_pass))
-sudo("sed -i '/exit 0/d' /etc/rc.local")
-sudo('''bash -c "echo \'sed -i 's/^#SPARK_HOME/SPARK_HOME/'
/home/{}/.Renviron\' >> /etc/rc.local"'''.format(os_user))
-sudo("bash -c 'echo exit 0 >> /etc/rc.local'")
+#sudo("sed -i '/exit 0/d' /etc/rc.local")
+#sudo('''bash -c "echo \'sed -i 's/^#SPARK_HOME/SPARK_HOME/'
/home/{}/.Renviron\' >> /etc/rc.local"'''.format(os_user))
+#sudo("bash -c 'echo exit 0 >> /etc/rc.local'")
sudo('touch /home/{}/.ensure_dir/rstudio_ensured'.format(os_user))
except:
sys.exit(1)
@@ -212,7 +212,7 @@ def ensure_additional_python_libs(os_user):
try:
manage_pkg('-y install', 'remote', 'libjpeg8-dev zlib1g-dev')
if os.environ['application'] in ('jupyter', 'zeppelin'):
-sudo('pip2 install NumPy=={} SciPy pandas Sympy Pillow sklearn
--no-cache-dir'.format(os.environ['notebook_numpy_version']))
+sudo('pip2 install NumPy==1.14.3 SciPy pandas Sympy Pillow
sklearn --no-cache-dir'.format(os.environ['notebook_numpy_version']))
sudo('pip3 install NumPy=={} SciPy pandas Sympy Pillow sklearn
--no-cache-dir'.format(os.environ['notebook_numpy_version']))
if os.environ['application'] in ('tensor', 'deeplearning'):
sudo('pip2 install
