IVYPORTAL-17679 UI Facelift for LTS 12.0.0 - Part 2

AxonIvyPortal/portal-components/src_hd/com/axonivy/portal/components/UserSelection/UserSelection.xhtml

@@ -56,14 +56,19 @@
 
   <h:panelGroup id="#{cc.attrs.componentId}-label-panel" layout="block"
     rendered="#{not empty cc.attrs.label and !cc.attrs.floatingLabel}"
-    styleClass="#{cc.attrs.labelPanelStyleClass}">
+    styleClass="#{cc.attrs.labelPanelStyleClass} ui-g-6 pl-0">
     <p:outputLabel id="#{cc.attrs.componentId}-label" value="#{cc.attrs.label}" for="#{cc.attrs.componentId}"
       styleClass="#{cc.attrs.labelStyleClass}" />
   </h:panelGroup>
 
   <c:set var="completeMethod" value="#{not empty cc.attrs.completeMethod ? cc.attrs.completeMethod : userSelectionBean.completeUserMethod}" />
+  <h:panelGroup layout="block"
+    styleClass="#{cc.attrs.messageStyleClass} #{cc.attrs.floatingLabel ? 'message-for-floating-label' : ''}">
+    <p:message id="#{cc.attrs.componentId}-message"
+      for="#{cc.attrs.componentId}" rendered="#{cc.attrs.isRenderedMessage}"/>
+  </h:panelGroup>
   <h:panelGroup id="#{cc.attrs.componentId}-autocomplete-panel" layout="block"
-    styleClass="user-selection-panel #{cc.attrs.autoCompletePanelStyleClass} #{cc.attrs.floatingLabel and ivyPrimefacesThemeResolver.sessionTheme.contains('serenity') ? 'md-inputfield' : ''} #{cc.attrs.floatingLabel and ivyPrimefacesThemeResolver.sessionTheme.contains('freya') ? 'ui-float-label' : ''}">
+    styleClass="pl-0 user-selection-panel #{cc.attrs.autoCompletePanelStyleClass} #{cc.attrs.floatingLabel and ivyPrimefacesThemeResolver.sessionTheme.contains('serenity') ? 'md-inputfield' : ''} #{cc.attrs.floatingLabel and ivyPrimefacesThemeResolver.sessionTheme.contains('freya') ? 'ui-float-label' : ''}">
     <p:autoComplete id="#{cc.attrs.componentId}"
       value="#{cc.attrs.selectedUser}"
       scrollHeight="#{cc.attrs.scrollHeight}"
@@ -104,11 +109,6 @@
       styleClass="#{cc.attrs.labelStyleClass}"
       rendered="#{cc.attrs.floatingLabel}" />
   </h:panelGroup>
-  <h:panelGroup layout="block"
-    styleClass="#{cc.attrs.messageStyleClass} #{cc.attrs.floatingLabel ? 'message-for-floating-label' : ''}">
-    <p:message id="#{cc.attrs.componentId}-message"
-      for="#{cc.attrs.componentId}" rendered="#{cc.attrs.isRenderedMessage}"/>
-  </h:panelGroup>
   <h:outputScript name="theme-checker.js" library="js" />
   <script type="text/javascript">
     ThemeChecker.updateLayoutByTheme('#{ivyPrimefacesThemeResolver.sessionTheme}');

AxonIvyPortal/portal-components/webContent/resources/css/user-selection-component.css

@@ -2,6 +2,11 @@
   width: 100%;
 }
 
+.ui-fluid.user-selection-panel {
+  display: inline-block;
+  width: 85%;
+}
+
 .message-for-floating-label {
   padding-left: 2px;
 }

AxonIvyPortal/portal-selenium-test/.settings/ch.ivyteam.ivy.designer.prefs

@@ -1,6 +1,5 @@
-ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=ch.ivyteam.ivy.project.portal.test.Data
 ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=ch.ivyteam.ivy.project.portal.test
 ch.ivyteam.ivy.project.preferences\:PORTAL_VERSION=10
 ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13
-ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=114006
+ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001
 eclipse.preferences.version=1

AxonIvyPortal/portal-selenium-test/dataclasses/ch/ivyteam/ivy/project/portal/test/Data.d.json

@@ -1,5 +1,5 @@
 {
-  "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json",
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
   "simpleName" : "Data",
   "namespace" : "ch.ivyteam.ivy.project.portal.test",
   "isBusinessCaseData" : false

AxonIvyPortal/portal-selenium-test/dataclasses/ch/ivyteam/ivy/project/portal/test/Responsible.d.json

@@ -1,5 +1,5 @@
 {
-  "$schema" : "https://json-schema.axonivy.com/data-class/11.4.0/data-class.json",
+  "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json",
   "simpleName" : "Responsible",
   "namespace" : "ch.ivyteam.ivy.project.portal.test",
   "isBusinessCaseData" : false,

AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/AbsencePage.java

@@ -24,6 +24,8 @@ public class AbsencePage extends TemplatePage {
 
   private static final String DELETE_ABSENCE__LINK_ID_PATTERN =
       "absences-management-form:absence-table:%d:delete-absence";
+  private static final String ABSENCE_ACTION_BUTTON_PATTERN = 
+      "absences-management-form:absence-table:%d:absence-action-button";
   private static final String EDIT_ABSENCE__LINK_ID_PATTERN = "absences-management-form:absence-table:%d:edit-absence";
 
   @Override
@@ -44,10 +46,10 @@ public void countAbsences(int expectedSize) {
   }
 
   public void showAbsencesInThePast(boolean shown) {
-    SelenideElement checkBox = $("input[id*='show-absence-in-the-past']");
+    SelenideElement checkBox = $(".show-absence-in-the-past-panel");
     boolean checkBoxSelected = checkBox.isSelected();
     if (checkBoxSelected != shown) {
-      waitForElementClickableThenClick("div[id*='show-absence-in-the-past'] div.ui-chkbox-box");
+      waitForElementClickableThenClick(checkBox);
     }
   }
 
@@ -171,12 +173,20 @@ public void waitForAbsencesGrowlMessageDisplay() {
     $(growlMessage.findElement(By.className("ui-growl-item-container"))).shouldBe(appear, DEFAULT_TIMEOUT);
   }
 
+  public void clickOnAbsenceAction(int index) {
+    $(By.id(String.format(ABSENCE_ACTION_BUTTON_PATTERN, index))).click();
+  }
   public void canDeleteAbsence(int index) {
+    clickOnAbsenceAction(index);
     waitForElementDisplayed($(By.id(String.format(DELETE_ABSENCE__LINK_ID_PATTERN, index))), true);
+    //Click to close
+    clickOnAbsenceAction(index);
   }
 
   public void canEditAbsence(int index) {
+    clickOnAbsenceAction(index);
     waitForElementDisplayed($(By.id(String.format(EDIT_ABSENCE__LINK_ID_PATTERN, index))), true);
+    clickOnAbsenceAction(index);
   }
 
   public void isDeputySettingSectionDisplayed(boolean isDisplay) {

AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/AdminSettingsPage.java

@@ -37,13 +37,16 @@ private void editGlobalVariable(String variableName, String variableValue, boole
     $("button[id$='admin-setting-component:adminTabView:restore-all-to-default-button']")
         .shouldBe(Condition.appear, DEFAULT_TIMEOUT).shouldBe(getClickableCondition());
     waitForElementDisplayed(By.id("admin-setting-component:adminTabView:settingTable"), true);
-
     var variableRow = $("[id='admin-setting-component:adminTabView:settingTable']").$$(".setting-key")
         .filter(Condition.text(variableName)).get(0);
 
     if (variableRow != null) {
-      SelenideElement editButton = variableRow.ancestor("tr").$(By.cssSelector("a[id$=edit]"));
-      editButton.shouldBe(clickable(), DEFAULT_TIMEOUT).click();
+      variableRow.ancestor("tr").scrollTo();
+      SelenideElement actionButton = variableRow.ancestor("tr").$(By.cssSelector("button[id$=settings-action-button]"));
+      actionButton.shouldBe(getClickableCondition()).click();
+      String currentElementId = actionButton.attr("id");
+      String editButtonId = currentElementId.replace("settings-action-button", "edit-application");
+      $("a[id='" + editButtonId + "']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click();
     }
     waitForElementDisplayed(By.cssSelector("[id$=':settingDialogForm']"), true);
     saveGlobalVariable(variableValue, isBooleanType);
@@ -141,7 +144,8 @@ public WebElement getAddApplicationDialog() {
   }
 
   public WebElement getEditSettingDialogOfFirstRow() {
-    waitForElementClickableThenClick($(By.id("admin-setting-component:adminTabView:settingTable:0:edit")));
+    waitForElementClickableThenClick($(By.id("admin-setting-component:adminTabView:settingTable:0:settings-action-button")));
+    $("a[id='admin-setting-component:adminTabView:settingTable:0:edit-application']").shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click();
     waitForElementDisplayed(By.id("admin-setting-component:settingDialog"), true);
     Sleeper.sleep(300);// Wait a bit focus effects, just only use this for capture screenshot
     return findElementById("admin-setting-component:settingDialog");

AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/AnnouncementPage.java

@@ -3,10 +3,6 @@
 import static com.codeborne.selenide.Condition.appear;
 import static com.codeborne.selenide.Selenide.$;
 
-import org.openqa.selenium.By;
-
-import com.codeborne.selenide.WebDriverRunner;
-
 public class AnnouncementPage extends TemplatePage {
 
   @Override
@@ -18,16 +14,16 @@ public String getInfoSummary() {
     return $("div[id$='announcement-tab']").shouldBe(appear, DEFAULT_TIMEOUT).$("span.ui-messages-error-summary").shouldBe(appear, DEFAULT_TIMEOUT).getText();
   }
 
-  public void publish() {
-    waitForElementClickableThenClick("button[id$='publish-announcement']");
-  }
-
-  public void dePublish() {
-    waitForElementClickableThenClick("button[id$='delete-announcement']");
+  public void clickOnSwitchButton() {
+    waitForElementClickableThenClick("div[id$='announcement-toggle-switch']");
   }
 
   public void setAnnoucement(int Language, String content) {
     $("input[id$='" + Language + ":announcement-input']").sendKeys(content);
   }
+
+  public void clickOnSaveButton() {
+    $("[id$='save-changes-announcement']").shouldBe(getClickableCondition()).click();
+  }
 
 }

AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/DashboardNewsWidgetPage.java

@@ -122,7 +122,7 @@ public void clickOnEditIconOfNews(int index) {
   }
 
   public SelenideElement getNewsItemIcon(int index) {
-    return getNewsItem(index).$(String.format(NEWS_ITEM_ATTR_FORMAT, index, "news-icon:awesome-icon-display"))
+    return getNewsItem(index).$(String.format(NEWS_ITEM_ATTR_FORMAT, index, "news-icon:current-icon-display"))
         .shouldBe(appear, DEFAULT_TIMEOUT);
   }
 

AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/NewAbsencePage.java

@@ -74,7 +74,7 @@ public void proceed() {
 
   public void closeAddAbsenceDialog() {
     $("[id='absence-dialog_title']").click();
-    $("a[id*='close-add-absence-dialog']").shouldBe(appear, DEFAULT_TIMEOUT)
+    $("div[id='absence-dialog']").$("span.ui-icon-closethick").shouldBe(appear, DEFAULT_TIMEOUT)
         .shouldBe(getClickableCondition(), DEFAULT_TIMEOUT).click();
     $("[id$='absence-dialog']").shouldBe(Condition.disappear, DEFAULT_TIMEOUT);
   }

AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/ProcessWidgetPage.java

@@ -112,7 +112,8 @@ public void addExternalLink(String name, String link, String iconClass, String i
 
     $("input[id$=':search-icon-name-field']").sendKeys(iconClass);
 
-    $("a[title='" + iconClass + "']").click();
+    $("div[id='process-widget:add-external-link-form:external-link-icon:icons-selection-form:icons']")
+        .$("a[title='" + iconClass + "']").click();
     $("div[id$='process-widget:add-external-link-form:external-link-icon:select-icon-dialog']")
         .shouldBe(Condition.disappear, DEFAULT_TIMEOUT);
 

AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/page/UserProfilePage.java

@@ -69,7 +69,7 @@ public void inputFormattingLanguage(String newLanguage) {
   }
 
   public String getLanguageSettingTitle() {
-    return findElementByCssSelector("h2[id$='language-setting-title']").getText();
+    return findElementByCssSelector("h5[id$='language-setting-title']").getText();
   }
 
   public void changeNewDashboardPageToCase() {

AxonIvyPortal/portal-selenium-test/src_test/com/axonivy/portal/selenium/test/AnnouncementTest.java

@@ -28,7 +28,8 @@ public void testNotificationLocalizationWhenChangingLanguageSetting() {
     AnnouncementPage announcementPage = adminSettingsPage.openAnnouncementTab();
     announcementPage.setAnnoucement(0, "lies mich");
     announcementPage.setAnnoucement(1, "Readme1");
-    announcementPage.publish();
+    announcementPage.clickOnSwitchButton();
+    announcementPage.clickOnSaveButton();
     adminSettingsPage.clickOnbackToNewDashboardPageOnAdminSetting();
     newDashboardPage = new NewDashboardPage();
     UserProfilePage userProfilePage = newDashboardPage.openMyProfilePage();
@@ -47,7 +48,8 @@ public void testValidationForDefaultLanguage() {
     NewDashboardPage newDashboardPage = new NewDashboardPage();
     AdminSettingsPage adminSettingsPage = newDashboardPage.openAdminSettings();
     AnnouncementPage announcementPage = adminSettingsPage.openAnnouncementTab();
-    announcementPage.publish();
+    announcementPage.clickOnSwitchButton();
+    announcementPage.clickOnSaveButton();
     assertEquals("Announcement for application default language is required.", announcementPage.getInfoSummary());
   }
 
@@ -60,7 +62,8 @@ public void testShouldDisplayNotification() {
     assertTrue(announcementPage.isDisplayed());
 
     announcementPage.setAnnoucement(1, "Readme1");
-    announcementPage.publish();
+    announcementPage.clickOnSwitchButton();
+    announcementPage.clickOnSaveButton();
     adminSettingsPage.clickOnbackToNewDashboardPageOnAdminSetting();
     newDashboardPage = new NewDashboardPage();
     assertEquals("Readme1", newDashboardPage.getAnnouncementMessage());
@@ -77,8 +80,9 @@ public void testDepublishNotification() {
     announcementPage.setAnnoucement(1, "Readme1");
     announcementPage.setAnnoucement(2, "Readme2");
     announcementPage.setAnnoucement(3, "Readme3");
-    announcementPage.publish();
-    announcementPage.dePublish();
+    announcementPage.clickOnSwitchButton();
+    announcementPage.clickOnSwitchButton();
+    announcementPage.clickOnSaveButton();
     assertTrue(newDashboardPage.isAnnouncementMessageNotDisplayed());
   }
 }

AxonIvyPortal/portal/cms/cms.yaml

@@ -21,6 +21,7 @@ ch.ivy.addon.portalkit.ui.jsf:
     editAbsence: Edit absence
     from: From
     noDeputy: No substitute
+    noPermissionToSeeThisArea: You do not have the required permission to see this area.
     period: Period
     personalTaskDuringAbsenceDeputies: Substitutes for personally assigned tasks during the absence
     personalTaskPermanentDeputies: Permanent substitutes for personally assigned tasks
@@ -135,7 +136,7 @@ ch.ivy.addon.portalkit.ui.jsf:
       announcementsDisabled: Announcements are disabled.
       announcementsEnabled: Announcements are enabled.
       defaultLanguageRequiredMessage: Announcement for application default language is required.
-      disable: Disable
+      disabled: Disabled
       enable: Enable
       information: You can announce a general information (e.g. Downtime, Changes, etc.) in this area. This message can be seen by all portal users.
       tabTitle: Announcements
@@ -450,7 +451,7 @@ ch.ivy.addon.portalkit.ui.jsf:
     notAvailable: N/A
     note: NOTE
     numberOfSelectedFilter: selected filters
-    ok: Ok
+    ok: OK
     'on': 'on'
     pleaseAddDocument: Please add a document with the link above.
     pleaseAddNote: Please add a note with the link above.
@@ -465,14 +466,15 @@ ch.ivy.addon.portalkit.ui.jsf:
     requiredFieldMessage: This field is required
     reserve: Reserve
     reset: Reset
-    resetSettingHeaderText: Reset setting?
+    resetSettingHeaderText: Reset setting
     resetTaskHeaderText: Reset this task?
     resetToDefaultMessage: This operation cannot be undone. Are you sure you want to reset to default settings?
     resetToStandardFilterHeaderText: 'Reset to standard filter? '
     restore: Restore
     restoreToDefaultChartHeaderText: Restore to default charts?
     role: Role
     save: Save
+    saveAll: Save all
     saveSuccessfully: Data saved successfully.
     search: Search
     second: second
@@ -512,7 +514,7 @@ ch.ivy.addon.portalkit.ui.jsf:
     viewExpired: Your current view expired. You will be redirected to the home page.
     viewMode: View mode
     visible: Visible
-    warning: Warning
+    warning: Warning!
     welcomeToPortal: Welcome, please login
     wrongDateFormat: Please enter valid date.
     year: year
@@ -1017,7 +1019,7 @@ ch.ivy.addon.portalkit.ui.jsf:
   taskWarning:
     createdTaskLeave: 'You are about to leave this page. Please choose one of the following options:<UL><LI>&nbsp; &nbsp; Leave: Discard your changes and move to the selected page.<LI>&nbsp; &nbsp; Cancel: Continue working this task.</UL>'
     createdTaskLogout: 'You are about to leave this page. Please choose one of the following options:<UL><LI>&nbsp;Logout: Discard your changes and logout.<LI>&nbsp;Cancel: Continue working this task.</UL>'
-    resetParkTaskBeforeLeave: 'You are about to leave a task in progress. Please choose one of the following options:<UL><LI>Leave: Discard your changes and move to the selected page.<LI>Reserve: Discard your changes and keep the task in your task list.<LI>Cancel: Continue working this task.</UL>'
+    resetParkTaskBeforeLeave: '<h4>You are about to leave a task in progress.<br/>Please choose one of the following options:</h4><UL><LI>Leave: Discard your changes and move to the selected page.<LI>Reserve: Discard your changes and keep the task in your task list.<LI>Cancel: Continue working this task.</UL>'
     resetParkTaskBeforeLogout: 'You are about to leave a task in progress. Please choose one of the following options:<UL><LI>&nbsp; &nbsp; Logout: Discard your changes and logout.<LI>&nbsp; &nbsp; Reserve: Discard your changes and keep the task in your personal task list. Then logout.<LI>&nbsp; &nbsp;
       Cancel: Continue working this task.</UL>'
     taskNotFound: The task does not exist or you have insufficient rights to see this task.