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

…o feature/IVYPORTAL-18067-Create-Portal-branch-release-12.0-LE # Conflicts: # AxonIvyPortal/PortalKitTestHelper/pom.xml # AxonIvyPortal/portal-components/pom.xml # AxonIvyPortal/portal-migration/pom.xml # AxonIvyPortal/portal-selenium-test/customized_pom.xml # AxonIvyPortal/portal-selenium-test/document_screenshot_pom.xml # AxonIvyPortal/portal-selenium-test/pom.xml # AxonIvyPortal/portal/pom.xml # Showcase/InternalSupport/pom.xml # Showcase/portal-components-examples/pom.xml # Showcase/portal-developer-examples/pom.xml # Showcase/portal-user-examples/pom.xml
axonivy-market · Dec 20, 2024 · f169eb8 · f169eb8
2 parents 088b085 + d2caf2e
commit f169eb8
Show file tree

Hide file tree

Showing 69 changed files with 843 additions and 253 deletions.
diff --git a/AxonIvyPortal/PortalKitTestHelper/dataclasses/portalKit_test/DataCreationData.d.json b/AxonIvyPortal/PortalKitTestHelper/dataclasses/portalKit_test/DataCreationData.d.json
@@ -60,5 +60,9 @@
   }, {
     "name" : "jsonKey",
     "type" : "String"
+  }, {
+    "name" : "persistedCounter",
+    "type" : "java.lang.Integer",
+    "modifiers" : [ "PERSISTENT" ]
   } ]
 }
