asv-hlps 1.3.28 → 1.3.29

package/lib/cjs/user.d.ts

@@ -1,3 +1,4 @@
+import { UserGrp } from "./models";
 import { Gender } from "./models/entities/users/Gender";
 import { Ste } from "./models/entities/users/Ste";
 import { User } from "./models/entities/users/User";
@@ -10,8 +11,16 @@ interface FullnameType {
     gender?: Gender;
     titr?: UserTitr;
 }
-export declare const inGrp: (grps: string[], user: User | UserNotarial) => boolean;
-export declare const inSteGrp: (grps: string[], user: User | UserNotarial) => boolean;
+export declare const inGrp: <T extends {
+    grp: UserGrp;
+}>(grps: string[], user: T) => boolean;
+export declare const displaySteOrStaff: <T extends {
+    ste: Ste;
+    fullname: string;
+}>(user: T, steNames?: string[]) => string;
+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 isBillPeriod: (user: User | UserNotarial, period: string) => boolean;
 export declare const isStaffSte: (steNames: string[], userSteName: string) => boolean;

package/lib/cjs/user.js

@@ -26,19 +26,28 @@ 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.inGrp = void 0;
+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.displaySteOrStaff = exports.inGrp = void 0;
 const bcrypt = __importStar(require("bcryptjs"));
 const randomatic_1 = __importDefault(require("randomatic"));
 const utils_1 = require("./utils");
+// export const inGrp = (grps: string[], user: User | UserNotarial) => {
 const inGrp = (grps, user) => {
     return [...grps].includes(user.grp.code.toLowerCase()) ? true : false;
 };
 exports.inGrp = inGrp;
+const displaySteOrStaff = (user, steNames = ["cpa"]) => {
+    if ((0, exports.isStaffSte)(steNames, user.ste.name)) {
+        return user.fullname;
+    }
+    return user === null || user === void 0 ? void 0 : user.ste.name;
+};
+exports.displaySteOrStaff = displaySteOrStaff;
 const inSteGrp = (grps, user) => {
+    var _a, _b;
     if (!user.ste) {
         return null;
     }
-    return [...grps].includes(user.ste.grp.code.toLowerCase()) ? true : false;
+    return [...grps].includes((_b = (_a = user === null || user === void 0 ? void 0 : user.ste) === null || _a === void 0 ? void 0 : _a.grp) === null || _b === void 0 ? void 0 : _b.code.toLowerCase()) ? true : false;
 };
 exports.inSteGrp = inSteGrp;
 /* export const hasRole = (roles: string[], user: User | UserNotarial) => {

package/lib/esm/user.d.ts

@@ -1,3 +1,4 @@
+import { UserGrp } from "./models";
 import { Gender } from "./models/entities/users/Gender";
 import { Ste } from "./models/entities/users/Ste";
 import { User } from "./models/entities/users/User";
@@ -10,8 +11,16 @@ interface FullnameType {
     gender?: Gender;
     titr?: UserTitr;
 }
-export declare const inGrp: (grps: string[], user: User | UserNotarial) => boolean;
-export declare const inSteGrp: (grps: string[], user: User | UserNotarial) => boolean;
+export declare const inGrp: <T extends {
+    grp: UserGrp;
+}>(grps: string[], user: T) => boolean;
+export declare const displaySteOrStaff: <T extends {
+    ste: Ste;
+    fullname: string;
+}>(user: T, steNames?: string[]) => string;
+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 isBillPeriod: (user: User | UserNotarial, period: string) => boolean;
 export declare const isStaffSte: (steNames: string[], userSteName: string) => boolean;

package/lib/esm/user.js

@@ -1,14 +1,22 @@
 import * as bcrypt from "bcryptjs";
 import randomatic from "randomatic";
 import { 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;
 };
+export const displaySteOrStaff = (user, steNames = ["cpa"]) => {
+    if (isStaffSte(steNames, user.ste.name)) {
+        return user.fullname;
+    }
+    return user === null || user === void 0 ? void 0 : user.ste.name;
+};
 export const inSteGrp = (grps, user) => {
+    var _a, _b;
     if (!user.ste) {
         return null;
     }
-    return [...grps].includes(user.ste.grp.code.toLowerCase()) ? true : false;
+    return [...grps].includes((_b = (_a = user === null || user === void 0 ? void 0 : user.ste) === null || _a === void 0 ? void 0 : _a.grp) === null || _b === void 0 ? void 0 : _b.code.toLowerCase()) ? true : false;
 };
 /* export const hasRole = (roles: string[], user: User | UserNotarial) => {
   return [...roles].includes(user.role.code.toLowerCase()) ? true : false;

package/package.json

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