From b21e61a8b9dd01c27eb01e7cda6e8459a0900ad5 Mon Sep 17 00:00:00 2001
From: lndanh-axonivy <lndanh@axonactive.com>
Date: Thu, 5 Sep 2024 15:52:24 +0700
Subject: [PATCH 1/3] IVYPORTAL-17408 DB query for filter in task/case widget
 is executed 3 times: fix bug

---
 .../CaseDashboardWidget/CaseDashboardWidget.xhtml      |  2 +-
 .../ProcessDashboardWidget.xhtml                       |  2 +-
 .../TaskDashboardWidget/TaskDashboardWidget.xhtml      |  2 +-
 .../layouts/restricted/decorator/TableWidget.xhtml     | 10 +++++-----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/CaseDashboardWidget/CaseDashboardWidget.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/CaseDashboardWidget/CaseDashboardWidget.xhtml
index e8d98d5c610..89a6a056d82 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/CaseDashboardWidget/CaseDashboardWidget.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/CaseDashboardWidget/CaseDashboardWidget.xhtml
@@ -21,7 +21,7 @@
     <ui:param name="onStatisticTabShow" value="handleFilterCategoryHeight(this);" />
     <ui:param name="componentToProcessOnApplyFilter" value="filter-container" />
     <ui:param name="componentToUpdateOnApplyFilter"
-      value="#{component.parent.namingContainer.clientId}:case-component:dashboard-cases #{component.parent.namingContainer.clientId}:case-component:empty-message-container" />
+      value="#{cc.clientId}:case-component:dashboard-cases #{cc.clientId}:case-component:empty-message-container" />
     <ui:param name="componentToUpdateOnResetFilter"
       value="#{cc.clientId}:case-component:dashboard-cases #{cc.clientId}:case-component:empty-message-container" />
     <ui:param name="onCompleteApplyFilters" value="PF('dashboard-cases-#{widget.id}').filter()" />
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessDashboardWidget/ProcessDashboardWidget.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessDashboardWidget/ProcessDashboardWidget.xhtml
index 8d769994b1a..a0e8a4a37cc 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessDashboardWidget/ProcessDashboardWidget.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/ProcessDashboardWidget/ProcessDashboardWidget.xhtml
@@ -23,7 +23,7 @@
       <ui:param name="isReadOnlyMode" value="#{cc.attrs.isReadOnlyMode}" />
       <ui:param name="widgetContentStyleClass" value="process-widget" />
       <ui:param name="componentToProcessOnApplyFilter" value="filter-container" />
-      <ui:param name="componentToUpdateOnApplyFilter" value="#{component.parent.namingContainer.clientId}:widget-content" />
+      <ui:param name="componentToUpdateOnApplyFilter" value="#{cc.clientId}:widget-content" />
       <ui:param name="componentToUpdateOnResetFilter" value="#{cc.clientId}:widget-content" />
     
       <ui:define name="widgetInformationContent">
diff --git a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/TaskDashboardWidget/TaskDashboardWidget.xhtml b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/TaskDashboardWidget/TaskDashboardWidget.xhtml
index 308921909bf..33b02b013b5 100644
--- a/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/TaskDashboardWidget/TaskDashboardWidget.xhtml
+++ b/AxonIvyPortal/portal/src_hd/ch/ivy/addon/portal/generic/dashboard/component/TaskDashboardWidget/TaskDashboardWidget.xhtml
@@ -21,7 +21,7 @@
     <ui:param name="isReadOnlyMode" value="#{isReadOnlyMode}" />
     <ui:param name="onStatisticTabShow" value="handleFilterCategoryHeight(this);" />
     <ui:param name="componentToProcessOnApplyFilter" value="filter-container" />
-    <ui:param name="componentToUpdateOnApplyFilter" value="#{component.parent.namingContainer.clientId}:task-component:dashboard-tasks #{component.parent.namingContainer.clientId}:task-component:empty-message-container" />
+    <ui:param name="componentToUpdateOnApplyFilter" value="#{cc.clientId}:task-component:dashboard-tasks #{cc.clientId}:task-component:empty-message-container" />
     <ui:param name="componentToUpdateOnResetFilter" value="#{cc.clientId}:task-component:dashboard-tasks #{cc.clientId}:task-component:empty-message-container" />
     <ui:param name="onCompleteApplyFilters" value="PF('dashboard-tasks-#{widget.id}').filter()" />
     <ui:param name="isRenderExpandCollapse" value="#{widget.isShowFullscreenMode()}" />
