@coolon/angular-ui-powerups 16.1.0-aplpha.126 → 16.1.0-aplpha.128

package/fesm2022/coolon-angular-ui-powerups.mjs

@@ -45,7 +45,7 @@ import { GarbageCollector, DelegatingValueModel, assert, UnaryCommand, lang, Dsl
 import { __decorate, __metadata, __param } from 'tslib';
 import * as i1 from '@angular/platform-browser';
 import escapeStringRegexp from 'escape-string-regexp';
-import { isEmpty, isString, isFunction, isNil, isInteger, isObject, isEqual, join, last, first, uniq, findLast, isNumber, isNaN as isNaN$1 } from 'lodash-es';
+import { escape, isEmpty, isString, isFunction, isNil, isInteger, isObject, isEqual, join, last, first, uniq, findLast, isNumber, isNaN as isNaN$1 } from 'lodash-es';
 import { marked } from 'marked';
 import { MemoizeGet, lang as lang$1, assert as assert$1, Stringy, Klass, Opts } from '@coolon/typescript-utilities';
 import { Enum } from 'typescript-string-enums';
@@ -498,19 +498,21 @@ class HighlightPipe extends GarbageCollector {
         this.dispose();
     }
     transform(value, searchModel) {
+        const sanitisedValue = escape(value);
+        console.log(sanitisedValue);
         const model = searchModel ?? this.highlightContext?.aupHighlightTextModel;
         const searchText = model?.value;
         if (isEmpty(searchText) || !isString(value)) {
-            return value;
+            return sanitisedValue;
         }
         // Match in a case insensitive manner
         const re = new RegExp(escapeStringRegexp(searchText), 'gi');
-        const match = value.match(re);
+        const match = sanitisedValue.match(re);
         // If there's no match, just return the original value.
         if (!match) {
-            return value;
+            return sanitisedValue;
         }
-        const result = value.replace(re, '<mark>' + match[0] + '</mark>');
+        const result = sanitisedValue.replace(re, '<mark>' + match[0] + '</mark>');
         return this.sanitizer.bypassSecurityTrustHtml(result);
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: HighlightPipe, deps: [{ token: i1.DomSanitizer }, { token: HighlightTextModelDirective, optional: true }], target: i0.ɵɵFactoryTarget.Pipe });
@@ -3545,11 +3547,11 @@ class DefaultCellRendererComponent {
         return this._value;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DefaultCellRendererComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: DefaultCellRendererComponent, selector: "aup-default-cell-renderer", inputs: { value: "value" }, ngImport: i0, template: "<span [innerHTML]=\"value?.toString()| aupHighlight\"></span>\n", styles: [""], dependencies: [{ kind: "pipe", type: HighlightPipe, name: "aupHighlight" }] });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.9", type: DefaultCellRendererComponent, selector: "aup-default-cell-renderer", inputs: { value: "value" }, ngImport: i0, template: "<span [innerHTML]=\"value?.toString() | aupHighlight\"></span>\n", styles: [""], dependencies: [{ kind: "pipe", type: HighlightPipe, name: "aupHighlight" }] });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.9", ngImport: i0, type: DefaultCellRendererComponent, decorators: [{
             type: Component,
-            args: [{ selector: "aup-default-cell-renderer", template: "<span [innerHTML]=\"value?.toString()| aupHighlight\"></span>\n" }]
+            args: [{ selector: "aup-default-cell-renderer", template: "<span [innerHTML]=\"value?.toString() | aupHighlight\"></span>\n" }]
         }], propDecorators: { value: [{
                 type: Input
             }] } });
@@ -8660,12 +8662,12 @@ class PlaceAuthService extends GarbageCollector {
         await toPromise(this, this._authZReady$);
         await this.enabledPlaceChecker.waitUntilReady(placeDef);
     }
-    getAuthenticationFailureRedirect(activatedRoute, state) {
-        const redirect = this.authNOptions.redirectTo(activatedRoute, state);
+    async getAuthenticationFailureRedirect(activatedRoute, state) {
+        const redirect = await this.authNOptions.redirectTo(activatedRoute, state);
         return redirect instanceof Visit ? redirect : Visit.goto(redirect);
     }
-    getAuthorisationFailureRedirectOptions(component) {
-        return this.authZOptions.redirectTo(component).map(it => it instanceof Visit ? it : Visit.goto(it));
+    async getAuthorisationFailureRedirectOptions(component) {
+        return (await this.authZOptions.redirectTo(component)).map(it => it instanceof Visit ? it : Visit.goto(it));
     }
     isAuthenticated() {
         return this.accessGuard$.value.isAuthenticated();
@@ -9156,10 +9158,10 @@ class PlaceRouter extends GarbageCollector {
     postponeRoutingUntil(condition$) {
         this._ready$.setDelegate(condition$);
     }
-    getAuthenticationFailureRedirect(activatedRoute, state) {
+    async getAuthenticationFailureRedirect(activatedRoute, state) {
         return this.authService.getAuthenticationFailureRedirect(activatedRoute, state);
     }
-    getAuthorisationFailureRedirectOptions(component) {
+    async getAuthorisationFailureRedirectOptions(component) {
         return this.authService.getAuthorisationFailureRedirectOptions(component);
     }
     get navigationSession() {
@@ -12276,7 +12278,7 @@ class PlaceGuard {
                 await this.placeRouter.authService.waitUntilAuthenticationReady();
                 const authenticated = this.authService.isAuthenticated();
                 if (!authenticated) {
-                    const redirect = this.authService.getAuthenticationFailureRedirect(activatedRoute, state);
+                    const redirect = await this.authService.getAuthenticationFailureRedirect(activatedRoute, state);
                     // const nextPlaceDef = this.getPlaceDefinition(redirect);
                     if (redirect.requiresAuthentication()) {
                         lang.illegalState(`onAuthenticationFailure hook returned place ${redirect.toDebugString()} that requires authentication.`);
@@ -12285,7 +12287,7 @@ class PlaceGuard {
                 }
                 await this.authService.waitUntilAuthorisationReadyFor(placeDefinition);
                 if (!this.authService.isAuthorised(placeDefinition)) {
-                    const nextRedirect = this.findBestAuthenticatedAlternative(placeDefinition, activatedRoute);
+                    const nextRedirect = await this.findBestAuthenticatedAlternative(placeDefinition, activatedRoute);
                     return this.createUrlTree(nextRedirect);
                 }
             }
@@ -12329,7 +12331,7 @@ class PlaceGuard {
             return lang.illegalState(`expected component to be an instance of PlaceComponent, got ${activatedRoute.component}`);
         }
     }
-    findBestAuthenticatedAlternative(placeDefinition, activatedRoute) {
+    async findBestAuthenticatedAlternative(placeDefinition, activatedRoute) {
         let currentPlace = placeDefinition;
         while (!currentPlace.isRoot()) {
             currentPlace = currentPlace.parent;
@@ -12339,7 +12341,7 @@ class PlaceGuard {
             }
         }
         // Couldn't find an authorised ancestor so we check if there are router level defined alternatives
-        const alternativeRoutes = this.placeRouter.getAuthorisationFailureRedirectOptions(activatedRoute.component);
+        const alternativeRoutes = await this.placeRouter.getAuthorisationFailureRedirectOptions(activatedRoute.component);
         if (alternativeRoutes.length < 1) {
             return lang.illegalState(`onAuthorisationFailure hook didn't return any alternate places`);
         }