From 9ee921e0aef1db565607040b3a98f0a4e66a0aea Mon Sep 17 00:00:00 2001 From: "AAVN\\pvquan" Date: Tue, 26 Nov 2024 14:01:35 +0700 Subject: [PATCH] MARP-1481 convert to Ivy 12 --- .github/workflows/ci.yml | 2 +- .github/workflows/dev.yml | 2 +- .github/workflows/release.yml | 2 +- pom.xml | 2 +- process-inspector-demo/.project | 124 +++++++++--------- process-inspector-demo/.settings/.jsdtscope | 12 -- .../.settings/ch.ivyteam.ivy.designer.prefs | 5 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 14 +- ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - process-inspector-demo/config/variables.yaml | 1 + .../utils/process/inspector/demo/Data.d.json | 6 + .../process/inspector/demo/Data.ivyClass | 2 - .../process/inspector/demo/DemoData.d.json | 11 ++ .../process/inspector/demo/DemoData.ivyClass | 4 - .../demo/FlowDemoSubProcessCallData.d.json | 6 + .../demo/FlowDemoSubProcessCallData.ivyClass | 2 - process-inspector-demo/pom.xml | 4 +- .../Analysis Processes/FlowDemoBasic.p.json | 12 +- .../FlowDemoSubProcessCall.p.json | 2 +- .../FlowParallelInOrder.p.json | 6 +- .../FlowSubProcessDemo.p.json | 2 +- .../processes/Start Processes/Demo.p.json | 2 +- .../inspector/demo/Dummy/Dummy.rddescriptor | 7 - .../inspector/demo/Dummy/DummyData.d.json | 6 + .../inspector/demo/Dummy/DummyData.ivyClass | 2 - .../inspector/demo/Dummy/DummyProcess.p.json | 2 +- .../ProcessInspectorTable.rddescriptor | 7 - .../ProcessInspectorTableData.d.json | 11 ++ .../ProcessInspectorTableData.ivyClass | 4 - .../ProcessInspectorTableProcess.p.json | 2 +- .../InspectorDetail.rddescriptor | 7 - .../InspectorDetailData.d.json | 15 +++ .../InspectorDetailData.ivyClass | 6 - .../InspectorDetailProcess.p.json | 2 +- .../InspectorSelection.rddescriptor | 7 - .../InspectorSelection.xhtml | 4 +- .../InspectorSelectionData.d.json | 15 +++ .../InspectorSelectionData.ivyClass | 6 - .../InspectorSelectionProcess.p.json | 2 +- .../layouts/frame-10-full-width.xhtml | 2 +- process-inspector-product/pom.xml | 2 +- process-inspector-test/.project | 124 +++++++++--------- process-inspector-test/.settings/.jsdtscope | 12 -- .../.settings/ch.ivyteam.ivy.designer.prefs | 5 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 14 +- ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - process-inspector-test/config/variables.yaml | 1 + .../utils/process/inspector/test/Data.d.json | 6 + .../process/inspector/test/Data.ivyClass | 2 - .../test/FlowMixedSubProcessData.d.json | 6 + .../test/FlowMixedSubProcessData.ivyClass | 2 - .../test/FlowSubProcessCall2Data.d.json | 6 + .../test/FlowSubProcessCall2Data.ivyClass | 2 - .../inspector/test/FlowTriggerCallData.d.json | 6 + .../test/FlowTriggerCallData.ivyClass | 2 - process-inspector-test/pom.xml | 6 +- .../processes/FlowExampleBasic.p.json | 6 +- .../processes/FlowExampleCommon.p.json | 2 +- .../processes/FlowExampleComplex.p.json | 10 +- .../processes/FlowExampleError.p.json | 6 +- .../processes/FlowExampleLoop.p.json | 6 +- .../processes/FlowMixedSubProcess.p.json | 4 +- .../processes/FlowParallelInOrder.p.json | 8 +- .../processes/FlowSubProcessCall.p.json | 2 +- .../processes/FlowSubprocess.p.json | 4 +- .../processes/FlowTriggerCall.p.json | 2 +- .../processes/ParallelTasksExample.p.json | 2 +- .../processes/TaskTypesExample.p.json | 2 +- .../inspector/test/Dummy/Dummy.rddescriptor | 7 - .../inspector/test/Dummy/DummyData.d.json | 6 + .../inspector/test/Dummy/DummyData.ivyClass | 2 - .../inspector/test/Dummy/DummyProcess.p.json | 2 +- .../webContent/layouts/basic-10.xhtml | 2 +- process-inspector/.classpath | 2 +- process-inspector/.project | 124 +++++++++--------- process-inspector/.settings/.jsdtscope | 12 -- .../.settings/ch.ivyteam.ivy.designer.prefs | 5 +- .../.settings/org.eclipse.jdt.core.prefs | 6 +- ....eclipse.wst.common.project.facet.core.xml | 14 +- ...rg.eclipse.wst.jsdt.ui.superType.container | 1 - .../org.eclipse.wst.jsdt.ui.superType.name | 1 - process-inspector/config/variables.yaml | 2 + process-inspector/pom.xml | 8 +- 87 files changed, 393 insertions(+), 397 deletions(-) delete mode 100644 process-inspector-demo/.settings/.jsdtscope delete mode 100644 process-inspector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 process-inspector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100644 process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/Data.d.json delete mode 100644 process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/Data.ivyClass create mode 100644 process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/DemoData.d.json delete mode 100644 process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/DemoData.ivyClass create mode 100644 process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/FlowDemoSubProcessCallData.d.json delete mode 100644 process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/FlowDemoSubProcessCallData.ivyClass delete mode 100644 process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/Dummy.rddescriptor create mode 100644 process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/DummyData.d.json delete mode 100644 process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/DummyData.ivyClass delete mode 100644 process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTable.rddescriptor create mode 100644 process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTableData.d.json delete mode 100644 process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTableData.ivyClass delete mode 100644 process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetail.rddescriptor create mode 100644 process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetailData.d.json delete mode 100644 process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetailData.ivyClass delete mode 100644 process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorSelection/InspectorSelection.rddescriptor create mode 100644 process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorSelection/InspectorSelectionData.d.json delete mode 100644 process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorSelection/InspectorSelectionData.ivyClass delete mode 100644 process-inspector-test/.settings/.jsdtscope delete mode 100644 process-inspector-test/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 process-inspector-test/.settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100644 process-inspector-test/dataclasses/com/axonivy/utils/process/inspector/test/Data.d.json delete mode 100644 process-inspector-test/dataclasses/com/axonivy/utils/process/inspector/test/Data.ivyClass create mode 100644 process-inspector-test/dataclasses/com/axonivy/utils/process/inspector/test/FlowMixedSubProcessData.d.json delete mode 100644 process-inspector-test/dataclasses/com/axonivy/utils/process/inspector/test/FlowMixedSubProcessData.ivyClass create mode 100644 process-inspector-test/dataclasses/com/axonivy/utils/process/inspector/test/FlowSubProcessCall2Data.d.json delete mode 100644 process-inspector-test/dataclasses/com/axonivy/utils/process/inspector/test/FlowSubProcessCall2Data.ivyClass create mode 100644 process-inspector-test/dataclasses/com/axonivy/utils/process/inspector/test/FlowTriggerCallData.d.json delete mode 100644 process-inspector-test/dataclasses/com/axonivy/utils/process/inspector/test/FlowTriggerCallData.ivyClass delete mode 100644 process-inspector-test/src_hd/com/axonivy/utils/process/inspector/test/Dummy/Dummy.rddescriptor create mode 100644 process-inspector-test/src_hd/com/axonivy/utils/process/inspector/test/Dummy/DummyData.d.json delete mode 100644 process-inspector-test/src_hd/com/axonivy/utils/process/inspector/test/Dummy/DummyData.ivyClass delete mode 100644 process-inspector/.settings/.jsdtscope delete mode 100644 process-inspector/.settings/org.eclipse.wst.jsdt.ui.superType.container delete mode 100644 process-inspector/.settings/org.eclipse.wst.jsdt.ui.superType.name create mode 100644 process-inspector/config/variables.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87d78f0d..bd4b9c46 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 c2fee378..ae5e6c34 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 ab5b0d75..bc801b4d 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 1df10c41..b7842910 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.axonivy.utils.process.inspector process-inspector process-inspector-modules - 11.2.7-SNAPSHOT + 12.0.0-SNAPSHOT pom diff --git a/process-inspector-demo/.project b/process-inspector-demo/.project index 898e1e86..830922d5 100644 --- a/process-inspector-demo/.project +++ b/process-inspector-demo/.project @@ -1,60 +1,64 @@ - - - process-inspector-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.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - 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 - org.eclipse.pde.PluginNature - - + + + process-inspector-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.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + 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.pde.PluginNature + + \ No newline at end of file diff --git a/process-inspector-demo/.settings/.jsdtscope b/process-inspector-demo/.settings/.jsdtscope deleted file mode 100644 index cf5ec79e..00000000 --- a/process-inspector-demo/.settings/.jsdtscope +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/process-inspector-demo/.settings/ch.ivyteam.ivy.designer.prefs b/process-inspector-demo/.settings/ch.ivyteam.ivy.designer.prefs index 60ce3e66..8a754553 100644 --- a/process-inspector-demo/.settings/ch.ivyteam.ivy.designer.prefs +++ b/process-inspector-demo/.settings/ch.ivyteam.ivy.designer.prefs @@ -1,5 +1,4 @@ -ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_DATA_CLASS=com.axonivy.utils.process.inspector.demo.Data ch.ivyteam.ivy.designer.preferences.DataClassPreferencePage\:DEFAULT_NAMESPACE=com.axonivy.utils.process.inspector.demo -ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=11 -ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=112000 +ch.ivyteam.ivy.project.preferences\:PRIMEFACES_VERSION=13 +ch.ivyteam.ivy.project.preferences\:PROJECT_VERSION=120001 eclipse.preferences.version=1 diff --git a/process-inspector-demo/.settings/org.eclipse.jdt.core.prefs b/process-inspector-demo/.settings/org.eclipse.jdt.core.prefs index f78f7f77..96641ff8 100644 --- a/process-inspector-demo/.settings/org.eclipse.jdt.core.prefs +++ b/process-inspector-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/process-inspector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml b/process-inspector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml index c2098f9c..621b1f83 100644 --- a/process-inspector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/process-inspector-demo/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -1,8 +1,6 @@ - - - - - - - - + + + + + + \ No newline at end of file diff --git a/process-inspector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container b/process-inspector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.container deleted file mode 100644 index 3bd5d0a4..00000000 --- a/process-inspector-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/process-inspector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name b/process-inspector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name deleted file mode 100644 index 05bd71b6..00000000 --- a/process-inspector-demo/.settings/org.eclipse.wst.jsdt.ui.superType.name +++ /dev/null @@ -1 +0,0 @@ -Window \ No newline at end of file diff --git a/process-inspector-demo/config/variables.yaml b/process-inspector-demo/config/variables.yaml index fd144582..c9573577 100644 --- a/process-inspector-demo/config/variables.yaml +++ b/process-inspector-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/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/Data.d.json b/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/Data.d.json new file mode 100644 index 00000000..66519db1 --- /dev/null +++ b/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/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.utils.process.inspector.demo", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/Data.ivyClass b/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/Data.ivyClass deleted file mode 100644 index 8af1180c..00000000 --- a/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/Data.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -Data #class -com.axonivy.utils.process.inspector.demo #namespace diff --git a/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/DemoData.d.json b/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/DemoData.d.json new file mode 100644 index 00000000..c7c23f41 --- /dev/null +++ b/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/DemoData.d.json @@ -0,0 +1,11 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "DemoData", + "namespace" : "com.axonivy.utils.process.inspector.demo", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "bean", + "type" : "com.axonivy.utils.process.inspector.demo.ProcessInspectorBean", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/DemoData.ivyClass b/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/DemoData.ivyClass deleted file mode 100644 index 1bb2b02e..00000000 --- a/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/DemoData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -DemoData #class -com.axonivy.utils.process.inspector.demo #namespace -bean com.axonivy.utils.process.inspector.demo.ProcessInspectorBean #field -bean PERSISTENT #fieldModifier diff --git a/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/FlowDemoSubProcessCallData.d.json b/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/FlowDemoSubProcessCallData.d.json new file mode 100644 index 00000000..69d339ad --- /dev/null +++ b/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/FlowDemoSubProcessCallData.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "FlowDemoSubProcessCallData", + "namespace" : "com.axonivy.utils.process.inspector.demo", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/FlowDemoSubProcessCallData.ivyClass b/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/FlowDemoSubProcessCallData.ivyClass deleted file mode 100644 index faab2544..00000000 --- a/process-inspector-demo/dataclasses/com/axonivy/utils/process/inspector/demo/FlowDemoSubProcessCallData.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -FlowDemoSubProcessCallData #class -com.axonivy.utils.process.inspector.demo #namespace diff --git a/process-inspector-demo/pom.xml b/process-inspector-demo/pom.xml index feeff388..8cd71e8e 100644 --- a/process-inspector-demo/pom.xml +++ b/process-inspector-demo/pom.xml @@ -3,10 +3,10 @@ 4.0.0 com.axonivy.utils.process.inspector process-inspector-demo - 11.2.7-SNAPSHOT + 12.0.0-SNAPSHOT iar - 11.3.0 + 12.0.0 diff --git a/process-inspector-demo/processes/Analysis Processes/FlowDemoBasic.p.json b/process-inspector-demo/processes/Analysis Processes/FlowDemoBasic.p.json index 71ce77e8..a6aeebff 100644 --- a/process-inspector-demo/processes/Analysis Processes/FlowDemoBasic.p.json +++ b/process-inspector-demo/processes/Analysis Processes/FlowDemoBasic.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18E180A64355D4D9", "config" : { "data" : "com.axonivy.utils.process.inspector.demo.Data", @@ -63,7 +63,7 @@ }, "visual" : { "at" : { "x" : 440, "y" : 64 }, - "labelOffset" : { "x" : 16, "y" : -16 } + "labelOffset" : { "y" : -16 } }, "connect" : [ { "id" : "f13", "to" : "f12", "label" : { @@ -81,7 +81,7 @@ "name" : "alter2", "visual" : { "at" : { "x" : 720, "y" : 64 }, - "labelOffset" : { "x" : 16, "y" : -16 } + "labelOffset" : { "y" : -16 } }, "connect" : [ { "id" : "f9", "to" : "f8" } @@ -92,7 +92,7 @@ "name" : "alter3", "visual" : { "at" : { "x" : 864, "y" : 64 }, - "labelOffset" : { "x" : 16, "y" : -16 } + "labelOffset" : { "y" : -16 } }, "connect" : [ { "id" : "f10", "to" : "f37" } @@ -139,9 +139,9 @@ "name" : "{internal}", "offset" : { "x" : -7, "y" : -2 } } }, - { "id" : "f21", "to" : "f20", "color" : "default path", "label" : { + { "id" : "f21", "to" : "f20", "label" : { "name" : "{external}" - } } + }, "color" : "default path" } ] }, { "id" : "f7", diff --git a/process-inspector-demo/processes/Analysis Processes/FlowDemoSubProcessCall.p.json b/process-inspector-demo/processes/Analysis Processes/FlowDemoSubProcessCall.p.json index ffde4daf..87cc6d35 100644 --- a/process-inspector-demo/processes/Analysis Processes/FlowDemoSubProcessCall.p.json +++ b/process-inspector-demo/processes/Analysis Processes/FlowDemoSubProcessCall.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18EEB6E309329524", "kind" : "CALLABLE_SUB", "config" : { diff --git a/process-inspector-demo/processes/Analysis Processes/FlowParallelInOrder.p.json b/process-inspector-demo/processes/Analysis Processes/FlowParallelInOrder.p.json index 02289cf6..6299f80f 100644 --- a/process-inspector-demo/processes/Analysis Processes/FlowParallelInOrder.p.json +++ b/process-inspector-demo/processes/Analysis Processes/FlowParallelInOrder.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18E3BEFFB97FCA4E", "config" : { "data" : "com.axonivy.utils.process.inspector.demo.Data" @@ -367,9 +367,9 @@ }, "connect" : [ { "id" : "f64", "to" : "f58", "via" : [ { "x" : 352, "y" : 344 } ] }, - { "id" : "f79", "to" : "f0", "color" : "default path", "label" : { + { "id" : "f79", "to" : "f0", "label" : { "name" : "{internal}" - } } + }, "color" : "default path" } ] }, { "id" : "f0", diff --git a/process-inspector-demo/processes/Analysis Processes/FlowSubProcessDemo.p.json b/process-inspector-demo/processes/Analysis Processes/FlowSubProcessDemo.p.json index e7cb6aac..9c858ec5 100644 --- a/process-inspector-demo/processes/Analysis Processes/FlowSubProcessDemo.p.json +++ b/process-inspector-demo/processes/Analysis Processes/FlowSubProcessDemo.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18E31D6BC0E4B857", "config" : { "data" : "com.axonivy.utils.process.inspector.demo.Data" diff --git a/process-inspector-demo/processes/Start Processes/Demo.p.json b/process-inspector-demo/processes/Start Processes/Demo.p.json index 5c7c9d50..a4e512f5 100644 --- a/process-inspector-demo/processes/Start Processes/Demo.p.json +++ b/process-inspector-demo/processes/Start Processes/Demo.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18E180F943F963D5", "config" : { "data" : "com.axonivy.utils.process.inspector.demo.DemoData" diff --git a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/Dummy.rddescriptor b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/Dummy.rddescriptor deleted file mode 100644 index ae605f0d..00000000 --- a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/Dummy.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/DummyData.d.json b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/DummyData.d.json new file mode 100644 index 00000000..869f02d7 --- /dev/null +++ b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/DummyData.d.json @@ -0,0 +1,6 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "DummyData", + "namespace" : "com.axonivy.utils.process.inspector.demo.Dummy", + "isBusinessCaseData" : false +} \ No newline at end of file diff --git a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/DummyData.ivyClass b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/DummyData.ivyClass deleted file mode 100644 index 2c664e2c..00000000 --- a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/DummyData.ivyClass +++ /dev/null @@ -1,2 +0,0 @@ -DummyData #class -com.axonivy.utils.process.inspector.demo.Dummy #namespace diff --git a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/DummyProcess.p.json b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/DummyProcess.p.json index 1b5ee431..a2454dbe 100644 --- a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/DummyProcess.p.json +++ b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/Dummy/DummyProcess.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18E7EA48B28E4A37", "kind" : "HTML_DIALOG", "config" : { diff --git a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTable.rddescriptor b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTable.rddescriptor deleted file mode 100644 index ae605f0d..00000000 --- a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTable.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTableData.d.json b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTableData.d.json new file mode 100644 index 00000000..a29545ed --- /dev/null +++ b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTableData.d.json @@ -0,0 +1,11 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "ProcessInspectorTableData", + "namespace" : "com.axonivy.utils.process.inspector.demo.ProcessInspectorTable", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "processInspectorBean", + "type" : "com.axonivy.utils.process.inspector.demo.ProcessInspectorBean", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTableData.ivyClass b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTableData.ivyClass deleted file mode 100644 index bbcc1f2e..00000000 --- a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTableData.ivyClass +++ /dev/null @@ -1,4 +0,0 @@ -ProcessInspectorTableData #class -com.axonivy.utils.process.inspector.demo.ProcessInspectorTable #namespace -processInspectorBean com.axonivy.utils.process.inspector.demo.ProcessInspectorBean #field -processInspectorBean PERSISTENT #fieldModifier diff --git a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTableProcess.p.json b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTableProcess.p.json index a9caa416..473478b2 100644 --- a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTableProcess.p.json +++ b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/ProcessInspectorTable/ProcessInspectorTableProcess.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18E18129A25A9EEC", "kind" : "HTML_DIALOG", "config" : { diff --git a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetail.rddescriptor b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetail.rddescriptor deleted file mode 100644 index ae605f0d..00000000 --- a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetail.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetailData.d.json b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetailData.d.json new file mode 100644 index 00000000..32e3a7b9 --- /dev/null +++ b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetailData.d.json @@ -0,0 +1,15 @@ +{ + "$schema" : "https://json-schema.axonivy.com/data-class/12.0.0/data-class.json", + "simpleName" : "InspectorDetailData", + "namespace" : "com.axonivy.utils.process.inspector.demo.component.InspectorDetail", + "isBusinessCaseData" : false, + "fields" : [ { + "name" : "processInspectorBean", + "type" : "com.axonivy.utils.process.inspector.demo.ProcessInspectorBean", + "modifiers" : [ "PERSISTENT" ] + }, { + "name" : "analyzer", + "type" : "com.axonivy.utils.process.inspector.demo.model.Analyzer", + "modifiers" : [ "PERSISTENT" ] + } ] +} \ No newline at end of file diff --git a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetailData.ivyClass b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetailData.ivyClass deleted file mode 100644 index 94980e2d..00000000 --- a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetailData.ivyClass +++ /dev/null @@ -1,6 +0,0 @@ -InspectorDetailData #class -com.axonivy.utils.process.inspector.demo.component.InspectorDetail #namespace -processInspectorBean com.axonivy.utils.process.inspector.demo.ProcessInspectorBean #field -processInspectorBean PERSISTENT #fieldModifier -analyzer com.axonivy.utils.process.inspector.demo.model.Analyzer #field -analyzer PERSISTENT #fieldModifier diff --git a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetailProcess.p.json b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetailProcess.p.json index 3d51141a..fa7cacca 100644 --- a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetailProcess.p.json +++ b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorDetail/InspectorDetailProcess.p.json @@ -1,5 +1,5 @@ { - "$schema" : "https://json-schema.axonivy.com/process/11.2.2/process.json", + "$schema" : "https://json-schema.axonivy.com/process/12.0.0/process.json", "id" : "18E3C233B54C77EA", "kind" : "HTML_DIALOG", "config" : { diff --git a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorSelection/InspectorSelection.rddescriptor b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorSelection/InspectorSelection.rddescriptor deleted file mode 100644 index ae605f0d..00000000 --- a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorSelection/InspectorSelection.rddescriptor +++ /dev/null @@ -1,7 +0,0 @@ - - - - viewTechnology - JSF - - diff --git a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorSelection/InspectorSelection.xhtml b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorSelection/InspectorSelection.xhtml index d7ca0d5a..d1d23299 100644 --- a/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorSelection/InspectorSelection.xhtml +++ b/process-inspector-demo/src_hd/com/axonivy/utils/process/inspector/demo/component/InspectorSelection/InspectorSelection.xhtml @@ -72,7 +72,7 @@ - - + - +