@elsikora/nestjs-crud-automator 1.10.1 → 1.10.2-dev.1
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/dist/cjs/utility/api/controller/get-list/transform-filter.utility.js +1 -2
- package/dist/cjs/utility/api/controller/get-list/transform-filter.utility.js.map +1 -1
- package/dist/cjs/utility/api/filter-order-by-from-entity.utility.js +2 -2
- package/dist/cjs/utility/api/filter-order-by-from-entity.utility.js.map +1 -1
- package/dist/cjs/utility/dto/generate-filter-decorator.utility.js +0 -2
- package/dist/cjs/utility/dto/generate-filter-decorator.utility.js.map +1 -1
- package/dist/esm/utility/api/controller/get-list/transform-filter.utility.js +1 -2
- package/dist/esm/utility/api/controller/get-list/transform-filter.utility.js.map +1 -1
- package/dist/esm/utility/api/filter-order-by-from-entity.utility.js +2 -2
- package/dist/esm/utility/api/filter-order-by-from-entity.utility.js.map +1 -1
- package/dist/esm/utility/dto/generate-filter-decorator.utility.js +0 -2
- package/dist/esm/utility/dto/generate-filter-decorator.utility.js.map +1 -1
- package/package.json +1 -1
|
@@ -43,8 +43,7 @@ function ApiControllerGetListTransformFilter(query, entityMetadata) {
|
|
|
43
43
|
continue;
|
|
44
44
|
const column = entityMetadata.columns.find((column) => column.name == key);
|
|
45
45
|
// @ts-ignore
|
|
46
|
-
|
|
47
|
-
if (column && column.metadata[propertyDescribe_constant.PROPERTY_DESCRIBE_DECORATOR_API_CONSTANT.METADATA_PROPERTY_NAME].type === desribeType_enum.EApiPropertyDescribeType.RELATION) {
|
|
46
|
+
if (column && column.metadata[propertyDescribe_constant.PROPERTY_DESCRIBE_DECORATOR_API_CONSTANT.METADATA_KEY].type === desribeType_enum.EApiPropertyDescribeType.RELATION) {
|
|
48
47
|
// @ts-ignore
|
|
49
48
|
filter[key] = { id: transformOperation_utility.ApiControllerGetListTransformOperation(operation, value) };
|
|
50
49
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-filter.utility.js","sources":["../../../../../../../src/utility/api/controller/get-list/transform-filter.utility.ts"],"sourcesContent":[null],"names":["PROPERTY_DESCRIBE_DECORATOR_API_CONSTANT","EApiPropertyDescribeType","ApiControllerGetListTransformOperation"],"mappings":";;;;;;;;;;;;;;;;;;;;AASA;;;;;;;;AAQG;AACG,SAAU,mCAAmC,CAAI,KAA8B,EAAE,cAA6B,EAAA;IACnH,MAAM,MAAM,GAAwB,EAAE;IAEtC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;AACzC,QAAA,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE;AAE5B,QAAA,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAkB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;AAEtD,QAAA,IAAI,CAAC,KAAK;YAAE;QAEZ,MAAM,UAAU,GAAW,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QAEjD,IAAI,UAAU,KAAK,OAAO,IAAI,UAAU,KAAK,QAAQ,EAAE;YACtD,MAAM,SAAS,GAAqB,KAAK,CAAC,CAAA,EAAG,MAAM,CAAC,GAAG,CAAC,CAAA,UAAA,CAAY,CAAqB;AAEzF,YAAA,MAAM,KAAK,GAAY,KAAK,CAAC,OAAO,CAAC;AAErC,YAAA,IAAI,CAAC,SAAS,IAAI,CAAC,GAAG,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;gBAAE;AAEjE,YAAA,MAAM,MAAM,GAAoC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAA2B,KAAK,MAAM,CAAC,IAAI,IAAI,GAAG,CAAC
|
|
1
|
+
{"version":3,"file":"transform-filter.utility.js","sources":["../../../../../../../src/utility/api/controller/get-list/transform-filter.utility.ts"],"sourcesContent":[null],"names":["PROPERTY_DESCRIBE_DECORATOR_API_CONSTANT","EApiPropertyDescribeType","ApiControllerGetListTransformOperation"],"mappings":";;;;;;;;;;;;;;;;;;;;AASA;;;;;;;;AAQG;AACG,SAAU,mCAAmC,CAAI,KAA8B,EAAE,cAA6B,EAAA;IACnH,MAAM,MAAM,GAAwB,EAAE;IAEtC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;AACzC,QAAA,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE;AAE5B,QAAA,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAkB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;AAEtD,QAAA,IAAI,CAAC,KAAK;YAAE;QAEZ,MAAM,UAAU,GAAW,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QAEjD,IAAI,UAAU,KAAK,OAAO,IAAI,UAAU,KAAK,QAAQ,EAAE;YACtD,MAAM,SAAS,GAAqB,KAAK,CAAC,CAAA,EAAG,MAAM,CAAC,GAAG,CAAC,CAAA,UAAA,CAAY,CAAqB;AAEzF,YAAA,MAAM,KAAK,GAAY,KAAK,CAAC,OAAO,CAAC;AAErC,YAAA,IAAI,CAAC,SAAS,IAAI,CAAC,GAAG,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;gBAAE;AAEjE,YAAA,MAAM,MAAM,GAAoC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAA2B,KAAK,MAAM,CAAC,IAAI,IAAI,GAAG,CAAC;;AAGhI,YAAA,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,CAACA,kEAAwC,CAAC,YAAY,CAAC,CAAC,IAAI,KAAKC,yCAAwB,CAAC,QAAQ,EAAE;;AAEhI,gBAAA,MAAM,CAAC,GAAc,CAAC,GAAG,EAAE,EAAE,EAAEC,iEAAsC,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE;;iBACnF;;gBAEN,MAAM,CAAC,GAAc,CAAC,GAAGA,iEAAsC,CAAC,SAAS,EAAE,KAAK,CAAC;;;;AAKpF,IAAA,OAAO,MAAM;AACd;;;;"}
|
|
@@ -37,8 +37,8 @@ function FilterOrderByFromEntity(entity, entityMetadata, method, dtoType, fieldS
|
|
|
37
37
|
if (isAllowedType) {
|
|
38
38
|
for (const metadataColumn of entityMetadata.columns) {
|
|
39
39
|
const metadata = metadataColumn.metadata?.[propertyDescribe_constant.PROPERTY_DESCRIBE_DECORATOR_API_CONSTANT.METADATA_KEY];
|
|
40
|
-
const useAsFilter = metadata?.properties?.[method]?.[dtoType]?.useAsOrderByFilter
|
|
41
|
-
if (metadataColumn.name == column.propertyName && metadata &&
|
|
40
|
+
const useAsFilter = metadata?.properties?.[method]?.[dtoType]?.useAsOrderByFilter !== false;
|
|
41
|
+
if (metadataColumn.name == column.propertyName && metadata && useAsFilter) {
|
|
42
42
|
const snakeUpperCase = column.propertyName
|
|
43
43
|
// eslint-disable-next-line @elsikora/unicorn/prefer-spread
|
|
44
44
|
.split("")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-order-by-from-entity.utility.js","sources":["../../../../../src/utility/api/filter-order-by-from-entity.utility.ts"],"sourcesContent":[null],"names":["getMetadataArgsStorage","FILTER_API_INTERFACE_CONSTANT","PROPERTY_DESCRIBE_DECORATOR_API_CONSTANT"],"mappings":";;;;;;;;AAeA;;;;;;;;;;;;AAYG;AACG,SAAU,uBAAuB,CAAI,MAAqB,EAAE,cAA6B,EAAE,MAAqB,EAAE,OAAoB,EAAE,aAAmD,EAAA;AAChM,IAAA,MAAM,QAAQ,GAAwBA,8BAAsB,EAAE;AAC9D,IAAA,MAAM,OAAO,GAA8B,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAA0B,KAAK,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IAE3H,IAAI,aAAa,EAAE;AAClB,QAAA,MAAM,YAAY,GAAgB,IAAI,GAAG,CAAS,OAAO,CAAC,GAAG,CAAC,CAAC,GAAuB,KAAK,GAAG,CAAC,YAAY,CAAC,CAAC;AAE7G,QAAA,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE;YAClC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;AAC7B,gBAAA,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,CAAA,+BAAA,CAAiC,CAAC;;;;IAKpE,MAAM,WAAW,GAAqC,EAAE;AAExD,IAAA,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC7B,MAAM,UAAU,GAAmB,MAAM,CAAC,OAAO,EAAE,IAAsB,IAAK,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,SAAmB,EAAE,MAAM,CAAC,YAAY,CAAmB;QAEnL,MAAM,aAAa,GAAY,CAAC,OAAO,UAAU,KAAK,UAAU,KAAK,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,IAAI,CAAC,MAAMC,6CAA6B,CAAC,gCAAgC,CAAC,QAAQ,CAAC,UAAoB,CAAC,KAAK,aAAa,KAAK,SAAS,IAAI,aAAa,CAAC,MAAM,CAAC,YAAmC,CAAC,KAAK,KAAK,CAAC,CAAC;QAEvV,IAAI,aAAa,EAAE;AAClB,YAAA,KAAK,MAAM,cAAc,IAAI,cAAc,CAAC,OAAO,EAAE;gBACpD,MAAM,QAAQ,GAA0H,cAAc,CAAC,QAAQ,GAAGC,kEAAwC,CAAC,YAAY,CAA0H;AAEjV,gBAAA,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"filter-order-by-from-entity.utility.js","sources":["../../../../../src/utility/api/filter-order-by-from-entity.utility.ts"],"sourcesContent":[null],"names":["getMetadataArgsStorage","FILTER_API_INTERFACE_CONSTANT","PROPERTY_DESCRIBE_DECORATOR_API_CONSTANT"],"mappings":";;;;;;;;AAeA;;;;;;;;;;;;AAYG;AACG,SAAU,uBAAuB,CAAI,MAAqB,EAAE,cAA6B,EAAE,MAAqB,EAAE,OAAoB,EAAE,aAAmD,EAAA;AAChM,IAAA,MAAM,QAAQ,GAAwBA,8BAAsB,EAAE;AAC9D,IAAA,MAAM,OAAO,GAA8B,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAA0B,KAAK,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IAE3H,IAAI,aAAa,EAAE;AAClB,QAAA,MAAM,YAAY,GAAgB,IAAI,GAAG,CAAS,OAAO,CAAC,GAAG,CAAC,CAAC,GAAuB,KAAK,GAAG,CAAC,YAAY,CAAC,CAAC;AAE7G,QAAA,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE;YAClC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;AAC7B,gBAAA,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,CAAA,+BAAA,CAAiC,CAAC;;;;IAKpE,MAAM,WAAW,GAAqC,EAAE;AAExD,IAAA,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC7B,MAAM,UAAU,GAAmB,MAAM,CAAC,OAAO,EAAE,IAAsB,IAAK,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,SAAmB,EAAE,MAAM,CAAC,YAAY,CAAmB;QAEnL,MAAM,aAAa,GAAY,CAAC,OAAO,UAAU,KAAK,UAAU,KAAK,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,IAAI,CAAC,MAAMC,6CAA6B,CAAC,gCAAgC,CAAC,QAAQ,CAAC,UAAoB,CAAC,KAAK,aAAa,KAAK,SAAS,IAAI,aAAa,CAAC,MAAM,CAAC,YAAmC,CAAC,KAAK,KAAK,CAAC,CAAC;QAEvV,IAAI,aAAa,EAAE;AAClB,YAAA,KAAK,MAAM,cAAc,IAAI,cAAc,CAAC,OAAO,EAAE;gBACpD,MAAM,QAAQ,GAA0H,cAAc,CAAC,QAAQ,GAAGC,kEAAwC,CAAC,YAAY,CAA0H;AAEjV,gBAAA,MAAM,WAAW,GAAY,QAAQ,EAAE,UAAU,GAAG,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,kBAAkB,KAAK,KAAK;AAEpG,gBAAA,IAAI,cAAc,CAAC,IAAI,IAAI,MAAM,CAAC,YAAY,IAAI,QAAQ,IAAI,WAAW,EAAE;AAC1E,oBAAA,MAAM,cAAc,GAAW,MAAM,CAAC;;yBAEpC,KAAK,CAAC,EAAE;AACR,yBAAA,GAAG,CAAC,CAAC,IAAY,EAAE,KAAa,KAAY;AAC5C,wBAAA,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,IAAI,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,EAAE;4BAC5E,OAAO,GAAG,GAAG,IAAI;;AAGlB,wBAAA,OAAO,IAAI;AACZ,qBAAC;yBACA,IAAI,CAAC,EAAE;AACP,yBAAA,WAAW,EAAE;AAEf,oBAAA,WAAW,CAAC,cAAwD,CAAC,GAAG,MAAM,CAAC,YAAY;;;;;AAM/F,IAAA,OAAO,WAAW;AACnB;;;;"}
|
|
@@ -32,14 +32,12 @@ function DtoGenerateFilterDecorator(metadata, entity) {
|
|
|
32
32
|
return enum_decorator.ApiPropertyEnum({ description: metadata.description, entity, enum: filterOperation_enum.EFilterOperationBoolean, enumName: "EFilterOperationBoolean", isRequired: false });
|
|
33
33
|
}
|
|
34
34
|
case desribeType_enum.EApiPropertyDescribeType.DATE: {
|
|
35
|
-
// @ts-ignore
|
|
36
35
|
return enum_decorator.ApiPropertyEnum({ entity, enum: filterOperation_enum.EFilterOperationDate, enumName: "EFilterOperationDate", isRequired: false });
|
|
37
36
|
}
|
|
38
37
|
case desribeType_enum.EApiPropertyDescribeType.ENUM: {
|
|
39
38
|
return enum_decorator.ApiPropertyEnum({ description: metadata.description, entity, enum: filterOperation_enum.EFilterOperationEnum, enumName: "EFilterOperationEnum", isRequired: false });
|
|
40
39
|
}
|
|
41
40
|
case desribeType_enum.EApiPropertyDescribeType.NUMBER: {
|
|
42
|
-
// @ts-ignore
|
|
43
41
|
return enum_decorator.ApiPropertyEnum({ description: metadata.description, entity, enum: filterOperation_enum.EFilterOperationNumber, enumName: "EFilterOperationNumber", isRequired: false });
|
|
44
42
|
}
|
|
45
43
|
case desribeType_enum.EApiPropertyDescribeType.OBJECT: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-filter-decorator.utility.js","sources":["../../../../../src/utility/dto/generate-filter-decorator.utility.ts"],"sourcesContent":[null],"names":["EApiPropertyDescribeType","ApiPropertyEnum","EFilterOperationBoolean","EFilterOperationDate","EFilterOperationEnum","EFilterOperationNumber","EFilterOperationObject","EFilterOperationRelation","EFilterOperationString","EFilterOperationUuid"],"mappings":";;;;;;;;;;;;;;;;;;;AAOA;;;;;;;;AAQG;AACG,SAAU,0BAA0B,CAAI,QAAwC,EAAE,MAAqB,EAAA;AAC5G,IAAA,QAAQ,QAAQ,CAAC,IAAI;AACpB,QAAA,KAAKA,yCAAwB,CAAC,OAAO,EAAE;YACtC,OAAOC,8BAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAEC,4CAAuB,EAAE,QAAQ,EAAE,yBAAyB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAG7J,QAAA,KAAKF,yCAAwB,CAAC,IAAI,EAAE
|
|
1
|
+
{"version":3,"file":"generate-filter-decorator.utility.js","sources":["../../../../../src/utility/dto/generate-filter-decorator.utility.ts"],"sourcesContent":[null],"names":["EApiPropertyDescribeType","ApiPropertyEnum","EFilterOperationBoolean","EFilterOperationDate","EFilterOperationEnum","EFilterOperationNumber","EFilterOperationObject","EFilterOperationRelation","EFilterOperationString","EFilterOperationUuid"],"mappings":";;;;;;;;;;;;;;;;;;;AAOA;;;;;;;;AAQG;AACG,SAAU,0BAA0B,CAAI,QAAwC,EAAE,MAAqB,EAAA;AAC5G,IAAA,QAAQ,QAAQ,CAAC,IAAI;AACpB,QAAA,KAAKA,yCAAwB,CAAC,OAAO,EAAE;YACtC,OAAOC,8BAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAEC,4CAAuB,EAAE,QAAQ,EAAE,yBAAyB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAG7J,QAAA,KAAKF,yCAAwB,CAAC,IAAI,EAAE;AACnC,YAAA,OAAOC,8BAAe,CAAC,EAAE,MAAM,EAAE,IAAI,EAAEE,yCAAoB,EAAE,QAAQ,EAAE,sBAAsB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAGpH,QAAA,KAAKH,yCAAwB,CAAC,IAAI,EAAE;YACnC,OAAOC,8BAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAEG,yCAAoB,EAAE,QAAQ,EAAE,sBAAsB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAGvJ,QAAA,KAAKJ,yCAAwB,CAAC,MAAM,EAAE;YACrC,OAAOC,8BAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAEI,2CAAsB,EAAE,QAAQ,EAAE,wBAAwB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAG3J,QAAA,KAAKL,yCAAwB,CAAC,MAAM,EAAE;YACrC,OAAOC,8BAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAEK,2CAAsB,EAAE,QAAQ,EAAE,wBAAwB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAG3J,QAAA,KAAKN,yCAAwB,CAAC,QAAQ,EAAE;YACvC,OAAOC,8BAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAEM,6CAAwB,EAAE,QAAQ,EAAE,0BAA0B,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAG/J,QAAA,KAAKP,yCAAwB,CAAC,MAAM,EAAE;YACrC,OAAOC,8BAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAEO,2CAAsB,EAAE,QAAQ,EAAE,wBAAwB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAG3J,QAAA,KAAKR,yCAAwB,CAAC,IAAI,EAAE;YACnC,OAAOC,8BAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAEQ,yCAAoB,EAAE,QAAQ,EAAE,sBAAsB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;;AAGzJ;;;;"}
|
|
@@ -41,8 +41,7 @@ function ApiControllerGetListTransformFilter(query, entityMetadata) {
|
|
|
41
41
|
continue;
|
|
42
42
|
const column = entityMetadata.columns.find((column) => column.name == key);
|
|
43
43
|
// @ts-ignore
|
|
44
|
-
|
|
45
|
-
if (column && column.metadata[PROPERTY_DESCRIBE_DECORATOR_API_CONSTANT.METADATA_PROPERTY_NAME].type === EApiPropertyDescribeType.RELATION) {
|
|
44
|
+
if (column && column.metadata[PROPERTY_DESCRIBE_DECORATOR_API_CONSTANT.METADATA_KEY].type === EApiPropertyDescribeType.RELATION) {
|
|
46
45
|
// @ts-ignore
|
|
47
46
|
filter[key] = { id: ApiControllerGetListTransformOperation(operation, value) };
|
|
48
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transform-filter.utility.js","sources":["../../../../../../../src/utility/api/controller/get-list/transform-filter.utility.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AASA;;;;;;;;AAQG;AACG,SAAU,mCAAmC,CAAI,KAA8B,EAAE,cAA6B,EAAA;IACnH,MAAM,MAAM,GAAwB,EAAE;IAEtC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;AACzC,QAAA,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE;AAE5B,QAAA,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAkB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;AAEtD,QAAA,IAAI,CAAC,KAAK;YAAE;QAEZ,MAAM,UAAU,GAAW,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QAEjD,IAAI,UAAU,KAAK,OAAO,IAAI,UAAU,KAAK,QAAQ,EAAE;YACtD,MAAM,SAAS,GAAqB,KAAK,CAAC,CAAA,EAAG,MAAM,CAAC,GAAG,CAAC,CAAA,UAAA,CAAY,CAAqB;AAEzF,YAAA,MAAM,KAAK,GAAY,KAAK,CAAC,OAAO,CAAC;AAErC,YAAA,IAAI,CAAC,SAAS,IAAI,CAAC,GAAG,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;gBAAE;AAEjE,YAAA,MAAM,MAAM,GAAoC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAA2B,KAAK,MAAM,CAAC,IAAI,IAAI,GAAG,CAAC
|
|
1
|
+
{"version":3,"file":"transform-filter.utility.js","sources":["../../../../../../../src/utility/api/controller/get-list/transform-filter.utility.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AASA;;;;;;;;AAQG;AACG,SAAU,mCAAmC,CAAI,KAA8B,EAAE,cAA6B,EAAA;IACnH,MAAM,MAAM,GAAwB,EAAE;IAEtC,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;AACzC,QAAA,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE;AAE5B,QAAA,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAkB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;AAEtD,QAAA,IAAI,CAAC,KAAK;YAAE;QAEZ,MAAM,UAAU,GAAW,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;QAEjD,IAAI,UAAU,KAAK,OAAO,IAAI,UAAU,KAAK,QAAQ,EAAE;YACtD,MAAM,SAAS,GAAqB,KAAK,CAAC,CAAA,EAAG,MAAM,CAAC,GAAG,CAAC,CAAA,UAAA,CAAY,CAAqB;AAEzF,YAAA,MAAM,KAAK,GAAY,KAAK,CAAC,OAAO,CAAC;AAErC,YAAA,IAAI,CAAC,SAAS,IAAI,CAAC,GAAG,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;gBAAE;AAEjE,YAAA,MAAM,MAAM,GAAoC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAA2B,KAAK,MAAM,CAAC,IAAI,IAAI,GAAG,CAAC;;AAGhI,YAAA,IAAI,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,wCAAwC,CAAC,YAAY,CAAC,CAAC,IAAI,KAAK,wBAAwB,CAAC,QAAQ,EAAE;;AAEhI,gBAAA,MAAM,CAAC,GAAc,CAAC,GAAG,EAAE,EAAE,EAAE,sCAAsC,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE;;iBACnF;;gBAEN,MAAM,CAAC,GAAc,CAAC,GAAG,sCAAsC,CAAC,SAAS,EAAE,KAAK,CAAC;;;;AAKpF,IAAA,OAAO,MAAM;AACd;;;;"}
|
|
@@ -35,8 +35,8 @@ function FilterOrderByFromEntity(entity, entityMetadata, method, dtoType, fieldS
|
|
|
35
35
|
if (isAllowedType) {
|
|
36
36
|
for (const metadataColumn of entityMetadata.columns) {
|
|
37
37
|
const metadata = metadataColumn.metadata?.[PROPERTY_DESCRIBE_DECORATOR_API_CONSTANT.METADATA_KEY];
|
|
38
|
-
const useAsFilter = metadata?.properties?.[method]?.[dtoType]?.useAsOrderByFilter
|
|
39
|
-
if (metadataColumn.name == column.propertyName && metadata &&
|
|
38
|
+
const useAsFilter = metadata?.properties?.[method]?.[dtoType]?.useAsOrderByFilter !== false;
|
|
39
|
+
if (metadataColumn.name == column.propertyName && metadata && useAsFilter) {
|
|
40
40
|
const snakeUpperCase = column.propertyName
|
|
41
41
|
// eslint-disable-next-line @elsikora/unicorn/prefer-spread
|
|
42
42
|
.split("")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-order-by-from-entity.utility.js","sources":["../../../../../src/utility/api/filter-order-by-from-entity.utility.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AAeA;;;;;;;;;;;;AAYG;AACG,SAAU,uBAAuB,CAAI,MAAqB,EAAE,cAA6B,EAAE,MAAqB,EAAE,OAAoB,EAAE,aAAmD,EAAA;AAChM,IAAA,MAAM,QAAQ,GAAwB,sBAAsB,EAAE;AAC9D,IAAA,MAAM,OAAO,GAA8B,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAA0B,KAAK,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IAE3H,IAAI,aAAa,EAAE;AAClB,QAAA,MAAM,YAAY,GAAgB,IAAI,GAAG,CAAS,OAAO,CAAC,GAAG,CAAC,CAAC,GAAuB,KAAK,GAAG,CAAC,YAAY,CAAC,CAAC;AAE7G,QAAA,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE;YAClC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;AAC7B,gBAAA,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,CAAA,+BAAA,CAAiC,CAAC;;;;IAKpE,MAAM,WAAW,GAAqC,EAAE;AAExD,IAAA,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC7B,MAAM,UAAU,GAAmB,MAAM,CAAC,OAAO,EAAE,IAAsB,IAAK,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,SAAmB,EAAE,MAAM,CAAC,YAAY,CAAmB;QAEnL,MAAM,aAAa,GAAY,CAAC,OAAO,UAAU,KAAK,UAAU,KAAK,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,IAAI,CAAC,MAAM,6BAA6B,CAAC,gCAAgC,CAAC,QAAQ,CAAC,UAAoB,CAAC,KAAK,aAAa,KAAK,SAAS,IAAI,aAAa,CAAC,MAAM,CAAC,YAAmC,CAAC,KAAK,KAAK,CAAC,CAAC;QAEvV,IAAI,aAAa,EAAE;AAClB,YAAA,KAAK,MAAM,cAAc,IAAI,cAAc,CAAC,OAAO,EAAE;gBACpD,MAAM,QAAQ,GAA0H,cAAc,CAAC,QAAQ,GAAG,wCAAwC,CAAC,YAAY,CAA0H;AAEjV,gBAAA,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"filter-order-by-from-entity.utility.js","sources":["../../../../../src/utility/api/filter-order-by-from-entity.utility.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;AAeA;;;;;;;;;;;;AAYG;AACG,SAAU,uBAAuB,CAAI,MAAqB,EAAE,cAA6B,EAAE,MAAqB,EAAE,OAAoB,EAAE,aAAmD,EAAA;AAChM,IAAA,MAAM,QAAQ,GAAwB,sBAAsB,EAAE;AAC9D,IAAA,MAAM,OAAO,GAA8B,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAA0B,KAAK,MAAM,CAAC,MAAM,IAAI,MAAM,CAAC;IAE3H,IAAI,aAAa,EAAE;AAClB,QAAA,MAAM,YAAY,GAAgB,IAAI,GAAG,CAAS,OAAO,CAAC,GAAG,CAAC,CAAC,GAAuB,KAAK,GAAG,CAAC,YAAY,CAAC,CAAC;AAE7G,QAAA,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE;YAClC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;AAC7B,gBAAA,MAAM,IAAI,KAAK,CAAC,UAAU,KAAK,CAAA,+BAAA,CAAiC,CAAC;;;;IAKpE,MAAM,WAAW,GAAqC,EAAE;AAExD,IAAA,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC7B,MAAM,UAAU,GAAmB,MAAM,CAAC,OAAO,EAAE,IAAsB,IAAK,OAAO,CAAC,WAAW,CAAC,aAAa,EAAE,MAAM,CAAC,SAAmB,EAAE,MAAM,CAAC,YAAY,CAAmB;QAEnL,MAAM,aAAa,GAAY,CAAC,OAAO,UAAU,KAAK,UAAU,KAAK,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,IAAI,CAAC,MAAM,6BAA6B,CAAC,gCAAgC,CAAC,QAAQ,CAAC,UAAoB,CAAC,KAAK,aAAa,KAAK,SAAS,IAAI,aAAa,CAAC,MAAM,CAAC,YAAmC,CAAC,KAAK,KAAK,CAAC,CAAC;QAEvV,IAAI,aAAa,EAAE;AAClB,YAAA,KAAK,MAAM,cAAc,IAAI,cAAc,CAAC,OAAO,EAAE;gBACpD,MAAM,QAAQ,GAA0H,cAAc,CAAC,QAAQ,GAAG,wCAAwC,CAAC,YAAY,CAA0H;AAEjV,gBAAA,MAAM,WAAW,GAAY,QAAQ,EAAE,UAAU,GAAG,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,kBAAkB,KAAK,KAAK;AAEpG,gBAAA,IAAI,cAAc,CAAC,IAAI,IAAI,MAAM,CAAC,YAAY,IAAI,QAAQ,IAAI,WAAW,EAAE;AAC1E,oBAAA,MAAM,cAAc,GAAW,MAAM,CAAC;;yBAEpC,KAAK,CAAC,EAAE;AACR,yBAAA,GAAG,CAAC,CAAC,IAAY,EAAE,KAAa,KAAY;AAC5C,wBAAA,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,IAAI,IAAI,KAAK,IAAI,CAAC,WAAW,EAAE,EAAE;4BAC5E,OAAO,GAAG,GAAG,IAAI;;AAGlB,wBAAA,OAAO,IAAI;AACZ,qBAAC;yBACA,IAAI,CAAC,EAAE;AACP,yBAAA,WAAW,EAAE;AAEf,oBAAA,WAAW,CAAC,cAAwD,CAAC,GAAG,MAAM,CAAC,YAAY;;;;;AAM/F,IAAA,OAAO,WAAW;AACnB;;;;"}
|
|
@@ -30,14 +30,12 @@ function DtoGenerateFilterDecorator(metadata, entity) {
|
|
|
30
30
|
return ApiPropertyEnum({ description: metadata.description, entity, enum: EFilterOperationBoolean, enumName: "EFilterOperationBoolean", isRequired: false });
|
|
31
31
|
}
|
|
32
32
|
case EApiPropertyDescribeType.DATE: {
|
|
33
|
-
// @ts-ignore
|
|
34
33
|
return ApiPropertyEnum({ entity, enum: EFilterOperationDate, enumName: "EFilterOperationDate", isRequired: false });
|
|
35
34
|
}
|
|
36
35
|
case EApiPropertyDescribeType.ENUM: {
|
|
37
36
|
return ApiPropertyEnum({ description: metadata.description, entity, enum: EFilterOperationEnum, enumName: "EFilterOperationEnum", isRequired: false });
|
|
38
37
|
}
|
|
39
38
|
case EApiPropertyDescribeType.NUMBER: {
|
|
40
|
-
// @ts-ignore
|
|
41
39
|
return ApiPropertyEnum({ description: metadata.description, entity, enum: EFilterOperationNumber, enumName: "EFilterOperationNumber", isRequired: false });
|
|
42
40
|
}
|
|
43
41
|
case EApiPropertyDescribeType.OBJECT: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-filter-decorator.utility.js","sources":["../../../../../src/utility/dto/generate-filter-decorator.utility.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAOA;;;;;;;;AAQG;AACG,SAAU,0BAA0B,CAAI,QAAwC,EAAE,MAAqB,EAAA;AAC5G,IAAA,QAAQ,QAAQ,CAAC,IAAI;AACpB,QAAA,KAAK,wBAAwB,CAAC,OAAO,EAAE;YACtC,OAAO,eAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,uBAAuB,EAAE,QAAQ,EAAE,yBAAyB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAG7J,QAAA,KAAK,wBAAwB,CAAC,IAAI,EAAE
|
|
1
|
+
{"version":3,"file":"generate-filter-decorator.utility.js","sources":["../../../../../src/utility/dto/generate-filter-decorator.utility.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAOA;;;;;;;;AAQG;AACG,SAAU,0BAA0B,CAAI,QAAwC,EAAE,MAAqB,EAAA;AAC5G,IAAA,QAAQ,QAAQ,CAAC,IAAI;AACpB,QAAA,KAAK,wBAAwB,CAAC,OAAO,EAAE;YACtC,OAAO,eAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,uBAAuB,EAAE,QAAQ,EAAE,yBAAyB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAG7J,QAAA,KAAK,wBAAwB,CAAC,IAAI,EAAE;AACnC,YAAA,OAAO,eAAe,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,sBAAsB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAGpH,QAAA,KAAK,wBAAwB,CAAC,IAAI,EAAE;YACnC,OAAO,eAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,sBAAsB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAGvJ,QAAA,KAAK,wBAAwB,CAAC,MAAM,EAAE;YACrC,OAAO,eAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE,QAAQ,EAAE,wBAAwB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAG3J,QAAA,KAAK,wBAAwB,CAAC,MAAM,EAAE;YACrC,OAAO,eAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE,QAAQ,EAAE,wBAAwB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAG3J,QAAA,KAAK,wBAAwB,CAAC,QAAQ,EAAE;YACvC,OAAO,eAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,wBAAwB,EAAE,QAAQ,EAAE,0BAA0B,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAG/J,QAAA,KAAK,wBAAwB,CAAC,MAAM,EAAE;YACrC,OAAO,eAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,sBAAsB,EAAE,QAAQ,EAAE,wBAAwB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;AAG3J,QAAA,KAAK,wBAAwB,CAAC,IAAI,EAAE;YACnC,OAAO,eAAe,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,QAAQ,EAAE,sBAAsB,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;;;AAGzJ;;;;"}
|