Issue 11609 fixes

dotCMS/src/functional-test/java/com/dotcms/rest/ContentResourceTest.java

@@ -9,6 +9,7 @@
 import com.dotcms.contenttype.model.type.BaseContentType;
 import com.dotcms.contenttype.model.type.ContentType;
 import com.dotcms.contenttype.model.type.ContentTypeBuilder;
+import com.dotcms.repackage.javax.ws.rs.HEAD;
 import com.dotcms.repackage.javax.ws.rs.client.Client;
 import com.dotcms.repackage.javax.ws.rs.client.ClientBuilder;
 import com.dotcms.repackage.javax.ws.rs.client.Entity;

dotCMS/src/main/java/com/dotcms/rest/api/v1/workflow/WorkflowResource.java

@@ -117,7 +117,7 @@ public final Response findSchemes(@Context final HttpServletRequest request,
     @NoCache
     @Produces({MediaType.APPLICATION_JSON, "application/javascript"})
     public final Response findAllSchemesAndSchemesByContentType(@Context            final HttpServletRequest request,
-                                                   @PathParam("contentTypeId")      final String contentTypeId) {
+                                                                @PathParam("contentTypeId")      final String contentTypeId) {
 
         final InitDataObject initDataObject = this.webResource.init
                 (null, true, request, true, null);
@@ -625,4 +625,4 @@ public final Response reorderAction(@Context final HttpServletRequest request,
 
         return response;
     } // reorderAction
-} // E:O:F:WorkflowResource.
+} // E:O:F:WorkflowResource.

dotCMS/src/main/java/com/dotcms/workflow/form/WorkflowActionForm.java

@@ -4,9 +4,10 @@
 import com.dotcms.repackage.com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.dotcms.repackage.javax.validation.constraints.NotNull;
 import com.dotcms.rest.api.Validated;
-import com.dotmarketing.portlets.workflows.model.WorkflowAction;
+import com.dotmarketing.portlets.workflows.model.WorkflowStatus;
 
 import java.util.List;
