You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/04/14 14:29:08 UTC

[incubator-dlab] branch for_video updated: Added new data to bucket browser

This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a commit to branch for_video
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/for_video by this push:
     new f5a1890  Added new data to bucket browser
f5a1890 is described below

commit f5a189073246b66f6f53699da5566eaa7f0abeed
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Apr 14 17:28:50 2020 +0300

    Added new data to bucket browser
---
 .../app/core/services/bucket-browser.service.ts    | 138 +++++++++++++++++++++
 .../bucket-browser/bucket-browser.component.html   |   6 +-
 .../bucket-browser/bucket-browser.component.scss   |  10 ++
 .../bucket-browser/bucket-browser.component.ts     |   2 +-
 4 files changed, 152 insertions(+), 4 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 fca1ba5..4888ec5 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
@@ -21,6 +21,75 @@ export class TodoItemFlatNode {
 let TREE_DATA = {};
 const local = {
   'dlab-local-shared-bucket': {
+    jupyter: {
+      'py2': {
+        'airports': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+          'part-00001-0e9a698b-9sa2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.03},
+        },
+        'carriers': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+          'part-00001-0e9a698b-9sa2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.03},
+        },
+        'flight': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.06},
+          'part-00001-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.05},
+          'part-00001-0e9a698b-9sa2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.03},
+        },
+       },
+      'py3': {
+        'airports': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+          'part-00001-0e9a698b-9sa2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.03},
+        },
+        'carriers': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+          'part-00001-0e9a698b-9sa2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.03},
+        },
+        'flight': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.06},
+          'part-00001-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.05},
+          'part-00001-0e9a698b-9sa2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.03},
+        },
+      },
+      'r': {
+        'airports': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+        },
+        'carriers': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+        },
+        'flight': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.06},
+          'part-00001-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.05},
+        },
+      },
+      'scala': {
+        'airports': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+        },
+        'carriers': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+        },
+        'flight': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.06},
+          'part-00001-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.05},
+        },
+      },
+      '.DS_Store': {size: 0.01},
+    },
     // folder: {
     //   folder: {
     //     folder: ['2008.cvs.bz2', 'airports.csv', 'carriers.csv'],
@@ -46,6 +115,75 @@ const projecta = {
     //   'file2': {size: 123.32},
     //   'file3': {size: 5.34},
     // },
+    jupyter: {
+      'py2': {
+        'airports': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+          'part-00001-0e9a698b-9sa2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.03},
+        },
+        'carriers': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+          'part-00001-0e9a698b-9sa2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.03},
+        },
+        'flight': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.06},
+          'part-00001-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.05},
+          'part-00001-0e9a698b-9sa2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.03},
+        },
+      },
+      'py3': {
+        'airports': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+          'part-00001-0e9a698b-9sa2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.03},
+        },
+        'carriers': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+          'part-00001-0e9a698b-9sa2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.03},
+        },
+        'flight': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.06},
+          'part-00001-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.05},
+          'part-00001-0e9a698b-9sa2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.03},
+        },
+      },
+      'r': {
+        'airports': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+        },
+        'carriers': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+        },
+        'flight': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.06},
+          'part-00001-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.05},
+        },
+      },
+      'scala': {
+        'airports': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+        },
+        'carriers': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.02},
+        },
+        'flight': {
+          '_SUCCESS': {size: 0.01},
+          'part-00000-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.06},
+          'part-00001-0e9a698b-9ce2-4c86-a9eb-b624d0f292fc-c000.snappy.parquet': {size: 0.05},
+        },
+      },
+      '.DS_Store': {size: 0.01},
+    },
     '2008.cvs.bz2': {size: 125.34},
     'airports.csv': {size: 33.12},
     'carriers.csv': {size: 46.13},
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 79c272d..8cfe965 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
@@ -51,10 +51,10 @@
                   </span>
                 <span class="item-name">{{file.item}}</span>
               </div>
-              <div class="size">{{file.size}}MB</div>
-              <div class="progress-wrapper">
+              <div class="size file-size">{{file.size}}MB</div>
+<!--              <div class="progress-wrapper">-->
 <!--                <div class="progres" *ngIf="file.isSelected"><div class="bar"></div></div>-->
-              </div>
+<!--              </div>-->
             </div>
 
           </li>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
index e94b699..a51ff29 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.scss
@@ -94,6 +94,8 @@
         flex:2;
         display: flex;
         align-items: center;
+        overflow: hidden;
+
 
         &-folder{
           span{
@@ -106,12 +108,19 @@
 
           span.item-name{
             padding-left: 14px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
           }
         }
       }
 
       .size{
         flex:1;
+        &.file-size{
+          text-align: right;
+          padding-right: 35px;
+        }
       }
 
       .progress-wrapper{
@@ -220,6 +229,7 @@
   border: 2px solid lightgrey;
   margin-top: 2px;
   position: relative;
+  min-width: 16px;
 
   &.checked {
     border-color: #35afd5;
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 203bd08..18a3fb4 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
@@ -38,7 +38,7 @@ export class BucketBrowserComponent implements OnInit {
   path = '';
 
   @ViewChild(FolderTreeComponent, {static: true}) folderTreeComponent;
-  private selectedFolder: any;
+  public selectedFolder: any;
   private isUploading: boolean;
   private selected: any[];
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org