@things-factory/shell 5.0.0-alpha.5 → 5.0.0-alpha.50

package/dist-server/utils/where-clause-builder.js

@@ -0,0 +1,159 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildWhereClause = void 0;
+function getClause(selectQueryBuilder, columnMeta, operator, field, pname) {
+    const relation = columnMeta.relationMetadata;
+    if (!relation) {
+        switch (operator) {
+            case 'like':
+                return `${field} LIKE :${pname}`;
+            case 'search':
+            case 'i_like':
+                return `LOWER(${field}) LIKE :${pname}`;
+            case 'nlike':
+                return `${field} NOT LIKE :${pname}`;
+            case 'i_nlike':
+                return `LOWER(${field}) NOT LIKE :${pname}`;
+        }
+    }
+    const inverseEntityMetadata = relation.inverseEntityMetadata;
+    const { target, tableName, ownColumns } = inverseEntityMetadata;
+    var subquery = selectQueryBuilder.subQuery().select('id').from(target, tableName);
+    switch (operator) {
+        case 'like':
+            subquery = subquery.where(`${tableName}.name LIKE :${pname}`);
+            break;
+        case 'search':
+        case 'i_like':
+            subquery = subquery.where(`LOWER(${tableName}.name) LIKE :${pname}`);
+            break;
+        case 'nlike':
+            subquery = subquery.where(`${tableName}.name NOT LIKE :${pname}`);
+            break;
+        case 'i_nlike':
+            subquery = subquery.where(`LOWER(${tableName}.name) NOT LIKE :${pname}`);
+            break;
+    }
+    if (ownColumns.find(column => column.propertyName === 'domain')) {
+        subquery.andWhere(`${tableName}.domain_id = :domain`);
+    }
+    return `${field} IN ${subquery.getQuery()}`;
+}
+const buildWhereClause = function (options) {
+    const { alias, columnMeta, operator, value, seq, selectQueryBuilder, domain } = options;
+    const values = value instanceof Array ? value : [value];
+    const { propertyName: name, propertyAliasName, propertyPath: path, databaseName } = columnMeta;
+    const field = `${alias}.${databaseName}`;
+    const pname = `args${seq}`;
+    switch (operator) {
+        case 'eq':
+            return {
+                clause: `${field} = :${pname}`,
+                parameters: { [pname]: value }
+            };
+        case 'like':
+            return {
+                clause: getClause(selectQueryBuilder, columnMeta, operator, field, pname),
+                parameters: { [pname]: `%${value}%` }
+            };
+        case 'search':
+        case 'i_like':
+            return {
+                clause: getClause(selectQueryBuilder, columnMeta, operator, field, pname),
+                parameters: { [pname]: `%${String(value).toLowerCase()}%` }
+            };
+        case 'nlike':
+            return {
+                clause: getClause(selectQueryBuilder, columnMeta, operator, field, pname),
+                value: { [pname]: `%${value}%` }
+            };
+        case 'i_nlike':
+            return {
+                clause: getClause(selectQueryBuilder, columnMeta, operator, field, pname),
+                value: { [pname]: `%${String(value).toLowerCase()}%` }
+            };
+        case 'lt':
+            return {
+                clause: `${field} < :${pname}`,
+                parameters: { [pname]: value }
+            };
+        case 'gt':
+            return {
+                clause: `${field} > :${pname}`,
+                parameters: { [pname]: value }
+            };
+        case 'lte':
+            return {
+                clause: `${field} <= :${pname}`,
+                parameters: { [pname]: value }
+            };
+        case 'gte':
+            return {
+                clause: `${field} >= :${pname}`,
+                parameters: { [pname]: value }
+            };
+        case 'noteq':
+            return {
+                clause: `${field} != :${pname}`,
+                parameters: { [pname]: value }
+            };
+        case 'in':
+            return {
+                clause: `${field} IN (:...${pname})`,
+                parameters: { [pname]: values }
+            };
+        case 'notin':
+            return {
+                clause: `${field} NOT IN (:...${pname})`,
+                parameters: { [pname]: values }
+            };
+        case 'notin_with_null':
+            return {
+                clause: `${field} IS NULL OR ${field} NOT IN (:...${pname}))`,
+                parameters: { [pname]: values }
+            };
+        case 'is_null':
+            return {
+                clause: `${field} IS NULL`
+            };
+        case 'is_not_null':
+            return {
+                clause: `${field} IS NOT NULL`
+            };
+        case 'is_false':
+            return {
+                clause: `${field} IS FALSE`
+            };
+        case 'is_true':
+            return {
+                clause: `${field} IS TRUE`
+            };
+        case 'is_not_false':
+            return {
+                clause: `${field} IS NOT FALSE`
+            };
+        case 'is_not_true':
+            return {
+                clause: `${field} IS NOT TRUE`
+            };
+        case 'is_present':
+            return {
+                clause: `${field} IS PRESENT`
+            };
+        case 'is_blank':
+            return {
+                clause: `${field} IS BLANK`
+            };
+        case 'is_empty_num_id':
+            return {
+                clause: `${field} IS EMPTY NUMERIC ID`
+            };
+        case 'between':
+            return {
+                clause: `${field} BETWEEN  :${pname}_1 AND :${pname}_2`,
+                parameters: { [`args${seq}_1`]: values[0], [`args${seq}_2`]: values[1] }
+            };
+    }
+};
+exports.buildWhereClause = buildWhereClause;
+//# sourceMappingURL=where-clause-builder.js.map

