#728 fix as comments

AtlasOfLivingAustralia · Oct 10, 2023 · a5cfb6e · a5cfb6e
1 parent 7fa17b9
commit a5cfb6e
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/grails-app/assets/javascripts/profileEditor/controllers/AdminController.js b/grails-app/assets/javascripts/profileEditor/controllers/AdminController.js
@@ -230,7 +230,7 @@ profileEditor.controller('ALAAdminController', function ($http, util, messageSer
 
     function cacheManagement() {
         self.loadingCacheManagement = true;
-        var promise = $http.get(util.contextRoot() + "/admin/cacheManagement/");
+        var promise = $http.get(util.contextRoot() + "/admin/cacheManagement");
         promise.then(function (response) {
             self.cacheRegions = response.data || [];
             self.loadingCacheManagement = false;
@@ -241,10 +241,14 @@ profileEditor.controller('ALAAdminController', function ($http, util, messageSer
 
     self.clearCache = function (cache) {
         var promise = $http.get(util.contextRoot() + "/admin/clearCache/" + cache);
-        promise.then(function() {
-            messageService.success("Job clear cache for " +  cache);
+        promise.then(function(response) {
+            if (response.data.error) {
+                messageService.alert(response.data.error);
+            } else {
+                messageService.success(response.data.resp);
+            }
         }, function() {
-            messageService.alert("Failed to clear cache the job");
+            messageService.alert(response.data.error);
         });
     }
 });
diff --git a/grails-app/controllers/au/org/ala/profile/hub/AdminController.groovy b/grails-app/controllers/au/org/ala/profile/hub/AdminController.groovy
@@ -127,9 +127,15 @@ class AdminController extends BaseController {
 
     @Secured(role = Role.ROLE_ADMIN, opusSpecific = false)
     def clearCache() {
+        Map result = [:]
         if (params.id) {
             grailsCacheManager.getCache(params.id).clear()
+            result.resp = "Successfully cleared cache - " + params.id
+            result.statusCode = HttpStatus.SC_OK
+        } else {
+            result.error = "Failed to clear cache the job"
+            result.statusCode = HttpStatus.SC_INTERNAL_SERVER_ERROR
         }
-        render view: "admin.gsp"
+        success result
     }
 }
diff --git a/grails-app/controllers/au/org/ala/profile/hub/UrlMappings.groovy b/grails-app/controllers/au/org/ala/profile/hub/UrlMappings.groovy
@@ -202,8 +202,8 @@ class UrlMappings {
         "/admin/job/$jobType/$jobId" controller: "admin", action: [DELETE: "deleteJob"]
         "/admin/job/" controller: "admin", action: [GET: "listPendingJobs"]
         "/admin/tag/$tagId?" controller: "admin", action: [GET: "getTag", PUT: "createTag", POST: "updateTag", DELETE: "deleteTag"]
-        "/admin/cacheManagement/" controller: "admin", action: [GET: "cacheManagement"]
-        "/admin/clearCache" controller: "admin", action: [GET: "clearCache"]
+        "/admin/cacheManagement" controller: "admin", action: [GET: "cacheManagement"]
+        "/admin/clearCache/$id" controller: "admin", action: [GET: "clearCache"]
         "/admin/reloadHelpUrls" controller: "admin", action: [POST: "reloadHelpUrls"]
         "/admin" controller: "admin", action: [GET: "index"]
         "/alaAdmin/index" controller: "admin", action: [GET: "alaIndex"]

diff --git a/grails-app/views/admin/admin.gsp b/grails-app/views/admin/admin.gsp
@@ -170,8 +170,10 @@
             <div class="table-responsive" ng-show="adminCtrl.cacheRegions.length > 0">
                 <table class="table table-striped">
                     <thead>
-                    <th>Cache Name</th>
-                    <th>Cache Clear</th>
+                    <tr>
+                        <th>Cache Name</th>
+                        <th>Actions</th>
+                    </tr>
                     </thead>
                     <tbody>
                     <tr ng-repeat="cache in adminCtrl.cacheRegions">