feature/IVYPORTAL-17431-Remove-Express-from-Portal - Remove ChatRende…

…rBean
axonivy-market · Sep 17, 2024 · dc2d88b · dc2d88b
1 parent 7b870ac
commit dc2d88b
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/AxonIvyPortal/portal/processes/Start Processes/PortalStart.p.json b/AxonIvyPortal/portal/processes/Start Processes/PortalStart.p.json
@@ -2674,11 +2674,7 @@
             "at" : { "x" : 224, "y" : 96 }
           },
           "connect" : [
-            { "id" : "S10-f8", "to" : "S10-f7", "label" : {
-                "name" : "Express end page",
-                "segment" : 0.47,
-                "offset" : { "y" : -11 }
-              } },
+            { "id" : "S10-f8", "to" : "S10-f7" },
             { "id" : "S10-f2", "to" : "S10-f68", "via" : [ { "x" : 288, "y" : 192 } ] },
             { "id" : "S10-f3", "to" : "S10-f17", "via" : [ { "x" : 288, "y" : 288 } ] },
             { "id" : "S10-f4", "to" : "S10-f19", "via" : [ { "x" : 256, "y" : 384 } ] },

diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/ChatRendererBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/ChatRendererBean.java
@@ -20,7 +20,6 @@
 public class ChatRendererBean implements Serializable {
 
   private static final long serialVersionUID = 4691697531600235758L;
-  private static final String EXPRESS_CREATION_TASK = "isExpressCreationTask";
 
   private Boolean isGroupChatRendered;
   private Boolean isPrivateChatRendered;
@@ -56,8 +55,4 @@ public void getGroupChatName() {
     String groupChatName = Ivy.cms().co("/ch.ivy.addon.portalkit.ui.jsf/common/case") + "-{caseId}" + " {caseName}";
     PrimeFaces.current().executeScript("var groupChatFormat = '" + groupChatName + "'");
   }
-
-  public boolean isExpressCreationTask() {
-    return Ivy.wfTask().customFields().stringField(EXPRESS_CREATION_TASK).get().isPresent();
-  }
 }
diff --git a/AxonIvyPortal/portal/webContent/layouts/restricted/AbstractTaskTemplate.xhtml b/AxonIvyPortal/portal/webContent/layouts/restricted/AbstractTaskTemplate.xhtml
@@ -141,7 +141,7 @@
                   icon="si si-move-to-bottom" onclick="PF('adhoc-task-reset-confirmation-dialog').show()" />
 
                 <p:menuitem id="chat-group" icon="si si-messages-bubble-add" action="#{chatAssigneeBean.createGroupChatForConfiguredRoleList(currentTask)}"
-                  rendered="#{chatRendererBean.isGroupChatRendered and !(currentTask.state eq 'CREATED') and !chatRendererBean.isExpressCreationTask()}"
+                  rendered="#{chatRendererBean.isGroupChatRendered and !(currentTask.state eq 'CREATED')}"
                   value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/chat/createProcessChat')}" update="chat-assignee-dialog" />
 
                 <p:divider styleClass="separator"