fix/pass-v2.1-to-v2.2 (#313)

Author: ahumadamatias

CHANGELOG.md

@@ -6,6 +6,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [2.2.2] - 2021-05-19
+
+### Fixed
+
+-   When ttl 0 was set, a request to the server was not made again, it brought it from memory, it was corrected in the isLive function of common.
+-   When the value of a remote filter contained '&', the generated url did not keep the '&'.
+
 ## [2.2.1] - 2020-10-17
 
 ### Fixed

src/common.ts

@@ -5,7 +5,7 @@ import { DocumentCollection } from './document-collection';
 import { Resource } from './resource';
 
 export function isLive(cacheable: ICacheable, ttl?: number): boolean {
-    let ttl_in_seconds = ttl && typeof ttl === 'number' ? ttl : cacheable.ttl || 0;
+    let ttl_in_seconds = typeof ttl === 'number' ? ttl : cacheable.ttl || 0;
 
     return Date.now() < cacheable.cache_last_update + ttl_in_seconds * 1000;
 }

src/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ngx-jsonapi",
-    "version": "2.2.1",
+    "version": "2.2.2",
     "description": "JSON API library for Angular",
     "module": "ngx-jsonapi/@ngx-jsonapi/ngx-jsonapi.es5.js",
     "es2015": "ngx-jsonapi/@ngx-jsonapi/ngx-jsonapi.js",

src/service.spec.ts

@@ -156,6 +156,32 @@ for (let store_cache_method of store_cache_methods) {
             expect(http_request_spy).toHaveBeenCalledTimes(0);
         });
 
+        it(`with cached on memory (live) collection emits source ^memory-server| when force ttl = 0 on call`, async () => {
+            // caching collection
+            test_response_subject.next(new HttpResponse({ body: TestFactory.getCollectionDocumentData(Book) }));
+            booksService.collections_ttl = 5; // live
+            await booksService.all({ store_cache_method: store_cache_method }).toPromise();
+
+            let http_request_spy = spyOn(HttpClient.prototype, 'request').and.callThrough();
+            let expected = [
+                // expected emits
+                { builded: true, loaded: false, source: 'memory' },
+                { builded: true, loaded: true, source: 'server' }
+            ];
+
+            let emits = await booksService
+                .all({ ttl: 0, store_cache_method: store_cache_method })
+                .pipe(
+                    map(emit => {
+                        return { builded: emit.builded, loaded: emit.loaded, source: emit.source };
+                    }),
+                    toArray()
+                )
+                .toPromise();
+            expect(emits).toMatchObject(expected);
+            expect(http_request_spy).toHaveBeenCalledTimes(1);
+        });
+
         it(`with cached on memory (dead) collection emits source ^memory-server|`, async () => {
             // caching collection
             test_response_subject.next(new HttpResponse({ body: TestFactory.getCollectionDocumentData(Book) }));

src/services/path-collection-builder.spec.ts

@@ -77,6 +77,11 @@ describe('Path Builder', () => {
         expect(path_collection_builder.get().includes('fields[authors]=name,address&fields[books]=title')).toBeTruthy();
     });
 
+    it('if filter with characters such as "&" are provided, they must be formatted and included in get_params', () => {
+        path_collection_builder.applyParams(testService, { remotefilter: { field: 'foo&bar' } });
+        expect(path_collection_builder.get().includes('filter[field]=foo%26bar')).toBeTruthy();
+    });
+
     it('if page params are provided, applyParams should call addParam one or two times with the page number and size', () => {
         Core.injectedServices.rsJsonapiConfig.parameters.page.number = 'page_index';
         Core.injectedServices.rsJsonapiConfig.parameters.page.size = 'page_size';

src/services/url-params-builder.ts

@@ -14,7 +14,7 @@ export class UrlParamsBuilder {
         let ret = '';
         if (Array.isArray(params) || params instanceof Object) {
             Base.forEach(params, (value, key) => {
-                ret += this.toparamsarray(value, add + '[' + key + ']');
+                ret += this.toparamsarray(encodeURIComponent(value), add + '[' + key + ']');
             });
         } else {
             ret += add + '=' + params;