Merge pull request #13 from VMBindraban/master

doktordirk · web-flow · commit 2ef549966fe5 · 2016-08-08T18:56:53.000+02:00
chore(build): build and bump version to 0.0.6
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-filter",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "A plugin for aurelia to populate search/filter criteria. Works well with aurelia-orm.",
   "keywords": [
     "aurelia",
diff --git a/dist/amd/criteriaBuilder.js b/dist/amd/criteriaBuilder.js
@@ -46,8 +46,6 @@ define(['exports', 'extend'], function (exports, _extend) {
       var currentSort = this.criteria.sort || {};
 
       this.criteria = Object.assign(criteriaWhere, { sort: currentSort, populate: this.populate.join(',') });
-
-      console.log(this.criteria);
     };
 
     CriteriaBuilder.prototype.parseOperator = function parseOperator(filter) {
diff --git a/dist/amd/filter.js b/dist/amd/filter.js
@@ -283,7 +283,7 @@ define(['exports', 'aurelia-framework', 'aurelia-view-manager', './criteriaBuild
       for (var column in columns) {
         var columnName = entityName ? entityName + '.' + column : column;
 
-        if (excludeColumns.indexOf(columnName) > -1) {
+        if (excludeColumns.indexOf(entityName) > -1 || excludeColumns.indexOf(columnName) > -1) {
           continue;
         }
 
diff --git a/dist/commonjs/criteriaBuilder.js b/dist/commonjs/criteriaBuilder.js
@@ -43,8 +43,6 @@ var CriteriaBuilder = exports.CriteriaBuilder = function () {
     var currentSort = this.criteria.sort || {};
 
     this.criteria = Object.assign(criteriaWhere, { sort: currentSort, populate: this.populate.join(',') });
-
-    console.log(this.criteria);
   };
 
   CriteriaBuilder.prototype.parseOperator = function parseOperator(filter) {
diff --git a/dist/commonjs/filter.js b/dist/commonjs/filter.js
@@ -268,7 +268,7 @@ var Filter = exports.Filter = (_dec = (0, _aureliaFramework.customElement)('filt
     for (var column in columns) {
       var columnName = entityName ? entityName + '.' + column : column;
 
-      if (excludeColumns.indexOf(columnName) > -1) {
+      if (excludeColumns.indexOf(entityName) > -1 || excludeColumns.indexOf(columnName) > -1) {
         continue;
       }
 
diff --git a/dist/criteriaBuilder.js b/dist/criteriaBuilder.js
@@ -25,8 +25,6 @@ export class CriteriaBuilder {
     let currentSort   = this.criteria.sort || {};
 
     this.criteria = Object.assign(criteriaWhere, {sort: currentSort, populate: this.populate.join(',')});
-
-    console.log(this.criteria);
   }
 
   parseOperator(filter) {
diff --git a/dist/es2015/criteriaBuilder.js b/dist/es2015/criteriaBuilder.js
@@ -25,8 +25,6 @@ export let CriteriaBuilder = class CriteriaBuilder {
     let currentSort = this.criteria.sort || {};
 
     this.criteria = Object.assign(criteriaWhere, { sort: currentSort, populate: this.populate.join(',') });
-
-    console.log(this.criteria);
   }
 
   parseOperator(filter) {
diff --git a/dist/es2015/filter.js b/dist/es2015/filter.js
@@ -234,7 +234,7 @@ export let Filter = (_dec = customElement('filter'), _dec2 = resolvedView('spoon
     for (let column in columns) {
       let columnName = entityName ? entityName + '.' + column : column;
 
-      if (excludeColumns.indexOf(columnName) > -1) {
+      if (excludeColumns.indexOf(entityName) > -1 || excludeColumns.indexOf(columnName) > -1) {
         continue;
       }
 
diff --git a/dist/filter.js b/dist/filter.js
@@ -15,7 +15,7 @@ export class Filter extends CriteriaBuilder {
     key: 'field',
     type: 'select',
     label: false,
-    options: [],
+    options: []
   };
 
   operatorElement = {
@@ -216,7 +216,8 @@ export class Filter extends CriteriaBuilder {
     for (let column in columns) {
       let columnName = (entityName) ? entityName + '.' + column : column;
 
-      if (excludeColumns.indexOf(columnName) > -1) {
+      // ignore entire or part of a association
+      if (excludeColumns.indexOf(entityName) > -1 || excludeColumns.indexOf(columnName) > -1) {
         continue;
       }
 
diff --git a/dist/native-modules/criteriaBuilder.js b/dist/native-modules/criteriaBuilder.js
@@ -32,8 +32,6 @@ export var CriteriaBuilder = function () {
     var currentSort = this.criteria.sort || {};
 
     this.criteria = Object.assign(criteriaWhere, { sort: currentSort, populate: this.populate.join(',') });
-
-    console.log(this.criteria);
   };
 
   CriteriaBuilder.prototype.parseOperator = function parseOperator(filter) {
diff --git a/dist/native-modules/filter.js b/dist/native-modules/filter.js
@@ -259,7 +259,7 @@ export var Filter = (_dec = customElement('filter'), _dec2 = resolvedView('spoon
     for (var column in columns) {
       var columnName = entityName ? entityName + '.' + column : column;
 
-      if (excludeColumns.indexOf(columnName) > -1) {
+      if (excludeColumns.indexOf(entityName) > -1 || excludeColumns.indexOf(columnName) > -1) {
         continue;
       }
 
diff --git a/dist/system/criteriaBuilder.js b/dist/system/criteriaBuilder.js
@@ -42,8 +42,6 @@ System.register(['extend'], function (_export, _context) {
           var currentSort = this.criteria.sort || {};
 
           this.criteria = Object.assign(criteriaWhere, { sort: currentSort, populate: this.populate.join(',') });
-
-          console.log(this.criteria);
         };
 
         CriteriaBuilder.prototype.parseOperator = function parseOperator(filter) {
diff --git a/dist/system/filter.js b/dist/system/filter.js
@@ -291,7 +291,7 @@ System.register(['aurelia-framework', 'aurelia-view-manager', './criteriaBuilder
           for (var column in columns) {
             var columnName = entityName ? entityName + '.' + column : column;
 
-            if (excludeColumns.indexOf(columnName) > -1) {
+            if (excludeColumns.indexOf(entityName) > -1 || excludeColumns.indexOf(columnName) > -1) {
               continue;
             }
 
diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,27 @@
+<a name="0.0.6"></a>
+## 0.0.6 (2016-08-08)
+
+
+### Bug Fixes
+
+* **build:** add criteriaBuilder to build ([de562eb](https://github.com/SpoonX/aurelia-filter/commit/de562eb))
+* **build:** don't concat components ([22cae5f](https://github.com/SpoonX/aurelia-filter/commit/22cae5f))
+* **project:** do not add column id ([5a29cf4](https://github.com/SpoonX/aurelia-filter/commit/5a29cf4))
+* **project:** do not override current sort criteria ([bfbc409](https://github.com/SpoonX/aurelia-filter/commit/bfbc409))
+* **project:** handle value type ([6c63065](https://github.com/SpoonX/aurelia-filter/commit/6c63065))
+* **project:** make it possible to filter on id ([bd9f67b](https://github.com/SpoonX/aurelia-filter/commit/bd9f67b))
+* **styling:** fix styling ([9210ef3](https://github.com/SpoonX/aurelia-filter/commit/9210ef3))
+
+
+### Features
+
+* **exclude:** exclude columns from entity ([0075050](https://github.com/SpoonX/aurelia-filter/commit/0075050))
+* **project:** ability to ignore entire association ([97953f4](https://github.com/SpoonX/aurelia-filter/commit/97953f4))
+* **project:** handle predefined values ([710b169](https://github.com/SpoonX/aurelia-filter/commit/710b169))
+* **project:** new build tasks with typings and bundled ([5b4aa11](https://github.com/SpoonX/aurelia-filter/commit/5b4aa11))
+
+
+
 <a name="0.0.5"></a>
 ## 0.0.5 (2016-08-01)
 
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-filter",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "A plugin for aurelia to populate search/filter criteria. Works well with aurelia-orm.",
   "keywords": [
     "aurelia",
diff --git a/src/filter.js b/src/filter.js
@@ -15,7 +15,7 @@ export class Filter extends CriteriaBuilder {
     key: 'field',
     type: 'select',
     label: false,
-    options: [],
+    options: []
   };
 
   operatorElement = {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "aurelia-filter",`
`3`		`- "version": "0.0.5",`
	`3`	`+ "version": "0.0.6",`
`4`	`4`	`"description": "A plugin for aurelia to populate search/filter criteria. Works well with aurelia-orm.",`
`5`	`5`	`"keywords": [`
`6`	`6`	`"aurelia",`
Original file line number	Diff line number	Diff line change
`@@ -283,7 +283,7 @@ define(['exports', 'aurelia-framework', 'aurelia-view-manager', './criteriaBuild`
`283`	`283`	`for (var column in columns) {`
`284`	`284`	`var columnName = entityName ? entityName + '.' + column : column;`
`285`	`285`
`286`		`- if (excludeColumns.indexOf(columnName) > -1) {`
	`286`	`+ if (excludeColumns.indexOf(entityName) > -1 \|\| excludeColumns.indexOf(columnName) > -1) {`
`287`	`287`	`continue;`
`288`	`288`	`}`
`289`	`289`
Original file line number	Diff line number	Diff line change
`@@ -268,7 +268,7 @@ var Filter = exports.Filter = (_dec = (0, _aureliaFramework.customElement)('filt`
`268`	`268`	`for (var column in columns) {`
`269`	`269`	`var columnName = entityName ? entityName + '.' + column : column;`
`270`	`270`
`271`		`- if (excludeColumns.indexOf(columnName) > -1) {`
	`271`	`+ if (excludeColumns.indexOf(entityName) > -1 \|\| excludeColumns.indexOf(columnName) > -1) {`
`272`	`272`	`continue;`
`273`	`273`	`}`
`274`	`274`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@ export class CriteriaBuilder {`
`25`	`25`	`let currentSort = this.criteria.sort \|\| {};`
`26`	`26`
`27`	`27`	`this.criteria = Object.assign(criteriaWhere, {sort: currentSort, populate: this.populate.join(',')});`
`28`		`-`
`29`		`- console.log(this.criteria);`
`30`	`28`	`}`
`31`	`29`
`32`	`30`	`parseOperator(filter) {`
Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,6 @@ export let CriteriaBuilder = class CriteriaBuilder {`
`25`	`25`	`let currentSort = this.criteria.sort \|\| {};`
`26`	`26`
`27`	`27`	`this.criteria = Object.assign(criteriaWhere, { sort: currentSort, populate: this.populate.join(',') });`
`28`		`-`
`29`		`- console.log(this.criteria);`
`30`	`28`	`}`
`31`	`29`
`32`	`30`	`parseOperator(filter) {`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ export let Filter = (_dec = customElement('filter'), _dec2 = resolvedView('spoon`
`234`	`234`	`for (let column in columns) {`
`235`	`235`	`let columnName = entityName ? entityName + '.' + column : column;`
`236`	`236`
`237`		`- if (excludeColumns.indexOf(columnName) > -1) {`
	`237`	`+ if (excludeColumns.indexOf(entityName) > -1 \|\| excludeColumns.indexOf(columnName) > -1) {`
`238`	`238`	`continue;`
`239`	`239`	`}`
`240`	`240`