mochapowered/mocha-dotnet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: mochapowered:db7fd5e8461c49671ebbecf8637442fa4f9181b4
Branches Tags
mochapowered:master
...
compare: mochapowered:a0fa60a9e8d2722f790cbd9f915eb6cabba07970
Branches Tags
mochapowered:master

3 Commits
db7fd5e846 ... a0fa60a9e8

Author SHA1 Message Date
Michael Becker
a0fa60a9e8 improve task processing and allow multiple instances in monikerlist 2025-01-17 22:12:01 -05:00
Michael Becker
63e72ab97f fix some tests 2025-01-17 22:11:35 -05:00
Michael Becker
db210362f9 fix this 2025-01-17 22:11:06 -05:00
11 changed files with 237 additions and 60 deletions
Show Stats Expand all files Collapse all files

80
mocha-dotnet/src/lib/Mocha.Core.UI.Server/Commands/ElementCommand.cs
View File

@ -30,40 +30,37 @@ public class ElementCommand : InstanceCommand
protected override void ProcessInternal(WebServerProcessRequestEventArgs e, Core.Oms oms, Core.OmsContext ctx, StreamWriter sw)
{
if (e.Context.Request.Method == "POST")
if (e.Context.Request.Method == "POST" && oms.IsInstanceOf(ProcessingInstance, oms.GetInstance(KnownInstanceGuids.Classes.Element)))
{
if (oms.IsInstanceOf(ProcessingInstance, oms.GetInstance(KnownInstanceGuids.Classes.Element)))
ctx.SetWorkData(oms.GetInstance(KnownInstanceGuids.Classes.Instance), ProcessingInstance);
// what we should do, is build a transaction with all updated ECs and fields and values
// if any update fails, the entire transaction should be rolled back
Response resp = oms.ProcessElement(ctx, ProcessingInstance, e.Context.Request.Form);
if (resp != null)
{
ctx.SetWorkData(oms.GetInstance(KnownInstanceGuids.Classes.Instance), ProcessingInstance);
// what we should do, is build a transaction with all updated ECs and fields and values
// if any update fails, the entire transaction should be rolled back
Response resp = oms.ProcessElement(ctx, ProcessingInstance, e.Context.Request.Form);
if (resp != null)
{
JsonObject obj2 = resp.GetResponse(oms, ctx);
RespondWithJson(oms, sw, e.Context, 200, "OK", obj2);
return;
}
else
{
JsonObject obj2 = new JsonObject();
obj2.Add("result", "failure");
obj2.Add("message", "no CT associated with element");
RespondWithJson(oms, sw, e.Context, 400, "Bad Request", obj2);
return;
}
foreach (KeyValuePair<string, string> kvp in e.Context.Request.Form)
{
Console.Error.WriteLine("---> {0} = {1}", kvp.Key, kvp.Value);
}
JsonObject obj = new JsonObject();
obj.Add("result", "failure");
obj.Add("message", "not implemented");
RespondWithJson(oms, sw, e.Context, 500, "Internal Server Error", obj);
JsonObject obj2 = resp.GetResponse(oms, ctx);
RespondWithJson(oms, sw, e.Context, 200, "OK", obj2);
return;
}
else
{
JsonObject obj2 = new JsonObject();
obj2.Add("result", "failure");
obj2.Add("message", "no CT associated with element");
RespondWithJson(oms, sw, e.Context, 400, "Bad Request", obj2);
return;
}
foreach (KeyValuePair<string, string> kvp in e.Context.Request.Form)
{
Console.Error.WriteLine("---> {0} = {1}", kvp.Key, kvp.Value);
}
JsonObject obj = new JsonObject();
obj.Add("result", "failure");
obj.Add("message", "not implemented");
RespondWithJson(oms, sw, e.Context, 500, "Internal Server Error", obj);
}
else
{
@ -100,6 +97,27 @@ public class ElementCommand : InstanceCommand
}
else if (oms.IsInstanceOf(ProcessingInstance, oms.GetInstance(KnownInstanceGuids.Classes.Task)))
{
foreach (KeyValuePair<string, string> kvp in e.Context.Request.Form)
{
if (kvp.Key == "relatedInstance")
{
object? v = oms.ParseValue(kvp.Value);
InstanceHandle relatedWorkSet = oms.GetRelatedInstance(ProcessingInstance, oms.GetInstance(KnownRelationshipGuids.Task__has_related__Work_Set));
if (relatedWorkSet != InstanceHandle.Empty)
{
ctx.SetWorkData(relatedWorkSet, v);
}
}
else
{
if (oms.TryParseInstanceRef(kvp.Key, out InstanceHandle h))
{
ctx.SetWorkData(h, oms.ParseValue(kvp.Value));
}
}
}
RespndWithTask(oms, sw, e.Context, ctx, ProcessingInstance);
}
else

1
mocha-dotnet/src/lib/Mocha.Core/KnownAttributeGuids.cs
View File

@ -49,6 +49,7 @@ namespace Mocha.Core
}
public static class Boolean
{
public static Guid EvaluateWorkSet { get; } = new Guid("{62c28f9e-5ce8-4ce5-8a56-1e80f1af7f6a}");
public static Guid MethodIsOfTypeSpecified { get; } = new Guid("{6e9df667-0f95-4320-a4be-5cdb00f1d4ee}");
public static Guid DisplayVersionInBadge { get; } = new Guid("{BE5966A4-C4CA-49A6-B504-B6E8759F392D}");
public static Guid Editable { get; } = new Guid("{957fd8b3-fdc4-4f35-87d6-db1c0682f53c}");

1
mocha-dotnet/src/lib/Mocha.Core/KnownInstanceGuids.cs
View File

@ -292,6 +292,7 @@ namespace Mocha.Core
public static Guid GetInstanceText { get; } = new Guid("{b024abd6-1f2b-495a-9da3-c9ce29fb0c2f}");
public static Guid GetRandomNumber { get; } = new Guid("{8f7945da-4cad-49cb-9838-85f3524a5adb}");
public static Guid GetIPAddress { get; } = new Guid("{45411e57-ef6e-44f5-8801-603e567d73d4}");
public static Guid GetGlobalIdentifier { get; } = new Guid("{1a7ebec3-dc02-4c9b-a5df-0c72646453c9}");
}
public static class SystemInstanceSetRoutines
{

1
mocha-dotnet/src/lib/Mocha.Core/KnownRelationshipGuids.cs
View File

@ -101,6 +101,7 @@ namespace Mocha.Core
public static Guid Task__has__Task_Category { get; } = new Guid("{84048159-430d-4f6c-9361-115c8629c517}");
public static Guid Task__executes__Method_Call { get; } = new Guid("{D8C0D4D4-F8C6-4B92-A2C1-8BF16B16203D}");
public static Guid Task__has_preview_action_title__Translation { get; } = new Guid("{3f65ce02-11dd-4829-a46b-b9ea1b43e56a}");
public static Guid Task__has_related__Work_Set { get; } = new Guid("{2eb391b4-7da2-4eca-8460-dcda7757c47a}");
public static Guid Prompt__has__Report_Field { get; } = new Guid("{922CCB05-61EA-441D-96E0-63D58231D202}"); // 3de784b9-4561-42f0-946f-b1e90d80029e
public static Guid Report_Field__for__Prompt { get; } = new Guid("{5DED3DB4-6864-45A9-A5FF-8E5A35AD6E6F}"); // b5f59216-a1f1-4979-8642-a4845e59daa8

113
mocha-dotnet/src/lib/Mocha.Core/Oms.cs
View File

@ -62,6 +62,27 @@ public abstract class Oms
UpdateSyntacticSugar();
RegisterSystemAttributeRoutine<string?>(KnownInstanceGuids.SystemAttributeRoutines.GetGlobalIdentifier, delegate (Oms oms, OmsContext context)
{
object? wd = context.GetWorkData(oms.GetInstance(KnownInstanceGuids.Classes.Instance));
if (wd is InstanceHandle wdi)
{
if (oms.IsInstanceOf(wdi, oms.GetInstance(KnownInstanceGuids.Classes.WorkSet)))
{
bool evaluateWorkSet = oms.GetAttributeValue<bool>(wdi, oms.GetInstance(KnownAttributeGuids.Boolean.EvaluateWorkSet));
if (evaluateWorkSet)
{
wd = context.GetWorkData<InstanceHandle>(wdi);
if (wd is InstanceHandle wdi2)
{
wdi = wdi2;
}
}
}
return oms.GetGlobalIdentifier(wdi).ToString("b");
}
return null;
});
RegisterSystemInstanceSetRoutine(KnownInstanceGuids.SystemInstanceSetRoutines.GetCurrentUser, delegate (Oms oms, OmsContext context)
{
Console.Error.WriteLine("oms: executing system instance set routine {0}", KnownInstanceGuids.SystemUpdateRoutines.LoginUser);
@ -1167,7 +1188,7 @@ public abstract class Oms
bool is_static = GetAttributeValue<bool>(methodOrMethodBinding, GetInstance(KnownAttributeGuids.Boolean.Static));
if (!is_static && targetInstance == null)
{
throw new NullReferenceException(String.Format("Attempt to call instance method `{0}` without an instance", methodOrMethodBinding));
//sthrow new NullReferenceException(String.Format("Attempt to call instance method `{0}` without an instance", methodOrMethodBinding));
}
if (targetInstance == null)
@ -2231,4 +2252,94 @@ public abstract class Oms
{
return _tenantStack.Pop();
}
public object? ParseValue(string value)
{
if (value.Contains(',') && (value.Contains('$') || (value.Contains('{') && value.Contains('}') && value.Length > 38)))
{
List<InstanceHandle> list = new List<InstanceHandle>();
string[] values = value.Split(new char[] { ',' });
foreach (string value2 in values)
{
if (TryParseInstanceRef(value2, out InstanceHandle h2))
{
list.Add(h2);
}
}
return list;
}
else if (value.Contains('$') || (value.StartsWith('{') && value.EndsWith('}') && value.Length == 38))
{
if (TryParseInstanceRef(value, out InstanceHandle h2))
{
return h2;
}
}
else if (Boolean.TryParse(value, out bool b))
{
return b;
}
else if (Decimal.TryParse(value, out decimal d))
{
return d;
}
else if (DateTime.TryParse(value, out DateTime dt))
{
return dt;
}
return value;
}
private object? ParseValueForWorkData__TypeSafeFirst(InstanceHandle h, string value)
{
if (IsInstanceOf(h, GetInstance(KnownInstanceGuids.Classes.WorkSet)) || IsInstanceOf(h, GetInstance(KnownInstanceGuids.Classes.Class)))
{
if (value.Contains(","))
{
List<InstanceHandle> list = new List<InstanceHandle>();
string[] values = value.Split(new char[] { ',' });
foreach (string value2 in values)
{
if (TryParseInstanceRef(value2, out InstanceHandle h2))
{
list.Add(h2);
}
}
return list;
}
else
{
if (TryParseInstanceRef(value, out InstanceHandle h2))
{
return h2;
}
}
}
else if (IsInstanceOf(h, GetInstance(KnownInstanceGuids.Classes.TextAttribute)))
{
return value;
}
else if (IsInstanceOf(h, GetInstance(KnownInstanceGuids.Classes.BooleanAttribute)))
{
if (Boolean.TryParse(value, out bool d))
{
return d;
}
}
else if (IsInstanceOf(h, GetInstance(KnownInstanceGuids.Classes.NumericAttribute)))
{
if (Decimal.TryParse(value, out decimal d))
{
return d;
}
}
else if (IsInstanceOf(h, GetInstance(KnownInstanceGuids.Classes.DateAttribute)))
{
if (DateTime.TryParse(value, out DateTime d))
{
return d;
}
}
throw new FormatException();
}
}

14
mocha-dotnet/src/lib/Mocha.Core/UI/Renderer.cs
View File

@ -128,6 +128,20 @@ public class Renderer
}
}
}
else
{
InstanceHandle ecinst = OMS.GetRelatedInstance(parentElementContent, OMS.GetInstance(KnownRelationshipGuids.Element_Content__has__Instance));
object? wdv = context.GetWorkData(ecinst);
if (wdv == null)
{
wdv = context.GetWorkData(parentElementContent);
}
if (wdv is InstanceHandle)
{
value = ((InstanceHandle)wdv);
}
}
}
if (useWidget is MonikerList)

