asv-hlps 1.2.25 → 1.2.28

package/lib/cjs/auth.d.ts

@@ -1,4 +1,5 @@
 import { User } from "./models/entities/users/User";
+import { UserNotarial } from "./models/entities/users/UserNotatial";
 export interface AuthParam {
     tag?: string;
     roles?: string[];
@@ -11,4 +12,4 @@ export interface AuthParam {
     steNames?: string[];
     url?: string;
 }
-export declare const getAuth: (authUser: User, authSte: string[], param?: AuthParam) => boolean;
+export declare const getAuth: (authUser: User | UserNotarial, authSte: string[], param?: AuthParam) => boolean;

package/lib/cjs/models/entities/users/UserOnline.d.ts

@@ -1,8 +1,9 @@
-import { User } from './User';
+import { User } from "./User";
+import { UserNotarial } from "./UserNotatial";
 export interface UserOnline {
     id: number;
     date: Date;
     logged: string;
     logout: string;
-    user: User;
+    user: User | UserNotarial;
 }

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

@@ -1,17 +1,17 @@
 import { NaAc } from "./shared/NaAc";
 import { NaCoAc } from "./shared/NaCoAc";
 import { NaCoShortAc } from "./shared/NaCoShortAc";
-import { colNa, colNaCo, colNaCoSh, FormProps, HeaderTableColumnType, IPath, MenuItemType } from "./types/Type";
+import { colNa, colNaCo, colNaCoSh, FormPropsType, HeaderTableColumnType, IPath, MenuItemType } from "./types/Type";
+export * from "./entities/auth/index";
 export * from "./entities/bills/index";
 export * from "./entities/buys/index";
-export * from "./entities/comptas/index";
-export * from "./entities/sales/index";
-export * from "./entities/users/index";
-export * from "./entities/world/index";
 export * from "./entities/cashs/index";
-export * from "./entities/auth/index";
+export * from "./entities/comptas/index";
 export * from "./entities/docs/index";
 export * from "./entities/mails/index";
 export * from "./entities/products/index";
+export * from "./entities/sales/index";
+export * from "./entities/users/index";
 export * from "./entities/utilities/index";
-export { NaAc, NaCoAc, NaCoShortAc, MenuItemType, HeaderTableColumnType, IPath, colNa, colNaCo, colNaCoSh, FormProps };
+export * from "./entities/world/index";
+export { NaAc, NaCoAc, NaCoShortAc, MenuItemType, HeaderTableColumnType, IPath, colNa, colNaCo, colNaCoSh, FormPropsType };

package/lib/cjs/models/index.js

@@ -19,15 +19,15 @@ const Type_1 = require("./types/Type");
 Object.defineProperty(exports, "colNa", { enumerable: true, get: function () { return Type_1.colNa; } });
 Object.defineProperty(exports, "colNaCo", { enumerable: true, get: function () { return Type_1.colNaCo; } });
 Object.defineProperty(exports, "colNaCoSh", { enumerable: true, get: function () { return Type_1.colNaCoSh; } });
+__exportStar(require("./entities/auth/index"), exports);
 __exportStar(require("./entities/bills/index"), exports);
 __exportStar(require("./entities/buys/index"), exports);
-__exportStar(require("./entities/comptas/index"), exports);
-__exportStar(require("./entities/sales/index"), exports);
-__exportStar(require("./entities/users/index"), exports);
-__exportStar(require("./entities/world/index"), exports);
 __exportStar(require("./entities/cashs/index"), exports);
-__exportStar(require("./entities/auth/index"), exports);
+__exportStar(require("./entities/comptas/index"), exports);
 __exportStar(require("./entities/docs/index"), exports);
 __exportStar(require("./entities/mails/index"), exports);
 __exportStar(require("./entities/products/index"), exports);
+__exportStar(require("./entities/sales/index"), exports);
+__exportStar(require("./entities/users/index"), exports);
 __exportStar(require("./entities/utilities/index"), exports);
+__exportStar(require("./entities/world/index"), exports);

package/lib/cjs/models/types/Type.d.ts

@@ -53,10 +53,10 @@ export declare type HeaderTableColumnType = {
 export declare const colNa: HeaderTableColumnType[];
 export declare const colNaCo: HeaderTableColumnType[];
 export declare const colNaCoSh: HeaderTableColumnType[];
-export declare type FormProps = {
+export declare type FormPropsType<T> = {
     onSubmitForm?: (value: any) => any;
     onCancelForm?: (value: any) => any;
-    tob?: any;
+    tob?: T;
     url?: string;
 };
 export interface TabContentType {

package/lib/cjs/npms/yup.js

@@ -76,8 +76,8 @@ const yupValideUniqEmail = (url, tob, isRequired = true) => {
     if (isRequired) {
         return yup
             .string()
-            .email("this value must be a valid email")
             .required("this value is required")
+            .email("this value must be a valid email")
             .test("Check_name", "This name is already taken", (value) => {
             return new Promise((resolve) => __awaiter(void 0, void 0, void 0, function* () {
                 const { data: res } = yield axios_1.default.post(url, { id: tob === null || tob === void 0 ? void 0 : tob.id, name: value });
@@ -86,7 +86,7 @@ const yupValideUniqEmail = (url, tob, isRequired = true) => {
         });
     }
     return yup.string().when((val) => {
-        if (val) {
+        if (val !== "") {
             return yup
                 .string()
                 .email()
@@ -137,9 +137,10 @@ exports.yupValideUniqCode = yupValideUniqCode;
 const yupValidateNoRequiredNumber = () => {
     return yup
         .string()
+        .nullable()
         .when((val) => {
         if (val) {
-            return yup.number();
+            return yup.number().nullable();
         }
     })
         .typeError("must be number");

package/lib/cjs/pdfs/tools/tools.d.ts

@@ -1,4 +1,5 @@
 import { User } from "../../models/entities/users/User";
+import { UserNotarial } from "../../models/entities/users/UserNotatial";
 export declare const displayPdfDate: (label: string, fromDate: string, toDate: string) => string;
 export declare const displayTitle: (title: string) => {
     width: string;
@@ -8,7 +9,7 @@ export declare const displayTitle: (title: string) => {
     margin: number[];
     fontSize: number;
 };
-export declare const displayClient: (user: User) => {
+export declare const displayClient: (user: User | UserNotarial) => {
     absolutePosition: {
         x: number;
         y: number;

package/lib/cjs/services/authService.d.ts

@@ -1,6 +1,8 @@
+import { AuthParam } from "../auth";
 export declare class AuthService {
     tokenKey: string;
-    constructor(tokenkey: string);
+    authStes: string[];
+    constructor(tokenkey: string, authStes: string[]);
     getStorageToken: (local?: boolean) => string;
     setStorageToken: (jwt: any) => any;
     decodeToken: () => unknown;
@@ -8,6 +10,7 @@ export declare class AuthService {
     login: (tob: LoginType, httpService: any) => Promise<boolean>;
     logout: () => boolean;
     authUser: () => unknown;
+    getAuth: (param?: AuthParam) => boolean;
 }
 declare type LoginType = {
     username: string;

package/lib/cjs/services/authService.js

@@ -14,16 +14,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthService = void 0;
 const jwt_decode_1 = __importDefault(require("jwt-decode"));
+const auth_1 = require("../auth");
 const storageService_1 = __importDefault(require("./storageService"));
 class AuthService {
-    constructor(tokenkey) {
-        this.tokenKey = "awPharma";
+    constructor(tokenkey, authStes) {
+        this.tokenKey = "";
+        this.authStes = [];
         // getStorageToken = (tokenKey, local = false) => {
         this.getStorageToken = (local = false) => {
             if (!this.tokenKey) {
                 return null;
             }
-            return storageService_1.default.getStorage(this.tokenKey);
+            return storageService_1.default.getStorage(this.tokenKey, local);
         };
         // setStorageToken = (tokenKey, jwt) => {
         this.setStorageToken = (jwt) => {
@@ -67,7 +69,14 @@ class AuthService {
                 return null;
             }
         };
+        /* getAuth = (authUser: User | UserNotarial, authSte: string[], param?: AuthParam) => {
+          return getAuth(authUser, authSte, param);
+        }; */
+        this.getAuth = (param) => {
+            return (0, auth_1.getAuth)(this.authUser(), this.authStes, param);
+        };
         this.tokenKey = tokenkey;
+        this.authStes = authStes;
     }
 }
 exports.AuthService = AuthService;

package/lib/cjs/user.d.ts

@@ -1,15 +1,16 @@
 import { Ste } from "./models/entities/users/Ste";
 import { User } from "./models/entities/users/User";
-export declare const inGrp: (grps: string[], user: User) => boolean;
-export declare const inSteGrp: (grps: string[], user: User) => boolean;
-export declare const hasRole: (roles: string[], user: User) => boolean;
-export declare const isBillPeriod: (user: User, period: string) => boolean;
-export declare const isStaffSte: (steNames: string[], user: User) => boolean;
-export declare const getFullname: (user: User) => string;
-export declare const entryDesignationUser: (user: User) => string;
+import { UserNotarial } from "./models/entities/users/UserNotatial";
+export declare const inGrp: (grps: string[], user: User | UserNotarial) => boolean;
+export declare const inSteGrp: (grps: string[], user: User | UserNotarial) => boolean;
+export declare const hasRole: (roles: string[], user: User | UserNotarial) => boolean;
+export declare const isBillPeriod: (user: User | UserNotarial, period: string) => boolean;
+export declare const isStaffSte: (steNames: string[], user: User | UserNotarial) => boolean;
+export declare const getFullname: (user: User | UserNotarial) => string;
+export declare const entryDesignationUser: (user: User | UserNotarial) => string;
 export declare const secureUser: (user: any, username: string, heads: any) => void;
 export declare const secureUserPassword: (user: any, heads: any) => void;
-export declare const userGrpCode: (user: User) => string;
-export declare const userCoef: (user: User) => number;
+export declare const userGrpCode: (user: User | UserNotarial) => string;
+export declare const userCoef: (user: User | UserNotarial) => number;
 export declare const labelSteName: (ste: Ste, size?: number, tabs?: string[]) => string;
 export declare const getSteShortname: (ste: Ste, steGrpNames: string[]) => string;

package/lib/cjs/user.js

@@ -49,7 +49,7 @@ const isBillPeriod = (user, period) => {
     return user.periodBill.toLowerCase() === period ? true : false;
 };
 exports.isBillPeriod = isBillPeriod;
-// export const isStaffSte = (user: User, steNames: string|string[]) => {
+// export const isStaffSte = (user: User | UserNotarial, steNames: string|string[]) => {
 const isStaffSte = (steNames, user) => {
     /* if(!Array.isArray(steNames)) {
       return (user.ste.name.toLowerCase() === steNames.toLowerCase());

package/lib/esm/auth.d.ts

@@ -1,4 +1,5 @@
 import { User } from "./models/entities/users/User";
+import { UserNotarial } from "./models/entities/users/UserNotatial";
 export interface AuthParam {
     tag?: string;
     roles?: string[];
@@ -11,4 +12,4 @@ export interface AuthParam {
     steNames?: string[];
     url?: string;
 }
-export declare const getAuth: (authUser: User, authSte: string[], param?: AuthParam) => boolean;
+export declare const getAuth: (authUser: User | UserNotarial, authSte: string[], param?: AuthParam) => boolean;

package/lib/esm/models/entities/users/UserOnline.d.ts

@@ -1,8 +1,9 @@
-import { User } from './User';
+import { User } from "./User";
+import { UserNotarial } from "./UserNotatial";
 export interface UserOnline {
     id: number;
     date: Date;
     logged: string;
     logout: string;
-    user: User;
+    user: User | UserNotarial;
 }

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

@@ -1,17 +1,17 @@
 import { NaAc } from "./shared/NaAc";
 import { NaCoAc } from "./shared/NaCoAc";
 import { NaCoShortAc } from "./shared/NaCoShortAc";
-import { colNa, colNaCo, colNaCoSh, FormProps, HeaderTableColumnType, IPath, MenuItemType } from "./types/Type";
+import { colNa, colNaCo, colNaCoSh, FormPropsType, HeaderTableColumnType, IPath, MenuItemType } from "./types/Type";
+export * from "./entities/auth/index";
 export * from "./entities/bills/index";
 export * from "./entities/buys/index";
-export * from "./entities/comptas/index";
-export * from "./entities/sales/index";
-export * from "./entities/users/index";
-export * from "./entities/world/index";
 export * from "./entities/cashs/index";
-export * from "./entities/auth/index";
+export * from "./entities/comptas/index";
 export * from "./entities/docs/index";
 export * from "./entities/mails/index";
 export * from "./entities/products/index";
+export * from "./entities/sales/index";
+export * from "./entities/users/index";
 export * from "./entities/utilities/index";
-export { NaAc, NaCoAc, NaCoShortAc, MenuItemType, HeaderTableColumnType, IPath, colNa, colNaCo, colNaCoSh, FormProps };
+export * from "./entities/world/index";
+export { NaAc, NaCoAc, NaCoShortAc, MenuItemType, HeaderTableColumnType, IPath, colNa, colNaCo, colNaCoSh, FormPropsType };

package/lib/esm/models/index.js

@@ -1,14 +1,14 @@
 import { colNa, colNaCo, colNaCoSh } from "./types/Type";
+export * from "./entities/auth/index";
 export * from "./entities/bills/index";
 export * from "./entities/buys/index";
-export * from "./entities/comptas/index";
-export * from "./entities/sales/index";
-export * from "./entities/users/index";
-export * from "./entities/world/index";
 export * from "./entities/cashs/index";
-export * from "./entities/auth/index";
+export * from "./entities/comptas/index";
 export * from "./entities/docs/index";
 export * from "./entities/mails/index";
 export * from "./entities/products/index";
+export * from "./entities/sales/index";
+export * from "./entities/users/index";
 export * from "./entities/utilities/index";
+export * from "./entities/world/index";
 export { colNa, colNaCo, colNaCoSh };

package/lib/esm/models/types/Type.d.ts

@@ -53,10 +53,10 @@ export declare type HeaderTableColumnType = {
 export declare const colNa: HeaderTableColumnType[];
 export declare const colNaCo: HeaderTableColumnType[];
 export declare const colNaCoSh: HeaderTableColumnType[];
-export declare type FormProps = {
+export declare type FormPropsType<T> = {
     onSubmitForm?: (value: any) => any;
     onCancelForm?: (value: any) => any;
-    tob?: any;
+    tob?: T;
     url?: string;
 };
 export interface TabContentType {

package/lib/esm/npms/yup.js

@@ -42,8 +42,8 @@ export const yupValideUniqEmail = (url, tob, isRequired = true) => {
     if (isRequired) {
         return yup
             .string()
-            .email("this value must be a valid email")
             .required("this value is required")
+            .email("this value must be a valid email")
             .test("Check_name", "This name is already taken", (value) => {
             return new Promise((resolve) => __awaiter(void 0, void 0, void 0, function* () {
                 const { data: res } = yield axios.post(url, { id: tob === null || tob === void 0 ? void 0 : tob.id, name: value });
@@ -52,7 +52,7 @@ export const yupValideUniqEmail = (url, tob, isRequired = true) => {
         });
     }
     return yup.string().when((val) => {
-        if (val) {
+        if (val !== "") {
             return yup
                 .string()
                 .email()
@@ -100,9 +100,10 @@ export const yupValideUniqCode = (url, max = 4, tob) => {
 export const yupValidateNoRequiredNumber = () => {
     return yup
         .string()
+        .nullable()
         .when((val) => {
         if (val) {
-            return yup.number();
+            return yup.number().nullable();
         }
     })
         .typeError("must be number");

package/lib/esm/pdfs/tools/tools.d.ts

@@ -1,4 +1,5 @@
 import { User } from "../../models/entities/users/User";
+import { UserNotarial } from "../../models/entities/users/UserNotatial";
 export declare const displayPdfDate: (label: string, fromDate: string, toDate: string) => string;
 export declare const displayTitle: (title: string) => {
     width: string;
@@ -8,7 +9,7 @@ export declare const displayTitle: (title: string) => {
     margin: number[];
     fontSize: number;
 };
-export declare const displayClient: (user: User) => {
+export declare const displayClient: (user: User | UserNotarial) => {
     absolutePosition: {
         x: number;
         y: number;

package/lib/esm/services/authService.d.ts

@@ -1,6 +1,8 @@
+import { AuthParam } from "../auth";
 export declare class AuthService {
     tokenKey: string;
-    constructor(tokenkey: string);
+    authStes: string[];
+    constructor(tokenkey: string, authStes: string[]);
     getStorageToken: (local?: boolean) => string;
     setStorageToken: (jwt: any) => any;
     decodeToken: () => unknown;
@@ -8,6 +10,7 @@ export declare class AuthService {
     login: (tob: LoginType, httpService: any) => Promise<boolean>;
     logout: () => boolean;
     authUser: () => unknown;
+    getAuth: (param?: AuthParam) => boolean;
 }
 declare type LoginType = {
     username: string;

package/lib/esm/services/authService.js

@@ -8,16 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import jwtDecode from "jwt-decode";
+import { getAuth } from "../auth";
 import storageService from "./storageService";
 export class AuthService {
-    constructor(tokenkey) {
-        this.tokenKey = "awPharma";
+    constructor(tokenkey, authStes) {
+        this.tokenKey = "";
+        this.authStes = [];
         // getStorageToken = (tokenKey, local = false) => {
         this.getStorageToken = (local = false) => {
             if (!this.tokenKey) {
                 return null;
             }
-            return storageService.getStorage(this.tokenKey);
+            return storageService.getStorage(this.tokenKey, local);
         };
         // setStorageToken = (tokenKey, jwt) => {
         this.setStorageToken = (jwt) => {
@@ -61,7 +63,14 @@ export class AuthService {
                 return null;
             }
         };
+        /* getAuth = (authUser: User | UserNotarial, authSte: string[], param?: AuthParam) => {
+          return getAuth(authUser, authSte, param);
+        }; */
+        this.getAuth = (param) => {
+            return getAuth(this.authUser(), this.authStes, param);
+        };
         this.tokenKey = tokenkey;
+        this.authStes = authStes;
     }
 }
 // export default new AuthService("awPharma");

package/lib/esm/user.d.ts

@@ -1,15 +1,16 @@
 import { Ste } from "./models/entities/users/Ste";
 import { User } from "./models/entities/users/User";
-export declare const inGrp: (grps: string[], user: User) => boolean;
-export declare const inSteGrp: (grps: string[], user: User) => boolean;
-export declare const hasRole: (roles: string[], user: User) => boolean;
-export declare const isBillPeriod: (user: User, period: string) => boolean;
-export declare const isStaffSte: (steNames: string[], user: User) => boolean;
-export declare const getFullname: (user: User) => string;
-export declare const entryDesignationUser: (user: User) => string;
+import { UserNotarial } from "./models/entities/users/UserNotatial";
+export declare const inGrp: (grps: string[], user: User | UserNotarial) => boolean;
+export declare const inSteGrp: (grps: string[], user: User | UserNotarial) => boolean;
+export declare const hasRole: (roles: string[], user: User | UserNotarial) => boolean;
+export declare const isBillPeriod: (user: User | UserNotarial, period: string) => boolean;
+export declare const isStaffSte: (steNames: string[], user: User | UserNotarial) => boolean;
+export declare const getFullname: (user: User | UserNotarial) => string;
+export declare const entryDesignationUser: (user: User | UserNotarial) => string;
 export declare const secureUser: (user: any, username: string, heads: any) => void;
 export declare const secureUserPassword: (user: any, heads: any) => void;
-export declare const userGrpCode: (user: User) => string;
-export declare const userCoef: (user: User) => number;
+export declare const userGrpCode: (user: User | UserNotarial) => string;
+export declare const userCoef: (user: User | UserNotarial) => number;
 export declare const labelSteName: (ste: Ste, size?: number, tabs?: string[]) => string;
 export declare const getSteShortname: (ste: Ste, steGrpNames: string[]) => string;

package/lib/esm/user.js

@@ -16,7 +16,7 @@ export const hasRole = (roles, user) => {
 export const isBillPeriod = (user, period) => {
     return user.periodBill.toLowerCase() === period ? true : false;
 };
-// export const isStaffSte = (user: User, steNames: string|string[]) => {
+// export const isStaffSte = (user: User | UserNotarial, steNames: string|string[]) => {
 export const isStaffSte = (steNames, user) => {
     /* if(!Array.isArray(steNames)) {
       return (user.ste.name.toLowerCase() === steNames.toLowerCase());

package/package.json

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