@coolon/angular-ui-powerups 11.0.0-alpha.2 → 11.0.0-alpha.3

package/bundles/coolon-angular-ui-powerups.umd.js

@@ -6450,6 +6450,7 @@
             this.component = component;
             this.navigationSession = navigationSession;
             this.isPrimaryComponent = isPrimaryComponent;
+            pectin.assert.notNil(component);
         }
         Object.defineProperty(PlaceComponentDeactivationHandler.prototype, "routerInteractionAdapter", {
             get: function () {
@@ -7617,7 +7618,7 @@
         { type: i1$1.UrlSerializer }
     ]; };
 
-    var PlaceRouter = /** @class */ (function (_super) {
+    exports.PlaceRouter = /** @class */ (function (_super) {
         __extends(PlaceRouter, _super);
         function PlaceRouter(angularRouter, angularLocation, interactionService, urlService, placeHistory) {
             var _this = _super.call(this) || this;
@@ -7653,7 +7654,7 @@
                 .pluck('name')
                 .otherwise(idleStateName);
             pectin.DebugContext.tag(_this._activeVisits, 'PlaceRouter.activeVisits');
-            _this.activeVisitsByPlaceDefinition = chain(_this._activeVisits).indexBy('placeDefinition');
+            _this.state = chain(_this._activeVisits).reduce(function (visits) { return new PlaceRouter.State(visits); });
             // TODO: make setup the callbacks in during module initiation to make this testable.
             angularRouter.events.subscribe(function (event) {
                 // Routing event sequence
@@ -7717,9 +7718,6 @@
         PlaceRouter.prototype.getAuthenticationFailureRedirect = function (activatedRoute, state) {
             return this.redirections.onAuthenticationFailure(activatedRoute, state);
         };
-        PlaceRouter.prototype.getAuthorisationFailureRedirect = function (activatedRoute, state) {
-            return this.redirections.onAuthorisationFailure(activatedRoute, state);
-        };
         Object.defineProperty(PlaceRouter.prototype, "navigationSession", {
             get: function () {
                 return this.navigationSessionModel.value;
@@ -7955,19 +7953,34 @@
         };
         return PlaceRouter;
     }(pectin.GarbageCollector));
-    PlaceRouter.ɵprov = i0.ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new PlaceRouter(i0.ɵɵinject(i1$1.Router), i0.ɵɵinject(i2.Location), i0.ɵɵinject(exports.InteractionService), i0.ɵɵinject(UrlService), i0.ɵɵinject(exports.PlaceHistory)); }, token: PlaceRouter, providedIn: "root" });
-    PlaceRouter.decorators = [
+    exports.PlaceRouter.ɵprov = i0.ɵɵdefineInjectable({ factory: function PlaceRouter_Factory() { return new exports.PlaceRouter(i0.ɵɵinject(i1$1.Router), i0.ɵɵinject(i2.Location), i0.ɵɵinject(exports.InteractionService), i0.ɵɵinject(UrlService), i0.ɵɵinject(exports.PlaceHistory)); }, token: exports.PlaceRouter, providedIn: "root" });
+    exports.PlaceRouter.decorators = [
         { type: i0.Injectable, args: [{
                     providedIn: 'root'
                 },] }
     ];
-    PlaceRouter.ctorParameters = function () { return [
+    exports.PlaceRouter.ctorParameters = function () { return [
         { type: i1$1.Router },
         { type: i2.Location },
         { type: exports.InteractionService },
         { type: UrlService },
         { type: exports.PlaceHistory }
     ]; };
+    (function (PlaceRouter) {
+        var State = /** @class */ (function () {
+            function State(activeVisits) {
+                this.activeVisits = activeVisits;
+            }
+            State.prototype.isPlaceActive = function (placeDefinition) {
+                return !!this.getVisitFor(placeDefinition);
+            };
+            State.prototype.getVisitFor = function (placeDefinition) {
+                return this.activeVisits.find(function (v) { return v.placeDefinition === placeDefinition; });
+            };
+            return State;
+        }());
+        PlaceRouter.State = State;
+    })(exports.PlaceRouter || (exports.PlaceRouter = {}));
 
     var Visit = /** @class */ (function () {
         function Visit(placeDefinition, visitParameters) {
@@ -8040,6 +8053,20 @@
 
     var AUP_PLACE_CONFIG = new i0.InjectionToken('AUP_PLACE_CONFIG');
 
+    var NotAuthorisedNoticeComponent = /** @class */ (function () {
+        function NotAuthorisedNoticeComponent() {
+        }
+        return NotAuthorisedNoticeComponent;
+    }());
+    NotAuthorisedNoticeComponent.decorators = [
+        { type: i0.Component, args: [{
+                    selector: 'aup-not-authorised-notice',
+                    template: "<p>You are not authorised to access this page</p>\n",
+                    styles: [":host{display:flex;flex-direction:column;align-items:center;justify-content:center}"]
+                },] }
+    ];
+    NotAuthorisedNoticeComponent.ctorParameters = function () { return []; };
+
     // Freezes the state of the components at the start of the animation.
     var animationStartStyle = animations$1.style({ position: 'absolute', top: '0', left: '0', bottom: '0', right: '0' });
     var left = [
@@ -8084,13 +8111,15 @@
     }
     var LEFT_RIGHT_PLACE_ANIMATION = leftRightPlaceAnimation('0.3s');
 
+    var AUP_UNAUTHORISED_PLACE_NOTICE_COMPONENT = new i0.InjectionToken('AUP_UNAUTHORISED_PLACE_COMPONENT');
     var PlaceOutletComponent = /** @class */ (function (_super) {
         __extends(PlaceOutletComponent, _super);
-        function PlaceOutletComponent(router, placeRouter, placeConfig, parentOutlet) {
+        function PlaceOutletComponent(router, placeRouter, placeConfig, unauthorisedPlaceNotice, parentOutlet, cdr) {
             var _this = _super.call(this) || this;
             _this.router = router;
             _this.placeRouter = placeRouter;
             _this.placeConfig = placeConfig;
+            _this.cdr = cdr;
             _this.placeChanged = new i0.EventEmitter();
             _this.outletActivated = new pectin.MutableValueModel(false);
             _this._activatedRouteModel = new pectin.MutableValueModel();
@@ -8123,7 +8152,7 @@
             _this.animationEnabled = valueOf.all(_this.animateModel, _this.animationSupported).areTruthy();
             // Extract our visit model from the place router.
             _this._activePlaceDefinition = chain(_this._activePlaceModel).pluck('placeDefinition');
-            _this.routerVisitModel = _this._activePlaceDefinition.findIn(chain(placeRouter.activeVisitsByPlaceDefinition));
+            _this.routerVisitModel = chain(placeRouter.state).map(function (state) { return state.getVisitFor(_this._activePlaceDefinition.value); }, { dependsOn: _this._activePlaceDefinition });
             _this.navigationInProgress = chain(_this.placeRouter.navigationInProgress);
             when(_this.navigationInProgress).becomesFalsey(function () {
                 _this.checkStateAndInitialise();
@@ -8134,13 +8163,11 @@
             chain(_this._activePlaceModel)
                 .postponeWhile(_this.navigationInProgress)
                 .subscribe(function (place) { return _this.placeChanged.emit(place); });
-            when(placeRouter.accessGuard).changes(function (guard) {
-                var activePlace = _this._activePlaceModel.value;
-                if (activePlace && !guard.isAuthorised(activePlace.placeDefinition)) {
-                    var visit = placeRouter.getAuthorisationFailureRedirect(_this._activatedRouteModel.value.snapshot, _this.router.routerState.snapshot);
-                    _this.placeRouter.navigate(visit);
-                }
-            });
+            _this.authorised = chain(placeRouter.accessGuard).map(function (guard) { return guard.isAuthorised(_this._activePlaceDefinition.value); }, {
+                dependsOn: _this._activePlaceDefinition,
+                postponeWhile: chain(_this._activePlaceDefinition).isNil()
+            }).otherwise(true); // if we don't have a place def yet we need to show the outlet so we get one injected.
+            _this.notAuthorisedNoticePortal = new portal.ComponentPortal(unauthorisedPlaceNotice !== null && unauthorisedPlaceNotice !== void 0 ? unauthorisedPlaceNotice : NotAuthorisedNoticeComponent);
             return _this;
         }
         // @Trace()
@@ -8157,6 +8184,13 @@
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(PlaceOutletComponent.prototype, "isAuthorised", {
+            get: function () {
+                return this.authorised.value;
+            },
+            enumerable: false,
+            configurable: true
+        });
         // @Trace()
         PlaceOutletComponent.prototype.navigate = function (visit) {
             // const place = this.placesInAnimationOrder.query().findMatching(p => visit.placeDefinition.component === p);
@@ -8223,6 +8257,7 @@
                     pectin.lang.illegalState('wrong visit!!!');
                 }
                 this.initialisePlace(routerVisit, activePlace);
+                this.cdr.detectChanges();
             }
         };
         PlaceOutletComponent.prototype.initialisePlace = function (routerVisit, activePlace) {
@@ -8276,16 +8311,18 @@
     PlaceOutletComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'aup-place-outlet',
-                    template: "<ng-container *ngIf=\"animationEnabled.value\">\n  <div class=\"router-outlet-container\" cdkScrollable\n       [@routeAnimations]=\"{value: getAnimationOrder(), params:{duration: animationDuration}}\"\n       (@routeAnimations.start)=\"animationStarted()\"\n       (@routeAnimations.done)=\"animationDone()\"\n  >\n    <router-outlet #routerOutlet=\"outlet\"\n                   (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                   (deactivate)=\"onOutletDeactivated()\">\n    </router-outlet>\n  </div>\n</ng-container>\n\n<ng-container *ngIf=\"!animationEnabled.value\">\n  <div class=\"router-outlet-container\" cdkScrollable>\n    <router-outlet #routerOutlet=\"outlet\"\n                   (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                   (deactivate)=\"onOutletDeactivated()\">\n    </router-outlet>\n  </div>\n</ng-container>\n\n",
+                    template: "<ng-container *ngIf=\"animationEnabled.value\">\n  <div class=\"router-outlet-container\"\n       cdkScrollable\n       [@routeAnimations]=\"{value: getAnimationOrder(), params:{duration: animationDuration}}\"\n       (@routeAnimations.start)=\"animationStarted()\"\n       (@routeAnimations.done)=\"animationDone()\"\n  >\n    <router-outlet #routerOutlet=\"outlet\"\n                   (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                   (deactivate)=\"onOutletDeactivated()\">\n    </router-outlet>\n  </div>\n</ng-container>\n\n<ng-container *ngIf=\"!animationEnabled.value\">\n  <div class=\"router-outlet-container\"\n       cdkScrollable>\n    <router-outlet #routerOutlet=\"outlet\"\n                   (activate)=\"onOutletActivated(routerOutlet, $event)\"\n                   (deactivate)=\"onOutletDeactivated()\">\n    </router-outlet>\n  </div>\n</ng-container>\n\n<div  class=\"not-authorised-component-container\" *ngIf=\"!authorised.value\">\n  <ng-template [cdkPortalOutlet]=\"notAuthorisedNoticePortal\"></ng-template>\n</div>\n",
                     animations: [LEFT_RIGHT_PLACE_ANIMATION],
-                    styles: [":host{display:flex;flex-direction:column;min-height:0}.router-outlet-container{flex:1;display:block;position:relative;min-height:0;overflow-x:hidden;overflow-y:scroll}router-outlet{display:none}"]
+                    styles: [":host{display:flex;flex-direction:column;min-height:0}:host:not(.authorised) .router-outlet-container{display:none}.router-outlet-container{flex:1;display:block;position:relative;min-height:0;overflow-x:hidden;overflow-y:scroll}router-outlet{display:none}.not-authorised-component-container{flex:1;display:grid;grid-template-columns:1fr;grid-template-rows:1fr}"]
                 },] }
     ];
     PlaceOutletComponent.ctorParameters = function () { return [
         { type: i1$1.Router },
-        { type: PlaceRouter },
+        { type: exports.PlaceRouter },
         { type: undefined, decorators: [{ type: i0.Optional }, { type: i0.Inject, args: [AUP_PLACE_CONFIG,] }] },
-        { type: PlaceOutletComponent, decorators: [{ type: i0.SkipSelf }, { type: i0.Optional }] }
+        { type: undefined, decorators: [{ type: i0.Optional }, { type: i0.Inject, args: [AUP_UNAUTHORISED_PLACE_NOTICE_COMPONENT,] }] },
+        { type: PlaceOutletComponent, decorators: [{ type: i0.SkipSelf }, { type: i0.Optional }] },
+        { type: i0.ChangeDetectorRef }
     ]; };
     PlaceOutletComponent.propDecorators = {
         animate: [{ type: i0.Input }],
@@ -8293,7 +8330,8 @@
         customPlaceAnimationOrderModel: [{ type: i0.Input, args: ['placeAnimationOrderModel',] }],
         customPlaceAnimationOrder: [{ type: i0.Input, args: ['placeAnimationOrder',] }],
         placeChanged: [{ type: i0.Output }],
-        routerOut: [{ type: i0.ViewChild, args: ['routeOutlet', { static: true },] }]
+        routerOut: [{ type: i0.ViewChild, args: ['routeOutlet', { static: true },] }],
+        isAuthorised: [{ type: i0.HostBinding, args: ["class.authorised",] }]
     };
     __decorate([
         pectin.StoreInValueModel('animateModel'),
@@ -8323,8 +8361,9 @@
                 .map(function (c) { return exports.PlaceComponent.getDefinition(c); })
                 .select(function (d) {
                 var guard = placeRouter.accessGuard.value;
-                return guard.isAuthorised(d);
-            }, { dependsOn: placeRouter.accessGuard });
+                var state = placeRouter.state.value;
+                return guard.isAuthorised(d) || state.isPlaceActive(d);
+            }, { dependsOn: [placeRouter.accessGuard, placeRouter.state] });
             _this.commandFactory = pectin.Command.createFactory(function (placeDefinition) {
                 _this.placeOutlet.navigate(new Visit(placeDefinition));
             });
@@ -8358,7 +8397,7 @@
                 },] }
     ];
     AbstractPlaceNavigationComponent.ctorParameters = function () { return [
-        { type: PlaceRouter }
+        { type: exports.PlaceRouter }
     ]; };
     AbstractPlaceNavigationComponent.propDecorators = {
         places: [{ type: i0.Input }],
@@ -8404,7 +8443,7 @@
                 },] }
     ];
     ListPlaceNavComponent.ctorParameters = function () { return [
-        { type: PlaceRouter }
+        { type: exports.PlaceRouter }
     ]; };
 
     /**
@@ -8475,7 +8514,7 @@
                 },] }
     ];
     SidePlaceNavigationComponent.ctorParameters = function () { return [
-        { type: PlaceRouter }
+        { type: exports.PlaceRouter }
     ]; };
     SidePlaceNavigationComponent.propDecorators = {
         expanded: [{ type: i0.HostBinding, args: ['class.expanded',] }],
@@ -8497,7 +8536,7 @@
                 },] }
     ];
     TabbedPlaceNavigationComponent.ctorParameters = function () { return [
-        { type: PlaceRouter }
+        { type: exports.PlaceRouter }
     ]; };
 
     var PlaceModule = /** @class */ (function () {
@@ -8518,14 +8557,16 @@
                         icon.MatIconModule,
                         DirectivesModule,
                         flexLayout.FlexModule,
-                        ComponentsModule
+                        ComponentsModule,
+                        portal.PortalModule
                     ],
                     declarations: [
                         PlaceOutletComponent,
                         TabbedPlaceNavigationComponent,
                         ListPlaceNavComponent,
                         SidePlaceNavigationComponent,
-                        AbstractPlaceNavigationComponent
+                        AbstractPlaceNavigationComponent,
+                        NotAuthorisedNoticeComponent
                     ],
                     entryComponents: [],
                     exports: [
@@ -8857,7 +8898,7 @@
         // @Trace()
         PlaceGuard.prototype.canActivate = function (activatedRoute, state) {
             return __awaiter(this, void 0, void 0, function () {
-                var placeDefinition_1, redirectLocation, nextPlaceDef, redirectLocation, nextPlaceDef, result;
+                var placeDefinition_1, redirectLocation, nextPlaceDef, result;
                 var _this = this;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
@@ -8875,14 +8916,6 @@
                                 }
                                 return [2 /*return*/, this.createUrlTree(redirectLocation)];
                             }
-                            if (!(this.placeRouter.accessGuard.value ? this.placeRouter.accessGuard.value.isAuthorised(placeDefinition_1) : true)) {
-                                redirectLocation = this.placeRouter.getAuthorisationFailureRedirect(activatedRoute, state);
-                                nextPlaceDef = this.getPlaceDefinition(redirectLocation);
-                                if (!(this.placeRouter.accessGuard.value ? this.placeRouter.accessGuard.value.isAuthorised(nextPlaceDef) : true)) {
-                                    pectin.lang.illegalState("handleNotAuthorised hook returned place " + nextPlaceDef.component.name + " that is not authorised for the current user.");
-                                }
-                                return [2 /*return*/, this.createUrlTree(redirectLocation)];
-                            }
                             _a.label = 2;
                         case 2: return [4 /*yield*/, this.cleanInteractionState(activatedRoute, state, function () { return __awaiter(_this, void 0, void 0, function () {
                                 var params, parsedParams, navigationSession, initialVisit, sanitiser, sanitisedVisit, urlSnapshot;
@@ -8926,6 +8959,11 @@
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
+                            if (!component) {
+                                // this happens when the place wasn't authorised and the associated
+                                // router outlet was removed from the dom.
+                                return [2 /*return*/, true];
+                            }
                             currentUrl = this.urlService.parseUrl(currentState.url);
                             nextUrl = this.urlService.parseUrl(nextState.url);
                             return [4 /*yield*/, this.placeRouter.navigationSession.canDeactivatePlace(component, currentUrl, nextUrl)];
@@ -8986,14 +9024,14 @@
         };
         return PlaceGuard;
     }());
-    PlaceGuard.ɵprov = i0.ɵɵdefineInjectable({ factory: function PlaceGuard_Factory() { return new PlaceGuard(i0.ɵɵinject(i1$1.Router), i0.ɵɵinject(UrlService), i0.ɵɵinject(PlaceRouter), i0.ɵɵinject(exports.PlaceHistory), i0.ɵɵinject(exports.InteractionService), i0.ɵɵinject(i0.INJECTOR)); }, token: PlaceGuard, providedIn: "root" });
+    PlaceGuard.ɵprov = i0.ɵɵdefineInjectable({ factory: function PlaceGuard_Factory() { return new PlaceGuard(i0.ɵɵinject(i1$1.Router), i0.ɵɵinject(UrlService), i0.ɵɵinject(exports.PlaceRouter), i0.ɵɵinject(exports.PlaceHistory), i0.ɵɵinject(exports.InteractionService), i0.ɵɵinject(i0.INJECTOR)); }, token: PlaceGuard, providedIn: "root" });
     PlaceGuard.decorators = [
         { type: i0.Injectable, args: [{ providedIn: 'root' },] }
     ];
     PlaceGuard.ctorParameters = function () { return [
         { type: i1$1.Router },
         { type: UrlService },
-        { type: PlaceRouter },
+        { type: exports.PlaceRouter },
         { type: exports.PlaceHistory },
         { type: exports.InteractionService },
         { type: i0.Injector }
@@ -9109,6 +9147,7 @@
 
     exports.ACTIVITY_DATA = ACTIVITY_DATA;
     exports.AUP_PLACE_CONFIG = AUP_PLACE_CONFIG;
+    exports.AUP_UNAUTHORISED_PLACE_NOTICE_COMPONENT = AUP_UNAUTHORISED_PLACE_NOTICE_COMPONENT;
     exports.AbstractInputActivity = AbstractInputActivity;
     exports.AbstractInputComponent = AbstractInputComponent;
     exports.AbstractInteractionContext = AbstractInteractionContext;
@@ -9186,6 +9225,7 @@
     exports.NavigationSession = NavigationSession;
     exports.NoopAuthGuard = NoopAuthGuard;
     exports.NoopComponent = NoopComponent;
+    exports.NotAuthorisedNoticeComponent = NotAuthorisedNoticeComponent;
     exports.NumberInputComponent = NumberInputComponent;
     exports.POPUP_CONTAINER = POPUP_CONTAINER;
     exports.PORTAL_EDITOR_COMPONENT = PORTAL_EDITOR_COMPONENT;
@@ -9198,7 +9238,6 @@
     exports.PlaceGuard = PlaceGuard;
     exports.PlaceModule = PlaceModule;
     exports.PlaceOutletComponent = PlaceOutletComponent;
-    exports.PlaceRouter = PlaceRouter;
     exports.Point = Point;
     exports.PopStateDuringInteractionNavigation = PopStateDuringInteractionNavigation;
     exports.PopStateNavigation = PopStateNavigation;