ps-toolkit-ui 0.0.21 → 0.0.25
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/ps-toolkit-ui.umd.js +21 -34
- package/bundles/ps-toolkit-ui.umd.js.map +1 -1
- package/bundles/ps-toolkit-ui.umd.min.js +1 -1
- package/bundles/ps-toolkit-ui.umd.min.js.map +1 -1
- package/esm2015/lib/components/base.component.js +20 -22
- package/esm2015/lib/components/sidebar/sidebar.component.js +2 -3
- package/fesm2015/ps-toolkit-ui.js +19 -23
- package/fesm2015/ps-toolkit-ui.js.map +1 -1
- package/lib/components/base.component.d.ts +3 -1
- package/package.json +1 -1
- package/ps-toolkit-ui.metadata.json +1 -1
|
@@ -1,41 +1,39 @@
|
|
|
1
1
|
import { Injectable } from '@angular/core';
|
|
2
2
|
import { PermissionClass } from '../classes/permission.class';
|
|
3
|
+
import { PermissionTypeEnum } from '../classes/enum.class';
|
|
3
4
|
export class BaseComponent {
|
|
4
5
|
constructor(app, c, a = null) {
|
|
6
|
+
this.app = app;
|
|
5
7
|
this.c = c;
|
|
6
8
|
this.a = a;
|
|
7
9
|
this.l = (key, v = null) => {
|
|
8
10
|
return app.getL(`${c}${(a ? `.${a}` : '')}`, key, v);
|
|
9
11
|
};
|
|
10
12
|
if (app.currentUser !== null) {
|
|
11
|
-
this.permissions = this.getPermission(
|
|
13
|
+
this.permissions = this.getPermission();
|
|
14
|
+
console.log(this.permissions);
|
|
12
15
|
if (this.permissions) {
|
|
13
16
|
this.permissions.Area = app.area;
|
|
14
17
|
}
|
|
15
18
|
}
|
|
16
19
|
}
|
|
17
|
-
getPermission(
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
}
|
|
22
|
-
if (per.Children) {
|
|
23
|
-
const pc = this.getPermission(per.Children);
|
|
24
|
-
if (pc != null) {
|
|
25
|
-
return this.getPermissionClass(pc);
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
if (per.Accesses) {
|
|
29
|
-
const pc = this.getPermission(per.Accesses);
|
|
30
|
-
if (pc != null) {
|
|
31
|
-
return this.getPermissionClass(pc);
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
return null;
|
|
20
|
+
getPermission() {
|
|
21
|
+
const p = this.app.currentUser.Permissions.filter(per => per.Controller === this.c && (this.a == null || per.Action === this.a) &&
|
|
22
|
+
per.Type === PermissionTypeEnum.Item);
|
|
23
|
+
return p.length > 0 ? this.getPermissionClass(p[0]) : null;
|
|
36
24
|
}
|
|
37
25
|
getPermissionClass(p) {
|
|
38
|
-
|
|
26
|
+
console.log('$$$$$$$$$$');
|
|
27
|
+
console.log(p);
|
|
28
|
+
console.log('$$$$$$$$$$');
|
|
29
|
+
return new PermissionClass(p.Name, p.Icon, p.Type, p.Area, p.Controller, p.Action, [], this.getPermissionAccessesClass(p.Id));
|
|
30
|
+
}
|
|
31
|
+
getPermissionAccessesClass(parentId) {
|
|
32
|
+
console.log('--------------');
|
|
33
|
+
console.log(parentId);
|
|
34
|
+
console.log(this.app.currentUser.Permissions.filter(x => x.ParentId = parentId));
|
|
35
|
+
console.log('--------------');
|
|
36
|
+
return this.app.currentUser.Permissions.filter(x => x.ParentId = parentId).map(x => this.getPermissionClass(x));
|
|
39
37
|
}
|
|
40
38
|
hasAccess(a) {
|
|
41
39
|
return this.permissions ? this.permissions.hasAccess(a) : false;
|
|
@@ -52,4 +50,4 @@ BaseComponent.ctorParameters = () => [
|
|
|
52
50
|
null,
|
|
53
51
|
null
|
|
54
52
|
];
|
|
55
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFzZS5jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiRDovUHJvamVjdHMvUHNUb29sa2l0L1VJL3Byb2plY3RzL3BzLXRvb2xraXQtdWkvc3JjLyIsInNvdXJjZXMiOlsibGliL2NvbXBvbmVudHMvYmFzZS5jb21wb25lbnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFDLFVBQVUsRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUN6QyxPQUFPLEVBQUMsZUFBZSxFQUFDLE1BQU0sNkJBQTZCLENBQUM7QUFDNUQsT0FBTyxFQUFDLGtCQUFrQixFQUFDLE1BQU0sdUJBQXVCLENBQUM7QUFHekQsTUFBTSxPQUFnQixhQUFhO0lBR2pDLFlBQTZCLEdBQVEsRUFBUyxDQUFDLEVBQVMsSUFBSSxJQUFJO1FBQW5DLFFBQUcsR0FBSCxHQUFHLENBQUs7UUFBUyxNQUFDLEdBQUQsQ0FBQyxDQUFBO1FBQVMsTUFBQyxHQUFELENBQUMsQ0FBTztRQUM5RCxJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUMsR0FBVyxFQUFFLENBQUMsR0FBRyxJQUFJLEVBQVUsRUFBRTtZQUN6QyxPQUFPLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3ZELENBQUMsQ0FBQztRQUNGLElBQUksR0FBRyxDQUFDLFdBQVcsS0FBSyxJQUFJLEVBQUM7WUFDM0IsSUFBSSxDQUFDLFdBQVcsR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7WUFDeEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDOUIsSUFBSSxJQUFJLENBQUMsV0FBVyxFQUFDO2dCQUNuQixJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksR0FBRyxHQUFHLENBQUMsSUFBSSxDQUFDO2FBQ2xDO1NBQ0Y7SUFDSCxDQUFDO0lBQ0QsYUFBYTtRQUNYLE1BQU0sQ0FBQyxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsVUFBVSxLQUFLLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLElBQUksSUFBSSxHQUFHLENBQUMsTUFBTSxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUM7WUFDN0gsR0FBRyxDQUFDLElBQUksS0FBSyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN4QyxPQUFPLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQztJQUM3RCxDQUFDO0lBQ0Qsa0JBQWtCLENBQUMsQ0FBTTtRQUN2QixPQUFPLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQzFCLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDZixPQUFPLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDO1FBQzFCLE9BQU8sSUFBSSxlQUFlLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRSxFQUFFLElBQUksQ0FBQywwQkFBMEIsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUNoSSxDQUFDO0lBQ0QsMEJBQTBCLENBQUMsUUFBZ0I7UUFDekMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO1FBQzlCLE9BQU8sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDLENBQUM7UUFDdEIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLFFBQVEsR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDO1FBQ2pGLE9BQU8sQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsQ0FBQztRQUM5QixPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2xILENBQUM7SUFDRCxTQUFTLENBQUMsQ0FBUztRQUNqQixPQUFPLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7SUFDbEUsQ0FBQztJQUNELFNBQVMsQ0FBQyxDQUFTO1FBQ2pCLE9BQU8sSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztJQUNsRSxDQUFDOzs7WUF2Q0YsVUFBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7SW5qZWN0YWJsZX0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbmltcG9ydCB7UGVybWlzc2lvbkNsYXNzfSBmcm9tICcuLi9jbGFzc2VzL3Blcm1pc3Npb24uY2xhc3MnO1xyXG5pbXBvcnQge1Blcm1pc3Npb25UeXBlRW51bX0gZnJvbSAnLi4vY2xhc3Nlcy9lbnVtLmNsYXNzJztcclxuXHJcbkBJbmplY3RhYmxlKClcclxuZXhwb3J0IGFic3RyYWN0IGNsYXNzIEJhc2VDb21wb25lbnQge1xyXG4gIGw6IChrLCB2PykgPT4gc3RyaW5nO1xyXG4gIHBlcm1pc3Npb25zOiBQZXJtaXNzaW9uQ2xhc3M7XHJcbiAgcHJvdGVjdGVkIGNvbnN0cnVjdG9yKHB1YmxpYyBhcHA6IGFueSwgcHVibGljIGMsIHB1YmxpYyBhID0gbnVsbCl7XHJcbiAgICB0aGlzLmwgPSAoa2V5OiBzdHJpbmcsIHYgPSBudWxsKTogc3RyaW5nID0+IHtcclxuICAgICAgcmV0dXJuIGFwcC5nZXRMKGAke2N9JHsoYSA/IGAuJHthfWAgOiAnJyl9YCwga2V5LCB2KTtcclxuICAgIH07XHJcbiAgICBpZiAoYXBwLmN1cnJlbnRVc2VyICE9PSBudWxsKXtcclxuICAgICAgdGhpcy5wZXJtaXNzaW9ucyA9IHRoaXMuZ2V0UGVybWlzc2lvbigpO1xyXG4gICAgICBjb25zb2xlLmxvZyh0aGlzLnBlcm1pc3Npb25zKTtcclxuICAgICAgaWYgKHRoaXMucGVybWlzc2lvbnMpe1xyXG4gICAgICAgIHRoaXMucGVybWlzc2lvbnMuQXJlYSA9IGFwcC5hcmVhO1xyXG4gICAgICB9XHJcbiAgICB9XHJcbiAgfVxyXG4gIGdldFBlcm1pc3Npb24oKTogYW55e1xyXG4gICAgY29uc3QgcCA9IHRoaXMuYXBwLmN1cnJlbnRVc2VyLlBlcm1pc3Npb25zLmZpbHRlcihwZXIgPT4gcGVyLkNvbnRyb2xsZXIgPT09IHRoaXMuYyAmJiAodGhpcy5hID09IG51bGwgfHwgcGVyLkFjdGlvbiA9PT0gdGhpcy5hKSAmJlxyXG4gICAgICBwZXIuVHlwZSA9PT0gUGVybWlzc2lvblR5cGVFbnVtLkl0ZW0pO1xyXG4gICAgcmV0dXJuIHAubGVuZ3RoID4gMCA/IHRoaXMuZ2V0UGVybWlzc2lvbkNsYXNzKHBbMF0pIDogbnVsbDtcclxuICB9XHJcbiAgZ2V0UGVybWlzc2lvbkNsYXNzKHA6IGFueSk6IFBlcm1pc3Npb25DbGFzc3tcclxuICAgIGNvbnNvbGUubG9nKCckJCQkJCQkJCQkJyk7XHJcbiAgICBjb25zb2xlLmxvZyhwKTtcclxuICAgIGNvbnNvbGUubG9nKCckJCQkJCQkJCQkJyk7XHJcbiAgICByZXR1cm4gbmV3IFBlcm1pc3Npb25DbGFzcyhwLk5hbWUsIHAuSWNvbiwgcC5UeXBlLCBwLkFyZWEsIHAuQ29udHJvbGxlciwgcC5BY3Rpb24sIFtdLCB0aGlzLmdldFBlcm1pc3Npb25BY2Nlc3Nlc0NsYXNzKHAuSWQpKTtcclxuICB9XHJcbiAgZ2V0UGVybWlzc2lvbkFjY2Vzc2VzQ2xhc3MocGFyZW50SWQ6IHN0cmluZyk6IFBlcm1pc3Npb25DbGFzc1tde1xyXG4gICAgY29uc29sZS5sb2coJy0tLS0tLS0tLS0tLS0tJyk7XHJcbiAgICBjb25zb2xlLmxvZyhwYXJlbnRJZCk7XHJcbiAgICBjb25zb2xlLmxvZyh0aGlzLmFwcC5jdXJyZW50VXNlci5QZXJtaXNzaW9ucy5maWx0ZXIoeCA9PiB4LlBhcmVudElkID0gcGFyZW50SWQpKTtcclxuICAgIGNvbnNvbGUubG9nKCctLS0tLS0tLS0tLS0tLScpO1xyXG4gICAgcmV0dXJuIHRoaXMuYXBwLmN1cnJlbnRVc2VyLlBlcm1pc3Npb25zLmZpbHRlcih4ID0+IHguUGFyZW50SWQgPSBwYXJlbnRJZCkubWFwKHggPT4gdGhpcy5nZXRQZXJtaXNzaW9uQ2xhc3MoeCkpO1xyXG4gIH1cclxuICBoYXNBY2Nlc3MoYTogc3RyaW5nKTogYm9vbGVhbntcclxuICAgIHJldHVybiB0aGlzLnBlcm1pc3Npb25zID8gdGhpcy5wZXJtaXNzaW9ucy5oYXNBY2Nlc3MoYSkgOiBmYWxzZTtcclxuICB9XHJcbiAgaGFzT3B0aW9uKGE6IHN0cmluZyk6IGJvb2xlYW57XHJcbiAgICByZXR1cm4gdGhpcy5wZXJtaXNzaW9ucyA/IHRoaXMucGVybWlzc2lvbnMuaGFzT3B0aW9uKGEpIDogZmFsc2U7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -28,11 +28,10 @@ export class SidebarComponent {
|
|
|
28
28
|
}
|
|
29
29
|
ngOnInit() {
|
|
30
30
|
this.sidebar = this.getSidebar();
|
|
31
|
-
console.log(this.sidebar);
|
|
32
31
|
this.setActive();
|
|
33
32
|
}
|
|
34
33
|
getSidebar(parentId = null) {
|
|
35
|
-
return this.permissions.filter(x => x.Type === PermissionTypeEnum.Item &&
|
|
34
|
+
return this.permissions.filter(x => x.Type === PermissionTypeEnum.Item && x.ParentId === parentId).map((s) => {
|
|
36
35
|
return new SidebarClass(this.l, s.Name, s.Controller, s.Action, s.Icon, this.getSidebar(s.Id));
|
|
37
36
|
});
|
|
38
37
|
}
|
|
@@ -65,4 +64,4 @@ SidebarComponent.propDecorators = {
|
|
|
65
64
|
area: [{ type: Input }],
|
|
66
65
|
toggleSidebar: [{ type: Output }]
|
|
67
66
|
};
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2lkZWJhci5jb21wb25lbnQuanMiLCJzb3VyY2VSb290IjoiRDovUHJvamVjdHMvUHNUb29sa2l0L1VJL3Byb2plY3RzL3BzLXRvb2xraXQtdWkvc3JjLyIsInNvdXJjZXMiOlsibGliL2NvbXBvbmVudHMvc2lkZWJhci9zaWRlYmFyLmNvbXBvbmVudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUMsU0FBUyxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQVUsTUFBTSxFQUFDLE1BQU0sZUFBZSxDQUFDO0FBQzdFLE9BQU8sRUFBQyx3QkFBd0IsRUFBQyxNQUFNLCtCQUErQixDQUFDO0FBQ3ZFLE9BQU8sRUFBQyxTQUFTLEVBQUMsTUFBTSwwQkFBMEIsQ0FBQztBQUNuRCxPQUFPLEVBQUMsWUFBWSxFQUFDLE1BQU0sNkJBQTZCLENBQUM7QUFDekQsT0FBTyxFQUFDLGFBQWEsRUFBRSxNQUFNLEVBQUMsTUFBTSxpQkFBaUIsQ0FBQztBQUN0RCxPQUFPLEVBQUMsV0FBVyxFQUFDLE1BQU0sNEJBQTRCLENBQUM7QUFDdkQsT0FBTyxFQUFDLGtCQUFrQixFQUFDLE1BQU0sMEJBQTBCLENBQUM7QUFPNUQsTUFBTSxPQUFPLGdCQUFnQjtJQVUzQixZQUFtQixNQUFnQyxFQUFVLE1BQWM7UUFBeEQsV0FBTSxHQUFOLE1BQU0sQ0FBMEI7UUFBVSxXQUFNLEdBQU4sTUFBTSxDQUFRO1FBUjNFLGdCQUFXLEdBQVUsRUFBRSxDQUFDO1FBSXhCLGtCQUFhLEdBQUcsSUFBSSxZQUFZLEVBQVUsQ0FBQztRQUMzQyxZQUFPLEdBQW1CLEVBQUUsQ0FBQztRQUkzQixNQUFNLElBQUksR0FBRyxJQUFJLFNBQVMsQ0FBQyxNQUFNLENBQUMsV0FBVyxFQUFFLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUMvRCxJQUFJLENBQUMsQ0FBQyxHQUFHLENBQUMsR0FBVyxFQUFFLENBQUMsR0FBRyxJQUFJLEVBQVUsRUFBRTtZQUN6QyxPQUFPLElBQUksQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLFNBQVMsRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDL0MsQ0FBQyxDQUFDO1FBQ0YsTUFBTSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDOUIsSUFBSSxLQUFLLFlBQVksYUFBYSxFQUFFO2dCQUNsQyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7YUFDbEI7UUFDSCxDQUFDLENBQUMsQ0FBQztJQUNMLENBQUM7SUFDRCxTQUFTO1FBQ1AsTUFBTSxNQUFNLEdBQUcsV0FBVyxDQUFDLE9BQU8sQ0FBQyxRQUFRLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDdkcsSUFBSSxDQUFDLGNBQWMsR0FBRyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQztJQUNwRSxDQUFDO0lBQ0QsUUFBUTtRQUNOLElBQUksQ0FBQyxPQUFPLEdBQUcsSUFBSSxDQUFDLFVBQVUsRUFBRSxDQUFDO1FBQ2pDLElBQUksQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUNuQixDQUFDO0lBQ0QsVUFBVSxDQUFDLFdBQW1CLElBQUk7UUFDaEMsT0FBTyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssa0JBQWtCLENBQUMsSUFBSSxJQUFJLENBQUMsQ0FBQyxRQUFRLEtBQUssUUFBUSxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxFQUFFLEVBQUU7WUFDekcsT0FBTyxJQUFJLFlBQVksQ0FBQyxJQUFJLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQyxJQUFJLEVBQUUsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztRQUNqRyxDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFDRCxnQkFBZ0IsQ0FBQyxJQUFvQixFQUFFLE1BQU07UUFDM0MsS0FBSyxNQUFNLENBQUMsSUFBSSxJQUFJLEVBQUM7WUFDbkIsSUFBSSxDQUFDLENBQUMsVUFBVSxHQUFHLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEtBQUssTUFBTSxFQUFDO2dCQUN2RCxPQUFPLENBQUMsQ0FBQzthQUNWO1lBQ0QsTUFBTSxFQUFFLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENBQUMsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7WUFDckQsSUFBSSxFQUFFLEVBQUM7Z0JBQ0wsT0FBTyxFQUFFLENBQUM7YUFDWDtTQUNGO1FBQ0QsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDOzs7WUFsREYsU0FBUyxTQUFDO2dCQUNQLFFBQVEsRUFBRSxhQUFhO2dCQUN2Qiw4YkFBdUM7O2FBRTFDOzs7WUFYTyx3QkFBd0I7WUFHVCxNQUFNOzs7MEJBVTFCLEtBQUs7bUJBRUwsS0FBSzs0QkFFTCxNQUFNIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHtDb21wb25lbnQsIEV2ZW50RW1pdHRlciwgSW5wdXQsIE9uSW5pdCwgT3V0cHV0fSBmcm9tICdAYW5ndWxhci9jb3JlJztcclxuaW1wb3J0IHtQc1Rvb2xraXRVaUNvbmZpZ1NlcnZpY2V9IGZyb20gJy4uLy4uL3NlcnZpY2VzL2NvbmZpZy5zZXJ2aWNlJztcclxuaW1wb3J0IHtMYW5nQ2xhc3N9IGZyb20gJy4uLy4uL2NsYXNzZXMvbGFuZy5jbGFzcyc7XHJcbmltcG9ydCB7U2lkZWJhckNsYXNzfSBmcm9tICcuLi8uLi9jbGFzc2VzL3NpZGViYXIuY2xhc3MnO1xyXG5pbXBvcnQge05hdmlnYXRpb25FbmQsIFJvdXRlcn0gZnJvbSAnQGFuZ3VsYXIvcm91dGVyJztcclxuaW1wb3J0IHtIZWxwZXJDbGFzc30gZnJvbSAnLi4vLi4vY2xhc3Nlcy9oZWxwZXIuY2xhc3MnO1xyXG5pbXBvcnQge1Blcm1pc3Npb25UeXBlRW51bX0gZnJvbSAnLi4vLi4vY2xhc3Nlcy9lbnVtLmNsYXNzJztcclxuXHJcbkBDb21wb25lbnQoe1xyXG4gICAgc2VsZWN0b3I6ICdsaWItc2lkZWJhcicsXHJcbiAgICB0ZW1wbGF0ZVVybDogJy4vc2lkZWJhci5jb21wb25lbnQuaHRtbCcsXHJcbiAgICBzdHlsZVVybHM6IFsnLi9zaWRlYmFyLmNvbXBvbmVudC5jc3MnXVxyXG59KVxyXG5leHBvcnQgY2xhc3MgU2lkZWJhckNvbXBvbmVudCBpbXBsZW1lbnRzIE9uSW5pdHtcclxuICBASW5wdXQoKVxyXG4gIHBlcm1pc3Npb25zOiBhbnlbXSA9IFtdO1xyXG4gIEBJbnB1dCgpXHJcbiAgYXJlYTogc3RyaW5nO1xyXG4gIEBPdXRwdXQoKVxyXG4gIHRvZ2dsZVNpZGViYXIgPSBuZXcgRXZlbnRFbWl0dGVyPHN0cmluZz4oKTtcclxuICBzaWRlYmFyOiBTaWRlYmFyQ2xhc3NbXSA9IFtdO1xyXG4gIGN1cnJlbnRTaWRlYmFyO1xyXG4gIGw6IChrLCB2PykgPT4gc3RyaW5nO1xyXG4gIGNvbnN0cnVjdG9yKHB1YmxpYyBjb25maWc6IFBzVG9vbGtpdFVpQ29uZmlnU2VydmljZSwgcHJpdmF0ZSByb3V0ZXI6IFJvdXRlcil7XHJcbiAgICBjb25zdCBsYW5nID0gbmV3IExhbmdDbGFzcyhjb25maWcuY3VycmVudExhbmcsIGNvbmZpZy5zdHJpbmdzKTtcclxuICAgIHRoaXMubCA9IChrZXk6IHN0cmluZywgdiA9IG51bGwpOiBzdHJpbmcgPT4ge1xyXG4gICAgICByZXR1cm4gbGFuZy5nZXQoJ1B1YmxpYycsICdTaWRlYmFyJywga2V5LCB2KTtcclxuICAgIH07XHJcbiAgICByb3V0ZXIuZXZlbnRzLnN1YnNjcmliZShldmVudCA9PiB7XHJcbiAgICAgIGlmIChldmVudCBpbnN0YW5jZW9mIE5hdmlnYXRpb25FbmQpIHtcclxuICAgICAgICB0aGlzLnNldEFjdGl2ZSgpO1xyXG4gICAgICB9XHJcbiAgICB9KTtcclxuICB9XHJcbiAgc2V0QWN0aXZlKCk6IHZvaWR7XHJcbiAgICBjb25zdCBhY3RpdmUgPSBIZWxwZXJDbGFzcy5nZXREYXRhKCdhY3RpdmUnLCB0aGlzLnJvdXRlci5yb3V0ZXJTdGF0ZSwgdGhpcy5yb3V0ZXIucm91dGVyU3RhdGUucm9vdClbMF07XHJcbiAgICB0aGlzLmN1cnJlbnRTaWRlYmFyID0gdGhpcy5nZXRTaWRlYmFyQWN0aXZlKHRoaXMuc2lkZWJhciwgYWN0aXZlKTtcclxuICB9XHJcbiAgbmdPbkluaXQoKTogdm9pZCB7XHJcbiAgICB0aGlzLnNpZGViYXIgPSB0aGlzLmdldFNpZGViYXIoKTtcclxuICAgIHRoaXMuc2V0QWN0aXZlKCk7XHJcbiAgfVxyXG4gIGdldFNpZGViYXIocGFyZW50SWQ6IHN0cmluZyA9IG51bGwpOiBTaWRlYmFyQ2xhc3NbXXtcclxuICAgIHJldHVybiB0aGlzLnBlcm1pc3Npb25zLmZpbHRlcih4ID0+IHguVHlwZSA9PT0gUGVybWlzc2lvblR5cGVFbnVtLkl0ZW0gJiYgeC5QYXJlbnRJZCA9PT0gcGFyZW50SWQpLm1hcCgocykgPT4ge1xyXG4gICAgICAgIHJldHVybiBuZXcgU2lkZWJhckNsYXNzKHRoaXMubCwgcy5OYW1lLCBzLkNvbnRyb2xsZXIsIHMuQWN0aW9uLCBzLkljb24sIHRoaXMuZ2V0U2lkZWJhcihzLklkKSk7XHJcbiAgICAgIH0pO1xyXG4gIH1cclxuICBnZXRTaWRlYmFyQWN0aXZlKGl0ZW06IFNpZGViYXJDbGFzc1tdLCBhY3RpdmUpOiBTaWRlYmFyQ2xhc3N7XHJcbiAgICBmb3IgKGNvbnN0IGkgb2YgaXRlbSl7XHJcbiAgICAgIGlmIChpLmNvbnRyb2xsZXIgKyAoaS5hY3Rpb24gPyBpLmFjdGlvbiA6ICcnKSA9PT0gYWN0aXZlKXtcclxuICAgICAgICByZXR1cm4gaTtcclxuICAgICAgfVxyXG4gICAgICBjb25zdCBjYSA9IHRoaXMuZ2V0U2lkZWJhckFjdGl2ZShpLmNoaWxkcmVuLCBhY3RpdmUpO1xyXG4gICAgICBpZiAoY2Epe1xyXG4gICAgICAgIHJldHVybiBjYTtcclxuICAgICAgfVxyXG4gICAgfVxyXG4gICAgcmV0dXJuIG51bGw7XHJcbiAgfVxyXG59XHJcbiJdfQ==
|
|
@@ -1608,11 +1608,10 @@ class SidebarComponent {
|
|
|
1608
1608
|
}
|
|
1609
1609
|
ngOnInit() {
|
|
1610
1610
|
this.sidebar = this.getSidebar();
|
|
1611
|
-
console.log(this.sidebar);
|
|
1612
1611
|
this.setActive();
|
|
1613
1612
|
}
|
|
1614
1613
|
getSidebar(parentId = null) {
|
|
1615
|
-
return this.permissions.filter(x => x.Type === PermissionTypeEnum.Item &&
|
|
1614
|
+
return this.permissions.filter(x => x.Type === PermissionTypeEnum.Item && x.ParentId === parentId).map((s) => {
|
|
1616
1615
|
return new SidebarClass(this.l, s.Name, s.Controller, s.Action, s.Icon, this.getSidebar(s.Id));
|
|
1617
1616
|
});
|
|
1618
1617
|
}
|
|
@@ -5939,40 +5938,37 @@ PsToolkitUiModule.decorators = [
|
|
|
5939
5938
|
|
|
5940
5939
|
class BaseComponent {
|
|
5941
5940
|
constructor(app, c, a = null) {
|
|
5941
|
+
this.app = app;
|
|
5942
5942
|
this.c = c;
|
|
5943
5943
|
this.a = a;
|
|
5944
5944
|
this.l = (key, v = null) => {
|
|
5945
5945
|
return app.getL(`${c}${(a ? `.${a}` : '')}`, key, v);
|
|
5946
5946
|
};
|
|
5947
5947
|
if (app.currentUser !== null) {
|
|
5948
|
-
this.permissions = this.getPermission(
|
|
5948
|
+
this.permissions = this.getPermission();
|
|
5949
|
+
console.log(this.permissions);
|
|
5949
5950
|
if (this.permissions) {
|
|
5950
5951
|
this.permissions.Area = app.area;
|
|
5951
5952
|
}
|
|
5952
5953
|
}
|
|
5953
5954
|
}
|
|
5954
|
-
getPermission(
|
|
5955
|
-
|
|
5956
|
-
|
|
5957
|
-
|
|
5958
|
-
}
|
|
5959
|
-
if (per.Children) {
|
|
5960
|
-
const pc = this.getPermission(per.Children);
|
|
5961
|
-
if (pc != null) {
|
|
5962
|
-
return this.getPermissionClass(pc);
|
|
5963
|
-
}
|
|
5964
|
-
}
|
|
5965
|
-
if (per.Accesses) {
|
|
5966
|
-
const pc = this.getPermission(per.Accesses);
|
|
5967
|
-
if (pc != null) {
|
|
5968
|
-
return this.getPermissionClass(pc);
|
|
5969
|
-
}
|
|
5970
|
-
}
|
|
5971
|
-
}
|
|
5972
|
-
return null;
|
|
5955
|
+
getPermission() {
|
|
5956
|
+
const p = this.app.currentUser.Permissions.filter(per => per.Controller === this.c && (this.a == null || per.Action === this.a) &&
|
|
5957
|
+
per.Type === PermissionTypeEnum.Item);
|
|
5958
|
+
return p.length > 0 ? this.getPermissionClass(p[0]) : null;
|
|
5973
5959
|
}
|
|
5974
5960
|
getPermissionClass(p) {
|
|
5975
|
-
|
|
5961
|
+
console.log('$$$$$$$$$$');
|
|
5962
|
+
console.log(p);
|
|
5963
|
+
console.log('$$$$$$$$$$');
|
|
5964
|
+
return new PermissionClass(p.Name, p.Icon, p.Type, p.Area, p.Controller, p.Action, [], this.getPermissionAccessesClass(p.Id));
|
|
5965
|
+
}
|
|
5966
|
+
getPermissionAccessesClass(parentId) {
|
|
5967
|
+
console.log('--------------');
|
|
5968
|
+
console.log(parentId);
|
|
5969
|
+
console.log(this.app.currentUser.Permissions.filter(x => x.ParentId = parentId));
|
|
5970
|
+
console.log('--------------');
|
|
5971
|
+
return this.app.currentUser.Permissions.filter(x => x.ParentId = parentId).map(x => this.getPermissionClass(x));
|
|
5976
5972
|
}
|
|
5977
5973
|
hasAccess(a) {
|
|
5978
5974
|
return this.permissions ? this.permissions.hasAccess(a) : false;
|