@things-factory/product-base 6.2.115 → 6.2.120
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/product-base",
|
|
3
|
-
"version": "6.2.
|
|
3
|
+
"version": "6.2.120",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,9 +24,9 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/biz-base": "^6.2.
|
|
27
|
+
"@things-factory/biz-base": "^6.2.120",
|
|
28
28
|
"@things-factory/env": "^6.2.115",
|
|
29
|
-
"@things-factory/routing-base": "^6.2.
|
|
29
|
+
"@things-factory/routing-base": "^6.2.120"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "6b3b329144401effb7cd8ea0cf1aa4cb5f179dca"
|
|
32
32
|
}
|
|
@@ -3,14 +3,7 @@ import { Brackets, In, SelectQueryBuilder } from 'typeorm'
|
|
|
3
3
|
|
|
4
4
|
import { Attachment } from '@things-factory/attachment-base'
|
|
5
5
|
import { User } from '@things-factory/auth-base'
|
|
6
|
-
import {
|
|
7
|
-
Bizplace,
|
|
8
|
-
getCompaniesBizplaces,
|
|
9
|
-
getCompanyBizplace,
|
|
10
|
-
getMyBizplace,
|
|
11
|
-
getPartnersCompanyBizplaces,
|
|
12
|
-
getPermittedBizplaceIds
|
|
13
|
-
} from '@things-factory/biz-base'
|
|
6
|
+
import { Bizplace, getCompaniesBizplaces, getCompanyBizplace, getMyBizplace, getPartnersCompanyBizplaces, getPermittedBizplaceIds } from '@things-factory/biz-base'
|
|
14
7
|
import { logger } from '@things-factory/env'
|
|
15
8
|
import { buildCondition, Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
|
|
16
9
|
|
|
@@ -113,10 +106,7 @@ export class ProductQuery {
|
|
|
113
106
|
|
|
114
107
|
const qb: SelectQueryBuilder<Product> = buildCustomConditions(params, context, bizplaces)
|
|
115
108
|
|
|
116
|
-
let [items, total] = await qb
|
|
117
|
-
.leftJoinAndSelect('Product.productDetails', 'ProductDetails')
|
|
118
|
-
.leftJoinAndSelect('Product.routing', 'Routing')
|
|
119
|
-
.getManyAndCount()
|
|
109
|
+
let [items, total] = await qb.leftJoinAndSelect('Product.productDetails', 'ProductDetails').leftJoinAndSelect('Product.routing', 'Routing').getManyAndCount()
|
|
120
110
|
|
|
121
111
|
items = items.map(itm => {
|
|
122
112
|
let defaultProductDetail = itm.productDetails.find(itm => itm.isDefault)
|
|
@@ -301,7 +291,7 @@ function buildCustomConditions(params, context, bizplaces): SelectQueryBuilder<P
|
|
|
301
291
|
alias: 'Product',
|
|
302
292
|
params,
|
|
303
293
|
domain: context.domain,
|
|
304
|
-
searchables: ['sku', 'name']
|
|
294
|
+
searchables: ['sku', 'name', 'description']
|
|
305
295
|
})
|
|
306
296
|
|
|
307
297
|
if (productFilters) {
|