diff --git a/ui/src/app/app.component.html b/ui/src/app/app.component.html index b7adb997b..fe988c62f 100644 --- a/ui/src/app/app.component.html +++ b/ui/src/app/app.component.html @@ -42,7 +42,7 @@
  • - + Dashboard diff --git a/ui/src/app/metadata/provider/container/provider-edit.component.ts b/ui/src/app/metadata/provider/container/provider-edit.component.ts index 6b437227a..19e101e75 100644 --- a/ui/src/app/metadata/provider/container/provider-edit.component.ts +++ b/ui/src/app/metadata/provider/container/provider-edit.component.ts @@ -95,7 +95,7 @@ export class ProviderEditComponent implements OnDestroy, CanComponentDeactivate cancel(): void { this.clear(); - this.router.navigate(['metadata', 'manager', 'providers']); + this.router.navigate(['dashboard', 'metadata', 'manager', 'providers']); } canDeactivate( diff --git a/ui/src/app/metadata/provider/effect/collection.effect.ts b/ui/src/app/metadata/provider/effect/collection.effect.ts index aa80ae3c9..c0a421188 100644 --- a/ui/src/app/metadata/provider/effect/collection.effect.ts +++ b/ui/src/app/metadata/provider/effect/collection.effect.ts @@ -130,7 +130,7 @@ export class CollectionEffects { createProviderSuccessRedirect$ = this.actions$.pipe( ofType(ProviderCollectionActionTypes.ADD_PROVIDER_SUCCESS), map(action => action.payload), - tap(provider => this.router.navigate(['metadata', 'manager', 'providers'])) + tap(provider => this.router.navigate(['dashboard', 'metadata', 'manager', 'providers'])) ); @Effect() @@ -162,7 +162,7 @@ export class CollectionEffects { map(action => action.payload), tap(provider => { this.store.dispatch(new ClearProvider()); - this.router.navigate(['metadata', 'manager', 'providers']); + this.router.navigate(['dashboard', 'metadata', 'manager', 'providers']); }) ); diff --git a/ui/src/app/metadata/resolver/action/collection.action.ts b/ui/src/app/metadata/resolver/action/collection.action.ts index f0aebd69a..9ce6c31d4 100644 --- a/ui/src/app/metadata/resolver/action/collection.action.ts +++ b/ui/src/app/metadata/resolver/action/collection.action.ts @@ -10,6 +10,7 @@ export enum ResolverCollectionActionTypes { UPDATE_RESOLVER_REQUEST = '[Metadata Resolver] Update Request', UPDATE_RESOLVER_SUCCESS = '[Metadata Resolver] Update Success', UPDATE_RESOLVER_FAIL = '[Metadata Resolver] Update Fail', + UPDATE_RESOLVER_CONFLICT = '[Metadata Resolver] Update Conflict', LOAD_RESOLVER_REQUEST = '[Metadata Resolver Collection] Resolver REQUEST', LOAD_RESOLVER_SUCCESS = '[Metadata Resolver Collection] Resolver SUCCESS', @@ -76,6 +77,12 @@ export class UpdateResolverSuccess implements Action { export class UpdateResolverFail implements Action { readonly type = ResolverCollectionActionTypes.UPDATE_RESOLVER_FAIL; + constructor(public payload: any) { } +} + +export class UpdateResolverConflict implements Action { + readonly type = ResolverCollectionActionTypes.UPDATE_RESOLVER_CONFLICT; + constructor(public payload: MetadataResolver) { } } @@ -143,5 +150,6 @@ export type ResolverCollectionActionsUnion = | UpdateResolverRequest | UpdateResolverSuccess | UpdateResolverFail + | UpdateResolverConflict | UploadResolverRequest | CreateResolverFromUrlRequest; diff --git a/ui/src/app/metadata/resolver/container/resolver-edit.component.ts b/ui/src/app/metadata/resolver/container/resolver-edit.component.ts index 013d5cd24..9b121c1b2 100644 --- a/ui/src/app/metadata/resolver/container/resolver-edit.component.ts +++ b/ui/src/app/metadata/resolver/container/resolver-edit.component.ts @@ -85,7 +85,7 @@ export class ResolverEditComponent implements OnDestroy, CanComponentDeactivate cancel(): void { this.clear(); - this.router.navigate(['metadata', 'manager', 'resolvers']); + this.router.navigate(['dashboard', 'metadata', 'manager', 'resolvers']); } canDeactivate( @@ -97,7 +97,6 @@ export class ResolverEditComponent implements OnDestroy, CanComponentDeactivate return of(true); } const diff = this.diffService.updatedDiff(this.resolver, this.latest); - console.log(diff, this.resolver, this.latest); if (diff && Object.keys(diff).length > 0) { let modal = this.modalService.open(UnsavedEntityComponent); modal.result.then( diff --git a/ui/src/app/metadata/resolver/effect/collection.effects.ts b/ui/src/app/metadata/resolver/effect/collection.effects.ts index 46d2d0712..608d1d442 100644 --- a/ui/src/app/metadata/resolver/effect/collection.effects.ts +++ b/ui/src/app/metadata/resolver/effect/collection.effects.ts @@ -39,8 +39,6 @@ export class ResolverCollectionEffects { ofType(ResolverCollectionActionTypes.UPDATE_RESOLVER_REQUEST), map(action => action.payload), switchMap(provider => { - delete provider.modifiedDate; - delete provider.createdDate; return this.descriptorService .update(provider) .pipe( @@ -48,7 +46,16 @@ export class ResolverCollectionEffects { id: p.id, changes: p })), - catchError(err => of(new providerActions.UpdateResolverFail(provider))) + catchError(err => { + if (err.status === 409) { + return of(new providerActions.UpdateResolverConflict(provider)); + } + console.log(err); + return of(new providerActions.UpdateResolverFail({ + errorCode: err.status, + errorMessage: `${err.statusText} - ${err.message}` + })); + }) ); }) ); @@ -57,7 +64,7 @@ export class ResolverCollectionEffects { updateResolverSuccessRedirect$ = this.actions$.pipe( ofType(ResolverCollectionActionTypes.UPDATE_RESOLVER_SUCCESS), map(action => action.payload), - tap(provider => this.router.navigate(['metadata'])) + tap(provider => this.router.navigate(['dashboard'])) ); @Effect() @@ -67,6 +74,20 @@ export class ResolverCollectionEffects { map(provider => new providerActions.LoadResolverRequest()) ); + @Effect() + updateResolverFailNotification$ = this.actions$.pipe( + ofType(ResolverCollectionActionTypes.UPDATE_RESOLVER_FAIL), + map(action => action.payload), + withLatestFrom(this.store.select(fromI18n.getMessages)), + map(([error, messages]) => new AddNotification( + new Notification( + NotificationType.Danger, + `${error.errorCode}: ${this.i18nService.translate(error.errorMessage, null, messages)}`, + 8000 + ) + )) + ); + @Effect() selectResolver$ = this.actions$.pipe( ofType(ResolverCollectionActionTypes.SELECT), @@ -104,7 +125,7 @@ export class ResolverCollectionEffects { addResolverSuccessRedirect$ = this.actions$.pipe( ofType(ResolverCollectionActionTypes.ADD_RESOLVER_SUCCESS), map(action => action.payload), - tap(provider => this.router.navigate(['metadata'])) + tap(provider => this.router.navigate(['dashboard'])) ); @Effect() addResolverSuccessReload$ = this.actions$.pipe( diff --git a/ui/src/app/metadata/resolver/effect/entity.effect.ts b/ui/src/app/metadata/resolver/effect/entity.effect.ts index 1c487dec2..98a4b5891 100644 --- a/ui/src/app/metadata/resolver/effect/entity.effect.ts +++ b/ui/src/app/metadata/resolver/effect/entity.effect.ts @@ -28,11 +28,11 @@ export class EntityEffects { cancelChanges$ = this.actions$.pipe( ofType(ResolverEntityActionTypes.CANCEL), map(() => new provider.LoadResolverRequest()), - tap(() => this.router.navigate(['metadata'])) + tap(() => this.router.navigate(['dashboard'])) ); @Effect() - updateResolverSuccessRedirect$ = this.actions$.pipe( + updateResolverSuccessClear$ = this.actions$.pipe( ofType(ResolverCollectionActionTypes.UPDATE_RESOLVER_SUCCESS), map(action => action.payload), map(p => new Clear()) @@ -40,7 +40,7 @@ export class EntityEffects { @Effect() openContention$ = this.actions$.pipe( - ofType(ResolverCollectionActionTypes.UPDATE_RESOLVER_FAIL), + ofType(ResolverCollectionActionTypes.UPDATE_RESOLVER_CONFLICT), map(action => action.payload), withLatestFrom(this.store.select(fromResolver.getSelectedResolver)), switchMap(([filter, current]) => { diff --git a/ui/src/app/user/admin/admin.module.ts b/ui/src/app/user/admin/admin.module.ts index b8567d46b..f15e062dc 100644 --- a/ui/src/app/user/admin/admin.module.ts +++ b/ui/src/app/user/admin/admin.module.ts @@ -13,20 +13,26 @@ import { reducers } from './reducer'; import { AdminService } from './service/admin.service'; import { AdminCollectionEffects } from './effect/collection.effect'; import { EffectsModule } from '@ngrx/effects'; +import { DeleteUserDialogComponent } from './component/delete-user-dialog.component'; +import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap'; @NgModule({ declarations: [ AdminManagementPageComponent, - AdminComponent + AdminComponent, + DeleteUserDialogComponent + ], + entryComponents: [ + DeleteUserDialogComponent ], - entryComponents: [], imports: [ CommonModule, FormsModule, RouterModule, HttpClientModule, SharedModule, - I18nModule + I18nModule, + NgbModalModule ] }) export class UserAdminModule { diff --git a/ui/src/app/user/admin/component/delete-user-dialog.component.html b/ui/src/app/user/admin/component/delete-user-dialog.component.html new file mode 100644 index 000000000..98030428c --- /dev/null +++ b/ui/src/app/user/admin/component/delete-user-dialog.component.html @@ -0,0 +1,13 @@ +
    +

    Delete User?

    +
    +
    +
    + +

    You are requesting to delete a user. If you complete this process the user will be removed. This cannot be undone. Do you wish to continue?

    +
    +
    +
    + + +
    \ No newline at end of file diff --git a/ui/src/app/user/admin/component/delete-user-dialog.component.ts b/ui/src/app/user/admin/component/delete-user-dialog.component.ts new file mode 100644 index 000000000..68c733517 --- /dev/null +++ b/ui/src/app/user/admin/component/delete-user-dialog.component.ts @@ -0,0 +1,14 @@ +import { Component, ChangeDetectionStrategy, Input, Output, EventEmitter } from '@angular/core'; + +import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; + +@Component({ + selector: 'delete-user-dialog', + changeDetection: ChangeDetectionStrategy.OnPush, + templateUrl: './delete-user-dialog.component.html' +}) +export class DeleteUserDialogComponent { + constructor( + public activeModal: NgbActiveModal + ) { } +} /* istanbul ignore next */ diff --git a/ui/src/app/user/admin/container/admin-management.component.ts b/ui/src/app/user/admin/container/admin-management.component.ts index b94a8c396..54af32a13 100644 --- a/ui/src/app/user/admin/container/admin-management.component.ts +++ b/ui/src/app/user/admin/container/admin-management.component.ts @@ -9,6 +9,10 @@ import * as fromAdmin from '../reducer'; import { LoadAdminRequest, UpdateAdminRequest, RemoveAdminRequest } from '../action/collection.action'; import { Admin } from '../model/admin'; import { LoadRoleRequest } from '../../../core/action/configuration.action'; +import { ModalService } from '../../../core/service/modal.service'; +import { DeleteUserDialogComponent } from '../component/delete-user-dialog.component'; +import { map } from 'rxjs/operators'; +import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; @Component({ selector: 'admin-management-page', @@ -22,7 +26,8 @@ export class AdminManagementPageComponent { roles$: Observable; constructor( - private store: Store + private store: Store, + private modal: NgbModal ) { this.store.dispatch(new LoadAdminRequest()); this.store.dispatch(new LoadRoleRequest()); @@ -39,6 +44,14 @@ export class AdminManagementPageComponent { } deleteUser(user: string): void { - this.store.dispatch(new RemoveAdminRequest(user)); + this.modal + .open(DeleteUserDialogComponent) + .result + .then( + result => this.store.dispatch(new RemoveAdminRequest(user)) + ) + .catch( + err => err + ); } }