ps-toolkit-ui 0.0.20 → 0.0.24

package/bundles/ps-toolkit-ui.umd.js

@@ -801,13 +801,14 @@
     })(exports.ResultStatusEnum || (exports.ResultStatusEnum = {}));
     (function (PermissionTypeEnum) {
         PermissionTypeEnum[PermissionTypeEnum["Form"] = -1] = "Form";
-        PermissionTypeEnum[PermissionTypeEnum["Access"] = 0] = "Access";
-        PermissionTypeEnum[PermissionTypeEnum["OptionLink"] = 1] = "OptionLink";
-        PermissionTypeEnum[PermissionTypeEnum["OptionLinkNewTab"] = 2] = "OptionLinkNewTab";
-        PermissionTypeEnum[PermissionTypeEnum["OptionReport"] = 3] = "OptionReport";
-        PermissionTypeEnum[PermissionTypeEnum["OptionFile"] = 4] = "OptionFile";
-        PermissionTypeEnum[PermissionTypeEnum["OptionModal"] = 5] = "OptionModal";
-        PermissionTypeEnum[PermissionTypeEnum["OptionConfirm"] = 6] = "OptionConfirm";
+        PermissionTypeEnum[PermissionTypeEnum["Item"] = 0] = "Item";
+        PermissionTypeEnum[PermissionTypeEnum["Access"] = 1] = "Access";
+        PermissionTypeEnum[PermissionTypeEnum["OptionLink"] = 2] = "OptionLink";
+        PermissionTypeEnum[PermissionTypeEnum["OptionLinkNewTab"] = 3] = "OptionLinkNewTab";
+        PermissionTypeEnum[PermissionTypeEnum["OptionReport"] = 4] = "OptionReport";
+        PermissionTypeEnum[PermissionTypeEnum["OptionFile"] = 5] = "OptionFile";
+        PermissionTypeEnum[PermissionTypeEnum["OptionModal"] = 6] = "OptionModal";
+        PermissionTypeEnum[PermissionTypeEnum["OptionConfirm"] = 7] = "OptionConfirm";
     })(exports.PermissionTypeEnum || (exports.PermissionTypeEnum = {}));
     (function (VehicleType) {
         VehicleType[VehicleType["Car"] = 1] = "Car";
@@ -2127,13 +2128,15 @@
             this.currentSidebar = this.getSidebarActive(this.sidebar, active);
         };
         SidebarComponent.prototype.ngOnInit = function () {
+            this.sidebar = this.getSidebar();
+            this.setActive();
+        };
+        SidebarComponent.prototype.getSidebar = function (parentId) {
             var _this = this;
-            this.sidebar = this.permissions.map(function (s) {
-                return new SidebarClass(_this.l, s.Name, s.Controller, s.Action, s.Icon, s.Children ? s.Children.map(function (c) {
-                    return new SidebarClass(_this.l, c.Name, c.Controller, c.Action, c.Icon, []);
-                }) : []);
+            if (parentId === void 0) { parentId = null; }
+            return this.permissions.filter(function (x) { return x.Type === exports.PermissionTypeEnum.Item && x.ParentId === parentId; }).map(function (s) {
+                return new SidebarClass(_this.l, s.Name, s.Controller, s.Action, s.Icon, _this.getSidebar(s.Id));
             });
-            this.setActive();
         };
         SidebarComponent.prototype.getSidebarActive = function (item, active) {
             var e_1, _a;
@@ -6860,6 +6863,7 @@
     var BaseComponent = /** @class */ (function () {
         function BaseComponent(app, c, a) {
             if (a === void 0) { a = null; }
+            this.app = app;
             this.c = c;
             this.a = a;
             this.l = function (key, v) {
@@ -6867,45 +6871,25 @@
                 return app.getL("" + c + (a ? "." + a : ''), key, v);
             };
             if (app.currentUser !== null) {
-                this.permissions = this.getPermission(app.currentUser.Permissions);
+                this.permissions = this.getPermission();
+                console.log(this.permissions);
                 if (this.permissions) {
                     this.permissions.Area = app.area;
                 }
             }
         }
-        BaseComponent.prototype.getPermission = function (permissions) {
-            var e_1, _a;
-            try {
-                for (var permissions_1 = __values(permissions), permissions_1_1 = permissions_1.next(); !permissions_1_1.done; permissions_1_1 = permissions_1.next()) {
-                    var per = permissions_1_1.value;
-                    if (per.Controller === this.c && (this.a == null || per.Action === this.a)) {
-                        return this.getPermissionClass(per);
-                    }
-                    if (per.Children) {
-                        var pc = this.getPermission(per.Children);
-                        if (pc != null) {
-                            return this.getPermissionClass(pc);
-                        }
-                    }
-                    if (per.Accesses) {
-                        var pc = this.getPermission(per.Accesses);
-                        if (pc != null) {
-                            return this.getPermissionClass(pc);
-                        }
-                    }
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (permissions_1_1 && !permissions_1_1.done && (_a = permissions_1.return)) _a.call(permissions_1);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-            return null;
+        BaseComponent.prototype.getPermission = function () {
+            var _this = this;
+            var p = this.app.currentUser.Permissions.filter(function (per) { return per.Controller === _this.c && (_this.a == null || per.Action === _this.a) &&
+                per.Type === exports.PermissionTypeEnum.Item; });
+            return p.length > 0 ? this.getPermissionClass(p[0]) : null;
         };
         BaseComponent.prototype.getPermissionClass = function (p) {
-            return new PermissionClass(p.Name, p.Icon, p.Type, p.Area, p.Controller, p.Action, p.Children, p.Accesses);
+            return new PermissionClass(p.Name, p.Icon, p.Type, p.Area, p.Controller, p.Action, [], this.getPermissionAccessesClass(p.Id));
+        };
+        BaseComponent.prototype.getPermissionAccessesClass = function (parentId) {
+            var _this = this;
+            return this.app.currentUser.Permissions.filter(function (x) { return x.ParentId = parentId; }).map(function (x) { return _this.getPermissionClass(x); });
         };
         BaseComponent.prototype.hasAccess = function (a) {
             return this.permissions ? this.permissions.hasAccess(a) : false;