[develop | DONE | CHANGED]: refineFieldResults.service.ts & searchDataproviders.service.ts & searchOrganizations.service.ts & searchProjects.service.ts & searchResearchResults.service.ts: Set cache for default refine queries (without keywords or filters) - not in deposit and datasource specific pages.

services/refineFieldResults.service.ts

@@ -57,7 +57,8 @@ export class RefineFieldResultsService {
     getField (link:string,fieldName:string, properties:EnvProperties):any{
       let url = link+"&refine=true&page=1&size=0";
 
-      return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url)
+      // return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url)
+      return this.http.get((properties.useLongCache && link.includes("sf=") && !link.includes("fq="))? (properties.cacheUrl+encodeURIComponent(url)): url)
                   //.map(res => <any> res.json())
                   .pipe(map(res => res['refineResults']))
                   .pipe(map(res =>  this.parse(res,fieldName)));

services/searchDataproviders.service.ts

@@ -47,8 +47,9 @@ export class SearchDataprovidersService {
       url += "&page="+(page-1)+"&size="+size;
       url += minRef ? "&minRef=true" : "";
 
-      return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url)
-      .pipe(map(res => [res['meta'].total, this.parseResults(res['results']), RefineResultsUtils.parse(res['refineResults'],refineFields, "datasource")]));
+      // return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url)
+      return this.http.get((properties.useLongCache && size == 0 && !params && (!refineQuery || !refineQuery.includes("fq="))) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
+        .pipe(map(res => [res['meta'].total, this.parseResults(res['results']), RefineResultsUtils.parse(res['refineResults'],refineFields, "datasource")]));
     }
 
     searchDataprovidersForDeposit (id: string,type:string, page: number, size: number, properties:EnvProperties):any {

services/searchOrganizations.service.ts

@@ -80,8 +80,9 @@ export class SearchOrganizationsService {
       url += "&page="+(page-1)+"&size="+size;
       url += minRef ? "&minRef=true" : "";
 
-      return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url)
-      //.map(res => <any> res.json())
+      // return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url)
+      return this.http.get((properties.useLongCache && size == 0 && !params && (!refineQuery || !refineQuery.includes("fq="))) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
+        //.map(res => <any> res.json())
 
       .pipe(map(res => [res['meta'].total, this.parseResults(res['results']),RefineResultsUtils.parse(res['refineResults'],refineFields, "organization")]));
     }

services/searchProjects.service.ts

@@ -70,8 +70,9 @@ export class SearchProjectsService {
       url += minRef ? "&minRef=true" : "";
 
       // url += "&format=json";
-      return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url)
-      //.map(res => <any> res.json())
+      // return this.http.get((properties.useCache)? (properties.cacheUrl+encodeURIComponent(url)): url)
+      return this.http.get((properties.useLongCache && size == 0 && !params && (!refineQuery || !refineQuery.includes("fq="))) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
+        //.map(res => <any> res.json())
       .pipe(map(res => [res['meta'].total, this.parseResults(res['results']), RefineResultsUtils.parse(res['refineResults'],refineFields, "project")]));
     }
     

services/searchResearchResults.service.ts

@@ -129,7 +129,8 @@ export class SearchResearchResultsService {
     url += minRef ? "&minRef=true" : "";
     // url += "&format=json";
 
-    return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
+    // return this.http.get((properties.useCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
+    return this.http.get((properties.useLongCache && size == 0 && !params && (!refineQuery || !refineQuery.includes("fq="))) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
         .pipe(map(res => [res['meta'].total, this.parseResults(resultType, res['results'], properties), RefineResultsUtils.parse(res['refineResults'], refineFields, "publication")]));
   }