fix(sg-filter): Fix filter by account

#744
bwsw · Dec 12, 2017 · 1588f2d · 1588f2d
1 parent ca45c7b
commit 1588f2d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/src/app/reducers/security-groups/redux/sg.reducers.ts b/src/app/reducers/security-groups/redux/sg.reducers.ts
@@ -1,20 +1,10 @@
-import {
-  createEntityAdapter,
-  EntityAdapter,
-  EntityState
-} from '@ngrx/entity';
-import {
-  createFeatureSelector,
-  createSelector
-} from '@ngrx/store';
-import {
-  SecurityGroup,
-  SecurityGroupType
-} from '../../../security-group/sg.model';
-import * as securityGroup from './sg.actions';
-import * as fromAccounts from '../../accounts/redux/accounts.reducers';
+import { createEntityAdapter, EntityAdapter, EntityState } from '@ngrx/entity';
+import { createFeatureSelector, createSelector } from '@ngrx/store';
 
 import { SecurityGroupViewMode } from '../../../security-group/sg-view-mode';
+import { SecurityGroup, SecurityGroupType } from '../../../security-group/sg.model';
+import * as fromAccounts from '../../accounts/redux/accounts.reducers';
+import * as securityGroup from './sg.actions';
 
 
 export interface State {
@@ -226,6 +216,7 @@ export const selectFilteredSecurityGroups = createSelector(
   filters,
   fromAccounts.selectAll,
   (securityGroups, filter, accounts) => {
+    const mode = filter.viewMode;
     const queryLower = filter.query ? filter.query.toLowerCase() : '';
     const queryFilter = (group: SecurityGroup) => !queryLower || group.name.toLowerCase()
       .includes(queryLower);
@@ -236,10 +227,9 @@ export const selectFilteredSecurityGroups = createSelector(
     const domainsMap = selectedAccounts.reduce((m, i) => ({ ...m, [i.domainid]: i }), {});
 
     const selectedAccountIdsFilter = group => !filter.selectedAccountIds.length ||
+      group.type === SecurityGroupType.PredefinedTemplate ||
       (accountsMap[group.account] && domainsMap[group.domainid]);
 
-
-    const mode = filter.viewMode;
     const viewModeFilter = (group: SecurityGroup) => {
       if (mode === SecurityGroupViewMode.Templates) {
         return group.type === SecurityGroupType.PredefinedTemplate || group.type === SecurityGroupType.CustomTemplate;

diff --git a/src/app/security-group/sg-list/security-group-list.component.html b/src/app/security-group/sg-list/security-group-list.component.html
@@ -7,6 +7,6 @@
   [dynamicOutputs]="outputs"
 >
 </cs-grouped-list>
-<ng-container *ngIf="!securityGroups.length">
+<div class="padding" *ngIf="!securityGroups.length">
   {{ 'COMMON.NO_RESULTS' | translate }}
-</ng-container>
+</div>