package/dist-server/utils/where-clause-builder.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"where-clause-builder.js","sourceRoot":"","sources":["../../server/utils/where-clause-builder.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "5.0.0-alpha.5",
+  "version": "5.0.0-alpha.50",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -31,12 +31,12 @@
     "test": "NODE_ENV=test jest"
   },
   "dependencies": {
-    "@apollo/client": "^3.5.6",
-    "@graphql-tools/merge": "^7.0.0",
-    "@graphql-tools/schema": "^8.2.0",
-    "@graphql-tools/utils": "^8.3.0",
+    "@apollo/client": "^3.5.10",
+    "@graphql-tools/merge": "^8.2.3",
+    "@graphql-tools/schema": "^8.3.2",
+    "@graphql-tools/utils": "^8.6.2",
     "@hatiolab/koa-webpack": "^6.0.0",
-    "@hatiolab/things-scene": "^2.7.34",
+    "@hatiolab/things-scene": "^3.0.12",
     "@koa/cors": "^3.1.0",
     "@material/mwc-button": "^0.25.3",
     "@material/mwc-fab": "^0.25.3",
@@ -44,26 +44,26 @@
     "@material/mwc-icon-button": "^0.25.3",
     "@material/mwc-slider": "^0.25.3",
     "@material/mwc-textfield": "^0.25.3",
-    "@operato/board": "1.0.0-alpha.4",
-    "@operato/graphql": "1.0.0-alpha.4",
-    "@operato/help": "1.0.0-alpha.4",
-    "@operato/layout": "1.0.0-alpha.4",
-    "@operato/shell": "1.0.0-alpha.4",
-    "@operato/utils": "1.0.0-alpha.4",
-    "@things-factory/ejs-remote": "^5.0.0-alpha.5",
-    "@things-factory/env": "^5.0.0-alpha.5",
-    "@things-factory/styles": "^5.0.0-alpha.5",
-    "@things-factory/utils": "^5.0.0-alpha.5",
+    "@operato/board": "1.0.0-beta.20",
+    "@operato/graphql": "1.0.0-beta.20",
+    "@operato/help": "1.0.0-beta.20",
+    "@operato/layout": "1.0.0-beta.20",
+    "@operato/shell": "1.0.0-beta.20",
+    "@operato/utils": "1.0.0-beta.20",
+    "@things-factory/ejs-remote": "^5.0.0-alpha.50",
+    "@things-factory/env": "^5.0.0-alpha.50",
+    "@things-factory/styles": "^5.0.0-alpha.50",
+    "@things-factory/utils": "^5.0.0-alpha.50",
     "@webcomponents/webcomponentsjs": "^2.6.0",
     "@webpack-contrib/schema-utils": "^1.0.0-beta.0",
-    "apollo-server-core": "^3.5.0",
-    "apollo-server-koa": "^3.5.0",
-    "apollo-server-types": "^3.4.0",
+    "apollo-server-core": "^3.6.4",
+    "apollo-server-koa": "^3.6.4",
+    "apollo-server-types": "^3.5.1",
     "apollo-upload-client": "^17.0.0",
     "args": "^5.0.0",
     "broadcastchannel-polyfill": "^1.0.1",
     "chalk": "^4.1.0",
-    "class-validator": "^0.12.2",
+    "class-validator": "^0.13.2",
     "core-js": "^3.16.0",
     "csvtojson": "^2.0.10",
     "debug": "^4.1.1",
@@ -75,9 +75,9 @@
     "graphql-redis-subscriptions": "^2.4.2",
     "graphql-subscriptions": "^2.0.0",
     "graphql-tag": "^2.12.6",
-    "graphql-upload": "^12.0.0",
+    "graphql-upload": "^13.0.0",
     "haunted": "^4.8.2",
-    "html-webpack-plugin": "^4.3.0",
+    "html-webpack-plugin": "^5.5.0",
     "husky": "7.0.1",
     "imports-loader": "^3.0.0",
     "inquirer": "^8.2.0",
@@ -92,14 +92,13 @@
     "koa-static": "^5.0.0",
     "koa-unless": "^1.0.7",
     "koa2-connect-history-api-fallback": "^0.1.2",
-    "lit": "^2.2.0",
+    "lit": "^2.2.1",
     "loader-utils": "^2.0.0",
     "lodash": "^4.17.15",
     "lodash-es": "^4.17.15",
     "mkdirp": "^1.0.3",
     "mqtt": "^4.3.4",
     "node-fetch": "^2.6.0",
-    "node-sass": "^6.0.1",
     "nodemon": "^2.0.2",
     "npm-license-crawler": "^0.2.1",
     "pluralize": "^8.0.0",
@@ -109,6 +108,7 @@
     "redux-thunk": "^2.3.0",
     "regenerator-runtime": "^0.13.2",
     "reselect": "^4.0.0",
+    "sass": "^1.50.1",
     "scrollbooster": "^3.0.2",
     "subscriptions-transport-ws": "^0.11.0",
     "sweetalert2": "^10.9.0",
@@ -129,5 +129,5 @@
   "resolutions": {
     "core-js": "^3.16.0"
   },
-  "gitHead": "379449b7be7b3d8220f1cac9ab684b812117edfd"
+  "gitHead": "ba819c6d9ddf60319283f620b80c9737e7486a91"
 }

