Update XAPI

Author: artem-dudarev

README.md

@@ -53,7 +53,7 @@ Default values based on latest [Stable 10 Release](https://www.virtocommerce.org
 | --CompanyName (or -C) | Your company name| string | Optional | VirtoCommerce |
 | --ModuleName (or -M) | Your module name | string | Optional | NewModule |
 | --PlatformVersion (or -P) | Virto Commerce platform version | string | Optional | 3.876.0 |
-| --XapiVersion (or -X) | XAPI module version | string | Optional | 3.800.0 |
+| --XapiVersion (or -X) | XAPI module version | string | Optional | 3.901.0 |
 
 ## How to uninstall
 

templates/vc-module-xapi-template/.template.config/template.json

@@ -60,7 +60,7 @@
       "type": "parameter",
       "dataType": "string",
       "description": "Required XAPI module Version",
-      "defaultValue": "3.800.0",
+      "defaultValue": "3.901.0",
       "replaces": "{XapiVersion}"
     },
     "KebabModuleName": {

templates/vc-module-xapi-template/vc-module-{KebabModuleName}/module.ignore

@@ -3,15 +3,12 @@ AutoMapper.Extensions.Microsoft.DependencyInjection.dll
 GraphQL.dll
 GraphQL.Authorization.dll
 GraphQL.DataLoader.dll
+GraphQL.MicrosoftDI.dll
 GraphQL.NewtonsoftJson.dll
-GraphQL.Relay.dll
-GraphQL.Server.Core.dll
 GraphQL.Server.Transports.AspNetCore.dll
-GraphQL.Server.Transports.AspNetCore.NewtonsoftJson.dll
-GraphQL.Server.Transports.Subscriptions.Abstractions.dll
-GraphQL.Server.Transports.Subscriptions.WebSockets.dll
-GraphQL.SystemReactive.dll
-GraphQL-Parser.dll
+GraphQL.Server.Ui.GraphiQL.dll
+GraphQL.SystemTextJson.dll
+GraphQLParser.dll
 MediatR.dll
 MediatR.Extensions.Microsoft.DependencyInjection.dll
 Microsoft.AI.DependencyCollector.dll
@@ -25,8 +22,5 @@ Microsoft.Extensions.Logging.ApplicationInsights.dll
 PipelineNet.dll
 System.Diagnostics.PerformanceCounter.dll
 System.Reactive.dll
-System.Reactive.xml
-System.Reactive.Core.dll
-System.Reactive.Linq.dll
 TimeZoneConverter.dll
 VirtoCommerce.Xapi.Core.dll

templates/vc-module-xapi-template/vc-module-{KebabModuleName}/src/{Namespace}.Web/Module.cs

@@ -1,12 +1,10 @@
-using GraphQL.Server;
-using MediatR;
+using GraphQL.MicrosoftDI;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using VirtoCommerce.Xapi.Core.Extensions;
-using VirtoCommerce.Xapi.Core.Infrastructure;
 using VirtoCommerce.Platform.Core.Modularity;
 using VirtoCommerce.Platform.Core.Security;
+using VirtoCommerce.Xapi.Core.Extensions;
 using {Namespace}.Core;
 using {Namespace}.Data;
 
@@ -19,19 +17,18 @@ public class Module : IModule, IHasConfiguration
 
     public void Initialize(IServiceCollection serviceCollection)
     {
-        var assemblyMarker = typeof(AssemblyMarker);
-        var graphQlBuilder = new CustomGraphQLBuilder(serviceCollection);
-        graphQlBuilder.AddGraphTypes(assemblyMarker);
-        serviceCollection.AddMediatR(assemblyMarker);
-        serviceCollection.AddAutoMapper(assemblyMarker);
-        serviceCollection.AddSchemaBuilders(assemblyMarker);
-
         // Override models
         //AbstractTypeFactory<OriginalModel>.OverrideType<OriginalModel, ExtendedModel>().MapToType<ExtendedEntity>();
         //AbstractTypeFactory<OriginalEntity>.OverrideType<OriginalEntity, ExtendedEntity>();
 
         // Register services
         //serviceCollection.AddTransient<IMyService, MyService>();
+
+        // Register GraphQL schema
+        _ = new GraphQLBuilder(serviceCollection, builder =>
+        {
+            builder.AddSchema(serviceCollection, typeof(AssemblyMarker));
+        });
     }
 
     public void PostInitialize(IApplicationBuilder appBuilder)
@@ -41,6 +38,9 @@ public void PostInitialize(IApplicationBuilder appBuilder)
         // Register permissions
         var permissionsRegistrar = serviceProvider.GetRequiredService<IPermissionsRegistrar>();
         permissionsRegistrar.RegisterPermissions(ModuleInfo.Id, "{ModuleName}", ModuleConstants.Security.Permissions.AllPermissions);
+
+        // Register partial GraphQL schema
+        appBuilder.UseScopedSchema<AssemblyMarker>("{KebabModuleName}");
     }
 
     public void Uninstall()