Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
* 2026-07-13 - AB#190: Shared library for rules cache registration and rules loading.
* 2026-07-10 - AB#172: Plus one Sonar recommendation.
* 2026-07-10 - AB#172: Dockerfile must run as nonroot.
* 2026-07-10 - AB#172: Remove unrequired test file name.
Expand Down
22 changes: 19 additions & 3 deletions Contoso.Spa.Api/Controllers/TransferController.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using Contoso.Spa.Flow.Rules;
using Contoso.Spa.Flow.Rules.Interfaces;
using Contoso.Spa.Flow;
using LogicBuilder.App.Utils.Rules;
using LogicBuilder.App.Utils.Rules.Interfaces;
using LogicBuilder.DataContracts;
using LogicBuilder.RulesDirector;
using Microsoft.AspNetCore.Mvc;
Expand Down Expand Up @@ -33,7 +34,22 @@ await _rulesLoader.LoadRules
moduleData.ResourcesStream,
moduleData.RulesStream
),
_rulesCache
_rulesCache,
new RulesLoaderRequest
(
"Contoso.Spa.Flow.Rulesets",
typeof(FlowActivity),
[
typeof(LogicBuilder.App.Utils.Interfaces.ITypeHelper).Assembly,
typeof(LogicBuilder.App.Spa.Forms.Parameters.CommandButtonParameters).Assembly,
typeof(LogicBuilder.App.Spa.Forms.Configuration.CommandButtonDescriptor).Assembly,
typeof(LogicBuilder.Forms.Parameters.Expansions.SelectExpandDefinitionParameters).Assembly,
typeof(Domain.Entities.StudentModel).Assembly,
typeof(Data.Entities.Course).Assembly,
typeof(DirectorBase).Assembly,
typeof(string).Assembly
]
)
);

return NoContent();
Expand Down
2 changes: 1 addition & 1 deletion Contoso.Spa.Flow/Contoso.Spa.Flow.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
<PackageReference Include="LogicBuilder.App.Spa.AutoMapperProfiles" Version="1.0.3" />
<PackageReference Include="LogicBuilder.App.Spa.Forms.Configuration" Version="1.0.1" />
<PackageReference Include="LogicBuilder.App.Spa.Forms.Parameters" Version="1.0.1" />
<PackageReference Include="LogicBuilder.App.Utils" Version="1.0.3" />
<PackageReference Include="LogicBuilder.App.Utils" Version="1.0.5" />
<PackageReference Include="LogicBuilder.EntityFrameworkCore" Version="8.0.3" />
<PackageReference Include="LogicBuilder.RulesDirector" Version="2.0.6" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.9" />
Expand Down
11 changes: 0 additions & 11 deletions Contoso.Spa.Flow/Rules/Interfaces/IRulesLoader.cs

This file was deleted.

11 changes: 0 additions & 11 deletions Contoso.Spa.Flow/Rules/Interfaces/IRulesSerializer.cs

This file was deleted.

23 changes: 0 additions & 23 deletions Contoso.Spa.Flow/Rules/RulesCache.cs

This file was deleted.

62 changes: 0 additions & 62 deletions Contoso.Spa.Flow/Rules/RulesLoader.cs

This file was deleted.

76 changes: 0 additions & 76 deletions Contoso.Spa.Flow/Rules/RulesLoaderService.cs

This file was deleted.

9 changes: 0 additions & 9 deletions Contoso.Spa.Flow/Rules/RulesModule.cs

This file was deleted.

73 changes: 0 additions & 73 deletions Contoso.Spa.Flow/Rules/RulesSerializer.cs

This file was deleted.

17 changes: 0 additions & 17 deletions Contoso.Spa.Flow/Rules/RulesServiceRegistrations.cs

This file was deleted.

Binary file modified Contoso.Spa.Flow/Rulesets/about.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/callterminateflow.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/courses.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/departments.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/get-selector.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/home.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/instructors.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/item_filter_courses.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/item_filter_departments.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/item_filter_instructors.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/item_filter_students.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/nav_about.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/nav_courses.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/nav_departments.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/nav_home.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/nav_instructors.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/nav_students.module
Binary file not shown.
Binary file modified Contoso.Spa.Flow/Rulesets/students.module
Binary file not shown.
20 changes: 19 additions & 1 deletion Contoso.Spa.Flow/SpaFlowServiceRegistrations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Contoso.Spa.Flow.Cache.Interfaces;
using Contoso.Spa.Flow.Interfaces;
using LogicBuilder.App.Spa.AutoMapperProfiles;
using LogicBuilder.App.Utils.Rules;
using LogicBuilder.EntityFrameworkCore.Mapping;
using LogicBuilder.RulesDirector;
using Microsoft.Extensions.Logging.Abstractions;
Expand All @@ -19,7 +20,24 @@ public static IServiceCollection AddSpaFlowServices(this IServiceCollection serv
return services
.AddAppUtilsServices()
.AddFlowFactories()
.AddRulesCacheService()
.AddRulesCacheService
(
new RulesLoaderRequest
(
"Contoso.Spa.Flow.Rulesets",
typeof(FlowActivity),
[
typeof(LogicBuilder.App.Utils.Interfaces.ITypeHelper).Assembly,
typeof(LogicBuilder.App.Spa.Forms.Parameters.CommandButtonParameters).Assembly,
typeof(LogicBuilder.App.Spa.Forms.Configuration.CommandButtonDescriptor).Assembly,
typeof(LogicBuilder.Forms.Parameters.Expansions.SelectExpandDefinitionParameters).Assembly,
typeof(Contoso.Domain.Entities.StudentModel).Assembly,
typeof(Contoso.Data.Entities.Course).Assembly,
typeof(DirectorBase).Assembly,
typeof(string).Assembly
]
)
)
.AddTransient<ICustomActions, CustomActions>()
.AddTransient<ICustomDialogs, CustomDialogs>()
.AddTransient<IFlowManager, FlowManager>()
Expand Down
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/build/about.module
Binary file not shown.
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/build/courses.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/build/departments.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/build/get-selector.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/build/home.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/build/instructors.module
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/build/nav_about.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/build/nav_courses.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/build/nav_departments.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/build/nav_home.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/build/nav_instructors.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/build/nav_students.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/build/students.module
Binary file not shown.
Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/diagram/about.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/diagram/courses.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/diagram/departments.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/diagram/get-selector.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/diagram/home.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/diagram/instructors.module
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/diagram/nav_about.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/diagram/nav_courses.module
Binary file not shown.
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/diagram/nav_home.module
Binary file not shown.
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/diagram/nav_students.module
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/RULES/App01/diagram/students.module
Binary file not shown.
Binary file not shown.
Binary file modified FlowProjects/Contoso.SPA/SOURCE/Transient/get-selector.vsdx
Binary file not shown.
2 changes: 1 addition & 1 deletion FlowProjects/Contoso.SPA/functions.data

Large diffs are not rendered by default.

Binary file modified FlowProjects/Contoso.SPA/functions.data.xml
Binary file not shown.
Loading