WFE 13.3.0 (autocommit)

optimajet · Aug 7, 2024 · b913eb5 · b913eb5
1 parent dfc33b6
commit b913eb5
Show file tree

Hide file tree

Showing 111 changed files with 413 additions and 362 deletions.
diff --git a/Designer/templates/transition.html b/Designer/templates/transition.html
@@ -363,7 +363,7 @@ <h4 v-if="FormData.IsFork && FormData.SubprocessInOutDefinition == 'Auto'" class
       </el-form-item>
     </div>
 
-    <el-form-item v-if="expertMode" :label="labels.SubprocessSpecifiedParameters" :readonly="readonly">
+    <el-form-item v-if="expertMode" :readonly="readonly">
       <el-checkbox v-model="FormData.DisableParentStateControl" :disabled="readonly" :label="labels.DisableParentStateControl"
                    name="type"></el-checkbox>
     </el-form-item>

diff --git a/Designer/workflowdesigner.min.js b/Designer/workflowdesigner.min.js
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,25 @@
+<Project>
+  <!-- Version -->
+  <PropertyGroup>
+    <Version>13.3.0</Version>
+    <AssemblyVersion>13.3.0</AssemblyVersion>
+    <FileVersion>13.3.0</FileVersion>
+  </PropertyGroup>
+  <!-- Build -->
+  <PropertyGroup>
+    <LangVersion>12</LangVersion>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+  <!-- Nuget -->
+  <PropertyGroup>
+    <Company>Optimajet Limited</Company>
+    <Product>Workflow Engine</Product>
+    <Authors>Optimajet Limited</Authors>
+    <Copyright>OptimaJet Workflow Engine 2024</Copyright>
+    <PackageProjectUrl>https://workflowengine.io</PackageProjectUrl>
+    <PackageReleaseNotes>https://workflowengine.io/documentation/release-notes/workflow-engine/</PackageReleaseNotes>
+    <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
+    <PackageIconUrl>https://workflowengine.io/images/favicons/favicon.ico</PackageIconUrl>
+    <RepositoryUrl>https://github.com/optimajet/WorkflowEngine.NET</RepositoryUrl>
+  </PropertyGroup>
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,88 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <!-- Common -->
+  <ItemGroup>
+    <PackageVersion Include="ConfigureAwait.Fody" Version="3.3.1" />
+    <PackageVersion Include="Fody" Version="6.6.3" />
+    <PackageVersion Include="WorkflowEngine.NETCore-Core" Version="13.3.0" />
+    <PackageVersion Include="WorkflowEngine.NETCore-Migrator" Version="13.3.0" />
+  </ItemGroup>
+  <!-- Plugins -->
+  <ItemGroup>
+    <!-- ActiveDirectoryPlugin-->
+    <PackageVersion Include="Novell.Directory.Ldap.NETStandard" Version="3.6.0" />
+    <PackageVersion Include="System.DirectoryServices" Version="7.0.1" />
+    <!-- FilesPlugin -->
+    <PackageVersion Include="FluentFTP" Version="32.4.3" />
+    <PackageVersion Include="SharpZipLib" Version="1.4.2" />
+    <PackageVersion Include="SSH.NET" Version="2020.0.2" />
+    <!-- NexmoPlugin -->
+    <PackageVersion Include="Nexmo.Csharp.Client" Version="5.1.0" />
+    <!-- SlackPlugin -->
+    <PackageVersion Include="SlackAPI" Version="1.1.13" />
+    <!-- TelegramPlugin -->
+    <PackageVersion Include="TLSharp" Version="0.1.0.555" />
+    <!-- TwilioPlugin -->
+    <PackageVersion Include="Twilio" Version="5.45.1" />
+  </ItemGroup>
+  <!-- Core -->
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.1.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="1.1.1" />
+    <PackageVersion Include="System.Collections.Specialized" Version="4.3.0" />
+    <PackageVersion Include="System.Security.Cryptography.Csp" Version="4.3.0" />
+    <PackageVersion Include="System.Xml.XmlDocument" Version="4.3.0" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="ThomasLevesque.WeakEvent" Version="4.1.0" />
+  </ItemGroup>
+  <!-- Providers -->
+  <ItemGroup>
+    <PackageVersion Include="FluentMigrator" Version="5.2.0" />
+    <PackageVersion Include="FluentMigrator.Runner" Version="5.2.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.0" />
+    <PackageVersion Include="MongoDB.Driver.signed" Version="2.19.0" />
+    <PackageVersion Include="FluentMigrator.Runner.MySql" Version="5.2.0" />
+    <PackageVersion Include="MySql.Data" Version="8.0.30" />
+    <PackageVersion Include="FluentMigrator.Runner.Oracle" Version="5.2.0" />
+    <PackageVersion Include="Oracle.ManagedDataAccess.Core" Version="3.21.100" />
+    <PackageVersion Include="FluentMigrator.Runner.Postgres" Version="5.2.0" />
+    <PackageVersion Include="Npgsql" Version="8.0.3" />
+    <PackageVersion Include="FluentMigrator.Runner.SQLite" Version="5.2.0" />
+  </ItemGroup>
+  <!-- EFSchema -->
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.5.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.5" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.5" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
+    <PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.40" />
+    <PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
+  </ItemGroup>
+  <!-- Tests -->
+  <ItemGroup>
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageVersion Include="MSTest.TestAdapter" Version="3.2.1" />
+    <PackageVersion Include="MSTest.TestFramework" Version="3.2.1" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+    <!-- RealTimeTrackingPlugin -->
+    <PackageVersion Include="Moq" Version="4.20.70" />
+    <!-- Tests -->
+    <PackageVersion Include="Bogus" Version="35.5.1" />
+    <PackageVersion Include="Microsoft.VisualStudio.Threading" Version="17.2.32" />
+    <PackageVersion Include="System.Diagnostics.Debug" Version="4.3.0" />
+    <PackageVersion Include="coverlet.collector" Version="3.1.0" />
+    <PackageVersion Include="System.Data.SQLite" Version="1.0.115.5" />
+    <!-- Test.Common -->
+    <PackageVersion Include="Testcontainers" Version="3.7.0" />
+    <PackageVersion Include="Testcontainers.MySql" Version="3.7.0" />
+    <PackageVersion Include="Testcontainers.PostgreSql" Version="3.7.0" />
+    <!-- WorkflowProvider.Test -->
+    <PackageVersion Include="AutoMapper" Version="13.0.1" />
+  </ItemGroup>
+</Project>
diff --git a/Providers/OptimaJet.Workflow.DbPersistence/OptimaJet.Workflow.MSSQL.deps.json b/Providers/OptimaJet.Workflow.DbPersistence/OptimaJet.Workflow.MSSQL.deps.json
@@ -7,14 +7,14 @@
   "targets": {
     ".NETStandard,Version=v2.0": {},
     ".NETStandard,Version=v2.0/": {
-      "OptimaJet.Workflow.MSSQL/13.2.2": {
+      "OptimaJet.Workflow.MSSQL/13.3.0": {
         "dependencies": {
           "Microsoft.Data.SqlClient": "5.2.0",
           "NETStandard.Library": "2.0.3",
-          "WorkflowEngine.NETCore-Core": "13.2.2",
-          "WorkflowEngine.NETCore-Migrator": "13.2.2",
-          "OptimaJet.Workflow.Core": "13.2.0.0",
-          "OptimaJet.Workflow.Migrator": "13.2.0.0"
+          "WorkflowEngine.NETCore-Core": "13.3.0",
+          "WorkflowEngine.NETCore-Migrator": "13.3.0",
+          "OptimaJet.Workflow.Core": "13.3.0.0",
+          "OptimaJet.Workflow.Migrator": "13.3.0.0"
         },
         "runtime": {
           "OptimaJet.Workflow.MSSQL.dll": {}
@@ -669,7 +669,7 @@
       "Microsoft.Extensions.DependencyModel/1.1.1": {
         "dependencies": {
           "Microsoft.DotNet.PlatformAbstractions": "1.1.1",
-          "Newtonsoft.Json": "13.0.1",
+          "Newtonsoft.Json": "13.0.3",
           "System.Diagnostics.Debug": "4.3.0",
           "System.Dynamic.Runtime": "4.0.11",
           "System.Linq": "4.3.0"
@@ -863,11 +863,11 @@
           "Microsoft.NETCore.Platforms": "1.1.0"
         }
       },
-      "Newtonsoft.Json/13.0.1": {
+      "Newtonsoft.Json/13.0.3": {
         "runtime": {
           "lib/netstandard2.0/Newtonsoft.Json.dll": {
             "assemblyVersion": "13.0.0.0",
-            "fileVersion": "13.0.1.25517"
+            "fileVersion": "13.0.3.27908"
           }
         }
       },
@@ -1683,12 +1683,12 @@
           }
         }
       },
-      "WorkflowEngine.NETCore-Core/13.2.2": {
+      "WorkflowEngine.NETCore-Core/13.3.0": {
         "dependencies": {
           "Microsoft.CodeAnalysis.CSharp": "4.1.0",
           "Microsoft.CodeAnalysis.CSharp.Scripting": "4.1.0",
           "Microsoft.Extensions.DependencyModel": "1.1.1",
-          "Newtonsoft.Json": "13.0.1",
+          "Newtonsoft.Json": "13.0.3",
           "System.Collections.Specialized": "4.3.0",
           "System.Security.Cryptography.Csp": "4.3.0",
           "System.Xml.XmlDocument": "4.3.0",
@@ -1698,37 +1698,37 @@
           "OptimaJet.Workflow.Core.dll": {}
         }
       },
-      "WorkflowEngine.NETCore-Migrator/13.2.2": {
+      "WorkflowEngine.NETCore-Migrator/13.3.0": {
         "dependencies": {
           "FluentMigrator": "5.2.0",
           "FluentMigrator.Runner": "5.2.0",
           "Microsoft.Extensions.DependencyInjection": "8.0.0",
-          "WorkflowEngine.NETCore-Core": "13.2.2"
+          "WorkflowEngine.NETCore-Core": "13.3.0"
         },
         "runtime": {
           "OptimaJet.Workflow.Migrator.dll": {}
         }
       },
-      "OptimaJet.Workflow.Core/13.2.0.0": {
+      "OptimaJet.Workflow.Core/13.3.0.0": {
         "runtime": {
           "OptimaJet.Workflow.Core.dll": {
-            "assemblyVersion": "13.2.0.0",
-            "fileVersion": "13.2.0.0"
+            "assemblyVersion": "13.3.0.0",
+            "fileVersion": "13.3.0.0"
           }
         }
       },
-      "OptimaJet.Workflow.Migrator/13.2.0.0": {
+      "OptimaJet.Workflow.Migrator/13.3.0.0": {
         "runtime": {
           "OptimaJet.Workflow.Migrator.dll": {
-            "assemblyVersion": "13.2.0.0",
-            "fileVersion": "13.2.0.0"
+            "assemblyVersion": "13.3.0.0",
+            "fileVersion": "13.3.0.0"
           }
         }
       }
     }
   },
   "libraries": {
-    "OptimaJet.Workflow.MSSQL/13.2.2": {
+    "OptimaJet.Workflow.MSSQL/13.3.0": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
@@ -2104,12 +2104,12 @@
       "path": "netstandard.library/2.0.3",
       "hashPath": "netstandard.library.2.0.3.nupkg.sha512"
     },
-    "Newtonsoft.Json/13.0.1": {
+    "Newtonsoft.Json/13.0.3": {
       "type": "package",
       "serviceable": true,
-      "sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==",
-      "path": "newtonsoft.json/13.0.1",
-      "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512"
+      "sha512": "sha512-HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==",
+      "path": "newtonsoft.json/13.0.3",
+      "hashPath": "newtonsoft.json.13.0.3.nupkg.sha512"
     },
     "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl/4.3.0": {
       "type": "package",
@@ -2671,22 +2671,22 @@
       "path": "thomaslevesque.weakevent/4.1.0",
       "hashPath": "thomaslevesque.weakevent.4.1.0.nupkg.sha512"
     },
-    "WorkflowEngine.NETCore-Core/13.2.2": {
+    "WorkflowEngine.NETCore-Core/13.3.0": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "WorkflowEngine.NETCore-Migrator/13.2.2": {
+    "WorkflowEngine.NETCore-Migrator/13.3.0": {
       "type": "project",
       "serviceable": false,
       "sha512": ""
     },
-    "OptimaJet.Workflow.Core/13.2.0.0": {
+    "OptimaJet.Workflow.Core/13.3.0.0": {
       "type": "reference",
       "serviceable": false,
       "sha512": ""
     },
-    "OptimaJet.Workflow.Migrator/13.2.0.0": {
+    "OptimaJet.Workflow.Migrator/13.3.0.0": {
       "type": "reference",
       "serviceable": false,
       "sha512": ""

diff --git a/Providers/OptimaJet.Workflow.DbPersistence/OptimaJet.Workflow.MSSQL.dll b/Providers/OptimaJet.Workflow.DbPersistence/OptimaJet.Workflow.MSSQL.dll
diff --git a/Providers/OptimaJet.Workflow.DbPersistence/SQL/CreatePersistenceObjects.sql b/Providers/OptimaJet.Workflow.DbPersistence/SQL/CreatePersistenceObjects.sql
@@ -1,7 +1,7 @@
 /*
 Company: OptimaJet
 Project: WorkflowEngine.NET Provider for MSSQL and Azure SQL
-Version: 13.2
+Version: 13.3
 File: CreatePersistenceObjects.sql
 
 */

diff --git a/Providers/OptimaJet.Workflow.DbPersistence/SQL/DropPersistenceObjects.sql b/Providers/OptimaJet.Workflow.DbPersistence/SQL/DropPersistenceObjects.sql
@@ -1,7 +1,7 @@
 /*
 Company: OptimaJet
 Project: WorkflowEngine.NET Provider for MSSQL
-Version: 13.2
+Version: 13.3
 File: DropPersistenceObjects.sql
 */
 

diff --git a/Providers/OptimaJet.Workflow.DbPersistence/SQL/InitialWorkflowEngineSchema.sql b/Providers/OptimaJet.Workflow.DbPersistence/SQL/InitialWorkflowEngineSchema.sql
@@ -1,7 +1,7 @@
 /*
 Company: OptimaJet
 Project: WorkflowEngine.NET Provider for MSSQL and Azure SQL
-Version: 13.2
+Version: 13.3
 File: CreatePersistenceObjects.sql
 */
 

diff --git a/Providers/OptimaJet.Workflow.DbPersistence/Source/MSSQLProvider.cs b/Providers/OptimaJet.Workflow.DbPersistence/Source/MSSQLProvider.cs
@@ -1566,6 +1566,7 @@ public virtual async Task BulkInitProcessesAsync(List<ProcessInstance> instances
                 processRow["StateName"] = processInstance.ProcessScheme.InitialActivity.State;
                 processRow["RootProcessId"] = processInstance.RootProcessId;
                 processRow["TenantId"] = processInstance.TenantId;
+                processRow["CalendarName"] = processInstance.CalendarName;
                 if (processInstance.ParentProcessId.HasValue)
                 {
                     processRow["ParentProcessId"] = processInstance.ParentProcessId;
@@ -1620,6 +1621,7 @@ public virtual async Task BulkInitProcessesAsync(List<ProcessInstance> instances
             bulk.ColumnMappings.Add("RootProcessId", "RootProcessId");
             bulk.ColumnMappings.Add("ParentProcessId", "ParentProcessId");
             bulk.ColumnMappings.Add("TenantId", "TenantId");
+            bulk.ColumnMappings.Add("CalendarName", "CalendarName");
             await bulk.WriteToServerAsync(piDataTable, token).ConfigureAwait(false);
             bulk.DestinationTableName = WorkflowProcessInstanceStatus.ObjectName;
             bulk.ColumnMappings.Clear();

diff --git a/Providers/OptimaJet.Workflow.DbPersistence/Source/Models/WorkflowProcessInstance.cs b/Providers/OptimaJet.Workflow.DbPersistence/Source/Models/WorkflowProcessInstance.cs
@@ -66,6 +66,7 @@ public static DataTable ToDataTable()
             dt.Columns.Add(nameof(ProcessInstanceEntity.SubprocessName), typeof(string));
             dt.Columns.Add(nameof(ProcessInstanceEntity.CreationDate), typeof(string));
             dt.Columns.Add(nameof(ProcessInstanceEntity.LastTransitionDate), typeof(string));
+            dt.Columns.Add(nameof(ProcessInstanceEntity.CalendarName), typeof(string));
             return dt;
         }
     }

diff --git a/Providers/OptimaJet.Workflow.DbPersistence/Source/OptimaJet.Workflow.MSSQL.csproj b/Providers/OptimaJet.Workflow.DbPersistence/Source/OptimaJet.Workflow.MSSQL.csproj
@@ -1,18 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>10</LangVersion>
     <RootNamespace>OptimaJet.Workflow.MSSQL</RootNamespace>
     <AssemblyName>OptimaJet.Workflow.MSSQL</AssemblyName>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyVersion>13.2.0</AssemblyVersion>
-    <FileVersion>13.2.0</FileVersion>
-    <Version>13.2.2</Version>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
-    <Authors>Optimajet Limited</Authors>
-    <Company>Optimajet Limited</Company>
-    <Product>Workflow Engine</Product>
     <Description>
       Contains dlls for MSSQL Server Persistence Provider: DbPersistenceProvider which implements interface IPersistenceProvider,
       DbSchemePersistenceProvider which implements interface ISchemePersistenceProvider,
@@ -21,13 +11,9 @@
       Steps for workflow runtime configuration with DbPersistenceProvider: https://workflowengine.io/documentation/workflow-server/how-to-launch/#customdb in
       Create WorkflowRuntime section.
     </Description>
-    <Copyright>OptimaJet Workflow Engine 2024</Copyright>
     <PackageLicenseUrl>https://workflowengine.io/agreements/eula/</PackageLicenseUrl>
-    <PackageProjectUrl>https://workflowengine.io</PackageProjectUrl>
     <PackageId>WorkflowEngine.NETCore-ProviderForMSSQL</PackageId>
-    <PackageIconUrl>https://workflowengine.io/images/favicons/favicon.ico</PackageIconUrl>
     <PackageTags>workflow engine, ms sql, for sql</PackageTags>
-    <PackageReleaseNotes>https://workflowengine.io/documentation/release-notes/</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefineConstants>TRACE;DEBUG</DefineConstants>
@@ -45,11 +31,11 @@
     <None Remove="Properties\Settings.settings" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="WorkflowEngine.NETCore-Core" Version="13.2.2" />
-    <PackageReference Include="WorkflowEngine.NETCore-Migrator" Version="13.2.2" />
+    <PackageReference Include="WorkflowEngine.NETCore-Core" />
+    <PackageReference Include="WorkflowEngine.NETCore-Migrator" />
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="OptimaJet.Workflow.Test, PublicKey=002400000480000094000000060200000024000052534131000400000100010065d40ec9673e8069ae5e05ccba45efe141a95751a82e90dd8c6db1a29e8c87884bb1d2c2672b7fe8ca6ce5091ddc3301f6092f7a1f36f88de1531613924a35f2c8213aa9c261f071db2f537c7109659ac6b46b5a4b28611c4de18c37f0fbcc7844a739a07386248558b54bf41bc616a988fabfdab6ea0f9a710a3fd55b3495bf" />

diff --git a/Providers/OptimaJet.Workflow.DbPersistence/Source/Scripts/CreatePersistenceObjects.sql b/Providers/OptimaJet.Workflow.DbPersistence/Source/Scripts/CreatePersistenceObjects.sql
@@ -1,7 +1,7 @@
 /*
 Company: OptimaJet
 Project: WorkflowEngine.NET Provider for MSSQL and Azure SQL
-Version: 13.2
+Version: 13.3
 File: CreatePersistenceObjects.sql
 
 */

diff --git a/Providers/OptimaJet.Workflow.DbPersistence/Source/Scripts/DropPersistenceObjects.sql b/Providers/OptimaJet.Workflow.DbPersistence/Source/Scripts/DropPersistenceObjects.sql
@@ -1,7 +1,7 @@
 /*
 Company: OptimaJet
 Project: WorkflowEngine.NET Provider for MSSQL
-Version: 13.2
+Version: 13.3
 File: DropPersistenceObjects.sql
 */