From 66608434dcf7bd6bd9026b06175d2b670772b860 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Wed, 11 Dec 2024 16:04:42 +0700
Subject: [PATCH 01/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Add border in Actions menu of Task widget
---
 .../addon/portalkit/component/SideStep/SideStep.xhtml | 11 ++++++-----
 .../portal/webContent/resources/css/portal.css        |  9 ++++++++-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/SideStep/SideStep.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/SideStep/SideStep.xhtml
index b3df89c0732..5c2f1981ede 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/SideStep/SideStep.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/SideStep/SideStep.xhtml
@@ -113,14 +113,15 @@
       <span class="option-item-label">#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/destroy')}</span>
     </p:commandLink>
 
-    <h:panelGroup id="task-additional-actions" layout="block" rendered="#{cc.attrs.renderedAdditionalAction}">
+    <h:panelGroup id="task-additional-actions" styleClass="task-additional-actions-panel" layout="block" rendered="#{cc.attrs.renderedAdditionalAction}">
       <f:event listener="#{sideStepBean.getSideSteps(task.getId(), task.case.getId())}" type="preRenderComponent" />
-      <p:divider styleClass="task-action-separator" />
-      <h:outputText rendered="#{empty sideStepBean.currentSideSteps}" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/caseDetails/noSideSteps')}" styleClass="option-item pointer-event-none" />
+      <h:outputText rendered="#{empty sideStepBean.currentSideSteps}" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/caseDetails/noSideSteps')}" styleClass="option-item  pointer-event-none" />
       <ui:repeat var="sideStep" value="#{sideStepBean.currentSideSteps}">
   
-        <p:commandLink id="option-item" styleClass="option-item" value="#{sideStep.name}" global="false"
-          actionListener="#{sideStepBean.startSideStep(sideStep)}" process="@this" />
+        <p:commandLink id="option-item" styleClass="option-item" global="false"
+          actionListener="#{sideStepBean.startSideStep(sideStep)}" process="@this">
+          <span class="option-item-label" >#{sideStep.name}</span>
+        </p:commandLink>  
       </ui:repeat>
     </h:panelGroup>
   </p:overlayPanel>
diff --git a/AxonIvyPortal/portal/webContent/resources/css/portal.css b/AxonIvyPortal/portal/webContent/resources/css/portal.css
index 6b05e0d2411..939a756d941 100644
--- a/AxonIvyPortal/portal/webContent/resources/css/portal.css
+++ b/AxonIvyPortal/portal/webContent/resources/css/portal.css
@@ -1156,13 +1156,20 @@ ul.users-in-role {
 .options-panel .option-item:hover {
   text-decoration: none;
   color: var(--menu-action-hover-text-color);
-  background-color: var(--item-background-hover);
+}
+
+.options-panel .option-item:not(:last-child) {
+  border-bottom: 1px solid var(--ivy-primary-color-grey-pale);
 }
 
 .options-panel .pointer-event-none {
   pointer-events: none;
 }
 
+.task-additional-actions-panel {
+  border-top: 1px solid var(--ivy-primary-color-grey-medium);
+}
+
 .process-widget-action .name-sort-command,
 .process-widget-action .editing-switch-command,
 .process-widget-action .show-adding-dialog-commmand,

From f65996d3d4fcc65b276dfa8a7f56e5c76a26f583 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Wed, 11 Dec 2024 16:38:29 +0700
Subject: [PATCH 02/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Add border in actions menu for case widget
---
 .../addon/portalkit/component/ActionStep/ActionStep.xhtml  | 2 +-
 AxonIvyPortal/portal/webContent/resources/css/portal.css   | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ActionStep/ActionStep.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ActionStep/ActionStep.xhtml
index f91f3032968..7e008bc2554 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ActionStep/ActionStep.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ActionStep/ActionStep.xhtml
@@ -74,7 +74,7 @@
       <h:outputText value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/destroy')}" />
     </p:commandLink>
 
-    <h:panelGroup id="side-steps">
+    <h:panelGroup id="side-steps" styleClass="case-side-steps-panel">
       <f:event listener="#{sideStepBean.getSideSteps(cc.attrs.taskId, case.id)}" type="preRenderComponent" />
       <h:outputText rendered="#{empty sideStepBean.currentSideSteps}" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/caseDetails/noSideSteps')}" styleClass="action-step-item" />
       <ui:repeat var="sideStep" value="#{sideStepBean.currentSideSteps}">
diff --git a/AxonIvyPortal/portal/webContent/resources/css/portal.css b/AxonIvyPortal/portal/webContent/resources/css/portal.css
index 939a756d941..80278a92b14 100644
--- a/AxonIvyPortal/portal/webContent/resources/css/portal.css
+++ b/AxonIvyPortal/portal/webContent/resources/css/portal.css
@@ -785,9 +785,12 @@ body .ui-inputfield.case-detail-name-input {
   color: var(--action-step-disabled-text-color); }
 
 .action-steps-panel a.action-step-item:hover {
-  background-color: var(--item-background-hover);
   color: var(--menu-action-hover-text-color); }
 
+.action-steps-panel a.action-step-item:not(:last-child) {
+  border-bottom: 1px solid var(--ivy-primary-color-grey-pale);
+}
+
 .case-state-in-progress {
   color: var(--case-state-in-progress-color); }
 
@@ -1166,7 +1169,7 @@ ul.users-in-role {
   pointer-events: none;
 }
 
-.task-additional-actions-panel {
+.task-additional-actions-panel, .case-side-steps-panel {
   border-top: 1px solid var(--ivy-primary-color-grey-medium);
 }
 

From e2e26450aeba0e8bd3169d38f1b0cedcaa159640 Mon Sep 17 00:00:00 2001
From: Thinh Nguyen <117440893+nhthinh-axonivy@users.noreply.github.com>
Date: Thu, 12 Dec 2024 09:45:36 +0700
Subject: [PATCH 03/36] =?UTF-8?q?bug/IVYPORTAL-18051-Portal-Dashboard-show?=
 =?UTF-8?q?s-no-permission-screen-when-=E2=80=A6=20(#1280)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* bug/IVYPORTAL-18051-Portal-Dashboard-shows-no-permission-screen-when-dashboards-is-empty
_ adapt logic
_ import default dashboard
---
 .../addon/portal/generic/menu/MenuView.java   | 18 ++++---
 .../portal/generic/bean/DashboardBean.java    | 53 +++++++++++--------
 2 files changed, 43 insertions(+), 28 deletions(-)

diff --git a/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java b/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java
index 668df5c4364..25dc3cf939d 100644
--- a/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java
+++ b/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java
@@ -91,8 +91,6 @@ public void buildPortalLeftMenu(ITask workingTask, boolean isWorkingOnATask) {
     mainMenuModel = new DefaultMenuModel();
     mainMenuModel.getElements().add(buildDashboardItem()); // menuIndex = 0
 
-
-
     List<SubMenuItem> subMenuItems = PortalMenuNavigator.callSubMenuItemsProcess();
     int menuIndex = 1;
     for (SubMenuItem subMenu : subMenuItems) {
@@ -152,13 +150,17 @@ private MenuElement buildDashboardItem() {
     String mainMenuDisplayName = mainMenuEntryService.getNameInCurrentLocale();
     String mainMenuIcon = mainMenuEntryService.getMenuIcon();
 
-    var subItemDashboards = getSubItemDashboards();
+    List<Dashboard> subItemDashboards = getSubItemDashboards();
     if (subItemDashboards.size() > 1) {
       return buildDashboardGroupMenu(subItemDashboards, dashboardTitle, mainMenuDisplayName, mainMenuIcon,
           currentLanguage, dashboardLink);
+    } else if (subItemDashboards.size() == 1) {
+      Dashboard dashboard = subItemDashboards.getFirst();
+      String localizedTitle = getLocalizedTitle(dashboard, currentLanguage, dashboardTitle);
+      return buildSingleDashboardMenu(localizedTitle, dashboardId, dashboardLink, dashboard.getIcon());
     }
-
-    return buildSingleDashboardMenu(dashboardTitle, dashboardId, dashboardLink);
+    
+    return buildSingleDashboardMenu(dashboardTitle, "", dashboardLink, "");
   }
 
   private String determineDashboardLink() {
@@ -240,9 +242,11 @@ private void setMenuExpansion(DefaultSubMenu dashboardGroupMenu) {
     }
   }
 
-  private MenuElement buildSingleDashboardMenu(String dashboardTitle, String dashboardId, String dashboardLink) {
+  private MenuElement buildSingleDashboardMenu(String dashboardTitle, String dashboardId, String dashboardLink,
+      String dashboardIcon) {
     var dashboardMenu = new PortalMenuBuilder(dashboardTitle, MenuKind.DASHBOARD, this.isWorkingOnATask)
-        .icon(PortalMenuItem.DEFAULT_DASHBOARD_ICON).url(dashboardLink).workingTaskId(this.workingTaskId).build();
+        .icon(StringUtils.isNoneEmpty(dashboardIcon) ? dashboardIcon : PortalMenuItem.DEFAULT_DASHBOARD_ICON)
+        .url(dashboardLink).workingTaskId(this.workingTaskId).build();
 
     if (StringUtils.isBlank(dashboardId)) {
       dashboardId = dashboardMenu.getId();
diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardBean.java
index b573ec9dde1..d4061a3be47 100644
--- a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardBean.java
+++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardBean.java
@@ -91,33 +91,17 @@ public void init() {
     currentDashboardIndex = 0;
     dashboards = collectDashboards();
 
-
     if (isReadOnlyMode) {
       MenuView menuView = (MenuView) ManagedBeans.get("menuView");
       menuView.updateDashboardCache(dashboards);
     }
 
-    if (CollectionUtils.isNotEmpty(DashboardUtils.getDashboardsWithoutMenuItem())) {
+    if (CollectionUtils.isNotEmpty(DashboardUtils.getDashboardsWithoutMenuItem())
+        || isRequestPathForMainOrDetailModification()) {
       updateSelectedDashboardIdFromSessionAttribute();
-      currentDashboardIndex = findIndexOfDashboardById(selectedDashboardId);
-      selectedDashboard = dashboards.get(currentDashboardIndex);
-
-      String selectedDashboardName = selectedDashboard.getTitles().stream()
-          .filter(displayName -> displayName.getLocale().equals(Ivy.session().getContentLocale()))
-          .findFirst()
-          .orElseGet(() -> selectedDashboard.getTitles().get(0)).getValue();
-      setSelectedDashboardName(selectedDashboardName);
-      initShareDashboardLink(selectedDashboard);
-      // can not find dashboard by dashboard id session in view mode
-      if (StringUtils.isBlank(selectedDashboardId)
-          || (!selectedDashboardId.equalsIgnoreCase(selectedDashboard.getId())
-              && DashboardUtils.getDashboardsWithoutMenuItem().size() > 1)) {
-        DashboardUtils.storeDashboardInSession(selectedDashboard.getId());
-      }
-      if (isReadOnlyMode) {
-        DashboardUtils.highlightDashboardMenuItem(selectedDashboard.getId());
-      }
-    }
+      updateSelectedDashboard();
+      storeAndHighlightDashboardIfRequired();
+  }
     buildWidgetModels(selectedDashboard);
     isRunningTaskWhenClickingOnTaskInList = GlobalSettingService.getInstance()
         .findGlobalSettingValue(GlobalVariable.DEFAULT_BEHAVIOUR_WHEN_CLICKING_ON_LINE_IN_TASK_LIST)
@@ -131,6 +115,33 @@ private void buildClientStatisticApiUri() {
         .getExternalContext().getRequestContextPath() + "/api/statistics/data";
   }
 
+  private boolean isRequestPathForMainOrDetailModification() {
+    String requestPath = Ivy.request().getRequestPath();
+    return requestPath.endsWith("/PortalMainDashboard.xhtml")
+        || requestPath.endsWith("/PortalDashboardDetailModification.xhtml");
+  }
+
+  private void updateSelectedDashboard() {
+    currentDashboardIndex = findIndexOfDashboardById(selectedDashboardId);
+    selectedDashboard = dashboards.get(currentDashboardIndex);
+
+    String selectedDashboardName = selectedDashboard.getTitles().stream()
+        .filter(displayName -> displayName.getLocale().equals(Ivy.session().getContentLocale())).findFirst()
+        .orElseGet(() -> selectedDashboard.getTitles().get(0)).getValue();
+    setSelectedDashboardName(selectedDashboardName);
+    initShareDashboardLink(selectedDashboard);
+  }
+
+  private void storeAndHighlightDashboardIfRequired() {
+    if (StringUtils.isBlank(selectedDashboardId) || (!selectedDashboardId.equalsIgnoreCase(selectedDashboard.getId())
+        && DashboardUtils.getDashboardsWithoutMenuItem().size() > 1)) {
+      DashboardUtils.storeDashboardInSession(selectedDashboard.getId());
+    }
+    if (isReadOnlyMode) {
+      DashboardUtils.highlightDashboardMenuItem(selectedDashboard.getId());
+    }
+  }
+
   protected List<Dashboard> collectDashboards() {
     return DashboardUtils.collectDashboards();
   }

From d48f4b04c94a394c92c29c4637e2ead28ab8608d Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Thu, 12 Dec 2024 13:51:57 +0700
Subject: [PATCH 04/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update Edit external link UI
---
 .../admin/AdminSettings/AdminSettings.xhtml   |  2 +-
 .../IconSelection/IconSelection.xhtml         |  4 +--
 .../ProcessWidget/ProcessWidgetDialogs.xhtml  | 36 +++++++++++--------
 .../webContent/resources/css/portal.css       |  2 +-
 .../webContent/resources/js/process-widget.js |  7 ++++
 5 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettings.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettings.xhtml
index 1accd261b13..d9b9818ad5f 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettings.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettings.xhtml
@@ -230,7 +230,7 @@
                 <p:outputLabel styleClass="app-icon w-full admin-settings-application-icon"
                   value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/adminSettings/applicationList/menuIcon')}" />
                 <div class="w-full">
-                  <ic:ch.ivy.addon.portalkit.component.IconSelection value="#{data.selectedApp.menuIcon}" isNotInAdminSettings="false"/>
+                  <ic:ch.ivy.addon.portalkit.component.IconSelection value="#{data.selectedApp.menuIcon}" isImmediate="false"/>
                 </div>
               </div>
 
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/IconSelection/IconSelection.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/IconSelection/IconSelection.xhtml
index bd0ba3fd786..852e2fbb2e9 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/IconSelection/IconSelection.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/IconSelection/IconSelection.xhtml
@@ -9,14 +9,14 @@
   <cc:attribute name="tabindex" required="false" default="1" />
   <cc:attribute name="isReadOnly" default="false" />
   <cc:attribute name="hideIconArray" default="false"/>
-  <cc:attribute name="isNotInAdminSettings" default="true"/>
+  <cc:attribute name="isImmediate" default="true"/>
 </cc:interface>
 <cc:implementation>
   <c:set var="tabindex" value="#{cc.attrs.tabindex}"/>
   <c:set var="readOnly" value="#{empty cc.attrs.isReadOnly ? false : cc.attrs.isReadOnly}"/>
   <c:set var="hideIconArray" value="#{empty cc.attrs.hideIconArray ? false : cc.attrs.hideIconArray}"/>
   <f:event listener="#{iconSelectionBean.init(cc.attrs.value)}" type="preRenderComponent" />
-  <p:remoteCommand rendered="#{!hideIconArray}" oncomplete="loadIconsFirstTime('#{hideIconArray}','#{cc.clientId}', '#{cc.attrs.value}');" autoRun="true" global="false" immediate="#{cc.attrs.isNotInAdminSettings}"/>
+  <p:remoteCommand rendered="#{!hideIconArray}" oncomplete="loadIconsFirstTime('#{hideIconArray}','#{cc.clientId}', '#{cc.attrs.value}');" autoRun="true" global="false" process="@this" immediate="#{cc.attrs.isImmediate}"/>
 
   <h:panelGroup id="awesome-icon-selection" styleClass="awesome-icon-selection-panel">
     <h:panelGroup rendered="#{!hideIconArray}" id="menu-icon-container" styleClass="menu-icon-container" layout="block">
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml
index 2827e269108..c82e9674fc4 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml
@@ -28,7 +28,7 @@
       <div id="edit-process-icon-group" class="ui-g-12 edit-process-icon-group MarTop20 u-no-padding-left u-no-padding-right">
         <p class="u-mar-right-10 edit-process-header-sub-title">#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/processwidget/editDialog/dialogCurrentIcon')}</p>
         <div class="ui-g-12 u-no-padding-left">
-          <ic:ch.ivy.addon.portalkit.component.IconSelection id="edit-process-icon" hideIconArray="true"
+          <ic:ch.ivy.addon.portalkit.component.IconSelection id="edit-process-icon" hideIconArray="false" isImmediate="false"
             value="#{processWidgetBean.selectedIconProcess}"
             isReadOnly="#{!processWidgetBean.canChangeProcessIcon()}" />
         </div>
@@ -151,27 +151,35 @@
 
           <h:panelGroup id="file-upload-panel" layout="block"
             styleClass="#{empty processWidgetBean.editedExternalLink.imageLocation ? 'ui-g-12' : 'ui-g-12 ui-fluid u-padding-0 MarTop10 external-link-preview-image-panel'}">
-            <p:fileUpload id="editing-external-link-image-upload"
+            <p:fileUpload id="editing-external-link-image-upload" style="display: none;"
               rendered="#{empty processWidgetBean.editedExternalLink.imageLocation}"
               listener="#{processWidgetBean.handleExternalLinkImageUpload}"
               chooseIcon="#{visibilityBean.generateButtonIcon('si si-add-small')}"
-              dragDropSupport="true" auto="true"
-              update="file-upload-panel"
+              dragDropSupport="true" auto="true" widgetVar="editExternalLinkUpload"
+              update="file-upload-panel" 
               allowTypes="/(\.|\/)(png|jpg|jpeg|svg)$/i"
-              accept=".png,.jpg,.jpeg,.svg"
-              label="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/select')}"
-              invalidFileMessage="#{ivy.cms.co('/Dialogs/components/CaseDocument/invalidFileMessage')}" />
-            <p:graphicImage id="editing-external-link-preview-image"
-              rendered="#{not empty processWidgetBean.editedExternalLink.imageLocation}"
-              styleClass="external-link-preview-image" library="ivy-cms"
-              name="#{processWidgetBean.editedExternalLink.imageLocation}" />
+              accept=".png,.jpg,.jpeg,.svg" onvalidationfailure="handleEditExternalLinkUploadFileFail();"
+              label="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/select')}" oncomplete="hideExtendLinkPreviewLabel();"
+              invalidFileMessage="#{ivy.cms.co('/Dialogs/components/CaseDocument/invalidFileMessage')}" dropZone="edit-external-link-preview-image-panel"/>
+              <p:outputPanel id="edit-external-link-preview-image-panel" styleClass="ui-external-link-preview-image-panel" >
+                <h:panelGroup rendered="#{empty processWidgetBean.editedExternalLink.imageLocation}" class="ui-external-link-preview-image-label">
+                <i class="si si-file-code-upload-1" id="ui-external-link-preview-image-icon" />
+                <p:outputLabel value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/dragAndDropImage')}">
+                <p:link value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/uploadOneHere')}" onclick="PF('editExternalLinkUpload').show();return false"/>
+                </p:outputLabel>
+                </h:panelGroup>
+                <p:graphicImage id="editing-external-link-preview-image"
+                  rendered="#{not empty processWidgetBean.editedExternalLink.imageLocation}"
+                  styleClass="external-link-preview-image" library="ivy-cms"
+                  name="#{processWidgetBean.editedExternalLink.imageLocation}" />
+              </p:outputPanel>
             <h:panelGroup
               class="external-link-preview-image-overlay-panel"
               rendered="#{not empty processWidgetBean.editedExternalLink.imageLocation}">
               <p:commandButton
                 id="editing-external-link-delete-image-button"
                 actionListener="#{processWidgetBean.removeTempExternalLinkImage}"
-                update="file-upload-panel"
+                update="file-upload-panel" immediate="true"
                 rendered="#{not empty processWidgetBean.editedExternalLink.imageLocation}"
                 styleClass="external-link-delete-image-button"
                 icon="si si-bin-1" />
@@ -343,14 +351,14 @@
       <h:panelGroup id="file-upload-panel" layout="block"
         styleClass="#{empty externalLinkBean.externalLink.imageLocation ? 'ui-g-12 ':'ui-g-12 ui-fluid u-padding-0 MarTop10 external-link-preview-image-panel'}">
         <p:fileUpload id="external-link-image-upload"
-          onvalidationfailure="handleUploadFileFail();" style="display: none;"
+          style="display: none;"
           widgetVar="externalLinkUpload"
           rendered="#{empty externalLinkBean.externalLink.imageLocation}"
           listener="#{externalLinkBean.handleImageUpload}"
           chooseIcon="#{visibilityBean.generateButtonIcon('si si-add-small')}"
           dragDropSupport="true" auto="true" update="file-upload-panel"
           allowTypes="/(\.|\/)(png|jpg|jpeg|svg)$/i"
-          accept=".png,.jpg,.jpeg,.svg"
+          accept=".png,.jpg,.jpeg,.svg" onvalidationfailure="handleUploadFileFail();"
           invalidFileMessage="#{ivy.cms.co('/Dialogs/components/CaseDocument/invalidFileMessage')}"
           dropZone="external-link-preview-image-panel" oncomplete="hideExtendLinkPreviewLabel();"/>
           
diff --git a/AxonIvyPortal/portal/webContent/resources/css/portal.css b/AxonIvyPortal/portal/webContent/resources/css/portal.css
index 80278a92b14..1fc8df215dc 100644
--- a/AxonIvyPortal/portal/webContent/resources/css/portal.css
+++ b/AxonIvyPortal/portal/webContent/resources/css/portal.css
@@ -247,7 +247,7 @@ body .process-widget .ui-selectbooleanbutton.ui-state-active .ui-icon {
   font-size: var(--large-font-size); }
 
 .edit-process-icon-group .awesome-icon-selection-panel span {
-  font-size: var(--process-grid-icon-font-size); }
+  font-size: 1.4em; }
 
 .edit-process-info-group .edit-process-detail-1st-cell,
 .grid-view-form .process-action-group {
diff --git a/AxonIvyPortal/portal/webContent/resources/js/process-widget.js b/AxonIvyPortal/portal/webContent/resources/js/process-widget.js
index 8b2f4d90924..6404261cb2d 100644
--- a/AxonIvyPortal/portal/webContent/resources/js/process-widget.js
+++ b/AxonIvyPortal/portal/webContent/resources/js/process-widget.js
@@ -345,4 +345,11 @@ function handleUploadFileFail() {
   let uploadErrorElement = document.getElementsByClassName('ui-messages ui-widget ui-helper-hidden ui-fileupload-messages')[1];
   errorMessageElement.style.display = 'block';
   errorMessageElement.appendChild(uploadErrorElement);
+}
+
+function handleEditExternalLinkUploadFileFail() {
+  let errorMessageElement = document.getElementById('error-message');
+  let uploadErrorElement = document.getElementsByClassName('ui-messages ui-widget ui-helper-hidden ui-fileupload-messages')[0];
+  errorMessageElement.style.display = 'block';
+  errorMessageElement.appendChild(uploadErrorElement);
 }
\ No newline at end of file

From 33eddc01912800afbe046cc4f332b365213444df Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Thu, 12 Dec 2024 14:26:46 +0700
Subject: [PATCH 05/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Add error message when uploading file fail
---
 .../component/ProcessWidget/ProcessWidgetDialogs.xhtml       | 5 +++--
 .../portal/webContent/resources/js/process-widget.js         | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml
index c82e9674fc4..aea7337bb42 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml
@@ -18,6 +18,7 @@
     <h:form id="edit-process-form" styleClass="ui-g edit-process-form">
       <c:set var="process" value="#{processWidgetBean.editedProcess}" />
       <c:set var="processIcon" value="#{process.getIcon()}" />
+      <div style="display: none;" id="edit-external-link-error-message" />
       <div class="ui-g-12 edit-process-header-group u-no-padding-left u-no-padding-right">
         <div class="ui-g-12 u-padding-0">
           <p class="edit-process-header-sub-title">#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/description')}</p>
@@ -39,7 +40,7 @@
           <span class="u-mar-right-5">#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/processwidget/editDialog/dialogEditInfoTitle', [process.getType().getLabel()])}</span>
         </p>
 
-        <p:messages styleClass="ui-g-12 u-padding-0">
+        <p:messages id="edit-external-link-error-message" styleClass="ui-g-12 u-padding-0">
           <p:autoUpdate />
         </p:messages>
 
@@ -197,7 +198,7 @@
         oncomplete="PF('edit-process-dialog').hide()"
         styleClass="u-mar-right-10" />
       <p:commandButton id="save-process-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/save')}" icon="#{visibilityBean.generateButtonIcon('si si-check-1')}"
-        process="#{cc.clientId}:edit-process-form" actionListener="#{processWidgetBean.updateProcessData()}" update="#{cc.clientId}:edit-process-form"
+        process="#{cc.clientId}:edit-process-form" actionListener="#{processWidgetBean.updateProcessData()}" update="#{cc.clientId}:edit-process-form:edit-external-link-error-message"
         oncomplete="if(!args.validationFailed){PF('edit-process-dialog').hide(); updateProcessListOnSaveSuccessful();}" form="#{cc.clientId}:edit-process-form"/>
     </f:facet>
   </p:dialog>
diff --git a/AxonIvyPortal/portal/webContent/resources/js/process-widget.js b/AxonIvyPortal/portal/webContent/resources/js/process-widget.js
index 6404261cb2d..f1508bc733a 100644
--- a/AxonIvyPortal/portal/webContent/resources/js/process-widget.js
+++ b/AxonIvyPortal/portal/webContent/resources/js/process-widget.js
@@ -348,7 +348,7 @@ function handleUploadFileFail() {
 }
 
 function handleEditExternalLinkUploadFileFail() {
-  let errorMessageElement = document.getElementById('error-message');
+  let errorMessageElement = document.getElementById('edit-external-link-error-message');
   let uploadErrorElement = document.getElementsByClassName('ui-messages ui-widget ui-helper-hidden ui-fileupload-messages')[0];
   errorMessageElement.style.display = 'block';
   errorMessageElement.appendChild(uploadErrorElement);

From fe9dca1dff5aba017b7cbc069d12822ed834ea3e Mon Sep 17 00:00:00 2001
From: mnhnam-axonivy <nam.mai@axonactive.com>
Date: Thu, 12 Dec 2024 15:05:43 +0700
Subject: [PATCH 06/36] IVYPORTAL-18072 SPIKE: Evaluate the full screen issue
 with new case and task list - Implemented

---
 .../config/variables/Portal/Dashboard.json    |  4 +-
 .../portal/generic/bean/DashboardBean.java    |  6 ++
 .../portalkit/dto/dashboard/Dashboard.java    | 15 +++++
 .../addon/portalkit/util/DashboardUtils.java  |  9 +++
 .../restricted/DashboardTemplate.xhtml        | 14 +++--
 .../webContent/resources/js/dashboard.js      | 62 +++++++++++++++++--
 .../resources/js/responsive-toolkit.js        |  5 +-
 7 files changed, 101 insertions(+), 14 deletions(-)

diff --git a/AxonIvyPortal/portal/config/variables/Portal/Dashboard.json b/AxonIvyPortal/portal/config/variables/Portal/Dashboard.json
index c222e3a9993..c3116189da4 100644
--- a/AxonIvyPortal/portal/config/variables/Portal/Dashboard.json
+++ b/AxonIvyPortal/portal/config/variables/Portal/Dashboard.json
@@ -377,7 +377,7 @@
         ],
         "layout": {
           "w": 12,
-          "h": 8,
+          "h": 12,
           "x": 0,
           "y": 0
         },
@@ -489,7 +489,7 @@
         ],
         "layout": {
           "w": 12,
-          "h": 8,
+          "h": 12,
           "x": 0,
           "y": 0
         },
diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardBean.java
index b573ec9dde1..16d6c18d2a8 100644
--- a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardBean.java
+++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/DashboardBean.java
@@ -123,6 +123,12 @@ public void init() {
         .findGlobalSettingValue(GlobalVariable.DEFAULT_BEHAVIOUR_WHEN_CLICKING_ON_LINE_IN_TASK_LIST)
         .equals(BehaviourWhenClickingOnLineInTaskList.RUN_TASK.name());
 
+    // Set responsive option for default task list and case list
+    if (DashboardUtils.isDefaultCaseListDashboard(selectedDashboard)
+        || DashboardUtils.isDefaultTaskListDashboard(selectedDashboard)) {
+      selectedDashboard.setIsResponsive(true);
+    }
+
     buildClientStatisticApiUri();
   }
 
diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/Dashboard.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/Dashboard.java
index 0896ec2dc67..234df2d8057 100644
--- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/Dashboard.java
+++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/dto/dashboard/Dashboard.java
@@ -35,9 +35,13 @@ public class Dashboard extends AbstractConfiguration implements Serializable {
   private String displayedPermission;
   private Boolean isTopMenu;
 
+  @JsonIgnore
+  private Boolean isResponsive;
+
   public Dashboard() {
     // Set default values
     isTopMenu = false;
+    isResponsive = false;
   }
 
   public Dashboard(Dashboard dashboard) {
@@ -54,6 +58,7 @@ public Dashboard(Dashboard dashboard) {
     permissionDTOs = dashboard.permissionDTOs;
     displayedPermission = dashboard.displayedPermission;
     isTopMenu = dashboard.isTopMenu;
+    isResponsive = dashboard.isResponsive;
   }
   
   public String getTitle() {
@@ -146,6 +151,16 @@ public void setIsTopMenu(Boolean isTopMenu) {
     this.isTopMenu = isTopMenu;
   }
 
+  @JsonIgnore
+  public Boolean getIsResponsive() {
+    return isResponsive;
+  }
+
+  @JsonIgnore
+  public void setIsResponsive(Boolean isResponsive) {
+    this.isResponsive = isResponsive;
+  }
+
   @Override
   public int hashCode() {
     final int prime = 31;
diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DashboardUtils.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DashboardUtils.java
index f42e63ec3d2..5a66ea4269e 100644
--- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DashboardUtils.java
+++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DashboardUtils.java
@@ -327,4 +327,13 @@ public static void updatePropertiesToNullIfCurrentValueIsDefaultValue(List<Dashb
     }
   }
 
+  public static boolean isDefaultTaskListDashboard(Dashboard dashboard) {
+    return Optional.ofNullable(dashboard).map(Dashboard::getId)
+        .orElseGet(() -> "").contentEquals(DEFAULT_TASK_LIST_DASHBOARD);
+  }
+
+  public static boolean isDefaultCaseListDashboard(Dashboard dashboard) {
+    return Optional.ofNullable(dashboard).map(Dashboard::getId)
+        .orElseGet(() -> "").contentEquals(DEFAULT_CASE_LIST_DASHBOARD);
+  }
 }
diff --git a/AxonIvyPortal/portal/webContent/layouts/restricted/DashboardTemplate.xhtml b/AxonIvyPortal/portal/webContent/layouts/restricted/DashboardTemplate.xhtml
index 2c2a30aa326..b6e4256d46c 100644
--- a/AxonIvyPortal/portal/webContent/layouts/restricted/DashboardTemplate.xhtml
+++ b/AxonIvyPortal/portal/webContent/layouts/restricted/DashboardTemplate.xhtml
@@ -20,6 +20,8 @@
           }
 
           $(document).ready(function () {
+            loadGrid(#{managedBean.selectedDashboard.isResponsive});
+            updateDashboardWhenResizeWindow(#{managedBean.selectedDashboard.isResponsive});
             setTimeout(() => {
               initStatistics();
             }, 50);
@@ -48,7 +50,7 @@
 
         <h:form id="dashboard-remote-command-form" prependId="false">
           <h:inputHidden id="dashboard-view-mode" value="#{managedBean.isReadOnlyMode}"/>
-          <p:remoteCommand name="updateDashboardWidget" update="grid-stack" oncomplete="loadGrid();dashboardToolKit.responsive(); initStatistics('#{managedBean.clientStatisticApiUri}');" />
+          <p:remoteCommand name="updateDashboardWidget" update="grid-stack" oncomplete="loadGrid(#{managedBean.selectedDashboard.isResponsive});dashboardToolKit.responsive(); initStatistics('#{managedBean.clientStatisticApiUri}');" />
           <p:remoteCommand name="loadAllWidgetSavedFilters" actionListener="#{managedBean.loadAllWidgetSavedFilters()}"
             global="false" process="@this" immediate="true" partialSubmit="true"
             update="delete-saved-filter-form:quick-filter-table"
@@ -181,7 +183,7 @@
               <p:commandButton id="confirm-destruction-dashboard-tasks" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/destroy')}"
                icon="#{visibilityBean.generateButtonIcon('si si-remove')}"
                actionListener="#{taskWidgetBean.destroyTask(taskWidgetBean.selectedTaskItemId)}"
-               oncomplete="PF('destroy-task-dialog').hide();loadGrid(); initStatistics();"
+               oncomplete="PF('destroy-task-dialog').hide();loadGrid(#{managedBean.selectedDashboard.isResponsive}); initStatistics();"
                update="grid-stack dashboard-title-container" />
             </ui:define>
            </ui:decorate>
@@ -203,13 +205,13 @@
               <p:commandButton id="confirm-escalation-dashboard-tasks" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/yes')}"
                icon="#{visibilityBean.generateButtonIcon('si si-check-1')}"
                actionListener="#{taskWidgetBean.expiryTask(taskWidgetBean.selectedTaskItemId)}"
-               oncomplete="PF('escalation-task-dialog').hide();loadGrid();initStatistics();" update="grid-stack dashboard-title-container" />
+               oncomplete="PF('escalation-task-dialog').hide();loadGrid(#{managedBean.selectedDashboard.isResponsive});initStatistics();" update="grid-stack dashboard-title-container" />
             </ui:define>
            </ui:decorate>
            
            <!-- Delegate Task Dialog -->
            <ic:ch.ivy.addon.portalkit.component.TaskItemDelegate id="dashboard-tasks-item-delegate"
-            taskId="#{taskWidgetBean.selectedTaskItemId}" componentToUpdate="grid-stack dashboard-title-container" onCompletedCallback="loadGrid(); initStatistics();"/>
+            taskId="#{taskWidgetBean.selectedTaskItemId}" componentToUpdate="grid-stack dashboard-title-container" onCompletedCallback="loadGrid(#{managedBean.selectedDashboard.isResponsive}); initStatistics();"/>
            
            <!-- Workflow Event of Task Dialog -->
            <ic:ch.ivy.addon.portalkit.component.TaskItemWorkflowEvents id="dashboard-tasks-workflow-event"
@@ -231,7 +233,7 @@
             <p:commandButton id="confirm-destruction-dashboard-cases" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/destroy')}"
               icon="#{visibilityBean.generateButtonIcon('si si-remove')}"
               actionListener="#{caseWidgetBean.destroyCase(caseWidgetBean.selectedCase)}"
-              oncomplete="PF('destroy-case-dialog').hide();loadGrid();initStatistics();"
+              oncomplete="PF('destroy-case-dialog').hide();loadGrid(#{managedBean.selectedDashboard.isResponsive});initStatistics();"
               update="grid-stack dashboard-title-container" />
            </ui:define>
           </ui:decorate>
@@ -308,7 +310,7 @@
 
           <h:panelGroup rendered="#{managedBean.isShowShareButtonOnDashboard() and not managedBean.isMainDashboardSelected()}" layout="block" styleClass="u-text-align-center">
             <p:link value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/ShareThisDashboard')}" 
-                  onclick="PF('share-dashboard-dialog').show(); return false;" />
+                  onclick="PF('share-dashboard-dialog').show(); return false;" styleClass="js-share-dashboard-link" />
           </h:panelGroup>
           <ic:com.axonivy.portal.component.ShareLinkDialog
             id="share-dashboard-component"
diff --git a/AxonIvyPortal/portal/webContent/resources/js/dashboard.js b/AxonIvyPortal/portal/webContent/resources/js/dashboard.js
index c47154a8e32..5f30323d805 100644
--- a/AxonIvyPortal/portal/webContent/resources/js/dashboard.js
+++ b/AxonIvyPortal/portal/webContent/resources/js/dashboard.js
@@ -1,11 +1,38 @@
 var grids;
 var originalGridstackHeight = 0;
-loadGrid();
-// resizeTableBody();
-function loadGrid() {
+
+const defaultNumberOfCells = 12;
+const defaultCellHeight = 100;
+const additionalHeightForResizeHandler = 15;
+
+// Store the initial window height to detect changes
+let windowHeight = window.innerHeight;
+
+function loadGrid(isResponsive) {
+
+  // Set default height for cells
+  var gridCellHeight = defaultCellHeight;
+
+  if (isResponsive) {
+	var dashboardModificationPageHeaderHeight = 0;
+    const announcementHeight = ($('.js-announcement-message').outerHeight(true) || 0);
+    const shareDashboardLinkHeight = ($('.js-share-dashboard-link').outerHeight(true) || 0);
+
+    if ($('.js-dashboard__header').length > 0) {
+        dashboardModificationPageHeaderHeight = ($('.js-dashboard__header').outerHeight(true) || 0) + additionalHeightForResizeHandler;
+    }
+
+    // calculate available height then divide by default number of cells to get height value for each cell
+    gridCellHeight = (PortalLayout.getAvailableHeight() - announcementHeight
+        - shareDashboardLinkHeight - dashboardModificationPageHeaderHeight) / defaultNumberOfCells;
+
+    // If the calculated cell height is less than or equals to 0, use the default cell height instead
+    gridCellHeight = gridCellHeight > 0 ? gridCellHeight : defaultCellHeight;
+  }
+
   grids = GridStack.initAll({
-    column: 12,
-    cellHeight: 100,
+    column: defaultNumberOfCells,
+    cellHeight: gridCellHeight,
     resizable: {
       handles: 'e, se, s, sw, w'
     }
@@ -534,4 +561,29 @@ function udateResizableTablesWhenResizeWidget() {
     }
   });
 
+}
+
+function updateDashboardWhenResizeWindow(isResponsiveDashboard) {
+  if (!isResponsiveDashboard) {
+    return;
+  }
+
+  // resize timeout ID
+  let resizeTimeout;
+
+  window.addEventListener('resize', function () {
+    clearTimeout(resizeTimeout);
+
+    resizeTimeout = setTimeout(function () {
+
+   // Check if the window height has changed
+   if (window.innerHeight !== windowHeight) {
+
+     // Call the remote command 'updateDashboardWidget'
+     updateDashboardWidget();
+
+     windowHeight = window.innerHeight;
+      }
+    }, 1000); // Delay execution by 1 sec to avoid send multiple requests
+  });
 }
\ No newline at end of file
diff --git a/AxonIvyPortal/portal/webContent/resources/js/responsive-toolkit.js b/AxonIvyPortal/portal/webContent/resources/js/responsive-toolkit.js
index 893f3cdd016..9a26eac17fa 100644
--- a/AxonIvyPortal/portal/webContent/resources/js/responsive-toolkit.js
+++ b/AxonIvyPortal/portal/webContent/resources/js/responsive-toolkit.js
@@ -87,7 +87,10 @@ var PortalLayout = {
 
   getAvailableHeight: function () {
     var $layoutMain = $('.js-layout-main');
-    var layoutMainPadding = parseInt($layoutMain.css('padding-top') || 0) + parseInt($layoutMain.css('padding-bottom') || 0);
+    const roundedLayoutMainPaddingTop = parseInt(Math.round(parseFloat($layoutMain.css('padding-top') || 0)) || 0);
+    const roundedLayoutMainPaddingBottom = parseInt(Math.round(parseFloat($layoutMain.css('padding-bottom') || 0)) || 0);
+    var layoutMainPadding = roundedLayoutMainPaddingTop + roundedLayoutMainPaddingBottom;
+
     return window.innerHeight - layoutMainPadding;
   },
 

From fc41236f5d4c1e8820bcddeae60ba3b6086bb689 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Thu, 12 Dec 2024 15:57:24 +0700
Subject: [PATCH 07/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update link and button following guidelines
---
 .../PortalDashboardDetailModification.xhtml   |  9 +++++----
 .../restricted/decorator/TableWidget.xhtml    | 20 ++++++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/PortalDashboardDetailModification/PortalDashboardDetailModification.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/PortalDashboardDetailModification/PortalDashboardDetailModification.xhtml
index 4d83a6a8f0a..f9c8c06dd4f 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/PortalDashboardDetailModification/PortalDashboardDetailModification.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/PortalDashboardDetailModification/PortalDashboardDetailModification.xhtml
@@ -24,11 +24,12 @@
     </ui:define>
 
     <ui:define name="headerAction">
-      <p:commandButton id="back-to-configuration" styleClass="dashboard__switch-mode u-mar-right-5 ui-button-flat"
+      <p:commandLink id="back-to-configuration" styleClass="dashboard__switch-mode u-mar-right-5 pr-2"
         actionListener="#{dashboardDetailModificationBean.navigatetoDashboardConfigurationPage}"
-        update="grid-stack @this" process="@this"
-        value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/back')}"
-        icon="si si-arrow-left-1" />
+        update="grid-stack @this" process="@this">
+          <i class="relative si si-arrow-left-1" style="top: 2px;"/>
+          <span>#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/back')}</span>
+      </p:commandLink>
 
       <c:set var="showRestoreButton" value="#{dashboardDetailModificationBean.foundTemplate.isPresent()}"/>
       <h:panelGroup id="restore-button-group" styleClass="restore-button-group u-mar-right-15">
diff --git a/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml b/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
index b8b8eefe3bc..022dba18612 100644
--- a/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
+++ b/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
@@ -232,9 +232,12 @@
   
           <div class="ui-g filter-overlay-panel__footer ">
             <div id="manage-filter" class="ui-g-3 flex justify-content-center ui-sm-hidden">
-               <p:commandButton icon="si si-pencil" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/ManageFilter')}"
-                    styleClass="ui-sm-hidden saved-filter__manage-filter absolute bottom-0 mb-4 ui-button-flat" global="false"
-                    onclick="hideAllDashboardOverlayPanels(); PF('manage-filter-dialog').show();" />
+               <p:commandLink
+                    styleClass="ui-sm-hidden saved-filter__manage-filter absolute bottom-0 mb-5 ui-button-flat" global="false"
+                    onclick="hideAllDashboardOverlayPanels(); PF('manage-filter-dialog').show();">
+                  <i class="pr-1 pt-1 si si-pencil" />
+                  <span>#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/ManageFilter')}</span>
+               </p:commandLink>
             </div>
             <div class="ui-g-9 u-text-align-right ui-sm-12 footer-buttons-container">
               <div class="ui-g-6 ui-sm-hidden">
@@ -265,13 +268,16 @@
                 styleClass="u-mar-right-5 w-full" />
               </div>
               <div class="ui-g-12 flex justify-content-center ui-sm-12">
-              <p:commandButton id="reset-button" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/resetFilters')}"
-                styleClass="secondary-btn u-mar-right-5 ui-button-flat" partialSubmit="true"
-                process="filter-form-#{index}" icon="si si-button-refresh-arrows"
+              <i class=" ui-commandlink pr-2 pt-1 si si-button-refresh-arrows"/>
+              <p:commandLink id="reset-button"
+                styleClass="secondary-btn u-mar-right-5 flex reset-button" partialSubmit="true"
+                process="filter-form-#{index}"
                 update="#{componentToUpdateOnResetFilter} #{cc.clientId}:widget-header-actions"
                 oncomplete="PF('filter-overlay-panel-#{index}').hide(); initWidgetFilterHtml('#{widget.id}');"
                 actionListener="#{widget.onResetUserFilters()}"
-                resetValues="true"/>
+                resetValues="true">
+                  <span>#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/resetFilters')}</span>
+                </p:commandLink>
               </div>
 
             </div>

From 4ac64e2e46ddcc8abfe36b83f2bff336a147ef77 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Thu, 12 Dec 2024 16:42:54 +0700
Subject: [PATCH 08/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update UI of delete button
---
 .../DashboardModification.xhtml               |  2 +-
 .../restricted/DashboardTemplate.xhtml        | 24 +++++++++++--------
 .../resources/css/portal-variables-dark.css   |  3 ++-
 .../resources/css/portal-variables-light.css  |  1 +
 .../webContent/resources/css/portal.css       | 15 +++++++++---
 5 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/DashboardModification/DashboardModification.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/DashboardModification/DashboardModification.xhtml
index a90abd57fac..d3e6db1fefd 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/DashboardModification/DashboardModification.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/DashboardModification/DashboardModification.xhtml
@@ -130,7 +130,7 @@
       value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/dashboardManagement/deleteDashboardMessage',[dashboardModificationBean.selectedDashboard.title])}" />
     <ui:define name="dialogFooter">
       <div class="flex flex-column">
-      <p:commandButton id="remove-dashboard-button" styleClass="w-full"
+      <p:commandButton id="remove-dashboard-button" styleClass="w-full portal-remove-button"
         value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/remove')}"
         actionListener="#{dashboardModificationBean.removeDashboard()}"
         update="dashboard-modification-container"
diff --git a/AxonIvyPortal/portal/webContent/layouts/restricted/DashboardTemplate.xhtml b/AxonIvyPortal/portal/webContent/layouts/restricted/DashboardTemplate.xhtml
index 2c2a30aa326..0d64bee9b9b 100644
--- a/AxonIvyPortal/portal/webContent/layouts/restricted/DashboardTemplate.xhtml
+++ b/AxonIvyPortal/portal/webContent/layouts/restricted/DashboardTemplate.xhtml
@@ -176,13 +176,15 @@
               value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/taskList/destroyTaskMessage')}" />
              
             <ui:define name="dialogFooter">
-              <p:commandLink value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
-               onclick="PF('destroy-task-dialog').hide();" styleClass="u-mar-right-15" />
+              <h:panelGroup styleClass="flex flex-column">
               <p:commandButton id="confirm-destruction-dashboard-tasks" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/destroy')}"
-               icon="#{visibilityBean.generateButtonIcon('si si-remove')}"
+               styleClass="w-full portal-remove-button"
                actionListener="#{taskWidgetBean.destroyTask(taskWidgetBean.selectedTaskItemId)}"
                oncomplete="PF('destroy-task-dialog').hide();loadGrid(); initStatistics();"
                update="grid-stack dashboard-title-container" />
+              <p:commandLink value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
+               onclick="PF('destroy-task-dialog').hide();" styleClass="pt-3 flex justify-content-center" />
+               </h:panelGroup>
             </ui:define>
            </ui:decorate>
            
@@ -226,13 +228,15 @@
             <ui:param name="dialogContent" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/caseList/destroyCaseMessage')}" />
             
            <ui:define name="dialogFooter">
-            <p:commandLink value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
-              onclick="PF('destroy-case-dialog').hide();" styleClass="u-mar-right-15"/>
-            <p:commandButton id="confirm-destruction-dashboard-cases" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/destroy')}"
-              icon="#{visibilityBean.generateButtonIcon('si si-remove')}"
-              actionListener="#{caseWidgetBean.destroyCase(caseWidgetBean.selectedCase)}"
-              oncomplete="PF('destroy-case-dialog').hide();loadGrid();initStatistics();"
-              update="grid-stack dashboard-title-container" />
+            <h:panelGroup>
+              <p:commandButton id="confirm-destruction-dashboard-cases" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/destroy')}"
+                styleClass="w-full portal-remove-button"
+                actionListener="#{caseWidgetBean.destroyCase(caseWidgetBean.selectedCase)}"
+                oncomplete="PF('destroy-case-dialog').hide();loadGrid();initStatistics();"
+                update="grid-stack dashboard-title-container" />
+              <p:commandLink value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
+                onclick="PF('destroy-case-dialog').hide();" styleClass="pt-3 flex justify-content-center"/>
+            </h:panelGroup>
            </ui:define>
           </ui:decorate>
           
diff --git a/AxonIvyPortal/portal/webContent/resources/css/portal-variables-dark.css b/AxonIvyPortal/portal/webContent/resources/css/portal-variables-dark.css
index 49187eeb259..18ce559c462 100644
--- a/AxonIvyPortal/portal/webContent/resources/css/portal-variables-dark.css
+++ b/AxonIvyPortal/portal/webContent/resources/css/portal-variables-dark.css
@@ -299,7 +299,8 @@
   --text-tab-default-color: var(--ivy-primary-color-grey-medium);
   --no-item-icon-color: var(--ivy-primary-color-grey-light);
   --user-menu-items-border-color: var(--ivy-portal-color-gray-dark);
-  
+  --option-item-border-color: var(--ivy-portal-color-gray-dark);
+
   /* Portal breadcrumb */
   --breadcrumb-background-color: transparent;
   --breadcrumb-home-icon-color: var(--primary-color);
diff --git a/AxonIvyPortal/portal/webContent/resources/css/portal-variables-light.css b/AxonIvyPortal/portal/webContent/resources/css/portal-variables-light.css
index 0c8388c9914..e89d41c305f 100644
--- a/AxonIvyPortal/portal/webContent/resources/css/portal-variables-light.css
+++ b/AxonIvyPortal/portal/webContent/resources/css/portal-variables-light.css
@@ -309,6 +309,7 @@
   --text-tab-default-color: var(--ivy-primary-color-grey-medium);
   --no-item-icon-color: var(--ivy-primary-color-grey-light);
   --user-menu-items-border-color: var(--ivy-primary-color-grey-pale);
+  --option-item-border-color: var(--ivy-primary-color-grey-pale);
   /* Portal breadcrumb */
   --breadcrumb-background-color: transparent;
   --breadcrumb-home-icon-color: var(--primary-color);
diff --git a/AxonIvyPortal/portal/webContent/resources/css/portal.css b/AxonIvyPortal/portal/webContent/resources/css/portal.css
index 1fc8df215dc..7be9f666aae 100644
--- a/AxonIvyPortal/portal/webContent/resources/css/portal.css
+++ b/AxonIvyPortal/portal/webContent/resources/css/portal.css
@@ -788,7 +788,7 @@ body .ui-inputfield.case-detail-name-input {
   color: var(--menu-action-hover-text-color); }
 
 .action-steps-panel a.action-step-item:not(:last-child) {
-  border-bottom: 1px solid var(--ivy-primary-color-grey-pale);
+  border-bottom: 1px solid var(--option-item-border-color);
 }
 
 .case-state-in-progress {
@@ -1162,7 +1162,7 @@ ul.users-in-role {
 }
 
 .options-panel .option-item:not(:last-child) {
-  border-bottom: 1px solid var(--ivy-primary-color-grey-pale);
+  border-bottom: 1px solid var(--option-item-border-color);
 }
 
 .options-panel .pointer-event-none {
@@ -1170,7 +1170,7 @@ ul.users-in-role {
 }
 
 .task-additional-actions-panel, .case-side-steps-panel {
-  border-top: 1px solid var(--ivy-primary-color-grey-medium);
+  border-top: 1px solid var(--ivy-primary-color-grey-light);
 }
 
 .process-widget-action .name-sort-command,
@@ -1295,6 +1295,15 @@ color: var(--button-text-color);
   color: var(--ivy-tertinary-color-red-medium);
 }
 
+.portal-remove-button {
+  background-color: var(--ivy-tertinary-color-red-medium) !important;
+  border-color: var(--ivy-tertinary-color-red-medium) !important;
+}
+
+.ui-button.portal-remove-button:active {
+  border-color: var(--ivy-tertinary-color-red-medium) !important;
+}
+
 
 /* My Profile */
 .my-profile-container .setting-header span {

From b91770d5d194bed06a95a7402980f7c33f449ed3 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Thu, 12 Dec 2024 17:23:36 +0700
Subject: [PATCH 09/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update UI of remove/delete button
---
 .../PortalDashboardDetailModification.xhtml   | 15 ++++++------
 .../WelcomeDashboardWidget.xhtml              |  2 +-
 .../AbsenceManagement/AbsenceManagement.xhtml | 24 +++++++++----------
 .../admin/AdminSettings/AdminSettings.xhtml   | 10 ++++----
 .../ProcessWidget/ProcessWidgetDialogs.xhtml  | 12 +++++-----
 .../WarningBeforeLeavingTask.xhtml            |  6 ++---
 6 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/PortalDashboardDetailModification/PortalDashboardDetailModification.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/PortalDashboardDetailModification/PortalDashboardDetailModification.xhtml
index f9c8c06dd4f..e00fe4deb0b 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/PortalDashboardDetailModification/PortalDashboardDetailModification.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/PortalDashboardDetailModification/PortalDashboardDetailModification.xhtml
@@ -103,13 +103,14 @@
         <ui:param name="dialogContent" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/dashboard/removeWidgetMessage')}" />
 
         <ui:define name="dialogFooter">
-          <p:link href="#" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}" onclick="PF('remove-widget-dialog').hide();"
-            styleClass="u-mar-right-15" />
-          <p:commandButton id="remove-widget-button" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/remove')}"
-            actionListener="#{dashboardDetailModificationBean.removeWidget()}"
-            icon="#{visibilityBean.generateButtonIcon('si si-remove-circle')}"
-            process="@this"
-            oncomplete="PF('remove-widget-dialog').hide(); updateDashboardWidget(); return false;"/>
+          <h:panelGroup styleClass="flex flex-column">
+            <p:commandButton id="remove-widget-button" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/remove')}"
+              actionListener="#{dashboardDetailModificationBean.removeWidget()}"
+              process="@this" styleClass="w-full portal-remove-button"
+              oncomplete="PF('remove-widget-dialog').hide(); updateDashboardWidget(); return false;"/>
+            <p:link href="#" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}" onclick="PF('remove-widget-dialog').hide();"
+              styleClass="pt-3 flex justify-content-center" />
+           </h:panelGroup>
         </ui:define>
       </ui:decorate>
     </ui:define>
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/WelcomeDashboardWidget/WelcomeDashboardWidget.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/WelcomeDashboardWidget/WelcomeDashboardWidget.xhtml
index e56100d9edd..7220bddd9d0 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/WelcomeDashboardWidget/WelcomeDashboardWidget.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/WelcomeDashboardWidget/WelcomeDashboardWidget.xhtml
@@ -33,7 +33,7 @@
               oncomplete="PF('new-widget-configuration-dialog').show()" />
             <p:menuitem id="delete-welcome-widget"
               value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/delete')}"
-              icon="si si-bin-1"
+              icon="si si-bin-1" styleClass="color-destroy"
               oncomplete="PF('remove-widget-dialog').show()"
               actionListener="#{dashboardDetailModificationBean.setDeleteWidget(widget)}"
               update="remove-widget-dialog"
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/setting/AbsenceManagement/AbsenceManagement.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/setting/AbsenceManagement/AbsenceManagement.xhtml
index 2442cc63140..7c84babd9c1 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/setting/AbsenceManagement/AbsenceManagement.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/setting/AbsenceManagement/AbsenceManagement.xhtml
@@ -101,7 +101,7 @@
                           <p:menuitem id="delete-absence" actionListener="#{logic.preDelete(absence)}"
                             oncomplete="PF('deleteAbsenceConfirmation').show();"
                             rendered="#{absenceManagementBean.isAbsenceDeletable(absence)}"
-                            icon="si si-bin-1" process="@this"
+                            icon="si si-bin-1" process="@this" styleClass="color-destroy"
                             value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/delete')}">
                           </p:menuitem>
                         </p:menu>
@@ -253,17 +253,17 @@
         <ui:param name="dialogContent" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/confirmForDelete')}" />
 
         <ui:define name="dialogFooter">
-          <p:commandLink id="cancel-confirmation-action"
-            value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
-            onclick="PF('deleteAbsenceConfirmation').hide()"
-            styleClass="u-mar-right-15" />
-
-          <p:commandButton id="confirm-action" process="@this"
-            icon="#{visibilityBean.generateButtonIcon('si si-remove')}"
-            value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/delete')}"
-            actionListener="#{logic.deleteAbsence}"
-            oncomplete="PF('deleteAbsenceConfirmation').hide();"
-            update="@(.absence-table) @(.substitute-table) @(.substitution-table)" />
+          <h:panelGroup styleClass="flex flex-column">
+            <p:commandButton id="confirm-action" process="@this"
+              value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/delete')}"
+              actionListener="#{logic.deleteAbsence}" styleClass="w-full portal-remove-button"
+              oncomplete="PF('deleteAbsenceConfirmation').hide();"
+              update="@(.absence-table) @(.substitute-table) @(.substitution-table)" />
+            <p:commandLink id="cancel-confirmation-action"
+              value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
+              onclick="PF('deleteAbsenceConfirmation').hide()"
+              styleClass="pt-3 flex justify-content-center" />
+          </h:panelGroup>
         </ui:define>
       </ui:decorate>
       <c:if test="#{absenceManagementBean.absencesCreatable ||  absenceManagementBean.ownAbsencesCreatable}">
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettings.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettings.xhtml
index d9b9818ad5f..f390f58154e 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettings.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/admin/AdminSettings/AdminSettings.xhtml
@@ -81,7 +81,7 @@
                   process="@this" />
                 <p:menuitem id="delete-application"
                   value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/delete')}"
-                  icon="si si-bin-1"
+                  icon="si si-bin-1" styleClass="color-destroy"
                   oncomplete="PF('deleteConfirmation').show()"
                   actionListener="#{logic.submitDeleteApp(app)}"
                   update=":#{p:resolveFirstComponentWithId('deleteConfirmationDialog', view).clientId}"
@@ -363,12 +363,14 @@
     <ui:param name="dialogContent" value="#{data.confirmMsg}" />
     
     <ui:define name="dialogFooter">
-       <p:commandLink value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}" 
-          onclick="PF('deleteConfirmation').hide()" styleClass="u-mar-right-15"/>
+      <h:panelGroup styleClass="flex flex-column">
        <p:commandButton value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/delete')}"
-          icon="#{visibilityBean.generateButtonIcon('si si-remove')}"
+          styleClass="w-full portal-remove-button"
           actionListener="#{logic.delete}" oncomplete="PF('deleteConfirmation').hide();"
           update=":#{p:resolveFirstComponentWithId('applicationForm', view).clientId}" />
+       <p:commandLink value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}" 
+          onclick="PF('deleteConfirmation').hide()" styleClass="pt-3 flex justify-content-center"/>
+      </h:panelGroup>
     </ui:define>
   </ui:decorate>
 
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml
index aea7337bb42..b5254a7de7a 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml
@@ -223,14 +223,14 @@
     </ui:define>
     
     <ui:define name="dialogFooter">
-      <h:form id="delete-process-workflow-form">
-        <p:link onclick="PF('remove-process-workflow-dialog').hide()" styleClass="u-mar-right-15"
-          value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
-          href="#" />
+      <h:form id="delete-process-workflow-form" styleClass="flex flex-column">
         <p:commandButton id="remove-process-command" global="false" process="@this" update="#{cc.clientId}:process-list"
-          icon="#{visibilityBean.generateButtonIcon('si si-check-1')}"
-          actionListener="#{processWidgetBean.deleteProcessWorkflow()}" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/ok')}"
+          styleClass="w-full portal-remove-button"
+          actionListener="#{processWidgetBean.deleteProcessWorkflow()}" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/remove')}"
           oncomplete="PF('remove-process-workflow-dialog').hide(); updateProcessListOnSaveSuccessful();" />
+        <p:link onclick="PF('remove-process-workflow-dialog').hide()" styleClass="pt-3 flex justify-content-center"
+          value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
+          href="#" />
       </h:form>
     </ui:define>
   </ui:decorate>
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/WarningBeforeLeavingTask/WarningBeforeLeavingTask.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/WarningBeforeLeavingTask/WarningBeforeLeavingTask.xhtml
index f17551c2a52..a11103d165b 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/WarningBeforeLeavingTask/WarningBeforeLeavingTask.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/WarningBeforeLeavingTask/WarningBeforeLeavingTask.xhtml
@@ -47,11 +47,11 @@
             styleClass="w-6 mx-0 ui-reserve-task-button" oncomplete="#{cc.attrs.reserveOnComplete}" />
         </div>
         <div class="w-full flex justify-content-center mt-2">
-          <p:commandButton id="cancel-button"
+          <p:commandLink id="cancel-button"
             onclick="PF('#{cc.attrs.widgetVar}').hide();#{cc.attrs.cancelOnClick}"
             actionListener="#{cc.attrs.cancelActionListener}"
-            styleClass="ui-confirmdialog-yes w-full mx-0 ui-cancel-button ui-button-flat transparent"
-            value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}" />
+            styleClass="ui-confirmdialog-yes w-full mx-0 text-center"
+            value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"/>
         </div>
       </h:form>
     </ui:define>

From 30b0efc1e702de7a91f3a163014dafc627a4731e Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Thu, 12 Dec 2024 17:26:30 +0700
Subject: [PATCH 10/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Change icon of action menu
---
 .../portal/setting/AbsenceManagement/AbsenceManagement.xhtml    | 2 +-
 .../component/process/ProcessItemAction/ProcessItemAction.xhtml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/setting/AbsenceManagement/AbsenceManagement.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/setting/AbsenceManagement/AbsenceManagement.xhtml
index 7c84babd9c1..7a74a690f01 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/setting/AbsenceManagement/AbsenceManagement.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/setting/AbsenceManagement/AbsenceManagement.xhtml
@@ -86,7 +86,7 @@
                       </p:column>
                       <p:column headerText="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/action')}"
                         styleClass="absences-table-action-column">
-                        <p:commandButton id="absence-action-button" icon="si si-navigation-menu-horizontal"
+                        <p:commandButton id="absence-action-button" icon="fa fa-ellipsis-h"
                           styleClass="rounded-button icon-more-menu-button ui-no-rounded-button-process-page"
                           type="button" />
                         <p:menu class="absence-column-value" overlay="true" trigger="absence-action-button"
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/process/ProcessItemAction/ProcessItemAction.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/process/ProcessItemAction/ProcessItemAction.xhtml
index 111554405ca..a3b4139e27d 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/process/ProcessItemAction/ProcessItemAction.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/process/ProcessItemAction/ProcessItemAction.xhtml
@@ -31,7 +31,7 @@
 
   <div id="process-action-group" class="process-action-group">
     <h:panelGroup layout="block" rendered="#{!hideActionButton}">
-      <p:commandButton id="process-action-button" icon="si si-navigation-menu-horizontal"
+      <p:commandButton id="process-action-button" icon="fa fa-ellipsis-h"
         styleClass="rounded-button icon-more-menu-button #{buttonStyle} ui-no-rounded-button-process-page" type="button"/>
 
       <p:menu id="process-action-menu" overlay="true"

From 0f4b1540fad46145c7d632d1ed45054e4d95ef6b Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Thu, 12 Dec 2024 17:29:43 +0700
Subject: [PATCH 11/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update jenkinsfile
---
 build/gui-test-new-dashboard/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/gui-test-new-dashboard/Jenkinsfile b/build/gui-test-new-dashboard/Jenkinsfile
index 8ce96f24e30..70f661dba46 100644
--- a/build/gui-test-new-dashboard/Jenkinsfile
+++ b/build/gui-test-new-dashboard/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'portal-slave'}
+  agent {label 'luat-pc'}
 
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '60'))

From 3c38c3192f676a4df03300135ec60c2572ca2ec7 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Thu, 12 Dec 2024 17:34:20 +0700
Subject: [PATCH 12/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update jenkins file
---
 build/document-screenshot-selenide/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/document-screenshot-selenide/Jenkinsfile b/build/document-screenshot-selenide/Jenkinsfile
index 7d77ac2d8b7..8b84b3df717 100644
--- a/build/document-screenshot-selenide/Jenkinsfile
+++ b/build/document-screenshot-selenide/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'portal-slave'}
+  agent {label 'luat-pc'}
 
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '60'))

From 245af245416bff1d461a48c6a46b1702b8421549 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Thu, 12 Dec 2024 17:44:44 +0700
Subject: [PATCH 13/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update UI of destroy button in CaseItemDetails and TaskItemDetails
---
 .../CaseItemDetails/CaseItemDetails.xhtml          | 14 ++++++++------
 .../TaskItemDetails/TaskItemDetails.xhtml          | 12 +++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemDetails/CaseItemDetails.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemDetails/CaseItemDetails.xhtml
index a035bbc8d98..b18ad939d28 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemDetails/CaseItemDetails.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemDetails/CaseItemDetails.xhtml
@@ -181,12 +181,14 @@
     <ui:param name="dialogContent" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/caseList/destroyCaseMessage')}" />
   
     <ui:define name="dialogFooter">
-      <p:commandLink value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
-        onclick="PF('destroy-case-dialog').hide();" styleClass="u-mar-right-15" />
-      <p:commandButton id="confirm-destruction" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/destroy')}"
-        icon="#{visibilityBean.generateButtonIcon('si si-remove')}"
-        actionListener="#{caseWidgetBean.destroyCase(case)}"
-        oncomplete="backToPrevPage(#{caseWidgetBean.willNavigateBack()});" />
+      <h:panelGroup styleClass="flex flex-column">
+        <p:commandButton id="confirm-destruction" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/destroy')}"
+          styleClass="w-full portal-remove-button"
+          actionListener="#{caseWidgetBean.destroyCase(case)}"
+          oncomplete="backToPrevPage(#{caseWidgetBean.willNavigateBack()});" />
+        <p:commandLink value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
+          onclick="PF('destroy-case-dialog').hide();" styleClass="pt-3 flex justify-content-center" />
+        </h:panelGroup>
     </ui:define>
   </ui:decorate>
 
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskItemDetails/TaskItemDetails.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskItemDetails/TaskItemDetails.xhtml
index 0d45c5670e2..6e6e0c83a21 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskItemDetails/TaskItemDetails.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskItemDetails/TaskItemDetails.xhtml
@@ -200,11 +200,13 @@
     <ui:param name="dialogContent" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/taskList/destroyTaskMessage')}" />
 
     <ui:define name="dialogFooter">
-      <p:commandLink value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}" onclick="PF('destroy-task-dialog').hide();"
-        styleClass="u-mar-right-15" />
-      <p:commandButton id="confirm-destruction" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/destroy')}"
-        icon="#{visibilityBean.generateButtonIcon('si si-remove')}" actionListener="#{logic.destroyTask(task)}"
-        oncomplete="PF('destroy-task-dialog').hide()" update="#{informationWidgetComponent}" process="@this" />
+      <h:panelGroup styleClass="flex flex-column">
+        <p:commandButton id="confirm-destruction" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/destroy')}"
+          actionListener="#{logic.destroyTask(task)}" styleClass="w-full portal-remove-button"
+          oncomplete="PF('destroy-task-dialog').hide()" update="#{informationWidgetComponent}" process="@this" />
+        <p:commandLink value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}" onclick="PF('destroy-task-dialog').hide();"
+          styleClass="pt-3 flex justify-content-center" />
+      </h:panelGroup>
     </ui:define>
   </ui:decorate>
   

From 98caf30289f3ce9770ac9f55cba2c8659a7f5bc2 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Fri, 13 Dec 2024 09:27:03 +0700
Subject: [PATCH 14/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update height of upload image in external link
---
 AxonIvyPortal/portal/webContent/resources/css/module.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AxonIvyPortal/portal/webContent/resources/css/module.css b/AxonIvyPortal/portal/webContent/resources/css/module.css
index a34b1eaf453..1aa04197549 100644
--- a/AxonIvyPortal/portal/webContent/resources/css/module.css
+++ b/AxonIvyPortal/portal/webContent/resources/css/module.css
@@ -5610,7 +5610,7 @@ a.dashboard-action-container label {
   border: 1px solid var(--process-list-item-border-color);
   background-color: var(--process-list-item-background-color);
   border-radius: 10px;
-  height: 10em;
+  height: 15rem;
   align-items: center;
   display: flex;
 }

From 546f87280d576aaede65439c0fa348787eaabafd Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Fri, 13 Dec 2024 11:19:05 +0700
Subject: [PATCH 15/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update GUI tests
---
 .../portal/selenium/page/CaseWidgetNewDashBoardPage.java    | 4 ++--
 .../com/axonivy/portal/selenium/page/NewDashboardPage.java  | 2 +-
 .../portal/selenium/page/TaskWidgetNewDashBoardPage.java    | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseWidgetNewDashBoardPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseWidgetNewDashBoardPage.java
index 4b2914eac2b..59a7e13f672 100644
--- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseWidgetNewDashBoardPage.java
+++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseWidgetNewDashBoardPage.java
@@ -162,7 +162,7 @@ public void nextPageTable() {
   }
 
   public void resetFilter() {
-    $("div.filter-overlay-panel__footer").shouldBe(appear, DEFAULT_TIMEOUT).$$("button[id$='reset-button']")
+    $("div.filter-overlay-panel__footer").shouldBe(appear, DEFAULT_TIMEOUT).$$("a[id$='reset-button']")
         .filter(text("Reset")).first().shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click();
     $("div.filter-overlay-panel__footer").shouldBe(disappear, DEFAULT_TIMEOUT);
     waitForElementClickable($$("div.table-widget-panel")
@@ -269,7 +269,7 @@ public void removeAllFilterItems() {
   }
 
   public void openManageFiltersDialog() {
-    $("div#manage-filter").shouldBe(appear, DEFAULT_TIMEOUT).$("button").shouldBe(getClickableCondition()).click();
+    $("div#manage-filter").shouldBe(appear, DEFAULT_TIMEOUT).$("a").shouldBe(getClickableCondition()).click();
   }
 
   public void closeManageFilterDialog() {
diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardPage.java
index aa73b4029ce..3a228dfba65 100644
--- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardPage.java
+++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardPage.java
@@ -545,7 +545,7 @@ public SelenideElement getCompactModeProcessFilterPanelSaveButton() {
   }
 
   public SelenideElement getCompactModeProcessFilterPanelResetButton() {
-    return getCompactModeProcessFilterPanel().$("button[id$=':reset-button']");
+    return getCompactModeProcessFilterPanel().$("a[id$=':reset-button']");
   }
 
   public void resetCompactModeProcessFilterPanel() {
diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskWidgetNewDashBoardPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskWidgetNewDashBoardPage.java
index b2c269d7f42..c94ce3ae09f 100644
--- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskWidgetNewDashBoardPage.java
+++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TaskWidgetNewDashBoardPage.java
@@ -132,7 +132,7 @@ public void applyFilter() {
   }
 
   public void resetFilter() {
-    $("div.filter-overlay-panel__footer").shouldBe(appear, DEFAULT_TIMEOUT).$$("button[id$='reset-button']")
+    $("div.filter-overlay-panel__footer").shouldBe(appear, DEFAULT_TIMEOUT).$$("a[id$='reset-button']")
         .filter(text("Reset")).first().shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click();
   }
 
@@ -183,7 +183,7 @@ public boolean hasSavedFilterItem(String filterName) {
   }
 
   public void clickOnManageFilterLink() {
-    $("div#manage-filter").shouldBe(appear, DEFAULT_TIMEOUT).$("button").shouldBe(getClickableCondition()).click();
+    $("div#manage-filter").shouldBe(appear, DEFAULT_TIMEOUT).$("a").shouldBe(getClickableCondition()).click();
     $("[id$='manage-filter-dialog']").shouldBe(appear, DEFAULT_TIMEOUT);
   }
 
@@ -530,7 +530,7 @@ public void saveFilter(String widgetFilterName) {
   }
   
   public void openManageFiltersDialog() {
-    $("div#manage-filter").shouldBe(appear, DEFAULT_TIMEOUT).$("button").shouldBe(getClickableCondition()).click();
+    $("div#manage-filter").shouldBe(appear, DEFAULT_TIMEOUT).$("a").shouldBe(getClickableCondition()).click();
   }
   
   public void removeAllFilterItems() {

From 2640eb057366b3ad7ebfe1c62bdc26a2d47fd108 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Fri, 13 Dec 2024 11:49:54 +0700
Subject: [PATCH 16/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update screenshot tests
---
 .../com/axonivy/portal/selenium/page/NewDashboardPage.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardPage.java
index 3a228dfba65..d06faa3f5f6 100644
--- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardPage.java
+++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewDashboardPage.java
@@ -1033,7 +1033,7 @@ public NotificationCompactPage openNotificationPanel() {
   }
   
   public void clickOnManageFilterLink() {
-    $("div[class*='filter-overlay-panel__footer']").shouldBe(appear, DEFAULT_TIMEOUT).$("div#manage-filter").shouldBe(appear, DEFAULT_TIMEOUT).$("button[class*='saved-filter__manage-filter']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click();
+    $("div[class*='filter-overlay-panel__footer']").shouldBe(appear, DEFAULT_TIMEOUT).$("div#manage-filter").shouldBe(appear, DEFAULT_TIMEOUT).$("a[class*='saved-filter__manage-filter']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click();
     $("[id$='manage-filter-dialog']").shouldBe(appear, DEFAULT_TIMEOUT);
   }
   

From 955e9b90cd90159788e5736b1d69bcffa394a8c6 Mon Sep 17 00:00:00 2001
From: Luong Minh Luat <157108501+lmluat-axonivy@users.noreply.github.com>
Date: Fri, 13 Dec 2024 13:40:46 +0700
Subject: [PATCH 17/36] 
 feature/IVYPORTAL-18028-High-Failure-to-use-HTTPS-or-SFTP-URL-in-Maven-artifact-upload-download-Two-occurrences
 (#1298)

- Use HTTPS URL in maven artifact download
---
 AxonIvyPortal/portal-product/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AxonIvyPortal/portal-product/pom.xml b/AxonIvyPortal/portal-product/pom.xml
index 86f1e4da881..fa802272f14 100644
--- a/AxonIvyPortal/portal-product/pom.xml
+++ b/AxonIvyPortal/portal-product/pom.xml
@@ -24,7 +24,7 @@
       </releases>
       <name>Axonivy Repo</name>
       <id>release-repo</id>
-      <url>http://repo.axonivy.com/artifactory/libs-release/</url>
+      <url>https://repo.axonivy.com/artifactory/libs-release/</url>
       <layout>default</layout>
     </repository>
     <repository>
@@ -35,7 +35,7 @@
       </snapshots>
       <name>Axonivy Repo</name>
       <id>snapshots-repo</id>
-      <url>http://repo.axonivy.com/artifactory/libs-snapshot/</url>
+      <url>https://repo.axonivy.com/artifactory/libs-snapshot/</url>
       <layout>default</layout>
     </repository>
   </repositories>

From e5754fe8579c76e1d767ca09bf8b3480cbfc8ee8 Mon Sep 17 00:00:00 2001
From: Tung Le <76459536+lttung-axonivy@users.noreply.github.com>
Date: Fri, 13 Dec 2024 18:03:00 +0700
Subject: [PATCH 18/36] Update portal_walkthrough_testplan.jmx for new test
 data (#1306)

---
 .../portal-selenium-test/jmeter/portal_walkthrough_testplan.jmx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AxonIvyPortal/portal-selenium-test/jmeter/portal_walkthrough_testplan.jmx b/AxonIvyPortal/portal-selenium-test/jmeter/portal_walkthrough_testplan.jmx
index b8279fee7d0..68a9ea29895 100644
--- a/AxonIvyPortal/portal-selenium-test/jmeter/portal_walkthrough_testplan.jmx
+++ b/AxonIvyPortal/portal-selenium-test/jmeter/portal_walkthrough_testplan.jmx
@@ -1650,7 +1650,7 @@
               </elementProp>
               <elementProp name="case-default_case_list_dashboard_case_1:quick-search-form:quick-search-input-0" elementType="HTTPArgument">
                 <boolProp name="HTTPArgument.always_encode">true</boolProp>
-                <stringProp name="Argument.value">Create test data with category attach to one business case</stringProp>
+                <stringProp name="Argument.value">Business case has lots of tasks cases</stringProp>
                 <stringProp name="Argument.metadata">=</stringProp>
                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
                 <stringProp name="Argument.name">case-default_case_list_dashboard_case_1:quick-search-form:quick-search-input-0</stringProp>

From 6b4aa0a6b01893ad132f81c8974d54fe25ebe00d Mon Sep 17 00:00:00 2001
From: mnhnam-axonivy <nam.mai@axonactive.com>
Date: Mon, 16 Dec 2024 10:32:07 +0700
Subject: [PATCH 19/36] IVYPORTAL-18029 High - Client-side cross-site scripting
 - Fixed security check

---
 .../portal/webContent/resources/js/iframe-task-template.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js b/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js
index 7e32a706de4..02d1c0b63f7 100644
--- a/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js
+++ b/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js
@@ -1,15 +1,14 @@
 var invalidIFrameSrcPath = false;
 
 let taskUrl = new URLSearchParams(window.location.search).get("taskUrl");
-let updateIframeSrc = (newSrc) => {
-  getPortalIframe().src = newSrc;
-}
+
 if (taskUrl){
   if(taskUrl.endsWith('blank')){
     window.history.back(document.referrer);
   }
-  updateIframeSrc(taskUrl)
+  getPortalIframe().src = taskUrl;
 }
+
 loadIframe(false);
 var recheckFrameTimer;
 function loadIframe(recheckIndicator) {

From f4cf1709e1971d7aeaf8da62e54746eb49cd2fe8 Mon Sep 17 00:00:00 2001
From: Tung Le <76459536+lttung-axonivy@users.noreply.github.com>
Date: Mon, 16 Dec 2024 10:39:35 +0700
Subject: [PATCH 20/36] Updated all pom build.plugin.version=12.0.0,
 ivy.engine.version=12.0.2 (#1308)

Co-authored-by: wawa-axonivy <wawa.ivyteam@gmail.com>
---
 AxonIvyPortal/PortalKitTestHelper/pom.xml                     | 4 ++--
 AxonIvyPortal/portal-components/pom.xml                       | 4 ++--
 AxonIvyPortal/portal-migration/pom.xml                        | 4 ++--
 AxonIvyPortal/portal-selenium-test/customized_pom.xml         | 4 ++--
 .../portal-selenium-test/document_screenshot_pom.xml          | 4 ++--
 AxonIvyPortal/portal-selenium-test/pom.xml                    | 4 ++--
 AxonIvyPortal/portal/pom.xml                                  | 4 ++--
 Showcase/InternalSupport/pom.xml                              | 4 ++--
 Showcase/portal-components-examples/pom.xml                   | 4 ++--
 Showcase/portal-developer-examples/pom.xml                    | 4 ++--
 Showcase/portal-user-examples/pom.xml                         | 4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/AxonIvyPortal/PortalKitTestHelper/pom.xml b/AxonIvyPortal/PortalKitTestHelper/pom.xml
index 9b1856defa9..79b9a3a82a9 100644
--- a/AxonIvyPortal/PortalKitTestHelper/pom.xml
+++ b/AxonIvyPortal/PortalKitTestHelper/pom.xml
@@ -7,8 +7,8 @@
   <version>9.1.0.0-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
-    <ivy.engine.version>12.0.1</ivy.engine.version>
-    <build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
+    <ivy.engine.version>12.0.2</ivy.engine.version>
+    <build.plugin.version>12.0.0</build.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
diff --git a/AxonIvyPortal/portal-components/pom.xml b/AxonIvyPortal/portal-components/pom.xml
index 7f1813bde05..ab5abfd88c3 100644
--- a/AxonIvyPortal/portal-components/pom.xml
+++ b/AxonIvyPortal/portal-components/pom.xml
@@ -16,8 +16,8 @@
     </snapshotRepository>
   </distributionManagement>
   <properties>
-    <ivy.engine.version>12.0.1</ivy.engine.version>
-    <build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
+    <ivy.engine.version>12.0.2</ivy.engine.version>
+    <build.plugin.version>12.0.0</build.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
diff --git a/AxonIvyPortal/portal-migration/pom.xml b/AxonIvyPortal/portal-migration/pom.xml
index fab872d578f..ae3e7224111 100644
--- a/AxonIvyPortal/portal-migration/pom.xml
+++ b/AxonIvyPortal/portal-migration/pom.xml
@@ -6,8 +6,8 @@
   <version>9.4.0</version>
   <packaging>iar</packaging>
   <properties>
-    <ivy.engine.version>12.0.1</ivy.engine.version>
-    <build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
+    <ivy.engine.version>12.0.2</ivy.engine.version>
+    <build.plugin.version>12.0.0</build.plugin.version>
   </properties>
   <build>
     <plugins>
diff --git a/AxonIvyPortal/portal-selenium-test/customized_pom.xml b/AxonIvyPortal/portal-selenium-test/customized_pom.xml
index 09309492b2a..254cb3b2a27 100644
--- a/AxonIvyPortal/portal-selenium-test/customized_pom.xml
+++ b/AxonIvyPortal/portal-selenium-test/customized_pom.xml
@@ -6,8 +6,8 @@
   <version>9.1.0.0-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
-    <build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
-    <ivy.engine.version>12.0.1</ivy.engine.version>
+    <build.plugin.version>12.0.0</build.plugin.version>
+    <ivy.engine.version>12.0.2</ivy.engine.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
diff --git a/AxonIvyPortal/portal-selenium-test/document_screenshot_pom.xml b/AxonIvyPortal/portal-selenium-test/document_screenshot_pom.xml
index 09bffcb6333..ce671e75e8b 100644
--- a/AxonIvyPortal/portal-selenium-test/document_screenshot_pom.xml
+++ b/AxonIvyPortal/portal-selenium-test/document_screenshot_pom.xml
@@ -6,8 +6,8 @@
   <version>9.1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <properties>
-    <build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
-    <ivy.engine.version>12.0.1</ivy.engine.version>
+    <build.plugin.version>12.0.0</build.plugin.version>
+    <ivy.engine.version>12.0.2</ivy.engine.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <distributionManagement>
diff --git a/AxonIvyPortal/portal-selenium-test/pom.xml b/AxonIvyPortal/portal-selenium-test/pom.xml
index 9b533775639..59acebbe3a2 100644
--- a/AxonIvyPortal/portal-selenium-test/pom.xml
+++ b/AxonIvyPortal/portal-selenium-test/pom.xml
@@ -7,8 +7,8 @@
   <version>9.1.0.0-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
-    <ivy.engine.version>12.0.1</ivy.engine.version>
-    <build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
+    <ivy.engine.version>12.0.2</ivy.engine.version>
+    <build.plugin.version>12.0.0</build.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
diff --git a/AxonIvyPortal/portal/pom.xml b/AxonIvyPortal/portal/pom.xml
index 5c7f9309e22..706213bcb9e 100644
--- a/AxonIvyPortal/portal/pom.xml
+++ b/AxonIvyPortal/portal/pom.xml
@@ -17,8 +17,8 @@
     </snapshotRepository>
   </distributionManagement>
   <properties>
-    <ivy.engine.version>12.0.1</ivy.engine.version>
-    <build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
+    <ivy.engine.version>12.0.2</ivy.engine.version>
+    <build.plugin.version>12.0.0</build.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
diff --git a/Showcase/InternalSupport/pom.xml b/Showcase/InternalSupport/pom.xml
index 6a74a3701a5..dcbc2f4958e 100644
--- a/Showcase/InternalSupport/pom.xml
+++ b/Showcase/InternalSupport/pom.xml
@@ -6,8 +6,8 @@
   <version>9.1.0.0-SNAPSHOT</version>
   <packaging>iar</packaging>
   <properties>
-    <build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
-    <ivy.engine.version>12.0.1</ivy.engine.version>
+    <build.plugin.version>12.0.0</build.plugin.version>
+    <ivy.engine.version>12.0.2</ivy.engine.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <repositories>
diff --git a/Showcase/portal-components-examples/pom.xml b/Showcase/portal-components-examples/pom.xml
index 076878621ed..43de80ab6a9 100644
--- a/Showcase/portal-components-examples/pom.xml
+++ b/Showcase/portal-components-examples/pom.xml
@@ -17,8 +17,8 @@
     </snapshotRepository>
   </distributionManagement>
   <properties>
-    <ivy.engine.version>12.0.1</ivy.engine.version>
-    <build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
+    <ivy.engine.version>12.0.2</ivy.engine.version>
+    <build.plugin.version>12.0.0</build.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
diff --git a/Showcase/portal-developer-examples/pom.xml b/Showcase/portal-developer-examples/pom.xml
index 470188c062f..ab5a66f5505 100644
--- a/Showcase/portal-developer-examples/pom.xml
+++ b/Showcase/portal-developer-examples/pom.xml
@@ -17,8 +17,8 @@
     </snapshotRepository>
   </distributionManagement>
   <properties>
-    <ivy.engine.version>12.0.1</ivy.engine.version>
-    <build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
+    <ivy.engine.version>12.0.2</ivy.engine.version>
+    <build.plugin.version>12.0.0</build.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>
diff --git a/Showcase/portal-user-examples/pom.xml b/Showcase/portal-user-examples/pom.xml
index 20e8b2c6f51..f6ca58fd61a 100644
--- a/Showcase/portal-user-examples/pom.xml
+++ b/Showcase/portal-user-examples/pom.xml
@@ -17,8 +17,8 @@
     </snapshotRepository>
   </distributionManagement>
   <properties>
-    <ivy.engine.version>12.0.1</ivy.engine.version>
-    <build.plugin.version>12.0.0-SNAPSHOT</build.plugin.version>
+    <ivy.engine.version>12.0.2</ivy.engine.version>
+    <build.plugin.version>12.0.0</build.plugin.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
   <dependencies>

From c8474f3527c145dfb73b299376350a8b955a8899 Mon Sep 17 00:00:00 2001
From: mnhnam-axonivy <nam.mai@axonactive.com>
Date: Mon, 16 Dec 2024 10:40:42 +0700
Subject: [PATCH 21/36] IVYPORTAL-18029 High - Client-side cross-site scripting
 - Try to fix Client-side cross-site scripting

---
 .../portal/webContent/resources/js/iframe-task-template.js      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js b/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js
index 02d1c0b63f7..6eb27d0635e 100644
--- a/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js
+++ b/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js
@@ -6,7 +6,7 @@ if (taskUrl){
   if(taskUrl.endsWith('blank')){
     window.history.back(document.referrer);
   }
-  getPortalIframe().src = taskUrl;
+  getPortalIframe().src = new URLSearchParams(window.location.search).get("taskUrl");
 }
 
 loadIframe(false);

From 033f462f96ef37e3c148a145f9c862bf3b8e2e69 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Mon, 16 Dec 2024 11:00:20 +0700
Subject: [PATCH 22/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update UI delete document button
---
 .../portal/generic/CaseDocuments/CaseDocuments.xhtml      | 8 ++++----
 .../portal/generic/TaskDocuments/TaskDocuments.xhtml      | 8 ++++----
 .../component/CaseItemDocument/CaseItemDocument.xhtml     | 8 ++++----
 .../component/TaskItemDocuments/TaskItemDocuments.xhtml   | 6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/CaseDocuments/CaseDocuments.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/CaseDocuments/CaseDocuments.xhtml
index 5b3ad1a5c31..74e7f501aee 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/CaseDocuments/CaseDocuments.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/CaseDocuments/CaseDocuments.xhtml
@@ -99,13 +99,13 @@
         <ui:param name="dialogContent" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/confirmForDelete')}" />
 
         <ui:define name="dialogFooter">
-          <p:commandLink id="document-deletion-cancellation-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
-             process="@this" onsuccess="PF('document-deletion-dialog').hide()" styleClass="u-mar-right-15"/>
           <p:commandButton id="document-deletion-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/delete')}"
-            process="@this" icon="#{visibilityBean.generateButtonIcon('si si-remove')}"
+            process="@this"
             update="case-document-global-messages case-doc-form"
-            actionListener="#{logic.deleteDocument}"
+            actionListener="#{logic.deleteDocument}" styleClass="w-full portal-remove-button"
             oncomplete="PF('document-deletion-dialog').hide();" />
+          <p:commandLink id="document-deletion-cancellation-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
+             process="@this" onsuccess="PF('document-deletion-dialog').hide()" styleClass="pt-3 flex justify-content-center"/>
         </ui:define>
       </ui:decorate>
     </ui:define>
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskDocuments/TaskDocuments.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskDocuments/TaskDocuments.xhtml
index 2e40333a337..b4c4e1da392 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskDocuments/TaskDocuments.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/TaskDocuments/TaskDocuments.xhtml
@@ -99,13 +99,13 @@
         <ui:param name="dialogContent" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/confirmForDelete')}" />
 
         <ui:define name="dialogFooter">
-          <p:commandLink id="document-deletion-cancellation-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
-             process="@this" onsuccess="PF('document-deletion-dialog').hide()" styleClass="u-mar-right-15"/>
           <p:commandButton id="document-deletion-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/delete')}"
-            process="@this" icon="#{visibilityBean.generateButtonIcon('si si-remove')}"
+            process="@this"
             update="task-document-global-messages task-doc-form"
-            actionListener="#{logic.deleteDocument}"
+            actionListener="#{logic.deleteDocument}" styleClass="w-full portal-remove-button"
             oncomplete="PF('document-deletion-dialog').hide();" />
+          <p:commandLink id="document-deletion-cancellation-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
+             process="@this" onsuccess="PF('document-deletion-dialog').hide()" styleClass="pt-3 flex justify-content-center"/>
         </ui:define>
       </ui:decorate>
     </ui:define>
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemDocument/CaseItemDocument.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemDocument/CaseItemDocument.xhtml
index 4c966982edf..3d073e96869 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemDocument/CaseItemDocument.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/CaseItemDocument/CaseItemDocument.xhtml
@@ -167,13 +167,13 @@
     <ui:param name="dialogContent" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/confirmForDelete')}" />
     
     <ui:define name="dialogFooter">
-      <p:commandLink id="document-deletion-cancellation-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
-         process="@this" onsuccess="PF('document-deletion-dialog').hide()" styleClass="u-mar-right-15"/>
       <p:commandButton id="document-deletion-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/delete')}"
-        process="@this" icon="#{visibilityBean.generateButtonIcon('si si-remove')}"
+        process="@this"
         update="#{cc.attrs.componentToUpdate} #{cc.clientId}:case-document-global-messages #{cc.clientId}:case-document-form"
-        actionListener="#{logic.deleteDocument}"
+        actionListener="#{logic.deleteDocument}" styleClass="w-full portal-remove-button"
         oncomplete="PF('document-deletion-dialog').hide();handleCaseDetailsTable();" />
+      <p:commandLink id="document-deletion-cancellation-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
+         process="@this" onsuccess="PF('document-deletion-dialog').hide()" styleClass="pt-3 flex justify-content-center"/>
     </ui:define>
   </ui:decorate>
   <script type="text/javascript">
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskItemDocuments/TaskItemDocuments.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskItemDocuments/TaskItemDocuments.xhtml
index edbf1b00073..724ab83c410 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskItemDocuments/TaskItemDocuments.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/TaskItemDocuments/TaskItemDocuments.xhtml
@@ -166,12 +166,12 @@
     <ui:param name="dialogContent" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/confirmForDelete')}" />
     
     <ui:define name="dialogFooter">
-      <p:commandLink id="document-deletion-cancellation-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
-        process="@this" onsuccess="PF('document-deletion-dialog').hide()" styleClass="u-mar-right-15"/>
       <p:commandButton id="document-deletion-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/delete')}" process="@this"
-        icon="#{visibilityBean.generateButtonIcon('si si-remove')}"
+        styleClass="w-full portal-remove-button"
         update="#{p:resolveFirstComponentWithId('task-document-form', view).clientId} #{cc.attrs.componentToUpdate} #{p:resolveFirstComponentWithId('task-document-global-messages', view).clientId}"
         actionListener="#{logic.deleteDocument}" oncomplete="PF('document-deletion-dialog').hide();handleTaskDetailsTables();" />
+      <p:commandLink id="document-deletion-cancellation-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
+        process="@this" onsuccess="PF('document-deletion-dialog').hide()" styleClass="pt-3 flex justify-content-center"/>
     </ui:define>
   </ui:decorate>
   <script type="text/javascript">

From d13151137a5b86798c7633a3281537d14b8a1ec6 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Mon, 16 Dec 2024 11:30:29 +0700
Subject: [PATCH 23/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Upload document-screenshot.js file
---
 .../portal-selenium-test/resources/js/document-screenshot.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js b/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js
index 72d33cbad1f..d6de1e6f34c 100644
--- a/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js
+++ b/AxonIvyPortal/portal-selenium-test/resources/js/document-screenshot.js
@@ -124,7 +124,7 @@ function highlightProcessItems() {
 }
 
 function highlightEditProcessIcon() {
-  appendStepAnnotation($("[id$='process-widget:edit-process-form:edit-process-icon:awesome-icon-selection']"), "4", -10, 100);
+  appendStepAnnotation($("[id$='process-widget:edit-process-form:edit-process-icon:awesome-icon-selection']"), "4", -40, 110);
 }
 
 function highlightEditProcessDialog() {

From 62c78a3d253302339587f72423edb65109407130 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Mon, 16 Dec 2024 11:59:13 +0700
Subject: [PATCH 24/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update screenshot test
---
 .../document/screenshot/PortalCasesScreenshotTest.java       | 2 +-
 .../com/axonivy/portal/selenium/page/CaseDetailsPage.java    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/PortalCasesScreenshotTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/PortalCasesScreenshotTest.java
index ffd8a3412be..8a6f125fe7f 100644
--- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/PortalCasesScreenshotTest.java
+++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/PortalCasesScreenshotTest.java
@@ -84,7 +84,7 @@ public void screenshotCaseDetails() throws IOException {
     ScreenshotUtils.captureElementWithMarginOptionScreenshot(detailsPage.openAddAttachmentDialog(),
         ScreenshotUtils.CASE_DETAIL_FOLDER + "how-to-attach-document-to-case", new ScreenshotMargin(10));
     detailsPage.closeAddAttachmentDialog();
-    detailsPage.uploadDocumentWithoutError(FileHelper.getAbsolutePathToTestFile("test-no-files-no-js.pdf"));
+    detailsPage.uploadDocument(FileHelper.getAbsolutePathToTestFile("test-no-files-no-js.pdf"));
 
     refreshPage();
     detailsPage.waitForCaseDetailsDisplay();
diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseDetailsPage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseDetailsPage.java
index cec20f12a4e..e069a25ee19 100644
--- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseDetailsPage.java
+++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/CaseDetailsPage.java
@@ -850,6 +850,11 @@ public void uploadDocumentWithoutError(String pathToFile) {
     $("button[id$='document:document-upload-close-command']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT)
         .click();
   }
+  
+  public void uploadDocument(String pathToFile) {
+    $("input[id$='document-upload-panel_input']").shouldBe(exist, DEFAULT_TIMEOUT)
+    .shouldBe(Condition.hidden, DEFAULT_TIMEOUT).sendKeys(pathToFile);
+  }
 
   public void openAddDocumentDialogAndUploadDocument(String pathToFile) {
     getAddAttachmentDialog();

From 0eeaa313c89d6e685d406a00283a97dccb979f0e Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Mon, 16 Dec 2024 14:01:00 +0700
Subject: [PATCH 25/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update reset filter in task widget filter
---
 .../restricted/decorator/TableWidget.xhtml    | 23 +++++++++----------
 .../webContent/resources/css/utility.css      |  4 ++++
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml b/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
index 022dba18612..6b54297ccbd 100644
--- a/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
+++ b/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
@@ -267,19 +267,18 @@
                 actionListener="#{widget.onApplyUserFilters()}"
                 styleClass="u-mar-right-5 w-full" />
               </div>
-              <div class="ui-g-12 flex justify-content-center ui-sm-12">
-              <i class=" ui-commandlink pr-2 pt-1 si si-button-refresh-arrows"/>
-              <p:commandLink id="reset-button"
-                styleClass="secondary-btn u-mar-right-5 flex reset-button" partialSubmit="true"
-                process="filter-form-#{index}"
-                update="#{componentToUpdateOnResetFilter} #{cc.clientId}:widget-header-actions"
-                oncomplete="PF('filter-overlay-panel-#{index}').hide(); initWidgetFilterHtml('#{widget.id}');"
-                actionListener="#{widget.onResetUserFilters()}"
-                resetValues="true">
-                  <span>#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/resetFilters')}</span>
-                </p:commandLink>
+              <div class="ui-g-12 flex justify-content-center ui-sm-12 ">
+                <i class="pr-2 pt-1 si si-button-refresh-arrows ui-link u-hover-no-underline"/>
+                <p:commandLink id="reset-button"
+                  styleClass="u-mar-right-5 flex reset-button" partialSubmit="true"
+                  process="filter-form-#{index}"
+                  update="#{componentToUpdateOnResetFilter} #{cc.clientId}:widget-header-actions"
+                  oncomplete="PF('filter-overlay-panel-#{index}').hide(); initWidgetFilterHtml('#{widget.id}');"
+                  actionListener="#{widget.onResetUserFilters()}"
+                  resetValues="true">
+                    <span>#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/resetFilters')}</span>
+                  </p:commandLink>
               </div>
-
             </div>
           </div>
         </h:form>
diff --git a/AxonIvyPortal/portal/webContent/resources/css/utility.css b/AxonIvyPortal/portal/webContent/resources/css/utility.css
index 6b8a3fe3de3..c98684a324d 100644
--- a/AxonIvyPortal/portal/webContent/resources/css/utility.css
+++ b/AxonIvyPortal/portal/webContent/resources/css/utility.css
@@ -72,6 +72,10 @@
   transition: all 0.5s ease;
 }
 
+.u-hover-no-underline:hover{
+  text-decoration: none !important;
+}
+
 .u-hover-effect:hover {
   opacity: 0.8;
   -webkit-transition: all 0.5s ease;

From 960f08804fd6b55a6577517685fa9c0abc1347f6 Mon Sep 17 00:00:00 2001
From: mnhnam-axonivy <nam.mai@axonactive.com>
Date: Mon, 16 Dec 2024 14:02:09 +0700
Subject: [PATCH 26/36] IVYPORTAL-18029 High - Client-side cross-site scripting
 - Apply new approach

---
 .../generic/bean/IFrameTaskTemplateBean.java  |  7 +++
 .../restricted/IFrameTaskTemplate.xhtml       | 49 ++++++++++++-------
 .../resources/js/iframe-task-template.js      | 10 ----
 3 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/IFrameTaskTemplateBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/IFrameTaskTemplateBean.java
index c7b6b99bcd2..af864d25651 100644
--- a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/IFrameTaskTemplateBean.java
+++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/IFrameTaskTemplateBean.java
@@ -54,6 +54,7 @@ public class IFrameTaskTemplateBean extends AbstractTaskTemplateBean implements
   public static final String PORTAL_GROWL_MESSGE_PARAM = "portalGrowlMessage";
   private static final String DEFAULT_TASK_ICON = "si si-task-list-edit";
   private static final String TASK_ICON = "taskIcon";
+  private static final String TASK_URL = "taskUrl";
 
   private int currentProcessStep;
   private List<String> processSteps;
@@ -74,6 +75,12 @@ public class IFrameTaskTemplateBean extends AbstractTaskTemplateBean implements
 
   private Long caseId = null;
 
+  public String getTaskUrl() {
+    return Optional.ofNullable(FacesContext.getCurrentInstance()
+        .getExternalContext().getRequestParameterMap().get(TASK_URL))
+        .orElse(StringUtils.EMPTY);
+  }
+
   public void useTaskInIFrame() {
     keepOverridePortalGrowl();
     Map<String, String> requestParamMap = getRequestParameterMap();
diff --git a/AxonIvyPortal/portal/webContent/layouts/restricted/IFrameTaskTemplate.xhtml b/AxonIvyPortal/portal/webContent/layouts/restricted/IFrameTaskTemplate.xhtml
index c9cda06739d..7b521bc862c 100644
--- a/AxonIvyPortal/portal/webContent/layouts/restricted/IFrameTaskTemplate.xhtml
+++ b/AxonIvyPortal/portal/webContent/layouts/restricted/IFrameTaskTemplate.xhtml
@@ -70,24 +70,24 @@
     **2. JavaScript-Based Configuration:**
     Example:
     <script>
-    	window.taskName = "Approve Investment";
-    	window.taskIcon = "si si-bulb";
-    	window.isHideTaskName = false;
-    	window.caseId = "123456";
-    	window.isHideCaseInfo = false;
-    	window.currentProcessStep = 0;
-    	window.processSteps = ["Create Investment Request", "Approve Investment Request"];
-    	// Convert Java List of steps to JSON format if needed:
-    	window.processSteps = #{portalComponentUtilsBean.convertToJSON(data.steps)};
-    	window.isShowAllSteps = true;
-    	window.processChainDirection = "VERTICAL";
-    	window.processChainShape = "LINE";
-    	window.isHideTaskAction = false;
-    	window.isWorkingOnATask = false;
-    	window.announcementInvisible = false;
-    	window.isCardFrame = true;
-    	window.viewName = "TASK_DETAIL";
-  	</script>
+        window.taskName = "Approve Investment";
+        window.taskIcon = "si si-bulb";
+        window.isHideTaskName = false;
+        window.caseId = "123456";
+        window.isHideCaseInfo = false;
+        window.currentProcessStep = 0;
+        window.processSteps = ["Create Investment Request", "Approve Investment Request"];
+        // Convert Java List of steps to JSON format if needed:
+        window.processSteps = #{portalComponentUtilsBean.convertToJSON(data.steps)};
+        window.isShowAllSteps = true;
+        window.processChainDirection = "VERTICAL";
+        window.processChainShape = "LINE";
+        window.isHideTaskAction = false;
+        window.isWorkingOnATask = false;
+        window.announcementInvisible = false;
+        window.isCardFrame = true;
+        window.viewName = "TASK_DETAIL";
+      </script>
     -->
 
 
@@ -113,6 +113,19 @@
     <ui:param name="taskIcon" value="#{iFrameTaskTemplateBean.taskIcon}" />
 
     <ui:define name="content">
+      <script>
+        $(document).ready(function() {
+          var taskUrl = '#{iFrameTaskTemplateBean.taskUrl}';
+          if (taskUrl){
+            if(taskUrl.endsWith('blank')){
+              window.history.back(document.referrer);
+            }
+            getPortalIframe().src = taskUrl;
+          }
+          
+          loadIframe(false);
+        });
+      </script>
       <h:form>
         <p:remoteCommand name="redirectToEndPageCommand" actionListener="#{iFrameTaskTemplateBean.navigateToEndPage()}" />
         <p:remoteCommand name="displayPortalGrowlMessageCommand" actionListener="#{iFrameTaskTemplateBean.displayPortalGrowlMessage()}" />
diff --git a/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js b/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js
index 6eb27d0635e..46a55531bc3 100644
--- a/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js
+++ b/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js
@@ -1,15 +1,5 @@
 var invalidIFrameSrcPath = false;
 
-let taskUrl = new URLSearchParams(window.location.search).get("taskUrl");
-
-if (taskUrl){
-  if(taskUrl.endsWith('blank')){
-    window.history.back(document.referrer);
-  }
-  getPortalIframe().src = new URLSearchParams(window.location.search).get("taskUrl");
-}
-
-loadIframe(false);
 var recheckFrameTimer;
 function loadIframe(recheckIndicator) {
   var iframe = getPortalIframe();

From 7c327a7aa6ed405fe19782ac77543f79d6ac2dfe Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Mon, 16 Dec 2024 15:26:58 +0700
Subject: [PATCH 27/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update document
---
 .../source/portal-user-guide/full-process-list/index.rst       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Documentation/portal-guide/source/portal-user-guide/full-process-list/index.rst b/Documentation/portal-guide/source/portal-user-guide/full-process-list/index.rst
index a6d45171e83..5be92984647 100644
--- a/Documentation/portal-guide/source/portal-user-guide/full-process-list/index.rst
+++ b/Documentation/portal-guide/source/portal-user-guide/full-process-list/index.rst
@@ -127,8 +127,7 @@ HowTo: Edit process icon of External link in Image mode
 #. Click on ``More menu item`` icon in the process card item.
 #. Click on |edit-icon| :guilabel:`Edit` menu item.
 #. The dialog **Edit process information** is opened.
-#. Click on the link ``Change`` besides the current icon.
-#. The dialog :guilabel:`Selecting icon` is opened, and choose new icon.
+#. You can change the current icon using the available icon list, or open the :guilabel:`Selecting icon dialog` to get more new icons.
 #. Press on :guilabel:`Save` button, and process icon is changed
 
    |edit-process-menu-item|

From 12ee8e7eb885b148db9cdbcb30892c6750b78fe1 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Mon, 16 Dec 2024 15:30:24 +0700
Subject: [PATCH 28/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update screenshot tests
---
 .../document/screenshot/PortalProcessesScreenshotTest.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/PortalProcessesScreenshotTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/PortalProcessesScreenshotTest.java
index d7421a40e6a..84856693bec 100644
--- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/PortalProcessesScreenshotTest.java
+++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/document/screenshot/PortalProcessesScreenshotTest.java
@@ -79,10 +79,11 @@ public void screenshotPortalFullProcessesList() throws IOException {
     ScreenshotUtils.captureElementWithMarginOptionScreenshot(processWidget.getProcessEditMenu(0),
         ScreenshotUtils.PROCESSES_WIDGET_FOLDER + "edit-process-menu-item", new ScreenshotMargin(150, 200));
     processWidget.clickOnProcessEditMenu(0);
+    ScreenshotUtils.maximizeBrowser();
     ScreenshotUtils.executeDecorateJs("highlightEditProcessDialog()");
     ScreenshotUtils.executeDecorateJs("highlightEditProcessIcon()");
     ScreenshotUtils.captureElementWithMarginOptionScreenshot(processWidget.getEditProcessDialog(),
-        ScreenshotUtils.PROCESSES_WIDGET_FOLDER + "edit-process-dialog", new ScreenshotMargin(10));
+        ScreenshotUtils.PROCESSES_WIDGET_FOLDER + "edit-process-dialog", new ScreenshotMargin(5));
     ScreenshotUtils.resizeBrowser(new Dimension(1366, 800));
     refreshPage();
     processWidget.waitUtilProcessWidgetDisplayed();

From b6f0df9a2b89a5165b18037502070ae86c286d24 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Mon, 16 Dec 2024 15:33:04 +0700
Subject: [PATCH 29/36] Revert "feature/IVYPORTAL-18032-UI-facelift-conflict"

This reverts commit 0f4b1540fad46145c7d632d1ed45054e4d95ef6b.
---
 build/gui-test-new-dashboard/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/gui-test-new-dashboard/Jenkinsfile b/build/gui-test-new-dashboard/Jenkinsfile
index 70f661dba46..8ce96f24e30 100644
--- a/build/gui-test-new-dashboard/Jenkinsfile
+++ b/build/gui-test-new-dashboard/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'luat-pc'}
+  agent {label 'portal-slave'}
 
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '60'))

From ba0dbde96fe0d43f1b6f85c16da335db1c85d76e Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Mon, 16 Dec 2024 15:33:15 +0700
Subject: [PATCH 30/36] Revert "feature/IVYPORTAL-18032-UI-facelift-conflict"

This reverts commit 3c38c3192f676a4df03300135ec60c2572ca2ec7.
---
 build/document-screenshot-selenide/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/document-screenshot-selenide/Jenkinsfile b/build/document-screenshot-selenide/Jenkinsfile
index 8b84b3df717..7d77ac2d8b7 100644
--- a/build/document-screenshot-selenide/Jenkinsfile
+++ b/build/document-screenshot-selenide/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'luat-pc'}
+  agent {label 'portal-slave'}
 
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '60'))

From cbc283beee68db986d67a41b405c0a3d47808120 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Mon, 16 Dec 2024 16:15:31 +0700
Subject: [PATCH 31/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Update UI of process image
---
 AxonIvyPortal/portal/webContent/resources/css/module.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AxonIvyPortal/portal/webContent/resources/css/module.css b/AxonIvyPortal/portal/webContent/resources/css/module.css
index 1aa04197549..62b286ae003 100644
--- a/AxonIvyPortal/portal/webContent/resources/css/module.css
+++ b/AxonIvyPortal/portal/webContent/resources/css/module.css
@@ -5180,7 +5180,7 @@ body.light .image-process-container .image-process-item .card-item.card.image-wi
 }
 
 .image-process-item .card.image-widget-mode .process-name {
-  padding: 0.5rem 0.6rem;
+  padding: 1rem 0.6rem;
 }
 
 .image-process-icon .process-image-view-icon {

From f3e17576ba1d6fbef14b120019fd4be902fe508f Mon Sep 17 00:00:00 2001
From: Nam Mai <117440763+mnhnam-axonivy@users.noreply.github.com>
Date: Mon, 16 Dec 2024 17:00:59 +0700
Subject: [PATCH 32/36]   IVYPORTAL-18029: Security findings- Client-side
 cross-site scripting (#1310)

* feature/IVYPORTAL-18028-High-Failure-to-use-HTTPS-or-SFTP-URL-in-Maven-artifact-upload-download-Two-occurrences-12 (#1305)

* IVYPORTAL-18029 High - Client-side cross-site scripting
- Apply new approach to load taskUrl from server
---
 .../generic/bean/IFrameTaskTemplateBean.java  |  7 +++
 .../restricted/IFrameTaskTemplate.xhtml       | 49 ++++++++++++-------
 .../resources/js/iframe-task-template.js      | 11 -----
 3 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/IFrameTaskTemplateBean.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/IFrameTaskTemplateBean.java
index c7b6b99bcd2..af864d25651 100644
--- a/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/IFrameTaskTemplateBean.java
+++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portal/generic/bean/IFrameTaskTemplateBean.java
@@ -54,6 +54,7 @@ public class IFrameTaskTemplateBean extends AbstractTaskTemplateBean implements
   public static final String PORTAL_GROWL_MESSGE_PARAM = "portalGrowlMessage";
   private static final String DEFAULT_TASK_ICON = "si si-task-list-edit";
   private static final String TASK_ICON = "taskIcon";
+  private static final String TASK_URL = "taskUrl";
 
   private int currentProcessStep;
   private List<String> processSteps;
@@ -74,6 +75,12 @@ public class IFrameTaskTemplateBean extends AbstractTaskTemplateBean implements
 
   private Long caseId = null;
 
+  public String getTaskUrl() {
+    return Optional.ofNullable(FacesContext.getCurrentInstance()
+        .getExternalContext().getRequestParameterMap().get(TASK_URL))
+        .orElse(StringUtils.EMPTY);
+  }
+
   public void useTaskInIFrame() {
     keepOverridePortalGrowl();
     Map<String, String> requestParamMap = getRequestParameterMap();
diff --git a/AxonIvyPortal/portal/webContent/layouts/restricted/IFrameTaskTemplate.xhtml b/AxonIvyPortal/portal/webContent/layouts/restricted/IFrameTaskTemplate.xhtml
index c9cda06739d..7b521bc862c 100644
--- a/AxonIvyPortal/portal/webContent/layouts/restricted/IFrameTaskTemplate.xhtml
+++ b/AxonIvyPortal/portal/webContent/layouts/restricted/IFrameTaskTemplate.xhtml
@@ -70,24 +70,24 @@
     **2. JavaScript-Based Configuration:**
     Example:
     <script>
-    	window.taskName = "Approve Investment";
-    	window.taskIcon = "si si-bulb";
-    	window.isHideTaskName = false;
-    	window.caseId = "123456";
-    	window.isHideCaseInfo = false;
-    	window.currentProcessStep = 0;
-    	window.processSteps = ["Create Investment Request", "Approve Investment Request"];
-    	// Convert Java List of steps to JSON format if needed:
-    	window.processSteps = #{portalComponentUtilsBean.convertToJSON(data.steps)};
-    	window.isShowAllSteps = true;
-    	window.processChainDirection = "VERTICAL";
-    	window.processChainShape = "LINE";
-    	window.isHideTaskAction = false;
-    	window.isWorkingOnATask = false;
-    	window.announcementInvisible = false;
-    	window.isCardFrame = true;
-    	window.viewName = "TASK_DETAIL";
-  	</script>
+        window.taskName = "Approve Investment";
+        window.taskIcon = "si si-bulb";
+        window.isHideTaskName = false;
+        window.caseId = "123456";
+        window.isHideCaseInfo = false;
+        window.currentProcessStep = 0;
+        window.processSteps = ["Create Investment Request", "Approve Investment Request"];
+        // Convert Java List of steps to JSON format if needed:
+        window.processSteps = #{portalComponentUtilsBean.convertToJSON(data.steps)};
+        window.isShowAllSteps = true;
+        window.processChainDirection = "VERTICAL";
+        window.processChainShape = "LINE";
+        window.isHideTaskAction = false;
+        window.isWorkingOnATask = false;
+        window.announcementInvisible = false;
+        window.isCardFrame = true;
+        window.viewName = "TASK_DETAIL";
+      </script>
     -->
 
 
@@ -113,6 +113,19 @@
     <ui:param name="taskIcon" value="#{iFrameTaskTemplateBean.taskIcon}" />
 
     <ui:define name="content">
+      <script>
+        $(document).ready(function() {
+          var taskUrl = '#{iFrameTaskTemplateBean.taskUrl}';
+          if (taskUrl){
+            if(taskUrl.endsWith('blank')){
+              window.history.back(document.referrer);
+            }
+            getPortalIframe().src = taskUrl;
+          }
+          
+          loadIframe(false);
+        });
+      </script>
       <h:form>
         <p:remoteCommand name="redirectToEndPageCommand" actionListener="#{iFrameTaskTemplateBean.navigateToEndPage()}" />
         <p:remoteCommand name="displayPortalGrowlMessageCommand" actionListener="#{iFrameTaskTemplateBean.displayPortalGrowlMessage()}" />
diff --git a/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js b/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js
index 7e32a706de4..46a55531bc3 100644
--- a/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js
+++ b/AxonIvyPortal/portal/webContent/resources/js/iframe-task-template.js
@@ -1,16 +1,5 @@
 var invalidIFrameSrcPath = false;
 
-let taskUrl = new URLSearchParams(window.location.search).get("taskUrl");
-let updateIframeSrc = (newSrc) => {
-  getPortalIframe().src = newSrc;
-}
-if (taskUrl){
-  if(taskUrl.endsWith('blank')){
-    window.history.back(document.referrer);
-  }
-  updateIframeSrc(taskUrl)
-}
-loadIframe(false);
 var recheckFrameTimer;
 function loadIframe(recheckIndicator) {
   var iframe = getPortalIframe();

From c770f8c666c636c728627fbf42327d03f544afb0 Mon Sep 17 00:00:00 2001
From: "Nam.Chu" <nam.chu@axonactive.com>
Date: Tue, 17 Dec 2024 09:53:17 +0700
Subject: [PATCH 33/36] IVYPORTAL-18031 Medium - DOM text reinterpreted as HTML
 - Implement

---
 AxonIvyPortal/portal/webContent/resources/js/chat.js  | 11 ++++++++++-
 .../portal/webContent/resources/js/welcome-widget.js  | 11 +++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/AxonIvyPortal/portal/webContent/resources/js/chat.js b/AxonIvyPortal/portal/webContent/resources/js/chat.js
index 24291ab046c..020e46607f9 100644
--- a/AxonIvyPortal/portal/webContent/resources/js/chat.js
+++ b/AxonIvyPortal/portal/webContent/resources/js/chat.js
@@ -733,7 +733,7 @@ function View(uri)
             }
           } else {
             var userDom = document.createElement('li');
-            userDom.innerHTML = $('.js-no-users-of-role').val();
+            userDom.innerHTML = escapeHtml($('.js-no-users-of-role').val());
             userList.appendChild(userDom); 
           }
           roleGroupDom.appendChild(userList)
@@ -742,6 +742,15 @@ function View(uri)
       }
       PF('participants-list-dialog').initPosition();
     }
+	
+    function escapeHtml(unsafe){
+      return unsafe
+         .replace(/&/g, "&amp;")
+         .replace(/</g, "&lt;")
+         .replace(/>/g, "&gt;")
+         .replace(/"/g, "&quot;")
+         .replace(/'/g, "&#039;");
+    }
 
     function initCloneGroup(groupTemplate, groupId) {
       var cloneGroup = groupTemplate.cloneNode(true);
diff --git a/AxonIvyPortal/portal/webContent/resources/js/welcome-widget.js b/AxonIvyPortal/portal/webContent/resources/js/welcome-widget.js
index f8d858969a0..a3090dc29e7 100644
--- a/AxonIvyPortal/portal/webContent/resources/js/welcome-widget.js
+++ b/AxonIvyPortal/portal/webContent/resources/js/welcome-widget.js
@@ -1,3 +1,11 @@
+function escapeHtml(unsafe){
+  return unsafe
+         .replace(/&/g, "&amp;")
+         .replace(/</g, "&lt;")
+         .replace(/>/g, "&gt;")
+         .replace(/"/g, "&quot;")
+         .replace(/'/g, "&#039;");
+}
 WelcomeWidgetConfiguration = {
 
   oldImageStyleClass : '',
@@ -11,7 +19,6 @@ WelcomeWidgetConfiguration = {
     this.updateStyleClasses();
     this.updatePreviewImageFit();
   },
-
   updatePreviewText : function(isGreeting) {
     var previewDialog = $('#new-widget-configuration-dialog');
     var welcomeText = previewDialog.find('.js-welcome-text-input.language-to-preview').get(0).value;
@@ -19,7 +26,7 @@ WelcomeWidgetConfiguration = {
     if (isGreeting == 'true' || (isGreeting == undefined && $('.js-greeting-text').length != 0)) {
       welcomeText = previewDialog.find('.js-greeting-text.language-to-preview').get(0).innerHTML + welcomeText;
     }
-    $('#new-widget-configuration-dialog').find('.js-preview-text').get(0).innerHTML = welcomeText;
+    $('#new-widget-configuration-dialog').find('.js-preview-text').get(0).innerHTML = escapeHtml(welcomeText);
   },
 
   updatePreviewTextPosition : function() {

From bdf9f32a60f5d95583a9abc1926749be771751d6 Mon Sep 17 00:00:00 2001
From: mnhnam-axonivy <nam.mai@axonactive.com>
Date: Tue, 17 Dec 2024 11:01:49 +0700
Subject: [PATCH 34/36] IVYPORTAL-18029 Security findings- Client-side
 cross-site scripting - Fixed GUI test

---
 .../com/axonivy/portal/selenium/page/TemplatePage.java      | 4 ++++
 .../axonivy/portal/selenium/test/LanguageSettingTest.java   | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TemplatePage.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TemplatePage.java
index 4038d8afe67..952b993f09e 100644
--- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TemplatePage.java
+++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/TemplatePage.java
@@ -481,6 +481,10 @@ public NewDashboardPage openTaskList() {
     return openMainMenu().selectTaskMenu();
   }
 
+  public void waitForTaskTitleAppear() {
+    waitForElementDisplayed(By.id("title"), true);
+  }
+
   public void waitForIFrameContentVisible() {
     waitForIFrameScreenshotSizeGreaterThan(IFRAME_SCREENSHOT_FILE_SIZE_AT_MINIMUM);
   }
diff --git a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/LanguageSettingTest.java b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/LanguageSettingTest.java
index f0b988a2334..8699cc2c955 100644
--- a/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/LanguageSettingTest.java
+++ b/AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/LanguageSettingTest.java
@@ -8,6 +8,7 @@
 import com.axonivy.portal.selenium.common.NavigationHelper;
 import com.axonivy.portal.selenium.page.MainMenuPage;
 import com.axonivy.portal.selenium.page.NewDashboardPage;
+import com.axonivy.portal.selenium.page.TaskIFrameTemplatePage;
 import com.axonivy.portal.selenium.page.TopMenuTaskWidgetPage;
 import com.axonivy.portal.selenium.page.UserProfilePage;
 import com.axonivy.portal.selenium.page.WorkingTaskDialogFromUserProfilePage;
@@ -26,9 +27,10 @@ public void setup() {
   public void testChangeLanguageWhenWorkingOnTask() {
     NavigationHelper.navigateToTaskList();
     TopMenuTaskWidgetPage taskWidget = new TopMenuTaskWidgetPage();
-    taskWidget.startTaskIFrameByIndex(0);
+    TaskIFrameTemplatePage taskPage = taskWidget.startTaskIFrameByIndex(0);
     taskWidget.switchBackToParent();
-    taskWidget.clickOnMyProfile();
+    taskPage.waitForTaskTitleAppear();
+    taskPage.clickOnMyProfile();
     WorkingTaskDialogFromUserProfilePage workingTaskDialogPage = new WorkingTaskDialogFromUserProfilePage();
     workingTaskDialogPage.leaveTask();
     UserProfilePage userProfilePage = new UserProfilePage();

From e2ce1b2c34855242bc5aff37a8f76c8b99342141 Mon Sep 17 00:00:00 2001
From: mnhnam-axonivy <nam.mai@axonactive.com>
Date: Tue, 17 Dec 2024 14:45:37 +0700
Subject: [PATCH 35/36] IVYPORTAL-18072 SPIKE: Evaluate the full screen issue
 with new case and task list - Handled feedback: make the dashboard load from
 memory responsiveness

---
 .../ch/ivy/addon/portalkit/util/DefaultDashboardUtils.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DefaultDashboardUtils.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DefaultDashboardUtils.java
index f092c03fb23..7c996cbaee0 100644
--- a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DefaultDashboardUtils.java
+++ b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DefaultDashboardUtils.java
@@ -53,7 +53,7 @@ public class DefaultDashboardUtils {
             ],
             "layout": {
               "w": 12,
-              "h": 8,
+              "h": 12,
               "x": 0,
               "y": 0
             },
@@ -168,7 +168,7 @@ public class DefaultDashboardUtils {
             ],
             "layout": {
               "w": 12,
-              "h": 8,
+              "h": 12,
               "x": 0,
               "y": 0
             },

From bd3734e5f85b642a3cef26f4d3568eee76d7ec43 Mon Sep 17 00:00:00 2001
From: lmluat-axonivy <luat.luongminh@axonactive.com>
Date: Tue, 17 Dec 2024 15:43:16 +0700
Subject: [PATCH 36/36] feature/IVYPORTAL-18032-UI-facelift-conflict

- Handle feedback
---
 AxonIvyPortal/portal/cms/cms_de.yaml          |  1 +
 AxonIvyPortal/portal/cms/cms_en.yaml          |  1 +
 AxonIvyPortal/portal/cms/cms_es.yaml          |  1 +
 AxonIvyPortal/portal/cms/cms_fr.yaml          |  1 +
 .../ProcessWidget/ProcessWidgetDialogs.xhtml  | 21 ++++++-------------
 5 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/AxonIvyPortal/portal/cms/cms_de.yaml b/AxonIvyPortal/portal/cms/cms_de.yaml
index dd66e122eea..f7223acbf51 100644
--- a/AxonIvyPortal/portal/cms/cms_de.yaml
+++ b/AxonIvyPortal/portal/cms/cms_de.yaml
@@ -410,6 +410,7 @@ ch.ivy.addon.portalkit.ui.jsf:
     active: Aktiviert
     add: Hinzufügen
     addDocument: Dokument hinzufügen
+    addLink: Link hinzufügen
     addNote: Notiz hinzufügen
     allCategories: Alle Kategorien
     allTypes: Alle Typen
diff --git a/AxonIvyPortal/portal/cms/cms_en.yaml b/AxonIvyPortal/portal/cms/cms_en.yaml
index aee201428bf..73c02a2e09d 100644
--- a/AxonIvyPortal/portal/cms/cms_en.yaml
+++ b/AxonIvyPortal/portal/cms/cms_en.yaml
@@ -409,6 +409,7 @@ ch.ivy.addon.portalkit.ui.jsf:
     active: Active
     add: Add
     addDocument: Add document
+    addLink: Add Link
     addNote: Add note
     allCategories: All Categories
     allTypes: All types
diff --git a/AxonIvyPortal/portal/cms/cms_es.yaml b/AxonIvyPortal/portal/cms/cms_es.yaml
index f74b3738de8..cc0eeedb7d0 100644
--- a/AxonIvyPortal/portal/cms/cms_es.yaml
+++ b/AxonIvyPortal/portal/cms/cms_es.yaml
@@ -411,6 +411,7 @@ ch.ivy.addon.portalkit.ui.jsf:
     active: Activado
     add: Añadir
     addDocument: Agregar documento
+    addLink: Añadir enlace
     addNote: Agregar nota
     allCategories: Todas las categorias
     allTypes: Todos los tipos
diff --git a/AxonIvyPortal/portal/cms/cms_fr.yaml b/AxonIvyPortal/portal/cms/cms_fr.yaml
index 53419436396..c343a2a9a7b 100644
--- a/AxonIvyPortal/portal/cms/cms_fr.yaml
+++ b/AxonIvyPortal/portal/cms/cms_fr.yaml
@@ -408,6 +408,7 @@ ch.ivy.addon.portalkit.ui.jsf:
     active: Activé
     add: Ajouter
     addDocument: Ajouter un document
+    addLink: Ajouter un lien
     addNote: Ajouter une note
     allCategories: Toutes les catégories
     allTypes: Tous les types
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml
index b5254a7de7a..f879affb6cb 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portalkit/component/ProcessWidget/ProcessWidgetDialogs.xhtml
@@ -192,13 +192,9 @@
     </h:form>
 
     <f:facet name="footer">
-      <p:commandLink id="cancel-edit-process-command"
-        value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
-        actionListener="#{processWidgetBean.removeTempExternalLinkImage}"
-        oncomplete="PF('edit-process-dialog').hide()"
-        styleClass="u-mar-right-10" />
-      <p:commandButton id="save-process-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/save')}" icon="#{visibilityBean.generateButtonIcon('si si-check-1')}"
-        process="#{cc.clientId}:edit-process-form" actionListener="#{processWidgetBean.updateProcessData()}" update="#{cc.clientId}:edit-process-form:edit-external-link-error-message"
+      <p:commandButton id="save-process-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/save')}"
+        process="#{cc.clientId}:edit-process-form" actionListener="#{processWidgetBean.updateProcessData()}" styleClass="w-full"
+        update="#{cc.clientId}:edit-process-form:edit-external-link-error-message"
         oncomplete="if(!args.validationFailed){PF('edit-process-dialog').hide(); updateProcessListOnSaveSuccessful();}" form="#{cc.clientId}:edit-process-form"/>
     </f:facet>
   </p:dialog>
@@ -390,15 +386,10 @@
     </h:form>
 
     <f:facet name="footer">
-      <p:commandLink id="cancel-adding-external-link-command"
-        value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/cancel')}"
-        actionListener="#{externalLinkBean.removeImage()}"
-        oncomplete="PF('add-external-link-dialog').hide()"
-        styleClass="u-mar-right-15" />
-      <p:commandButton id="adding-new-external-link-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/add')}"
-        icon="#{visibilityBean.generateButtonIcon('si si-add-small')}" process="#{cc.clientId}:add-external-link-form"
+      <p:commandButton id="adding-new-external-link-command" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/addLink')}"
+        process="#{cc.clientId}:add-external-link-form"
         form="#{cc.clientId}:add-external-link-form" actionListener="#{processWidgetBean.createNewExternalLink()}"
-        update="#{cc.clientId}:add-external-link-form"
+        update="#{cc.clientId}:add-external-link-form" styleClass="w-full"
         oncomplete="if(!args.validationFailed){PF('add-external-link-dialog').hide(); updateProcessListOnSaveSuccessful();}" />
     </f:facet>
   </p:dialog>