Merged in bugfix/SHIBUI-464 (pull request #65)

SHIBUI-464 Fixed bug persisting entityId in field after save Approved-by: Ryan Mathis <rmathis@unicon.net>
TIER · May 1, 2018 · b27378d · b27378d
2 parents a595855 + 7b2844e
commit b27378d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 21 deletions.
diff --git a/ui/src/app/metadata-filter/action/filter.action.ts b/ui/src/app/metadata-filter/action/filter.action.ts
@@ -6,7 +6,6 @@ import { MDUI } from '../../domain/model/mdui';
 
 export const SELECT_ID = '[Filter] Select Entity ID';
 
-export const CREATE_FILTER = '[Filter] Create Filter';
 export const UPDATE_FILTER = '[Filter] Update Filter';
 export const CANCEL_CREATE_FILTER = '[Filter] Cancel Create Filter';
 
@@ -36,12 +35,6 @@ export class LoadEntityPreviewError implements Action {
     constructor(public payload: string) { }
 }
 
-export class CreateFilter implements Action {
-    readonly type = CREATE_FILTER;
-
-    constructor(public payload: MetadataFilter) { }
-}
-
 export class CancelCreateFilter implements Action {
     readonly type = CANCEL_CREATE_FILTER;
 }
@@ -54,7 +47,6 @@ export class UpdateFilterChanges implements Action {
 
 export type Actions =
     | SelectId
-    | CreateFilter
     | UpdateFilterChanges
     | CancelCreateFilter
     | LoadEntityPreview

diff --git a/ui/src/app/metadata-filter/container/edit-filter.component.ts b/ui/src/app/metadata-filter/container/edit-filter.component.ts
@@ -12,7 +12,7 @@ import * as fromFilter from '../reducer';
 import * as fromCollection from '../../domain/reducer';
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { CancelCreateFilter, SelectId, CreateFilter, UpdateFilterChanges } from '../action/filter.action';
+import { CancelCreateFilter, SelectId, UpdateFilterChanges } from '../action/filter.action';
 import { AddFilterRequest, UpdateFilterRequest } from '../../domain/action/filter-collection.action';
 import { MetadataFilter } from '../../domain/model/metadata-filter';
 import { Filter } from '../../domain/entity/filter';
@@ -101,8 +101,6 @@ export class EditFilterComponent implements OnInit, OnDestroy {
     }
 
     ngOnInit(): void {
-        this.store.dispatch(new ClearSearch());
-
         let id = this.form.get('entityId');
         id.valueChanges
             .distinctUntilChanged()

diff --git a/ui/src/app/metadata-filter/container/new-filter.component.ts b/ui/src/app/metadata-filter/container/new-filter.component.ts
@@ -11,7 +11,7 @@ import 'rxjs/add/observable/fromPromise';
 import * as fromFilter from '../reducer';
 import { ProviderStatusEmitter, ProviderValueEmitter } from '../../domain/service/provider-change-emitter.service';
 import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { CancelCreateFilter, SelectId, CreateFilter, UpdateFilterChanges } from '../action/filter.action';
+import { CancelCreateFilter, SelectId, UpdateFilterChanges } from '../action/filter.action';
 import { AddFilterRequest } from '../../domain/action/filter-collection.action';
 import { MetadataFilter } from '../../domain/model/metadata-filter';
 import { Filter } from '../../domain/entity/filter';
@@ -71,6 +71,7 @@ export class NewFilterComponent implements OnInit, OnDestroy {
         private valueEmitter: ProviderValueEmitter,
         private fb: FormBuilder
     ) {
+        this.store.dispatch(new ClearSearch());
         this.changes$ = this.store.select(fromFilter.getFilter);
         this.changes$.subscribe(c => this.changes = new Filter(c));
 
@@ -86,8 +87,6 @@ export class NewFilterComponent implements OnInit, OnDestroy {
     }
 
     ngOnInit(): void {
-        this.store.dispatch(new ClearSearch());
-
         let id = this.form.get('entityId');
         id.valueChanges
             .distinctUntilChanged()
@@ -114,6 +113,7 @@ export class NewFilterComponent implements OnInit, OnDestroy {
         this.selected$
             .distinctUntilChanged()
             .subscribe(entityId => {
+                console.log(entityId);
                 id.setValue(entityId);
             });
     }

diff --git a/ui/src/app/metadata-filter/reducer/filter.reducer.ts b/ui/src/app/metadata-filter/reducer/filter.reducer.ts
@@ -1,9 +1,11 @@
 import { createSelector, createFeatureSelector } from '@ngrx/store';
 import * as filter from '../action/filter.action';
+import * as search from '../action/search.action';
 import * as collection from '../../domain/action/filter-collection.action';
 import { FilterCollectionActionTypes, FilterCollectionActionsUnion } from '../../domain/action/filter-collection.action';
 import * as fromRoot from '../../core/reducer';
 import { MetadataFilter, MDUI } from '../../domain/domain.type';
+import { SearchAction } from '../../dashboard/action/search.action';
 
 export interface FilterState {
     selected: string | null;
@@ -19,7 +21,7 @@ export const initialState: FilterState = {
     saving: false
 };
 
-export function reducer(state = initialState, action: filter.Actions | FilterCollectionActionsUnion): FilterState {
+export function reducer(state = initialState, action: filter.Actions | search.Actions | FilterCollectionActionsUnion): FilterState {
     switch (action.type) {
         case filter.SELECT_ID: {
             return {
@@ -33,12 +35,6 @@ export function reducer(state = initialState, action: filter.Actions | FilterCol
                 preview: action.payload
             };
         }
-        case filter.CREATE_FILTER: {
-            return {
-                ...state,
-                changes: action.payload
-            };
-        }
         case filter.UPDATE_FILTER: {
             return {
                 ...state,
@@ -57,6 +53,7 @@ export function reducer(state = initialState, action: filter.Actions | FilterCol
         }
         case FilterCollectionActionTypes.ADD_FILTER_SUCCESS:
         case FilterCollectionActionTypes.UPDATE_FILTER_SUCCESS:
+        case search.CLEAR_SEARCH:
         case filter.CANCEL_CREATE_FILTER: {
             return {
                 ...initialState