package/server/middlewares/index.ts

@@ -1,4 +1,5 @@
 import { config, logger } from '@things-factory/env'
+
 import { domainMiddleware } from './domain-middleware'
 
 const debug = require('debug')('things-factory:shell:middleware')
@@ -18,8 +19,8 @@ export function initMiddlewares(app) {
     try {
       await next()
     } catch (err) {
-      context.status = err.status || 500
-      context.body = err.message
+      context.status = err?.status || 500
+      context.body = err?.message
 
       // emitting error to app.on('error', ...)
       context.app.emit('error', err, context)

package/server/pubsub.ts

@@ -4,7 +4,7 @@ import { PubSub } from 'graphql-subscriptions'
 import Redis from 'ioredis'
 import { connect } from 'mqtt'
 
-import { config } from '@things-factory/env'
+import { config, logger } from '@things-factory/env'
 
 const { middleware, host, port, nodes, topic, options } = config.get('pubsub', {})
 
@@ -56,7 +56,7 @@ switch (middleware) {
         ...options
       })
     } catch (e) {
-      console.error('graphql-kafka-subscriptions module is not installed, so application can not go further.')
+      logger.error('graphql-kafka-subscriptions module is not installed, so application can not go further.')
       throw e
     }
     break
@@ -73,7 +73,7 @@ const exitHandler = async evt => {
     try {
       await pubsub.close()
     } catch (err) {
-      console.error(err)
+      logger.error(err)
     }
   }
 }

package/server/server-dev.ts

@@ -1,33 +1,36 @@
+/* following lines should be located in top of the file */
 // @prettier-ignore
 process.env.NODE_ENV = 'development'
 process.setMaxListeners(0)
-/** Never move following lines */
 
