Skip to content

Commit d69c9dd

Browse files
committed
Fix problems with demo project and adjust codeql problems
1 parent 7225875 commit d69c9dd

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

src/ng-generate/table/generators/ts-component.generator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ export class TsComponentGenerator {
775775
queryFilter?.queryNode.subNodes.push(additionalCondition);
776776
777777
const filterRQLQuery = queryFilter ? QueryStringifier.stringify(queryFilter) : '';
778-
const optionsRQLQuery = QueryStringifier.stringify(queryOption).replace('&', ',');
778+
const optionsRQLQuery = QueryStringifier.stringify(queryOption).replace(/&/g, ',');
779779
780780
let rqlStringTemp = '';
781781
if(filterRQLQuery.length > 0) {

src/ng-generate/table/generators/ts-filter-service.generator.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,10 @@ export class TsFilterServiceGenerator {
503503
${
504504
this.allStringProps.length > 0
505505
? `this.activeFilters.filter(af => af.type === FilterEnums.Search).forEach(af => {
506-
query.addNode(new Or(this.addSelectedColumnsQuery(af.prop, af.filterValue))); })`
506+
if (af.prop != null && af.filterValue != null) {
507+
query.addNode(new Or(this.addSelectedColumnsQuery(af.prop, af.filterValue)));
508+
}
509+
});`
507510
: ``
508511
}
509512
}`;

0 commit comments

Comments
 (0)