@coolon/angular-ui-powerups 3.7.2 → 3.7.4

package/fesm2015/coolon-angular-ui-powerups.js

@@ -21,13 +21,13 @@ import { fas } from '@fortawesome/free-solid-svg-icons';
 import { GarbageCollector, DelegatingValueModel, assert, UnaryCommand, lang, Dsl, Logger, TrackExternal, Command, ValueModel, StoreInValueModel, MutableListModel, Disposable, DelegatingListModel, StoreInListModel, MutableValueModel, FocusManager, EventListenerList, Form, Guard, Binding, DebugContext, ListModel, MultipleSelectionModel, DirtyTrackingForm, DelegatingCommand, Deferred, Trace, Functions } from '@coolon/pectin';
 import { __decorate, __metadata, __awaiter } from 'tslib';
 import { Memoize } from '@typescript-plus/fast-memoize-decorator/dist/src';
-import _, { isNil, isEqual } from 'lodash';
+import _, { isEqual, isNil } from 'lodash';
 import { Enum } from 'typescript-string-enums';
 import { assert as assert$1, Opts, lang as lang$1, Klass } from '@coolon/typescript-utilities';
 import produce from 'immer';
 import { FlexModule, GridModule } from '@angular/flex-layout';
 import { MatDialogModule, MatDialog, MAT_DIALOG_DEFAULT_OPTIONS, MatDialogConfig } from '@angular/material/dialog';
-import { RouterModule, ActivatedRouteSnapshot, NavigationStart, NavigationCancel, UrlSegment, Router, UrlSerializer, NavigationEnd, NavigationError, RouterOutlet } from '@angular/router';
+import { RouterModule, ActivatedRouteSnapshot, NavigationStart, NavigationCancel, UrlSegment, Router, UrlSerializer, NavigationEnd, NavigationError } from '@angular/router';
 import { Overlay, CdkScrollable } from '@angular/cdk/overlay';
 import ResizeObserver from 'resize-observer-polyfill';
 import { MatListModule } from '@angular/material/list';
@@ -2118,6 +2118,14 @@ class PropertyColumnModel extends ColumnModel {
         }));
         return this;
     }