diff --git a/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/DataCreation.p.json b/AxonIvyPortal/PortalKitTestHelper/processes/Start Processes/DataCreation.p.json
@@ -1004,11 +1004,6 @@
     }, {
       "id" : "f112",
       "type" : "TaskSwitchGateway",
-      "config" : {
-        "tasks" : [ {
-            "id" : "TaskA"
-          } ]
-      },
       "visual" : {
         "at" : { "x" : 1472, "y" : 192 }
       },
@@ -1282,11 +1277,6 @@
         }, {
           "id" : "S10-f5",
           "type" : "TaskSwitchGateway",
-          "config" : {
-            "tasks" : [ {
-                "id" : "TaskA"
-              } ]
-          },
           "visual" : {
             "at" : { "x" : 640, "y" : 256 }
           },
@@ -1914,5 +1904,309 @@
       "connect" : [
         { "id" : "f191", "to" : "f186", "color" : "default" }
       ]
+    }, {
+      "id" : "f145",
+      "type" : "RequestStart",
+      "name" : "createABusinessCaseHasLotsOfTasksCases",
+      "config" : {
+        "signature" : "createBusinessCaseHasLotsOfTasksCases",
+        "request" : {
+          "name" : "Create a business case has lots of tasks cases"
+        },
+        "task" : {
+          "name" : "First task of the case"
+        },
+        "case" : {
+          "name" : "Business case has lots of tasks cases"
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 64, "y" : 2144 },
+        "labelOffset" : { "x" : 17, "y" : 49 }
+      },
+      "connect" : [
+        { "id" : "f147", "to" : "f146" }
+      ]
+    }, {
+      "id" : "f146",
+      "type" : "Script",
+      "name" : "Init",
+      "config" : {
+        "output" : {
+          "code" : "in.counter = 0;"
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 216, "y" : 2144 }
+      },
+      "connect" : [
+        { "id" : "f216", "to" : "f217" }
+      ]
+    }, {
+      "id" : "f148",
+      "type" : "RequestStart",
+      "name" : "createACaseHasLotsOfTasks",
+      "config" : {
+        "signature" : "createCaseHasLotsOfTasks",
+        "request" : {
+          "isHttpRequestable" : false
+        },
+        "triggerable" : true,
+        "task" : {
+          "name" : "First task of the case",
+          "responsible" : {
+            "activator" : "SYSTEM"
+          }
+        },
+        "case" : {
+          "name" : "Technical case"
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 64, "y" : 2352 }
+      },
+      "connect" : [
+        { "id" : "f192", "to" : "f149" }
+      ]
+    }, {
+      "id" : "f149",
+      "type" : "Script",
+      "name" : "Init",
+      "config" : {
+        "output" : {
+          "code" : "in.persistedCounter = 0;"
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 216, "y" : 2352 }
+      },
+      "connect" : [
+        { "id" : "f194", "to" : "f224" }
+      ]
+    }, {
+      "id" : "f193",
+      "type" : "TaskSwitchGateway",
+      "config" : {
+        "tasks" : [ {
+            "id" : "TaskA",
+            "name" : "<%= \"Task A \" + in1.persistedCounter + \" of case \" + ivy.case.getId() %>"
+          }, {
+            "id" : "TaskB",
+            "name" : "<%= \"Task B \" + in1.persistedCounter + \" of case \" + ivy.case.getId() %>"
+          }, {
+            "id" : "TaskC",
+            "name" : "<%= \"Task C \" + in1.persistedCounter + \" of case \" + ivy.case.getId() %>"
+          }, {
+            "id" : "TaskD",
+            "name" : "<%= \"Task D \" + in1.persistedCounter + \" of case \" + ivy.case.getId() %>"
+          }, {
+            "id" : "TaskE",
+            "name" : "<%= \"Task E \" + in1.persistedCounter + \" of case \" + ivy.case.getId() %>"
+          }, {
+            "id" : "TaskF",
+            "name" : "<%= \"Task F \" + in1.persistedCounter + \" of case \" + ivy.case.getId() %>"
+          }, {
+            "id" : "TaskG",
+            "name" : "<%= \"Task G \" + in1.persistedCounter + \" of case \" + ivy.case.getId() %>"
+          }, {
+            "id" : "TaskH",
+            "name" : "<%= \"Task H \" + in1.persistedCounter + \" of case \" + ivy.case.getId() %>"
+          }, {
+            "id" : "TaskI",
+            "name" : "<%= \"Task I \" + in1.persistedCounter + \" of case \" + ivy.case.getId() %>"
+          }, {
+            "id" : "TaskJ",
+            "name" : "<%= \"Task J \" + in1.persistedCounter + \" of case \" + ivy.case.getId() %>",
+            "responsible" : {
+              "activator" : "SYSTEM"
+            }
+          } ]
+      },
+      "visual" : {
+        "at" : { "x" : 480, "y" : 2352 },
+        "labelOffset" : { "x" : 14, "y" : 34 }
+      },
+      "connect" : [
+        { "id" : "f196", "to" : "f195", "condition" : "ivp==\"TaskA.ivp\"" },
+        { "id" : "f198", "to" : "f197", "condition" : "ivp==\"TaskB.ivp\"" },
+        { "id" : "f207", "to" : "f199", "condition" : "ivp==\"TaskC.ivp\"" },
+        { "id" : "f208", "to" : "f200", "condition" : "ivp==\"TaskD.ivp\"" },
+        { "id" : "f209", "to" : "f205", "condition" : "ivp==\"TaskE.ivp\"" },
+        { "id" : "f210", "to" : "f206", "condition" : "ivp==\"TaskF.ivp\"" },
+        { "id" : "f211", "to" : "f201", "condition" : "ivp==\"TaskG.ivp\"" },
+        { "id" : "f212", "to" : "f202", "condition" : "ivp==\"TaskH.ivp\"" },
+        { "id" : "f213", "to" : "f227", "condition" : "ivp==\"TaskI.ivp\"" },
+        { "id" : "f228", "to" : "f204", "via" : [ { "x" : 480, "y" : 2272 } ], "condition" : "ivp==\"TaskJ.ivp\"" }
+      ]
+    }, {
+      "id" : "f195",
+      "type" : "TaskEnd",
+      "visual" : {
+        "at" : { "x" : 608, "y" : 2352 },
+        "labelOffset" : { "x" : 13, "y" : 33 }
+      }
+    }, {
+      "id" : "f197",
+      "type" : "TaskEnd",
+      "visual" : {
+        "at" : { "x" : 608, "y" : 2384 },
+        "labelOffset" : { "x" : 13, "y" : 33 }
+      }
+    }, {
+      "id" : "f199",
+      "type" : "TaskEnd",
+      "visual" : {
+        "at" : { "x" : 608, "y" : 2416 },
+        "labelOffset" : { "x" : 13, "y" : 33 }
+      }
+    }, {
+      "id" : "f200",
+      "type" : "TaskEnd",
+      "visual" : {
+        "at" : { "x" : 608, "y" : 2448 },
+        "labelOffset" : { "x" : 13, "y" : 33 }
+      }
+    }, {
+      "id" : "f201",
+      "type" : "TaskEnd",
+      "visual" : {
+        "at" : { "x" : 544, "y" : 2480 },
+        "labelOffset" : { "x" : 13, "y" : 33 }
+      }
+    }, {
+      "id" : "f202",
+      "type" : "TaskEnd",
+      "visual" : {
+        "at" : { "x" : 512, "y" : 2480 },
+        "labelOffset" : { "x" : 13, "y" : 33 }
+      }
+    }, {
+      "id" : "f205",
+      "type" : "TaskEnd",
+      "visual" : {
+        "at" : { "x" : 608, "y" : 2480 },
+        "labelOffset" : { "x" : 13, "y" : 33 }
+      }
+    }, {
+      "id" : "f206",
+      "type" : "TaskEnd",
+      "visual" : {
+        "at" : { "x" : 576, "y" : 2480 },
+        "labelOffset" : { "x" : 13, "y" : 33 }
+      }
+    }, {
+      "id" : "f215",
+      "type" : "TriggerCall",
+      "name" : "Create a case has lots of tasks",
+      "config" : {
+        "processCall" : "Start Processes/DataCreation:createCaseHasLotsOfTasks()"
+      },
+      "visual" : {
+        "at" : { "x" : 576, "y" : 2144 }
+      },
+      "connect" : [
+        { "id" : "f219", "to" : "f222" }
+      ]
+    }, {
+      "id" : "f217",
+      "type" : "Alternative",
+      "name" : "counter < 50",
+      "config" : {
+        "conditions" : {
+          "f218" : "in.counter < 50"
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 384, "y" : 2144 },
+        "labelOffset" : { "x" : -24, "y" : -8 }
+      },
+      "connect" : [
+        { "id" : "f218", "to" : "f215", "label" : {
+            "name" : "Yes"
+          }, "color" : "default" },
+        { "id" : "f221", "to" : "f220", "label" : {
+            "name" : "No"
+          } }
+      ]
+    }, {
+      "id" : "f220",
+      "type" : "TaskEnd",
+      "visual" : {
+        "at" : { "x" : 384, "y" : 2208 }
+      }
+    }, {
+      "id" : "f222",
+      "type" : "Script",
+      "name" : "Increase counter",
+      "config" : {
+        "output" : {
+          "code" : [
+            "import java.lang.Thread;",
+            "in.counter++;",
+            "Thread.sleep(1000);",
+            "ivy.log.warn(\"Increased counter {0} of business case {1}\", in.counter, ivy.case.getId());"
+          ]
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 576, "y" : 2064 }
+      },
+      "connect" : [
+        { "id" : "f223", "to" : "f217", "via" : [ { "x" : 384, "y" : 2064 } ] }
+      ]
+    }, {
+      "id" : "f204",
+      "type" : "Script",
+      "name" : "Increase counter",
+      "config" : {
+        "output" : {
+          "code" : [
+            "import java.lang.Thread;",
+            "in.persistedCounter++;",
+            "Thread.sleep(100);",
+            "ivy.log.warn(\"Increased counter {0} of case {1}\", in.persistedCounter, ivy.case.getId());"
+          ]
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 384, "y" : 2272 }
+      },
+      "connect" : [
+        { "id" : "f203", "to" : "f224" }
+      ]
+    }, {
+      "id" : "f224",
+      "type" : "Alternative",
+      "name" : "counter < 10",
+      "config" : {
+        "conditions" : {
+          "f225" : "in.persistedCounter < 10"
+        }
+      },
+      "visual" : {
+        "at" : { "x" : 384, "y" : 2352 },
+        "labelOffset" : { "x" : -24, "y" : -8 }
+      },
+      "connect" : [
+        { "id" : "f225", "to" : "f193", "label" : {
+            "name" : "Yes"
+          }, "color" : "default", "var" : "in1" },
+        { "id" : "f226", "to" : "f214", "label" : {
+            "name" : "No"
+          } }
+      ]
+    }, {
+      "id" : "f214",
+      "type" : "TaskEnd",
+      "visual" : {
+        "at" : { "x" : 384, "y" : 2480 }
+      }
+    }, {
+      "id" : "f227",
+      "type" : "TaskEnd",
+      "visual" : {
+        "at" : { "x" : 480, "y" : 2480 },
+        "labelOffset" : { "x" : 13, "y" : 33 }
+      }
     } ]
 }
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/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/resources/js/document-screenshot.js b/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() {

diff --git a/...t/src_test/com/axonivy/portal/selenium/document/screenshot/PortalCasesScreenshotTest.java b/...t/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();