Skip to content

Commit

Permalink
Merge pull request #16 from Gavant/types-update
Browse files Browse the repository at this point in the history 
Fix for types: dont allow undefined to be returned from load more
  • Loading branch information
@napafundi
napafundi committed Oct 26, 2021
2 parents 6225e9c + 77c2562 commit d4a4189
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 89 deletions.
15 changes: 8 additions & 7 deletions addon/hooks/pagination.ts
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import { action } from '@ember/object';
import { inject as service } from '@ember/service';
import { getOwner, setOwner } from '@ember/application';
import { A } from '@ember/array';
import NativeArray from '@ember/array/-private/native-array';
import { action } from '@ember/object';
import RouterService from '@ember/routing/router-service';
import { inject as service } from '@ember/service';
import { tracked } from '@glimmer/tracking';
import { A } from '@ember/array';

import DS from 'ember-data';
import RouterService from '@ember/routing/router-service';

import { buildQueryParams, QueryParamsObj } from '@gavant/ember-pagination/utils/query-params';

Expand Down Expand Up @@ -260,12 +261,12 @@ export class Pagination<T extends DS.Model, M = ResponseMetadata> {
* @memberof Pagination
*/
@action
loadMoreModels(): Promise<T[]> | undefined {
async loadMoreModels(): Promise<T[]> {
if (this.hasMore && !this.isLoadingModels) {
return this.loadModels();
} else {
return [];
}

return undefined;
}

/**
Expand Down
167 changes: 85 additions & 82 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,84 +1,87 @@
{
"name": "@gavant/ember-pagination",
"version": "3.0.0-beta.2",
"description": "The default blueprint for ember-cli addons.",
"keywords": [
"ember-addon"
],
"repository": "https://github.com/Gavant/gavant-ember-pagination.git",
"license": "MIT",
"author": "",
"directories": {
"doc": "doc",
"test": "tests"
},
"scripts": {
"build": "ember build",
"lint:hbs": "ember-template-lint .",
"lint:js": "eslint .",
"start": "ember serve",
"test": "ember test",
"test:all": "ember try:each",
"prepublishOnly": "ember ts:precompile",
"postpublish": "ember ts:clean"
},
"dependencies": {
"ember-cli-babel": "^7.17.2",
"ember-cli-htmlbars": "^4.2.2",
"ember-cli-moment-shim": "^3.7.1",
"ember-cli-typescript": "^3.1.4",
"moment": "^2.24.0"
},
"devDependencies": {
"@ember/optional-features": "^1.3.0",
"@glimmer/component": "^1.0.0",
"@glimmer/tracking": "^1.0.1",
"@types/ember": "^3.1.1",
"@types/ember-data": "^3.1.9",
"@types/ember-qunit": "^3.4.6",
"@types/ember-test-helpers": "^1.0.5",
"@types/ember-testing-helpers": "^0.0.3",
"@types/ember__test-helpers": "^0.7.8",
"@types/qunit": "^2.5.4",
"@types/rsvp": "^4.0.2",
"babel-eslint": "^10.0.3",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.5.3",
"ember-awesome-macros": "^4.0.0",
"ember-cli": "~3.15.2",
"ember-cli-changelog": "^0.3.4",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-eslint": "^5.1.0",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-release": "^1.0.0-beta.2",
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.3",
"ember-cli-typescript-blueprints": "^2.0.0",
"ember-cli-uglify": "^3.0.0",
"ember-data": "^3.16.4",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^7.0.1",
"ember-load-initializers": "^2.1.1",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.6.0",
"ember-resolver": "^7.0.0",
"ember-source": "^3.15.0",
"ember-source-channel-url": "^2.0.1",
"ember-try": "^1.4.0",
"eslint-plugin-ember": "^7.7.1",
"eslint-plugin-node": "^10.0.0",
"loader.js": "^4.7.0",
"qunit-dom": "^0.9.2",
"typescript": "3.7.5"
},
"engines": {
"node": "8.* || >= 10.*"
},
"ember": {
"edition": "octane"
},
"ember-addon": {
"configPath": "tests/dummy/config"
}
"name": "@gavant/ember-pagination",
"version": "3.0.0-beta.2",
"description": "The default blueprint for ember-cli addons.",
"keywords": [
"ember-addon"
],
"repository": "https://github.com/Gavant/gavant-ember-pagination.git",
"license": "MIT",
"author": "",
"directories": {
"doc": "doc",
"test": "tests"
},
"scripts": {
"build": "ember build",
"lint:hbs": "ember-template-lint .",
"lint:js": "eslint .",
"start": "ember serve",
"test": "ember test",
"test:all": "ember try:each",
"prepublishOnly": "ember ts:precompile",
"postpublish": "ember ts:clean"
},
"dependencies": {
"ember-cli-babel": "^7.17.2",
"ember-cli-htmlbars": "^4.2.2",
"ember-cli-moment-shim": "^3.7.1",
"ember-cli-typescript": "^3.1.4",
"moment": "^2.24.0"
},
"devDependencies": {
"@ember/optional-features": "^1.3.0",
"@glimmer/component": "^1.0.0",
"@glimmer/tracking": "^1.0.1",
"@types/ember": "^3.1.1",
"@types/ember-data": "^3.1.9",
"@types/ember-qunit": "^3.4.6",
"@types/ember-test-helpers": "^1.0.5",
"@types/ember-testing-helpers": "^0.0.3",
"@types/ember__test-helpers": "^0.7.8",
"@types/qunit": "^2.5.4",
"@types/rsvp": "^4.0.2",
"babel-eslint": "^10.0.3",
"broccoli-asset-rev": "^3.0.0",
"ember-auto-import": "^1.5.3",
"ember-awesome-macros": "^4.0.0",
"ember-cli": "~3.15.2",
"ember-cli-changelog": "^0.3.4",
"ember-cli-dependency-checker": "^3.2.0",
"ember-cli-eslint": "^5.1.0",
"ember-cli-inject-live-reload": "^2.0.1",
"ember-cli-release": "^1.0.0-beta.2",
"ember-cli-sri": "^2.1.1",
"ember-cli-template-lint": "^1.0.0-beta.3",
"ember-cli-typescript-blueprints": "^2.0.0",
"ember-cli-uglify": "^3.0.0",
"ember-data": "^3.16.4",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.1",
"ember-fetch": "^7.0.1",
"ember-load-initializers": "^2.1.1",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-qunit": "^4.6.0",
"ember-resolver": "^7.0.0",
"ember-source": "^3.15.0",
"ember-source-channel-url": "^2.0.1",
"ember-try": "^1.4.0",
"eslint-plugin-ember": "^7.7.1",
"eslint-plugin-node": "^10.0.0",
"loader.js": "^4.7.0",
"qunit-dom": "^0.9.2",
"typescript": "3.7.5"
},
"engines": {
"node": "8.* || >= 10.*"
},
"ember": {
"edition": "octane"
},
"ember-addon": {
"configPath": "tests/dummy/config"
},
"volta": {
"node": "10.17.0"
}
}

0 comments on commit d4a4189

Please sign in to comment.