+    liveEditCellRenderer(componentType, options) {
+        return this.mutableCellRenderer(componentType, options);
+    }
+    /**
+     * Deprecated.  Use #liveEditCellRenderer instead.
+     * @param componentType
+     * @param options
+     */
     mutableCellRenderer(componentType, options) {
         this.configureCellRenderer(new ComponentCellRendererPortalRef(componentType, (component, rowData, firstTime) => {
             // keep a local copy most recent row value so it's available to teh
@@ -2580,7 +2588,7 @@ TableComponent.decorators = [
     { type: Component, args: [{
                 selector: 'aup-table',
                 template: "<table mat-table [dataSource]=\"tableModel.dataSource.value\" [trackBy]=\"tableModel.trackBy\">\n\n  <ng-container *ngFor=\"let column of columns.value; index as index; first as first; last as last\" matColumnDef=\"{{column.columnId}}\">\n    <th mat-header-cell *matHeaderCellDef>\n      <aup-table-header-cell-renderer [column]=\"column\"\n                                      [attr.column-index]=\"index\"\n                                      [attr.column-id]=\"column.columnId\"\n                                      [class.first-column]=\"first\"\n                                      [class.last-column]=\"last\"\n      ></aup-table-header-cell-renderer>\n    </th>\n    <td mat-cell *matCellDef=\"let row\" (click)=\"onCellClicked(column, row)\" [class.enable-cursor]=\"tableModel.isRowSelectionEnabledFor(column)\">\n      <aup-table-cell-renderer [column]=\"column\"\n                               [row]=\"row\"\n                               [tableModel]=\"tableModel\"\n                               [editSession]=\"tableModel.getEditSessionFor(row)\"\n                               [attr.column-index]=\"index\"\n                               [attr.column-id]=\"column.columnId\"\n                               [class.first-column]=\"first\"\n                               [class.last-column]=\"last\"\n      ></aup-table-cell-renderer>\n    </td>\n  </ng-container>\n\n  <tr mat-header-row *matHeaderRowDef=\"columnIds.value\"></tr>\n  <tr mat-row *matRowDef=\"let row; columns: columnIds.value; let i = index\"\n      [ngClass]=\"tableModel.getRowClasses(row)\" [attr.trackBy]=\"tableModel.trackBy(i, row)\"\n  ></tr>\n\n</table>\n",
-                styles: [":host{align-items:stretch;display:flex;flex-direction:column}:host table{flex:1}"]
+                styles: [":host{align-items:stretch;display:flex;flex-direction:column}:host table{flex:1;width:100%}"]
             },] }
 ];
 TableComponent.ctorParameters = () => [];
@@ -4192,8 +4200,6 @@ InteractionModule.decorators = [
             },] }
 ];
 
-const PLACE_AUTH_SERVICE = new InjectionToken("PlaceAuthService");
-
 class ParameterDefinition {
     constructor(propertyName, options, urlFormat) {
         this.propertyName = propertyName;
@@ -4522,72 +4528,6 @@ __decorate([
     PlaceComponent.injectDefinition = injectDefinition;
 })(PlaceComponent || (PlaceComponent = {}));
 
-class Visit {
-    constructor(placeDefinition, visitParameters = {}) {
-        this.placeDefinition = placeDefinition;
-        this.visitParameters = visitParameters;
-    }
-    // @Trace()
-    getRouteId() {
-        return this.placeDefinition.getRouteIdFrom(this);
-    }
-    // @Trace()
-    hasRouteId() {
-        return !isNil(this.getRouteId());
-    }
-    /**
-     * Returns the value of the place parameter with the specified name.  The parameter
-     * name is taken from the `as` option, e.g. {as: 'aCustomName'} otherwise it is the
-     * same as the the ValueModel property name.
-     * @param parameterName the field name of the property model or the `as` option if specified.
-     */
-    getParameter(parameterName) {
-        return this.visitParameters[parameterName];
-    }
-    // @Trace()
-    hasParameter(parameterName) {
-        return Object.keys(this.visitParameters).includes(parameterName);
-    }
-    replace(parameter, value) {
-        return new Visit(this.placeDefinition, Object.assign(Object.assign({}, this.visitParameters), { [parameter.name]: value }));
-    }
-    mergeRouteParameters(routeParams) {
-        // todo: whitelist parameters.
-        const routeParameterKeys = Object.keys(routeParams);
-        const params = {};
-        this.placeDefinition.getVisitParameterDefs().forEach(def => {
-            if (def.isRouteId || def.isRouteParameter) {
-                if (routeParameterKeys.includes(def.name)) {
-                    params[def.name] = routeParams[def.name];
-                }
-            }
-            else {
-                // copy non route params as is, but only if they already exist otherwise we'll inject nil values and break the
-                // defaults and remember sanitisation process.
-                const value = this.getParameter(def.name);
-                if (this.hasParameter(def.name)) {
-                    params[def.name] = value;
-                }
-            }
-        });
-        return new Visit(this.placeDefinition, params);
-    }
-    hasRoutingChangedFrom(other) {
-        const samePlace = other.placeDefinition === this.placeDefinition;
-        const sameRouteParameters = isEqual(this.placeDefinition.getFormattedRouteParameters(this, true), this.placeDefinition.getFormattedRouteParameters(other, true));
-        return !samePlace || !sameRouteParameters;
-    }
-    hasChangedFrom(other) {
-        const sameNonRouteParameters = isEqual(this.placeDefinition.getNonRouteParameters(this), this.placeDefinition.getNonRouteParameters(other));
-        return !sameNonRouteParameters || this.hasRoutingChangedFrom(other);
-    }
-    toDebugString() {
-        return Object.keys(this.visitParameters).map(k => `${k}=${this.visitParameters[k]}`).join(",");
-    }
-}
-
-const AUP_PLACE_CONFIG = new InjectionToken('AUP_PLACE_CONFIG');
-
 /**
  * This class handles the logic around canDeactivate for a given router state transition.  It's core responsibilities are:
  * 1. Ensure we only ask the component to deactivate once on a given navigation cycle (since visit sanitisation can result in multiple round trips to through the router.)
@@ -4761,14 +4701,14 @@ class NavigationSession extends GarbageCollector {
         // Important: I tried to perform this fix at a later point int he routing cycle but it created all kinds of
         // strangeness.
         Logger.get(this).info('WORK-AROUND: Updating browser location after pop state - see angular issue #13586');
-        console.log(`replacing ${this.urlService.getCurrentLocationUrlSnapshot().url} with ${poppedHistoryToReplace}`);
+        // console.log(`replacing ${this.urlService.getCurrentLocationUrlSnapshot().url} with ${poppedHistoryToReplace}`);
         this.urlService.resetBrowserLocation(poppedHistoryToReplace, { replaceCurrent: true });
-        console.log(`pushing ${activeUrl} back onto the history.`);
+        // console.log(`pushing ${activeUrl} back onto the history.`);
         this.urlService.resetBrowserLocation(activeUrl, { replaceCurrent: false });
     }
     ignore(event, reason) {
         reason = reason ? ` -> ${reason}` : '';
-        Logger.get(this).info(`Ignoring router event${reason}: ${event.constructor.name} -> ${event.url} :: ${this.toString()}`);
+        // Logger.get(this).info(`Ignoring router event${reason}: ${event.constructor.name} -> ${event.url} :: ${this.toString()}`);
     }
     toString() {
         return `${this.constructor.name}(${this.debugState()})`;
@@ -5357,6 +5297,31 @@ class PopStateNavigation extends AbstractPopStateNavigation {
     }
 }
 
+var PlaceAccessGuard;
+(function (PlaceAccessGuard) {
+    class NoAuth {
+        isAuthenticated() {
+            return true;
+        }
+        isAuthorised(placeDefinition) {
+            return true;
+        }
+    }
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", Object)
+    ], NoAuth.prototype, "isAuthenticated", null);
+    __decorate([
+        Trace(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [PlaceDefinition]),
+        __metadata("design:returntype", Boolean)
+    ], NoAuth.prototype, "isAuthorised", null);
+    PlaceAccessGuard.NoAuth = NoAuth;
+})(PlaceAccessGuard || (PlaceAccessGuard = {}));
+
 class PlaceHistory {
     constructor() {
         this._archive = new Map();
@@ -5656,6 +5621,11 @@ class PlaceRouter extends GarbageCollector {
         this.navigationSessionModel = new MutableValueModel();
         this._activeVisits = new MutableListModel();
         this.sessionFinishedJobs = [];
+        /**
+         * An observable model containing the authoriser function.  This allows places to react to changes
+         * in permissions when any underlying auth logic changes, e.g. a role being removed from a user.
+         */
+        this._accessGuard = new DelegatingValueModel().withDefault(new PlaceAccessGuard.NoAuth());
         if (window['Cypress']) {
             window['aup.PlaceRouter'] = this;
         }
@@ -5714,6 +5684,29 @@ class PlaceRouter extends GarbageCollector {
         // the back button was clicked.
         angularLocation.onUrlChange(url => this.onUrlChanged(url));
     }
+    get accessGuard() {
+        return this._accessGuard.readonly;
+    }
+    // @Trace()
+    configureAuth(accessGrant, redirections) {
+        // We need a shitty mutable model until setDelegate is clever enough to work with readonly models.
+        const hackyMutableModel = new MutableValueModel();
+        const binding = new Binding(hackyMutableModel, accessGrant, {
+            toRight(leftValue) {
+                return lang.illegalState('hackyMutableModel is read only');
+            },
+            toLeft: (rightValue) => rightValue
+        });
+        binding.writeLeft();
+        this._accessGuard.setDelegate(hackyMutableModel);
+        this.redirections = redirections;
+    }
+    getAuthenticationFailureRedirect(activatedRoute, state) {
+        return this.redirections.onAuthenticationFailure(activatedRoute, state);
+    }
+    getAuthorisationFailureRedirect(activatedRoute, state) {
+        return this.redirections.onAuthorisationFailure(activatedRoute, state);
+    }
     get navigationSession() {
         return this.navigationSessionModel.value;
     }
@@ -5839,7 +5832,7 @@ class PlaceRouter extends GarbageCollector {
             this.placeHistory.notifyNavigationStarted();
         }
         assert.isTruthy(next !== previous);
-        Logger.get(this).info(`### Router State Transition: ${previous ? previous.toString() : 'null'} -> ${next.toString()}`);
+        // Logger.get(this).info(`### Router State Transition: ${previous ? previous.toString() : 'null'} -> ${next.toString()}`);
         this.navigationSessionModel.value = next;
         if (!!previous) {
             previous.dispose();
@@ -5859,7 +5852,7 @@ class PlaceRouter extends GarbageCollector {
         const session = this.currentSession;
         session.dispose();
         this.navigationSessionModel.value = null;
-        console.log(`### Router Session Finished (was ${session.toString()})`);
+        // console.log(`### Router Session Finished (was ${session.toString()})`);
         this.sessionFinishedJobs.forEach(job => job());
         this.sessionFinishedJobs = [];
     }
@@ -5915,6 +5908,72 @@ PlaceRouter.ctorParameters = () => [
     { type: PlaceHistory }
 ];
 
+class Visit {
+    constructor(placeDefinition, visitParameters = {}) {
+        this.placeDefinition = placeDefinition;
+        this.visitParameters = visitParameters;
+    }
+    // @Trace()
+    getRouteId() {
+        return this.placeDefinition.getRouteIdFrom(this);
+    }
+    // @Trace()
+    hasRouteId() {
+        return !isNil(this.getRouteId());
+    }
+    /**
+     * Returns the value of the place parameter with the specified name.  The parameter
+     * name is taken from the `as` option, e.g. {as: 'aCustomName'} otherwise it is the
+     * same as the the ValueModel property name.
+     * @param parameterName the field name of the property model or the `as` option if specified.
+     */
+    getParameter(parameterName) {
+        return this.visitParameters[parameterName];
+    }
+    // @Trace()
+    hasParameter(parameterName) {
+        return Object.keys(this.visitParameters).includes(parameterName);
+    }
+    replace(parameter, value) {
+        return new Visit(this.placeDefinition, Object.assign(Object.assign({}, this.visitParameters), { [parameter.name]: value }));
+    }
+    mergeRouteParameters(routeParams) {
+        // todo: whitelist parameters.
+        const routeParameterKeys = Object.keys(routeParams);
+        const params = {};
+        this.placeDefinition.getVisitParameterDefs().forEach(def => {
+            if (def.isRouteId || def.isRouteParameter) {
+                if (routeParameterKeys.includes(def.name)) {
+                    params[def.name] = routeParams[def.name];
+                }
+            }
+            else {
+                // copy non route params as is, but only if they already exist otherwise we'll inject nil values and break the
+                // defaults and remember sanitisation process.
+                const value = this.getParameter(def.name);
+                if (this.hasParameter(def.name)) {
+                    params[def.name] = value;
+                }
+            }
+        });
+        return new Visit(this.placeDefinition, params);
+    }
+    hasRoutingChangedFrom(other) {
+        const samePlace = other.placeDefinition === this.placeDefinition;
+        const sameRouteParameters = isEqual(this.placeDefinition.getFormattedRouteParameters(this, true), this.placeDefinition.getFormattedRouteParameters(other, true));
+        return !samePlace || !sameRouteParameters;
+    }
+    hasChangedFrom(other) {
+        const sameNonRouteParameters = isEqual(this.placeDefinition.getNonRouteParameters(this), this.placeDefinition.getNonRouteParameters(other));
+        return !sameNonRouteParameters || this.hasRoutingChangedFrom(other);
+    }
+    toDebugString() {
+        return Object.keys(this.visitParameters).map(k => `${k}=${this.visitParameters[k]}`).join(',');
+    }
+}
+
+const AUP_PLACE_CONFIG = new InjectionToken('AUP_PLACE_CONFIG');
+
 // Freezes the state of the components at the start of the animation.
 const animationStartStyle = style({ position: 'absolute', top: '0', left: '0', bottom: '0', right: '0' });
 const left = [
@@ -5960,11 +6019,10 @@ function leftRightPlaceAnimation(duration) {
 const LEFT_RIGHT_PLACE_ANIMATION = leftRightPlaceAnimation('0.3s');
 
 class PlaceOutletComponent extends DisposableComponent {
-    constructor(router, placeRouter, placeAuthService, placeConfig, parentOutlet) {
+    constructor(router, placeRouter, placeConfig, parentOutlet) {
         super();
         this.router = router;
         this.placeRouter = placeRouter;
-        this.placeAuthService = placeAuthService;
         this.placeConfig = placeConfig;
         this.placeChanged = new EventEmitter();
         this.outletActivated = new MutableValueModel(false);
@@ -6009,11 +6067,11 @@ class PlaceOutletComponent extends DisposableComponent {
         chain(this._activePlaceModel)
             .postponeWhile(this.navigationInProgress)
             .subscribe(place => this.placeChanged.emit(place));
-        when(placeAuthService.authoriserModel).changes(isAuthorised => {
+        when(placeRouter.accessGuard).changes(guard => {
             const activePlace = this._activePlaceModel.value;
-            if (activePlace && !isAuthorised(activePlace.placeDefinition)) {
-                const visitOrPlace = placeAuthService.handleNotAuthorised(this._activatedRouteModel.value.snapshot, this.router.routerState.snapshot);
-                this.placeRouter.navigate(visitOrPlace instanceof Visit ? visitOrPlace : new Visit(PlaceComponent.getDefinition(visitOrPlace)));
+            if (activePlace && !guard.isAuthorised(activePlace.placeDefinition)) {
+                const visit = placeRouter.getAuthorisationFailureRedirect(this._activatedRouteModel.value.snapshot, this.router.routerState.snapshot);
+                this.placeRouter.navigate(visit);
             }
         });
     }
@@ -6046,6 +6104,7 @@ class PlaceOutletComponent extends DisposableComponent {
     get activatedRouteModel() {
         return this._activatedRouteModel.readonly;
     }
+    // @Trace()
     onOutletActivated(routerOutlet, place) {
         this._activatedRouteModel.value = routerOutlet.activatedRoute;
         this._activePlaceModel.value = place;
@@ -6065,6 +6124,7 @@ class PlaceOutletComponent extends DisposableComponent {
             }
         }
     }
+    // @Trace()
     onOutletDeactivated() {
         this.outletActivated.value = false;
         this._activePlaceModel.value = null;
@@ -6137,7 +6197,6 @@ PlaceOutletComponent.decorators = [
 PlaceOutletComponent.ctorParameters = () => [
     { type: Router },
     { type: PlaceRouter },
-    { type: undefined, decorators: [{ type: Inject, args: [PLACE_AUTH_SERVICE,] }] },
     { type: undefined, decorators: [{ type: Optional }, { type: Inject, args: [AUP_PLACE_CONFIG,] }] },
     { type: PlaceOutletComponent, decorators: [{ type: SkipSelf }, { type: Optional }] }
 ];
@@ -6165,27 +6224,19 @@ __decorate([
     StoreInListModel('customPlaceAnimationOrderModel'),
     __metadata("design:type", Array)
 ], PlaceOutletComponent.prototype, "customPlaceAnimationOrder", void 0);
-__decorate([
-    Trace(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [RouterOutlet, PlaceComponent]),
-    __metadata("design:returntype", void 0)
-], PlaceOutletComponent.prototype, "onOutletActivated", null);
-__decorate([
-    Trace(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], PlaceOutletComponent.prototype, "onOutletDeactivated", null);
 
 class AbstractPlaceNavigationComponent extends DisposableComponent {
-    constructor(authService) {
+    constructor(placeRouter) {
         super();
+        this.placeRouter = placeRouter;
         this._activePlaceComponent = new DelegatingValueModel();
         const { chain, valueOf, before, when, after, observe, switchOn } = Dsl.disposeWith(this);
         this.placeDefinitions = chain(this.placesModel)
             .map(c => PlaceComponent.getDefinition(c))
-            .select(d => authService.authoriserModel.value(d), { dependsOn: authService.authoriserModel });
+            .select(d => {
+            const guard = placeRouter.accessGuard.value;
+            return guard.isAuthorised(d);
+        }, { dependsOn: placeRouter.accessGuard });
         this.commandFactory = Command.createFactory((placeDefinition) => {
             this.placeOutlet.navigate(new Visit(placeDefinition));
         });
@@ -6217,7 +6268,7 @@ AbstractPlaceNavigationComponent.decorators = [
             },] }
 ];
 AbstractPlaceNavigationComponent.ctorParameters = () => [
-    { type: undefined, decorators: [{ type: Inject, args: [PLACE_AUTH_SERVICE,] }] }
+    { type: PlaceRouter }
 ];
 AbstractPlaceNavigationComponent.propDecorators = {
     places: [{ type: Input }],
@@ -6295,8 +6346,8 @@ EmptyStateComponent.decorators = [
 EmptyStateComponent.ctorParameters = () => [];
 
 class ListPlaceNavComponent extends AbstractPlaceNavigationComponent {
-    constructor(authService) {
-        super(authService);
+    constructor(router) {
+        super(router);
     }
 }
 ListPlaceNavComponent.decorators = [
@@ -6307,7 +6358,7 @@ ListPlaceNavComponent.decorators = [
             },] }
 ];
 ListPlaceNavComponent.ctorParameters = () => [
-    { type: undefined, decorators: [{ type: Inject, args: [PLACE_AUTH_SERVICE,] }] }
+    { type: PlaceRouter }
 ];
 
 /**
@@ -6353,9 +6404,8 @@ ListPlaceNavComponent.ctorParameters = () => [
  * })
  */
 class SidePlaceNavigationComponent extends AbstractPlaceNavigationComponent {
-    constructor(router, authService) {
-        super(authService);
-        this.router = router;
+    constructor(router) {
+        super(router);
         this.expanded = false;
     }
     expandMenu() {
@@ -6376,8 +6426,7 @@ SidePlaceNavigationComponent.decorators = [
             },] }
 ];
 SidePlaceNavigationComponent.ctorParameters = () => [
-    { type: Router },
-    { type: undefined, decorators: [{ type: Inject, args: [PLACE_AUTH_SERVICE,] }] }
+    { type: PlaceRouter }
 ];
 SidePlaceNavigationComponent.propDecorators = {
     expanded: [{ type: HostBinding, args: ['class.expanded',] }],
@@ -6385,8 +6434,8 @@ SidePlaceNavigationComponent.propDecorators = {
 };
 
 class TabbedPlaceNavigationComponent extends AbstractPlaceNavigationComponent {
-    constructor(authService) {
-        super(authService);
+    constructor(router) {
+        super(router);
     }
 }
 TabbedPlaceNavigationComponent.decorators = [
@@ -6397,7 +6446,7 @@ TabbedPlaceNavigationComponent.decorators = [
             },] }
 ];
 TabbedPlaceNavigationComponent.ctorParameters = () => [
-    { type: undefined, decorators: [{ type: Inject, args: [PLACE_AUTH_SERVICE,] }] }
+    { type: PlaceRouter }
 ];
 
 class PlaceModule {
@@ -6707,12 +6756,11 @@ class VisitSanitiser {
 }
 
 class PlaceGuard {
-    constructor(router, urlService, placeRouter, placeHistory, placeAuthService, interactionService, injector) {
+    constructor(router, urlService, placeRouter, placeHistory, interactionService, injector) {
         this.router = router;
         this.urlService = urlService;
         this.placeRouter = placeRouter;
         this.placeHistory = placeHistory;
-        this.placeAuthService = placeAuthService;
         this.interactionService = interactionService;
         this.injector = injector;
     }
@@ -6722,18 +6770,18 @@ class PlaceGuard {
             if (PlaceComponent.isPlaceComponentConstructor(activatedRoute.component)) {
                 const placeDefinition = PlaceComponent.getDefinition(activatedRoute.component);
                 if (placeDefinition.authenticate) {
-                    if (!(yield this.placeAuthService.isAuthenticated())) {
-                        const redirectLocation = this.placeAuthService.handleNotAuthenticated(activatedRoute, state);
+                    if (!(yield this.placeRouter.accessGuard.value.isAuthenticated())) {
+                        const redirectLocation = this.placeRouter.getAuthenticationFailureRedirect(activatedRoute, state);
                         const nextPlaceDef = this.getPlaceDefinition(redirectLocation);
                         if (nextPlaceDef.authenticate) {
                             lang.illegalState(`handleNotAuthenticated hook returned place ${nextPlaceDef.component.name} that requires authentication.`);
                         }
                         return this.createUrlTree(redirectLocation);
                     }
-                    if (!this.placeAuthService.isAuthorised(placeDefinition)) {
-                        const redirectLocation = this.placeAuthService.handleNotAuthorised(activatedRoute, state);
+                    if (!(this.placeRouter.accessGuard.value ? this.placeRouter.accessGuard.value.isAuthorised(placeDefinition) : true)) {
+                        const redirectLocation = this.placeRouter.getAuthorisationFailureRedirect(activatedRoute, state);
                         const nextPlaceDef = this.getPlaceDefinition(redirectLocation);
-                        if (!this.placeAuthService.isAuthorised(nextPlaceDef)) {
+                        if (!(this.placeRouter.accessGuard.value ? this.placeRouter.accessGuard.value.isAuthorised(nextPlaceDef) : true)) {
                             lang.illegalState(`handleNotAuthorised hook returned place ${nextPlaceDef.component.name} that is not authorised for the current user.`);
                         }
                         return this.createUrlTree(redirectLocation);
@@ -6820,7 +6868,7 @@ class PlaceGuard {
         });
     }
 }
-PlaceGuard.ɵprov = ɵɵdefineInjectable({ factory: function PlaceGuard_Factory() { return new PlaceGuard(ɵɵinject(Router), ɵɵinject(UrlService), ɵɵinject(PlaceRouter), ɵɵinject(PlaceHistory), ɵɵinject(PLACE_AUTH_SERVICE), ɵɵinject(InteractionService), ɵɵinject(INJECTOR)); }, token: PlaceGuard, providedIn: "root" });
+PlaceGuard.ɵprov = ɵɵdefineInjectable({ factory: function PlaceGuard_Factory() { return new PlaceGuard(ɵɵinject(Router), ɵɵinject(UrlService), ɵɵinject(PlaceRouter), ɵɵinject(PlaceHistory), ɵɵinject(InteractionService), ɵɵinject(INJECTOR)); }, token: PlaceGuard, providedIn: "root" });
 PlaceGuard.decorators = [
     { type: Injectable, args: [{ providedIn: 'root' },] }
 ];
@@ -6829,7 +6877,6 @@ PlaceGuard.ctorParameters = () => [
     { type: UrlService },
     { type: PlaceRouter },
     { type: PlaceHistory },
-    { type: undefined, decorators: [{ type: Inject, args: [PLACE_AUTH_SERVICE,] }] },
     { type: InteractionService },
     { type: Injector }
 ];
@@ -6934,5 +6981,5 @@ function VisitParameterList(options) {
  * Generated bundle index. Do not edit.
  */
 
-export { ACTIVITY_DATA, AUP_PLACE_CONFIG, AbstractInputActivity, AbstractInputComponent, AbstractInteractionContext, AbstractListInputComponent, AbstractPlaceNavigationComponent, AbstractPopStateNavigation, AbstractPopupMenuComponent, AbstractValueInputComponent, Activity, ActivityActionsComponent, ActivityContainerComponent, ActivityOutletComponent, ActivityRef, AddItemInteractionContextComponent, AlertDialogComponent, AngularUiPowerupsModule, AutocompleteInputComponent, Bounds, BusyOverlayComponent, CELL_EDITOR_PORTAL, CELL_RENDERER_PORTAL, CardContainerComponent, CellEditorPortalRef, CellHeaderPortalRef, CellPortalRef, CellRendererPortalRef, CheckboxInputComponent, ColumnModel, ColumnTemplateDirective, CommandComponent, CommandContainer, CommandDirective, CommandFace, CommandFaceComponent, ComponentCellRendererPortalRef, ComponentsModule, ConfirmThenDialogComponent, ConfirmationDialogComponent, ConsolidatedParameterMap, CustomTemplateColumnModel, CustomValueColumnModel, DEFINITION_META_DATA_KEY, DIALOG_INTERACTION_SERVICE_DEFAULTS, DefaultCellRendererComponent, DefaultHeaderCellRendererComponent, DialogInteractionContext, DialogInteractionContextFactory, Dimension, DirectivesModule, DisposableComponent, EditRowControls, EditSession, EditorControlColumnModel, EmptyStateComponent, EventCleanUpSession, FlexComponent, FocusBinding, FocusBindingDirective, FocusBindingFactory, FocusContainerComponent, FocusableComponent, Formatter, HEADER_CELL_RENDERER_PORTAL, IconComponent, InPlaceInteractionContextComponent, InteractionContextTriggerFor, InteractionModule, InteractionService, InteractionServiceRoutingAdapter, LEFT_RIGHT_PLACE_ANIMATION, ListPlaceNavComponent, ListPropertyColumnModel, ModalInteractionContextFactory, MoreMenuComponent, MultipleSelectInputComponent, Navigating, NavigatingDuringInteraction, NavigationContext, NavigationSession, NoopAuthGuard, NoopComponent, NumberInputComponent, PLACE_AUTH_SERVICE, POPUP_CONTAINER, PORTAL_EDITOR_COMPONENT, PORTAL_RENDERER_COMPONENT, ParameterDefinition, PasswordInputComponent, Place, PlaceComponent, PlaceComponentDeactivationHandler, PlaceDefinition, PlaceGuard, PlaceHistory, PlaceModule, PlaceOutletComponent, PlaceRouter, Point, PopStateDuringInteractionNavigation, PopStateNavigation, PopupAwareComponent, PopupInteractionContextComponent, PopupMenuComponent, PopupMenuRendererComponent, PropertyColumnModel, ROUTE_PARAMETER_LIST_KEY, RemoveLastInteractionFromUrlNavigationSession, ResizeAwareComponent, RouteId, ScrollContainerComponent, SectionHeaderComponent, SelectCellRendererComponent, SelectHeaderCellRendererComponent, SelectInputActivity, SelectInputComponent, SelectionColumnModel, SeparatorComponent, SidePlaceNavigationComponent, StringInputActivity, StringInputComponent, SwitchCaseComponent, SwitchCaseDefaultDirective, SwitchCaseOption, SwitchCaseWhenDirective, SynchroniseInteractionContextIdsWithRoute, TabbedPlaceNavigationComponent, TableCellRendererComponent, TableComponent, TableHeaderCellRendererComponent, TableModel, TableRowMenuComponent, TemplateCellRendererPortalRef, TextInputComponent, ToolBarComponent, TrackBy, UrlService, UrlSnapshot, VerticalFocusContainerComponent, Visit, VisitParameter, VisitParameterList, VisitSanitiser, WaitUntilLeavingInteractionTransitionCancelled, WaitUntilLinkTriggeredNavigationInteractionCancellationTypeDetermined, WaitUntilPopStateDuringCanDeactivateInteractionFinishes, leftRightPlaceAnimation, slideDownOnEnterAnimation, slideRightOnEnterAnimation, ɵ0 };
+export { ACTIVITY_DATA, AUP_PLACE_CONFIG, AbstractInputActivity, AbstractInputComponent, AbstractInteractionContext, AbstractListInputComponent, AbstractPlaceNavigationComponent, AbstractPopStateNavigation, AbstractPopupMenuComponent, AbstractValueInputComponent, Activity, ActivityActionsComponent, ActivityContainerComponent, ActivityOutletComponent, ActivityRef, AddItemInteractionContextComponent, AlertDialogComponent, AngularUiPowerupsModule, AutocompleteInputComponent, Bounds, BusyOverlayComponent, CELL_EDITOR_PORTAL, CELL_RENDERER_PORTAL, CardContainerComponent, CellEditorPortalRef, CellHeaderPortalRef, CellPortalRef, CellRendererPortalRef, CheckboxInputComponent, ColumnModel, ColumnTemplateDirective, CommandComponent, CommandContainer, CommandDirective, CommandFace, CommandFaceComponent, ComponentCellRendererPortalRef, ComponentsModule, ConfirmThenDialogComponent, ConfirmationDialogComponent, ConsolidatedParameterMap, CustomTemplateColumnModel, CustomValueColumnModel, DEFINITION_META_DATA_KEY, DIALOG_INTERACTION_SERVICE_DEFAULTS, DefaultCellRendererComponent, DefaultHeaderCellRendererComponent, DialogInteractionContext, DialogInteractionContextFactory, Dimension, DirectivesModule, DisposableComponent, EditRowControls, EditSession, EditorControlColumnModel, EmptyStateComponent, EventCleanUpSession, FlexComponent, FocusBinding, FocusBindingDirective, FocusBindingFactory, FocusContainerComponent, FocusableComponent, Formatter, HEADER_CELL_RENDERER_PORTAL, IconComponent, InPlaceInteractionContextComponent, InteractionContextTriggerFor, InteractionModule, InteractionService, InteractionServiceRoutingAdapter, LEFT_RIGHT_PLACE_ANIMATION, ListPlaceNavComponent, ListPropertyColumnModel, ModalInteractionContextFactory, MoreMenuComponent, MultipleSelectInputComponent, Navigating, NavigatingDuringInteraction, NavigationContext, NavigationSession, NoopAuthGuard, NoopComponent, NumberInputComponent, POPUP_CONTAINER, PORTAL_EDITOR_COMPONENT, PORTAL_RENDERER_COMPONENT, ParameterDefinition, PasswordInputComponent, Place, PlaceAccessGuard, PlaceComponent, PlaceComponentDeactivationHandler, PlaceDefinition, PlaceGuard, PlaceHistory, PlaceModule, PlaceOutletComponent, PlaceRouter, Point, PopStateDuringInteractionNavigation, PopStateNavigation, PopupAwareComponent, PopupInteractionContextComponent, PopupMenuComponent, PopupMenuRendererComponent, PropertyColumnModel, ROUTE_PARAMETER_LIST_KEY, RemoveLastInteractionFromUrlNavigationSession, ResizeAwareComponent, RouteId, ScrollContainerComponent, SectionHeaderComponent, SelectCellRendererComponent, SelectHeaderCellRendererComponent, SelectInputActivity, SelectInputComponent, SelectionColumnModel, SeparatorComponent, SidePlaceNavigationComponent, StringInputActivity, StringInputComponent, SwitchCaseComponent, SwitchCaseDefaultDirective, SwitchCaseOption, SwitchCaseWhenDirective, SynchroniseInteractionContextIdsWithRoute, TabbedPlaceNavigationComponent, TableCellRendererComponent, TableComponent, TableHeaderCellRendererComponent, TableModel, TableRowMenuComponent, TemplateCellRendererPortalRef, TextInputComponent, ToolBarComponent, TrackBy, UrlService, UrlSnapshot, VerticalFocusContainerComponent, Visit, VisitParameter, VisitParameterList, VisitSanitiser, WaitUntilLeavingInteractionTransitionCancelled, WaitUntilLinkTriggeredNavigationInteractionCancellationTypeDetermined, WaitUntilPopStateDuringCanDeactivateInteractionFinishes, leftRightPlaceAnimation, slideDownOnEnterAnimation, slideRightOnEnterAnimation, ɵ0 };
 //# sourceMappingURL=coolon-angular-ui-powerups.js.map