@pxp-nd/core 1.2.80 → 1.2.81

package/dist/lib/pxp/Controller.d.ts

@@ -36,8 +36,8 @@ export declare class Controller implements ControllerInterface {
     private basicReadOnly;
     constructor(module: string, Entity?: any, config?: IConfigPxpApp, io?: any);
     private initializeRoutes;
-    genericMethodWrapper(params: Record<string, unknown>, req: Request, next: NextFunction, res: Response, methodName: string, dbsettings: string, readonly: boolean, permission: boolean, log: boolean, logConfig: {}, isHtml: boolean): Promise<void>;
-    ormMethodWrapper(params: Record<string, unknown>, req: Request | any, next: NextFunction, res: Response, methodName: string, readonly: boolean, permission?: boolean, log?: boolean, logConfig?: {}, isHtml?: boolean): Promise<void>;
+    genericMethodWrapper(params: Record<string, unknown>, req: Request, next: NextFunction, res: Response, methodName: string, dbsettings: string, readonly: boolean, permission: boolean, log: boolean, logConfig: {}, isHtml: boolean, isFile: boolean): Promise<void>;
+    ormMethodWrapper(params: Record<string, unknown>, req: Request | any, next: NextFunction, res: Response, methodName: string, readonly: boolean, permission?: boolean, log?: boolean, logConfig?: {}, isHtml?: boolean, isFile?: boolean): Promise<void>;
     list(params: Record<string, unknown>): Promise<unknown>;
     add(params: Record<string, unknown>, manager: EntityManager): Promise<unknown>;
     edit(params: Record<string, unknown>, manager: EntityManager): Promise<unknown>;

package/dist/lib/pxp/Controller.js

@@ -127,6 +127,7 @@ class Controller {
         const logConfig = Reflect.getMetadata('logConfig', this.constructor) || {};
         // get type return
         let ishtml = Reflect.getMetadata('ishtml', this.constructor) || {};
+        let isfile = Reflect.getMetadata('isfile', this.constructor) || {};
         const defaultConfig = Reflect.getMetadata('optionsRoute', this.constructor) || {};
         // define basic routes
         if (this.modelString !== '') {
@@ -143,6 +144,8 @@ class Controller {
             const logKey = typeof logMethod == 'object' ? true : logMethod;
             // is html
             const isHtmlMethod = ishtml[route.methodName] !== undefined ? ishtml[route.methodName] : (defaultConfig[route.methodName] ? defaultConfig[route.methodName].ishtml : false);
+            // is file
+            const isFileMethod = isfile[route.methodName] !== undefined ? isfile[route.methodName] : (defaultConfig[route.methodName] ? defaultConfig[route.methodName].isfile : false);
             if (readOnlyMethod === null || readOnlyMethod === undefined) {
                 throw new index_1.PxpError(500, 'ReadOnly decorator was not defined for ' +
                     route.methodName +
@@ -168,7 +171,7 @@ class Controller {
                         .toLowerCase();
                     this.validated = false;
                     try {
-                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readOnlyMethod, false, logKey, logValue, isHtmlMethod));
+                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readOnlyMethod, false, logKey, logValue, isHtmlMethod, isFileMethod));
                     }
                     catch (ex) {
                         const now = new Date();
@@ -202,7 +205,7 @@ class Controller {
                         .toLowerCase();
                     this.validated = false;
                     try {
-                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readOnlyMethod, permission[route.methodName], logKey, logValue, isHtmlMethod));
+                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readOnlyMethod, permission[route.methodName], logKey, logValue, isHtmlMethod, isFileMethod));
                     }
                     catch (ex) {
                         const now = new Date();
@@ -216,9 +219,9 @@ class Controller {
             }
         });
     }
