CR feedback

Author: labkey-martyp

ehr/resources/views/postgresMigration.html

@@ -5,10 +5,13 @@
     </div>
 </div>
 <script type="text/javascript" nonce="<%=scriptNonce%>">
-    function indexAction(actionName) {
+    function indexAction(operation) {
         LABKEY.Ajax.request({
-            url: LABKEY.ActionURL.buildURL('ehr', actionName),
+            url: LABKEY.ActionURL.buildURL('ehr', 'updateEHRIndices'),
             method: 'POST',
+            jsonData: {
+                operation: operation
+            },
             success: function(response) {
                 var json = JSON.parse(response.responseText);
                 if (json.success) {
@@ -34,11 +37,11 @@
 
     LABKEY.Utils.attachEventHandler('dropIndicesLink', 'click', function(e) {
         e.preventDefault();
-        indexAction('dropEHRIndices');
+        indexAction('drop');
     }, 1);
 
     LABKEY.Utils.attachEventHandler('addIndicesLink', 'click', function(e) {
         e.preventDefault();
-        indexAction('addEHRIndices');
+        indexAction('add');
     }, 1);
 </script>

ehr/src/org/labkey/ehr/EHRController.java

@@ -684,39 +684,55 @@ public ApiResponse execute(RecordDeleteForm form, BindException errors)
         }
     }
 
+    public static class UpdateEHRIndicesForm
+    {
+        private String _operation;
+
+        public String getOperation()
+        {
+            return _operation;
+        }
+
+        public void setOperation(String operation)
+        {
+            _operation = operation;
+        }
+    }
+
     @RequiresPermission(AdminPermission.class)
-    public static class DropEHRIndicesAction extends MutatingApiAction<Object>
+    public static class UpdateEHRIndicesAction extends MutatingApiAction<UpdateEHRIndicesForm>
     {
         @Override
-        public ApiResponse execute(Object form, BindException errors)
+        public void validateForm(UpdateEHRIndicesForm form, Errors errors)
         {
-            try
+            super.validateForm(form, errors);
+
+            if (form.getOperation() == null)
             {
-                List<String> messages = EHRManager.get().dropEHRIndices(getContainer(), getUser());
-                Map<String, Object> response = new HashMap<>();
-                response.put("success", true);
-                response.put("messages", messages);
-                return new ApiSimpleResponse(response);
+                errors.reject(ERROR_MSG, "Operation parameter is required.");
             }
-            catch (Exception e)
+            else if (!"add".equalsIgnoreCase(form.getOperation()) && !"drop".equalsIgnoreCase(form.getOperation()))
             {
-                Map<String, Object> response = new HashMap<>();
-                response.put("success", false);
-                response.put("message", e.getMessage());
-                return new ApiSimpleResponse(response);
+                errors.reject(ERROR_MSG, "Invalid operation. Must be 'add' or 'drop'.");
             }
         }
-    }
 
-    @RequiresPermission(AdminPermission.class)
-    public static class AddEHRIndicesAction extends MutatingApiAction<Object>
-    {
         @Override
-        public ApiResponse execute(Object form, BindException errors)
+        public ApiResponse execute(UpdateEHRIndicesForm form, BindException errors)
         {
             try
             {
-                List<String> messages = EHRManager.get().addEHRIndices(getContainer(), getUser());
+                List<String> messages;
+
+                if ("drop".equalsIgnoreCase(form.getOperation()))
+                {
+                    messages = EHRManager.get().dropEHRIndices(getContainer(), getUser());
+                }
+                else
+                {
+                    messages = EHRManager.get().addEHRIndices(getContainer(), getUser());
+                }
+
                 Map<String, Object> response = new HashMap<>();
                 response.put("success", true);
                 response.put("messages", messages);