Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/axonivy-market/portal int…
Browse files Browse the repository at this point in the history
…o feature/IVYPORTAL-17519-Update-dependencies-to-latest-possible-versions
  • Loading branch information
lttung-axonivy committed Sep 11, 2024
2 parents 4e230cc + 8f4bd48 commit b72d71c
Show file tree
Hide file tree
Showing 154 changed files with 301 additions and 1,126 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
1 change: 1 addition & 0 deletions AxonIvyPortal/PortalKitTestHelper/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<properties>
<ivy.engine.version>11.4.0</ivy.engine.version>
<build.plugin.version>11.4.0-SNAPSHOT</build.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:ic="http://ivyteam.ch/jsf/component"
xmlns:p="http://primefaces.org/ui"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:pa="http://primefaces.org/serenity">
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:p="http://primefaces.org/ui" xmlns:pa="http://primefaces.org/serenity">

<p:ajaxStatus id="ajaxLoadingStatus">
<f:facet name="start">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html"
xmlns:c="http://java.sun.com/jsp/jstl/core"
xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:ic="http://ivyteam.ch/jsf/component"
xmlns:p="http://primefaces.org/ui"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
1 change: 1 addition & 0 deletions AxonIvyPortal/portal-components/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<properties>
<ivy.engine.version>11.4.0</ivy.engine.version>
<build.plugin.version>11.4.0-SNAPSHOT</build.plugin.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,12 @@
"config" : {
"output" : {
"code" : [
"import org.apache.log4j.Level;",
"import com.axonivy.portal.components.ivydata.exception.PortalIvyDataException;",
"import com.axonivy.portal.components.util.ErrorHandler;",
"",
"for (PortalIvyDataException exception : in.exceptions) {",
" ErrorHandler.addError(org.apache.log4j.Priority.ERROR, exception);",
" ErrorHandler.addError(exception);",
"}"
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ public final class PortalComponentConstants {

public static final String PORTAL_APPLICATION_NAME = "Portal";
public static final String SECURITY_SERVICE_CALLABLE = "Ivy Data Processes/PortalComponentSecurityService";
public static final String GET_GROUP_ID_CALLABLE = "Functional Processes/GetGroupId";

private PortalComponentConstants() {}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ public static void navigateToUrl(String url) {
PrimeFaces.current().executeScript(statement);
}

/**
* Navigate to portal home
*/
public static void navigateToPortalHome() {
navigateToUrl(Ivy.html().applicationHomeRef());
}
/**
* Navigate to portal home
*/
public static void navigateToPortalHome() {
navigateToUrl(Ivy.html().applicationHomeLink().getAbsoluteEncoded());
}

/**
* Navigate to PortalEndPage without finishing a task, e.g. clicking on Cancel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,6 @@ public List<IDocument> getAll() {
return new ArrayList<>(documents);
}

/**
* We make it as deprecated from 8.0 Please refer to sub-function process DeleteDocument
*
* @param document
*/
@Deprecated
public void delete(IDocument document) {
documentsOf(iCase).delete(document);
}

/**
* @param document
* @return streamed content
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
package com.axonivy.portal.components.util;

import org.apache.log4j.Priority;

import com.axonivy.portal.components.ivydata.exception.PortalIvyDataException;

import ch.ivyteam.ivy.environment.Ivy;

public class ErrorHandler {

private ErrorHandler() {}

public static void addError(Priority priority, PortalIvyDataException error) {
Ivy.log().log(priority, error.toString());
public static void addError(PortalIvyDataException error) {
Ivy.log().error(error.toString());
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"type" : "String",
"modifiers" : [ "PERSISTENT" ]
}, {
"name" : "iCase",
"name" : "caze",
"type" : "ch.ivyteam.ivy.workflow.ICase",
"modifiers" : [ "PERSISTENT" ]
}, {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"processCall" : "Functional Processes/OpenCaseDetailsHook:call(ch.ivyteam.ivy.workflow.ICase,Boolean,Boolean)",
"call" : {
"map" : {
"param.caseView" : "in.iCase",
"param.caseView" : "in.caze",
"param.isShowBackButton" : "true",
"param.isOpenInFrame" : "in.isOpenInFrame"
}
Expand All @@ -59,11 +59,11 @@
"signature" : "openDetails",
"input" : {
"params" : [
{ "name" : "iCase", "type" : "ch.ivyteam.ivy.workflow.ICase", "desc" : "" },
{ "name" : "caze", "type" : "ch.ivyteam.ivy.workflow.ICase", "desc" : "" },
{ "name" : "isOpenInFrame", "type" : "Boolean", "desc" : "" }
],
"map" : {
"out.iCase" : "param.iCase",
"out.caze" : "param.caze",
"out.isOpenInFrame" : "param.isOpenInFrame"
}
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html"
xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:p="http://primefaces.org/ui" xmlns:pa="http://primefaces.org/serenity">
<ui:composition xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://xmlns.jcp.org/jsf/core"
xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
xmlns:p="http://primefaces.org/ui" xmlns:pa="http://primefaces.org/serenity">

<p:ajaxStatus id="ajaxLoadingStatus">
<f:facet name="start">
Expand Down
1 change: 1 addition & 0 deletions AxonIvyPortal/portal-selenium-test/customized_pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<properties>
<build.plugin.version>11.4.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>11.4.0</ivy.engine.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<properties>
<build.plugin.version>11.4.0-SNAPSHOT</build.plugin.version>
<ivy.engine.version>11.4.0</ivy.engine.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<distributionManagement>
<repository>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static com.codeborne.selenide.CollectionCondition.size;
import static com.codeborne.selenide.CollectionCondition.sizeGreaterThanOrEqual;

import java.io.IOException;
import java.util.List;

import org.junit.jupiter.api.BeforeEach;
Expand All @@ -12,6 +13,7 @@
import com.axonivy.portal.selenium.common.BaseTest;
import com.axonivy.portal.selenium.common.ScreenshotUtils;
import com.axonivy.portal.selenium.common.TestAccount;
import com.axonivy.portal.selenium.common.Variable;
import com.axonivy.portal.selenium.page.CaseEditWidgetNewDashBoardPage;
import com.axonivy.portal.selenium.page.CaseWidgetNewDashBoardPage;
import com.axonivy.portal.selenium.page.DashboardModificationPage;
Expand All @@ -20,6 +22,7 @@
import com.axonivy.portal.selenium.page.ProcessWidgetNewDashBoardPage;
import com.axonivy.portal.selenium.page.TaskEditWidgetNewDashBoardPage;
import com.axonivy.portal.selenium.page.TaskWidgetNewDashBoardPage;
import com.axonivy.portal.selenium.util.ConfigurationJsonUtils;

@IvyWebTest
public class QuickSearchTest extends BaseTest {
Expand Down Expand Up @@ -49,10 +52,6 @@ public void testVisibilityOfQuickSearchOnTaskWidget() {
modificationPage.navigateToEditDashboardDetailsByName("Dashboard");

assertTrue(taskWidget.isQuickSearchInputShow());
taskWidget.setInputForQuickSearch("Task number 10");
taskWidget.countAllTasks().shouldHave(sizeGreaterThanOrEqual(1), DEFAULT_TIMEOUT);
taskWidget.clearQuickSearchInput();

TaskEditWidgetNewDashBoardPage taskEditWidget = taskWidget.openEditTaskWidget();
taskEditWidget.clickOnQuickSearchCheckBox();
taskEditWidget.save();
Expand Down Expand Up @@ -85,11 +84,7 @@ public void testTaskQuickSearchStandardFields() {
taskEditWidget.save();

taskWidget.waitPageLoaded();

taskWidget.setInputForQuickSearch("engine");
assertTrue(taskWidget.isEmptyMessageAppear());
redirectToNewDashBoard();
taskWidget.clearQuickSearchInput();
taskWidget.setInputForQuickSearch("TestCase1");
taskWidget.countAllTasks().shouldHave(size(3), DEFAULT_TIMEOUT);
taskWidget.clickOnButtonExpandTaskWidget();
Expand All @@ -103,22 +98,13 @@ public void testTaskQuickSearchKeywordSessionCache() {
redirectToRelativeLink(create12CasesWithCategoryUrl);
login(TestAccount.ADMIN_USER);
TaskWidgetNewDashBoardPage taskWidget = newDashboardPage.selectTaskWidget(YOUR_TASKS_WIDGET);

taskWidget.setInputForQuickSearch("Task number 10");
taskWidget.countAllTasks().shouldHave(size(1), DEFAULT_TIMEOUT);

var configurationPage = newDashboardPage.openDashboardConfigurationPage();
DashboardModificationPage modificationPage = configurationPage.openEditPublicDashboardsPage();
modificationPage.navigateToEditDashboardDetailsByName("Dashboard");
ScreenshotUtils.maximizeBrowser();

taskWidget.waitPageLoaded();
taskWidget.setInputForQuickSearch("Task number 10");
taskWidget.countAllTasks().shouldHave(size(1), DEFAULT_TIMEOUT);

redirectToNewDashBoard();
newDashboardPage = new NewDashboardPage();
newDashboardPage.waitForCaseWidgetLoaded();

taskWidget = new TaskWidgetNewDashBoardPage();
taskWidget.setInputForQuickSearch("Task number 10");
taskWidget.countAllTasks().shouldHave(size(1), DEFAULT_TIMEOUT);
}

Expand Down Expand Up @@ -223,14 +209,6 @@ public void testVisibilityOfQuickSearchOnCaseWidget() {
modificationPage.navigateToEditDashboardDetailsByName("Dashboard");
CaseEditWidgetNewDashBoardPage caseEditWidget = caseWidget.openEditWidget();

caseEditWidget.clickOnQuickSearchCheckBox();
caseEditWidget.save();

caseWidget.setInputForQuickSearch("case");
caseWidget.countAllCases().shouldHave(sizeGreaterThanOrEqual(1), DEFAULT_TIMEOUT);
caseWidget.clearQuickSearchInput();

caseWidget.openEditWidget();
caseEditWidget.clickOnQuickSearchCheckBox();
caseEditWidget.save();
assertFalse(caseWidget.isQuickSearchInputShow("0"));
Expand Down Expand Up @@ -274,26 +252,17 @@ public void testCaseQuickSearchStandardFields() {
}

@Test
public void testCaseQuickSearchKeywordSessionCache() {
public void testCaseQuickSearchKeywordSessionCache() throws IOException {
ConfigurationJsonUtils.updateJSONSetting("dashboard-case-widget-has-quicksearch.json", Variable.DASHBOARD);
redirectToRelativeLink(create12CasesWithCategoryUrl);
login(TestAccount.ADMIN_USER);
CaseWidgetNewDashBoardPage caseWidget = newDashboardPage.selectCaseWidget(YOUR_CASES_WIDGET);
caseWidget.setInputForQuickSearch("TestCase");

var configurationPage = newDashboardPage.openDashboardConfigurationPage();
DashboardModificationPage modificationPage = configurationPage.openEditPublicDashboardsPage();
modificationPage.navigateToEditDashboardDetailsByName("Dashboard");
ScreenshotUtils.maximizeBrowser();

caseWidget.waitPageLoaded();
CaseEditWidgetNewDashBoardPage caseEditWidget = caseWidget.openEditWidget();
caseEditWidget.clickOnQuickSearchCheckBox();
caseEditWidget.save();
caseWidget.setInputForQuickSearch("TestCase");
caseWidget.countAllCases().shouldHave(size(12), DEFAULT_TIMEOUT);

redirectToNewDashBoard();
assertEquals("TestCase", caseWidget.getQuickSearchInput());
caseWidget.countAllCases().shouldHave(size(12), DEFAULT_TIMEOUT);
}

@Test
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
14 changes: 2 additions & 12 deletions AxonIvyPortal/portal/cms/cms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -704,20 +704,10 @@ ch.ivy.addon.portalkit.ui.jsf:
filters: Filters
iconMessage:
caseWidget:
BEACH_PALM_SUNBED: You are awesome - all cases are done. Lean back and enjoy.
CHARGING_BATTERY_FULL_1: There are currently no cases. Time to recharge the batteries a little.
COFFEE_OF_HOT: Wow! Good job! All cases are completed. How about a quick coffee break?
RANKING_WINNER_MEDAL: Game, set and match! You did it, all cases are completed!
SOCCER_PLAYER: Goal! You did it, all cases completed. Short half-time break.
YOGA_MEDITATE: Well done! All cases are done. Inhale, exhale, relax.
EMPTY_MESSAGE: Currently, there are no cases available.
noCasesFoundWhenFilter: There are currently no cases considering the applied filter.
taskWidget:
BEACH_PALM_SUNBED: You are awesome - all tasks are done. Lean back and enjoy.
CHARGING_BATTERY_FULL_1: There are currently no tasks. Time to recharge the batteries a little.
COFFEE_OF_HOT: Wow! Good job! All tasks are completed. How about a quick coffee break?
RANKING_WINNER_MEDAL: Game, set and match! You did it, all tasks are completed!
SOCCER_PLAYER: Goal! You did it, all tasks completed. Short half-time break.
YOGA_MEDITATE: Well done! All tasks are done. Inhale, exhale, relax.
EMPTY_MESSAGE: Currently, there are no tasks available.
noTasksFoundWhenFilter: There are currently no tasks after applied filter.
loading: Loading...
noCategory: There are no categories
Expand Down
14 changes: 2 additions & 12 deletions AxonIvyPortal/portal/cms/cms_de.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -875,20 +875,10 @@ ch.ivy.addon.portalkit.ui.jsf:
fullscreenMode: Vollbildmodus
iconMessage:
caseWidget:
BEACH_PALM_SUNBED: Sie sind großartig - alle Vorgänge sind erledigt. Lehnen Sie sich zurück und genießen Sie.
CHARGING_BATTERY_FULL_1: Zurzeit gibt es keine Vorgänge. Zeit, die Batterien ein wenig aufzuladen.
COFFEE_OF_HOT: Wahnsinn! Gut gemacht! Alle Vorgänge sind abgeschlossen. Wie wäre es mit einer kurzen Kaffeepause?
RANKING_WINNER_MEDAL: Spiel, Satz und Sieg! Du hast es geschafft, alle Vorgänge sind abgeschlossen!
SOCCER_PLAYER: Ziel erreicht! Du hast es geschafft, alle Vorgänge sind abgeschlossen. Kurze Halbzeitpause.
YOGA_MEDITATE: Gut gemacht! Alle Vorgänge sind erledigt. Einatmen, ausatmen, entspannen.
EMPTY_MESSAGE: Aktuell sind keine weiteren Cases vorhanden.
noCasesFoundWhenFilter: Derzeit gibt es keine Vorgänge nach dem angewandten Filter.
taskWidget:
BEACH_PALM_SUNBED: Sie sind großartig - alle Aufgaben sind erledigt. Lehnen Sie sich zurück und genießen Sie.
CHARGING_BATTERY_FULL_1: Derzeit gibt es keine Aufgaben. Zeit, die Batterien ein wenig aufzuladen.
COFFEE_OF_HOT: Wahnsinn! Gut gemacht! Alle Aufgaben sind erledigt. Wie wäre es mit einer kurzen Kaffeepause?
RANKING_WINNER_MEDAL: Spiel, Satz und Sieg! Du hast es geschafft, alle Aufgaben sind erledigt!
SOCCER_PLAYER: Ziel erreicht! Du hast es geschafft, alle Aufgaben sind erledigt. Kurze Halbzeitpause.
YOGA_MEDITATE: Gut gemacht! Alle Aufgaben sind erledigt. Einatmen, ausatmen, entspannen.
EMPTY_MESSAGE: Aktuell sind keine weiteren Aufgaben vorhanden.
noTasksFoundWhenFilter: Derzeit gibt es keine Aufgaben nach dem angewandten Filter.
loading: Laden...
noCategory: Es gibt keine Kategorien
Expand Down
Loading

0 comments on commit b72d71c

Please sign in to comment.