@coolon/angular-ui-powerups 11.0.0-alpha.2 → 11.0.0-alpha.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/coolon-angular-ui-powerups.umd.js +82 -43
- package/bundles/coolon-angular-ui-powerups.umd.js.map +1 -1
- package/bundles/coolon-angular-ui-powerups.umd.min.js +1 -1
- package/bundles/coolon-angular-ui-powerups.umd.min.js.map +1 -1
- package/coolon-angular-ui-powerups.metadata.json +1 -1
- package/esm2015/lib/components/card-container/card-container.component.js +1 -1
- package/esm2015/lib/components/card-container/card-container.component.metadata.json +1 -1
- package/esm2015/lib/place/components/abstract-place-navigation.component.js +3 -2
- package/esm2015/lib/place/components/abstract-place-navigation.component.js.map +1 -1
- package/esm2015/lib/place/components/abstract-place-navigation.component.metadata.json +1 -1
- package/esm2015/lib/place/components/not-authorised-notice/not-authorised-notice.component.js +14 -0
- package/esm2015/lib/place/components/not-authorised-notice/not-authorised-notice.component.js.map +1 -0
- package/esm2015/lib/place/components/not-authorised-notice/not-authorised-notice.component.metadata.json +1 -0
- package/esm2015/lib/place/components/not-authorised-notice/not-authorised-notice.component.ngfactory.js.map +1 -0
- package/esm2015/lib/place/components/not-authorised-notice/not-authorised-notice.component.scss.shim.ngstyle.js.map +1 -0
- package/esm2015/lib/place/components/place-outlet/place-outlet.component.js +23 -14
- package/esm2015/lib/place/components/place-outlet/place-outlet.component.js.map +1 -1
- package/esm2015/lib/place/components/place-outlet/place-outlet.component.metadata.json +1 -1
- package/esm2015/lib/place/exports.js +1 -0
- package/esm2015/lib/place/exports.js.map +1 -1
- package/esm2015/lib/place/exports.metadata.json +1 -1
- package/esm2015/lib/place/guards/place.guard.js +5 -8
- package/esm2015/lib/place/guards/place.guard.js.map +1 -1
- package/esm2015/lib/place/navigation/place-component-deactivation-handler.js +2 -0
- package/esm2015/lib/place/navigation/place-component-deactivation-handler.js.map +1 -1
- package/esm2015/lib/place/place-router.js +15 -4
- package/esm2015/lib/place/place-router.js.map +1 -1
- package/esm2015/lib/place/place-router.metadata.json +1 -1
- package/esm2015/lib/place/place.module.js +6 -2
- package/esm2015/lib/place/place.module.js.map +1 -1
- package/esm2015/lib/place/place.module.metadata.json +1 -1
- package/esm2015/lib/place/place.module.ngfactory.js.map +1 -1
- package/fesm2015/coolon-angular-ui-powerups.js +63 -31
- package/fesm2015/coolon-angular-ui-powerups.js.map +1 -1
- package/lib/place/components/not-authorised-notice/not-authorised-notice.component.d.ts +3 -0
- package/lib/place/components/place-outlet/place-outlet.component.d.ts +10 -3
- package/lib/place/exports.d.ts +1 -0
- package/lib/place/place-router.d.ts +10 -6
- package/package.json +1 -1
- package/schematics/utils/build-context.d.ts +4 -5
- package/schematics/utils/workspace.d.ts +3 -4
- package/schematics/utils/workspace.js.map +1 -1
|
@@ -729,7 +729,7 @@
|
|
|
729
729
|
{ type: i0.Component, args: [{
|
|
730
730
|
selector: 'aup-card-container',
|
|
731
731
|
template: "<div class=\"card-container\">\n <ng-content></ng-content>\n\n <div class=\"add-card-container\" *ngIf=\"addCardCommand.enabled.value\" [pectinCommand]=\"addCardCommand\">\n <aup-command-face *ngIf=\"addCardFace\" [faces]=\"[addCardFace]\"></aup-command-face>\n <aup-icon *ngIf=\"!addCardFace\" icon=\"mat:add\"></aup-icon>\n </div>\n\n <div class=\"add-card-template\" *ngIf=\"addCardTemplate\">\n <ng-container [ngTemplateOutlet]=\"addCardTemplate\"></ng-container>\n </div>\n\n</div>\n",
|
|
732
|
-
styles: [":host{--resolved-card-gap:var(--card-gap,16px);--resolved-card-width:var(--card-width,300px);--resolved-card-height:var(--card-height,auto);--resolved-card-min-height:var(--card-min-height,auto);--resolved-card-background:var(--card-background,#fcfcfb);flex:1;display:block;background:var(--resolved-card-background)}.card-container{display:grid;grid-template-columns:repeat(auto-fill,var(--resolved-card-width));grid-
|
|
732
|
+
styles: [":host{--resolved-card-gap:var(--card-gap,16px);--resolved-card-width:var(--card-width,300px);--resolved-card-height:var(--card-height,auto);--resolved-card-min-height:var(--card-min-height,auto);--resolved-card-background:var(--card-background,#fcfcfb);flex:1;display:block;background:var(--resolved-card-background)}.card-container{display:grid;grid-template-columns:repeat(auto-fill,var(--resolved-card-width));grid-auto-rows:minmax(var(--resolved-card-min-height),var(--resolved-card-height));grid-gap:var(--resolved-card-gap);box-sizing:border-box;padding:var(--resolved-card-gap);min-height:calc(var(--resolved-card-height) + 2 * var(--resolved-card-gap));min-width:calc(var(--resolved-card-width) + 2 * var(--resolved-card-gap));width:calc((var(--resolved-card-width) + var(--resolved-card-gap)) * 2 + var(--grid-gap));max-width:100%}.add-card-container{width:var(--resolved-card-width);height:var(--resolved-card-height);min-height:var(--resolved-card-min-height);display:flex;flex-direction:column;align-items:center;justify-content:center;box-sizing:border-box;border:2px dashed rgba(0,0,0,.1);border-radius:6px;font-weight:300;cursor:pointer;color:rgba(0,0,0,.54);background-color:hsla(0,0%,100%,.8);transition:all .28s cubic-bezier(.4,0,.2,1)}.add-card-container mat-icon{font-size:200%}.add-card-container:hover{transition:box-shadow .28s cubic-bezier(.4,0,.2,1);transition:all .28s cubic-bezier(.4,0,.2,1);border-color:transparent;background-color:#fff;color:rgba(0,0,0,.54)}.add-card-container:hover:hover{box-shadow:0 2px 4px -1px rgba(0,0,0,.2),0 4px 5px 0 rgba(0,0,0,.14),0 1px 10px 0 rgba(0,0,0,.12)}.add-card-template-container{width:var(--resolved-card-width);height:var(--resolved-card-height);display:flex;flex-direction:column;align-items:stretch;justify-content:stretch}"]
|
|
733
733
|
},] }
|
|
734
734
|
];
|
|
735
735
|
CardContainerComponent.ctorParameters = function () { return []; };
|
|
@@ -6450,6 +6450,7 @@
|
|
|
6450
6450
|
this.component = component;
|
|
6451
6451
|
this.navigationSession = navigationSession;
|
|
6452
6452
|
this.isPrimaryComponent = isPrimaryComponent;
|
|
6453
|
+
pectin.assert.notNil(component);
|
|
6453
6454
|
}
|
|
6454
6455
|
Object.defineProperty(PlaceComponentDeactivationHandler.prototype, "routerInteractionAdapter", {
|
|
6455
6456
|
get: function () {
|
|
@@ -7617,7 +7618,7 @@
|
|
|
7617
7618
|
{ type: i1$1.UrlSerializer }
|
|
7618
7619
|
]; };
|
|
7619
7620
|
|
|
7620
|
-
|
|
7621
|
+
exports.PlaceRouter = /** @class */ (function (_super) {
|
|
7621
7622
|
__extends(PlaceRouter, _super);
|
|
7622
7623
|
function PlaceRouter(angularRouter, angularLocation, interactionService, urlService, placeHistory) {
|
|
7623
7624
|
var _this = _super.call(this) || this;
|
|
@@ -7653,7 +7654,7 @@
|
|
|
7653
7654
|
.pluck('name')
|
|
7654
7655
|
.otherwise(idleStateName);
|
|
7655
7656
|
pectin.DebugContext.tag(_this._activeVisits, 'PlaceRouter.activeVisits');
|
|
7656
|
-
_this.
|
|
7657
|
+
_this.state = chain(_this._activeVisits).reduce(function (visits) { return new PlaceRouter.State(visits); });
|
|
7657
7658
|
// TODO: make setup the callbacks in during module initiation to make this testable.
|
|
7658
7659
|
angularRouter.events.subscribe(function (event) {
|
|
7659
7660
|
// Routing event sequence
|
|
@@ -7717,9 +7718,6 @@
|
|
|
7717
7718
|
PlaceRouter.prototype.getAuthenticationFailureRedirect = function (activatedRoute, state) {
|
|
7718
7719
|
return this.redirections.onAuthenticationFailure(activatedRoute, state);
|
|
7719
7720
|
};
|
|
7720
|
-
PlaceRouter.prototype.getAuthorisationFailureRedirect = function (activatedRoute, state) {
|
|
7721
|
-
return this.redirections.onAuthorisationFailure(activatedRoute, state);
|
|
7722
|
-
};
|
|
7723
7721
|
Object.defineProperty(PlaceRouter.prototype, "navigationSession", {
|
|
7724
7722
|
get: function () {
|
|
7725
7723
|
return this.navigationSessionModel.value;
|
|
@@ -7955,19 +7953,34 @@
|
|
|
7955
7953
|
};
|
|
7956
7954
|
return PlaceRouter;
|
|
7957
7955
|
}(pectin.GarbageCollector));
|
|
7958
|
-
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" });
|
|
7959
|
-
PlaceRouter.decorators = [
|
|
7956
|
+
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" });
|
|
7957
|
+
exports.PlaceRouter.decorators = [
|
|
7960
7958
|
{ type: i0.Injectable, args: [{
|
|
7961
7959
|
providedIn: 'root'
|
|
7962
7960
|
},] }
|
|
7963
7961
|
];
|
|
7964
|
-
PlaceRouter.ctorParameters = function () { return [
|
|
7962
|
+
exports.PlaceRouter.ctorParameters = function () { return [
|
|
7965
7963
|
{ type: i1$1.Router },
|
|
7966
7964
|
{ type: i2.Location },
|
|
7967
7965
|
{ type: exports.InteractionService },
|
|
7968
7966
|
{ type: UrlService },
|
|
7969
7967
|
{ type: exports.PlaceHistory }
|
|
7970
7968
|
]; };
|
|
7969
|
+
(function (PlaceRouter) {
|
|
7970
|
+
var State = /** @class */ (function () {
|
|
7971
|
+
function State(activeVisits) {
|
|
7972
|
+
this.activeVisits = activeVisits;
|
|
7973
|
+
}
|
|
7974
|
+
State.prototype.isPlaceActive = function (placeDefinition) {
|
|
7975
|
+
return !!this.getVisitFor(placeDefinition);
|
|
7976
|
+
};
|
|
7977
|
+
State.prototype.getVisitFor = function (placeDefinition) {
|
|
7978
|
+
return this.activeVisits.find(function (v) { return v.placeDefinition === placeDefinition; });
|
|
7979
|
+
};
|
|
7980
|
+
return State;
|
|
7981
|
+
}());
|
|
7982
|
+
PlaceRouter.State = State;
|
|
7983
|
+
})(exports.PlaceRouter || (exports.PlaceRouter = {}));
|
|
7971
7984
|
|
|
7972
7985
|
var Visit = /** @class */ (function () {
|
|
7973
7986
|
function Visit(placeDefinition, visitParameters) {
|
|
@@ -8040,6 +8053,20 @@
|
|
|
8040
8053
|
|
|
8041
8054
|
var AUP_PLACE_CONFIG = new i0.InjectionToken('AUP_PLACE_CONFIG');
|
|
8042
8055
|
|
|
8056
|
+
var NotAuthorisedNoticeComponent = /** @class */ (function () {
|
|
8057
|
+
function NotAuthorisedNoticeComponent() {
|
|
8058
|
+
}
|
|
8059
|
+
return NotAuthorisedNoticeComponent;
|
|
8060
|
+
}());
|
|
8061
|
+
NotAuthorisedNoticeComponent.decorators = [
|
|
8062
|
+
{ type: i0.Component, args: [{
|
|
8063
|
+
selector: 'aup-not-authorised-notice',
|
|
8064
|
+
template: "<p>You are not authorised to access this page</p>\n",
|
|
8065
|
+
styles: [":host{display:flex;flex-direction:column;align-items:center;justify-content:center}"]
|
|
8066
|
+
},] }
|
|
8067
|
+
];
|
|
8068
|
+
NotAuthorisedNoticeComponent.ctorParameters = function () { return []; };
|
|
8069
|
+
|
|
8043
8070
|
// Freezes the state of the components at the start of the animation.
|
|
8044
8071
|
var animationStartStyle = animations$1.style({ position: 'absolute', top: '0', left: '0', bottom: '0', right: '0' });
|
|
8045
8072
|
var left = [
|
|
@@ -8084,13 +8111,15 @@
|
|
|
8084
8111
|
}
|
|
8085
8112
|
var LEFT_RIGHT_PLACE_ANIMATION = leftRightPlaceAnimation('0.3s');
|
|
8086
8113
|
|
|
8114
|
+
var AUP_UNAUTHORISED_PLACE_NOTICE_COMPONENT = new i0.InjectionToken('AUP_UNAUTHORISED_PLACE_COMPONENT');
|
|
8087
8115
|
var PlaceOutletComponent = /** @class */ (function (_super) {
|
|
8088
8116
|
__extends(PlaceOutletComponent, _super);
|
|
8089
|
-
function PlaceOutletComponent(router, placeRouter, placeConfig, parentOutlet) {
|
|
8117
|
+
function PlaceOutletComponent(router, placeRouter, placeConfig, unauthorisedPlaceNotice, parentOutlet, cdr) {
|
|
8090
8118
|
var _this = _super.call(this) || this;
|
|
8091
8119
|
_this.router = router;
|
|
8092
8120
|
_this.placeRouter = placeRouter;
|
|
8093
8121
|
_this.placeConfig = placeConfig;
|
|
8122
|
+
_this.cdr = cdr;
|
|
8094
8123
|
_this.placeChanged = new i0.EventEmitter();
|
|
8095
8124
|
_this.outletActivated = new pectin.MutableValueModel(false);
|
|
8096
8125
|
_this._activatedRouteModel = new pectin.MutableValueModel();
|
|
@@ -8123,7 +8152,7 @@
|
|
|
8123
8152
|
_this.animationEnabled = valueOf.all(_this.animateModel, _this.animationSupported).areTruthy();
|
|
8124
8153
|
// Extract our visit model from the place router.
|
|
8125
8154
|
_this._activePlaceDefinition = chain(_this._activePlaceModel).pluck('placeDefinition');
|
|
8126
|
-
_this.routerVisitModel =
|
|
8155
|
+
_this.routerVisitModel = chain(placeRouter.state).map(function (state) { return state.getVisitFor(_this._activePlaceDefinition.value); }, { dependsOn: _this._activePlaceDefinition });
|
|
8127
8156
|
_this.navigationInProgress = chain(_this.placeRouter.navigationInProgress);
|
|
8128
8157
|
when(_this.navigationInProgress).becomesFalsey(function () {
|
|
8129
8158
|
_this.checkStateAndInitialise();
|
|
@@ -8134,13 +8163,11 @@
|
|
|
8134
8163
|
chain(_this._activePlaceModel)
|
|
8135
8164
|
.postponeWhile(_this.navigationInProgress)
|
|
8136
8165
|
.subscribe(function (place) { return _this.placeChanged.emit(place); });
|
|
8137
|
-
|
|
8138
|
-
|
|
8139
|
-
|
|
8140
|
-
|
|
8141
|
-
|
|
8142
|
-
}
|
|
8143
|
-
});
|
|
8166
|
+
_this.authorised = chain(placeRouter.accessGuard).map(function (guard) { return guard.isAuthorised(_this._activePlaceDefinition.value); }, {
|
|
8167
|
+
dependsOn: _this._activePlaceDefinition,
|
|
8168
|
+
postponeWhile: chain(_this._activePlaceDefinition).isNil()
|
|
8169
|
+
}).otherwise(true); // if we don't have a place def yet we need to show the outlet so we get one injected.
|
|
8170
|
+
_this.notAuthorisedNoticePortal = new portal.ComponentPortal(unauthorisedPlaceNotice !== null && unauthorisedPlaceNotice !== void 0 ? unauthorisedPlaceNotice : NotAuthorisedNoticeComponent);
|
|
8144
8171
|
return _this;
|
|
8145
8172
|
}
|
|
8146
8173
|
// @Trace()
|
|
@@ -8157,6 +8184,13 @@
|
|
|
8157
8184
|
enumerable: false,
|
|
8158
8185
|
configurable: true
|
|
8159
8186
|
});
|
|
8187
|
+
Object.defineProperty(PlaceOutletComponent.prototype, "isAuthorised", {
|
|
8188
|
+
get: function () {
|
|
8189
|
+
return this.authorised.value;
|
|
8190
|
+
},
|
|
8191
|
+
enumerable: false,
|
|
8192
|
+
configurable: true
|
|
8193
|
+
});
|
|
8160
8194
|
// @Trace()
|
|
8161
8195
|
PlaceOutletComponent.prototype.navigate = function (visit) {
|
|
8162
8196
|
// const place = this.placesInAnimationOrder.query().findMatching(p => visit.placeDefinition.component === p);
|
|
@@ -8223,6 +8257,7 @@
|
|
|
8223
8257
|
pectin.lang.illegalState('wrong visit!!!');
|
|
8224
8258
|
}
|
|
8225
8259
|
this.initialisePlace(routerVisit, activePlace);
|
|
8260
|
+
this.cdr.detectChanges();
|
|
8226
8261
|
}
|
|
8227
8262
|
};
|
|
8228
8263
|
PlaceOutletComponent.prototype.initialisePlace = function (routerVisit, activePlace) {
|
|
@@ -8276,16 +8311,18 @@
|
|
|
8276
8311
|
PlaceOutletComponent.decorators = [
|
|
8277
8312
|
{ type: i0.Component, args: [{
|
|
8278
8313
|
selector: 'aup-place-outlet',
|
|
8279
|
-
template: "<ng-container *ngIf=\"animationEnabled.value\">\n <div class=\"router-outlet-container\"
|
|
8314
|
+
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",
|
|
8280
8315
|
animations: [LEFT_RIGHT_PLACE_ANIMATION],
|
|
8281
|
-
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}"]
|
|
8316
|
+
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}"]
|
|
8282
8317
|
},] }
|
|
8283
8318
|
];
|
|
8284
8319
|
PlaceOutletComponent.ctorParameters = function () { return [
|
|
8285
8320
|
{ type: i1$1.Router },
|
|
8286
|
-
{ type: PlaceRouter },
|
|
8321
|
+
{ type: exports.PlaceRouter },
|
|
8287
8322
|
{ type: undefined, decorators: [{ type: i0.Optional }, { type: i0.Inject, args: [AUP_PLACE_CONFIG,] }] },
|
|
8288
|
-
{ type:
|
|
8323
|
+
{ type: undefined, decorators: [{ type: i0.Optional }, { type: i0.Inject, args: [AUP_UNAUTHORISED_PLACE_NOTICE_COMPONENT,] }] },
|
|
8324
|
+
{ type: PlaceOutletComponent, decorators: [{ type: i0.SkipSelf }, { type: i0.Optional }] },
|
|
8325
|
+
{ type: i0.ChangeDetectorRef }
|
|
8289
8326
|
]; };
|
|
8290
8327
|
PlaceOutletComponent.propDecorators = {
|
|
8291
8328
|
animate: [{ type: i0.Input }],
|
|
@@ -8293,7 +8330,8 @@
|
|
|
8293
8330
|
customPlaceAnimationOrderModel: [{ type: i0.Input, args: ['placeAnimationOrderModel',] }],
|
|
8294
8331
|
customPlaceAnimationOrder: [{ type: i0.Input, args: ['placeAnimationOrder',] }],
|
|
8295
8332
|
placeChanged: [{ type: i0.Output }],
|
|
8296
|
-
routerOut: [{ type: i0.ViewChild, args: ['routeOutlet', { static: true },] }]
|
|
8333
|
+
routerOut: [{ type: i0.ViewChild, args: ['routeOutlet', { static: true },] }],
|
|
8334
|
+
isAuthorised: [{ type: i0.HostBinding, args: ["class.authorised",] }]
|
|
8297
8335
|
};
|
|
8298
8336
|
__decorate([
|
|
8299
8337
|
pectin.StoreInValueModel('animateModel'),
|
|
@@ -8323,8 +8361,9 @@
|
|
|
8323
8361
|
.map(function (c) { return exports.PlaceComponent.getDefinition(c); })
|
|
8324
8362
|
.select(function (d) {
|
|
8325
8363
|
var guard = placeRouter.accessGuard.value;
|
|
8326
|
-
|
|
8327
|
-
|
|
8364
|
+
var state = placeRouter.state.value;
|
|
8365
|
+
return guard.isAuthorised(d) || state.isPlaceActive(d);
|
|
8366
|
+
}, { dependsOn: [placeRouter.accessGuard, placeRouter.state] });
|
|
8328
8367
|
_this.commandFactory = pectin.Command.createFactory(function (placeDefinition) {
|
|
8329
8368
|
_this.placeOutlet.navigate(new Visit(placeDefinition));
|
|
8330
8369
|
});
|
|
@@ -8358,7 +8397,7 @@
|
|
|
8358
8397
|
},] }
|
|
8359
8398
|
];
|
|
8360
8399
|
AbstractPlaceNavigationComponent.ctorParameters = function () { return [
|
|
8361
|
-
{ type: PlaceRouter }
|
|
8400
|
+
{ type: exports.PlaceRouter }
|
|
8362
8401
|
]; };
|
|
8363
8402
|
AbstractPlaceNavigationComponent.propDecorators = {
|
|
8364
8403
|
places: [{ type: i0.Input }],
|
|
@@ -8404,7 +8443,7 @@
|
|
|
8404
8443
|
},] }
|
|
8405
8444
|
];
|
|
8406
8445
|
ListPlaceNavComponent.ctorParameters = function () { return [
|
|
8407
|
-
{ type: PlaceRouter }
|
|
8446
|
+
{ type: exports.PlaceRouter }
|
|
8408
8447
|
]; };
|
|
8409
8448
|
|
|
8410
8449
|
/**
|
|
@@ -8475,7 +8514,7 @@
|
|
|
8475
8514
|
},] }
|
|
8476
8515
|
];
|
|
8477
8516
|
SidePlaceNavigationComponent.ctorParameters = function () { return [
|
|
8478
|
-
{ type: PlaceRouter }
|
|
8517
|
+
{ type: exports.PlaceRouter }
|
|
8479
8518
|
]; };
|
|
8480
8519
|
SidePlaceNavigationComponent.propDecorators = {
|
|
8481
8520
|
expanded: [{ type: i0.HostBinding, args: ['class.expanded',] }],
|
|
@@ -8497,7 +8536,7 @@
|
|
|
8497
8536
|
},] }
|
|
8498
8537
|
];
|
|
8499
8538
|
TabbedPlaceNavigationComponent.ctorParameters = function () { return [
|
|
8500
|
-
{ type: PlaceRouter }
|
|
8539
|
+
{ type: exports.PlaceRouter }
|
|
8501
8540
|
]; };
|
|
8502
8541
|
|
|
8503
8542
|
var PlaceModule = /** @class */ (function () {
|
|
@@ -8518,14 +8557,16 @@
|
|
|
8518
8557
|
icon.MatIconModule,
|
|
8519
8558
|
DirectivesModule,
|
|
8520
8559
|
flexLayout.FlexModule,
|
|
8521
|
-
ComponentsModule
|
|
8560
|
+
ComponentsModule,
|
|
8561
|
+
portal.PortalModule
|
|
8522
8562
|
],
|
|
8523
8563
|
declarations: [
|
|
8524
8564
|
PlaceOutletComponent,
|
|
8525
8565
|
TabbedPlaceNavigationComponent,
|
|
8526
8566
|
ListPlaceNavComponent,
|
|
8527
8567
|
SidePlaceNavigationComponent,
|
|
8528
|
-
AbstractPlaceNavigationComponent
|
|
8568
|
+
AbstractPlaceNavigationComponent,
|
|
8569
|
+
NotAuthorisedNoticeComponent
|
|
8529
8570
|
],
|
|
8530
8571
|
entryComponents: [],
|
|
8531
8572
|
exports: [
|
|
@@ -8857,7 +8898,7 @@
|
|
|
8857
8898
|
// @Trace()
|
|
8858
8899
|
PlaceGuard.prototype.canActivate = function (activatedRoute, state) {
|
|
8859
8900
|
return __awaiter(this, void 0, void 0, function () {
|
|
8860
|
-
var placeDefinition_1, redirectLocation, nextPlaceDef,
|
|
8901
|
+
var placeDefinition_1, redirectLocation, nextPlaceDef, result;
|
|
8861
8902
|
var _this = this;
|
|
8862
8903
|
return __generator(this, function (_a) {
|
|
8863
8904
|
switch (_a.label) {
|
|
@@ -8875,14 +8916,6 @@
|
|
|
8875
8916
|
}
|
|
8876
8917
|
return [2 /*return*/, this.createUrlTree(redirectLocation)];
|
|
8877
8918
|
}
|
|
8878
|
-
if (!(this.placeRouter.accessGuard.value ? this.placeRouter.accessGuard.value.isAuthorised(placeDefinition_1) : true)) {
|
|
8879
|
-
redirectLocation = this.placeRouter.getAuthorisationFailureRedirect(activatedRoute, state);
|
|
8880
|
-
nextPlaceDef = this.getPlaceDefinition(redirectLocation);
|
|
8881
|
-
if (!(this.placeRouter.accessGuard.value ? this.placeRouter.accessGuard.value.isAuthorised(nextPlaceDef) : true)) {
|
|
8882
|
-
pectin.lang.illegalState("handleNotAuthorised hook returned place " + nextPlaceDef.component.name + " that is not authorised for the current user.");
|
|
8883
|
-
}
|
|
8884
|
-
return [2 /*return*/, this.createUrlTree(redirectLocation)];
|
|
8885
|
-
}
|
|
8886
8919
|
_a.label = 2;
|
|
8887
8920
|
case 2: return [4 /*yield*/, this.cleanInteractionState(activatedRoute, state, function () { return __awaiter(_this, void 0, void 0, function () {
|
|
8888
8921
|
var params, parsedParams, navigationSession, initialVisit, sanitiser, sanitisedVisit, urlSnapshot;
|
|
@@ -8926,6 +8959,11 @@
|
|
|
8926
8959
|
return __generator(this, function (_a) {
|
|
8927
8960
|
switch (_a.label) {
|
|
8928
8961
|
case 0:
|
|
8962
|
+
if (!component) {
|
|
8963
|
+
// this happens when the place wasn't authorised and the associated
|
|
8964
|
+
// router outlet was removed from the dom.
|
|
8965
|
+
return [2 /*return*/, true];
|
|
8966
|
+
}
|
|
8929
8967
|
currentUrl = this.urlService.parseUrl(currentState.url);
|
|
8930
8968
|
nextUrl = this.urlService.parseUrl(nextState.url);
|
|
8931
8969
|
return [4 /*yield*/, this.placeRouter.navigationSession.canDeactivatePlace(component, currentUrl, nextUrl)];
|
|
@@ -8986,14 +9024,14 @@
|
|
|
8986
9024
|
};
|
|
8987
9025
|
return PlaceGuard;
|
|
8988
9026
|
}());
|
|
8989
|
-
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" });
|
|
9027
|
+
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" });
|
|
8990
9028
|
PlaceGuard.decorators = [
|
|
8991
9029
|
{ type: i0.Injectable, args: [{ providedIn: 'root' },] }
|
|
8992
9030
|
];
|
|
8993
9031
|
PlaceGuard.ctorParameters = function () { return [
|
|
8994
9032
|
{ type: i1$1.Router },
|
|
8995
9033
|
{ type: UrlService },
|
|
8996
|
-
{ type: PlaceRouter },
|
|
9034
|
+
{ type: exports.PlaceRouter },
|
|
8997
9035
|
{ type: exports.PlaceHistory },
|
|
8998
9036
|
{ type: exports.InteractionService },
|
|
8999
9037
|
{ type: i0.Injector }
|
|
@@ -9109,6 +9147,7 @@
|
|
|
9109
9147
|
|
|
9110
9148
|
exports.ACTIVITY_DATA = ACTIVITY_DATA;
|
|
9111
9149
|
exports.AUP_PLACE_CONFIG = AUP_PLACE_CONFIG;
|
|
9150
|
+
exports.AUP_UNAUTHORISED_PLACE_NOTICE_COMPONENT = AUP_UNAUTHORISED_PLACE_NOTICE_COMPONENT;
|
|
9112
9151
|
exports.AbstractInputActivity = AbstractInputActivity;
|
|
9113
9152
|
exports.AbstractInputComponent = AbstractInputComponent;
|
|
9114
9153
|
exports.AbstractInteractionContext = AbstractInteractionContext;
|
|
@@ -9186,6 +9225,7 @@
|
|
|
9186
9225
|
exports.NavigationSession = NavigationSession;
|
|
9187
9226
|
exports.NoopAuthGuard = NoopAuthGuard;
|
|
9188
9227
|
exports.NoopComponent = NoopComponent;
|
|
9228
|
+
exports.NotAuthorisedNoticeComponent = NotAuthorisedNoticeComponent;
|
|
9189
9229
|
exports.NumberInputComponent = NumberInputComponent;
|
|
9190
9230
|
exports.POPUP_CONTAINER = POPUP_CONTAINER;
|
|
9191
9231
|
exports.PORTAL_EDITOR_COMPONENT = PORTAL_EDITOR_COMPONENT;
|
|
@@ -9198,7 +9238,6 @@
|
|
|
9198
9238
|
exports.PlaceGuard = PlaceGuard;
|
|
9199
9239
|
exports.PlaceModule = PlaceModule;
|
|
9200
9240
|
exports.PlaceOutletComponent = PlaceOutletComponent;
|
|
9201
|
-
exports.PlaceRouter = PlaceRouter;
|
|
9202
9241
|
exports.Point = Point;
|
|
9203
9242
|
exports.PopStateDuringInteractionNavigation = PopStateDuringInteractionNavigation;
|
|
9204
9243
|
exports.PopStateNavigation = PopStateNavigation;
|