From 5338992130d3c4a79808e926c84e5beb2de68c23 Mon Sep 17 00:00:00 2001 From: labkey-ankurj Date: Tue, 22 Sep 2020 15:02:45 -0700 Subject: [PATCH 1/3] stop impersonating button, address todos, remove old code --- .../src/org/labkey/laboratory/LaboratoryController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/laboratory/src/org/labkey/laboratory/LaboratoryController.java b/laboratory/src/org/labkey/laboratory/LaboratoryController.java index 0073cbb6..67d6ab4e 100644 --- a/laboratory/src/org/labkey/laboratory/LaboratoryController.java +++ b/laboratory/src/org/labkey/laboratory/LaboratoryController.java @@ -72,6 +72,9 @@ import org.labkey.api.assay.AssayFileWriter; import org.labkey.api.assay.AssayProvider; import org.labkey.api.assay.AssayService; +import org.labkey.api.util.ErrorRenderer; +import org.labkey.api.util.ErrorView; +import org.labkey.api.util.ErrorView; import org.labkey.api.util.ExceptionUtil; import org.labkey.api.util.Pair; import org.labkey.api.util.URLHelper; @@ -1029,7 +1032,10 @@ public void export(ProcessAssayForm form, HttpServletResponse response, BindExce { if (errors.hasErrors()) { - HttpView errorView = ExceptionUtil.getErrorView(HttpServletResponse.SC_BAD_REQUEST, "Failed to create template - invalid input", null, getViewContext().getRequest(), false); + ErrorRenderer renderer = ExceptionUtil.getErrorRenderer(HttpServletResponse.SC_BAD_REQUEST, "Failed to create template - invalid input", null, getViewContext().getRequest(), false, false); + renderer.setErrorType(ErrorRenderer.ErrorType.notFound); + HttpView errorView = getPageConfig().getTemplate().getTemplate(getViewContext(), new ErrorView(renderer), getPageConfig()); + getPageConfig().addClientDependencies(errorView.getClientDependencies()); errorView.render(getViewContext().getRequest(), getViewContext().getResponse()); return; } From 3ef116fc54f4ba4415a7e92dc8bf411ac0a5dd52 Mon Sep 17 00:00:00 2001 From: labkey-ankurj Date: Tue, 29 Sep 2020 08:15:51 -0700 Subject: [PATCH 2/3] server side code review changes --- .../src/org/labkey/laboratory/LaboratoryController.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/laboratory/src/org/labkey/laboratory/LaboratoryController.java b/laboratory/src/org/labkey/laboratory/LaboratoryController.java index 67d6ab4e..056644b3 100644 --- a/laboratory/src/org/labkey/laboratory/LaboratoryController.java +++ b/laboratory/src/org/labkey/laboratory/LaboratoryController.java @@ -1032,11 +1032,7 @@ public void export(ProcessAssayForm form, HttpServletResponse response, BindExce { if (errors.hasErrors()) { - ErrorRenderer renderer = ExceptionUtil.getErrorRenderer(HttpServletResponse.SC_BAD_REQUEST, "Failed to create template - invalid input", null, getViewContext().getRequest(), false, false); - renderer.setErrorType(ErrorRenderer.ErrorType.notFound); - HttpView errorView = getPageConfig().getTemplate().getTemplate(getViewContext(), new ErrorView(renderer), getPageConfig()); - getPageConfig().addClientDependencies(errorView.getClientDependencies()); - errorView.render(getViewContext().getRequest(), getViewContext().getResponse()); + ExceptionUtil.renderErrorView(getViewContext(), getPageConfig(), ErrorRenderer.ErrorType.notFound, HttpServletResponse.SC_BAD_REQUEST, "Failed to create template - invalid input", null, false, false); return; } From 60afd227b9f5da32c33edee242e1bae2381be9b2 Mon Sep 17 00:00:00 2001 From: labkey-ankurj Date: Tue, 29 Sep 2020 14:23:07 -0700 Subject: [PATCH 3/3] more code review feedback changes --- .../org/labkey/laboratory/LaboratoryController.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/laboratory/src/org/labkey/laboratory/LaboratoryController.java b/laboratory/src/org/labkey/laboratory/LaboratoryController.java index 056644b3..16ac1b4e 100644 --- a/laboratory/src/org/labkey/laboratory/LaboratoryController.java +++ b/laboratory/src/org/labkey/laboratory/LaboratoryController.java @@ -18,8 +18,8 @@ import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -34,6 +34,9 @@ import org.labkey.api.action.ReturnUrlForm; import org.labkey.api.action.SimpleViewAction; import org.labkey.api.action.SpringActionController; +import org.labkey.api.assay.AssayFileWriter; +import org.labkey.api.assay.AssayProvider; +import org.labkey.api.assay.AssayService; import org.labkey.api.data.Container; import org.labkey.api.data.ContainerManager; import org.labkey.api.data.PropertyManager; @@ -69,18 +72,12 @@ import org.labkey.api.security.permissions.InsertPermission; import org.labkey.api.security.permissions.ReadPermission; import org.labkey.api.security.permissions.UpdatePermission; -import org.labkey.api.assay.AssayFileWriter; -import org.labkey.api.assay.AssayProvider; -import org.labkey.api.assay.AssayService; import org.labkey.api.util.ErrorRenderer; -import org.labkey.api.util.ErrorView; -import org.labkey.api.util.ErrorView; import org.labkey.api.util.ExceptionUtil; import org.labkey.api.util.Pair; import org.labkey.api.util.URLHelper; import org.labkey.api.view.ActionURL; import org.labkey.api.view.HtmlView; -import org.labkey.api.view.HttpView; import org.labkey.api.view.JspView; import org.labkey.api.view.NavTree; import org.labkey.api.view.UnauthorizedException; @@ -97,14 +94,12 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.TreeMap; public class LaboratoryController extends SpringActionController