[incubator-dlab] 18/19: [DLAB-866]: rebuild data grid with project top level

[an...@apache.org]

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

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

commit b50ad5cb7d2382420cc9906788ced3ccac2106bd
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Jul 10 18:52:30 2019 +0300

    [DLAB-866]: rebuild data grid with project top level
---
 .../src/app/resources/resources.component.html     | 52 +++++++++++-----------
 .../src/app/resources/resources.component.ts       |  4 +-
 2 files changed, 29 insertions(+), 27 deletions(-)

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 c4fdad8..3020738 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
@@ -17,29 +17,31 @@
   ~ under the License.
   -->
 
-<div class="sub-nav base-retreat">
-  <div>
-    <button mat-raised-button class="butt butt-create" (click)="createEnvironment()"
-      [disabled]="!healthStatus?.projectAssigned">
-      <i class="material-icons">add</i>Create new
-    </button>
+<section class="base-retreat">
+  <div class="sub-nav">
+    <div>
+      <button mat-raised-button class="butt butt-create" (click)="createEnvironment()"
+        [disabled]="!healthStatus?.projectAssigned">
+        <i class="material-icons">add</i>Create new
+      </button>
+    </div>
+    <div>
+      <button mat-raised-button class="butt butt-tool" (click)="manageUngit()">
+        <i class="material-icons"></i>Git credentials
+      </button>
+      <button mat-raised-button class="butt butt-tool" (click)="toggleFiltering()">
+        <span *ngIf="!resourcesGrid.activeFiltering">
+          <i class="material-icons">visibility_off</i> Show active
+        </span>
+        <span *ngIf="resourcesGrid.activeFiltering">
+          <i class="material-icons">visibility</i> Show all
+        </span>
+      </button>
+      <button mat-raised-button class="butt" (click)="refreshGrid()">
+        <i class="material-icons">autorenew</i>Refresh
+      </button>
+    </div>
   </div>
-  <div>
-    <button mat-raised-button class="butt butt-tool" (click)="manageUngit()">
-      <i class="material-icons"></i>Git credentials
-    </button>
-    <button mat-raised-button class="butt butt-tool" (click)="toggleFiltering()">
-      <span *ngIf="!resourcesGrid.activeFiltering">
-        <i class="material-icons">visibility_off</i> Show active
-      </span>
-      <span *ngIf="resourcesGrid.activeFiltering">
-        <i class="material-icons">visibility</i> Show all
-      </span>
-    </button>
-    <button mat-raised-button class="butt" (click)="refreshGrid()">
-      <i class="material-icons">autorenew</i>Refresh
-    </button>
-  </div>
-</div>
-
-<resources-grid></resources-grid>
+  <mat-divider></mat-divider>
+  <resources-grid></resources-grid>
+</section>
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 d59e4a0..4831f99 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
@@ -24,7 +24,7 @@ import { MatDialog } from '@angular/material';
 
 import { ResourcesGridComponent } from './resources-grid/resources-grid.component';
 import { ExploratoryEnvironmentCreateComponent } from './exploratory/create-environment';
-import { ExploratoryModel } from './resources-grid/resources-grid.model';
+import { ExploratoryModel, Exploratory } from './resources-grid/resources-grid.model';
 import { HealthStatusService } from '../core/services';
 import { ManageUngitComponent } from './manage-ungit/manage-ungit.component';
 
@@ -35,7 +35,7 @@ import { ManageUngitComponent } from './manage-ungit/manage-ungit.component';
 })
 
 export class ResourcesComponent implements OnInit {
-  public exploratoryEnvironments: Array<ExploratoryModel> = [];
+  public exploratoryEnvironments: Exploratory[] = [];
   public healthStatus: any;
 
   @ViewChild(ResourcesGridComponent) resourcesGrid: ResourcesGridComponent;


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