Skip to content

Commit

Permalink
update changelog, release new version
Browse files Browse the repository at this point in the history
  • Loading branch information
praveenweb committed Mar 18, 2020
1 parent 07e937f commit 6458ae7
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 13 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 0.0.8 (March 18, 2020)

- Bug Fix: Translate id to primary key for custom primary keys.
- Bug Fix: Respect primary key on order by.
- Bug Fix: Fix typo in GET_MANY_REFERENCE.
- Bug Fix: Set `asc` as default sorting order in GET_LIST.

## 0.0.7 (September 17, 2019)

- Bug Fix: Re-build library to fix discrepancies. Pass `where` arguments to `count` query.
Expand Down
20 changes: 10 additions & 10 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ export default (serverEndpoint, httpClient, config) => {
params.sort.field = primaryKey;
}

const orderBy = primaryKey !== DEFAULT_PRIMARY_KEY && params.sort.field === DEFAULT_PRIMARY_KEY ? primaryKey : params.sort.field;
switch (type) {
case 'GET_LIST':
// select multiple
Expand All @@ -94,7 +93,7 @@ export default (serverEndpoint, httpClient, config) => {
finalSelectQuery.args.limit = params.pagination.perPage;
finalSelectQuery.args.offset = (params.pagination.page * params.pagination.perPage) - params.pagination.perPage;
finalSelectQuery.args.where = params.filter;
finalSelectQuery.args.order_by = { column: orderBy, type: typeof params.sort.order === 'undefined' ? 'asc' : params.sort.order.toLowerCase() };
finalSelectQuery.args.order_by = { column: params.sort.field, type: typeof params.sort.order === 'undefined' ? 'asc' : params.sort.order.toLowerCase() };
finalCountQuery.args.table = { 'name': tableName, 'schema': schema };;
finalCountQuery.args.where = {};
finalCountQuery.args.where[primaryKey] = { '$ne': null };
Expand Down Expand Up @@ -186,7 +185,7 @@ export default (serverEndpoint, httpClient, config) => {
finalManyRefQuery.args.offset = (params.pagination.page * params.pagination.perPage) - params.pagination.perPage;
finalManyRefQuery.args.where = { [params.target]: params.id };
finalManyRefQuery.args.where = addFilters(finalManyRefQuery.args.where, params.filter);
finalManyRefQuery.args.order_by = { column: orderBy, type: typeof params.sort.order === 'undefined' ? 'asc' : params.sort.order.toLowerCase() };
finalManyRefQuery.args.order_by = { column: params.sort.field, type: typeof params.sort.order === 'undefined' ? 'asc' : params.sort.order.toLowerCase() };
finalManyRefCountQuery.args.table = { 'name': tableName, 'schema': schema };;
finalManyRefCountQuery.args.where = {};
finalManyRefCountQuery.args.where[primaryKey] = { '$ne': null };
Expand Down

0 comments on commit 6458ae7

Please sign in to comment.