Merge pull request #16 from bci-oss/fix/problems-with-demo-project

Fix problems with demo project and adjust codeql problems

Author: michelu89

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

@@ -775,7 +775,7 @@ export class TsComponentGenerator {
                     queryFilter?.queryNode.subNodes.push(additionalCondition);
 
                     const filterRQLQuery = queryFilter ? QueryStringifier.stringify(queryFilter) : '';
-                    const optionsRQLQuery = QueryStringifier.stringify(queryOption).replace('&', ',');
+                    const optionsRQLQuery = QueryStringifier.stringify(queryOption).replace(/&/g, ',');
 
                     let rqlStringTemp = '';
                     if(filterRQLQuery.length > 0) {

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

@@ -503,7 +503,10 @@ export class TsFilterServiceGenerator {
                         ${
                             this.allStringProps.length > 0
                                 ? `this.activeFilters.filter(af => af.type === FilterEnums.Search).forEach(af => {
-                                        query.addNode(new Or(this.addSelectedColumnsQuery(af.prop, af.filterValue))); })`
+                                       if (af.prop !== null && af.filterValue !== undefined) {
+                                         query.addNode(new Or(this.addSelectedColumnsQuery(af.prop, af.filterValue)));
+                                       }
+                                     });`
                                 : ``
                         }
                    }`;