[incubator-dlab] branch develop updated: [DLAB-1804]: Added hint if user have not any active project (#774)

[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 68ec345  [DLAB-1804]: Added hint if user have not any active project 
(#774)
68ec345 is described below

commit 68ec3457cb36e20bdc8cac2a13d05992ea962e95
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Mon Jun 1 17:20:39 2020 +0300

    [DLAB-1804]: Added hint if user have not any active project (#774)
---
 .../resources/exploratory/detail-dialog/detail-dialog.component.ts  | 6 +++++-
 .../resources/webapp/src/app/resources/resources.component.html     | 2 +-
 .../main/resources/webapp/src/app/resources/resources.component.ts  | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
 
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
index 211ab56..f282d0d 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
@@ -135,8 +135,12 @@ export class DetailDialogComponent implements OnInit {
   }
 
   public bucketBrowser(bucketName, endpoint, permition): void {
+    if (!permition) {
+      return;
+    }
     bucketName = this.isBucketAllowed ? this.notebook.bucket_name : 
this.data.buckets[0].children[0].name;
-    permition && this.dialog.open(BucketBrowserComponent, { data:
+    // bucketName = 'ofuks-1304-pr2-local-bucket';
+    this.dialog.open(BucketBrowserComponent, { data:
         {bucket: bucketName, endpoint: endpoint, bucketStatus: 
this.bucketStatus, buckets: this.data.buckets},
       panelClass: 'modal-fullscreen' })
     .afterClosed().subscribe();
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html
 
b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html
index d028240..d47559f 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html
@@ -23,8 +23,8 @@
       <span
         matTooltip="{{!healthStatus?.projectAssigned ? 'You are not assigned 
to any project' : 'You have not any active project'}}"
         matTooltipPosition="above"
-        matTooltipDisabled="{{healthStatus?.projectAssigned && 
resourcesGrid.activeProjectsList?.length}}"
         [matTooltipClass]="'bucket-item-tooltip'"
+        [matTooltipDisabled]="healthStatus?.projectAssigned && 
resourcesGrid.activeProjectsList?.length !== 0"
       >
         <span>{{resourcesGrid.activeProject}}</span>
       <button mat-raised-button class="butt butt-create" 
(click)="createEnvironment()"
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
 
b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
index 6308b72..301509d 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
+++ 
b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.ts
@@ -53,7 +53,6 @@ export class ResourcesComponent implements OnInit {
   ngOnInit() {
     this.getEnvironmentHealthStatus();
     this.exploratoryEnvironments = this.resourcesGrid.environments;
-
   }
 
   public createEnvironment(): void {


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