6
mocha-dotnet/src/lib/Mocha.Core/UI/Widgets/MonikerList.cs
View File

@ -47,7 +47,11 @@ public class MonikerList : Widget
obj.Add("relatedTasksUriTemplate", String.Format("/{0}/inst/{1}/rel-tasks", OMS.GetTenantName(OMS.CurrentTenant), OMS.GetInstanceKey(SelectedInstances.First()).ToString()));
}
obj.Add("text", OMS.GetInstanceText(ParentInstance));
obj.Add("singular", true);
if (OMS.GetAttributeValue<bool>(ParentInstance, OMS.GetInstance(KnownAttributeGuids.Boolean.Singular)))
{
obj.Add("singular", true);
}
}
protected override bool ShouldBeEnabled()

13
mocha-dotnet/tests/Mocha.Oms.Server.Tests/LocalTests.cs
View File

@ -17,19 +17,12 @@
using Mocha.Core;
using Mocha.Core.OmsImplementations;
using Mocha.Testing;
namespace Mocha.Oms.Server.Tests;
public class LocalTests
public class LocalTests : OmsTestsBase
{
public Mocha.Core.Oms? Oms { get; private set; }
[SetUp]
public void SetUp()
{
Oms = new EmbeddedMiniOms();
}
[Test]
public void TestInstanceTaskWithGAS_GetGlobalIdentifier()
{
@ -40,4 +33,4 @@ public class LocalTests
Dictionary<string, string> form = new Dictionary<string, string>();
Response resp = Oms.ProcessElement(context, ProcessingInstance, form);
}
}
}