+import java.util.Set;
 
 @JsonDeserialize(builder = WorkflowActionForm.Builder.class)
 public class WorkflowActionForm extends Validated {
@@ -30,7 +31,7 @@ public class WorkflowActionForm extends Validated {
     @NotNull
     private final boolean       requiresCheckout;
     @NotNull
-    private final RequiresCheckoutOption requiresCheckoutOption;
+    private final Set<WorkflowStatus> showOn;
     @NotNull
     private final boolean       actionRoleHierarchyForAssign;
     private final boolean       roleHierarchyForAssign;
@@ -75,8 +76,8 @@ public boolean isRequiresCheckout() {
         return requiresCheckout;
     }
 
-    public RequiresCheckoutOption getRequiresCheckoutOption() {
-        return requiresCheckoutOption;
+    public Set<WorkflowStatus> getShowOn() {
+        return showOn;
     }
 
     public boolean isActionRoleHierarchyForAssign() {
@@ -104,12 +105,14 @@ public String toString() {
         return "WorkflowActionForm{" +
                 "actionId='" + actionId + '\'' +
                 ", schemeId='" + schemeId + '\'' +
+                ", stepId='" + stepId + '\'' +
                 ", actionName='" + actionName + '\'' +
                 ", whoCanUse=" + whoCanUse +
                 ", actionIcon='" + actionIcon + '\'' +
                 ", actionAssignable=" + actionAssignable +
                 ", actionCommentable=" + actionCommentable +
-                ", requiresCheckoutOption=" + requiresCheckoutOption +
+                ", requiresCheckout=" + requiresCheckout +
+                ", showOn=" + showOn +
                 ", actionRoleHierarchyForAssign=" + actionRoleHierarchyForAssign +
                 ", roleHierarchyForAssign=" + roleHierarchyForAssign +
                 ", actionNextStep='" + actionNextStep + '\'' +
@@ -128,7 +131,7 @@ public WorkflowActionForm(final Builder builder) {
         this.actionIcon                 = builder.actionIcon;
         this.actionCommentable          = builder.actionCommentable;
         this.requiresCheckout           = builder.requiresCheckout;
-        this.requiresCheckoutOption     = valueOf(builder.requiresCheckoutOption);
+        this.showOn                     = builder.showOn;
         this.actionNextStep             = builder.actionNextStep;
         this.actionNextAssign           = builder.actionNextAssign;
         this.actionCondition            = builder.actionCondition;
@@ -138,32 +141,7 @@ public WorkflowActionForm(final Builder builder) {
         this.checkValid();
     }
 
-    private RequiresCheckoutOption valueOf (final String option) {
-
-        try {
-            return RequiresCheckoutOption.valueOf(option.toUpperCase());
-        } catch (Throwable e) {
-            return RequiresCheckoutOption.BOTH;
-        }
-    }
-
-    public enum RequiresCheckoutOption {
-
-        LOCKED(WorkflowAction.LOCKED),
-        UNLOCKED(WorkflowAction.UNLOCKED),
-        BOTH(WorkflowAction.LOCKED_OR_UNLOCKED);
-
-        private final String name;
-        RequiresCheckoutOption (final String name) {
-            this.name = name;
-        }
-
-        public String getName() {
-            return name;
-        };
-    }
-
-    public static final class Builder {
+       public static final class Builder {
 
         @JsonProperty()
         private String        actionId;
@@ -187,8 +165,6 @@ public static final class Builder {
         @JsonProperty(required = true)
         private boolean       requiresCheckout;
         @JsonProperty(required = true)
-        private String       requiresCheckoutOption;
-        @JsonProperty(required = true)
         private boolean       actionRoleHierarchyForAssign;
         @JsonProperty(required = true)
         private String        actionNextStep;
@@ -197,6 +173,15 @@ public static final class Builder {
         @JsonProperty()
         private String        actionCondition;
 
+        @JsonProperty(required = true)
+        private Set<WorkflowStatus> showOn;
+
+
+       public Builder showOn(Set<WorkflowStatus> showOn) {
+           this.showOn = showOn;
+           return this;
+       }
+
         public Builder stepId(String stepId) {
             this.stepId = stepId;
             return this;
@@ -242,11 +227,6 @@ public Builder requiresCheckout(boolean requiresCheckout) {
             return this;
         }
 
-        public Builder requiresCheckoutOption(String requiresCheckoutOption) {
-            this.requiresCheckoutOption = requiresCheckoutOption;
-            return this;
-        }
-
         public Builder actionRoleHierarchyForAssign(boolean actionRoleHierarchyForAssign) {
             this.actionRoleHierarchyForAssign = actionRoleHierarchyForAssign;
             return this;

dotCMS/src/main/java/com/dotcms/workflow/form/WorkflowReorderActionStepForm.java

@@ -0,0 +1,79 @@
+package com.dotcms.workflow.form;
+
+import com.dotcms.repackage.com.fasterxml.jackson.annotation.JsonProperty;
+import com.dotcms.repackage.com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.dotcms.repackage.javax.validation.constraints.NotNull;
+import com.dotcms.rest.api.Validated;
+
+@JsonDeserialize(builder = WorkflowReorderActionStepForm.Builder.class)
+public class WorkflowReorderActionStepForm extends Validated {
+
+    @NotNull
+    private final String        actionId;
+
+    @NotNull
+    private final String        stepId;
+
+    @NotNull
+    private final int           order;
+
+    public String getActionId() {
+        return actionId;
+    }
+
+    public String getStepId() {
+        return stepId;
+    }
+
+    public int getOrder() {
+        return order;
+    }
+
+    @Override
+    public String toString() {
+        return "WorkflowReorderActionStepForm{" +
+                "actionId='" + actionId + '\'' +
+                ", stepId='" + stepId + '\'' +
+                ", order=" + order +
+                '}';
+    }
+
+    public WorkflowReorderActionStepForm(final Builder builder) {
+
+        this.actionId           = builder.actionId;
+        this.stepId             = builder.stepId;
+        this.order              = builder.order;
+        this.checkValid();
+    }
+
+    public static final class Builder {
+
+        @JsonProperty(required = true)
+        private String        actionId;
+        @JsonProperty(required = true)
+        private String        stepId;
+        @JsonProperty(required = true)
+        private int           order;
+
+        public Builder actionId(String actionId) {
+            this.actionId = actionId;
+            return this;
+        }
+
+        public Builder stepId(String stepId) {
+            this.stepId = stepId;
+            return this;
+        }
+
+        public Builder order(int order) {
+            this.order = order;
+            return this;
+        }
+
+
+        public WorkflowReorderActionStepForm build() {
+
+            return new WorkflowReorderActionStepForm(this);
+        }
+    }
+}