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 b0097df..88d1d54 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -8,5 +8,5 @@ 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/pom.xml b/pom.xml index 9e51463..30c7cc0 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.axonivy.connector.salesforce salesforce-connector salesforce-connector-modules - 10.0.18-SNAPSHOT + 12.0.0-SNAPSHOT pom diff --git a/salesforce-connector-demo/.classpath b/salesforce-connector-demo/.classpath index 45a97e4..8228714 100644 --- a/salesforce-connector-demo/.classpath +++ b/salesforce-connector-demo/.classpath @@ -5,12 +5,7 @@ - - - - - - + diff --git a/salesforce-connector-demo/.project b/salesforce-connector-demo/.project index b8adfa3..4efccce 100644 --- a/salesforce-connector-demo/.project +++ b/salesforce-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/salesforce-connector-demo/.settings/.jsdtscope b/salesforce-connector-demo/.settings/.jsdtscope deleted file mode 100644 index 869c01d..0000000 --- a/salesforce-connector-demo/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/salesforce-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/salesforce-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs index 7b4c031..e5ff4be 100644 --- a/salesforce-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/salesforce-connector-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=salesforce.connector.demo.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=salesforce.connector.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/salesforce-connector-demo/.settings/org.eclipse.jdt.core.prefs b/salesforce-connector-demo/.settings/org.eclipse.jdt.core.prefs index d4540a5..3a79233 100644 --- a/salesforce-connector-demo/.settings/org.eclipse.jdt.core.prefs +++ b/salesforce-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/salesforce-connector-demo/.settings/org.eclipse.wst.common.component b/salesforce-connector-demo/.settings/org.eclipse.wst.common.component index e017937..8d00b3e 100644 --- a/salesforce-connector-demo/.settings/org.eclipse.wst.common.component +++ b/salesforce-connector-demo/.settings/org.eclipse.wst.common.component @@ -2,10 +2,9 @@ - - + \ No newline at end of file diff --git a/salesforce-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/salesforce-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml index 156ecdb..621b1f8 100644 --- a/salesforce-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/salesforce-connector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - + - - + \ No newline at end of file diff --git a/salesforce-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/salesforce-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a..0000000 --- a/salesforce-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/salesforce-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/salesforce-connector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b..0000000 --- a/salesforce-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/salesforce-connector-demo/config/variables.yaml b/salesforce-connector-demo/config/variables.yaml index 64c8fa0..4448394 100644 --- a/salesforce-connector-demo/config/variables.yaml +++ b/salesforce-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/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/Data.d.json b/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/Data.d.json new file mode 100644 index 0000000..a0f6d32 --- /dev/null +++ b/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/Data.d.json @@ -0,0 +1,20 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "Data", + "namespace" : "com.axonivy.connector.salesforce", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "opps", + "type" : "java.util.List" + }, { + "name" : "id", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "acc", + "type" : "com.axonivy.connector.salesforce.model.Account" + }, { + "name" : "accs", + "type" : "java.util.List" + } ] +} \ No newline at end of file diff --git a/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/Data.ivyClass b/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/Data.ivyClass deleted file mode 100644 index a2daf06..0000000 --- a/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/Data.ivyClass +++ /dev/null @@ -1,7 +0,0 @@ -Data #class -com.axonivy.connector.salesforce #namespace -opps java.util.List #field -id String #field -id PERSISTENT #fieldModifier -acc com.axonivy.connector.salesforce.model.Account #field -accs java.util.List #field diff --git a/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/FindAllEventByOpportunityIdData.d.json b/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/FindAllEventByOpportunityIdData.d.json new file mode 100644 index 0000000..d9bd308 --- /dev/null +++ b/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/FindAllEventByOpportunityIdData.d.json @@ -0,0 +1,13 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "FindAllEventByOpportunityIdData", + "namespace" : "com.axonivy.connector.salesforce", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "events", + "type" : "java.util.List" + }, { + "name" : "oppId", + "type" : "String" + } ] +} \ No newline at end of file diff --git a/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/FindAllEventByOpportunityIdData.ivyClass b/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/FindAllEventByOpportunityIdData.ivyClass deleted file mode 100644 index b16c5bd..0000000 --- a/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/FindAllEventByOpportunityIdData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -FindAllEventByOpportunityIdData #class -com.axonivy.connector.salesforce #namespace -events java.util.List #field -oppId String #field diff --git a/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/FindAllTaskByOpportunityIdData.d.json b/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/FindAllTaskByOpportunityIdData.d.json new file mode 100644 index 0000000..4797b60 --- /dev/null +++ b/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/FindAllTaskByOpportunityIdData.d.json @@ -0,0 +1,13 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "FindAllTaskByOpportunityIdData", + "namespace" : "com.axonivy.connector.salesforce", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "tasks", + "type" : "java.util.List" + }, { + "name" : "oppId", + "type" : "String" + } ] +} \ No newline at end of file diff --git a/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/FindAllTaskByOpportunityIdData.ivyClass b/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/FindAllTaskByOpportunityIdData.ivyClass deleted file mode 100644 index e81e479..0000000 --- a/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/FindAllTaskByOpportunityIdData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -FindAllTaskByOpportunityIdData #class -com.axonivy.connector.salesforce #namespace -tasks java.util.List #field -oppId String #field diff --git a/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/GetOppotunityData.d.json b/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/GetOppotunityData.d.json new file mode 100644 index 0000000..2fb2c1d --- /dev/null +++ b/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/GetOppotunityData.d.json @@ -0,0 +1,13 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "GetOppotunityData", + "namespace" : "com.axonivy.connector.salesforce", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "opp", + "type" : "com.axonivy.connector.salesforce.model.Opportunity" + }, { + "name" : "id", + "type" : "String" + } ] +} \ No newline at end of file diff --git a/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/GetOppotunityData.ivyClass b/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/GetOppotunityData.ivyClass deleted file mode 100644 index 2072cb3..0000000 --- a/salesforce-connector-demo/dataclasses/com/axonivy/connector/salesforce/GetOppotunityData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -GetOppotunityData #class -com.axonivy.connector.salesforce #namespace -opp com.axonivy.connector.salesforce.model.Opportunity #field -id String #field diff --git a/salesforce-connector-demo/dataclasses/salesforce/connector/demo/waitData.d.json b/salesforce-connector-demo/dataclasses/salesforce/connector/demo/waitData.d.json new file mode 100644 index 0000000..27fc290 --- /dev/null +++ b/salesforce-connector-demo/dataclasses/salesforce/connector/demo/waitData.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "waitData", + "namespace" : "salesforce.connector.demo", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/salesforce-connector-demo/pom.xml b/salesforce-connector-demo/pom.xml index 0450f12..bf40276 100644 --- a/salesforce-connector-demo/pom.xml +++ b/salesforce-connector-demo/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.axonivy.connector.salesforce salesforce-connector-demo - 10.0.18-SNAPSHOT + 12.0.0-SNAPSHOT iar - 10.0.16 + 12.0.0 diff --git a/salesforce-connector-demo/processes/ChartDemo.p.json b/salesforce-connector-demo/processes/ChartDemo.p.json index 026c15c..b35864e 100644 --- a/salesforce-connector-demo/processes/ChartDemo.p.json +++ b/salesforce-connector-demo/processes/ChartDemo.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18C19135AC79638F", "config" : { "data" : "com.axonivy.connector.salesforce.Data" @@ -9,13 +9,14 @@ "type" : "RequestStart", "name" : "start.ivp", "config" : { - "callSignature" : "start", - "outLink" : "start.ivp" + "signature" : "start" }, "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f3", "to" : "f2" } + "connect" : [ + { "id" : "f3", "to" : "f2" } + ] }, { "id" : "f1", "type" : "TaskEnd", @@ -27,21 +28,22 @@ "type" : "UserTask", "name" : "ChartDemo", "config" : { - "dialogId" : "salesforce.connector.demo.Chart", - "startMethod" : "start()", - "case" : { - "name" : "ChartDemo", - "description" : "Chart Demo" - }, + "dialog" : "salesforce.connector.demo.Chart:start()", "task" : { "name" : "ChartDemo", "description" : "Chart Demo", "skipTasklist" : true + }, + "case" : { + "name" : "ChartDemo", + "description" : "Chart Demo" } }, "visual" : { "at" : { "x" : 288, "y" : 64 } }, - "connect" : { "id" : "f4", "to" : "f1" } + "connect" : [ + { "id" : "f4", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/salesforce-connector-demo/processes/Functional Processes/findAllEventByOpportunityId.p.json b/salesforce-connector-demo/processes/Functional Processes/findAllEventByOpportunityId.p.json index e9c27e9..b815cec 100644 --- a/salesforce-connector-demo/processes/Functional Processes/findAllEventByOpportunityId.p.json +++ b/salesforce-connector-demo/processes/Functional Processes/findAllEventByOpportunityId.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18C19E836CE959F3", "kind" : "CALLABLE_SUB", "config" : { @@ -10,10 +10,10 @@ "type" : "CallSubStart", "name" : "findEvent(String)", "config" : { - "callSignature" : "findEvent", + "signature" : "findEvent", "input" : { "params" : [ - { "name" : "oppId", "type" : "String" } + { "name" : "oppId", "type" : "String", "desc" : "" } ], "map" : { "out.oppId" : "param.oppId" @@ -21,7 +21,7 @@ }, "result" : { "params" : [ - { "name" : "events", "type" : "java.util.List" } + { "name" : "events", "type" : "java.util.List", "desc" : "" } ], "map" : { "result.events" : "in.events" @@ -31,7 +31,9 @@ "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "CallSubEnd", @@ -43,13 +45,11 @@ "type" : "SubProcessCall", "name" : "QueryService", "config" : { + "processCall" : "QueryService:call(String)", "call" : { - "params" : [ - { "name" : "query", "type" : "String" } - ], + "map" : { }, "code" : "param.query = \"Select FIELDS(ALL) from Event where WhatId='\"+ in.oppId +\"' LIMIT 200\";" }, - "processCall" : "QueryService:call(String)", "output" : { "code" : [ "import com.axonivy.connector.salesforce.utils.ConvertUtils;", @@ -61,6 +61,8 @@ "visual" : { "at" : { "x" : 264, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/salesforce-connector-demo/processes/Functional Processes/findAllTaskByOpportunityId.p.json b/salesforce-connector-demo/processes/Functional Processes/findAllTaskByOpportunityId.p.json index 10d683c..f4b94df 100644 --- a/salesforce-connector-demo/processes/Functional Processes/findAllTaskByOpportunityId.p.json +++ b/salesforce-connector-demo/processes/Functional Processes/findAllTaskByOpportunityId.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18C19E6F2ADC725A", "kind" : "CALLABLE_SUB", "config" : { @@ -10,10 +10,10 @@ "type" : "CallSubStart", "name" : "findTask(String)", "config" : { - "callSignature" : "findTask", + "signature" : "findTask", "input" : { "params" : [ - { "name" : "oppId", "type" : "String" } + { "name" : "oppId", "type" : "String", "desc" : "" } ], "map" : { "out.oppId" : "param.oppId" @@ -21,7 +21,7 @@ }, "result" : { "params" : [ - { "name" : "tasks", "type" : "java.util.List" } + { "name" : "tasks", "type" : "java.util.List", "desc" : "" } ], "map" : { "result.tasks" : "in.tasks" @@ -31,7 +31,9 @@ "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "CallSubEnd", @@ -43,13 +45,11 @@ "type" : "SubProcessCall", "name" : "QueryService", "config" : { + "processCall" : "QueryService:call(String)", "call" : { - "params" : [ - { "name" : "query", "type" : "String" } - ], + "map" : { }, "code" : "param.query = \"Select FIELDS(ALL) from Task where WhatId='\"+ in.oppId +\"' LIMIT 200\";" }, - "processCall" : "QueryService:call(String)", "output" : { "code" : [ "import com.axonivy.connector.salesforce.utils.ConvertUtils;", @@ -61,6 +61,8 @@ "visual" : { "at" : { "x" : 264, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/salesforce-connector-demo/processes/Functional Processes/getAccount.p.json b/salesforce-connector-demo/processes/Functional Processes/getAccount.p.json index a5ba848..fb2300b 100644 --- a/salesforce-connector-demo/processes/Functional Processes/getAccount.p.json +++ b/salesforce-connector-demo/processes/Functional Processes/getAccount.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18BB792E496189BE", "kind" : "CALLABLE_SUB", "config" : { @@ -10,10 +10,10 @@ "type" : "CallSubStart", "name" : "getAccount(String)", "config" : { - "callSignature" : "getAccount", + "signature" : "getAccount", "input" : { "params" : [ - { "name" : "id", "type" : "String" } + { "name" : "id", "type" : "String", "desc" : "" } ], "map" : { "out.id" : "param.id" @@ -21,7 +21,7 @@ }, "result" : { "params" : [ - { "name" : "acc", "type" : "com.axonivy.connector.salesforce.model.Account" } + { "name" : "acc", "type" : "com.axonivy.connector.salesforce.model.Account", "desc" : "" } ], "map" : { "result.acc" : "in.acc" @@ -31,7 +31,9 @@ "visual" : { "at" : { "x" : 184, "y" : 224 } }, - "connect" : { "id" : "f1", "to" : "f0" } + "connect" : [ + { "id" : "f1", "to" : "f0" } + ] }, { "id" : "f5", "type" : "CallSubEnd", @@ -44,24 +46,23 @@ "name" : "GetAccService", "config" : { "processCall" : "GetAccService:call(String)", - "output" : { + "call" : { "map" : { - "out" : "in", - "out.acc" : "result.acc" + "param.id" : "in.id" } }, - "call" : { - "params" : [ - { "name" : "id", "type" : "String" } - ], + "output" : { "map" : { - "param.id" : "in.id" + "out" : "in", + "out.acc" : "result.acc" } } }, "visual" : { "at" : { "x" : 376, "y" : 224 } }, - "connect" : { "id" : "f2", "to" : "f5" } + "connect" : [ + { "id" : "f2", "to" : "f5" } + ] } ] } \ No newline at end of file diff --git a/salesforce-connector-demo/processes/Functional Processes/getAccounts.p.json b/salesforce-connector-demo/processes/Functional Processes/getAccounts.p.json index 07f3efc..ec1a110 100644 --- a/salesforce-connector-demo/processes/Functional Processes/getAccounts.p.json +++ b/salesforce-connector-demo/processes/Functional Processes/getAccounts.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18BF4F8754BA3BE2", "kind" : "CALLABLE_SUB", "config" : { @@ -10,10 +10,10 @@ "type" : "CallSubStart", "name" : "getAllAccounts()", "config" : { - "callSignature" : "getAllAccounts", + "signature" : "getAllAccounts", "result" : { "params" : [ - { "name" : "accs", "type" : "java.util.List" } + { "name" : "accs", "type" : "java.util.List", "desc" : "" } ], "map" : { "result.accs" : "in.accs" @@ -23,7 +23,9 @@ "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "CallSubEnd", @@ -35,13 +37,11 @@ "type" : "SubProcessCall", "name" : "QueryService", "config" : { + "processCall" : "QueryService:call(String)", "call" : { - "params" : [ - { "name" : "query", "type" : "String" } - ], + "map" : { }, "code" : "param.query = ivy.html.escape(\"Select FIELDS(ALL) from Account LIMIT 200\");" }, - "processCall" : "QueryService:call(String)", "output" : { "code" : [ "import com.axonivy.connector.salesforce.utils.ConvertUtils;", @@ -52,6 +52,8 @@ "visual" : { "at" : { "x" : 256, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/salesforce-connector-demo/processes/Functional Processes/getAllOpps.p.json b/salesforce-connector-demo/processes/Functional Processes/getAllOpps.p.json index 15c7bc0..c997ea9 100644 --- a/salesforce-connector-demo/processes/Functional Processes/getAllOpps.p.json +++ b/salesforce-connector-demo/processes/Functional Processes/getAllOpps.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18BEBE0550975A33", "kind" : "CALLABLE_SUB", "config" : { @@ -10,10 +10,10 @@ "type" : "CallSubStart", "name" : "getAllOpps()", "config" : { - "callSignature" : "getAllOpps", + "signature" : "getAllOpps", "result" : { "params" : [ - { "name" : "opps", "type" : "java.util.List" } + { "name" : "opps", "type" : "java.util.List", "desc" : "" } ], "map" : { "result.opps" : "in.opps" @@ -23,7 +23,9 @@ "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f3", "to" : "f2" } + "connect" : [ + { "id" : "f3", "to" : "f2" } + ] }, { "id" : "f1", "type" : "CallSubEnd", @@ -35,13 +37,11 @@ "type" : "SubProcessCall", "name" : "QueryService", "config" : { + "processCall" : "QueryService:call(String)", "call" : { - "params" : [ - { "name" : "query", "type" : "String" } - ], + "map" : { }, "code" : "param.query = ivy.html.escape(\"Select FIELDS(ALL) from Opportunity LIMIT 200\");" }, - "processCall" : "QueryService:call(String)", "output" : { "code" : [ "import com.axonivy.connector.salesforce.utils.ConvertUtils;", @@ -52,6 +52,8 @@ "visual" : { "at" : { "x" : 272, "y" : 64 } }, - "connect" : { "id" : "f4", "to" : "f1" } + "connect" : [ + { "id" : "f4", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/salesforce-connector-demo/processes/Functional Processes/getOpportunity.p.json b/salesforce-connector-demo/processes/Functional Processes/getOpportunity.p.json index b7382ec..3dd316a 100644 --- a/salesforce-connector-demo/processes/Functional Processes/getOpportunity.p.json +++ b/salesforce-connector-demo/processes/Functional Processes/getOpportunity.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18BB87D903C86664", "kind" : "CALLABLE_SUB", "config" : { @@ -10,10 +10,10 @@ "type" : "CallSubStart", "name" : "getOpportunity(String)", "config" : { - "callSignature" : "getOpportunity", + "signature" : "getOpportunity", "input" : { "params" : [ - { "name" : "id", "type" : "String" } + { "name" : "id", "type" : "String", "desc" : "" } ], "map" : { "out.id" : "param.id" @@ -21,7 +21,7 @@ }, "result" : { "params" : [ - { "name" : "opp", "type" : "com.axonivy.connector.salesforce.model.Opportunity" } + { "name" : "opp", "type" : "com.axonivy.connector.salesforce.model.Opportunity", "desc" : "" } ], "map" : { "result.opp" : "in.opp" @@ -31,7 +31,9 @@ "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f4", "to" : "f3" } + "connect" : [ + { "id" : "f4", "to" : "f3" } + ] }, { "id" : "f1", "type" : "CallSubEnd", @@ -44,24 +46,23 @@ "name" : "GetOppService", "config" : { "processCall" : "GetOppService:call(String)", - "output" : { + "call" : { "map" : { - "out" : "in", - "out.opp" : "result.opportunity" + "param.id" : "in.id" } }, - "call" : { - "params" : [ - { "name" : "id", "type" : "String" } - ], + "output" : { "map" : { - "param.id" : "in.id" + "out" : "in", + "out.opp" : "result.opportunity" } } }, "visual" : { "at" : { "x" : 272, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/salesforce-connector-demo/processes/Functional Processes/wait.p.json b/salesforce-connector-demo/processes/Functional Processes/wait.p.json new file mode 100644 index 0000000..8128bf2 --- /dev/null +++ b/salesforce-connector-demo/processes/Functional Processes/wait.p.json @@ -0,0 +1,29 @@ +{ + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", + "id" : "1938689FC62956B2", + "kind" : "CALLABLE_SUB", + "config" : { + "data" : "salesforce.connector.demo.waitData" + }, + "elements" : [ { + "id" : "f0", + "type" : "CallSubStart", + "name" : "call()", + "config" : { + "signature" : "call" + }, + "visual" : { + "at" : { "x" : 96, "y" : 64 } + }, + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] + }, { + "id" : "f1", + "type" : "CallSubEnd", + "visual" : { + "at" : { "x" : 352, "y" : 64 }, + "labelOffset" : { "x" : 13, "y" : 33 } + } + } ] +} \ No newline at end of file diff --git a/salesforce-connector-demo/processes/ListDemo.p.json b/salesforce-connector-demo/processes/ListDemo.p.json index b19798b..9bae2b4 100644 --- a/salesforce-connector-demo/processes/ListDemo.p.json +++ b/salesforce-connector-demo/processes/ListDemo.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18BB73FF80B2F1D9", "config" : { "data" : "com.axonivy.connector.salesforce.Data" @@ -9,13 +9,14 @@ "type" : "RequestStart", "name" : "start.ivp", "config" : { - "callSignature" : "start", - "outLink" : "start.ivp" + "signature" : "start" }, "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f3", "to" : "f5" } + "connect" : [ + { "id" : "f3", "to" : "f5" } + ] }, { "id" : "f1", "type" : "TaskEnd", @@ -27,21 +28,22 @@ "type" : "UserTask", "name" : "ListOpps", "config" : { - "dialogId" : "salesforce.connector.demo.ListOpps", - "startMethod" : "start()", - "case" : { - "name" : "Opportunities", - "description" : "List Opportunities" - }, + "dialog" : "salesforce.connector.demo.ListOpps:start()", "task" : { "name" : "Opportunities", "description" : "List Opportunities", "skipTasklist" : true + }, + "case" : { + "name" : "Opportunities", + "description" : "List Opportunities" } }, "visual" : { "at" : { "x" : 272, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] } ] } \ No newline at end of file diff --git a/salesforce-connector-demo/src_hd/salesforce/connector/demo/Chart/Chart.rddescriptor b/salesforce-connector-demo/src_hd/salesforce/connector/demo/Chart/Chart.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/salesforce-connector-demo/src_hd/salesforce/connector/demo/Chart/Chart.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/salesforce-connector-demo/src_hd/salesforce/connector/demo/Chart/ChartData.d.json b/salesforce-connector-demo/src_hd/salesforce/connector/demo/Chart/ChartData.d.json new file mode 100644 index 0000000..92369ae --- /dev/null +++ b/salesforce-connector-demo/src_hd/salesforce/connector/demo/Chart/ChartData.d.json @@ -0,0 +1,11 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "ChartData", + "namespace" : "salesforce.connector.demo.Chart", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "bean", + "type" : "com.axonivy.connector.salesforce.ChartBean", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/salesforce-connector-demo/src_hd/salesforce/connector/demo/Chart/ChartData.ivyClass b/salesforce-connector-demo/src_hd/salesforce/connector/demo/Chart/ChartData.ivyClass deleted file mode 100644 index 10cb5d4..0000000 --- a/salesforce-connector-demo/src_hd/salesforce/connector/demo/Chart/ChartData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -ChartData #class -salesforce.connector.demo.Chart #namespace -bean com.axonivy.connector.salesforce.ChartBean #field -bean PERSISTENT #fieldModifier diff --git a/salesforce-connector-demo/src_hd/salesforce/connector/demo/Chart/ChartProcess.p.json b/salesforce-connector-demo/src_hd/salesforce/connector/demo/Chart/ChartProcess.p.json index 7732028..ca527bf 100644 --- a/salesforce-connector-demo/src_hd/salesforce/connector/demo/Chart/ChartProcess.p.json +++ b/salesforce-connector-demo/src_hd/salesforce/connector/demo/Chart/ChartProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18C191426FF13FE2", "kind" : "HTML_DIALOG", "config" : { @@ -10,8 +10,9 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "input" : { + "map" : { }, "code" : [ "import com.axonivy.connector.salesforce.ChartBean;", "", @@ -23,7 +24,9 @@ "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -40,7 +43,9 @@ "visual" : { "at" : { "x" : 96, "y" : 160 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", diff --git a/salesforce-connector-demo/src_hd/salesforce/connector/demo/ListOpps/ListOpps.rddescriptor b/salesforce-connector-demo/src_hd/salesforce/connector/demo/ListOpps/ListOpps.rddescriptor deleted file mode 100644 index ae605f0..0000000 --- a/salesforce-connector-demo/src_hd/salesforce/connector/demo/ListOpps/ListOpps.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/salesforce-connector-demo/src_hd/salesforce/connector/demo/ListOpps/ListOppsData.d.json b/salesforce-connector-demo/src_hd/salesforce/connector/demo/ListOpps/ListOppsData.d.json new file mode 100644 index 0000000..5bf3d45 --- /dev/null +++ b/salesforce-connector-demo/src_hd/salesforce/connector/demo/ListOpps/ListOppsData.d.json @@ -0,0 +1,15 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "ListOppsData", + "namespace" : "salesforce.connector.demo.ListOpps", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "bean", + "type" : "com.axonivy.connector.salesforce.ListOppsBean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "id", + "type" : "String", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/salesforce-connector-demo/src_hd/salesforce/connector/demo/ListOpps/ListOppsData.ivyClass b/salesforce-connector-demo/src_hd/salesforce/connector/demo/ListOpps/ListOppsData.ivyClass deleted file mode 100644 index 74f4f77..0000000 --- a/salesforce-connector-demo/src_hd/salesforce/connector/demo/ListOpps/ListOppsData.ivyClass +++ /dev/null @@ -1,6 +0,0 @@ -ListOppsData #class -salesforce.connector.demo.ListOpps #namespace -bean com.axonivy.connector.salesforce.ListOppsBean #field -bean PERSISTENT #fieldModifier -id String #field -id PERSISTENT #fieldModifier diff --git a/salesforce-connector-demo/src_hd/salesforce/connector/demo/ListOpps/ListOppsProcess.p.json b/salesforce-connector-demo/src_hd/salesforce/connector/demo/ListOpps/ListOppsProcess.p.json index b2abc77..3301341 100644 --- a/salesforce-connector-demo/src_hd/salesforce/connector/demo/ListOpps/ListOppsProcess.p.json +++ b/salesforce-connector-demo/src_hd/salesforce/connector/demo/ListOpps/ListOppsProcess.p.json @@ -1,5 +1,5 @@ { - "format" : "10.0.0", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18BB743AA45B474E", "kind" : "HTML_DIALOG", "config" : { @@ -10,8 +10,9 @@ "type" : "HtmlDialogStart", "name" : "start()", "config" : { - "callSignature" : "start", + "signature" : "start", "input" : { + "map" : { }, "code" : [ "import com.axonivy.connector.salesforce.ListOppsBean;", "", @@ -23,7 +24,9 @@ "visual" : { "at" : { "x" : 96, "y" : 64 } }, - "connect" : { "id" : "f2", "to" : "f1" } + "connect" : [ + { "id" : "f2", "to" : "f1" } + ] }, { "id" : "f1", "type" : "HtmlDialogEnd", @@ -40,7 +43,9 @@ "visual" : { "at" : { "x" : 96, "y" : 160 } }, - "connect" : { "id" : "f5", "to" : "f4" } + "connect" : [ + { "id" : "f5", "to" : "f4" } + ] }, { "id" : "f4", "type" : "HtmlDialogExit", @@ -52,31 +57,30 @@ "type" : "HtmlDialogMethodStart", "name" : "save()", "config" : { - "callSignature" : "save", + "signature" : "save", "guid" : "18BEBBEEF1B67B0D" }, "visual" : { "at" : { "x" : 96, "y" : 280 } }, - "connect" : { "id" : "f14", "to" : "f13" } + "connect" : [ + { "id" : "f14", "to" : "f13" } + ] }, { "id" : "f7", "type" : "SubProcessCall", "name" : "AddOppService", "config" : { "processCall" : "AddOppService:call(com.axonivy.connector.salesforce.model.Opportunity)", - "output" : { + "call" : { "map" : { - "out" : "in", - "out.bean.selectedOpp.id" : "result.opp.id" + "param.opportunity" : "in.bean.selectedOpp" } }, - "call" : { - "params" : [ - { "name" : "oppotunity", "type" : "com.axonivy.connector.salesforce.model.Opportunity" } - ], + "output" : { "map" : { - "param.opportunity" : "in.bean.selectedOpp" + "out" : "in", + "out.bean.selectedOpp.id" : "result.opp.id" } } }, @@ -89,9 +93,13 @@ "visual" : { "at" : { "x" : 416, "y" : 320 } }, - "connect" : { "id" : "f25", "to" : "f9", "via" : [ { "x" : 672, "y" : 320 } ] } + "connect" : [ + { "id" : "f25", "to" : "f9", "via" : [ { "x" : 672, "y" : 320 } ] } + ] } ], - "connect" : { "id" : "f12", "to" : "f11" } + "connect" : [ + { "id" : "f12", "to" : "f11" } + ] }, { "id" : "f9", "type" : "HtmlDialogEnd", @@ -119,7 +127,9 @@ "visual" : { "at" : { "x" : 544, "y" : 280 } }, - "connect" : { "id" : "f10", "to" : "f9" } + "connect" : [ + { "id" : "f10", "to" : "f9" } + ] }, { "id" : "f13", "type" : "Script", @@ -132,19 +142,23 @@ "visual" : { "at" : { "x" : 224, "y" : 280 } }, - "connect" : { "id" : "f8", "to" : "f7" } + "connect" : [ + { "id" : "f8", "to" : "f7" } + ] }, { "id" : "f15", "type" : "HtmlDialogMethodStart", "name" : "update()", "config" : { - "callSignature" : "update", + "signature" : "update", "guid" : "18BF5BD97C43B688" }, "visual" : { "at" : { "x" : 88, "y" : 416 } }, - "connect" : { "id" : "f21", "to" : "f20" } + "connect" : [ + { "id" : "f21", "to" : "f20" } + ] }, { "id" : "f17", "type" : "HtmlDialogEnd", @@ -158,10 +172,6 @@ "config" : { "processCall" : "UpdateOppService:call(String,com.axonivy.connector.salesforce.model.OpportunityUpdateDTO)", "call" : { - "params" : [ - { "name" : "id", "type" : "String" }, - { "name" : "opportunityUpdateDTO", "type" : "com.axonivy.connector.salesforce.model.OpportunityUpdateDTO" } - ], "map" : { "param.id" : "in.bean.selectedOpp.id", "param.opportunityUpdateDTO" : "in.bean.updateDTO" @@ -177,9 +187,13 @@ "visual" : { "at" : { "x" : 456, "y" : 456 } }, - "connect" : { "id" : "f27", "to" : "f17", "via" : [ { "x" : 712, "y" : 456 } ] } + "connect" : [ + { "id" : "f27", "to" : "f17", "via" : [ { "x" : 712, "y" : 456 } ] } + ] } ], - "connect" : { "id" : "f23", "to" : "f22" } + "connect" : [ + { "id" : "f23", "to" : "f22" } + ] }, { "id" : "f20", "type" : "Script", @@ -192,7 +206,9 @@ "visual" : { "at" : { "x" : 224, "y" : 416 } }, - "connect" : { "id" : "f18", "to" : "f16" } + "connect" : [ + { "id" : "f18", "to" : "f16" } + ] }, { "id" : "f22", "type" : "Script", @@ -205,16 +221,18 @@ "visual" : { "at" : { "x" : 584, "y" : 416 } }, - "connect" : { "id" : "f19", "to" : "f17" } + "connect" : [ + { "id" : "f19", "to" : "f17" } + ] }, { "id" : "f28", "type" : "HtmlDialogMethodStart", "name" : "delete(String)", "config" : { - "callSignature" : "delete", + "signature" : "delete", "input" : { "params" : [ - { "name" : "id", "type" : "String" } + { "name" : "id", "type" : "String", "desc" : "" } ], "map" : { "out.id" : "param.id" @@ -225,7 +243,9 @@ "visual" : { "at" : { "x" : 88, "y" : 544 } }, - "connect" : { "id" : "f36", "to" : "f35" } + "connect" : [ + { "id" : "f36", "to" : "f35" } + ] }, { "id" : "f29", "type" : "SubProcessCall", @@ -233,9 +253,6 @@ "config" : { "processCall" : "DeleteOppService:call(String)", "call" : { - "params" : [ - { "name" : "id", "type" : "String" } - ], "map" : { "param.id" : "in.id" } @@ -250,9 +267,13 @@ "visual" : { "at" : { "x" : 448, "y" : 584 } }, - "connect" : { "id" : "f38", "to" : "f31", "via" : [ { "x" : 720, "y" : 584 } ] } + "connect" : [ + { "id" : "f38", "to" : "f31", "via" : [ { "x" : 720, "y" : 584 } ] } + ] } ], - "connect" : { "id" : "f34", "to" : "f33" } + "connect" : [ + { "id" : "f34", "to" : "f33" } + ] }, { "id" : "f31", "type" : "HtmlDialogEnd", @@ -271,7 +292,9 @@ "visual" : { "at" : { "x" : 600, "y" : 544 } }, - "connect" : { "id" : "f32", "to" : "f31" } + "connect" : [ + { "id" : "f32", "to" : "f31" } + ] }, { "id" : "f35", "type" : "Script", @@ -284,6 +307,8 @@ "visual" : { "at" : { "x" : 224, "y" : 544 } }, - "connect" : { "id" : "f30", "to" : "f29" } + "connect" : [ + { "id" : "f30", "to" : "f29" } + ] } ] } \ No newline at end of file diff --git a/salesforce-connector-demo/webContent/layouts/basic-10.xhtml b/salesforce-connector-demo/webContent/layouts/basic-10.xhtml index 1c84682..b4a3258 100644 --- a/salesforce-connector-demo/webContent/layouts/basic-10.xhtml +++ b/salesforce-connector-demo/webContent/layouts/basic-10.xhtml @@ -27,7 +27,7 @@ and refence it below in the head part. - + diff --git a/salesforce-connector-demo/webContent/layouts/frame-10.xhtml b/salesforce-connector-demo/webContent/layouts/frame-10.xhtml index 602c286..afe4063 100644 --- a/salesforce-connector-demo/webContent/layouts/frame-10.xhtml +++ b/salesforce-connector-demo/webContent/layouts/frame-10.xhtml @@ -32,7 +32,7 @@ and refence it below in the head part. - +