From 70fbd4bae29ea00778802bd9f0ece315d1126f54 Mon Sep 17 00:00:00 2001 From: Binal Date: Thu, 14 Mar 2019 10:45:55 -0700 Subject: [PATCH] Item 5351: ApiAction review and migration --- src/org/labkey/snd/SNDController.java | 24 +++++++++++++----------- src/org/labkey/snd/view/sndAdmin.jsp | 3 +++ webapp/snd/test/driver.js | 3 +++ webapp/snd/test/tests.js | 13 +++++++++++++ 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/org/labkey/snd/SNDController.java b/src/org/labkey/snd/SNDController.java index 21c57961..dde5ab99 100644 --- a/src/org/labkey/snd/SNDController.java +++ b/src/org/labkey/snd/SNDController.java @@ -22,6 +22,8 @@ import org.labkey.api.action.ApiResponse; import org.labkey.api.action.ApiSimpleResponse; import org.labkey.api.action.FormHandlerAction; +import org.labkey.api.action.MutatingApiAction; +import org.labkey.api.action.ReadOnlyApiAction; import org.labkey.api.action.RedirectAction; import org.labkey.api.action.SimpleApiJsonForm; import org.labkey.api.action.SimpleViewAction; @@ -103,7 +105,7 @@ public URLHelper getURL(Object o, Errors errors) } @RequiresPermission(AdminPermission.class) - public class SavePackageAction extends ApiAction + public class SavePackageAction extends MutatingApiAction { private GWTPropertyDescriptor convertJsonToPropertyDescriptor(JSONObject json, BindException errors) { @@ -440,7 +442,7 @@ private void setAdditionalSuperPackageInfo(LinkedList superPac } @RequiresPermission(AdminPermission.class) - public class GetPackagesAction extends ApiAction + public class GetPackagesAction extends ReadOnlyApiAction { @Override public void validateForm(SimpleApiJsonForm form, Errors errors) @@ -526,7 +528,7 @@ public ApiResponse execute(SimpleApiJsonForm form, BindException errors) } @RequiresPermission(AdminPermission.class) - public class SaveProjectAction extends ApiAction + public class SaveProjectAction extends MutatingApiAction { public static final String dateFormat = "yyyy-MM-dd"; @@ -708,7 +710,7 @@ public ApiResponse execute(SimpleApiJsonForm form, BindException errors) throws } @RequiresPermission(AdminPermission.class) - public class GetProjectAction extends ApiAction + public class GetProjectAction extends ReadOnlyApiAction { @Override public void validateForm(SimpleApiJsonForm form, Errors errors) @@ -764,7 +766,7 @@ public ApiResponse execute(SimpleApiJsonForm form, BindException errors) } @RequiresPermission(ReadPermission.class) - public class GetEventAction extends ApiAction + public class GetEventAction extends ReadOnlyApiAction { @Override public void validateForm(SimpleApiJsonForm form, Errors errors) @@ -849,7 +851,7 @@ public ApiResponse execute(SimpleApiJsonForm form, BindException errors) } @RequiresPermission(InsertPermission.class) - public class SaveEventAction extends ApiAction + public class SaveEventAction extends MutatingApiAction { @Override public void validateForm(SimpleApiJsonForm form, Errors errors) @@ -1097,7 +1099,7 @@ else if (propertyId != -1) } @RequiresPermission(AdminPermission.class) - public class RegisterTestTriggerFactoryAction extends ApiAction + public class RegisterTestTriggerFactoryAction extends ReadOnlyApiAction { @Override public Object execute(SimpleApiJsonForm form, BindException errors) @@ -1136,7 +1138,7 @@ public Object execute(SimpleApiJsonForm form, BindException errors) } @RequiresPermission(AdminPermission.class) - public class ClearNarrativeCacheAction extends ApiAction + public class ClearNarrativeCacheAction extends MutatingApiAction { @Override public Object execute(SimpleApiJsonForm form, BindException errors) @@ -1147,7 +1149,7 @@ public Object execute(SimpleApiJsonForm form, BindException errors) } @RequiresPermission(AdminPermission.class) - public class FillInNarrativeCacheAction extends ApiAction + public class FillInNarrativeCacheAction extends MutatingApiAction { @Override public Object execute(SimpleApiJsonForm form, BindException errors) @@ -1158,7 +1160,7 @@ public Object execute(SimpleApiJsonForm form, BindException errors) } @RequiresPermission(AdminPermission.class) - public class PopulateQCStatesAction extends ApiAction + public class PopulateQCStatesAction extends MutatingApiAction { @Override public Object execute(SimpleApiJsonForm form, BindException errors) @@ -1239,7 +1241,7 @@ public NavTree appendNavTrail(NavTree root) } @RequiresPermission(AdminPermission.class) - public class UpdateRoleAction extends ApiAction + public class UpdateRoleAction extends MutatingApiAction { @Override public Object execute(SimpleApiJsonForm form, BindException errors) diff --git a/src/org/labkey/snd/view/sndAdmin.jsp b/src/org/labkey/snd/view/sndAdmin.jsp index 7bcb2332..8abb6d45 100644 --- a/src/org/labkey/snd/view/sndAdmin.jsp +++ b/src/org/labkey/snd/view/sndAdmin.jsp @@ -100,6 +100,7 @@ LABKEY.Ajax.request({ success: fillInCacheSuccess, failure: handleFailure, + method: 'POST', url: LABKEY.ActionURL.buildURL('snd', 'fillInNarrativeCache.api'), params: {}, scope: this @@ -112,6 +113,7 @@ LABKEY.Ajax.request({ success: clearingCacheSuccess, failure: handleFailure, + method: 'POST', url: LABKEY.ActionURL.buildURL('snd', 'clearNarrativeCache.api'), params: {}, scope: this @@ -144,6 +146,7 @@ LABKEY.Ajax.request({ success: insertQCStateSuccess, failure: handleFailure, + method: 'POST', url: LABKEY.ActionURL.buildURL('snd', 'populateQCStates.api'), params: {}, scope: this diff --git a/webapp/snd/test/driver.js b/webapp/snd/test/driver.js index 6b39adf8..b2182db3 100644 --- a/webapp/snd/test/driver.js +++ b/webapp/snd/test/driver.js @@ -488,6 +488,7 @@ for (var i = 0; i < roleData.length; i++) { multi.add(LABKEY.Ajax.request, { + method: 'POST', url: TEST_URLS.UPDATE_ROLE_URL, jsonData: roleData[i], failure: function (json) { @@ -534,6 +535,7 @@ // console.log('savePackage, savePackage api - index: ' + index); LABKEY.Ajax.request({ + method: 'POST', url: TEST_URLS.SAVE_PKG_URL, jsonData: packageData, scope: this, @@ -592,6 +594,7 @@ projectData.projectItems = projectItems; LABKEY.Ajax.request({ + method: 'POST', url: TEST_URLS.SAVE_PROJECT_URL, jsonData: projectData, scope: this, diff --git a/webapp/snd/test/tests.js b/webapp/snd/test/tests.js index 70abab77..40f8d469 100644 --- a/webapp/snd/test/tests.js +++ b/webapp/snd/test/tests.js @@ -24,6 +24,7 @@ run: function(){ return{ request:{ + method: 'POST', url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL }, expectedFailure:"Missing json parameter." @@ -34,6 +35,7 @@ run: function(){ return{ request:{ + method: 'POST', url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL, jsonData:{ eventId: 1800001, @@ -68,6 +70,7 @@ run: function(){ return{ request:{ + method: 'POST', url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL, jsonData:{ eventId: 1800001, @@ -100,6 +103,7 @@ run: function(){ return{ request:{ + method: 'POST', url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL, jsonData:{ eventId: 1800001, @@ -133,6 +137,7 @@ run : function() { return { request: { + method: 'POST', url: LABKEY.SND_TEST_URLS.SAVE_EVENT_URL, jsonData :{ eventId: 1800001, @@ -211,6 +216,7 @@ run : function() { return { request: { + method: 'POST', url: LABKEY.SND_TEST_URLS.SAVE_EVENT_URL, jsonData :{ eventId: 1800001, @@ -293,6 +299,7 @@ run: function(){ return{ request:{ + method: 'POST' url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL, jsonData:{ eventId: 1800002, @@ -354,6 +361,7 @@ { return{ request:{ + method: 'POST', url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL, jsonData:{ eventId: "1800001-1", @@ -388,6 +396,7 @@ run:function(){ return{ request:{ + method: 'POST', url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL, jsonData:{ eventId: 1800001, @@ -422,6 +431,7 @@ run:function(){ return{ request:{ + method: 'POST', url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL, jsonData:{ eventId : 1800002, @@ -456,6 +466,7 @@ run:function(){ return{ request:{ + method: 'POST', url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL, jsonData:{ eventId : 1800002, @@ -491,6 +502,7 @@ run: function () { return { request: { + method: 'POST', url: LABKEY.SND_TEST_URLS.SAVE_EVENT_URL, jsonData: { eventId: 1700007, @@ -744,6 +756,7 @@ // Set up save event request var saveRequest = { request: { + method: 'POST', url: LABKEY.SND_TEST_URLS.SAVE_EVENT_URL, jsonData: testData.jsonData }