asv-hlps 1.4.28 → 1.4.30

package/lib/cjs/forms/AdditFormType.d.ts

@@ -0,0 +1,7 @@
+type AdditFormType<T = any> = {
+    onSubmitForm?: (value: any) => any;
+    onCancelForm?: any;
+    tob?: T;
+    url?: string;
+};
+export default AdditFormType;

package/lib/cjs/forms/AdditFormType.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/forms/index.d.ts

@@ -0,0 +1 @@
+export { default as AdditFormType } from "./AdditFormType";

package/lib/cjs/forms/index.js

@@ -1 +1,2 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/cjs/users/user.d.ts

@@ -24,6 +24,9 @@ export declare const inSteGrp: <T extends {
     ste?: Ste;
 }>(grps: string[], user: T) => boolean;
 export declare const hasRole: (roles: string[], userRole: UserRole) => boolean;
+export declare const hasRoles: <T extends {
+    roles?: string[];
+}>(roles: string[], user: T) => boolean;
 export declare const isBillPeriod: <T extends {
     periodBill: string;
 }>(user: T, period: string) => boolean;

package/lib/cjs/users/user.js

@@ -36,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSteShortname = exports.labelSteName = exports.userCoef = exports.userGrpCode = exports.secureUserPassword = exports.secureUser = exports.entryDesignationUser = exports.getFullname = exports.isStaffSte = exports.isBillPeriod = exports.hasRole = exports.inSteGrp = exports.displaySteOrFullname = exports.displaySteOrStaff = exports.inGrp = void 0;
+exports.getSteShortname = exports.labelSteName = exports.userCoef = exports.userGrpCode = exports.secureUserPassword = exports.secureUser = exports.entryDesignationUser = exports.getFullname = exports.isStaffSte = exports.isBillPeriod = exports.hasRoles = exports.hasRole = exports.inSteGrp = exports.displaySteOrFullname = exports.displaySteOrStaff = exports.inGrp = void 0;
 const bcrypt = __importStar(require("bcryptjs"));
 const randomatic_1 = __importDefault(require("randomatic"));
 const utils_1 = require("../utils");
@@ -77,9 +77,14 @@ exports.inSteGrp = inSteGrp;
   return [...roles].includes(user.role.code.toLowerCase()) ? true : false;
 }; */
 const hasRole = (roles, userRole) => {
-    return [...roles].includes(userRole.code.toLowerCase()) ? true : false;
+    // return [...roles].includes(userRole.code.toLowerCase()) ? true : false;
+    return [...roles].includes(userRole.code.toLowerCase());
 };
 exports.hasRole = hasRole;
+const hasRoles = (roles, user) => {
+    return (0, utils_1.arraySome)(roles, user.roles);
+};
+exports.hasRoles = hasRoles;
 const isBillPeriod = (user, period) => {
     return user.periodBill.toLowerCase() === period ? true : false;
 };

package/lib/esm/forms/AdditFormType.d.ts

@@ -0,0 +1,7 @@
+type AdditFormType<T = any> = {
+    onSubmitForm?: (value: any) => any;
+    onCancelForm?: any;
+    tob?: T;
+    url?: string;
+};
+export default AdditFormType;

package/lib/esm/forms/AdditFormType.js

@@ -0,0 +1 @@
+export {};

package/lib/esm/forms/index.d.ts

@@ -0,0 +1 @@
+export { default as AdditFormType } from "./AdditFormType";

package/lib/esm/forms/index.js

@@ -1 +1 @@
-"use strict";
+export {};

package/lib/esm/users/user.d.ts

@@ -24,6 +24,9 @@ export declare const inSteGrp: <T extends {
     ste?: Ste;
 }>(grps: string[], user: T) => boolean;
 export declare const hasRole: (roles: string[], userRole: UserRole) => boolean;
+export declare const hasRoles: <T extends {
+    roles?: string[];
+}>(roles: string[], user: T) => boolean;
 export declare const isBillPeriod: <T extends {
     periodBill: string;
 }>(user: T, period: string) => boolean;

package/lib/esm/users/user.js

@@ -1,6 +1,6 @@
 import * as bcrypt from "bcryptjs";
 import randomatic from "randomatic";
-import { limitTo, titleCase } from "../utils";
+import { arraySome, limitTo, titleCase } from "../utils";
 // export const inGrp = (grps: string[], user: User | UserNotarial) => {
 export const inGrp = (grps, user) => {
     return [...grps].includes(user.grp.code.toLowerCase()) ? true : false;
@@ -34,7 +34,11 @@ export const inSteGrp = (grps, user) => {
   return [...roles].includes(user.role.code.toLowerCase()) ? true : false;
 }; */
 export const hasRole = (roles, userRole) => {
-    return [...roles].includes(userRole.code.toLowerCase()) ? true : false;
+    // return [...roles].includes(userRole.code.toLowerCase()) ? true : false;
+    return [...roles].includes(userRole.code.toLowerCase());
+};
+export const hasRoles = (roles, user) => {
+    return arraySome(roles, user.roles);
 };
 export const isBillPeriod = (user, period) => {
     return user.periodBill.toLowerCase() === period ? true : false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asv-hlps",
-  "version": "1.4.28",
+  "version": "1.4.30",
   "description": "helpers",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",