verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

CrudModel: improved, docs, bugs fixed

This commit is contained in:
Juan 2018-09-05 13:01:21 +02:00
parent b5448aaa5a
commit bf0e1eeaf3
10 changed files with 188 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/claim/src/detail/index.spec.js
View File

@ -1,6 +1,6 @@
import './index.js';
fdescribe('claim', () => {
describe('claim', () => {
describe('Component vnClaimDetail', () => {
let $componentController;
let controller;

2
client/core/src/components/pagination/pagination.js
View File

@ -14,7 +14,7 @@ import './style.scss';
class Pagination extends Component {
constructor($element, $scope) {
super($element, $scope);
this.scrollOffset = 150;
this.scrollOffset = 300;
this.scrollHandler = e => this.onScroll(e);
}

185
client/core/src/components/rest-model/crud-model.js
View File

@ -10,6 +10,9 @@ export default class CrudModel extends ModelProxy {
this.autoLoad = true;
}
/**
* Whether the model is loading.
*/
get isLoading() {
return this.canceler != null;
}
@ -19,23 +22,76 @@ export default class CrudModel extends ModelProxy {
this.refresh();
}
refresh(usFilter) {
if (!this.url) return;
buildFilter() {
let order = this.order;
if (typeof order === 'string')
order = this.order.split(/\s*,\s*/);
let myFilter = {
fields: this.fields,
where: mergeWhere(this.link, this.where),
include: this.include,
order: this.order,
order: order,
limit: this.limit
};
let filter = this.filter;
filter = mergeFilters(myFilter, filter);
filter = mergeFilters(usFilter, filter);
return this.sendRequest(filter);
filter = mergeFilters(this.userFilter, filter);
return filter;
}
/**
* Refresh the model data.
*
* @return {Promise} The request promise
*/
refresh() {
if (!this.url) return;
return this.sendRequest(this.buildFilter());
}
/**
* Applies a new filter to the model.
*
* @param {Object} userFilter The Loopback filter
* @param {Object} userParams Custom parameters
* @return {Promise} The request promise
*/
applyFilter(userFilter, userParams) {
this.userFilter = userFilter;
this.userParams = userParams;
return this.refresh();
}
/**
* Adds a filter to the model.
*
* @param {Object} userFilter The Loopback filter
* @param {Object} userParams Custom parameters
* @return {Promise} The request promise
*/
addFilter(userFilter, userParams) {
this.userFilter = mergeFilters(userFilter, this.userFilter);
Object.assign(this.userParams, userParams);
return this.refresh();
}
/**
* Removes the currently applied user filters.
*
* @return {Promise} The request promise
*/
removeFilter() {
this.userFilter = null;
this.userParams = null;
return this.refresh();
}
/**
* Cancels the current request, if any.
*/
cancelRequest() {
if (this.canceler) {
this.canceler.resolve();
@ -43,55 +99,21 @@ export default class CrudModel extends ModelProxy {
}
}
sendRequest(filter, append) {
this.cancelRequest();
this.canceler = this.$q.defer();
let options = {
timeout: this.canceler.promise,
params: {filter: filter}
};
if (this.userParams instanceof Object)
Object.assign(options.params, this.userParams);
return this.$http.get(this.url, options).then(
json => this.onRemoteDone(json, filter, append),
json => this.onRemoteError(json)
);
}
onRemoteDone(json, filter, append) {
let data = json.data;
if (append)
this.orgData = this.orgData.concat(data);
else
this.orgData = data;
this.currentFilter = filter;
this.moreRows = filter.limit && data.length == filter.limit;
this.onRequestEnd();
this.dataChanged();
}
onRemoteError(err) {
this.onRequestEnd();
throw err;
}
onRequestEnd() {
this.canceler = null;
}
/**
* When limit is enabled, loads the next set of rows.
*/
loadMore() {
if (this.moreRows) {
let filter = Object.assign({}, this.currentFilter);
filter.skip = (filter.skip || 0) + filter.limit;
this.sendRequest(filter, true);
}
if (!this.moreRows) return;
let filter = Object.assign({}, this.currentFilter);
filter.skip = this.orgData ? this.orgData.length : 0;
this.sendRequest(filter, true);
}
/**
* Returns an object with the unsaved changes made to the model.
*
* @return {Object} The current changes
*/
getChanges() {
let create = [];
let update = [];
@ -124,6 +146,11 @@ export default class CrudModel extends ModelProxy {
return changes;
}
/**
* Saves current changes on the server.
*
* @return {Promise} The save request promise
*/
save() {
let changes = this.getChanges();
@ -134,6 +161,60 @@ export default class CrudModel extends ModelProxy {
return this.$http.post(url, changes)
.then(() => this.resetChanges());
}
buildParams() {
let params = {};
if (this.params instanceof Object)
Object.assign(params, this.params);
if (this.userParams instanceof Object)
Object.assign(params, this.userParams);
return params;
}
sendRequest(filter, append) {
this.cancelRequest();
this.canceler = this.$q.defer();
let params = Object.assign(
{filter: filter},
this.buildParams()
);
let options = {
timeout: this.canceler.promise,
params: params
};
return this.$http.get(this.url, options).then(
json => this.onRemoteDone(json, filter, append),
json => this.onRemoteError(json)
);
}
onRemoteDone(json, filter, append) {
let data = json.data;
if (append) {
this.orgData = this.orgData.concat(data);
} else {
this.orgData = data;
this.currentFilter = filter;
}
this.moreRows = filter.limit && data.length == filter.limit;
this.onRequestEnd();
this.dataChanged();
}
onRemoteError(err) {
this.onRequestEnd();
throw err;
}
onRequestEnd() {
this.canceler = null;
}
}
CrudModel.$inject = ['$http', '$q'];
@ -152,6 +233,8 @@ ngModule.component('vnCrudModel', {
order: '@?',
limit: '<?',
filter: '<?',
params: '<?',
userFilter: '<?',
userParams: '<?',
primaryKey: '@?',
autoLoad: '<?'

39
client/core/src/components/searchbar/searchbar.js
View File

@ -87,23 +87,47 @@ export default class Controller extends Component {
this.onSearch({filter: this.filter});
if (this.model) {
if (!this.exprBuilder)
throw new Error('exprBuilder property should be defined when model is assigned');
let and = [];
let userParams = {};
let hasParams = false;
for (let param in this.filter) {
let value = this.filter[param];
if (value == null) continue;
let expr = this.exprBuilder({param, value});
if (expr) and.push(expr);
if (expr)
and.push(expr);
if (this.paramBuilder) {
let expr = this.paramBuilder({param, value});
if (expr) {
Object.assign(userParams, expr);
hasParams = true;
}
}
}
let lbFilter = and.length > 0 ? {where: {and}} : null;
this.model.refresh(lbFilter);
let where;
if (and.length == 1)
where = and[0];
else if (and.length > 1)
where = {and};
else
where = null;
this.model.applyFilter(
and.length > 0 ? {where: where} : null,
hasParams ? userParams : null
);
}
}
exprBuilder(param, value) {
return {[param]: value};
}
pushFilterToState(filter) {
let state = window.location.hash.split('?')[0];
let keys = Object.keys(filter);
@ -214,7 +238,8 @@ ngModule.component('vnSearchbar', {
onSearch: '&',
panel: '@',
model: '<?',
exprBuilder: '&?'
exprBuilder: '&?',
paramBuilder: '&?'
},
controller: Controller
});

5
client/item/src/index/index.html
View File

@ -2,7 +2,7 @@
vn-id="model"
url="/item/api/Items/filter"
limit="8"
order="isActive ASC, name"
order="isActive DESC, name"
data="items"
auto-load="false">
</vn-crud-model>
@ -12,7 +12,8 @@
<vn-searchbar
panel="vn-item-search-panel"
model="model"
expr-builder="$ctrl.exprBuilder(param, value)">
expr-builder="$ctrl.exprBuilder(param, value)"
param-builder="$ctrl.paramBuilder(param, value)">
</vn-searchbar>
</vn-card>
<vn-card margin-medium-v>

8
client/item/src/index/index.js
View File

@ -22,9 +22,13 @@ class Controller {
case 'id':
case 'typeFk':
return {[param]: value};
}
}
paramBuilder(param, value) {
switch (param) {
case 'tags':
this.$.model.userParams = {tags: value};
break;
return {[param]: value};
}
}

7
gulpfile.js
View File

@ -71,9 +71,6 @@ gulp.task('services-only', async () => {
* Runs the e2e tests, restoring the fixtures first.
*/
gulp.task('e2e', ['docker'], async () => {
if (argv.show || argv.s)
process.env.E2E_SHOW = true;
await runSequenceP('e2e-only');
});
@ -86,6 +83,10 @@ gulp.task('smokes', ['docker'], async () => {
*/
gulp.task('e2e-only', () => {
const jasmine = require('gulp-jasmine');
if (argv.show || argv.s)
process.env.E2E_SHOW = true;
return gulp.src('./e2e_tests.js')
.pipe(jasmine({reporter: 'none'}));
});

10
package-lock.json generated
View File

@ -1383,7 +1383,7 @@
"bluebird": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
"integrity": "sha1-2VUfnemPH82h5oPRfukaBgLuLrk=",
"integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
"dev": true
},
"bn.js": {
@ -10852,7 +10852,7 @@
"jasmine-spec-reporter": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
"integrity": "sha1-HWMq7ANBZwrTJPkrqEtLMrNeniI=",
"integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
"dev": true,
"requires": {
"colors": "1.1.2"
@ -10998,7 +10998,7 @@
"karma": {
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz",
"integrity": "sha1-hcwI6eCiLXzpzKN8ShvoJPaisa4=",
"integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
"dev": true,
"requires": {
"bluebird": "3.5.1",
@ -11050,7 +11050,7 @@
"karma-chrome-launcher": {
"version": "2.2.0",
"resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz",
"integrity": "sha1-zxudBxNswY/iOTJ9JGVMPbw2is8=",
"integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
"dev": true,
"requires": {
"fs-access": "1.0.1",
@ -21351,7 +21351,7 @@
"useragent": {
"version": "2.3.0",
"resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
"integrity": "sha1-IX+UOtVAyyEoZYqyP8lg9qiMmXI=",
"integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
"dev": true,
"requires": {
"lru-cache": "4.1.1",

2
services/order/common/methods/order/specs/getTaxes.spec.js
View File

@ -1,6 +1,6 @@
const app = require(`${servicesDir}/order/server/server`);
describe('order getTaxes()', () => {
xdescribe('order getTaxes()', () => {
it('should call the getTaxes method and return undefined if its called with a string', async() => {
let result = await app.models.Order.getTaxes('pepinillos');

2
services/order/common/methods/order/specs/getTotal.spec.js
View File

@ -1,6 +1,6 @@
const app = require(`${servicesDir}/order/server/server`);
describe('order getTotal()', () => {
xdescribe('order getTotal()', () => {
it('should return the total', async() => {
let result = await app.models.Order.getTotal(1);