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 e4ab8f7 [DLAB-1965]: Fixed bucket browser issue (#828) e4ab8f7 is described below commit e4ab8f787eb1c8c448d7661e514a58105e3a1c2e Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com> AuthorDate: Fri Jul 24 09:48:10 2020 +0300 [DLAB-1965]: Fixed bucket browser issue (#828) --- .../resources/resources-grid/resources-grid.component.ts | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 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 810304b..69e8b02 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 @@ -260,11 +260,15 @@ export class ResourcesGridComponent implements OnInit { if (endpoint.status === 'ACTIVE') { const currEndpoint: SharedEndpoint = project.projectEndpoints[endpoint.name]; const edgeItem: BucketList = {name: `${project.project} (${endpoint.name})`, children: [], cloud: endpoint.cloudProvider}; - const projectBucket: string = currEndpoint.user_own_bicket_name - || currEndpoint.user_own_bucket_name - || currEndpoint.user_container_name ? currEndpoint.user_storage_account_name + '.' + currEndpoint.user_container_name : null; - const sharedBucket: string = currEndpoint.shared_bucket_name || - currEndpoint.shared_container_name ? currEndpoint.shared_storage_account_name + '.' + currEndpoint.shared_container_name : null; + let projectBucket: string = currEndpoint.user_own_bicket_name + || currEndpoint.user_own_bucket_name; + if (currEndpoint.user_container_name) { + projectBucket = currEndpoint.user_storage_account_name + '.' + currEndpoint.user_container_name; + } + let sharedBucket: string = currEndpoint.shared_bucket_name; + if (currEndpoint.shared_container_name) { + sharedBucket = currEndpoint.shared_storage_account_name + '.' + currEndpoint.shared_container_name; + } if (projectBucket && currEndpoint.status !== 'terminated' && currEndpoint.status !== 'terminating' && currEndpoint.status !== 'failed') { edgeItem.children.push({name: projectBucket, endpoint: endpoint.name}); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org