@pxp-nd/core 1.2.77 → 1.2.79

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

@@ -36,12 +36,13 @@ 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?: {}): Promise<void>;
-    ormMethodWrapper(params: Record<string, unknown>, req: Request | any, next: NextFunction, res: Response, methodName: string, readonly: boolean, permission?: boolean, log?: boolean, logConfig?: {}): 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): 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>;
     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>;
     delete(params: Record<string, unknown>, manager: EntityManager): Promise<unknown>;
+    getWhereOwnColumns(params: Record<string, unknown>, model: any): Record<any, any>;
     getListParams(params: Record<string, unknown>, where: Record<string, unknown>): ListParam;
     procedureMethodWrapper(params: Record<string, unknown>, next: NextFunction, res: Response, methodName: string, readonly: boolean, permission?: boolean, log?: boolean, logConfig?: {}): Promise<void>;
     sqlMethodWrapper(params: Record<string, unknown>, next: NextFunction, res: Response, methodName: string, readonly: boolean, permission?: boolean, log?: boolean, logConfig?: {}): Promise<void>;

package/dist/lib/pxp/Controller.js

@@ -125,6 +125,8 @@ class Controller {
         const dbsettings = Reflect.getMetadata('dbsettings', this.constructor) || {};
         // get logConfig
         const logConfig = Reflect.getMetadata('logConfig', this.constructor) || {};
+        // get type return
+        let ishtml = Reflect.getMetadata('ishtml', this.constructor) || {};
         const defaultConfig = Reflect.getMetadata('optionsRoute', this.constructor) || {};
         // define basic routes
         if (this.modelString !== '') {
@@ -139,6 +141,8 @@ class Controller {
             const logMethod = log[route.methodName] !== undefined ? log[route.methodName] : (defaultConfig[route.methodName] ? defaultConfig[route.methodName].log : true);
             const logValue = typeof logMethod == 'object' ? logMethod : logConfig[route.methodName];
             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);
             if (readOnlyMethod === null || readOnlyMethod === undefined) {
                 throw new index_1.PxpError(500, 'ReadOnly decorator was not defined for ' +
                     route.methodName +
@@ -164,7 +168,7 @@ class Controller {
                         .toLowerCase();
                     this.validated = false;
                     try {
-                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readOnlyMethod, false, logKey, logValue));
+                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readOnlyMethod, false, logKey, logValue, isHtmlMethod));
                     }
                     catch (ex) {
                         const now = new Date();
@@ -198,7 +202,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));
+                        await index_1.__(this.genericMethodWrapper(params, req, next, res, route.methodName, methodDbSettings, readOnlyMethod, permission[route.methodName], logKey, logValue, isHtmlMethod));
                     }
                     catch (ex) {
                         const now = new Date();
@@ -212,9 +216,9 @@ class Controller {
             }
         });
     }
-    async genericMethodWrapper(params, req, next, res, methodName, dbsettings, readonly, permission = true, log = true, logConfig = {}) {
+    async genericMethodWrapper(params, req, next, res, methodName, dbsettings, readonly, permission = true, log = true, logConfig = {}, isHtml) {
         if (dbsettings === 'Orm') {
-            await index_1.__(this.ormMethodWrapper(params, req, next, res, methodName, readonly, permission, log, logConfig));
+            await index_1.__(this.ormMethodWrapper(params, req, next, res, methodName, readonly, permission, log, logConfig, isHtml));
         }
         else if (dbsettings === 'Procedure') {
             await index_1.__(this.procedureMethodWrapper(params, next, res, methodName, readonly, permission, log, logConfig));
@@ -223,7 +227,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 = {}) {
+    async ormMethodWrapper(params, req, next, res, methodName, readonly, permission = true, log = true, logConfig = {}, isHtml = false) {
         let metResponse;
         if (permission) {
             if (this.user && this.user.roles && this.user.roles.length === 0) {
@@ -270,7 +274,12 @@ class Controller {
             xlsx_1.makeXlsx(req, res);
         }
         else {
-            res.json(metResponse);
+            if (isHtml) {
+                res.send(metResponse);
+            }
+            else {
+                res.json(metResponse);
+            }
         }
     }
     async list(params) {
@@ -327,6 +336,21 @@ class Controller {
         await manager.remove(modelInstance);
         return modelInstance;
     }
+    getWhereOwnColumns(params, model) {
+        const connection = typeorm_1.getConnection(process.env.DB_WRITE_CONNECTION_NAME);
+        let ownColumnsForSchema = {};
+        const whereOwnColumns = connection.getMetadata(model).ownColumns.reduce((t, column) => {
+            if (`_${column.propertyName}` in params) {
+                ownColumnsForSchema = Object.assign(Object.assign({}, ownColumnsForSchema), { [`_${column.propertyName}`]: joi_1.default.string() });
+                t = Object.assign(Object.assign({}, t), { [column.propertyName]: params[`_${column.propertyName}`] });
+            }
+            return t;
+        }, {});
+        return {
+            whereOwnColumns,
+            ownColumnsForSchema,
+        };
+    }
     getListParams(params, where) {
         const whereGenericFilter = [];
         if (params.genericFilterFields) {

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

@@ -3,6 +3,7 @@ export declare interface ILog {
 }
 export declare interface IOptionsRoute {
     readOnly?: boolean;
+    isHtml?: boolean;
     dbSettings?: 'Procedure' | 'Orm' | 'Query';
     authentication?: boolean;
     log?: boolean | ILog;
@@ -17,7 +18,8 @@ declare const Model: (model: string) => ClassDecorator;
 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 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, Model, StoredProcedure };
+export { Get, Post, Put, Delete, Patch, Route, Authentication, Log, Permission, DbSettings, ReadOnly, IsHtml, 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.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.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
  *
@@ -33,6 +33,7 @@ const setProperty = (target, propertyKey) => (value, name, overwrite = true) =>
 const createOptions = (options) => (target, propertyKey) => {
     options = Object.assign({
         readOnly: true,
+        isHtml: false,
         dbSettings: 'Orm',
         authentication: true,
         log: true
@@ -100,6 +101,8 @@ const Authentication = (authentication = true) => (target, propertyKey) => setPr
 exports.Authentication = Authentication;
 const ReadOnly = (ronly = true) => (target, propertyKey) => setProperty(target, propertyKey)(ronly, 'readonly');
 exports.ReadOnly = ReadOnly;
+const IsHtml = (ishtml = false) => (target, propertyKey) => setProperty(target, propertyKey)(ishtml, 'ishtml');
+exports.IsHtml = IsHtml;
 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.77",
+  "version": "1.2.79",
   "description": "Contains main files for pxp-nd",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",