diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87d78f0..bd4b9c4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,4 +9,4 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v5 diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index d0b01fa..b5df4a4 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -8,8 +8,4 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4 - with: - ivyVersion: nightly-10 - ivyPluginVersion: 10.0.16 - testerVersion: 10.0.16 + uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab5b0d7..bc801b4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,4 +4,4 @@ on: workflow_dispatch jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/release.yml@v5 diff --git a/jsf-formarchive-util-demo/.classpath b/jsf-formarchive-util-demo/.classpath index c25266a..befe031 100644 --- a/jsf-formarchive-util-demo/.classpath +++ b/jsf-formarchive-util-demo/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/jsf-formarchive-util-demo/.project b/jsf-formarchive-util-demo/.project index ce986cb..8110b28 100644 --- a/jsf-formarchive-util-demo/.project +++ b/jsf-formarchive-util-demo/.project @@ -25,6 +25,11 @@ + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder @@ -44,6 +49,5 @@ org.eclipse.jdt.core.javanature org.eclipse.jem.beaninfo.BeanInfoNature org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - + \ No newline at end of file diff --git a/jsf-formarchive-util-demo/.settings/.jsdtscope b/jsf-formarchive-util-demo/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/jsf-formarchive-util-demo/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/jsf-formarchive-util-demo/.settings/ch.ivyteam.ivy.designer.prefs b/jsf-formarchive-util-demo/.settings/ch.ivyteam.ivy.designer.prefs index 074c307..c14a98e 100644 --- a/jsf-formarchive-util-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/jsf-formarchive-util-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,6 +1,5 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=jsf.form.archive.util.demo.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=jsf.form.archive.util.demo ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:useProjectSettings=true -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 eclipse.preferences.version=1 diff --git a/jsf-formarchive-util-demo/.settings/org.eclipse.jdt.core.prefs b/jsf-formarchive-util-demo/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/jsf-formarchive-util-demo/.settings/org.eclipse.jdt.core.prefs +++ b/jsf-formarchive-util-demo/.settings/org.eclipse.jdt.core.prefs @@ -1,10 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.source=21 diff --git a/jsf-formarchive-util-demo/.settings/org.eclipse.wst.common.component b/jsf-formarchive-util-demo/.settings/org.eclipse.wst.common.component index 1e8cb8a..cffba15 100644 --- a/jsf-formarchive-util-demo/.settings/org.eclipse.wst.common.component +++ b/jsf-formarchive-util-demo/.settings/org.eclipse.wst.common.component @@ -1,38 +1,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/jsf-formarchive-util-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/jsf-formarchive-util-demo/.settings/org.eclipse.wst.common.project.facet.core.xml index 4837af5..f9d4879 100644 --- a/jsf-formarchive-util-demo/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/jsf-formarchive-util-demo/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - - - + + \ No newline at end of file diff --git a/jsf-formarchive-util-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/jsf-formarchive-util-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/jsf-formarchive-util-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file diff --git a/jsf-formarchive-util-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/jsf-formarchive-util-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/jsf-formarchive-util-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/jsf-formarchive-util-demo/config/variables.yaml b/jsf-formarchive-util-demo/config/variables.yaml index 6ff84af..40bc904 100644 --- a/jsf-formarchive-util-demo/config/variables.yaml +++ b/jsf-formarchive-util-demo/config/variables.yaml @@ -1,3 +1,4 @@ +# yaml-language-server: $schema=https://json-schema.axonivy.com/app/12.0.0/variables.json # == Variables == # # You can define here your project Variables. @@ -5,4 +6,4 @@ # please add a 'variables.yaml' in the sub directory '_'. # Variables: - #myVariable: value \ No newline at end of file +#myVariable: value diff --git a/jsf-formarchive-util-demo/dataclasses/jsf/form/archive/util/demo/Data.d.json b/jsf-formarchive-util-demo/dataclasses/jsf/form/archive/util/demo/Data.d.json new file mode 100644 index 0000000..9299eac --- /dev/null +++ b/jsf-formarchive-util-demo/dataclasses/jsf/form/archive/util/demo/Data.d.json @@ -0,0 +1,19 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Data", + "namespace" : "jsf.form.archive.util.demo", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "remarks", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "item", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "amount", + "type" : "Number", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/jsf-formarchive-util-demo/dataclasses/jsf/form/archive/util/demo/Data.ivyClass b/jsf-formarchive-util-demo/dataclasses/jsf/form/archive/util/demo/Data.ivyClass deleted file mode 100644 index 5a21be3..0000000 --- a/jsf-formarchive-util-demo/dataclasses/jsf/form/archive/util/demo/Data.ivyClass +++ /dev/null @@ -1,8 +0,0 @@ -Data #class -jsf.form.archive.util.demo #namespace -remarks String #field -remarks PERSISTENT #fieldModifier -item String #field -item PERSISTENT #fieldModifier -amount Number #field -amount PERSISTENT #fieldModifier diff --git a/jsf-formarchive-util-demo/pom.xml b/jsf-formarchive-util-demo/pom.xml index acadeb7..3b17607 100644 --- a/jsf-formarchive-util-demo/pom.xml +++ b/jsf-formarchive-util-demo/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.axonivy.utils.jsfformarchive jsf-form-archive-util-demo - 10.0.2-SNAPSHOT + 12.0.0-SNAPSHOT iar - 10.0.16 + 12.0.0 diff --git a/jsf-formarchive-util-demo/processes/JSFFormArchiveDemo.p.json b/jsf-formarchive-util-demo/processes/JSFFormArchiveDemo.p.json index 7787c52..0ee2ef9 100644 --- a/jsf-formarchive-util-demo/processes/JSFFormArchiveDemo.p.json +++ b/jsf-formarchive-util-demo/processes/JSFFormArchiveDemo.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "166EDFBCF2BF8C6E", "config" : { "data" : "jsf.form.archive.util.demo.Data" @@ -9,21 +9,27 @@ "type" : "RequestStart", "name" : "start.ivp", "config" : { - "callSignature" : "start", + "signature" : "start", + "request" : { + "name" : "<%=ivy.cms.co(\"/Processes/Order/name\")%>" + }, + "permission" : { + "anonymous" : false + }, "task" : { "name" : "OrderRequest" - }, - "outLink" : "start.ivp", - "wfuser" : "1", - "startName" : "<%=ivy.cms.co(\"/Processes/Order/name\")%>", - "tags" : "demo", - "case" : { } + } }, + "tags" : [ + "demo" + ], "visual" : { "at" : { "x" : 128, "y" : 224 }, "labelOffset" : { "x" : 8, "y" : 37 } }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "TaskEnd", @@ -35,69 +41,66 @@ "type" : "DialogCall", "name" : "OrderRequest", "config" : { - "dialogId" : "jsf.form.archive.util.demo.OrderRequest", - "startMethod" : "start(jsf.form.archive.util.demo.Data)", - "output" : { + "dialog" : "jsf.form.archive.util.demo.OrderRequest:start(jsf.form.archive.util.demo.Data)", + "call" : { "map" : { - "out" : "result.data" + "param.data" : "in" } }, - "call" : { - "params" : [ - { "name" : "data", "type" : "jsf.form.archive.util.demo.Data" } - ], + "output" : { "map" : { - "param.data" : "in" + "out" : "result.data" } } }, "visual" : { "at" : { "x" : 288, "y" : 224 }, - "size" : { "width" : 128, "height" : 60 } + "size" : { "width" : 128 } }, - "connect" : { "id" : "f12", "to" : "f11" } + "connect" : [ + { "id" : "f12", "to" : "f11" } + ] }, { "id" : "f5", "type" : "DialogCall", "name" : "Show archived forms", "config" : { - "dialogId" : "jsf.form.archive.util.demo.FormArchive", - "startMethod" : "start()" + "dialog" : "jsf.form.archive.util.demo.FormArchive:start()" }, "visual" : { "at" : { "x" : 664, "y" : 224 }, - "size" : { "width" : 144, "height" : 60 } + "size" : { "width" : 144 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f11", "type" : "UserTask", "name" : "ApprovalTask", "config" : { - "dialogId" : "jsf.form.archive.util.demo.ApprovalTask", - "startMethod" : "start(jsf.form.archive.util.demo.Data)", - "output" : { + "dialog" : "jsf.form.archive.util.demo.ApprovalTask:start(jsf.form.archive.util.demo.Data)", + "call" : { "map" : { - "out" : "result.data" + "param.data" : "in" } }, "task" : { "name" : "<%=ivy.cms.co(\"/Processes/Order/Tasks/Approval/name\")%>", "skipTasklist" : true }, - "call" : { - "params" : [ - { "name" : "data", "type" : "jsf.form.archive.util.demo.Data" } - ], + "output" : { "map" : { - "param.data" : "in" + "out" : "result.data" } } }, "visual" : { "at" : { "x" : 472, "y" : 224 } }, - "connect" : { "id" : "f6", "to" : "f5" } + "connect" : [ + { "id" : "f6", "to" : "f5" } + ] }, { "id" : "f7", "type" : "ProcessAnnotation", @@ -113,6 +116,8 @@ "at" : { "x" : 452, "y" : 80 }, "size" : { "width" : 772, "height" : 132 } }, - "connect" : { "id" : "f8", "to" : "f0" } + "connect" : [ + { "id" : "f8", "to" : "f0" } + ] } ] } \ No newline at end of file diff --git a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/ApprovalTask/ApprovalTask.rddescriptor b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/ApprovalTask/ApprovalTask.rddescriptor deleted file mode 100644 index 232f04c..0000000 --- a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/ApprovalTask/ApprovalTask.rddescriptor +++ /dev/null @@ -1,24 +0,0 @@ - - - true - - guid - 166EDFD07659E3F1 - true - - - version - 1 - true - - - binary - false - true - - - viewTechnology - JSF - true - - diff --git a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/ApprovalTask/ApprovalTaskData.d.json b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/ApprovalTask/ApprovalTaskData.d.json new file mode 100644 index 0000000..7232053 --- /dev/null +++ b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/ApprovalTask/ApprovalTaskData.d.json @@ -0,0 +1,11 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "ApprovalTaskData", + "namespace" : "jsf.form.archive.util.demo.ApprovalTask", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "data", + "type" : "jsf.form.archive.util.demo.Data", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/ApprovalTask/ApprovalTaskData.ivyClass b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/ApprovalTask/ApprovalTaskData.ivyClass deleted file mode 100644 index bf77ace..0000000 --- a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/ApprovalTask/ApprovalTaskData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -ApprovalTaskData #class -jsf.form.archive.util.demo.ApprovalTask #namespace -data jsf.form.archive.util.demo.Data #field -data PERSISTENT #fieldModifier diff --git a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/ApprovalTask/ApprovalTaskProcess.p.json b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/ApprovalTask/ApprovalTaskProcess.p.json index a092a2c..2090704 100644 --- a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/ApprovalTask/ApprovalTaskProcess.p.json +++ b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/ApprovalTask/ApprovalTaskProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "1916AD2B37334E48", "kind" : "HTML_DIALOG", "config" : { @@ -10,21 +10,21 @@ "type" : "HtmlDialogStart", "name" : "start(Data)", "config" : { - "callSignature" : "start", - "result" : { + "signature" : "start", + "input" : { "params" : [ - { "name" : "data", "type" : "jsf.form.archive.util.demo.Data" } + { "name" : "data", "type" : "jsf.form.archive.util.demo.Data", "desc" : "" } ], "map" : { - "result.data" : "in.data" + "out.data" : "param.data" } }, - "input" : { + "result" : { "params" : [ - { "name" : "data", "type" : "jsf.form.archive.util.demo.Data" } + { "name" : "data", "type" : "jsf.form.archive.util.demo.Data", "desc" : "" } ], "map" : { - "out.data" : "param.data" + "result.data" : "in.data" } }, "guid" : "166EDFD0765E8776" @@ -33,7 +33,9 @@ "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 8, "y" : 35 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -51,12 +53,14 @@ "type" : "HtmlDialogMethodStart", "name" : "close()", "config" : { - "callSignature" : "close", + "signature" : "close", "guid" : "191E980778B5701B" }, "visual" : { "at" : { "x" : 96, "y" : 160 } }, - "connect" : { "id" : "f7", "to" : "f4" } + "connect" : [ + { "id" : "f7", "to" : "f4" } + ] } ] } \ No newline at end of file diff --git a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchive.rddescriptor b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchive.rddescriptor deleted file mode 100644 index 49774b6..0000000 --- a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchive.rddescriptor +++ /dev/null @@ -1,24 +0,0 @@ - - - true - - guid - 166EEADAE2DB4697 - true - - - version - 1 - true - - - binary - false - true - - - viewTechnology - JSF - true - - diff --git a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchive.xhtml b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchive.xhtml index cbb8401..ee661ba 100644 --- a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchive.xhtml +++ b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchive.xhtml @@ -15,7 +15,7 @@ value="#{ivy.case.documents().all}" var="caseDoc"> - #{caseDoc.name} diff --git a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchiveData.d.json b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchiveData.d.json new file mode 100644 index 0000000..17a6548 --- /dev/null +++ b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchiveData.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "FormArchiveData", + "namespace" : "jsf.form.archive.util.demo.FormArchive", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchiveData.ivyClass b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchiveData.ivyClass deleted file mode 100644 index 271db76..0000000 --- a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchiveData.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -FormArchiveData #class -jsf.form.archive.util.demo.FormArchive #namespace diff --git a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchiveProcess.p.json b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchiveProcess.p.json index 7d5b3ca..66cc56f 100644 --- a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchiveProcess.p.json +++ b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/FormArchive/FormArchiveProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "166EEADAE19F9CEB", "kind" : "HTML_DIALOG", "config" : { @@ -10,14 +10,16 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "guid" : "166EEADAE2DDDB4C" }, "visual" : { "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 8, "y" : 35 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -35,7 +37,9 @@ "at" : { "x" : 96, "y" : 160 }, "labelOffset" : { "x" : 8, "y" : 32 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", diff --git a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/OrderRequest/OrderRequest.rddescriptor b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/OrderRequest/OrderRequest.rddescriptor deleted file mode 100644 index 232f04c..0000000 --- a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/OrderRequest/OrderRequest.rddescriptor +++ /dev/null @@ -1,24 +0,0 @@ - - - true - - guid - 166EDFD07659E3F1 - true - - - version - 1 - true - - - binary - false - true - - - viewTechnology - JSF - true - - diff --git a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/OrderRequest/OrderRequestData.d.json b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/OrderRequest/OrderRequestData.d.json new file mode 100644 index 0000000..0aae1fe --- /dev/null +++ b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/OrderRequest/OrderRequestData.d.json @@ -0,0 +1,11 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "OrderRequestData", + "namespace" : "jsf.form.archive.util.demo.OrderRequest", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "data", + "type" : "jsf.form.archive.util.demo.Data", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/OrderRequest/OrderRequestData.ivyClass b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/OrderRequest/OrderRequestData.ivyClass deleted file mode 100644 index d30adcd..0000000 --- a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/OrderRequest/OrderRequestData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -OrderRequestData #class -jsf.form.archive.util.demo.OrderRequest #namespace -data jsf.form.archive.util.demo.Data #field -data PERSISTENT #fieldModifier diff --git a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/OrderRequest/OrderRequestProcess.p.json b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/OrderRequest/OrderRequestProcess.p.json index 14d59fc..7768a77 100644 --- a/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/OrderRequest/OrderRequestProcess.p.json +++ b/jsf-formarchive-util-demo/src_hd/jsf/form/archive/util/demo/OrderRequest/OrderRequestProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "166EDFD075BE6CB6", "kind" : "HTML_DIALOG", "config" : { @@ -10,21 +10,21 @@ "type" : "HtmlDialogStart", "name" : "start(Data)", "config" : { - "callSignature" : "start", - "result" : { + "signature" : "start", + "input" : { "params" : [ - { "name" : "data", "type" : "jsf.form.archive.util.demo.Data" } + { "name" : "data", "type" : "jsf.form.archive.util.demo.Data", "desc" : "" } ], "map" : { - "result.data" : "in.data" + "out.data" : "param.data" } }, - "input" : { + "result" : { "params" : [ - { "name" : "data", "type" : "jsf.form.archive.util.demo.Data" } + { "name" : "data", "type" : "jsf.form.archive.util.demo.Data", "desc" : "" } ], "map" : { - "out.data" : "param.data" + "result.data" : "in.data" } }, "guid" : "166EDFD0765E8776" @@ -33,7 +33,9 @@ "at" : { "x" : 96, "y" : 64 }, "labelOffset" : { "x" : 8, "y" : 35 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -51,12 +53,14 @@ "type" : "HtmlDialogMethodStart", "name" : "close()", "config" : { - "callSignature" : "close", + "signature" : "close", "guid" : "191E97B969FE8560" }, "visual" : { "at" : { "x" : 96, "y" : 160 } }, - "connect" : { "id" : "f6", "to" : "f4" } + "connect" : [ + { "id" : "f6", "to" : "f4" } + ] } ] } \ No newline at end of file diff --git a/jsf-formarchive-util-demo/webContent/layouts/frame-10.xhtml b/jsf-formarchive-util-demo/webContent/layouts/frame-10.xhtml index caee274..be8785d 100644 --- a/jsf-formarchive-util-demo/webContent/layouts/frame-10.xhtml +++ b/jsf-formarchive-util-demo/webContent/layouts/frame-10.xhtml @@ -32,7 +32,7 @@ and refence it below in the head part. - +