diff --git a/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml b/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
index 21dc94c141c..bd9241a3b21 100644
--- a/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
+++ b/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
@@ -96,7 +96,7 @@
       <p:remoteCommand id="apply-widget-filter-command-#{index}"
         name="applyWidgetFilterCommand#{index}"
         oncomplete="PF('filter-overlay-panel-#{index}').hide(); #{onCompleteApplyFilters}; resizeTableBody()"
-        update="widget-header-actions #{componentToUpdateOnApplyFilter}"
+        update="widget-header-actions"
         global="false" process="@this" partialSubmit="true" immediate="true"
         rendered="#{renderFilter}"/>
 
@@ -232,16 +232,16 @@
               <p:commandButton id="reset-button" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/reset')}"
                 styleClass="secondary-btn u-mar-right-5" partialSubmit="true"
                 process="filter-form-#{index}"
-                update="filter-form-#{index} #{componentToUpdateOnResetFilter}"
-                oncomplete="#{onCompleteResetFilters}; {applyWidgetFilterCommand#{index}();} initWidgetFilterHtml('#{widget.id}');"
+                update="#{componentToUpdateOnResetFilter} #{cc.clientId}:widget-header-actions"
+                oncomplete="PF('filter-overlay-panel-#{index}').hide(); initWidgetFilterHtml('#{widget.id}');"
                 actionListener="#{widget.onResetUserFilters()}"
                 icon="si si-button-refresh-arrows" resetValues="true"/>
   
               <p:commandButton id="apply-button" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/apply')}"
                 partialSubmit="true"
-                update="filter-form-#{index}"
+                update="#{componentToUpdateOnApplyFilter} #{cc.clientId}:widget-header-actions"
                 process="filter-form-#{index}"
-                oncomplete="if (args &amp;&amp; !args.validationFailed) {applyWidgetFilterCommand#{index}();} initWidgetFilterHtml('#{widget.id}');"
+                oncomplete="PF('filter-overlay-panel-#{index}').hide(); initWidgetFilterHtml('#{widget.id}');"
                 actionListener="#{widget.onApplyUserFilters()}"
                 icon="si si-check-1"
                 styleClass="u-mar-right-5" />

From 2bbe20b8b69946ae6f5810fcbea27dffb8461dc4 Mon Sep 17 00:00:00 2001
From: lndanh-axonivy <lndanh@axonactive.com>
Date: Mon, 16 Sep 2024 11:25:22 +0700
Subject: [PATCH 2/3] IVYPORTAL-17408 DB query for filter in task/case widget
 is executed 3 times: update jenkinfile

---
 .../restricted/decorator/TableWidget.xhtml     | 18 ++++++++++++++----
 build/create-release/Jenkinsfile               |  2 +-
 build/document-screenshot-selenide/Jenkinsfile |  2 +-
 build/gui-test-cluster/Jenkinsfile             |  2 +-
 build/gui-test-new-dashboard/Jenkinsfile       |  2 +-
 build/integration/Jenkinsfile                  |  2 +-
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml b/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
index bd9241a3b21..fa9f256e2fc 100644
--- a/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
+++ b/AxonIvyPortal/portal/webContent/layouts/restricted/decorator/TableWidget.xhtml
@@ -95,8 +95,13 @@
       <!-- remote-command to apply widget filter -->
       <p:remoteCommand id="apply-widget-filter-command-#{index}"
         name="applyWidgetFilterCommand#{index}"
-        oncomplete="PF('filter-overlay-panel-#{index}').hide(); #{onCompleteApplyFilters}; resizeTableBody()"
-        update="widget-header-actions"
+        update="#{componentToUpdateOnApplyFilter} #{cc.clientId}:widget-header-actions"
+        oncomplete="PF('filter-overlay-panel-#{index}').hide();"
+        global="false" process="@this" partialSubmit="true" immediate="true"
+        rendered="#{renderFilter}"/>
+        
+       <p:remoteCommand id="apply-widget-filter-command2-#{index}"
+        name="applyInvalidWidgetFilterCommand#{index}"
         global="false" process="@this" partialSubmit="true" immediate="true"
         rendered="#{renderFilter}"/>
 
@@ -239,9 +244,14 @@
   
               <p:commandButton id="apply-button" value="#{ivy.cms.co('/ch.ivy.addon.portalkit.ui.jsf/common/apply')}"
                 partialSubmit="true"
-                update="#{componentToUpdateOnApplyFilter} #{cc.clientId}:widget-header-actions"
+                update="filter-form-#{index}"
                 process="filter-form-#{index}"
