Merge branch 'master' of https://github.com/axonivy-market/portal int…

…o feature/IVYPORTAL-18050-Create-cache-mechanism-for-dashboard-converter-to-enhance-performance
axonivy-market · Dec 17, 2024 · f8ca4eb · f8ca4eb
2 parents 80bc517 + f3e1757
commit f8ca4eb
Show file tree

Hide file tree

Showing 18 changed files with 105 additions and 80 deletions.
diff --git 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
@@ -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
@@ -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-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>

diff --git 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
@@ -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/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>

diff --git 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
@@ -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/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) {
@@ -156,9 +154,13 @@ private MenuElement buildDashboardItem() {
     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
@@ -94,27 +94,12 @@ public void init() {
       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)
@@ -128,6 +113,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();
   }

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
@@ -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
@@ -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
@@ -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();

diff --git 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
@@ -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
@@ -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
@@ -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>