@wavemaker/app-ng-runtime 11.8.0-next.27310 → 11.8.0-next.27311
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.
- app-ng-runtime/components/base/bundles/index.umd.js +19 -13
- app-ng-runtime/components/base/directives/show-in-device.directive.d.ts +3 -6
- app-ng-runtime/components/base/esm2022/directives/show-in-device.directive.mjs +12 -14
- app-ng-runtime/components/base/esm2022/widgets/common/lazy-load/lazy-load.directive.mjs +13 -6
- app-ng-runtime/components/base/fesm2022/index.mjs +19 -13
- app-ng-runtime/components/base/fesm2022/index.mjs.map +1 -1
- app-ng-runtime/components/base/widgets/common/lazy-load/lazy-load.directive.d.ts +2 -2
- app-ng-runtime/package.json +1 -1
- app-ng-runtime/runtime/base/bundles/index.umd.js +11 -4
- app-ng-runtime/runtime/base/directives/accessroles.directive.d.ts +4 -3
- app-ng-runtime/runtime/base/esm2022/directives/accessroles.directive.mjs +14 -7
- app-ng-runtime/runtime/base/fesm2022/index.mjs +12 -5
- app-ng-runtime/runtime/base/fesm2022/index.mjs.map +1 -1
|
@@ -7,9 +7,9 @@ export declare class LazyLoadDirective implements OnDestroy {
|
|
|
7
7
|
private readonly context;
|
|
8
8
|
private embeddedView;
|
|
9
9
|
private unSubscribeFn;
|
|
10
|
-
constructor(inj: Injector, templateRef: TemplateRef<any>, viewContainer: ViewContainerRef);
|
|
10
|
+
constructor(inj: Injector, templateRef: TemplateRef<any>, viewContainer: ViewContainerRef, explicitContext?: any);
|
|
11
11
|
set lazyLoad(expr: any);
|
|
12
12
|
ngOnDestroy(): void;
|
|
13
|
-
static ɵfac: i0.ɵɵFactoryDeclaration<LazyLoadDirective,
|
|
13
|
+
static ɵfac: i0.ɵɵFactoryDeclaration<LazyLoadDirective, [null, null, null, { optional: true; }]>;
|
|
14
14
|
static ɵdir: i0.ɵɵDirectiveDeclaration<LazyLoadDirective, "[lazyLoad]", never, { "lazyLoad": { "alias": "lazyLoad"; "required": false; }; }, {}, never, never, false, never>;
|
|
15
15
|
}
|
app-ng-runtime/package.json
CHANGED
|
@@ -2016,16 +2016,18 @@
|
|
|
2016
2016
|
USER_ROLE["AUTHENTICATED"] = "Authenticated";
|
|
2017
2017
|
})(USER_ROLE || (USER_ROLE = {}));
|
|
2018
2018
|
class AccessrolesDirective {
|
|
2019
|
-
constructor(templateRef, viewContainerRef, securityService, inj) {
|
|
2019
|
+
constructor(templateRef, viewContainerRef, securityService, inj, explicitContext) {
|
|
2020
2020
|
this.templateRef = templateRef;
|
|
2021
2021
|
this.viewContainerRef = viewContainerRef;
|
|
2022
2022
|
this.securityService = securityService;
|
|
2023
2023
|
this.inj = inj;
|
|
2024
2024
|
this.processed = false;
|
|
2025
|
+
this.context = {};
|
|
2025
2026
|
const securityConfig = this.securityService.get();
|
|
2026
2027
|
this.securityEnabled = lodashEs.get(securityConfig, 'securityEnabled');
|
|
2027
2028
|
this.isUserAuthenticated = lodashEs.get(securityConfig, 'authenticated');
|
|
2028
2029
|
this.userRoles = lodashEs.get(securityConfig, 'userInfo.userRoles');
|
|
2030
|
+
lodashEs.extend(this.context, inj._lView[8], explicitContext);
|
|
2029
2031
|
}
|
|
2030
2032
|
/**
|
|
2031
2033
|
* Returns array of roles from comma separated string of roles
|
|
@@ -2087,13 +2089,13 @@
|
|
|
2087
2089
|
const isAccessible = !this.securityEnabled || this.hasAccessToWidget(widgetRoles, this.userRoles);
|
|
2088
2090
|
if (isAccessible) {
|
|
2089
2091
|
// [WMS-19294] pass on the previous context as second param.
|
|
2090
|
-
this.viewContainerRef.createEmbeddedView(this.templateRef, this.
|
|
2092
|
+
this.viewContainerRef.createEmbeddedView(this.templateRef, this.context);
|
|
2091
2093
|
}
|
|
2092
2094
|
else {
|
|
2093
2095
|
this.viewContainerRef.clear();
|
|
2094
2096
|
}
|
|
2095
2097
|
}
|
|
2096
|
-
static { this.ɵfac = function AccessrolesDirective_Factory(t) { return new (t || AccessrolesDirective)(i0__namespace.ɵɵdirectiveInject(i0__namespace.TemplateRef), i0__namespace.ɵɵdirectiveInject(i0__namespace.ViewContainerRef), i0__namespace.ɵɵdirectiveInject(i2__namespace.SecurityService), i0__namespace.ɵɵdirectiveInject(i0__namespace.Injector)); }; }
|
|
2098
|
+
static { this.ɵfac = function AccessrolesDirective_Factory(t) { return new (t || AccessrolesDirective)(i0__namespace.ɵɵdirectiveInject(i0__namespace.TemplateRef), i0__namespace.ɵɵdirectiveInject(i0__namespace.ViewContainerRef), i0__namespace.ɵɵdirectiveInject(i2__namespace.SecurityService), i0__namespace.ɵɵdirectiveInject(i0__namespace.Injector), i0__namespace.ɵɵdirectiveInject('EXPLICIT_CONTEXT', 8)); }; }
|
|
2097
2099
|
static { this.ɵdir = /*@__PURE__*/ i0__namespace.ɵɵdefineDirective({ type: AccessrolesDirective, selectors: [["", "accessroles", ""]], inputs: { accessroles: "accessroles" } }); }
|
|
2098
2100
|
}
|
|
2099
2101
|
(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0__namespace.ɵsetClassMetadata(AccessrolesDirective, [{
|
|
@@ -2101,7 +2103,12 @@
|
|
|
2101
2103
|
args: [{
|
|
2102
2104
|
selector: '[accessroles]'
|
|
2103
2105
|
}]
|
|
2104
|
-
}], () => [{ type: i0__namespace.TemplateRef }, { type: i0__namespace.ViewContainerRef }, { type: i2__namespace.SecurityService }, { type: i0__namespace.Injector }
|
|
2106
|
+
}], () => [{ type: i0__namespace.TemplateRef }, { type: i0__namespace.ViewContainerRef }, { type: i2__namespace.SecurityService }, { type: i0__namespace.Injector }, { type: undefined, decorators: [{
|
|
2107
|
+
type: i0.Inject,
|
|
2108
|
+
args: ['EXPLICIT_CONTEXT']
|
|
2109
|
+
}, {
|
|
2110
|
+
type: i0.Optional
|
|
2111
|
+
}] }], { accessroles: [{
|
|
2105
2112
|
type: i0.Input
|
|
2106
2113
|
}] }); })();
|
|
2107
2114
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { TemplateRef, ViewContainerRef
|
|
1
|
+
import { Injector, TemplateRef, ViewContainerRef } from '@angular/core';
|
|
2
2
|
import { SecurityService } from '@wm/security';
|
|
3
3
|
import * as i0 from "@angular/core";
|
|
4
4
|
export declare class AccessrolesDirective {
|
|
@@ -9,8 +9,9 @@ export declare class AccessrolesDirective {
|
|
|
9
9
|
private processed;
|
|
10
10
|
private readonly isUserAuthenticated;
|
|
11
11
|
private readonly userRoles;
|
|
12
|
+
private readonly context;
|
|
12
13
|
private securityEnabled;
|
|
13
|
-
constructor(templateRef: TemplateRef<any>, viewContainerRef: ViewContainerRef, securityService: SecurityService, inj: Injector);
|
|
14
|
+
constructor(templateRef: TemplateRef<any>, viewContainerRef: ViewContainerRef, securityService: SecurityService, inj: Injector, explicitContext: any);
|
|
14
15
|
/**
|
|
15
16
|
* Returns array of roles from comma separated string of roles
|
|
16
17
|
* Handles encoded commas
|
|
@@ -33,6 +34,6 @@ export declare class AccessrolesDirective {
|
|
|
33
34
|
*/
|
|
34
35
|
private hasAccessToWidget;
|
|
35
36
|
set accessroles(roles: any);
|
|
36
|
-
static ɵfac: i0.ɵɵFactoryDeclaration<AccessrolesDirective,
|
|
37
|
+
static ɵfac: i0.ɵɵFactoryDeclaration<AccessrolesDirective, [null, null, null, null, { optional: true; }]>;
|
|
37
38
|
static ɵdir: i0.ɵɵDirectiveDeclaration<AccessrolesDirective, "[accessroles]", never, { "accessroles": { "alias": "accessroles"; "required": false; }; }, {}, never, never, false, never>;
|
|
38
39
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Directive, Input, TemplateRef, ViewContainerRef
|
|
1
|
+
import { Directive, Inject, Injector, Input, Optional, TemplateRef, ViewContainerRef } from '@angular/core';
|
|
2
2
|
import { SecurityService } from '@wm/security';
|
|
3
|
-
import { get, includes, split, trim } from "lodash-es";
|
|
3
|
+
import { extend, get, includes, split, trim } from "lodash-es";
|
|
4
4
|
import * as i0 from "@angular/core";
|
|
5
5
|
import * as i1 from "@wm/security";
|
|
6
6
|
var USER_ROLE;
|
|
@@ -10,16 +10,18 @@ var USER_ROLE;
|
|
|
10
10
|
USER_ROLE["AUTHENTICATED"] = "Authenticated";
|
|
11
11
|
})(USER_ROLE || (USER_ROLE = {}));
|
|
12
12
|
export class AccessrolesDirective {
|
|
13
|
-
constructor(templateRef, viewContainerRef, securityService, inj) {
|
|
13
|
+
constructor(templateRef, viewContainerRef, securityService, inj, explicitContext) {
|
|
14
14
|
this.templateRef = templateRef;
|
|
15
15
|
this.viewContainerRef = viewContainerRef;
|
|
16
16
|
this.securityService = securityService;
|
|
17
17
|
this.inj = inj;
|
|
18
18
|
this.processed = false;
|
|
19
|
+
this.context = {};
|
|
19
20
|
const securityConfig = this.securityService.get();
|
|
20
21
|
this.securityEnabled = get(securityConfig, 'securityEnabled');
|
|
21
22
|
this.isUserAuthenticated = get(securityConfig, 'authenticated');
|
|
22
23
|
this.userRoles = get(securityConfig, 'userInfo.userRoles');
|
|
24
|
+
extend(this.context, inj._lView[8], explicitContext);
|
|
23
25
|
}
|
|
24
26
|
/**
|
|
25
27
|
* Returns array of roles from comma separated string of roles
|
|
@@ -81,13 +83,13 @@ export class AccessrolesDirective {
|
|
|
81
83
|
const isAccessible = !this.securityEnabled || this.hasAccessToWidget(widgetRoles, this.userRoles);
|
|
82
84
|
if (isAccessible) {
|
|
83
85
|
// [WMS-19294] pass on the previous context as second param.
|
|
84
|
-
this.viewContainerRef.createEmbeddedView(this.templateRef, this.
|
|
86
|
+
this.viewContainerRef.createEmbeddedView(this.templateRef, this.context);
|
|
85
87
|
}
|
|
86
88
|
else {
|
|
87
89
|
this.viewContainerRef.clear();
|
|
88
90
|
}
|
|
89
91
|
}
|
|
90
|
-
static { this.ɵfac = function AccessrolesDirective_Factory(t) { return new (t || AccessrolesDirective)(i0.ɵɵdirectiveInject(i0.TemplateRef), i0.ɵɵdirectiveInject(i0.ViewContainerRef), i0.ɵɵdirectiveInject(i1.SecurityService), i0.ɵɵdirectiveInject(i0.Injector)); }; }
|
|
92
|
+
static { this.ɵfac = function AccessrolesDirective_Factory(t) { return new (t || AccessrolesDirective)(i0.ɵɵdirectiveInject(i0.TemplateRef), i0.ɵɵdirectiveInject(i0.ViewContainerRef), i0.ɵɵdirectiveInject(i1.SecurityService), i0.ɵɵdirectiveInject(i0.Injector), i0.ɵɵdirectiveInject('EXPLICIT_CONTEXT', 8)); }; }
|
|
91
93
|
static { this.ɵdir = /*@__PURE__*/ i0.ɵɵdefineDirective({ type: AccessrolesDirective, selectors: [["", "accessroles", ""]], inputs: { accessroles: "accessroles" } }); }
|
|
92
94
|
}
|
|
93
95
|
(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(AccessrolesDirective, [{
|
|
@@ -95,7 +97,12 @@ export class AccessrolesDirective {
|
|
|
95
97
|
args: [{
|
|
96
98
|
selector: '[accessroles]'
|
|
97
99
|
}]
|
|
98
|
-
}], () => [{ type: i0.TemplateRef }, { type: i0.ViewContainerRef }, { type: i1.SecurityService }, { type: i0.Injector }
|
|
100
|
+
}], () => [{ type: i0.TemplateRef }, { type: i0.ViewContainerRef }, { type: i1.SecurityService }, { type: i0.Injector }, { type: undefined, decorators: [{
|
|
101
|
+
type: Inject,
|
|
102
|
+
args: ['EXPLICIT_CONTEXT']
|
|
103
|
+
}, {
|
|
104
|
+
type: Optional
|
|
105
|
+
}] }], { accessroles: [{
|
|
99
106
|
type: Input
|
|
100
107
|
}] }); })();
|
|
101
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"accessroles.directive.js","sourceRoot":"","sources":["../../../../../projects/runtime-base/src/directives/accessroles.directive.ts"],"names":[],"mappings":"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","sourcesContent":["import {Directive, Inject, Injector, Input, Optional, TemplateRef, ViewContainerRef} from '@angular/core';\n\nimport {SecurityService} from '@wm/security';\nimport {extend, get, includes, split, trim} from \"lodash-es\";\n\nenum USER_ROLE {\n    EVERYONE = 'Everyone',\n    ANONYMOUS = 'Anonymous',\n    AUTHENTICATED = 'Authenticated'\n}\n\n@Directive({\n    selector: '[accessroles]'\n})\nexport class AccessrolesDirective {\n\n    private processed = false;\n    private readonly isUserAuthenticated;\n    private readonly userRoles;\n    private readonly context = {};\n    private securityEnabled: boolean;\n\n    constructor(\n        private templateRef: TemplateRef<any>,\n        private viewContainerRef: ViewContainerRef,\n        private securityService: SecurityService,\n        private inj: Injector,\n        @Inject('EXPLICIT_CONTEXT') @Optional() explicitContext: any\n    ) {\n        const securityConfig = this.securityService.get();\n        this.securityEnabled = get(securityConfig, 'securityEnabled');\n        this.isUserAuthenticated = get(securityConfig, 'authenticated');\n        this.userRoles = get(securityConfig, 'userInfo.userRoles');\n        extend(this.context, (inj as any)._lView[8], explicitContext);\n    }\n\n    /**\n     * Returns array of roles from comma separated string of roles\n     * Handles encoded commas\n     * @param val\n     * @returns {any}\n     */\n    private getWidgetRolesArrayFromStr(val) {\n        const UNICODE_COMMA_REGEX = /&#44;/g;\n\n        val = val || '';\n        if (val === '') {\n            return [];\n        }\n        // replace the unicode equivalent of comma with comma\n        return split(val, ',').map(function (v) {\n            return trim(v).replace(UNICODE_COMMA_REGEX, ',');\n        });\n    }\n\n    /**\n     * Returns true if roles in first arrays is\n     * @param widgetRoles\n     * @param userRoles\n     * @returns {any}\n     */\n    private matchRoles(widgetRoles, userRoles) {\n        return widgetRoles.some(function (item) {\n            return includes(userRoles, item);\n        });\n    }\n\n    /**\n     * Decides whether the current logged in user has access to widget or not\n     * @param widgetRoles\n     * @param userRoles\n     * @returns {any}\n     */\n    private hasAccessToWidget(widgetRoles, userRoles) {\n        // access the widget when 'Everyone' is chosen\n        if (includes(widgetRoles, USER_ROLE.EVERYONE)) {\n            return true;\n        }\n\n        // access the widget when 'Anonymous' is chosen and user is not authenticated\n        if (includes(widgetRoles, USER_ROLE.ANONYMOUS) && !this.isUserAuthenticated) {\n            return true;\n        }\n\n        // access the widget when 'Only Authenticated Users' is chosen and user is authenticated\n        if (includes(widgetRoles, USER_ROLE.AUTHENTICATED) && this.isUserAuthenticated) {\n            return true;\n        }\n\n        // access the widget when widget role and logged in user role matches\n        return this.isUserAuthenticated && this.matchRoles(widgetRoles, userRoles);\n    }\n\n    @Input() set accessroles(roles) {\n        // flag to compute the directive only once\n        if (this.processed) {\n            return;\n        }\n\n        this.processed = true;\n        const widgetRoles = this.getWidgetRolesArrayFromStr(roles);\n        const isAccessible = !this.securityEnabled || this.hasAccessToWidget(widgetRoles, this.userRoles);\n        if (isAccessible) {\n            // [WMS-19294] pass on the previous context as second param.\n            this.viewContainerRef.createEmbeddedView(this.templateRef, this.context);\n        } else {\n            this.viewContainerRef.clear();\n        }\n    }\n}\n"]}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as i0 from '@angular/core';
|
|
2
|
-
import { Injectable, Directive, inject, ViewChild, Inject, HostListener, Input, Component, ViewContainerRef, Self, ChangeDetectorRef, KeyValueDiffers, ViewEncapsulation, CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA, NgModule, APP_ID, RendererStyleFlags2, APP_INITIALIZER, LOCALE_ID } from '@angular/core';
|
|
2
|
+
import { Injectable, Directive, inject, ViewChild, Inject, HostListener, Optional, Input, Component, ViewContainerRef, Self, ChangeDetectorRef, KeyValueDiffers, ViewEncapsulation, CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA, NgModule, APP_ID, RendererStyleFlags2, APP_INITIALIZER, LOCALE_ID } from '@angular/core';
|
|
3
3
|
import * as i1$1 from '@angular/router';
|
|
4
4
|
import { ActivatedRoute, Router, RouterOutlet, NavigationStart, NavigationEnd, NavigationCancel, NavigationError, RouterModule } from '@angular/router';
|
|
5
5
|
import * as i1$2 from '@angular/common';
|
|
@@ -2074,16 +2074,18 @@ var USER_ROLE;
|
|
|
2074
2074
|
USER_ROLE["AUTHENTICATED"] = "Authenticated";
|
|
2075
2075
|
})(USER_ROLE || (USER_ROLE = {}));
|
|
2076
2076
|
class AccessrolesDirective {
|
|
2077
|
-
constructor(templateRef, viewContainerRef, securityService, inj) {
|
|
2077
|
+
constructor(templateRef, viewContainerRef, securityService, inj, explicitContext) {
|
|
2078
2078
|
this.templateRef = templateRef;
|
|
2079
2079
|
this.viewContainerRef = viewContainerRef;
|
|
2080
2080
|
this.securityService = securityService;
|
|
2081
2081
|
this.inj = inj;
|
|
2082
2082
|
this.processed = false;
|
|
2083
|
+
this.context = {};
|
|
2083
2084
|
const securityConfig = this.securityService.get();
|
|
2084
2085
|
this.securityEnabled = get(securityConfig, 'securityEnabled');
|
|
2085
2086
|
this.isUserAuthenticated = get(securityConfig, 'authenticated');
|
|
2086
2087
|
this.userRoles = get(securityConfig, 'userInfo.userRoles');
|
|
2088
|
+
extend(this.context, inj._lView[8], explicitContext);
|
|
2087
2089
|
}
|
|
2088
2090
|
/**
|
|
2089
2091
|
* Returns array of roles from comma separated string of roles
|
|
@@ -2145,13 +2147,13 @@ class AccessrolesDirective {
|
|
|
2145
2147
|
const isAccessible = !this.securityEnabled || this.hasAccessToWidget(widgetRoles, this.userRoles);
|
|
2146
2148
|
if (isAccessible) {
|
|
2147
2149
|
// [WMS-19294] pass on the previous context as second param.
|
|
2148
|
-
this.viewContainerRef.createEmbeddedView(this.templateRef, this.
|
|
2150
|
+
this.viewContainerRef.createEmbeddedView(this.templateRef, this.context);
|
|
2149
2151
|
}
|
|
2150
2152
|
else {
|
|
2151
2153
|
this.viewContainerRef.clear();
|
|
2152
2154
|
}
|
|
2153
2155
|
}
|
|
2154
|
-
static { this.ɵfac = function AccessrolesDirective_Factory(t) { return new (t || AccessrolesDirective)(i0.ɵɵdirectiveInject(i0.TemplateRef), i0.ɵɵdirectiveInject(i0.ViewContainerRef), i0.ɵɵdirectiveInject(i2.SecurityService), i0.ɵɵdirectiveInject(i0.Injector)); }; }
|
|
2156
|
+
static { this.ɵfac = function AccessrolesDirective_Factory(t) { return new (t || AccessrolesDirective)(i0.ɵɵdirectiveInject(i0.TemplateRef), i0.ɵɵdirectiveInject(i0.ViewContainerRef), i0.ɵɵdirectiveInject(i2.SecurityService), i0.ɵɵdirectiveInject(i0.Injector), i0.ɵɵdirectiveInject('EXPLICIT_CONTEXT', 8)); }; }
|
|
2155
2157
|
static { this.ɵdir = /*@__PURE__*/ i0.ɵɵdefineDirective({ type: AccessrolesDirective, selectors: [["", "accessroles", ""]], inputs: { accessroles: "accessroles" } }); }
|
|
2156
2158
|
}
|
|
2157
2159
|
(() => { (typeof ngDevMode === "undefined" || ngDevMode) && i0.ɵsetClassMetadata(AccessrolesDirective, [{
|
|
@@ -2159,7 +2161,12 @@ class AccessrolesDirective {
|
|
|
2159
2161
|
args: [{
|
|
2160
2162
|
selector: '[accessroles]'
|
|
2161
2163
|
}]
|
|
2162
|
-
}], () => [{ type: i0.TemplateRef }, { type: i0.ViewContainerRef }, { type: i2.SecurityService }, { type: i0.Injector }
|
|
2164
|
+
}], () => [{ type: i0.TemplateRef }, { type: i0.ViewContainerRef }, { type: i2.SecurityService }, { type: i0.Injector }, { type: undefined, decorators: [{
|
|
2165
|
+
type: Inject,
|
|
2166
|
+
args: ['EXPLICIT_CONTEXT']
|
|
2167
|
+
}, {
|
|
2168
|
+
type: Optional
|
|
2169
|
+
}] }], { accessroles: [{
|
|
2163
2170
|
type: Input
|
|
2164
2171
|
}] }); })();
|
|
2165
2172
|
|