@@ -10,8 +10,10 @@ import { LocalFilter } from './services/localfilter';
10
10
import { CacheMemory } from './services/cachememory' ;
11
11
import { CacheStore } from './services/cachestore' ;
12
12
13
- import { IService , ISchema , IResource , ICollection , IExecParams , ICacheStore , ICacheMemory ,
14
- IParamsCollection , IParamsResource , IAttributes } from './interfaces' ;
13
+ import {
14
+ IService , ISchema , IResource , ICollection , IExecParams , ICacheStore , ICacheMemory ,
15
+ IParamsCollection , IParamsResource , IAttributes
16
+ } from './interfaces' ;
15
17
16
18
export class Service extends ParentResourceService implements IService {
17
19
public schema : ISchema ;
@@ -95,11 +97,13 @@ export class Service extends ParentResourceService implements IService {
95
97
if ( this . getService ( ) . cachememory . isResourceLive ( id , temporal_ttl ) ) {
96
98
// we create a promise because we need return collection before
97
99
// run success client function
98
- var deferred = Core . injectedServices . $q . defer ( ) ;
100
+ let deferred = Core . injectedServices . $q . defer ( ) ;
99
101
deferred . resolve ( fc_success ) ;
100
102
deferred . promise . then ( fc_success => {
101
103
this . runFc ( fc_success , 'cachememory' ) ;
102
- } ) ;
104
+ } )
105
+ // .catch(() => {})
106
+ ;
103
107
resource . is_loading = false ;
104
108
return resource ;
105
109
} else {
@@ -130,7 +134,9 @@ export class Service extends ParentResourceService implements IService {
130
134
this . getService ( ) . cachememory . setResource ( resource ) ;
131
135
this . getService ( ) . cachestore . setResource ( resource ) ;
132
136
this . runFc ( fc_success , success ) ;
133
- } ,
137
+ }
138
+ )
139
+ . catch (
134
140
error => {
135
141
this . runFc ( fc_error , error ) ;
136
142
}
@@ -160,9 +166,9 @@ export class Service extends ParentResourceService implements IService {
160
166
if ( params . page . number > 1 ) {
161
167
path . addParam ( Core . injectedServices . rsJsonapiConfig . parameters . page . number + '=' + params . page . number ) ;
162
168
}
163
- if ( params . page . limit ) {
164
- path . addParam ( Core . injectedServices . rsJsonapiConfig . parameters . page . limit + '=' + params . page . limit ) ;
165
- }
169
+ if ( params . page . limit ) {
170
+ path . addParam ( Core . injectedServices . rsJsonapiConfig . parameters . page . limit + '=' + params . page . limit ) ;
171
+ }
166
172
}
167
173
168
174
// make request
@@ -173,9 +179,9 @@ export class Service extends ParentResourceService implements IService {
173
179
let localfilter = new LocalFilter ( params . localfilter ) ;
174
180
let cached_collection : ICollection ;
175
181
if ( params . localfilter && Object . keys ( params . localfilter ) . length > 0 ) {
176
- cached_collection = Base . newCollection ( ) ;
182
+ cached_collection = Base . newCollection ( ) ;
177
183
} else {
178
- cached_collection = tempororay_collection ;
184
+ cached_collection = tempororay_collection ;
179
185
}
180
186
181
187
// MEMORY_CACHE
@@ -200,7 +206,9 @@ export class Service extends ParentResourceService implements IService {
200
206
deferred . resolve ( fc_success ) ;
201
207
deferred . promise . then ( fc_success => {
202
208
this . runFc ( fc_success , 'cachememory' ) ;
203
- } ) ;
209
+ } )
210
+ . catch ( ( ) => { } )
211
+ ;
204
212
} else {
205
213
this . getAllFromServer ( path , params , fc_success , fc_error , tempororay_collection , cached_collection ) ;
206
214
}
@@ -225,7 +233,8 @@ export class Service extends ParentResourceService implements IService {
225
233
} else {
226
234
this . getAllFromServer ( path , params , fc_success , fc_error , tempororay_collection , cached_collection ) ;
227
235
}
228
- } ,
236
+ }
237
+ ) . catch (
229
238
error => {
230
239
this . getAllFromServer ( path , params , fc_success , fc_error , tempororay_collection , cached_collection ) ;
231
240
}
@@ -273,7 +282,9 @@ export class Service extends ParentResourceService implements IService {
273
282
}
274
283
275
284
this . runFc ( fc_success , success ) ;
276
- } ,
285
+ }
286
+ )
287
+ . catch (
277
288
error => {
278
289
// do not replace $source, because localstorage don't write if = server
279
290
// tempororay_collection.$source = 'server';
@@ -295,7 +306,8 @@ export class Service extends ParentResourceService implements IService {
295
306
success => {
296
307
this . getService ( ) . cachememory . removeResource ( id ) ;
297
308
this . runFc ( fc_success , success ) ;
298
- } ,
309
+ }
310
+ ) . catch (
299
311
error => {
300
312
this . runFc ( fc_error , error ) ;
301
313
}
0 commit comments