Skip to content
This repository was archived by the owner on Feb 9, 2026. It is now read-only.

19.1 fb migrate api action #9

Merged
labkey-bpatel merged 1 commit into from
Mar 14, 2019
Merged

19.1 fb migrate api action #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/org/labkey/snd/SNDController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -103,7 +105,7 @@ public URLHelper getURL(Object o, Errors errors)
}

@RequiresPermission(AdminPermission.class)
public class SavePackageAction extends ApiAction<SimpleApiJsonForm>
public class SavePackageAction extends MutatingApiAction<SimpleApiJsonForm>
{
private GWTPropertyDescriptor convertJsonToPropertyDescriptor(JSONObject json, BindException errors)
{
Expand Down Expand Up @@ -440,7 +442,7 @@ private void setAdditionalSuperPackageInfo(LinkedList<SuperPackageInfo> superPac
}

@RequiresPermission(AdminPermission.class)
public class GetPackagesAction extends ApiAction<SimpleApiJsonForm>
public class GetPackagesAction extends ReadOnlyApiAction<SimpleApiJsonForm>
{
@Override
public void validateForm(SimpleApiJsonForm form, Errors errors)
Expand Down Expand Up @@ -526,7 +528,7 @@ public ApiResponse execute(SimpleApiJsonForm form, BindException errors)
}

@RequiresPermission(AdminPermission.class)
public class SaveProjectAction extends ApiAction<SimpleApiJsonForm>
public class SaveProjectAction extends MutatingApiAction<SimpleApiJsonForm>
{

public static final String dateFormat = "yyyy-MM-dd";
Expand Down Expand Up @@ -708,7 +710,7 @@ public ApiResponse execute(SimpleApiJsonForm form, BindException errors) throws
}

@RequiresPermission(AdminPermission.class)
public class GetProjectAction extends ApiAction<SimpleApiJsonForm>
public class GetProjectAction extends ReadOnlyApiAction<SimpleApiJsonForm>
{
@Override
public void validateForm(SimpleApiJsonForm form, Errors errors)
Expand Down Expand Up @@ -764,7 +766,7 @@ public ApiResponse execute(SimpleApiJsonForm form, BindException errors)
}

@RequiresPermission(ReadPermission.class)
public class GetEventAction extends ApiAction<SimpleApiJsonForm>
public class GetEventAction extends ReadOnlyApiAction<SimpleApiJsonForm>
{
@Override
public void validateForm(SimpleApiJsonForm form, Errors errors)
Expand Down Expand Up @@ -849,7 +851,7 @@ public ApiResponse execute(SimpleApiJsonForm form, BindException errors)
}

@RequiresPermission(InsertPermission.class)
public class SaveEventAction extends ApiAction<SimpleApiJsonForm>
public class SaveEventAction extends MutatingApiAction<SimpleApiJsonForm>
{
@Override
public void validateForm(SimpleApiJsonForm form, Errors errors)
Expand Down Expand Up @@ -1097,7 +1099,7 @@ else if (propertyId != -1)
}

@RequiresPermission(AdminPermission.class)
public class RegisterTestTriggerFactoryAction extends ApiAction<SimpleApiJsonForm>
public class RegisterTestTriggerFactoryAction extends ReadOnlyApiAction<SimpleApiJsonForm>
{
@Override
public Object execute(SimpleApiJsonForm form, BindException errors)
Expand Down Expand Up @@ -1136,7 +1138,7 @@ public Object execute(SimpleApiJsonForm form, BindException errors)
}

@RequiresPermission(AdminPermission.class)
public class ClearNarrativeCacheAction extends ApiAction<SimpleApiJsonForm>
public class ClearNarrativeCacheAction extends MutatingApiAction<SimpleApiJsonForm>
{
@Override
public Object execute(SimpleApiJsonForm form, BindException errors)
Expand All @@ -1147,7 +1149,7 @@ public Object execute(SimpleApiJsonForm form, BindException errors)
}

@RequiresPermission(AdminPermission.class)
public class FillInNarrativeCacheAction extends ApiAction<SimpleApiJsonForm>
public class FillInNarrativeCacheAction extends MutatingApiAction<SimpleApiJsonForm>
{
@Override
public Object execute(SimpleApiJsonForm form, BindException errors)
Expand All @@ -1158,7 +1160,7 @@ public Object execute(SimpleApiJsonForm form, BindException errors)
}

@RequiresPermission(AdminPermission.class)
public class PopulateQCStatesAction extends ApiAction<SimpleApiJsonForm>
public class PopulateQCStatesAction extends MutatingApiAction<SimpleApiJsonForm>
{
@Override
public Object execute(SimpleApiJsonForm form, BindException errors)
Expand Down Expand Up @@ -1239,7 +1241,7 @@ public NavTree appendNavTrail(NavTree root)
}

@RequiresPermission(AdminPermission.class)
public class UpdateRoleAction extends ApiAction<SimpleApiJsonForm>
public class UpdateRoleAction extends MutatingApiAction<SimpleApiJsonForm>
{
@Override
public Object execute(SimpleApiJsonForm form, BindException errors)
Expand Down
3 changes: 3 additions & 0 deletions src/org/labkey/snd/view/sndAdmin.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
LABKEY.Ajax.request({
success: fillInCacheSuccess,
failure: handleFailure,
method: 'POST',
url: LABKEY.ActionURL.buildURL('snd', 'fillInNarrativeCache.api'),
params: {},
scope: this
Expand All @@ -112,6 +113,7 @@
LABKEY.Ajax.request({
success: clearingCacheSuccess,
failure: handleFailure,
method: 'POST',
url: LABKEY.ActionURL.buildURL('snd', 'clearNarrativeCache.api'),
params: {},
scope: this
Expand Down Expand Up @@ -144,6 +146,7 @@
LABKEY.Ajax.request({
success: insertQCStateSuccess,
failure: handleFailure,
method: 'POST',
url: LABKEY.ActionURL.buildURL('snd', 'populateQCStates.api'),
params: {},
scope: this
Expand Down
3 changes: 3 additions & 0 deletions webapp/snd/test/driver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -592,6 +594,7 @@
projectData.projectItems = projectItems;

LABKEY.Ajax.request({
method: 'POST',
url: TEST_URLS.SAVE_PROJECT_URL,
jsonData: projectData,
scope: this,
Expand Down
13 changes: 13 additions & 0 deletions webapp/snd/test/tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
run: function(){
return{
request:{
method: 'POST',
url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL
},
expectedFailure:"Missing json parameter."
Expand All @@ -34,6 +35,7 @@
run: function(){
return{
request:{
method: 'POST',
url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL,
jsonData:{
eventId: 1800001,
Expand Down Expand Up @@ -68,6 +70,7 @@
run: function(){
return{
request:{
method: 'POST',
url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL,
jsonData:{
eventId: 1800001,
Expand Down Expand Up @@ -100,6 +103,7 @@
run: function(){
return{
request:{
method: 'POST',
url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL,
jsonData:{
eventId: 1800001,
Expand Down Expand Up @@ -133,6 +137,7 @@
run : function() {
return {
request: {
method: 'POST',
url: LABKEY.SND_TEST_URLS.SAVE_EVENT_URL,
jsonData :{
eventId: 1800001,
Expand Down Expand Up @@ -211,6 +216,7 @@
run : function() {
return {
request: {
method: 'POST',
url: LABKEY.SND_TEST_URLS.SAVE_EVENT_URL,
jsonData :{
eventId: 1800001,
Expand Down Expand Up @@ -293,6 +299,7 @@
run: function(){
return{
request:{
method: 'POST'
url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL,
jsonData:{
eventId: 1800002,
Expand Down Expand Up @@ -354,6 +361,7 @@
{
return{
request:{
method: 'POST',
url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL,
jsonData:{
eventId: "1800001-1",
Expand Down Expand Up @@ -388,6 +396,7 @@
run:function(){
return{
request:{
method: 'POST',
url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL,
jsonData:{
eventId: 1800001,
Expand Down Expand Up @@ -422,6 +431,7 @@
run:function(){
return{
request:{
method: 'POST',
url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL,
jsonData:{
eventId : 1800002,
Expand Down Expand Up @@ -456,6 +466,7 @@
run:function(){
return{
request:{
method: 'POST',
url:LABKEY.SND_TEST_URLS.SAVE_EVENT_URL,
jsonData:{
eventId : 1800002,
Expand Down Expand Up @@ -491,6 +502,7 @@
run: function () {
return {
request: {
method: 'POST',
url: LABKEY.SND_TEST_URLS.SAVE_EVENT_URL,
jsonData: {
eventId: 1700007,
Expand Down Expand Up @@ -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
}
Expand Down