1
mocha-dotnet/tests/Mocha.Oms.Server.Tests/Mocha.Oms.Server.Tests.csproj
View File

@ -22,6 +22,7 @@
<ProjectReference Include="../../src/app/Mocha.Oms.Server/Mocha.Oms.Server.csproj" />
<ProjectReference Include="../../src/lib/Mocha.Core.UI.Server/Mocha.Core.UI.Server.csproj" />
<ProjectReference Include="../../src/lib/Mocha.Core/Mocha.Core.csproj" />
<ProjectReference Include="../../src/lib/Mocha.Testing/Mocha.Testing.csproj" />
</ItemGroup>
</Project>

64
mocha-dotnet/tests/Mocha.Oms.Server.Tests/RemoteTests.cs
View File

@ -2,6 +2,7 @@
using System.Data.SqlTypes;
using System.Net;
using System.Net.Http.Json;
using System.Runtime.CompilerServices;
using System.Text.Json.Nodes;
using Mocha.Core;
using NUnit.Framework.Interfaces;
@ -22,6 +23,12 @@ public class RemoteTests
int exitCode = program.Start();
}
protected int GetPort()
{
return 4436;
// return program.Port;
}
[TearDown]
public void TearDown()
{
@ -30,14 +37,18 @@ public class RemoteTests
protected string? BuildUrl(string v)
{
return String.Format("http://localhost:{0}{1}", program.Port, v);
return String.Format("http://localhost:{0}{1}", GetPort(), v);
}
[Test]
public async Task Does_Test_Program_Boot()
{
Assert.That(program, Is.Not.Null);
}
[Test]
public async Task Tenant_List_Test()
{
Assert.That(program, Is.Not.Null);
HttpClient client = new HttpClient();
HttpResponseMessage resp = client.Send(new HttpRequestMessage(HttpMethod.Get, BuildUrl("/tenants")));
@ -55,8 +66,6 @@ public class RemoteTests
[Test]
public async Task Instance_Json_Test()
{
Assert.That(program, Is.Not.Null);
InstanceHandle h = program.Oms.GetInstance(KnownInstanceGuids.Classes.Class);
InstanceKey k = program.Oms.GetInstanceKey(h);
Guid g = program.Oms.GetGlobalIdentifier(h);
@ -79,8 +88,6 @@ public class RemoteTests
[Test, TestCase("1$1"), TestCase("1$2"), TestCase("1$3"), TestCase("4$1"), TestCase("6$3")]
public async Task Instance_Json_Test_Multi(string ik)
{
Assert.That(program, Is.Not.Null);
InstanceHandle h = program.Oms.GetInstance(InstanceKey.Parse(ik));
InstanceKey k = program.Oms.GetInstanceKey(h);
Guid g = program.Oms.GetGlobalIdentifier(h);
@ -99,13 +106,35 @@ public class RemoteTests
Assert.That(new Guid(json["globalIdentifier"].ToString()), Is.EqualTo(g));
Assert.That(json["text"].ToString(), Is.EqualTo(sz));
}
[Test]
public async Task Element_with_Parameters_Test()
{
InstanceHandle h = program.Oms.GetInstance(KnownInstanceGuids.Classes.Class);
InstanceKey k = program.Oms.GetInstanceKey(h);
Guid g = program.Oms.GetGlobalIdentifier(h);
string sz = program.Oms.GetInstanceText(h);
HttpClient client = new HttpClient();
Dictionary<string, string> coll = new Dictionary<string, string>();
coll["56$272"] = "86$1";
HttpResponseMessage resp = client.Send(new HttpRequestMessage(HttpMethod.Post, BuildUrl("/tenants/super/instances/2997$48/element")) { Content = new FormUrlEncodedContent(coll) });
Assert.That(resp.StatusCode, Is.EqualTo(System.Net.HttpStatusCode.OK));
Assert.That(resp.Content.Headers.ContentType.ToString(), Is.EqualTo("application/json"));
string content = await resp.Content.ReadAsStringAsync();
JsonObject json = JsonNode.Parse(content) as JsonObject;
Assert.That(json["result"].ToString(), Is.EqualTo("success"));
Assert.That(json["value"]["widget"].ToString(), Is.EqualTo("root"));
}
[Test]
public async Task Element_Test()
{
Assert.That(program, Is.Not.Null);
InstanceHandle h = program.Oms.GetInstance(KnownInstanceGuids.Classes.Class);
InstanceKey k = program.Oms.GetInstanceKey(h);
Guid g = program.Oms.GetGlobalIdentifier(h);
@ -127,15 +156,22 @@ public class RemoteTests
[Test]
public async Task Instance_Task_Test_with_GAS_Get_Global_Identifier()
{
Assert.That(program, Is.Not.Null);
InstanceHandle h = program.Oms.GetInstance(KnownInstanceGuids.Classes.Class);
InstanceKey k = program.Oms.GetInstanceKey(h);
Guid g = program.Oms.GetGlobalIdentifier(h);
string sz = program.Oms.GetInstanceText(h);
HttpClient client = new HttpClient();
HttpResponseMessage resp = client.Send(new HttpRequestMessage(HttpMethod.Get, BuildUrl("/tenants/super/instances/56$51/element")));
HttpRequestMessage message = new HttpRequestMessage(HttpMethod.Get, BuildUrl("/tenants/super/instances/56$51/element"));
// when a related task is executed, the url is ~/d/inst/{iid}/rel-task/{task-iid}.htmld
// {iid} in this case is passed in as a Work Set to the related task
// how to determine what Work Set it should be passed in as? I don't think it's simply `Related Instance`
Dictionary<string, string> dict = new Dictionary<string, string>();
dict[KnownInstanceGuids.Classes.Instance.ToString("b")] = "";
message.Content = new FormUrlEncodedContent(dict);
HttpResponseMessage resp = client.Send(message);
Assert.That(resp.StatusCode, Is.EqualTo(System.Net.HttpStatusCode.OK));
Assert.That(resp.Content.Headers.ContentType.ToString(), Is.EqualTo("application/json"));
@ -150,8 +186,6 @@ public class RemoteTests
[Test]
public async Task Globals_Test_Get_Empty_Value()
{
Assert.That(program, Is.Not.Null);
HttpClient client = new HttpClient();
HttpResponseMessage resp = client.Send(new HttpRequestMessage(HttpMethod.Get, BuildUrl(String.Format("/globals/{0}", KnownAttributeGuids.Text.ReferralURL))));
@ -168,8 +202,6 @@ public class RemoteTests
[Test]
public async Task Globals_Test_Set_Value()
{
Assert.That(program, Is.Not.Null);
HttpClient client = new HttpClient();
HttpRequestMessage msg = new HttpRequestMessage(HttpMethod.Post, BuildUrl(String.Format("/globals/{0}", KnownAttributeGuids.Text.ReferralURL)));
msg.Content = new System.Net.Http.FormUrlEncodedContent(new KeyValuePair<string, string>[] { new KeyValuePair<string, string>("value", "test attribute value") });

3
mocha-dotnet/tests/Mocha.Zq.Tests/IntegrationTests.cs
View File

@ -1,10 +1,11 @@
using System;
using Mocha.Core;
using Mocha.Testing;
using Mocha.Zq.Integration;
namespace Mocha.Zq.Tests;
public class IntegrationTests : Mocha.Core.Tests.OmsTestsBase
public class IntegrationTests : OmsTestsBase
{
[Test]