Skip to content

Commit 931ae5b

Browse files
optimajetoptimajet
committed
WFE 20.0.7 (autocommit)
1 parent f9c092a commit 931ae5b

File tree

55 files changed

+296
-180
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+296
-180
lines changed

‎Designer/templates/activity.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ <h4 v-if="itemHasComment" style="padding-bottom: 1px;border-bottom: 1px solid rg
755755
name: item['ActionName'],
756756
type: ['Action']
757757
};
758-
data.jsonform = me.showjson(item[name], params, onSuccess, onClose, me.VueConfig.data.FormData);
758+
data.jsonform = me.showjson(item[name], params, onSuccess, onClose, data.FormData);
759759
};
760760

761761
methods.onSave = function () {

‎Designer/templates/customforms/formsplugin/showform.html‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -292,15 +292,17 @@ <h4 class="WorkflowDesignerTitleWithCreate Underline">
292292
data.originalActivityName = me.options.callerElement.Name;
293293
} else {
294294
me.linkItem = value;
295-
formData.Name = value.Name;
296-
formData.State = value.State;
297-
formData.AssociatedCommands = JSON.parse(value.Annotations.find(a => a.Name === 'AssociatedCommands')?.JsonValue ?? '[]');
298-
formData.FormName = value.Annotations.find(a => a.Name === 'FormName')?.JsonValue;
299-
const formVersionString = value.Annotations.find(a => a.Name === 'FormVersion')?.JsonValue;
295+
const annotations = value?.Annotations ?? [];
296+
const getAnnotationValue = (name, fallback) => annotations.find(a => a.Name === name)?.JsonValue ?? fallback;
297+
formData.Name = value?.Name;
298+
formData.State = value?.State;
299+
formData.AssociatedCommands = JSON.parse(getAnnotationValue('AssociatedCommands', '[]'));
300+
formData.FormName = getAnnotationValue('FormName');
301+
const formVersionString = getAnnotationValue('FormVersion');
300302
formData.FormVersion = formVersionString ? parseInt(formVersionString) : 'latest';
301-
formData.InParameterName = value.Annotations.find(a => a.Name === 'InParameterName')?.JsonValue;
302-
formData.DraftParameterName = value.Annotations.find(a => a.Name === 'DraftParameterName')?.JsonValue;
303-
formData.OutParameterName = value.Annotations.find(a => a.Name === 'OutParameterName')?.JsonValue;
303+
formData.InParameterName = getAnnotationValue('InParameterName');
304+
formData.DraftParameterName = getAnnotationValue('DraftParameterName');
305+
formData.OutParameterName = getAnnotationValue('OutParameterName');
304306
data.originalActivityName = formData.Name;
305307
}
306308

@@ -310,8 +312,8 @@ <h4 class="WorkflowDesignerTitleWithCreate Underline">
310312
data.prevInParamName = formData.InParameterName;
311313

