Merge branch 'master' into SHIBUI-754

TIER · Aug 17, 2018 · b0acb1b · b0acb1b
2 parents 1eeff24 + e6f8510
commit b0acb1b
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 12 deletions.
diff --git a/ui/src/app/metadata/domain/service/filter.service.ts b/ui/src/app/metadata/domain/service/filter.service.ts
@@ -18,7 +18,6 @@ export class MetadataFilterService {
     }
 
     find(providerId: string, filterId: string): Observable<MetadataFilter> {
-        // console.log(id);
         return this.http.get<MetadataFilter>(`${this.base}${this.endpoint}/${providerId}/Filters/${ filterId }`);
     }
 
@@ -27,7 +26,10 @@ export class MetadataFilterService {
     }
 
     save(providerId: string, filter: MetadataFilter): Observable<MetadataFilter> {
-        console.log(providerId, filter);
         return this.http.post<MetadataFilter>(`${this.base}${this.endpoint}/${providerId}/Filters`, filter);
     }
+
+    remove(providerId: string, filterId: string): Observable<string> {
+        return this.http.delete<string>(`${this.base}${this.endpoint}/${providerId}/Filters/${ filterId }`);
+    }
 }
diff --git a/ui/src/app/metadata/filter/action/collection.action.ts b/ui/src/app/metadata/filter/action/collection.action.ts
@@ -99,19 +99,19 @@ export class AddFilterFail implements Action {
 export class RemoveFilterRequest implements Action {
     readonly type = FilterCollectionActionTypes.REMOVE_FILTER_REQUEST;
 
-    constructor(public payload: MetadataFilter) { }
+    constructor(public payload: string) { }
 }
 
 export class RemoveFilterSuccess implements Action {
     readonly type = FilterCollectionActionTypes.REMOVE_FILTER_SUCCESS;
 
-    constructor(public payload: MetadataFilter) { }
+    constructor(public payload: string) { }
 }
 
 export class RemoveFilterFail implements Action {
     readonly type = FilterCollectionActionTypes.REMOVE_FILTER_FAIL;
 
-    constructor(public payload: MetadataFilter) { }
+    constructor(public error: Error) { }
 }
 
 export type FilterCollectionActionsUnion =

diff --git a/ui/src/app/metadata/filter/effect/collection.effect.ts b/ui/src/app/metadata/filter/effect/collection.effect.ts
@@ -113,6 +113,27 @@ export class FilterCollectionEffects {
         tap(([filter, provider]) => this.router.navigate(['/', 'metadata', 'provider', provider, 'filters']))
     );
 
+    @Effect()
+    removeFilterRequest$ = this.actions$.pipe(
+        ofType<actions.RemoveFilterRequest>(FilterCollectionActionTypes.REMOVE_FILTER_REQUEST),
+        map(action => action.payload),
+        withLatestFrom(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
+        switchMap(([filterId, providerId]) =>
+            this.filterService.remove(providerId, filterId).pipe(
+                map(removed => new actions.RemoveFilterSuccess(removed)),
+                catchError(err => of(new actions.RemoveFilterFail(err)))
+            )
+        )
+    );
+
+    @Effect()
+    removeFilterSuccess$ = this.actions$.pipe(
+        ofType<actions.RemoveFilterSuccess>(FilterCollectionActionTypes.REMOVE_FILTER_SUCCESS),
+        map(action => action.payload),
+        withLatestFrom(this.store.select(fromProvider.getSelectedProviderId).pipe(skipWhile(id => !id))),
+        map(([filter, providerId]) => new actions.LoadFilterRequest(providerId))
+    );
+
     constructor(
         private actions$: Actions,
         private router: Router,

diff --git a/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts b/ui/src/app/metadata/filter/reducer/collection.reducer.spec.ts
@@ -10,7 +10,8 @@ import {
     UpdateFilterRequest,
     AddFilterSuccess,
     AddFilterFail,
-    UpdateFilterFail
+    UpdateFilterFail,
+    RemoveFilterFail
 } from '../action/collection.action';
 import { EntityAttributesFilterEntity } from '../../domain/entity/filter/entity-attributes-filter';
 
@@ -93,6 +94,13 @@ describe('Filter Reducer', () => {
         });
     });
 
+    describe(`${FilterCollectionActionTypes.REMOVE_FILTER_FAIL}`, () => {
+        it('should set saving to false', () => {
+            const action = new RemoveFilterFail(new Error('foo'));
+            expect(reducer(snapshot, action).saving).toBe(false);
+        });
+    });
+
     describe(`${FilterCollectionActionTypes.UPDATE_FILTER_SUCCESS}`, () => {
         it('should update the filter in the collection', () => {
             spyOn(fromFilter.adapter, 'updateOne').and.callThrough();

diff --git a/ui/src/app/metadata/filter/reducer/collection.reducer.ts b/ui/src/app/metadata/filter/reducer/collection.reducer.ts
@@ -58,13 +58,28 @@ export function reducer(state = initialState, action: FilterCollectionActionsUni
 
         case FilterCollectionActionTypes.ADD_FILTER_SUCCESS:
         case FilterCollectionActionTypes.ADD_FILTER_FAIL:
+        case FilterCollectionActionTypes.REMOVE_FILTER_FAIL:
         case FilterCollectionActionTypes.UPDATE_FILTER_FAIL: {
             return {
                 ...state,
                 saving: false
             };
         }
 
+        case FilterCollectionActionTypes.REMOVE_FILTER_SUCCESS: {
+            return adapter.removeOne(action.payload, {
+                ...state,
+                saving: false
+            });
+        }
+
+        case FilterCollectionActionTypes.REMOVE_FILTER_REQUEST: {
+            return {
+                ...state,
+                saving: true
+            };
+        }
+
         case FilterCollectionActionTypes.SELECT_FILTER_REQUEST: {
             return {
                 ...state,

diff --git a/ui/src/app/metadata/filter/reducer/index.ts b/ui/src/app/metadata/filter/reducer/index.ts
@@ -52,7 +52,7 @@ export const getAllFilters = createSelector(getCollectionState, fromCollection.s
 export const getCollectionSaving = createSelector(getCollectionState, fromCollection.getIsSaving);
 
 export const notAddtlFilters = ['RequiredValidUntil', 'SignatureValidation', 'EntityRoleWhiteList'];
-export const filterTypeFn = filters => filters.filter(f => notAddtlFilters.indexOf(f['@type']) === -1);
+export const filterTypeFn = filters => [...filters.filter(f => notAddtlFilters.indexOf(f['@type']) === -1)];
 
 export const getAdditionalFilters = createSelector(getAllFilters, filterTypeFn);
 

diff --git a/ui/src/app/metadata/provider/container/provider-filter-list.component.html b/ui/src/app/metadata/provider/container/provider-filter-list.component.html
@@ -40,7 +40,7 @@
                             <th>Filter Type</th>
                             <th>Enabled?</th>
                             <th>Edit</th>
-                            <!--<th>Delete</th>-->
+                            <th>Delete</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -79,14 +79,12 @@
                                     <span class="sr-only">Edit</span>
                                 </a>
                             </td>
-                            <!--
                             <td class="td-sm">
-                                <button class="btn btn-link">
+                                <button class="btn btn-link" (click)="remove(filter.resourceId)">
                                     <i class="fa fa-trash fa-lg sr-hidden text-danger"></i>
                                     <span class="sr-only">Delete</span>
                                 </button>
                             </td>
-                            -->
                         </tr>
                     </tbody>
                 </table>

diff --git a/ui/src/app/metadata/provider/container/provider-filter-list.component.spec.ts b/ui/src/app/metadata/provider/container/provider-filter-list.component.spec.ts
@@ -59,4 +59,11 @@ describe('Provider Filter List Component', () => {
     it('should instantiate the component', async(() => {
         expect(app).toBeTruthy();
     }));
+
+    describe('remove method', () => {
+        it('should dispatch an action to the store', () => {
+            app.remove('foo');
+            expect(store.dispatch).toHaveBeenCalled();
+        });
+    });
 });
diff --git a/ui/src/app/metadata/provider/container/provider-filter-list.component.ts b/ui/src/app/metadata/provider/container/provider-filter-list.component.ts
@@ -7,7 +7,7 @@ import * as fromFilter from '../../filter/reducer';
 import { MetadataFilter, MetadataProvider } from '../../domain/model';
 import { NAV_FORMATS } from '../component/provider-editor-nav.component';
 import { SetIndex } from '../../../wizard/action/wizard.action';
-import { UpdateFilterRequest, LoadFilterRequest } from '../../filter/action/collection.action';
+import { UpdateFilterRequest, LoadFilterRequest, RemoveFilterRequest } from '../../filter/action/collection.action';
 
 @Component({
     selector: 'provider-filter-list',
@@ -44,6 +44,10 @@ export class ProviderFilterListComponent implements OnDestroy {
         this.store.dispatch(new UpdateFilterRequest({ ...filter, filterEnabled: !filter.filterEnabled }));
     }
 
+    remove(id: string): void {
+        this.store.dispatch(new RemoveFilterRequest(id));
+    }
+
     ngOnDestroy(): void {
         this.ngUnsubscribe.next();
         this.ngUnsubscribe.complete();