From b1d23f31a410847027acd5e861b30b205d8bc210 Mon Sep 17 00:00:00 2001 From: Ryan Mathis Date: Fri, 9 Apr 2021 15:27:37 -0700 Subject: [PATCH] Updated to enable deletion --- .../action/metadata-collection.action.ts | 4 ++-- .../component/enable-metadata.component.ts | 2 +- .../effect/metadata-collection.effect.spec.ts | 3 +++ .../effect/metadata-collection.effect.ts | 13 +++++++++++- .../reducer/metadata-collection.reducer.ts | 2 +- .../app/core/service/can-deactivate.guard.ts | 2 +- .../component/metadata-header.component.html | 18 ++++++++++------- .../container/metadata-options.component.html | 8 ++++++-- .../container/metadata-options.component.ts | 20 ++++++++++++++++++- .../domain/service/draft.service.spec.ts | 5 ++--- .../metadata/domain/service/draft.service.ts | 8 +++++--- .../domain/service/resolver.service.spec.ts | 6 ++---- .../domain/service/resolver.service.ts | 4 ++-- .../component/resolvers-list.component.html | 19 +++++++++++------- ...dashboard-resolvers-list.component.spec.ts | 4 ++-- .../dashboard-resolvers-list.component.ts | 9 +++++++-- .../resolver/action/collection.action.ts | 4 ++-- .../resolver/effect/collection.effects.ts | 2 +- .../resolver/reducer/collection.reducer.ts | 2 +- 19 files changed, 92 insertions(+), 43 deletions(-) diff --git a/ui/src/app/admin/action/metadata-collection.action.ts b/ui/src/app/admin/action/metadata-collection.action.ts index 01795d49b..07565cb6a 100644 --- a/ui/src/app/admin/action/metadata-collection.action.ts +++ b/ui/src/app/admin/action/metadata-collection.action.ts @@ -62,13 +62,13 @@ export class UpdateMetadataConflict implements Action { export class RemoveMetadataRequest implements Action { readonly type = MetadataCollectionActionTypes.REMOVE_METADATA; - constructor(public payload: MetadataResolver) { } + constructor(public payload: string) { } } export class RemoveMetadataSuccess implements Action { readonly type = MetadataCollectionActionTypes.REMOVE_METADATA_SUCCESS; - constructor(public payload: MetadataResolver) { } + constructor(public payload: string) { } } export class RemoveMetadataFail implements Action { diff --git a/ui/src/app/admin/component/enable-metadata.component.ts b/ui/src/app/admin/component/enable-metadata.component.ts index 014e0dfa3..e6d49b958 100644 --- a/ui/src/app/admin/component/enable-metadata.component.ts +++ b/ui/src/app/admin/component/enable-metadata.component.ts @@ -50,7 +50,7 @@ export class EnableMetadataComponent { .result .then( success => { - this.store.dispatch(new RemoveMetadataRequest(entity)); + this.store.dispatch(new RemoveMetadataRequest(entity.id)); }, err => { console.log('Cancelled'); diff --git a/ui/src/app/admin/effect/metadata-collection.effect.spec.ts b/ui/src/app/admin/effect/metadata-collection.effect.spec.ts index d4d0bfcb4..5c76b04b7 100644 --- a/ui/src/app/admin/effect/metadata-collection.effect.spec.ts +++ b/ui/src/app/admin/effect/metadata-collection.effect.spec.ts @@ -10,6 +10,8 @@ import { Metadata } from '../../metadata/domain/domain.type'; import { MetadataResolver } from '../../metadata/domain/model'; import * as fromI18n from '../../i18n/reducer'; import { I18nService } from '../../i18n/service/i18n.service'; +import { Router } from '@angular/router'; +import { RouterStub } from '../../../testing/router.stub'; describe('Metadata Collection Effects', () => { let effects: MetadataCollectionEffects; @@ -55,6 +57,7 @@ describe('Metadata Collection Effects', () => { }, MetadataCollectionEffects, provideMockActions(() => actions), + { provide: Router, useClass: RouterStub } ], }); diff --git a/ui/src/app/admin/effect/metadata-collection.effect.ts b/ui/src/app/admin/effect/metadata-collection.effect.ts index 2005a91bd..db5f3e4e7 100644 --- a/ui/src/app/admin/effect/metadata-collection.effect.ts +++ b/ui/src/app/admin/effect/metadata-collection.effect.ts @@ -24,6 +24,7 @@ import { Notification, NotificationType } from '../../notification/model/notific import { I18nService } from '../../i18n/service/i18n.service'; import * as fromRoot from '../../app.reducer'; import * as fromI18n from '../../i18n/reducer'; +import { Router } from '@angular/router'; /* istanbul ignore next */ @@ -123,10 +124,20 @@ export class MetadataCollectionEffects { ) ); + @Effect({dispatch: false}) + redirectOnRemove$ = this.actions$.pipe( + ofType(MetadataCollectionActionTypes.REMOVE_METADATA_SUCCESS), + map(action => action.payload), + switchMap(entity => + this.router.navigate(['/']) + ) + ); + constructor( private descriptorService: ResolverService, private actions$: Actions, private store: Store, - private i18nService: I18nService + private i18nService: I18nService, + private router: Router ) { } } /* istanbul ignore next */ diff --git a/ui/src/app/admin/reducer/metadata-collection.reducer.ts b/ui/src/app/admin/reducer/metadata-collection.reducer.ts index dc4006841..b11dded01 100644 --- a/ui/src/app/admin/reducer/metadata-collection.reducer.ts +++ b/ui/src/app/admin/reducer/metadata-collection.reducer.ts @@ -39,7 +39,7 @@ export function reducer(state = initialState, action: MetadataCollectionActionsU } case MetadataCollectionActionTypes.REMOVE_METADATA_SUCCESS: { - return adapter.removeOne(action.payload.id, { + return adapter.removeOne(action.payload, { ...state }); } diff --git a/ui/src/app/core/service/can-deactivate.guard.ts b/ui/src/app/core/service/can-deactivate.guard.ts index 341db400c..c0c7363ec 100644 --- a/ui/src/app/core/service/can-deactivate.guard.ts +++ b/ui/src/app/core/service/can-deactivate.guard.ts @@ -22,6 +22,6 @@ export class CanDeactivateGuard implements CanDeactivate currentState: RouterStateSnapshot, nextState: RouterStateSnapshot ) { - return component.canDeactivate ? component.canDeactivate(currentRoute, currentState, nextState) : true; + return component && component.canDeactivate ? component.canDeactivate(currentRoute, currentState, nextState) : true; } } /* istanbul ignore next */ diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.html b/ui/src/app/metadata/configuration/component/metadata-header.component.html index d105088c7..942c04b5c 100644 --- a/ui/src/app/metadata/configuration/component/metadata-header.component.html +++ b/ui/src/app/metadata/configuration/component/metadata-header.component.html @@ -1,12 +1,16 @@
-
- Saved:  - {{ (version.modifiedDate) | date:DATE_FORMAT }} -
- By:  - {{ version.createdBy }} -
+
+
+ Saved:  + {{ (version.modifiedDate) | date:DATE_FORMAT }} +
+ By:  + {{ version.createdBy }} +
+ +
+

Enabled Disabled diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.html b/ui/src/app/metadata/configuration/container/metadata-options.component.html index 1e643f4c4..1f4f9f326 100644 --- a/ui/src/app/metadata/configuration/container/metadata-options.component.html +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.html @@ -7,8 +7,12 @@

+ [isCurrent]="true"> + +
diff --git a/ui/src/app/metadata/configuration/container/metadata-options.component.ts b/ui/src/app/metadata/configuration/container/metadata-options.component.ts index 411c6fb10..2d1666199 100644 --- a/ui/src/app/metadata/configuration/container/metadata-options.component.ts +++ b/ui/src/app/metadata/configuration/container/metadata-options.component.ts @@ -16,7 +16,7 @@ import { getConfigurationModelType } from '../reducer'; import { MetadataConfiguration } from '../model/metadata-configuration'; -import { MetadataFilter } from '../../domain/model'; +import { MetadataEntity, MetadataFilter, MetadataResolver } from '../../domain/model'; import { getAdditionalFilters } from '../../filter/reducer'; import { ClearFilters, @@ -29,6 +29,10 @@ import { import { Metadata } from '../../domain/domain.type'; import { DeleteFilterComponent } from '../../provider/component/delete-filter.component'; import { ClearHistory } from '../action/history.action'; +import { DeleteDialogComponent } from '../../manager/component/delete-dialog.component'; +import { RemoveDraftRequest } from '../../resolver/action/draft.action'; +import { RemoveResolverRequest } from '../../resolver/action/collection.action'; +import { RemoveMetadataRequest } from '../../../admin/action/metadata-collection.action'; @Component({ selector: 'metadata-options-page', @@ -114,6 +118,20 @@ export class MetadataOptionsComponent implements OnDestroy { ); } + deleteResolver(id: string): void { + this.modalService + .open(DeleteDialogComponent) + .result + .then( + success => { + this.store.dispatch(new RemoveMetadataRequest(id)); + }, + err => { + console.log('Cancelled'); + } + ); + } + ngOnDestroy(): void { this.ngUnsubscribe.next(); this.ngUnsubscribe.complete(); diff --git a/ui/src/app/metadata/domain/service/draft.service.spec.ts b/ui/src/app/metadata/domain/service/draft.service.spec.ts index f03da6906..a8ae3cde8 100644 --- a/ui/src/app/metadata/domain/service/draft.service.spec.ts +++ b/ui/src/app/metadata/domain/service/draft.service.spec.ts @@ -41,7 +41,7 @@ describe(`EntityDraftService`, () => { it(`should return a 404 error if not found`, (done: DoneFn) => { let id = null; service.find(id).subscribe(null, err => { - expect(err).toEqual(404); + expect(err).toEqual(`404 - null not found in cache.`); done(); }); }); @@ -96,10 +96,9 @@ describe(`EntityDraftService`, () => { it('should return a 404 if not found', () => { const resolver = { id: 'bar' } as MetadataResolver; - const updates = { id: 'foo', serviceProviderName: 'bar' }; spyOn(service.storage, 'findByAttr').and.returnValue(null); service.update(resolver).subscribe(null, (err) => { - expect(err).toBe(404); + expect(err).toBe(`404 - ${resolver.id} not found in cache.`); expect(service.storage.findByAttr).toHaveBeenCalled(); }); }); diff --git a/ui/src/app/metadata/domain/service/draft.service.ts b/ui/src/app/metadata/domain/service/draft.service.ts index 824e8ec64..05efe2ef0 100644 --- a/ui/src/app/metadata/domain/service/draft.service.ts +++ b/ui/src/app/metadata/domain/service/draft.service.ts @@ -20,7 +20,7 @@ export class EntityDraftService { find(id: string, attr: string = 'id'): Observable { if (!id) { - return throwError(404); + return throwError(`404 - ${id} not found in cache.`); } return this.query().pipe( switchMap( @@ -39,7 +39,9 @@ export class EntityDraftService { } remove(provider: MetadataResolver): Observable { - this.storage.removeByAttr(provider.id, 'id'); + if (!!provider) { + this.storage.removeByAttr(provider.id, 'id'); + } return of(provider); } @@ -51,7 +53,7 @@ export class EntityDraftService { this.storage.add(stored); return of(stored); } else { - return throwError(404); + return throwError(`404 - ${provider.id} not found in cache.`); } } } /* istanbul ignore next */ diff --git a/ui/src/app/metadata/domain/service/resolver.service.spec.ts b/ui/src/app/metadata/domain/service/resolver.service.spec.ts index e4fb0c089..edace7e1f 100644 --- a/ui/src/app/metadata/domain/service/resolver.service.spec.ts +++ b/ui/src/app/metadata/domain/service/resolver.service.spec.ts @@ -115,13 +115,11 @@ describe(`Resolver Service`, () => { }); describe('remove', () => { - let id = 'foo', - serviceProviderName = 'Test Provider', - createdBy = 'admin'; + let id = 'foo'; it(`should send an expected PUT request`, waitForAsync(inject([ResolverService, HttpTestingController], (service: ResolverService, backend: HttpTestingController) => { - service.remove({ id, serviceProviderName, createdBy }).subscribe(); + service.remove(id).subscribe(); backend.expectOne((req: HttpRequest) => { return req.url === `api/EntityDescriptor/${id}` diff --git a/ui/src/app/metadata/domain/service/resolver.service.ts b/ui/src/app/metadata/domain/service/resolver.service.ts index 4db8ab41f..a29c7f0d7 100644 --- a/ui/src/app/metadata/domain/service/resolver.service.ts +++ b/ui/src/app/metadata/domain/service/resolver.service.ts @@ -36,8 +36,8 @@ export class ResolverService { return this.http.post(`${this.base}${this.endpoint}`, p); } - remove(provider: MetadataResolver): Observable { - return this.http.delete(`${this.base}${this.endpoint}/${provider.id}`); + remove(id: string): Observable { + return this.http.delete(`${this.base}${this.endpoint}/${id}`); } upload(name: string, xml: string): Observable { diff --git a/ui/src/app/metadata/manager/component/resolvers-list.component.html b/ui/src/app/metadata/manager/component/resolvers-list.component.html index 57d3ff52d..5c2de4b90 100644 --- a/ui/src/app/metadata/manager/component/resolvers-list.component.html +++ b/ui/src/app/metadata/manager/component/resolvers-list.component.html @@ -5,7 +5,8 @@ Entity ID Author Created Date - Enabled + Enabled + @@ -21,13 +22,8 @@ {{ resolver.getCreationDate() ? (resolver.getCreationDate() | customDate) : '—' }} - + - -   Incomplete Form @@ -55,6 +51,15 @@ + + + diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts index 977c7ee4e..020734d76 100644 --- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts +++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.spec.ts @@ -128,7 +128,7 @@ describe('Dashboard Resolvers List Page', () => { result: Promise.resolve(true) } as NgbModalRef; }); - instance.deleteResolver(resolver); + instance.deleteResolver({ entity: resolver, draft: false }); expect(modal.open).toHaveBeenCalled(); }); it('should log an error to the console on failure', () => { @@ -137,7 +137,7 @@ describe('Dashboard Resolvers List Page', () => { result: Promise.reject(false) } as NgbModalRef; }); - instance.deleteResolver(resolver); + instance.deleteResolver({ entity: resolver, draft: false }); expect(modal.open).toHaveBeenCalled(); }); }); diff --git a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts index 861b26848..91923dafc 100644 --- a/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts +++ b/ui/src/app/metadata/manager/container/dashboard-resolvers-list.component.ts @@ -12,6 +12,7 @@ import { DeleteDialogComponent } from '../component/delete-dialog.component'; import { RemoveDraftRequest } from '../../resolver/action/draft.action'; import { getAllResolvers } from '../../resolver/reducer'; import { FileBackedHttpMetadataResolver } from '../../domain/entity'; +import { RemoveResolverRequest } from '../../resolver/action/collection.action'; @Component({ selector: 'dashboard-resolvers-list', @@ -86,13 +87,17 @@ export class DashboardResolversListComponent implements OnInit { this.router.navigate(['metadata', 'resolver', entity.getId(), 'versions']); } - deleteResolver(entity: MetadataResolver): void { + deleteResolver({ entity, draft }: { entity: MetadataResolver, draft: boolean }): void { this.modalService .open(DeleteDialogComponent) .result .then( success => { - this.store.dispatch(new RemoveDraftRequest(entity)); + if (draft) { + this.store.dispatch(new RemoveDraftRequest(entity)); + } else { + this.store.dispatch(new RemoveResolverRequest(entity.id)); + } }, err => { console.log('Cancelled'); diff --git a/ui/src/app/metadata/resolver/action/collection.action.ts b/ui/src/app/metadata/resolver/action/collection.action.ts index 57861b17c..5ad95b7cd 100644 --- a/ui/src/app/metadata/resolver/action/collection.action.ts +++ b/ui/src/app/metadata/resolver/action/collection.action.ts @@ -118,13 +118,13 @@ export class AddResolverFail implements Action { export class RemoveResolverRequest implements Action { readonly type = ResolverCollectionActionTypes.REMOVE_RESOLVER; - constructor(public payload: MetadataResolver) { } + constructor(public payload: string) { } } export class RemoveResolverSuccess implements Action { readonly type = ResolverCollectionActionTypes.REMOVE_RESOLVER_SUCCESS; - constructor(public payload: MetadataResolver) { } + constructor(public payload: string) { } } export class RemoveResolverFail implements Action { diff --git a/ui/src/app/metadata/resolver/effect/collection.effects.ts b/ui/src/app/metadata/resolver/effect/collection.effects.ts index d818aacd8..b4550d358 100644 --- a/ui/src/app/metadata/resolver/effect/collection.effects.ts +++ b/ui/src/app/metadata/resolver/effect/collection.effects.ts @@ -213,7 +213,7 @@ export class ResolverCollectionEffects { this.descriptorService .remove(entity) .pipe( - map(p => new RemoveResolverSuccess(p)), + map(p => new RemoveResolverSuccess(entity)), catchError(err => of(new RemoveResolverFail(err))) ) ) diff --git a/ui/src/app/metadata/resolver/reducer/collection.reducer.ts b/ui/src/app/metadata/resolver/reducer/collection.reducer.ts index 82addcdbd..635142468 100644 --- a/ui/src/app/metadata/resolver/reducer/collection.reducer.ts +++ b/ui/src/app/metadata/resolver/reducer/collection.reducer.ts @@ -58,7 +58,7 @@ export function reducer(state = initialState, action: ResolverCollectionActionsU } case ResolverCollectionActionTypes.REMOVE_RESOLVER_SUCCESS: { - return adapter.removeOne(action.payload.id, { + return adapter.removeOne(action.payload, { ...state }); }