Version 3.8.28.462

Author: ActiveDbSoft CI Service

AngularSpa/AngularSpa.csproj

@@ -27,7 +27,7 @@
 
   <ItemGroup>
 
-    <PackageReference Include="ActiveQueryBuilder.Web.MVC" Version="3.8.27.461" />
+    <PackageReference Include="ActiveQueryBuilder.Web.MVC" Version="3.8.28.462" />
 
   </ItemGroup>
 

AngularSpa/ClientApp/src/app/querybuilder/querybuilder.component.ts

@@ -1,33 +1,33 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-querybuilder',
-  templateUrl: './querybuilder.component.html'
-})
-export class QuerybuilderComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-    const name = 'Angular';
-
-    const qb = document.getElementById('qb');
-    const treeview = document.getElementById('treeview');
-    const navbar = document.getElementById('navbar');
-    const canvas = document.getElementById('canvas');
-    const statusbar = document.getElementById('statusbar');
-    const grid = document.getElementById('grid');
-    const sql = document.getElementById('sql');
-
-    AQB.Web.UI.QueryBuilder(name, qb, { useDefaultTheme: false });
-    AQB.Web.UI.ObjectTreeView(name, treeview);
-    AQB.Web.UI.SubQueryNavigationBar(name, navbar);
-    AQB.Web.UI.Canvas(name, canvas);
-    AQB.Web.UI.StatusBar(name, statusbar);
-    AQB.Web.UI.Grid(name, grid, { orColumnCount: 0 });
-    AQB.Web.UI.SqlEditor(name, sql);
-
-    AQB.Web.UI.startApplication('QueryBuilder/CreateQueryBuilder', name);
-  }
-
-}
+import { Component, OnInit } from '@angular/core';
+
+@Component({
+  selector: 'app-querybuilder',
+  templateUrl: './querybuilder.component.html'
+})
+export class QuerybuilderComponent implements OnInit {
+
+  constructor() { }
+
+  ngOnInit() {
+    const name = 'Angular';
+
+    const qb = document.getElementById('qb');
+    const treeview = document.getElementById('treeview');
+    const navbar = document.getElementById('navbar');
+    const canvas = document.getElementById('canvas');
+    const statusbar = document.getElementById('statusbar');
+    const grid = document.getElementById('grid');
+    const sql = document.getElementById('sql');
+
+    AQB.Web.UI.QueryBuilder(name, qb, { useDefaultTheme: false });
+    AQB.Web.UI.ObjectTreeView(name, treeview);
+    AQB.Web.UI.SubQueryNavigationBar(name, navbar);
+    AQB.Web.UI.Canvas(name, canvas);
+    AQB.Web.UI.StatusBar(name, statusbar);
+    AQB.Web.UI.Grid(name, grid, { orColumnCount: 0 });
+    AQB.Web.UI.SqlEditor(name, sql);
+
+    AQB.Web.UI.autoInit();
+  }
+
+}

AngularSpa/ClientApp/src/assets/aqb.client.js

@@ -0,0 +1,38 @@
+using ActiveQueryBuilder.Core;
+using ActiveQueryBuilder.Web.Server;
+using ActiveQueryBuilder.Web.Server.Infrastructure.Factories;
+using ActiveQueryBuilder.Web.Server.Services;
+
+namespace AngularSpa.Factories
+{
+    public class QueryBuilderFactory : IQueryBuilderInstanceFactory
+    {
+        private readonly IQueryBuilderService _qbService;
+
+        public QueryBuilderFactory(IQueryBuilderService qbService)
+        {
+            _qbService = qbService;
+        }
+
+        public QueryBuilder Create(string name)
+        {
+            var qb = _qbService.Create(name);
+            qb.MetadataLoadingOptions.OfflineMode = true;
+            qb.SyntaxProvider = new GenericSyntaxProvider();
+
+            // Initialize metadata
+            var database = qb.MetadataContainer.AddSchema("dbo");
+            var orders = database.AddTable("Orders");
+            orders.AddField("Id");
+            orders.AddField("Name");
+
+            var customers = database.AddTable("Customers");
+            customers.AddField("Id");
+            customers.AddField("Name");
+
+            qb.MetadataStructure.Refresh();
+
+            return qb;
+        }
+    }
+}

AngularSpa/Controllers/QueryBuilderController.cs

@@ -1,11 +1,13 @@
 using ActiveQueryBuilder.Web.Core;
+using ActiveQueryBuilder.Web.Server.Infrastructure.Factories;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SpaServices.AngularCli;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using QueryBuilderFactory = AngularSpa.Factories.QueryBuilderFactory;
 
 namespace AngularSpa
 {
@@ -26,6 +28,7 @@ public void ConfigureServices(IServiceCollection services)
             // Active Query Builder requires support for Session HttpContext. 
             services.AddSession();
             services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+            services.AddScoped<IQueryBuilderInstanceFactory, QueryBuilderFactory>();
 
             services.AddActiveQueryBuilder();
 

AngularSpa/Factories/QueryBuilderFactory.cs

@@ -18,7 +18,7 @@
   <ItemGroup>
 
 
-    <PackageReference Include="ActiveQueryBuilder.Web.MVC" Version="3.8.27.461" />
+    <PackageReference Include="ActiveQueryBuilder.Web.MVC" Version="3.8.28.462" />
 
   </ItemGroup>
 

AngularSpa/Startup.cs

@@ -29,7 +29,7 @@
       <ItemGroup>
 
 
-        <PackageReference Include="ActiveQueryBuilder.Web.MVC" Version="3.8.27.461" />
+        <PackageReference Include="ActiveQueryBuilder.Web.MVC" Version="3.8.28.462" />
 
       </ItemGroup>
     </Otherwise>