-                oncomplete="PF('filter-overlay-panel-#{index}').hide(); initWidgetFilterHtml('#{widget.id}');"
+                oncomplete="if (args &amp;&amp; !args.validationFailed) {
+	                  applyWidgetFilterCommand#{index}();
+	                } else {
+	                  applyInvalidWidgetFilterCommand#{index}();
+	                }
+	                initWidgetFilterHtml('#{widget.id}');"
                 actionListener="#{widget.onApplyUserFilters()}"
                 icon="si si-check-1"
                 styleClass="u-mar-right-5" />
diff --git a/build/create-release/Jenkinsfile b/build/create-release/Jenkinsfile
index bf417c1c5e6..9e2e12c37da 100644
--- a/build/create-release/Jenkinsfile
+++ b/build/create-release/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'portal-slave'}
+  agent {label 'lndanh-pc'}
   
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '5'))
diff --git a/build/document-screenshot-selenide/Jenkinsfile b/build/document-screenshot-selenide/Jenkinsfile
index e7c1cf23954..09e193b1eb0 100644
--- a/build/document-screenshot-selenide/Jenkinsfile
+++ b/build/document-screenshot-selenide/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'portal-slave'}
+  agent {label 'lndanh-pc'}
 
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '60'))
diff --git a/build/gui-test-cluster/Jenkinsfile b/build/gui-test-cluster/Jenkinsfile
index 5ebe87a4b70..f536b61e7ee 100644
--- a/build/gui-test-cluster/Jenkinsfile
+++ b/build/gui-test-cluster/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'portal-slave'}
+  agent {label 'lndanh-pc'}
   
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '30'))
diff --git a/build/gui-test-new-dashboard/Jenkinsfile b/build/gui-test-new-dashboard/Jenkinsfile
index dc28edd480e..faba653d72f 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 'lndanh-pc'}
 
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '60'))
diff --git a/build/integration/Jenkinsfile b/build/integration/Jenkinsfile
index e65d5b0a743..1ec3f6d3d4e 100644
--- a/build/integration/Jenkinsfile
+++ b/build/integration/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'portal-slave'}
+  agent {label 'lndanh-pc'}
   
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '5'))

From 9e626f636e03c6d42c6453fbe4868ae04d9658fe Mon Sep 17 00:00:00 2001
From: lndanh-axonivy <lndanh@axonactive.com>
Date: Wed, 18 Sep 2024 14:58:40 +0700
Subject: [PATCH 3/3] IVYPORTAL-17408 DB query for filter in task/case widget
 is executed 3 times: revert jenkinfile

---
 build/create-release/Jenkinsfile               | 2 +-
 build/document-screenshot-selenide/Jenkinsfile | 2 +-
 build/gui-test-cluster/Jenkinsfile             | 2 +-
 build/gui-test-new-dashboard/Jenkinsfile       | 2 +-
 build/integration/Jenkinsfile                  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build/create-release/Jenkinsfile b/build/create-release/Jenkinsfile
index 9e2e12c37da..bf417c1c5e6 100644
--- a/build/create-release/Jenkinsfile
+++ b/build/create-release/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'lndanh-pc'}
+  agent {label 'portal-slave'}
   
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '5'))
diff --git a/build/document-screenshot-selenide/Jenkinsfile b/build/document-screenshot-selenide/Jenkinsfile
index 09e193b1eb0..e7c1cf23954 100644
--- a/build/document-screenshot-selenide/Jenkinsfile
+++ b/build/document-screenshot-selenide/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'lndanh-pc'}
+  agent {label 'portal-slave'}
 
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '60'))
diff --git a/build/gui-test-cluster/Jenkinsfile b/build/gui-test-cluster/Jenkinsfile
index f536b61e7ee..5ebe87a4b70 100644
--- a/build/gui-test-cluster/Jenkinsfile
+++ b/build/gui-test-cluster/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'lndanh-pc'}
+  agent {label 'portal-slave'}
   
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '30'))
diff --git a/build/gui-test-new-dashboard/Jenkinsfile b/build/gui-test-new-dashboard/Jenkinsfile
index 09ee453beaa..913a6cdb320 100644
--- a/build/gui-test-new-dashboard/Jenkinsfile
+++ b/build/gui-test-new-dashboard/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'lndanh-pc'}
+  agent {label 'portal-slave'}
 
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '60'))
diff --git a/build/integration/Jenkinsfile b/build/integration/Jenkinsfile
index 1ec3f6d3d4e..e65d5b0a743 100644
--- a/build/integration/Jenkinsfile
+++ b/build/integration/Jenkinsfile
@@ -1,5 +1,5 @@
 pipeline {
-  agent {label 'lndanh-pc'}
+  agent {label 'portal-slave'}
   
   options {
     buildDiscarder(logRotator(numToKeepStr: '60', artifactNumToKeepStr: '5'))