-import { ConnectionContext, SubscriptionServer } from 'subscriptions-transport-ws'
-import { config, loader, logger, orderedModuleNames } from '@things-factory/env'
-import { domainPrivateRouter, domainPublicRouter, globalPrivateRouter, globalPublicRouter } from './routers'
-import { execute, subscribe } from 'graphql'
-
-import { ApolloServer } from 'apollo-server-koa'
+/* following lines should be located in top of the file */
 import { ApolloServerPluginLandingPageGraphQLPlayground } from 'apollo-server-core'
-import { GraphqlLocalClient } from './graphql-local-client'
-import Koa from 'koa'
+import { ApolloServer } from 'apollo-server-koa'
+import bytesFormat from 'bytes'
 import co from 'co'
-import compose from 'koa-compose'
-import cors from '@koa/cors'
-import { createServer } from 'http'
-import { databaseInitializer } from './initializers/database'
+import { execute, subscribe } from 'graphql'
 import { graphqlUploadKoa } from 'graphql-upload'
-import { historyApiFallback } from 'koa2-connect-history-api-fallback'
-import ip from 'koa-ip'
+import { createServer } from 'http'
+import Koa from 'koa'
 import koaBodyParser from 'koa-bodyparser'
+import compose from 'koa-compose'
+import ip from 'koa-ip'
 import koaStatic from 'koa-static'
+import { historyApiFallback } from 'koa2-connect-history-api-fallback'
+/** Never move following lines */
+import { ConnectionContext, SubscriptionServer } from 'subscriptions-transport-ws'
+
 import koaWebpack from '@hatiolab/koa-webpack'
+import cors from '@koa/cors'
+import { config, loader, logger, orderedModuleNames } from '@things-factory/env'
+
+import { GraphqlLocalClient } from './graphql-local-client'
+import { databaseInitializer } from './initializers/database'
+import { domainPrivateRouter, domainPublicRouter, globalPrivateRouter, globalPublicRouter } from './routers'
 import { schema } from './schema'
-import bytesFormat from 'bytes'
 
 process.on('uncaughtException', error => {
-  console.error(error)
+  logger.error(error)
 
   process.exit(1)
 })

package/server/server.ts

@@ -1,29 +1,31 @@
+// @prettier-ignore
 process.env.NODE_ENV = 'production'
 process.setMaxListeners(0)
 
-import { ConnectionContext, SubscriptionServer } from 'subscriptions-transport-ws'
-import { config, loader, logger, orderedModuleNames } from '@things-factory/env'
-import { domainPrivateRouter, domainPublicRouter, globalPrivateRouter, globalPublicRouter } from './routers'
-import { execute, subscribe } from 'graphql'
-
 import { ApolloServer } from 'apollo-server-koa'
-import { GraphqlLocalClient } from './graphql-local-client'
-import Koa from 'koa'
+import bytesFormat from 'bytes'
 import co from 'co'
-import compose from 'koa-compose'
-import cors from '@koa/cors'
-import { createServer } from 'http'
-import { databaseInitializer } from './initializers/database'
+import { execute, subscribe } from 'graphql'
 import { graphqlUploadKoa } from 'graphql-upload'
-import { historyApiFallback } from 'koa2-connect-history-api-fallback'
-import ip from 'koa-ip'
+import { createServer } from 'http'
+import Koa from 'koa'
 import koaBodyParser from 'koa-bodyparser'
+import compose from 'koa-compose'
+import ip from 'koa-ip'
 import koaStatic from 'koa-static'
+import { historyApiFallback } from 'koa2-connect-history-api-fallback'
+import { ConnectionContext, SubscriptionServer } from 'subscriptions-transport-ws'
+
+import cors from '@koa/cors'
+import { config, loader, logger, orderedModuleNames } from '@things-factory/env'
+
+import { GraphqlLocalClient } from './graphql-local-client'
+import { databaseInitializer } from './initializers/database'
+import { domainPrivateRouter, domainPublicRouter, globalPrivateRouter, globalPublicRouter } from './routers'
 import { schema } from './schema'
-import bytesFormat from 'bytes'
 
 process.on('uncaughtException', error => {
-  console.error(error)
+  logger.error(error)
 
   process.exit(1)
 })

package/server/service/domain/domain.ts

