You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/10/18 14:42:10 UTC

[incubator-dlab] branch DLAB-1057 created (now edb3abe)

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

ankovalyshyn pushed a change to branch DLAB-1057
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


      at edb3abe  [DLAB-1157]: set selected active project on resource creation

This branch includes the following new commits:

     new 1e6435e  [DLAB-1157]: added project selector control
     new f01ddf4  [DLAB-1157]: added project selector control
     new 460705a  [DLAB-1157]: extend filtering config model; active project selection
     new edb3abe  [DLAB-1157]: set selected active project on resource creation

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



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


[incubator-dlab] 01/04: [DLAB-1157]: added project selector control

Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 1e6435e5820d9ef45e4780327e6cbe26415438ca
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Oct 16 15:50:18 2019 +0300

    [DLAB-1157]: added project selector control
---
 .../src/app/resources/resources.component.html      | 21 ++++++++++++++++++++-
 .../src/app/resources/resources.component.scss      | 10 ++++++++++
 .../webapp/src/app/resources/resources.component.ts | 18 +++++++++++++++---
 .../webapp/src/app/resources/resources.module.ts    |  2 +-
 .../resources/webapp/src/assets/styles/_theme.scss  |  4 ++++
 5 files changed, 50 insertions(+), 5 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 7595650..db7b9da 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
@@ -19,11 +19,30 @@
 
 <div class="base-retreat">
   <div class="sub-nav">
-    <div>
+    <div class="selection">
       <button mat-raised-button class="butt butt-create" (click)="createEnvironment()"
         [disabled]="!healthStatus?.projectAssigned">
         <i class="material-icons">add</i>Create new
       </button>
+
+      <div class="mat-reset">
+        <!-- *ngIf="!projects.length -->
+        <div class="control selector-wrapper">
+          <mat-form-field>
+            <mat-label>Select active project</mat-label>
+            <mat-select>
+              <mat-option *ngFor="let project of projects" [value]="project.name" (click)="setActiveProject(project)">
+                {{ project.name }}</mat-option>
+              <mat-option *ngIf="!projects.length" class="multiple-select ml-10" disabled>Projects list is empty
+              </mat-option>
+            </mat-select>
+            <button class="caret">
+              <i class="material-icons">keyboard_arrow_down</i>
+            </button>
+          </mat-form-field>
+        </div>
+      </div>
+
     </div>
     <div>
       <button mat-raised-button class="butt butt-tool" (click)="manageUngit()">
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.scss
index e4a13ae..c8f91ee 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.scss
@@ -22,7 +22,17 @@
 }
 
 .butt {
+  &.butt-create {
+    margin-right: 10px;
+  }
+
   &.butt-tool {
     margin-right: 10px;
   }
 }
+
+.base-retreat {
+  .selector-wrapper {
+    height: 38px;
+  }
+}
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 eb7e4bd..bc1459e 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,9 +24,10 @@ import { MatDialog } from '@angular/material/dialog';
 
 import { ResourcesGridComponent } from './resources-grid/resources-grid.component';
 import { ExploratoryEnvironmentCreateComponent } from './exploratory/create-environment';
-import { ExploratoryModel, Exploratory } from './resources-grid/resources-grid.model';
-import { HealthStatusService } from '../core/services';
+import { Exploratory } from './resources-grid/resources-grid.model';
+import { HealthStatusService, ProjectService } from '../core/services';
 import { ManageUngitComponent } from './manage-ungit/manage-ungit.component';
