MID-6310 Handling direct access to CaseWorkItem page

Evolveum · Jun 5, 2020 · 71bd125 · 71bd125
1 parent 39d3e45
commit 71bd125
Showing 1 changed file with 31 additions and 30 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItem.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/cases/PageCaseWorkItem.java
@@ -9,7 +9,6 @@
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.schema.GetOperationOptionsBuilder;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.schema.util.WorkItemId;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
@@ -32,14 +31,11 @@
 import org.apache.wicket.Component;
 import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.feedback.FeedbackMessage;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType.F_OBJECT_REF;
-
 /**
  * @author mederly
  */
@@ -100,7 +96,7 @@ public class PageCaseWorkItem extends PageAdminCaseWorkItems {
     private PageParameters pageParameters;
 
     public PageCaseWorkItem() {
-        this(null);
+        this((CaseWorkItemType)null);
     }
 
     public PageCaseWorkItem(CaseWorkItemType workItem) {
@@ -121,31 +117,35 @@ protected CaseWorkItemType load() {
                 }
             }
         };
+    }
+
+    public PageCaseWorkItem(PageParameters parameters) {
+        this.pageParameters = parameters;
+
+        String caseWorkItemId = parameters.get(OnePageParameterEncoder.PARAMETER).toString();
+        if (StringUtils.isEmpty(caseWorkItemId)) {
+            throw new IllegalStateException("Work item ID not specified.");
+        }
+        try {
+            workItemId = WorkItemId.create(caseWorkItemId);
+        } catch (IllegalStateException e) {
+            getSession().error(getString("PageCaseWorkItem.couldNotGetCase.runtime"));
+            throw redirectBackViaRestartResponseException();
+        }
 
-//        String caseId = parameters.get(OnePageParameterEncoder.PARAMETER).toString();
-//        if (StringUtils.isEmpty(caseId)) {
-//            throw new IllegalStateException("Case ID not specified.");
-//        }
-//        workItemId = WorkItemId.create(caseId);
-//        if (workItemId == null || StringUtils.isEmpty(workItemId.getCaseOid())) {
-//            throw new IllegalStateException("Case oid not specified.");
-//        }
-//
-//        caseModel = new LoadableModel<CaseType>(false) {
-//            @Override
-//            protected CaseType load() {
-//                return loadCaseIfNecessary();
-//            }
-//        };
-//
-//        caseWorkItemModel = new LoadableModel<CaseWorkItemType>(false) {
-//            @Override
-//            protected CaseWorkItemType load() {
-//                return loadCaseWorkItemIfNecessary();
-//            }
-//        };
-
-//        initLayout();
+        caseModel = new LoadableModel<CaseType>(false) {
+            @Override
+            protected CaseType load() {
+                return loadCaseIfNecessary();
+            }
+        };
+
+        caseWorkItemModel = new LoadableModel<CaseWorkItemType>(false) {
+            @Override
+            protected CaseWorkItemType load() {
+                return loadCaseWorkItemIfNecessary();
+            }
+        };
     }
 
     @Override
@@ -207,7 +207,8 @@ private CaseWorkItemType loadCaseWorkItemIfNecessary() {
         } catch (NumberFormatException ex) {
             LoggingUtils.logUnexpectedException(LOGGER, "Couldn't parse case work item id.", ex);
         }
-        return null;
+        getSession().error(getString("PageCaseWorkItem.couldNotGetCaseWorkItem"));
+        throw redirectBackViaRestartResponseException();
     }
 
     private void initLayout(){