@@ -1,12 +1,47 @@
-import { Column, CreateDateColumn, Entity, Index, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
+import { Column, CreateDateColumn, Entity, Index, UpdateDateColumn } from 'typeorm'
 import { ObjectType, Field, ID } from 'type-graphql'
+import { config } from '@things-factory/env'
+
+const numericTypes = ["int","int2","int4","int8","integer","tinyint","smallint","mediumint","bigint"]
+const generatedStrategy = ['uuid','rowid',"increment","identity"]
+const domainPrimaryOption =config.get('domainPrimaryOption')
+const domainPrimaryType = domainPrimaryOption?.type
+const domainPrimaryStrategy = domainPrimaryOption?.strategy
 
 @Entity()
 @Index('ix_domain_0', (domain: Domain) => [domain.subdomain], { unique: true })
 @ObjectType()
 export class Domain {
   @Field(type => ID)
-  @PrimaryGeneratedColumn('uuid')
+  @Column(
+    domainPrimaryOption?
+    {
+      type: domainPrimaryType,
+      primary:true,
+      transformer: {
+        //from(value: DatabaseType): EntityType
+        from: (value) => {
+          return value
+        },
+        //to(value: EntityType): DatabaseType
+        to: (value) => {
+          if(!value){
+            value = 0
+          }
+          if(numericTypes.indexOf(domainPrimaryType)>=0){
+            return parseInt(value)
+          }else{
+            return value
+          }
+        }
+      },
+      generated:generatedStrategy.indexOf(domainPrimaryStrategy)>=0?domainPrimaryStrategy:false
+    }:{
+      type: 'uuid',
+      primary:true,
+      generated:'uuid'
+    }
+  )
   readonly id: string
 
   @Field()

package/server/utils/condition-builder.ts

@@ -5,12 +5,13 @@ export const buildCondition = function (
   fieldName: string,
   operator: string,
   value: any,
-  relation: boolean,
+  relation: boolean | string,
   seq: number
 ) {
   seq++
 
   fieldName = _.snakeCase(fieldName)
+  const values = value instanceof Array ? value : [value]
 
   switch (operator) {
     case 'eq':
@@ -75,24 +76,23 @@ export const buildCondition = function (
       }
 
     case 'in':
-      const clause = relation ? `${fieldName}.id IN (:...args${seq})` : `${alias}.${fieldName} IN (:...args${seq})`
-      value = value?.length ? value : [value]
       return {
-        clause,
-        parameters: { [`args${seq}`]: value }
+        clause: relation ? `${fieldName}.id IN (:...args${seq})` : `${alias}.${fieldName} IN (:...args${seq})`,
+        parameters: { [`args${seq}`]: values }
       }
+
     case 'notin':
-      value = value?.length ? value : [value]
       return {
-        clause: `${alias}.${fieldName} NOT IN (:...args${seq})`,
-        parameters: { [`args${seq}`]: value }
+        clause: relation ? `${fieldName}.id NOT IN (:...args${seq})` : `${alias}.${fieldName} NOT IN (:...args${seq})`,
+        parameters: { [`args${seq}`]: values }
       }
 
     case 'notin_with_null':
-      value = value?.length ? value : [value]
       return {
-        clause: `(${alias}.${fieldName} IS NULL OR ${alias}.${fieldName} NOT IN (:...args${seq}))`,
-        parameters: { [`args${seq}`]: value }
+        clause: relation
+          ? `(${fieldName}.id IS NULL OR ${fieldName}.id  NOT IN (:...args${seq})`
+          : `${alias}.${fieldName} IS NULL OR ${alias}.${fieldName} NOT IN (:...args${seq}))`,
+        parameters: { [`args${seq}`]: values }
       }
 
     case 'is_null':
@@ -135,7 +135,7 @@ export const buildCondition = function (
     case 'between':
       return {
         clause: `${alias}.${fieldName} BETWEEN  :args${seq}_1 AND :args${seq}_2`,
-        parameters: { [`args${seq}_1`]: value[0], [`args${seq}_2`]: value[1] }
+        parameters: { [`args${seq}_1`]: values[0], [`args${seq}_2`]: values[1] }
       }
   }
 }

package/server/utils/list-params-converter.ts

@@ -1,8 +1,8 @@
-import { Between, Equal, ILike, In, IsNull, Like, Not, Raw } from 'typeorm'
+import { Between, Equal, FindOperator, ILike, In, IsNull, Like, Not, Raw } from 'typeorm'
 
-import { ListParam } from '../service/common-types'
+import { Filter, ListParam, Pagination, Sorting } from '../service/common-types'
 
-const OPERATION_FUNCTION_MAP = {
+const OPERATION_FUNCTION_MAP: { [operator: string]: (value: any) => FindOperator<any> } = {
   search: value => ILike(value),
   eq: value => Equal(value),
   noteq: value => Not(Equal(value)),
@@ -27,12 +27,12 @@ const OPERATION_FUNCTION_MAP = {
   between: value => Between(value[0], value[1])
 }
 
-function getOperatorFunction({ operator, name, value, dataType }) {
+function getOperatorFunction({ operator, value }: { operator: string; value: any }): FindOperator<any> {
   return OPERATION_FUNCTION_MAP[operator](value)
 }
 
-function makePaginationParams(pagination) {
-  var jsonParams = {}
+function makePaginationParams(pagination: Pagination): { skip?: number; take?: number } {
+  var result = {} as { skip?: number; take?: number }
   if (pagination) {
     var { page = 0, limit = 0 } = pagination
     var skip = 0
@@ -41,39 +41,41 @@ function makePaginationParams(pagination) {
     if (limit > 0) {
       skip = Math.max(page - 1, 0) * limit
       take = limit
-      Object.assign(jsonParams, {
+      Object.assign(result, {
         skip,
         take
       })
     }
   }
 
-  return jsonParams
+  return result
 }
 
-function makeSortingParams(sortings) {
-  var jsonParams = {}
+function makeSortingParams(sortings: Sorting[]): { order?: { [name: string]: 'DESC' | 'ASC' } } {
+  var result = {} as { order?: { [name: string]: 'DESC' | 'ASC' } }
   if (sortings) {
-    var order = {}
+    var order = {} as { [name: string]: 'DESC' | 'ASC' }
     sortings.forEach(s => {
       order[s.name] = s.desc ? 'DESC' : 'ASC'
     })
 
-    Object.assign(jsonParams, {
+    Object.assign(result, {
       order
     })
   }
 
-  return jsonParams
+  return result
 }
 
-function makeFilterParams(filters) {
+function makeFilterParams(filters: Filter[]): {
+  where: { [name: string]: FindOperator<any> } | { [name: string]: FindOperator<any> }[]
+} {
   /* for where AND clauses */
   const columnFilters = filters.filter(filter => filter.operator !== 'search')
   const columnWhere = columnFilters.reduce((where, f) => {
     where[f.name] = getOperatorFunction(f)
     return where
-  }, {})
+  }, {} as { [name: string]: FindOperator<any> })
 
   const searchFilters = filters.filter(filter => filter.operator === 'search')
   if (searchFilters.length === 0) {
@@ -95,9 +97,19 @@ function makeFilterParams(filters) {
   }
 }
 
-export function convertListParams(params: typeof ListParam, domain?: String) {
-  var { pagination, filters = [], sortings } = params as any
-  var jsonParams = {}
+export function convertListParams(
+  params: ListParam,
+  domain?: String
+): {
+  where?: { [name: string]: FindOperator<any> }
+  order?: {
+    [name: string]: 'DESC' | 'ASC'
+  }
+  skip?: number
+  take?: number
+} {
+  var { pagination, filters = [], sortings } = params
+  var result = {}
 
   if (domain) {
     filters.push({
@@ -107,9 +119,9 @@ export function convertListParams(params: typeof ListParam, domain?: String) {
     })
   }
 
-  if (pagination) Object.assign(jsonParams, makePaginationParams(pagination))
-  if (sortings) Object.assign(jsonParams, makeSortingParams(sortings))
-  if (filters) Object.assign(jsonParams, makeFilterParams(filters))
+  if (pagination) Object.assign(result, makePaginationParams(pagination))
+  if (sortings) Object.assign(result, makeSortingParams(sortings))
+  if (filters) Object.assign(result, makeFilterParams(filters))
 
-  return jsonParams
+  return result
 }