+import { Project } from './../administration/project/project.component';
 
 @Component({
   selector: 'dlab-resources',
@@ -37,17 +38,20 @@ import { ManageUngitComponent } from './manage-ungit/manage-ungit.component';
 export class ResourcesComponent implements OnInit {
   public exploratoryEnvironments: Exploratory[] = [];
   public healthStatus: any;
+  projects: Project[] = [];
 
   @ViewChild(ResourcesGridComponent, { static: true }) resourcesGrid: ResourcesGridComponent;
 
   constructor(
     public toastr: ToastrService,
     private healthStatusService: HealthStatusService,
-    private dialog: MatDialog
+    private dialog: MatDialog,
+    private projectService: ProjectService
   ) { }
 
   ngOnInit() {
     this.getEnvironmentHealthStatus();
+    this.getProjects();
     this.exploratoryEnvironments = this.resourcesGrid.environments;
   }
 
@@ -75,6 +79,14 @@ export class ResourcesComponent implements OnInit {
       .afterClosed().subscribe(() => this.refreshGrid());
   }
 
+  public setActiveProject(project): void {
+    console.log(project)
+  }
+
+  private getProjects() {
+    this.projectService.getProjectsList().subscribe((projects: any) => this.projects = projects);
+  }
+
   private getEnvironmentHealthStatus() {
     this.healthStatusService.getEnvironmentHealthStatus().subscribe(
       (result: any) => {
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts
index 9f3e25d..7ce335b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts
@@ -45,4 +45,4 @@ import { ConfirmDeleteAccountDialog } from './manage-ungit/manage-ungit.componen
   entryComponents: [ManageUngitComponent, ConfirmDeleteAccountDialog],
   exports: [ResourcesComponent]
 })
-export class ResourcesModule {}
+export class ResourcesModule { }
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
index e694771..8aef4d4 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
@@ -314,6 +314,10 @@ span.mat-slide-toggle-content {
           font-weight: 300;
           padding-top: 10px;
 
+          .mat-select-value {
+            max-width: inherit;
+          }
+
           .mat-select-value-text {
             span {
               color: #607d8b;


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


[incubator-dlab] 04/04: [DLAB-1157]: set selected active project on resource creation

Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit edb3abe9bea9ba74e7b1b945a90bf34c398ae034
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Oct 18 17:41:44 2019 +0300

    [DLAB-1157]: set selected active project on resource creation
---
 .../create-environment/create-environment.component.html      |  4 +++-
 .../create-environment/create-environment.component.ts        |  9 ++++++++-
 .../webapp/src/app/resources/resources.component.html         | 11 ++++++-----
 .../resources/webapp/src/app/resources/resources.component.ts | 10 ++++++++--
 4 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
index 984679f..7dd58d9 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.html
@@ -49,7 +49,9 @@
             <mat-form-field>
               <mat-label>Select endpoint</mat-label>
               <mat-select formControlName="endpoint" disableOptionCentering [disabled]="!endpoints.length">
-                <mat-option *ngFor="let endpoint of endpoints" [value]="endpoint" (click)="getTemplates(createExploratoryForm?.controls['project'].value, endpoint)">{{ endpoint }}</mat-option>
+                <mat-option *ngFor="let endpoint of endpoints" [value]="endpoint"
+                  (click)="getTemplates(createExploratoryForm?.controls['project'].value, endpoint)">{{ endpoint }}
+                </mat-option>
                 <mat-option *ngIf="!endpoints.length" class="multiple-select ml-10" disabled>Endpoints list is empty
                 </mat-option>
               </mat-select>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts
index 9d6795a..d1ccb64 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/create-environment/create-environment.component.ts
@@ -69,7 +69,14 @@ export class ExploratoryEnvironmentCreateComponent implements OnInit {
   }
 
   public getUserProjects() {
-    this.projectService.getUserProjectsList().subscribe((projects: any) => this.projects = projects);
+    this.projectService.getUserProjectsList().subscribe((projects: any) => {
+      this.projects = projects;
+      if (this.resourceGrid.activeProject) {
+        const activeProject = projects.find(item => item.name === this.resourceGrid.activeProject);
+        this.setEndpoints(activeProject)
+        this.createExploratoryForm.controls['project'].setValue(activeProject.name);
+      }
+    });
   }
 
   public setEndpoints(project) {
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 db7b9da..b705c38 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
@@ -26,12 +26,13 @@
       </button>
 
       <div class="mat-reset">
-        <!-- *ngIf="!projects.length -->
-        <div class="control selector-wrapper">
+        <div class="control selector-wrapper" *ngIf="projects.length">
           <mat-form-field>
             <mat-label>Select active project</mat-label>
-            <mat-select>
-              <mat-option *ngFor="let project of projects" [value]="project.name" (click)="setActiveProject(project)">
+            <mat-select [(value)]="resourcesGrid.activeProject">
+              <mat-option *ngIf="projects.length > 1" (click)="setActiveProject()">Show all</mat-option>
+              <mat-option *ngFor="let project of projects" [value]="project.name"
+                (click)="setActiveProject(project.name)">
                 {{ project.name }}</mat-option>
               <mat-option *ngIf="!projects.length" class="multiple-select ml-10" disabled>Projects list is empty
               </mat-option>
@@ -42,8 +43,8 @@
           </mat-form-field>
         </div>
       </div>
-
     </div>
+
     <div>
       <button mat-raised-button class="butt butt-tool" (click)="manageUngit()">
         <i class="material-icons"></i>Git credentials
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 bc1459e..bfdcdee 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
@@ -18,7 +18,6 @@
  */
 
 import { Component, OnInit, ViewChild, OnDestroy } from '@angular/core';
-import { Subscription } from 'rxjs';
 import { ToastrService } from 'ngx-toastr';
 import { MatDialog } from '@angular/material/dialog';
 
@@ -80,13 +79,20 @@ export class ResourcesComponent implements OnInit {
   }
 
   public setActiveProject(project): void {
-    console.log(project)
+    this.resourcesGrid.selectActiveProject(project);
+  }
+
+  public getActiveProject() {
+    console.log('activeProject: ', this.resourcesGrid.activeProject);
+
+    return this.resourcesGrid.activeProject;
   }
 
   private getProjects() {
     this.projectService.getProjectsList().subscribe((projects: any) => this.projects = projects);
   }
 
+
   private getEnvironmentHealthStatus() {
     this.healthStatusService.getEnvironmentHealthStatus().subscribe(
       (result: any) => {


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


[incubator-dlab] 02/04: [DLAB-1157]: added project selector control

Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit f01ddf40d129da2d6f469250b7eebeefe9a9e5ed
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed Oct 16 16:34:20 2019 +0300

    [DLAB-1157]: added project selector control
---
 .../src/main/resources/webapp/src/assets/styles/_theme.scss            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
index 8aef4d4..9523b45 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
@@ -303,8 +303,9 @@ span.mat-slide-toggle-content {
 
   .mat-reset {
     .mat-form-field {
+      overflow: hidden;
+
       .mat-form-field-wrapper {
-        overflow: hidden;
 
         .mat-form-field-infix {
           width: 275px;


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


[incubator-dlab] 03/04: [DLAB-1157]: extend filtering config model; active project selection

Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 460705a06ddf99e8c8acc0d2a9562966023a9c66
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Oct 18 16:31:17 2019 +0300

    [DLAB-1157]: extend filtering config model; active project selection
---
 .../resources-grid/filter-configuration.model.ts   |  2 +
 .../resources-grid/resources-grid.component.html   |  5 +-
 .../resources-grid/resources-grid.component.ts     | 59 ++++++++++++----------
 3 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/filter-configuration.model.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/filter-configuration.model.ts
index e2a31c0..751f8a5 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/filter-configuration.model.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/filter-configuration.model.ts
@@ -24,6 +24,7 @@ export class FilterConfigurationModel {
     public shapes: Array<any>,
     public resources: Array<any>,
     public type: string,
+    public project?: string,
   ) { }
 
   resetConfigurations(): void {
@@ -32,5 +33,6 @@ export class FilterConfigurationModel {
     this.shapes = [];
     this.resources = [];
     this.type = '';
+    this.project = '';
   }
 }
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
index 71615f4..d030a3a 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
@@ -100,7 +100,7 @@
 
     <ng-container matColumnDef="expandedDetail">
       <td mat-cell *matCellDef="let element" class="exploratory" [attr.colspan]="8"
-        [@detailExpand]="element == expandedElement || forse ? 'expanded' : 'collapsed'" sticky>
+        [@detailExpand]="element == expandedElement ? 'expanded' : 'collapsed'" sticky>
 
         <tr *ngFor="let element of element.exploratory; let i = index" class="element-row mat-row">
           <td class="name-col" (click)="printDetailEnvironmentModal(element)">{{ element.name }}</td>
@@ -202,7 +202,8 @@
                   <span>Manage libraries</span>
                 </li>
                 <li *ngIf="element.status === 'running'">
-                  <a target="_blank" [attr.href]="'/#/terminal/' + element.private_ip + '/' + element.endpoint" class="navigate">
+                  <a target="_blank" [attr.href]="'/#/terminal/' + element.private_ip + '/' + element.endpoint"
+                    class="navigate">
                     <i class="material-icons">laptop</i>
                     <span>Open terminal</span>
                   </a>
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 e983b42..e536835 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
@@ -57,16 +57,16 @@ export class ResourcesGridComponent implements OnInit {
   readonly DICTIONARY = DICTIONARY;
 
   environments: Exploratory[];
-  forse: boolean = true;
 
   collapseFilterRow: boolean = false;
   filtering: boolean = false;
   activeFiltering: boolean = false;
+  activeProject: any;
   healthStatus: GeneralEnvironmentStatus;
 
   filteredEnvironments: Exploratory[] = [];
-  filterConfiguration: FilterConfigurationModel = new FilterConfigurationModel('', [], [], [], '');
-  filterForm: FilterConfigurationModel = new FilterConfigurationModel('', [], [], [], '');
+  filterConfiguration: FilterConfigurationModel = new FilterConfigurationModel('', [], [], [], '', '');
+  filterForm: FilterConfigurationModel = new FilterConfigurationModel('', [], [], [], '', '');
 
   public filteringColumns: Array<any> = [
     { title: 'Environment name', name: 'name', class: 'name-col', filter_class: 'name-filter', filtering: true },
@@ -82,7 +82,6 @@ export class ResourcesGridComponent implements OnInit {
   public displayedFilterColumns: string[] = this.filteringColumns.map(item => item.filter_class);
 
 
-
   constructor(
     public toastr: ToastrService,
     private userResourceService: UserResourceService,
@@ -113,6 +112,11 @@ export class ResourcesGridComponent implements OnInit {
     this.filterForm[$event.type] = $event.model;
   }
 
+  public selectActiveProject(project = '') {
+    this.filterForm.project = project;
+    this.applyFilter_btnClick(this.filterForm);
+  }
+
   public showActiveInstances(): void {
     this.filterForm = this.loadUserPreferences(this.filterActiveInstances());
     this.applyFilter_btnClick(this.filterForm);
@@ -157,7 +161,7 @@ export class ResourcesGridComponent implements OnInit {
       });
     }));
 
-    this.filterConfiguration = new FilterConfigurationModel('', statuses, shapes, resources, '');
+    this.filterConfiguration = new FilterConfigurationModel('', statuses, shapes, resources, '', '');
   }
 
   private applyFilter_btnClick(config: FilterConfigurationModel) {
@@ -169,28 +173,32 @@ export class ResourcesGridComponent implements OnInit {
 
     if (filteredData.length) this.filtering = true;
     if (config) {
-      filteredData = filteredData.filter(project => {
-        project.exploratory = project.exploratory.filter(item => {
+      this.activeProject = config.project;
+      filteredData = filteredData
+        .filter(project => config.project ? project.project === config.project : project)
+        .filter(project => {
 
-          const isName = item.name.toLowerCase().indexOf(config.name.toLowerCase()) !== -1;
-          const isStatus = config.statuses.length > 0 ? (config.statuses.indexOf(item.status) !== -1) : (config.type !== 'active');
-          const isShape = config.shapes.length > 0 ? (config.shapes.indexOf(item.shape) !== -1) : true;
+          project.exploratory = project.exploratory.filter(item => {
 
-          const modifiedResources = containsStatus(item.resources, config.resources);
-          let isResources = config.resources.length > 0 ? (modifiedResources.length > 0) : true;
+            const isName = item.name.toLowerCase().indexOf(config.name.toLowerCase()) !== -1;
+            const isStatus = config.statuses.length > 0 ? (config.statuses.indexOf(item.status) !== -1) : (config.type !== 'active');
+            const isShape = config.shapes.length > 0 ? (config.shapes.indexOf(item.shape) !== -1) : true;
 
-          if (config.resources.length > 0 && modifiedResources.length > 0) { item.resources = modifiedResources; }
+            const modifiedResources = containsStatus(item.resources, config.resources);
+            let isResources = config.resources.length > 0 ? (modifiedResources.length > 0) : true;
 
-          if (config.resources.length === 0 && config.type === 'active' ||
-            modifiedResources.length >= 0 && config.resources.length > 0 && config.type === 'active') {
-            item.resources = modifiedResources;
-            isResources = true;
-          }
+            if (config.resources.length > 0 && modifiedResources.length > 0) { item.resources = modifiedResources; }
 
-          return isName && isStatus && isShape && isResources;
+            if (config.resources.length === 0 && config.type === 'active' ||
+              modifiedResources.length >= 0 && config.resources.length > 0 && config.type === 'active') {
+              item.resources = modifiedResources;
+              isResources = true;
+            }
+
+            return isName && isStatus && isShape && isResources;
+          });
+          return project.exploratory.length > 0;
         });
-        return project.exploratory.length > 0;
-      });
 
       this.updateUserPreferences(config);
     }
@@ -231,12 +239,9 @@ export class ResourcesGridComponent implements OnInit {
     this.activeFiltering = false;
 
     for (const index in filterConfig)
-      if (filterConfig[index].length)
-        this.activeFiltering = true;
+      if (filterConfig[index].length) this.activeFiltering = true;
   }
 
-
-
   resetFilterConfigurations(): void {
     this.filterForm.resetConfigurations();
     this.updateUserPreferences(this.filterForm);
@@ -251,12 +256,12 @@ export class ResourcesGridComponent implements OnInit {
           this.isActiveFilter(result);
           this.filterForm = this.loadUserPreferences(result.type ? this.filterActiveInstances() : this.aliveStatuses(result));
         }
-        this.applyFilter_btnClick(result ? this.filterForm : result);
+        this.applyFilter_btnClick(result || this.filterForm);
       }, () => this.applyFilter_btnClick(null));
   }
 
   loadUserPreferences(config): FilterConfigurationModel {
-    return new FilterConfigurationModel(config.name, config.statuses, config.shapes, config.resources, config.type);
+    return new FilterConfigurationModel(config.name, config.statuses, config.shapes, config.resources, config.type, config.project);
   }
 
   updateUserPreferences(filterConfiguration: FilterConfigurationModel): void {


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