[incubator-dlab] branch develop updated: Fixed endpoint disconnecting issue

[dgnatyshyn]

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 26cb3ae  Fixed endpoint disconnecting issue
     new 315ee25  Merge remote-tracking branch 'origin/develop' into develop
26cb3ae is described below

commit 26cb3ae9af532deb17c9cd714c9303ec66d2be0f
Author: Dmytro_Gnatyshyn <di1...@ukr.net>
AuthorDate: Thu Jun 18 13:22:48 2020 +0300

    Fixed endpoint disconnecting issue
---
 .../src/app/resources/resources-grid/resources-grid.component.ts    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
 
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
index 70cf223..164b539 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
@@ -349,10 +349,9 @@ export class ResourcesGridComponent implements OnInit {
           return;
         }
         const currEndpoint = project.projectEndpoints[key];
-        const provider: string =  project.endpoints.filter(endpoint => 
endpoint['name'] === key)[0]['cloudProvider'];
         const edgeItem = {name: `${project.project} (${key})`, children: []};
-        const projectBucket = 
currEndpoint[this.DICTIONARY[provider.toLowerCase()].bucket_name];
-        const sharedBucket = 
currEndpoint[this.DICTIONARY[provider.toLowerCase()].shared_bucket_name];
+        const projectBucket = currEndpoint.user_own_bicket_name || 
currEndpoint.user_own_bucket_name || currEndpoint.user_container_name;
+        const sharedBucket = currEndpoint.shared_bucket_name || 
currEndpoint.shared_container_name;
         if (projectBucket && currEndpoint.status !== 'terminated' && 
currEndpoint.status !== 'terminating' && currEndpoint.status !== 'failed') {
           edgeItem.children.push({name: projectBucket, endpoint: key});
         }
@@ -362,7 +361,6 @@ export class ResourcesGridComponent implements OnInit {
         return edgeItem;
       }).filter(v => v);
     });
-
     this.bucketsList = SortUtils.flatDeep(bucketsList, 1).filter(v => 
v.children.length);
   }
 


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