Feature/ivyportal 18032 UI facelift conflict

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>

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>

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>

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>

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>

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>

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>

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() {

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

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

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

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() {

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

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() {

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);
   }

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

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

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

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

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

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
         },

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>

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