-    async genericMethodWrapper(params, req, next, res, methodName, dbsettings, readonly, permission = true, log = true, logConfig = {}, isHtml) {
+    async genericMethodWrapper(params, req, next, res, methodName, dbsettings, readonly, permission = true, log = true, logConfig = {}, isHtml, isFile) {
         if (dbsettings === 'Orm') {
-            await index_1.__(this.ormMethodWrapper(params, req, next, res, methodName, readonly, permission, log, logConfig, isHtml));
+            await index_1.__(this.ormMethodWrapper(params, req, next, res, methodName, readonly, permission, log, logConfig, isHtml, isFile));
         }
         else if (dbsettings === 'Procedure') {
             await index_1.__(this.procedureMethodWrapper(params, next, res, methodName, readonly, permission, log, logConfig));
@@ -227,7 +230,7 @@ class Controller {
             await this.sqlMethodWrapper(params, next, res, methodName, readonly, permission, log, logConfig);
         }
     }
-    async ormMethodWrapper(params, req, next, res, methodName, readonly, permission = true, log = true, logConfig = {}, isHtml = false) {
+    async ormMethodWrapper(params, req, next, res, methodName, readonly, permission = true, log = true, logConfig = {}, isHtml = false, isFile = false) {
         let metResponse;
         if (permission) {
             if (this.user && this.user.roles && this.user.roles.length === 0) {
@@ -274,9 +277,14 @@ class Controller {
             xlsx_1.makeXlsx(req, res);
         }
         else {
-            if (isHtml) {
+            if (isHtml && !isFile) {
                 res.send(metResponse);
             }
+            else if (isFile && !isHtml) {
+                if (typeof metResponse === "string") {
+                    res.sendFile(metResponse);
+                }
+            }
             else {
                 res.json(metResponse);
             }
@@ -301,6 +309,9 @@ class Controller {
             }
             return t;
         }, {});
+        if (params.fetchOptions) {
+            ownColumnsForSchema = Object.assign(Object.assign({}, ownColumnsForSchema), { fetchOptions: joi_1.default.any() });
+        }
         const schema = this.getListSchema(ownColumnsForSchema);
         const resParams = await index_1.__(this.schemaValidate(schema, params));
         const listParam = this.getListParams(resParams, whereOwnColumns);
@@ -360,14 +371,10 @@ class Controller {
                 whereGenericFilter.push(Object.assign({ [field]: typeorm_1.Like('%' + params.genericFilterValue + '%') }, where));
             });
         }
-        const res = {
-            where: whereGenericFilter.length > 0 ? whereGenericFilter : [where],
-            skip: params.start,
-            take: params.limit,
-            order: {
+        const fetchOptions = params.fetchOptions ? JSON.parse(params.fetchOptions) : {};
+        const res = Object.assign({ where: whereGenericFilter.length > 0 ? whereGenericFilter : [where], skip: params.start, take: params.limit, order: {
                 [params.sort]: String(params.dir).toUpperCase()
-            }
-        };
+            } }, fetchOptions);
         // ffp search if in this request is sending the id
         return res;
     }

package/dist/lib/pxp/Decorators.d.ts

@@ -4,6 +4,7 @@ export declare interface ILog {
 export declare interface IOptionsRoute {
     readOnly?: boolean;
     isHtml?: boolean;
+    isFile?: boolean;
     dbSettings?: 'Procedure' | 'Orm' | 'Query';
     authentication?: boolean;
     log?: boolean | ILog;
@@ -19,7 +20,8 @@ declare const StoredProcedure: (storedProcedure: string) => ClassDecorator;
 declare const Authentication: (authentication?: boolean) => (target: any, propertyKey: string) => void;
 declare const ReadOnly: (ronly?: boolean) => (target: any, propertyKey: string) => void;
 declare const IsHtml: (ishtml?: boolean) => (target: any, propertyKey: string) => void;
+declare const IsFile: (isFile?: boolean) => (target: any, propertyKey: string) => void;
 declare const DbSettings: (modelType: 'Procedure' | 'Orm' | 'Query') => (target: any, propertyKey: string) => void;
 declare const Permission: (permission?: boolean) => (target: any, propertyKey: string) => void;
 declare const Log: (log?: boolean, config?: Record<string, unknown>) => (target: any, propertyKey: string) => void;
-export { Get, Post, Put, Delete, Patch, Route, Authentication, Log, Permission, DbSettings, ReadOnly, IsHtml, Model, StoredProcedure };
+export { Get, Post, Put, Delete, Patch, Route, Authentication, Log, Permission, DbSettings, ReadOnly, IsHtml, IsFile, Model, StoredProcedure };

package/dist/lib/pxp/Decorators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StoredProcedure = exports.Model = exports.IsHtml = exports.ReadOnly = exports.DbSettings = exports.Permission = exports.Log = exports.Authentication = exports.Route = exports.Patch = exports.Delete = exports.Put = exports.Post = exports.Get = void 0;
+exports.StoredProcedure = exports.Model = exports.IsFile = exports.IsHtml = exports.ReadOnly = exports.DbSettings = exports.Permission = exports.Log = exports.Authentication = exports.Route = exports.Patch = exports.Delete = exports.Put = exports.Post = exports.Get = void 0;
 /**
  * Kplian Ltda 2020
  *
@@ -34,6 +34,7 @@ const createOptions = (options) => (target, propertyKey) => {
     options = Object.assign({
         readOnly: true,
         isHtml: false,
+        isFile: false,
         dbSettings: 'Orm',
         authentication: true,
         log: true
@@ -103,6 +104,8 @@ const ReadOnly = (ronly = true) => (target, propertyKey) => setProperty(target,
 exports.ReadOnly = ReadOnly;
 const IsHtml = (ishtml = false) => (target, propertyKey) => setProperty(target, propertyKey)(ishtml, 'ishtml');
 exports.IsHtml = IsHtml;
+const IsFile = (isFile = false) => (target, propertyKey) => setProperty(target, propertyKey)(isFile, 'isfile');
+exports.IsFile = IsFile;
 const DbSettings = (modelType) => (target, propertyKey) => setProperty(target, propertyKey)(modelType, 'dbsettings');
 exports.DbSettings = DbSettings;
 const Permission = (permission = true) => (target, propertyKey) => setProperty(target, propertyKey)(permission, 'permission');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pxp-nd/core",
-  "version": "1.2.80",
+  "version": "1.2.81",
   "description": "Contains main files for pxp-nd",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",