diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87d78f0..fda8fa3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,3 +10,6 @@ on: jobs: build: uses: axonivy-market/github-workflows/.github/workflows/ci.yml@v4 + with: + javaVersion: 21 + mvnVersion: 3.9.8 \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ab5b0d7..12d9cc0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,3 +5,5 @@ on: workflow_dispatch jobs: build: uses: axonivy-market/github-workflows/.github/workflows/release.yml@v4 + with: + javaVersion: 21 \ No newline at end of file diff --git a/pom.xml b/pom.xml index ce79ddf..b67dd91 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.axonivy.connector.skribble skribble-connector skribble-connector-modules - 10.0.25-SNAPSHOT + 12.0.0 pom diff --git a/skribble-connector-demo/.classpath b/skribble-connector-demo/.classpath index aa20b3e..9baacfb 100644 --- a/skribble-connector-demo/.classpath +++ b/skribble-connector-demo/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/skribble-connector-demo/.project b/skribble-connector-demo/.project index 6c64b30..438c020 100644 --- a/skribble-connector-demo/.project +++ b/skribble-connector-demo/.project @@ -1,49 +1,53 @@ - - - skribble-connector-demo - - - - - - ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder - - - - - ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.wst.common.project.facet.core.builder - - - - - ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - ch.ivyteam.ivy.project.IvyProjectNature - org.eclipse.wst.common.modulecore.ModuleCoreNature - org.eclipse.jem.workbench.JavaEMFNature - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - org.eclipse.jem.beaninfo.BeanInfoNature - org.eclipse.wst.common.project.facet.core.nature - org.eclipse.wst.jsdt.core.jsNature - - + + + skribble-connector-demo + + + + + + ch.ivyteam.ivy.designer.dataClasses.ui.ivyDataClassBuilder + + + + + ch.ivyteam.ivy.designer.process.ui.ivyWebServiceProcessClassBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + ch.ivyteam.ivy.dialog.form.build.ivyDialogFormBuilder + + + + + ch.ivyteam.ivy.designer.ide.ivyModelValidationBuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + ch.ivyteam.ivy.project.IvyProjectNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + org.eclipse.jem.beaninfo.BeanInfoNature + org.eclipse.wst.common.project.facet.core.nature + + \ No newline at end of file diff --git a/skribble-connector-demo/.settings/.jsdtscope b/skribble-connector-demo/.settings/.jsdtscope deleted file mode 100644 index cf5ec79..0000000 --- a/skribble-connector-demo/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/skribble-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/skribble-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs index 44c7822..a784d34 100644 --- a/skribble-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/skribble-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.skribble.demo.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.skribble.demo -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/skribble-connector-demo/.settings/org.eclipse.jdt.core.prefs b/skribble-connector-demo/.settings/org.eclipse.jdt.core.prefs index f78f7f7..96641ff 100644 --- a/skribble-connector-demo/.settings/org.eclipse.jdt.core.prefs +++ b/skribble-connector-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/skribble-connector-demo/.settings/org.eclipse.wst.common.component b/skribble-connector-demo/.settings/org.eclipse.wst.common.component index 23522d0..ba2c583 100644 --- a/skribble-connector-demo/.settings/org.eclipse.wst.common.component +++ b/skribble-connector-demo/.settings/org.eclipse.wst.common.component @@ -1,11 +1,10 @@ - - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/skribble-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/skribble-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml index c2098f9..621b1f8 100644 --- a/skribble-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/skribble-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - - - - - - - + + + + + + \ No newline at end of file diff --git a/skribble-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/skribble-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/skribble-connector-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/skribble-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/skribble-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/skribble-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/skribble-connector-demo/config/variables.yaml b/skribble-connector-demo/config/variables.yaml index 64c8fa0..4448394 100644 --- a/skribble-connector-demo/config/variables.yaml +++ b/skribble-connector-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. diff --git a/skribble-connector-demo/dataclasses/com/axonivy/connector/skribble/demo/Data.d.json b/skribble-connector-demo/dataclasses/com/axonivy/connector/skribble/demo/Data.d.json new file mode 100644 index 0000000..15e4361 --- /dev/null +++ b/skribble-connector-demo/dataclasses/com/axonivy/connector/skribble/demo/Data.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Data", + "namespace" : "com.axonivy.connector.skribble.demo", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/skribble-connector-demo/dataclasses/com/axonivy/connector/skribble/demo/Data.ivyClass b/skribble-connector-demo/dataclasses/com/axonivy/connector/skribble/demo/Data.ivyClass deleted file mode 100644 index b1d5570..0000000 --- a/skribble-connector-demo/dataclasses/com/axonivy/connector/skribble/demo/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -com.axonivy.connector.skribble.demo #namespace diff --git a/skribble-connector-demo/dataclasses/com/axonivy/connector/skribble/demo/SampleProcessData.d.json b/skribble-connector-demo/dataclasses/com/axonivy/connector/skribble/demo/SampleProcessData.d.json new file mode 100644 index 0000000..2e389d7 --- /dev/null +++ b/skribble-connector-demo/dataclasses/com/axonivy/connector/skribble/demo/SampleProcessData.d.json @@ -0,0 +1,19 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "SampleProcessData", + "namespace" : "com.axonivy.connector.skribble.demo", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "createSignatureRequest", + "type" : "com.skribble.api.v2.client.CreateSignatureRequest", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "signatureRequest", + "type" : "com.skribble.api.v2.client.SignatureRequest", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "nextView", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/skribble-connector-demo/dataclasses/com/axonivy/connector/skribble/demo/SampleProcessData.ivyClass b/skribble-connector-demo/dataclasses/com/axonivy/connector/skribble/demo/SampleProcessData.ivyClass deleted file mode 100644 index 16bf1eb..0000000 --- a/skribble-connector-demo/dataclasses/com/axonivy/connector/skribble/demo/SampleProcessData.ivyClass +++ /dev/null @@ -1,8 +0,0 @@ -SampleProcessData #class -com.axonivy.connector.skribble.demo #namespace -createSignatureRequest com.skribble.api.v2.client.CreateSignatureRequest #field -createSignatureRequest PERSISTENT #fieldModifier -signatureRequest com.skribble.api.v2.client.SignatureRequest #field -signatureRequest PERSISTENT #fieldModifier -nextView String #field -nextView PERSISTENT #fieldModifier diff --git a/skribble-connector-demo/pom.xml b/skribble-connector-demo/pom.xml index 97dd59b..7d700df 100644 --- a/skribble-connector-demo/pom.xml +++ b/skribble-connector-demo/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.axonivy.connector.skribble skribble-connector-demo - 10.0.25-SNAPSHOT + 12.0.0 iar - 10.0.14 + 12.0.0 diff --git a/skribble-connector-demo/processes/SampleProcess.p.json b/skribble-connector-demo/processes/SampleProcess.p.json index 0c27ee1..6a4e68e 100644 --- a/skribble-connector-demo/processes/SampleProcess.p.json +++ b/skribble-connector-demo/processes/SampleProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "191739E06E060E63", "config" : { "data" : "com.axonivy.connector.skribble.demo.SampleProcessData" @@ -9,38 +9,46 @@ "type" : "RequestStart", "name" : "signNewDocument.ivp", "config" : { - "callSignature" : "signNewDocument", - "outLink" : "signNewDocument.ivp", - "startDescription" : "Upload your document for signing and define the requirement signers", - "startName" : "Upload document for signing", - "tags" : "demo", - "case" : { } + "signature" : "signNewDocument", + "request" : { + "name" : "Upload document for signing", + "description" : "Upload your document for signing and define the requirement signers" + } }, + "tags" : [ + "demo" + ], "visual" : { "at" : { "x" : 88, "y" : 144 } }, - "connect" : { "id" : "f14", "to" : "f9" } + "connect" : [ + { "id" : "f14", "to" : "f9" } + ] }, { "id" : "f4", "type" : "RequestStart", "name" : "showOverview.ivp", "config" : { - "callSignature" : "showOverview", + "signature" : "showOverview", "input" : { "map" : { "out.nextView" : "\"overview\"" } }, - "outLink" : "showOverview.ivp", - "startDescription" : "Loads all your documents from the Skribble-platform.", - "startName" : "Show documents status", - "tags" : "demo", - "case" : { } + "request" : { + "name" : "Show documents status", + "description" : "Loads all your documents from the Skribble-platform." + } }, + "tags" : [ + "demo" + ], "visual" : { "at" : { "x" : 96, "y" : 232 } }, - "connect" : { "id" : "f7", "to" : "f6" } + "connect" : [ + { "id" : "f7", "to" : "f6" } + ] }, { "id" : "f6", "type" : "DialogCall", @@ -49,8 +57,7 @@ "on Skribble" ], "config" : { - "dialogId" : "com.axonivy.connector.skribble.demo.Overview", - "startMethod" : "start()", + "dialog" : "com.axonivy.connector.skribble.demo.Overview:start()", "output" : { "map" : { "out" : "in", @@ -61,19 +68,22 @@ "visual" : { "at" : { "x" : 256, "y" : 232 } }, - "connect" : { "id" : "f16", "to" : "f10" } + "connect" : [ + { "id" : "f16", "to" : "f10" } + ] }, { "id" : "f9", "type" : "DialogCall", "name" : "Upload document for signing", "config" : { - "dialogId" : "com.axonivy.connector.skribble.demo.SignRequest", - "startMethod" : "start()" + "dialog" : "com.axonivy.connector.skribble.demo.SignRequest:start()" }, "visual" : { "at" : { "x" : 256, "y" : 144 } }, - "connect" : { "id" : "f17", "to" : "f15" } + "connect" : [ + { "id" : "f17", "to" : "f15" } + ] }, { "id" : "f10", "type" : "TaskEnd", diff --git a/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/Overview/Overview.rddescriptor b/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/Overview/Overview.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/Overview/Overview.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/Overview/OverviewData.d.json b/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/Overview/OverviewData.d.json new file mode 100644 index 0000000..6e41a0f --- /dev/null +++ b/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/Overview/OverviewData.d.json @@ -0,0 +1,27 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "OverviewData", + "namespace" : "com.axonivy.connector.skribble.demo.Overview", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "signatureRequests", + "type" : "List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "selectedSignatureRequest", + "type" : "com.skribble.api.v2.client.SignatureRequest", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "file", + "type" : "File", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "document", + "type" : "com.skribble.api.v2.client.Document", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "nextView", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/Overview/OverviewData.ivyClass b/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/Overview/OverviewData.ivyClass deleted file mode 100644 index 2d325c9..0000000 --- a/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/Overview/OverviewData.ivyClass +++ /dev/null @@ -1,12 +0,0 @@ -OverviewData #class -com.axonivy.connector.skribble.demo.Overview #namespace -signatureRequests List #field -signatureRequests PERSISTENT #fieldModifier -selectedSignatureRequest com.skribble.api.v2.client.SignatureRequest #field -selectedSignatureRequest PERSISTENT #fieldModifier -file File #field -file PERSISTENT #fieldModifier -document com.skribble.api.v2.client.Document #field -document PERSISTENT #fieldModifier -nextView String #field -nextView PERSISTENT #fieldModifier diff --git a/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/Overview/OverviewProcess.p.json b/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/Overview/OverviewProcess.p.json index 7d0d5ac..92a7552 100644 --- a/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/Overview/OverviewProcess.p.json +++ b/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/Overview/OverviewProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "1916EC2B0FB351D0", "kind" : "HTML_DIALOG", "config" : { @@ -10,10 +10,10 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "result" : { "params" : [ - { "name" : "nextView", "type" : "String" } + { "name" : "nextView", "type" : "String", "desc" : "" } ], "map" : { "result.nextView" : "in.nextView" @@ -24,7 +24,9 @@ "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f7", "to" : "f2" } + "connect" : [ + { "id" : "f7", "to" : "f2" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -41,7 +43,9 @@ "visual" : { "at" : { "x" : 96, "y" : 448 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", @@ -53,10 +57,10 @@ "type" : "HtmlDialogMethodStart", "name" : "downloadDocument(SignatureRequest)", "config" : { - "callSignature" : "downloadDocument", + "signature" : "downloadDocument", "input" : { "params" : [ - { "name" : "sr", "type" : "com.skribble.api.v2.client.SignatureRequest" } + { "name" : "sr", "type" : "com.skribble.api.v2.client.SignatureRequest", "desc" : "" } ], "map" : { "out.selectedSignatureRequest" : "param.sr" @@ -67,7 +71,9 @@ "visual" : { "at" : { "x" : 96, "y" : 352 } }, - "connect" : { "id" : "f19", "to" : "f18" } + "connect" : [ + { "id" : "f19", "to" : "f18" } + ] }, { "id" : "f9", "type" : "HtmlDialogEnd", @@ -83,25 +89,24 @@ ], "config" : { "processCall" : "API/Documents:getMetaData(String)", - "output" : { + "call" : { "map" : { - "out" : "in", - "out.document" : "result.document" + "param.documentId" : "in.selectedSignatureRequest.documentId" } }, - "call" : { - "params" : [ - { "name" : "documentId", "type" : "String" } - ], + "output" : { "map" : { - "param.documentId" : "in.selectedSignatureRequest.documentId" + "out" : "in", + "out.document" : "result.document" } } }, "visual" : { "at" : { "x" : 232, "y" : 352 } }, - "connect" : { "id" : "f21", "to" : "f20" } + "connect" : [ + { "id" : "f21", "to" : "f20" } + ] }, { "id" : "f20", "type" : "SubProcessCall", @@ -111,25 +116,24 @@ ], "config" : { "processCall" : "API/Documents:getContentDataAsFile(String)", - "output" : { + "call" : { "map" : { - "out" : "in", - "out.file" : "result.file" + "param.documentId" : "in.selectedSignatureRequest.documentId" } }, - "call" : { - "params" : [ - { "name" : "documentId", "type" : "String" } - ], + "output" : { "map" : { - "param.documentId" : "in.selectedSignatureRequest.documentId" + "out" : "in", + "out.file" : "result.file" } } }, "visual" : { "at" : { "x" : 416, "y" : 352 } }, - "connect" : { "id" : "f10", "to" : "f9" } + "connect" : [ + { "id" : "f10", "to" : "f9" } + ] }, { "id" : "f2", "type" : "SubProcessCall", @@ -139,18 +143,15 @@ ], "config" : { "processCall" : "API/SignatureRequest:getAll(com.axonivy.connector.skribble.signaturerequest.SignatureRequestSearchParameters)", - "output" : { + "call" : { "map" : { - "out" : "in", - "out.signatureRequests" : "result.signatureRequests" + "param.signatureRequestSearchParameters.created_by" : "ivy.var.get(\"skribbleConnector.username\")" } }, - "call" : { - "params" : [ - { "name" : "signatureRequestSearchParameters", "type" : "com.axonivy.connector.skribble.signaturerequest.SignatureRequestSearchParameters" } - ], + "output" : { "map" : { - "param.signatureRequestSearchParameters.created_by" : "ivy.var.get(\"skribbleConnector.username\")" + "out" : "in", + "out.signatureRequests" : "result.signatureRequests" } } }, @@ -158,16 +159,18 @@ "at" : { "x" : 383, "y" : 63 }, "size" : { "width" : 151, "height" : 55 } }, - "connect" : { "id" : "f22", "to" : "f1" } + "connect" : [ + { "id" : "f22", "to" : "f1" } + ] }, { "id" : "f23", "type" : "HtmlDialogMethodStart", "name" : "deleteSignerRequest(SignatureRequest)", "config" : { - "callSignature" : "deleteSignerRequest", + "signature" : "deleteSignerRequest", "input" : { "params" : [ - { "name" : "sr", "type" : "com.skribble.api.v2.client.SignatureRequest" } + { "name" : "sr", "type" : "com.skribble.api.v2.client.SignatureRequest", "desc" : "" } ], "map" : { "out.selectedSignatureRequest" : "param.sr" @@ -178,7 +181,9 @@ "visual" : { "at" : { "x" : 96, "y" : 240 } }, - "connect" : { "id" : "f27", "to" : "f26" } + "connect" : [ + { "id" : "f27", "to" : "f26" } + ] }, { "id" : "f26", "type" : "SubProcessCall", @@ -189,9 +194,6 @@ "config" : { "processCall" : "API/SignatureRequest:delete(com.skribble.api.v2.client.SignatureRequest)", "call" : { - "params" : [ - { "name" : "signatureRequest", "type" : "com.skribble.api.v2.client.SignatureRequest" } - ], "map" : { "param.signatureRequest" : "in.selectedSignatureRequest" } @@ -215,9 +217,11 @@ }, "visual" : { "at" : { "x" : 256, "y" : 240 }, - "size" : { "width" : 160, "height" : 60 } + "size" : { "width" : 160 } }, - "connect" : { "id" : "f11", "to" : "f2", "via" : [ { "x" : 383, "y" : 240 } ] } + "connect" : [ + { "id" : "f11", "to" : "f2", "via" : [ { "x" : 383, "y" : 240 } ] } + ] }, { "id" : "f6", "type" : "HtmlDialogEventStart", @@ -228,6 +232,8 @@ "visual" : { "at" : { "x" : 96, "y" : 160 } }, - "connect" : { "id" : "f15", "to" : "f2", "via" : [ { "x" : 383, "y" : 160 } ] } + "connect" : [ + { "id" : "f15", "to" : "f2", "via" : [ { "x" : 383, "y" : 160 } ] } + ] } ] } \ No newline at end of file diff --git a/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/SignRequest/SignRequest.rddescriptor b/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/SignRequest/SignRequest.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/SignRequest/SignRequest.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/SignRequest/SignRequestData.d.json b/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/SignRequest/SignRequestData.d.json new file mode 100644 index 0000000..ec998f6 --- /dev/null +++ b/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/SignRequest/SignRequestData.d.json @@ -0,0 +1,23 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "SignRequestData", + "namespace" : "com.axonivy.connector.skribble.demo.SignRequest", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "csr", + "type" : "com.skribble.api.v2.client.CreateSignatureRequest", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "fileUploadEvent", + "type" : "org.primefaces.event.FileUploadEvent", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "success", + "type" : "Boolean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "file", + "type" : "File", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/SignRequest/SignRequestData.ivyClass b/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/SignRequest/SignRequestData.ivyClass deleted file mode 100644 index 2a91b02..0000000 --- a/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/SignRequest/SignRequestData.ivyClass +++ /dev/null @@ -1,10 +0,0 @@ -SignRequestData #class -com.axonivy.connector.skribble.demo.SignRequest #namespace -csr com.skribble.api.v2.client.CreateSignatureRequest #field -csr PERSISTENT #fieldModifier -fileUploadEvent org.primefaces.event.FileUploadEvent #field -fileUploadEvent PERSISTENT #fieldModifier -success Boolean #field -success PERSISTENT #fieldModifier -file File #field -file PERSISTENT #fieldModifier diff --git a/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/SignRequest/SignRequestProcess.p.json b/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/SignRequest/SignRequestProcess.p.json index 0a82996..8ce7020 100644 --- a/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/SignRequest/SignRequestProcess.p.json +++ b/skribble-connector-demo/src_hd/com/axonivy/connector/skribble/demo/SignRequest/SignRequestProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "1918EA71B7CFD733", "kind" : "HTML_DIALOG", "config" : { @@ -10,13 +10,15 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "guid" : "1916EC2B0FDF2869" }, "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f6", "to" : "f2" } + "connect" : [ + { "id" : "f6", "to" : "f2" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -43,7 +45,9 @@ "visual" : { "at" : { "x" : 232, "y" : 64 } }, - "connect" : { "id" : "f7", "to" : "f1" } + "connect" : [ + { "id" : "f7", "to" : "f1" } + ] }, { "id" : "f8", "type" : "HtmlDialogEventStart", @@ -54,7 +58,9 @@ "visual" : { "at" : { "x" : 96, "y" : 152 } }, - "connect" : { "id" : "f10", "to" : "f9" } + "connect" : [ + { "id" : "f10", "to" : "f9" } + ] }, { "id" : "f9", "type" : "HtmlDialogEnd", @@ -71,7 +77,9 @@ "visual" : { "at" : { "x" : 96, "y" : 496 } }, - "connect" : { "id" : "f20", "to" : "f19" } + "connect" : [ + { "id" : "f20", "to" : "f19" } + ] }, { "id" : "f12", "type" : "HtmlDialogEnd", @@ -83,10 +91,10 @@ "type" : "HtmlDialogMethodStart", "name" : "uploadFile(FileUploadEvent)", "config" : { - "callSignature" : "uploadFile", + "signature" : "uploadFile", "input" : { "params" : [ - { "name" : "fileUploadEvent", "type" : "org.primefaces.event.FileUploadEvent" } + { "name" : "fileUploadEvent", "type" : "org.primefaces.event.FileUploadEvent", "desc" : "" } ], "map" : { "out.fileUploadEvent" : "param.fileUploadEvent" @@ -97,7 +105,9 @@ "visual" : { "at" : { "x" : 96, "y" : 408 } }, - "connect" : { "id" : "f18", "to" : "f17" } + "connect" : [ + { "id" : "f18", "to" : "f17" } + ] }, { "id" : "f15", "type" : "HtmlDialogEnd", @@ -133,7 +143,9 @@ "visual" : { "at" : { "x" : 232, "y" : 408 } }, - "connect" : { "id" : "f16", "to" : "f15" } + "connect" : [ + { "id" : "f16", "to" : "f15" } + ] }, { "id" : "f19", "type" : "Script", @@ -176,7 +188,9 @@ "visual" : { "at" : { "x" : 232, "y" : 496 } }, - "connect" : { "id" : "f13", "to" : "f12" } + "connect" : [ + { "id" : "f13", "to" : "f12" } + ] }, { "id" : "f41", "type" : "HtmlDialogEventStart", @@ -187,7 +201,9 @@ "visual" : { "at" : { "x" : 96, "y" : 256 } }, - "connect" : { "id" : "f33", "to" : "f25" } + "connect" : [ + { "id" : "f33", "to" : "f25" } + ] }, { "id" : "f22", "type" : "HtmlDialogEnd", @@ -204,9 +220,6 @@ "config" : { "processCall" : "API/SignatureRequest:create(com.skribble.api.v2.client.CreateSignatureRequest)", "call" : { - "params" : [ - { "name" : "createSignatureRequest", "type" : "com.skribble.api.v2.client.CreateSignatureRequest" } - ], "map" : { "param.createSignatureRequest" : "in.csr" } @@ -233,19 +246,26 @@ "visual" : { "at" : { "x" : 488, "y" : 256 } }, - "connect" : { "id" : "f23", "to" : "f22" } + "connect" : [ + { "id" : "f23", "to" : "f22" } + ] }, { "id" : "f5", "type" : "Alternative", "name" : "check ok?", + "config" : { + "conditions" : { + "f28" : "in.success" + } + }, "visual" : { "at" : { "x" : 360, "y" : 256 }, - "labelOffset" : { "x" : 16, "y" : -16 } + "labelOffset" : { "y" : -16 } }, "connect" : [ { "id" : "f28", "to" : "f24", "label" : { "name" : "yes" - }, "condition" : "in.success" }, + } }, { "id" : "f29", "to" : "f30", "label" : { "name" : "no" } } @@ -293,17 +313,20 @@ "visual" : { "at" : { "x" : 224, "y" : 256 } }, - "connect" : { "id" : "f26", "to" : "f5" } + "connect" : [ + { "id" : "f26", "to" : "f5" } + ] }, { "id" : "f31", "type" : "HtmlDialogMethodStart", "name" : "deleteSigner(CreateSignature)", "config" : { - "callSignature" : "deleteSigner", + "signature" : "deleteSigner", "input" : { "params" : [ - { "name" : "si", "type" : "com.skribble.api.v2.client.CreateSignature" } + { "name" : "si", "type" : "com.skribble.api.v2.client.CreateSignature", "desc" : "" } ], + "map" : { }, "code" : "out.csr.signatures.remove(param.si);" }, "guid" : "19192796A31DCE7D" @@ -311,7 +334,9 @@ "visual" : { "at" : { "x" : 96, "y" : 592 } }, - "connect" : { "id" : "f34", "to" : "f32" } + "connect" : [ + { "id" : "f34", "to" : "f32" } + ] }, { "id" : "f32", "type" : "HtmlDialogEnd", @@ -323,11 +348,12 @@ "type" : "HtmlDialogMethodStart", "name" : "updateEmail(CreateSignature)", "config" : { - "callSignature" : "updateEmail", + "signature" : "updateEmail", "input" : { "params" : [ - { "name" : "si", "type" : "com.skribble.api.v2.client.CreateSignature" } + { "name" : "si", "type" : "com.skribble.api.v2.client.CreateSignature", "desc" : "" } ], + "map" : { }, "code" : "param.si.accountEmail = param.si.signerIdentityData.emailAddress;" }, "guid" : "191929427C5DDFA0" @@ -335,7 +361,9 @@ "visual" : { "at" : { "x" : 96, "y" : 664 } }, - "connect" : { "id" : "f40", "to" : "f39" } + "connect" : [ + { "id" : "f40", "to" : "f39" } + ] }, { "id" : "f39", "type" : "HtmlDialogEnd", diff --git a/skribble-connector-demo/webContent/layouts/frame-10-full-width.xhtml b/skribble-connector-demo/webContent/layouts/frame-10-full-width.xhtml index 4e9479c..c2714dd 100644 --- a/skribble-connector-demo/webContent/layouts/frame-10-full-width.xhtml +++ b/skribble-connector-demo/webContent/layouts/frame-10-full-width.xhtml @@ -32,7 +32,7 @@ and refence it below in the head part. - +