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 c2fee37..ae5e6c3 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -8,4 +8,4 @@ on: jobs: build: - uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v4 + uses: axonivy-market/github-workflows/.github/workflows/dev.yml@v5 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/adobe-acrobat-sign-connector-demo/.classpath b/adobe-acrobat-sign-connector-demo/.classpath index 45a97e4..8228714 100644 --- a/adobe-acrobat-sign-connector-demo/.classpath +++ b/adobe-acrobat-sign-connector-demo/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/adobe-acrobat-sign-connector-demo/.project b/adobe-acrobat-sign-connector-demo/.project index 6ebed12..f0a8284 100644 --- a/adobe-acrobat-sign-connector-demo/.project +++ b/adobe-acrobat-sign-connector-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.m2e.core.maven2Nature 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/adobe-acrobat-sign-connector-demo/.settings/.jsdtscope b/adobe-acrobat-sign-connector-demo/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/adobe-acrobat-sign-connector-demo/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/adobe-acrobat-sign-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/adobe-acrobat-sign-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs index 45275d5..68c8143 100644 --- a/adobe-acrobat-sign-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/adobe-acrobat-sign-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.connector.adobe.acrobat.sign.connector.demo.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.connector.adobe.acrobat.sign.connector.demo -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=100000 -eclipse.preferences.version=1 +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 +eclipse.preferences.version=1 \ No newline at end of file diff --git a/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.core.resources.prefs b/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.jdt.core.prefs b/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.jdt.core.prefs +++ b/adobe-acrobat-sign-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/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.wst.common.component b/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.wst.common.component index cc5722b..70b66ae 100644 --- a/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.wst.common.component +++ b/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.wst.common.component @@ -1,29 +1,10 @@ - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/adobe-acrobat-sign-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/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/adobe-acrobat-sign-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/adobe-acrobat-sign-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/adobe-acrobat-sign-connector-demo/config/variables.yaml b/adobe-acrobat-sign-connector-demo/config/variables.yaml index f33043b..41a117c 100644 --- a/adobe-acrobat-sign-connector-demo/config/variables.yaml +++ b/adobe-acrobat-sign-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. @@ -9,11 +10,13 @@ Variables: adobe-acrobat-sign-connector: host: api.eu2.adobesign.com returnPage: /designer/page/adobe-acrobat-sign-connector$1/signatureReturn.jsp - baseUri: https://api.eu2.adobesign.com/oauth/v2 + baseUri: https://api.eu2.adobesign.com/oauth/v2 authenticationUri: https://secure.eu2.adobesign.com/public/oauth/v2 clientId: '' clientSecret: '' - permissions: user_read:account user_write:account user_login:account agreement_read:account agreement_write:account agreement_send:account widget_read:account widget_write:account library_read:account library_write:account workflow_read:account workflow_write:account + permissions: user_read:account user_write:account user_login:account agreement_read:account + agreement_write:account agreement_send:account widget_read:account widget_write:account + library_read:account library_write:account workflow_read:account workflow_write:account oauthToken: default-value accessToken: default-value integrationKey: '' diff --git a/adobe-acrobat-sign-connector-demo/dataclasses/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Data.d.json b/adobe-acrobat-sign-connector-demo/dataclasses/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Data.d.json new file mode 100644 index 0000000..37c956b --- /dev/null +++ b/adobe-acrobat-sign-connector-demo/dataclasses/com/axonivy/connector/adobe/acrobat/sign/connector/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.adobe.acrobat.sign.connector.demo", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/adobe-acrobat-sign-connector-demo/dataclasses/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Data.ivyClass b/adobe-acrobat-sign-connector-demo/dataclasses/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Data.ivyClass deleted file mode 100644 index 71b7986..0000000 --- a/adobe-acrobat-sign-connector-demo/dataclasses/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -com.axonivy.connector.adobe.acrobat.sign.connector.demo #namespace diff --git a/adobe-acrobat-sign-connector-demo/dataclasses/com/axonivy/connector/adobe/acrobat/sign/connector/demo/DemoData.d.json b/adobe-acrobat-sign-connector-demo/dataclasses/com/axonivy/connector/adobe/acrobat/sign/connector/demo/DemoData.d.json new file mode 100644 index 0000000..c3af64f --- /dev/null +++ b/adobe-acrobat-sign-connector-demo/dataclasses/com/axonivy/connector/adobe/acrobat/sign/connector/demo/DemoData.d.json @@ -0,0 +1,19 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "DemoData", + "namespace" : "com.axonivy.connector.adobe.acrobat.sign.connector.demo", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "file", + "type" : "java.io.File" + }, { + "name" : "fileId", + "type" : "String" + }, { + "name" : "agreementId", + "type" : "String" + }, { + "name" : "error", + "type" : "ch.ivyteam.ivy.bpm.error.BpmError" + } ] +} \ No newline at end of file diff --git a/adobe-acrobat-sign-connector-demo/dataclasses/com/axonivy/connector/adobe/acrobat/sign/connector/demo/DemoData.ivyClass b/adobe-acrobat-sign-connector-demo/dataclasses/com/axonivy/connector/adobe/acrobat/sign/connector/demo/DemoData.ivyClass deleted file mode 100644 index 0f6cd86..0000000 --- a/adobe-acrobat-sign-connector-demo/dataclasses/com/axonivy/connector/adobe/acrobat/sign/connector/demo/DemoData.ivyClass +++ /dev/null @@ -1,6 +0,0 @@ -DemoData #class -com.axonivy.connector.adobe.acrobat.sign.connector.demo #namespace -file java.io.File #field -fileId String #field -agreementId String #field -error ch.ivyteam.ivy.bpm.error.BpmError #field diff --git a/adobe-acrobat-sign-connector-demo/pom.xml b/adobe-acrobat-sign-connector-demo/pom.xml index 97353c9..5db6375 100644 --- a/adobe-acrobat-sign-connector-demo/pom.xml +++ b/adobe-acrobat-sign-connector-demo/pom.xml @@ -3,10 +3,11 @@ 4.0.0 com.axonivy.connector.adobe.acrobat.sign adobe-acrobat-sign-connector-demo - 10.0.30-SNAPSHOT + 12.0.0-SNAPSHOT iar - 10.0.16 + 12.0.0 + UTF-8 diff --git a/adobe-acrobat-sign-connector-demo/processes/Demo.p.json b/adobe-acrobat-sign-connector-demo/processes/Demo.p.json index 38d9d8b..c94d782 100644 --- a/adobe-acrobat-sign-connector-demo/processes/Demo.p.json +++ b/adobe-acrobat-sign-connector-demo/processes/Demo.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18822E284E99FC6E", "config" : { "data" : "com.axonivy.connector.adobe.acrobat.sign.connector.demo.DemoData" @@ -9,26 +9,30 @@ "type" : "RequestStart", "name" : "demo.ivp", "config" : { - "callSignature" : "demo", - "outLink" : "demo.ivp", - "startName" : "<%=ivy.cms.co(\"/Dialogs/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/Demo\")%>" + "signature" : "demo", + "request" : { + "name" : "<%=ivy.cms.co(\"/Dialogs/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/Demo\")%>" + } }, "visual" : { "at" : { "x" : 96, "y" : 592 } }, - "connect" : { "id" : "f33", "to" : "f32" } + "connect" : [ + { "id" : "f33", "to" : "f32" } + ] }, { "id" : "f32", "type" : "DialogCall", "name" : "Demo", "config" : { - "dialogId" : "com.axonivy.connector.adobe.acrobat.sign.connector.demo.Demo", - "startMethod" : "start()" + "dialog" : "com.axonivy.connector.adobe.acrobat.sign.connector.demo.Demo:start()" }, "visual" : { "at" : { "x" : 288, "y" : 592 } }, - "connect" : { "id" : "f35", "to" : "f34" } + "connect" : [ + { "id" : "f35", "to" : "f34" } + ] }, { "id" : "f34", "type" : "TaskEnd", diff --git a/adobe-acrobat-sign-connector-demo/src_hd/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/Demo.rddescriptor b/adobe-acrobat-sign-connector-demo/src_hd/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/Demo.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/adobe-acrobat-sign-connector-demo/src_hd/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/Demo.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/adobe-acrobat-sign-connector-demo/src_hd/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/DemoData.d.json b/adobe-acrobat-sign-connector-demo/src_hd/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/DemoData.d.json new file mode 100644 index 0000000..5b5db70 --- /dev/null +++ b/adobe-acrobat-sign-connector-demo/src_hd/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/DemoData.d.json @@ -0,0 +1,55 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "DemoData", + "namespace" : "com.axonivy.connector.adobe.acrobat.sign.connector.demo.Demo", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "file", + "type" : "File", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "documentId", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "agreementId", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "signingURI", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "signer1", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "signer2", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "authoringURI", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "documents", + "type" : "api.rest.v6.client.AgreementDocuments" + }, { + "name" : "documentContent", + "type" : "org.primefaces.model.StreamedContent" + }, { + "name" : "download", + "type" : "com.axonivy.connector.adobe.acrobat.sign.connector.rest.DownloadResult" + }, { + "name" : "filename", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "documentIds", + "type" : "java.util.List", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "files", + "type" : "java.util.List" + } ] +} \ No newline at end of file diff --git a/adobe-acrobat-sign-connector-demo/src_hd/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/DemoData.ivyClass b/adobe-acrobat-sign-connector-demo/src_hd/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/DemoData.ivyClass deleted file mode 100644 index ad692d0..0000000 --- a/adobe-acrobat-sign-connector-demo/src_hd/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/DemoData.ivyClass +++ /dev/null @@ -1,28 +0,0 @@ -DemoData #class -com.axonivy.connector.adobe.acrobat.sign.connector.demo.Demo #namespace -file File #field -file PERSISTENT #fieldModifier -documentId String #field -documentId PERSISTENT #fieldModifier -agreementId String #field -agreementId PERSISTENT #fieldModifier -signingURI String #field -signingURI PERSISTENT #fieldModifier -signer1 String #field -signer1 PERSISTENT #fieldModifier -signer2 String #field -signer2 PERSISTENT #fieldModifier -authoringURI String #field -authoringURI PERSISTENT #fieldModifier -documents api.rest.v6.client.AgreementDocuments #field -documents PERSISTENT #fieldModifier -documentContent org.primefaces.model.StreamedContent #field -documentContent PERSISTENT #fieldModifier -download com.axonivy.connector.adobe.acrobat.sign.connector.rest.DownloadResult #field -download PERSISTENT #fieldModifier -filename String #field -filename PERSISTENT #fieldModifier -documentIds java.util.List #field -documentIds PERSISTENT #fieldModifier -files java.util.List #field -files PERSISTENT #fieldModifier diff --git a/adobe-acrobat-sign-connector-demo/src_hd/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/DemoProcess.p.json b/adobe-acrobat-sign-connector-demo/src_hd/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/DemoProcess.p.json index 9b89da7..9fe7f7a 100644 --- a/adobe-acrobat-sign-connector-demo/src_hd/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/DemoProcess.p.json +++ b/adobe-acrobat-sign-connector-demo/src_hd/com/axonivy/connector/adobe/acrobat/sign/connector/demo/Demo/DemoProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "1886B1A625EA901A", "kind" : "HTML_DIALOG", "config" : { @@ -10,13 +10,15 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "guid" : "1886B1A62614A9F5" }, "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -33,7 +35,9 @@ "visual" : { "at" : { "x" : 96, "y" : 160 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", @@ -50,7 +54,9 @@ "visual" : { "at" : { "x" : 96, "y" : 248 } }, - "connect" : { "id" : "f51", "to" : "f11" } + "connect" : [ + { "id" : "f51", "to" : "f11" } + ] }, { "id" : "f7", "type" : "HtmlDialogEnd", @@ -63,52 +69,50 @@ "name" : "upload documents", "config" : { "processCall" : "connector/TransientDocuments:uploadDocuments(java.util.List)", - "output" : { + "call" : { "map" : { - "out" : "in", - "out.documentIds" : "result.ids" + "param.files" : "in.files" } }, - "call" : { - "params" : [ - { "name" : "files", "type" : "java.util.List" } - ], + "output" : { "map" : { - "param.files" : "in.files" + "out" : "in", + "out.documentIds" : "result.ids" } } }, "visual" : { "at" : { "x" : 384, "y" : 248 } }, - "connect" : { "id" : "f14", "to" : "f13" } + "connect" : [ + { "id" : "f14", "to" : "f13" } + ] }, { "id" : "f13", "type" : "SubProcessCall", "name" : "create agreement", "config" : { "processCall" : "connector/Agreements:createAgreement(api.rest.v6.client.AgreementCreationInfo)", - "output" : { - "map" : { - "out" : "in", - "out.agreementId" : "result.agreementInfo.id" - } - }, "call" : { - "params" : [ - { "name" : "agreement", "type" : "api.rest.v6.client.AgreementCreationInfo" } - ], "map" : { "param.agreement" : "com.axonivy.connector.adobe.acrobat.sign.connector.service.AdobeSignService.getInstance().buildSimpleAgreementWithFormFields(\"1SignerDemo\", in.documentIds, in.signer1, null)", "param.agreement.senderSigns" : "api.rest.v6.client.AgreementCreationInfo.SenderSignsEnum.NEVER", "param.agreement.signatureType" : "api.rest.v6.client.AgreementCreationInfo.SignatureTypeEnum.ESIGN" } + }, + "output" : { + "map" : { + "out" : "in", + "out.agreementId" : "result.agreementInfo.id" + } } }, "visual" : { "at" : { "x" : 552, "y" : 248 } }, - "connect" : { "id" : "f39", "to" : "f38" } + "connect" : [ + { "id" : "f39", "to" : "f38" } + ] }, { "id" : "f15", "type" : "HtmlDialogEventStart", @@ -119,7 +123,9 @@ "visual" : { "at" : { "x" : 96, "y" : 504 } }, - "connect" : { "id" : "f19", "to" : "f18" } + "connect" : [ + { "id" : "f19", "to" : "f18" } + ] }, { "id" : "f16", "type" : "HtmlDialogEnd", @@ -133,13 +139,9 @@ "config" : { "processCall" : "connector/Agreements:getSigningURLs(String,String)", "call" : { - "params" : [ - { "name" : "agreementId", "type" : "String" }, - { "name" : "frameParent", "type" : "String" } - ], "map" : { "param.agreementId" : "in.agreementId", - "param.frameParent" : "ivy.html.applicationHomeRef()" + "param.frameParent" : "ivy.html.applicationHomeLink().getAbsolute()" } }, "output" : { @@ -149,7 +151,9 @@ "visual" : { "at" : { "x" : 224, "y" : 504 } }, - "connect" : { "id" : "f17", "to" : "f16" } + "connect" : [ + { "id" : "f17", "to" : "f16" } + ] }, { "id" : "f20", "type" : "HtmlDialogEventStart", @@ -160,79 +164,79 @@ "visual" : { "at" : { "x" : 96, "y" : 344 } }, - "connect" : { "id" : "f9", "to" : "f23" } + "connect" : [ + { "id" : "f9", "to" : "f23" } + ] }, { "id" : "f23", "type" : "SubProcessCall", "name" : "upload document", "config" : { "processCall" : "connector/TransientDocuments:uploadDocuments(java.util.List)", - "output" : { + "call" : { "map" : { - "out" : "in", - "out.documentIds" : "result.ids" + "param.files" : "in.files" } }, - "call" : { - "params" : [ - { "name" : "files", "type" : "java.util.List" } - ], + "output" : { "map" : { - "param.files" : "in.files" + "out" : "in", + "out.documentIds" : "result.ids" } } }, "visual" : { "at" : { "x" : 384, "y" : 344 } }, - "connect" : { "id" : "f48", "to" : "f47" } + "connect" : [ + { "id" : "f48", "to" : "f47" } + ] }, { "id" : "f38", "type" : "SubProcessCall", "name" : "get documents", "config" : { "processCall" : "connector/Agreements:getDocuments(String)", - "output" : { + "call" : { "map" : { - "out" : "in", - "out.documents" : "result.documents" + "param.agreementId" : "in.agreementId" } }, - "call" : { - "params" : [ - { "name" : "agreementId", "type" : "String" } - ], + "output" : { "map" : { - "param.agreementId" : "in.agreementId" + "out" : "in", + "out.documents" : "result.documents" } } }, "visual" : { "at" : { "x" : 792, "y" : 248 } }, - "connect" : { "id" : "f10", "to" : "f7" } + "connect" : [ + { "id" : "f10", "to" : "f7" } + ] }, { "id" : "f40", "type" : "HtmlDialogMethodStart", "name" : "downloadDocument(String,String)", "config" : { - "callSignature" : "downloadDocument", - "result" : { + "signature" : "downloadDocument", + "input" : { "params" : [ - { "name" : "file", "type" : "org.primefaces.model.StreamedContent" } + { "name" : "documentId", "type" : "String", "desc" : "" }, + { "name" : "filename", "type" : "String", "desc" : "" } ], "map" : { - "result.file" : "in.documentContent" + "out.documentId" : "param.documentId", + "out.filename" : "param.filename" } }, - "input" : { + "result" : { "params" : [ - { "name" : "documentId", "type" : "String" }, - { "name" : "filename", "type" : "String" } + { "name" : "file", "type" : "org.primefaces.model.StreamedContent", "desc" : "" } ], "map" : { - "out.documentId" : "param.documentId", - "out.filename" : "param.filename" + "result.file" : "in.documentContent" } }, "guid" : "188B93A5550422ED" @@ -240,7 +244,9 @@ "visual" : { "at" : { "x" : 96, "y" : 592 } }, - "connect" : { "id" : "f44", "to" : "f43" } + "connect" : [ + { "id" : "f44", "to" : "f43" } + ] }, { "id" : "f41", "type" : "HtmlDialogEnd", @@ -254,12 +260,6 @@ "config" : { "processCall" : "connector/Agreements:dowloadDocument(String,String,String,Boolean)", "call" : { - "params" : [ - { "name" : "agreementId", "type" : "String" }, - { "name" : "documentId", "type" : "String" }, - { "name" : "filename", "type" : "String" }, - { "name" : "asFile", "type" : "Boolean" } - ], "map" : { "param.agreementId" : "in.agreementId", "param.documentId" : "in.documentId", @@ -277,7 +277,9 @@ "visual" : { "at" : { "x" : 224, "y" : 592 } }, - "connect" : { "id" : "f42", "to" : "f41" } + "connect" : [ + { "id" : "f42", "to" : "f41" } + ] }, { "id" : "f45", "type" : "HtmlDialogEventStart", @@ -288,32 +290,33 @@ "visual" : { "at" : { "x" : 664, "y" : 144 } }, - "connect" : { "id" : "f46", "to" : "f38" } + "connect" : [ + { "id" : "f46", "to" : "f38" } + ] }, { "id" : "f47", "type" : "SubProcessCall", "name" : "create agreement", "config" : { "processCall" : "connector/Agreements:createAgreement(api.rest.v6.client.AgreementCreationInfo)", - "output" : { + "call" : { "map" : { - "out" : "in", - "out.agreementId" : "result.agreementInfo.id" + "param.agreement" : "com.axonivy.connector.adobe.acrobat.sign.connector.service.AdobeSignService.getInstance().buildSimpleAgreementFor2SignerGroups(\"2SignerDemo\", in.documentIds, [in.signer1], [in.signer2])" } }, - "call" : { - "params" : [ - { "name" : "agreement", "type" : "api.rest.v6.client.AgreementCreationInfo" } - ], + "output" : { "map" : { - "param.agreement" : "com.axonivy.connector.adobe.acrobat.sign.connector.service.AdobeSignService.getInstance().buildSimpleAgreementFor2SignerGroups(\"2SignerDemo\", in.documentIds, [in.signer1], [in.signer2])" + "out" : "in", + "out.agreementId" : "result.agreementInfo.id" } } }, "visual" : { "at" : { "x" : 552, "y" : 344 } }, - "connect" : { "id" : "f33", "to" : "f38" } + "connect" : [ + { "id" : "f33", "to" : "f38" } + ] }, { "id" : "f21", "type" : "HtmlDialogEventStart", @@ -324,7 +327,9 @@ "visual" : { "at" : { "x" : 424, "y" : 504 } }, - "connect" : { "id" : "f26", "to" : "f25" } + "connect" : [ + { "id" : "f26", "to" : "f25" } + ] }, { "id" : "f24", "type" : "HtmlDialogEnd", @@ -338,13 +343,9 @@ "config" : { "processCall" : "connector/Agreements:getSigningURLs(String,String)", "call" : { - "params" : [ - { "name" : "agreementId", "type" : "String" }, - { "name" : "frameParent", "type" : "String" } - ], "map" : { "param.agreementId" : "in.agreementId", - "param.frameParent" : "ivy.html.applicationHomeRef()" + "param.frameParent" : "ivy.html.applicationHomeLink().getAbsolute()" } }, "output" : { @@ -354,17 +355,20 @@ "visual" : { "at" : { "x" : 552, "y" : 504 } }, - "connect" : { "id" : "f29", "to" : "f24" } + "connect" : [ + { "id" : "f29", "to" : "f24" } + ] }, { "id" : "f27", "type" : "HtmlDialogMethodStart", "name" : "handleFilesUpload(FilesUploadEvent)", "config" : { - "callSignature" : "handleFilesUpload", + "signature" : "handleFilesUpload", "input" : { "params" : [ - { "name" : "event", "type" : "org.primefaces.event.FilesUploadEvent" } + { "name" : "event", "type" : "org.primefaces.event.FilesUploadEvent", "desc" : "" } ], + "map" : { }, "code" : [ "import org.primefaces.model.file.UploadedFile;", " ", @@ -381,7 +385,9 @@ "visual" : { "at" : { "x" : 96, "y" : 776 } }, - "connect" : { "id" : "f36", "to" : "f30" } + "connect" : [ + { "id" : "f36", "to" : "f30" } + ] }, { "id" : "f30", "type" : "HtmlDialogEnd", @@ -393,11 +399,12 @@ "type" : "HtmlDialogMethodStart", "name" : "deleteFile(File)", "config" : { - "callSignature" : "deleteFile", + "signature" : "deleteFile", "input" : { "params" : [ - { "name" : "file", "type" : "java.io.File" } + { "name" : "file", "type" : "java.io.File", "desc" : "" } ], + "map" : { }, "code" : "out.files.remove(param.file);" }, "guid" : "18B7119BB46F06C5" @@ -405,7 +412,9 @@ "visual" : { "at" : { "x" : 96, "y" : 856 } }, - "connect" : { "id" : "f50", "to" : "f49" } + "connect" : [ + { "id" : "f50", "to" : "f49" } + ] }, { "id" : "f49", "type" : "HtmlDialogEnd", @@ -425,11 +434,6 @@ "config" : { "processCall" : "connector/Agreements:dowloadCombinedDocument(String,Boolean,String)", "call" : { - "params" : [ - { "name" : "agreementId", "type" : "String" }, - { "name" : "asFile", "type" : "Boolean" }, - { "name" : "filename", "type" : "String" } - ], "map" : { "param.agreementId" : "in.agreementId", "param.asFile" : "true", @@ -446,31 +450,35 @@ "visual" : { "at" : { "x" : 224, "y" : 688 } }, - "connect" : { "id" : "f52", "to" : "f34" } + "connect" : [ + { "id" : "f52", "to" : "f34" } + ] }, { "id" : "f8", "type" : "HtmlDialogMethodStart", "name" : "downloadCombinedDocument()", "config" : { - "callSignature" : "downloadCombinedDocument", + "signature" : "downloadCombinedDocument", + "input" : { + "map" : { + "out.filename" : "\"combined.pdf\"" + } + }, "result" : { "params" : [ - { "name" : "file", "type" : "org.primefaces.model.StreamedContent" } + { "name" : "file", "type" : "org.primefaces.model.StreamedContent", "desc" : "" } ], "map" : { "result.file" : "in.documentContent" } }, - "input" : { - "map" : { - "out.filename" : "\"combined.pdf\"" - } - }, "guid" : "18B809A45A478B92" }, "visual" : { "at" : { "x" : 96, "y" : 688 } }, - "connect" : { "id" : "f12", "to" : "f35" } + "connect" : [ + { "id" : "f12", "to" : "f35" } + ] } ] } \ No newline at end of file diff --git a/adobe-acrobat-sign-connector-demo/webContent/layouts/frame-10-full-width.xhtml b/adobe-acrobat-sign-connector-demo/webContent/layouts/frame-10-full-width.xhtml index 768d89e..e92e01a 100644 --- a/adobe-acrobat-sign-connector-demo/webContent/layouts/frame-10-full-width.xhtml +++ b/adobe-acrobat-sign-connector-demo/webContent/layouts/frame-10-full-width.xhtml @@ -32,7 +32,7 @@ and refence it below in the head part. - +