Merge pull request #923 from uPortal-Project/cache-http-get-consistently

Configure $http.get usages to cache
uPortal-Attic · Feb 17, 2021 · 9b908a8 · 9b908a8
2 parents 603db11 + 5db3c17
commit 9b908a8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,11 @@ and this project adheres to
 Versions in this document should match those
 [published to Sonatype Maven Central Repository][].
 
+## Next
+
++ Configure usages of `$http.get` to cache.
+  Previously some usages did not turn on caching.
+
 ## 12.0.0 - 2021-02-05
 
 **Breaking change: "silent" login is no longer a thing.**

diff --git a/web/src/main/webapp/my-app/layout/services.js b/web/src/main/webapp/my-app/layout/services.js
@@ -179,7 +179,8 @@ define(['angular', 'jquery'], function(angular, $) {
               };
 
               // no caching...  request from the server
-              return $http.get(SERVICE_LOC.context + SERVICE_LOC.layout)
+              return $http.get(SERVICE_LOC.context + SERVICE_LOC.layout,
+                {cache: true} )
                   .then(successFn, errorFn);
       };
 
@@ -207,13 +208,15 @@ define(['angular', 'jquery'], function(angular, $) {
                 };
 
                 // no caching...  request from the server
-                return $http.get(SERVICE_LOC.context + SERVICE_LOC.layout)
+                return $http.get(
+                  SERVICE_LOC.context + SERVICE_LOC.layout, {cache: true} )
                     .then(successFn, errorFn);
             });
         };
 
         var getApp = function(fname) {
-            return $http.get(SERVICE_LOC.base + 'portlet/' +fname + '.json')
+            return $http.get(SERVICE_LOC.base + 'portlet/' +fname + '.json',
+              {cache: true})
               .then(
                 function(result) {
                     return result;
@@ -335,7 +338,7 @@ define(['angular', 'jquery'], function(angular, $) {
             //    run that through an RSS to JSON converter.
             // Whereas this hack repurposes existing configuration for (3)
             // to do (1).
-          return $http.get(feedURL);
+          return $http.get(feedURL, {cache: true});
         };
 
         return {

diff --git a/web/src/main/webapp/my-app/marketplace/services.js b/web/src/main/webapp/my-app/marketplace/services.js
@@ -181,7 +181,7 @@ define(['angular', 'jquery'], function(angular, $) {
 
         var getUserRating = function(fname) {
             return $http.get(SERVICE_LOC.base + SERVICE_LOC.marketplace.base +
-                fname + '/getRating')
+                fname + '/getRating', {cache: true})
               .then(function(result) {
                 return result.data.rating;
               });
@@ -305,7 +305,7 @@ define(['angular', 'jquery'], function(angular, $) {
           return $http.get(
               SERVICE_LOC.base +
               SERVICE_LOC.marketplace.base + fname +
-              '/ratings')
+              '/ratings', {cache: true})
             .then(function(result) {
               return result.data.ratings;
             });

diff --git a/web/src/main/webapp/my-app/search/services.js b/web/src/main/webapp/my-app/search/services.js
@@ -101,7 +101,8 @@ define(['angular', 'jquery'], function(angular, $) {
         return getGoogleSearchURL().then(function(googleSearchURL) {
           return $q(function(resolve, reject) {
             if (googleSearchURL) {
-              return $http.get(googleSearchURL + '&q=' + term).then(
+              return $http.get(googleSearchURL + '&q=' + term,
+                {cache: true}).then(
                 function(response) {
                   var data = {
                     results: null,
@@ -327,7 +328,8 @@ define(['angular', 'jquery'], function(angular, $) {
         return getDirectorySearchURL().then(function(searchDirectoryURL) {
           return $q(function(resolve, reject) {
             if (searchDirectoryURL) {
-              return $http.get(searchDirectoryURL + '/?name=' + term).then(
+              return $http.get(searchDirectoryURL + '/?name=' + term,
+                {cache: true}).then(
                 function(response) {
                   return resolve(response.data);
                 },