312314
data.currentActivityCommands = getCurrentActivityCommands();
313-
methods.LoadFormNames().then(data => {
314-
data.currentFormNames = data ?? [];
315+
methods.LoadFormNames().then(names => {
316+
data.currentFormNames = names ?? [];
315317
})
316318
if (formData.FormName) {
317319
methods.LoadFormVersions(formData.FormName).then((data) => {

‎Designer/workflowdesigner.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22
<!-- Version -->
33
<PropertyGroup>
4-
<Version>20.0.6</Version>
4+
<Version>20.0.7</Version>
55
<AssemblyVersion>20.0.0</AssemblyVersion>
66
<FileVersion>20.0.0</FileVersion>
77
</PropertyGroup>

‎Directory.Packages.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
<PackageVersion Include="Microsoft.Identity.Client" Version="4.72.1" />
2121
<PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.10.0" />
2222
<PackageVersion Include="Azure.Identity" Version="1.14.0" />
23-
<PackageVersion Include="WorkflowEngine.NETCore-Core" Version="20.0.6" />
24-
<PackageVersion Include="WorkflowEngine.NETCore-Migrator" Version="20.0.6" />
23+
<PackageVersion Include="WorkflowEngine.NETCore-Core" Version="20.0.7" />
24+
<PackageVersion Include="WorkflowEngine.NETCore-Migrator" Version="20.0.7" />
2525
</ItemGroup>
2626
<!-- Plugins -->
2727
<ItemGroup>

‎Providers/OptimaJet.Workflow.DbPersistence/OptimaJet.Workflow.MSSQL.deps.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"targets": {
88
".NETStandard,Version=v2.0": {},
99
".NETStandard,Version=v2.0/": {
10-
"OptimaJet.Workflow.MSSQL/20.0.6": {
10+
"OptimaJet.Workflow.MSSQL/20.0.7": {
1111
"dependencies": {
1212
"Azure.Identity": "1.14.0",
1313
"Microsoft.Data.SqlClient": "5.2.0",
@@ -16,8 +16,8 @@
1616
"NETStandard.Library": "2.0.3",
1717
"System.IdentityModel.Tokens.Jwt": "8.10.0",
1818
"System.Runtime.Caching": "8.0.1",
19-
"WorkflowEngine.NETCore-Core": "20.0.6",
20-
"WorkflowEngine.NETCore-Migrator": "20.0.6",
19+
"WorkflowEngine.NETCore-Core": "20.0.7",
20+
"WorkflowEngine.NETCore-Migrator": "20.0.7",
2121
"OptimaJet.Workflow.Core": "20.0.0.0",
2222
"OptimaJet.Workflow.Migrator": "20.0.0.0"
2323
},
@@ -1698,7 +1698,7 @@
16981698
}
16991699
}
17001700
},
1701-
"WorkflowEngine.NETCore-Core/20.0.6": {
1701+
"WorkflowEngine.NETCore-Core/20.0.7": {
17021702
"dependencies": {
17031703
"Microsoft.Bcl.AsyncInterfaces": "9.0.5",
17041704
"Microsoft.CodeAnalysis.CSharp": "4.1.0",
@@ -1714,12 +1714,12 @@
17141714
},
17151715
"runtime": {
17161716
"OptimaJet.Workflow.Core.dll": {
1717-
"assemblyVersion": "20.0.6",
1717+
"assemblyVersion": "20.0.7",
17181718
"fileVersion": "20.0.0"
17191719
}
17201720
}
17211721
},
1722-
"WorkflowEngine.NETCore-Migrator/20.0.6": {
1722+
"WorkflowEngine.NETCore-Migrator/20.0.7": {
17231723
"dependencies": {
17241724
"Azure.Identity": "1.14.0",
17251725
"FluentMigrator": "5.2.0",
@@ -1729,11 +1729,11 @@
17291729
"Microsoft.IdentityModel.JsonWebTokens": "8.10.0",
17301730
"System.IdentityModel.Tokens.Jwt": "8.10.0",
17311731
"System.Runtime.Caching": "8.0.1",
1732-
"WorkflowEngine.NETCore-Core": "20.0.6"
1732+
"WorkflowEngine.NETCore-Core": "20.0.7"
17331733
},
17341734
"runtime": {
17351735
"OptimaJet.Workflow.Migrator.dll": {
1736-
"assemblyVersion": "20.0.6",
1736+
"assemblyVersion": "20.0.7",
17371737
"fileVersion": "20.0.0"
17381738
}
17391739
}
@@ -1757,7 +1757,7 @@
17571757
}
17581758
},
17591759
"libraries": {
1760-
"OptimaJet.Workflow.MSSQL/20.0.6": {
1760+
"OptimaJet.Workflow.MSSQL/20.0.7": {
17611761
"type": "project",
17621762
"serviceable": false,
17631763
"sha512": ""
@@ -2707,12 +2707,12 @@
27072707
"path": "thomaslevesque.weakevent/4.1.0",
27082708
"hashPath": "thomaslevesque.weakevent.4.1.0.nupkg.sha512"
27092709
},
2710-
"WorkflowEngine.NETCore-Core/20.0.6": {
2710+
"WorkflowEngine.NETCore-Core/20.0.7": {
27112711
"type": "project",
27122712
"serviceable": false,
27132713
"sha512": ""
27142714
},
2715-
"WorkflowEngine.NETCore-Migrator/20.0.6": {
2715+
"WorkflowEngine.NETCore-Migrator/20.0.7": {
27162716
"type": "project",
27172717
"serviceable": false,
27182718
"sha512": ""

‎Providers/OptimaJet.Workflow.DbPersistence/OptimaJet.Workflow.MSSQL.dll‎

2 KB
Binary file not shown.

‎Providers/OptimaJet.Workflow.DbPersistence/Source/MSSQLProvider.cs‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,7 @@ public virtual async Task BindProcessToNewSchemeAsync(ProcessInstance processIns
373373
await BindProcessToNewSchemeAsync(processInstance, false).ConfigureAwait(false);
374374
}
375375

376+
[Obsolete("Use BindProcessToNewSchemeAsync(ProcessInstance processInstance) instead.")]
376377
public virtual async Task BindProcessToNewSchemeAsync(ProcessInstance processInstance, bool resetIsDeterminingParametersChanged)
377378
{
378379
using var connection = OpenConnection();
@@ -1296,6 +1297,15 @@ public virtual async Task<SchemeDefinition<XElement>> GetProcessSchemeBySchemeId
12961297
return ConvertToSchemeDefinition(processScheme);
12971298
}
12981299

1300+
public virtual async Task<SchemeDefinition<XElement>> GetProcessSchemeWithParametersAsync(string schemeCode,
1301+
Guid? rootSchemeId, bool ignoreObsolete)
1302+
{
1303+
#pragma warning disable CS0618 // Type or member is obsolete
1304+
return await GetProcessSchemeWithParametersAsync(schemeCode, "{}", rootSchemeId, ignoreObsolete).ConfigureAwait(false);
1305+
#pragma warning restore CS0618 // Type or member is obsolete
1306+
}
1307+
1308+
[Obsolete("Use GetProcessSchemeWithParametersAsync(string schemeCode, Guid? rootSchemeId, bool ignoreObsolete) instead.")]
12991309
public virtual async Task<SchemeDefinition<XElement>> GetProcessSchemeWithParametersAsync(string schemeCode, string definingParameters,
13001310
Guid? rootSchemeId, bool ignoreObsolete)
13011311
{
@@ -1332,6 +1342,7 @@ public virtual async Task<SchemeDefinition<XElement>> GetProcessSchemeWithParame
13321342
throw SchemeNotFoundException.Create(schemeCode, SchemeLocation.WorkflowProcessScheme, definingParameters);
13331343
}
13341344

1345+
[Obsolete("Use SetSchemeIsObsoleteAsync(string schemeCode) instead.")]
13351346
public virtual async Task SetSchemeIsObsoleteAsync(string schemeCode, IDictionary<string, object> parameters)
13361347
{
13371348
string definingParameters = DefiningParametersSerializer.Serialize(parameters);
@@ -1508,14 +1519,20 @@ public virtual async Task SetSchemeTagsAsync(string schemeCode, IEnumerable<stri
15081519

15091520
#region IWorkflowGenerator
15101521

1522+
public virtual async Task<XElement> GenerateAsync(string schemeCode)
1523+
{
1524+
return await GetSchemeAsync(schemeCode).ConfigureAwait(false);
1525+
}
1526+
1527+
[Obsolete("Use GenerateAsync(string schemeCode) instead.")]
15111528
public virtual async Task<XElement> GenerateAsync(string schemeCode, Guid schemeId, IDictionary<string, object> parameters)
15121529
{
15131530
if (parameters.Count > 0)
15141531
{
15151532
throw new InvalidOperationException("Parameters not supported");
15161533
}
15171534

1518-
return await GetSchemeAsync(schemeCode).ConfigureAwait(false);
1535+
return await GenerateAsync(schemeCode).ConfigureAwait(false);
15191536
}
15201537

15211538
#endregion

‎Providers/OptimaJet.Workflow.MongoDB/OptimaJet.Workflow.MongoDB.deps.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"targets": {
88
".NETStandard,Version=v2.0": {},
99
".NETStandard,Version=v2.0/": {
10-
"OptimaJet.Workflow.MongoDB/20.0.6": {
10+
"OptimaJet.Workflow.MongoDB/20.0.7": {
1111
"dependencies": {
1212
"MongoDB.Driver": "2.30.0",
1313
"NETStandard.Library": "2.0.3",
14-
"WorkflowEngine.NETCore-Core": "20.0.6",
14+
"WorkflowEngine.NETCore-Core": "20.0.7",
1515
"OptimaJet.Workflow.Core": "20.0.0.0"
1616
},
1717
"runtime": {
@@ -1143,7 +1143,7 @@
11431143
}
11441144
}
11451145
},
1146-
"WorkflowEngine.NETCore-Core/20.0.6": {
1146+
"WorkflowEngine.NETCore-Core/20.0.7": {
11471147
"dependencies": {
11481148
"Microsoft.Bcl.AsyncInterfaces": "9.0.5",
11491149
"Microsoft.CodeAnalysis.CSharp": "4.1.0",
@@ -1159,7 +1159,7 @@
11591159
},
11601160
"runtime": {
11611161
"OptimaJet.Workflow.Core.dll": {
1162-
"assemblyVersion": "20.0.6",
1162+
"assemblyVersion": "20.0.7",
11631163
"fileVersion": "20.0.0"
11641164
}
11651165
}
@@ -1175,7 +1175,7 @@
11751175
}
11761176
},
11771177
"libraries": {
1178-
"OptimaJet.Workflow.MongoDB/20.0.6": {
1178+
"OptimaJet.Workflow.MongoDB/20.0.7": {
11791179
"type": "project",
11801180
"serviceable": false,
11811181
"sha512": ""
@@ -1831,7 +1831,7 @@
18311831
"path": "zstdsharp.port/0.7.3",
18321832
"hashPath": "zstdsharp.port.0.7.3.nupkg.sha512"
18331833
},
1834-
"WorkflowEngine.NETCore-Core/20.0.6": {
1834+
"WorkflowEngine.NETCore-Core/20.0.7": {
18351835
"type": "project",
18361836
"serviceable": false,
18371837
"sha512": ""

‎Providers/OptimaJet.Workflow.MongoDB/OptimaJet.Workflow.MongoDB.dll‎

2 KB
Binary file not shown.

0 commit comments

Comments
 (0)