Skip to content

Commit

Permalink
Merge pull request #1082 from axonivy-market/feature/IVYPORTAL-17576-…
Browse files Browse the repository at this point in the history
…Variable-Portal.DateTimeFormat.DateFilterWithTime-does-not-work-on-complex-filter-LE

IVYPORTAL-17576 Variable Portal.DateTimeFormat.DateFilterWithTime does not work on complex filter
  • Loading branch information
chnam-axonivy authored Oct 7, 2024
2 parents ef1d72c + 4cdec6c commit 3eede66
Show file tree
Hide file tree
Showing 493 changed files with 685 additions and 544 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "14B2A3DC7173EA26",
"config" : {
"data" : "ch.ivy.add.portalkit.task.TaskGenerationDataRange"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "1511A66AF619A768",
"config" : {
"data" : "portalKit_test.Data"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "18B031C59C3C7814",
"config" : {
"data" : "portalKit_test.Data"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "17F2050944B46BB0",
"config" : {
"data" : "portalKit_test.DashboardCreationData"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "153CACC26D0D4C3D",
"config" : {
"data" : "portalKit_test.DataCreationData"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "14DE09882B540AD5",
"config" : {
"data" : "portalKit_test.GrantPermissionsData"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "1636734E13CEC872",
"config" : {
"data" : "portalKit_test.LoginData"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "176463FD4BBF6C93",
"config" : {
"data" : "portalKit_test.Data"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "18D596926C35B1DB",
"config" : {
"data" : "portalKit_test.Data"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "1749B87B8C1B77BE",
"config" : {
"data" : "portalKit_test.PortalGlobalVariableHelperData"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "17208192E0AF4185",
"config" : {
"data" : "portalKit_test.PortalSettingHelperData"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "169BDE2F368D6EC4",
"config" : {
"data" : "portalKit_test.Data"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "1559AE0A76284C44",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "14B7775CB7A22AF4",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "167BAF785E543C28",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "167A72C8DB0B15A6",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "153CBA4AE9F19221",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "1622D86CE0C61E23",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "168DF9B20193A93C",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "169137A20654C01B",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "18DC0AD8321B5FC8",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "1818A90AC6618738",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "180CC2A120F7FCC9",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "180CBDED29C1D2F8",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "1817143899CB5AEC",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "18098C74EBB97195",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "1624CFE2532EF6BE",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "161936E158EBC57F",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "180CC1E9248E252B",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "180CC29030DF7407",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "18104AE3EB4807A1",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "18098B8A2F5FCF38",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public String sanitize(String content) {

/**
* This method is used to clearly mark XSS is considered.
* @param content
* @return santized content
*/
public String sanitizeIgnoredWithAwareness(String content) {
return content;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ private ProcessStartAPI() {
*/
public static String findStartableLinkByUserFriendlyRequestPath(String friendlyRequestPath) {
return Sudo.get(() -> {
List<IApplication> applicationsInSecurityContext = IApplicationRepository.instance()
.allOf(ISecurityContext.current());
List<IApplication> applicationsInSecurityContext = IApplicationRepository.of(ISecurityContext.current()).all();
for (IApplication app : applicationsInSecurityContext) {
IProcessStart processStart = findStartableProcessStartByUserFriendlyRequestPath(friendlyRequestPath,
app);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ public static IProcessStart findProcessStartByUserFriendlyRequestPath(String req
return processStart;
}

List<IApplication> applicationsInSecurityContext =
IApplicationRepository.instance().allOf(ISecurityContext.current());
List<IApplication> applicationsInSecurityContext = IApplicationRepository.of(ISecurityContext.current()).all();

List<IProcessModel> processModels = applicationsInSecurityContext.stream()
.map(IApplication::getProcessModelsSortedByName).flatMap(List::stream).collect(Collectors.toList());
Expand Down Expand Up @@ -78,7 +77,7 @@ public static String findFriendlyRequestPathContainsKeyword(String keyword, Obje
if (portalStartPmvId == null) {
return findFriendlyRequestPathContainsKeywordInPMV(keyword, Ivy.wfTask().getProcessModelVersion());
} else {
List<IApplication> applicationsInSecurityContext = IApplicationRepository.instance().allOf(ISecurityContext.current());
List<IApplication> applicationsInSecurityContext = IApplicationRepository.of(ISecurityContext.current()).all();
for (IApplication app : applicationsInSecurityContext) {
IProcessModelVersion findProcessModelVersion = app.findProcessModelVersion(portalStartPmvId);
if (findProcessModelVersion != null) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "16B1B70EE89C4939",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "18118F75C3E2A5CF",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "180F979F5AF44684",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "181FC5E5ED6EAE2A",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "180B70D44ADA37B5",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "180975ACFFBC3EAE",
"kind" : "HTML_DIALOG",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "14C7834636E63BEA",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "1633E7FE0C8BCFA6",
"config" : {
"data" : "ch.ivy.add.portalkit.Data"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "1602F513613E1225",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "15F95D721D0C7224",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "16812A78CEF8FB1A",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "15B8089000CE1FF7",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "15E13D0DD56B6D3B",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down Expand Up @@ -259,4 +259,4 @@
} }
]
} ]
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "188DC1996B169C8D",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "16AC05A855359627",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "16AB5FD24113C5D2",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "17554BEDC7CB0381",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema" : "https://json-schema.axonivy.com/process/11.3.0/process.json",
"$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json",
"id" : "1754F17410CDFE4E",
"kind" : "CALLABLE_SUB",
"config" : {
Expand Down
Loading

0 comments on commit 3eede66

Please sign in to comment.