Skip to content

Commit 4ba9c69

Browse files
committed
fix pagination next prev
1 parent 5c9ed73 commit 4ba9c69

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/resource-array.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ export class ResourceArray<T extends Resource> implements ArrayInterface<T> {
4646
// Load next page
4747
next = (type: { new(): T }): Observable<ResourceArray<T>> => {
4848
if (this.next_uri) {
49-
return ResourceHelper.getHttp().get(ResourceHelper.getProxy(this.next_uri), {headers: ResourceHelper.headers}).pipe(
49+
return ResourceHelper.getHttp().get(ResourceHelper.getProxy(this.next_uri), {headers: ResourceHelper.headers, observe: 'response'}).pipe(
5050
map(response => this.init(type, response, this.sortInfo)),
5151
catchError(error => observableThrowError(error)),);
5252
}
@@ -55,7 +55,7 @@ export class ResourceArray<T extends Resource> implements ArrayInterface<T> {
5555

5656
prev = (type: { new(): T }): Observable<ResourceArray<T>> => {
5757
if (this.prev_uri) {
58-
return ResourceHelper.getHttp().get(ResourceHelper.getProxy(this.prev_uri), {headers: ResourceHelper.headers}).pipe(
58+
return ResourceHelper.getHttp().get(ResourceHelper.getProxy(this.prev_uri), {headers: ResourceHelper.headers, observe: 'response'}).pipe(
5959
map(response => this.init(type, response, this.sortInfo)),
6060
catchError(error => observableThrowError(error)),);
6161
}
@@ -66,7 +66,7 @@ export class ResourceArray<T extends Resource> implements ArrayInterface<T> {
6666

6767
first = (type: { new(): T }): Observable<ResourceArray<T>> => {
6868
if (this.first_uri) {
69-
return ResourceHelper.getHttp().get(ResourceHelper.getProxy(this.first_uri), {headers: ResourceHelper.headers}).pipe(
69+
return ResourceHelper.getHttp().get(ResourceHelper.getProxy(this.first_uri), {headers: ResourceHelper.headers, observe: 'response'}).pipe(
7070
map(response => this.init(type, response, this.sortInfo)),
7171
catchError(error => observableThrowError(error)),);
7272
}
@@ -77,7 +77,7 @@ export class ResourceArray<T extends Resource> implements ArrayInterface<T> {
7777

7878
last = (type: { new(): T }): Observable<ResourceArray<T>> => {
7979
if (this.last_uri) {
80-
return ResourceHelper.getHttp().get(ResourceHelper.getProxy(this.last_uri), {headers: ResourceHelper.headers}).pipe(
80+
return ResourceHelper.getHttp().get(ResourceHelper.getProxy(this.last_uri), {headers: ResourceHelper.headers, observe: 'response'}).pipe(
8181
map(response => this.init(type, response, this.sortInfo)),
8282
catchError(error => observableThrowError(error)),);
8383
}
@@ -97,7 +97,7 @@ export class ResourceArray<T extends Resource> implements ArrayInterface<T> {
9797
let uri = urlParsed.query ?
9898
ResourceHelper.getProxy(this.self_uri).replace(urlParsed.query, query) : ResourceHelper.getProxy(this.self_uri).concat(query);
9999
uri = this.addSortInfo(uri);
100-
return ResourceHelper.getHttp().get(uri, {headers: ResourceHelper.headers}).pipe(
100+
return ResourceHelper.getHttp().get(uri, {headers: ResourceHelper.headers, observe: 'response'}).pipe(
101101
map(response => this.init(type, response, this.sortInfo)),
102102
catchError(error => observableThrowError(error)),);
103103
};
@@ -110,7 +110,7 @@ export class ResourceArray<T extends Resource> implements ArrayInterface<T> {
110110
this.self_uri = this.self_uri.replace('{&sort}', '');
111111
let uri = ResourceHelper.getProxy(this.self_uri).concat('?', 'size=', this.pageSize.toString(), '&page=', this.pageNumber.toString());
112112
uri = this.addSortInfo(uri);
113-
return ResourceHelper.getHttp().get(uri, {headers: ResourceHelper.headers}).pipe(
113+
return ResourceHelper.getHttp().get(uri, {headers: ResourceHelper.headers, observe: 'response'}).pipe(
114114
map(response => this.init(type, response, sort)),
115115
catchError(error => observableThrowError(error)),);
116116
};
@@ -120,7 +120,7 @@ export class ResourceArray<T extends Resource> implements ArrayInterface<T> {
120120
size = (type: { new(): T }, size: number): Observable<ResourceArray<T>> => {
121121
let uri = ResourceHelper.getProxy(this.self_uri).concat('?', 'size=', size.toString());
122122
uri = this.addSortInfo(uri);
123-
return ResourceHelper.getHttp().get(uri, {headers: ResourceHelper.headers}).pipe(
123+
return ResourceHelper.getHttp().get(uri, {headers: ResourceHelper.headers, observe: 'response'}).pipe(
124124
map(response => this.init(type, response, this.sortInfo)),
125125
catchError(error => observableThrowError(error)),);
126126
};

0 commit comments

Comments
 (0)