Sarand/BusinessMgr-2019
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

3.0.0.4 Portal Commodity Sales properties. Control Index population.

Browse Source
This commit is contained in:
Andy Howard
2025-02-11 21:03:34 +00:00
parent a7bec4e806
commit ef4da874b0
80 changed files with 1294 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaBusinessMgrCoreWebControl/Control/App/SbmApplication_Control.cs
+6 -2
View File
@@ -24,6 +24,7 @@ using Sarand.Net.Standard.Dbas.ItemOptions;
using Sarand.Net.Standard.Dbas.Security;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
namespace Sarand.BusinessMgr.Web.Control.App
@@ -242,13 +243,16 @@ namespace Sarand.BusinessMgr.Web.Control.App
else if (AppConfig.Instance.EqualsCI("PreProd")) instanceType = Sbm.InstanceType.UAT;
// Initialise hard-coded logging path.
if (StringUtil.IsEmpty(LoggingRootFolder))
if (StringUtil.IsBlank(LoggingRootFolder))
{
if (SbmSystem.ComputerName.EqualsCI("WIN-BPCLM1QUOMT"))
LoggingRootFolder = @"D:\Sbmonite\Logs\" + (Development ? "Dev" : "Test");
}
if (DirectoryUtil.DirectoryExists(LoggingRootFolder))
SaLogger.LogFolder = LoggingRootFolder;
{
SaLogger.LogFolder = Path.Combine(LoggingRootFolder, Sbm.Config.Logging.Folder.WebControl);
FileUtil.ValidateDirectory(SaLogger.LogFolder, true);
}
LogApplicationStart($"{SysUtil.Fn}");
// Control database connection.
SaBusinessMgrCoreWebControl/Control/Controllers/Instance/RepositoryDatabaseController-Ajax.cs
+91 -6
View File
@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using NPOI.SS.Formula.Functions;
using Sarand.BusinessMgr.Net.Standard.Base.Bus.Control;
using Sarand.BusinessMgr.Net.Standard.Dbas.Consoles;
using Sarand.BusinessMgr.Web.Control.Components;
using Sarand.BusinessMgr.Web.Control.Consoles;
using Sarand.BusinessMgr.Web.Control.Models.Instance;
@@ -10,6 +11,7 @@ using Sarand.Net.Standard.Base.Bus;
using Sarand.Net.Standard.Base.Core;
using Sarand.Net.Standard.Base.Dbas;
using Sarand.Net.Standard.Base.Utils;
using Sarand.Net.Standard.Dbas.Base;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -61,17 +63,17 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
{
// Validate Repository.
SessionData_Control.Profile.Filter.InstanceContext = model.Filter.Context;
if (StringUtil.IsBlank(model.Filter.Context))
SessionData_Control.Profile.Filter.InstanceContext = model.DatabaseFilter.Context;
if (StringUtil.IsBlank(model.DatabaseFilter.Context))
{
SaLogger.Warn($"{SysUtil.Fn} Instance Context not supplied.");
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.system"]));
}
SbmcRepository repository = ControlInstanceMgr.GetRepositoryByContext(model.Filter.Context);
SbmcRepository repository = ControlInstanceMgr.GetRepositoryByContext(model.DatabaseFilter.Context);
disposables.Add(repository);
if (repository == null)
{
SaLogger.Warn($"{SysUtil.Fn} Repository does not exist. Context: {model.Filter.Context}.");
SaLogger.Warn($"{SysUtil.Fn} Repository does not exist. Context: {model.DatabaseFilter.Context}.");
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.system"]));
}
@@ -88,8 +90,8 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
// Table filter.
List<String> filter = new List<string>();
if (!StringUtil.IsBlank(model.Filter.Search))
filter.Add($"tbl.name Like '%{DbQuery.FormatForLike(model.Filter.Search)}%'");
if (!StringUtil.IsBlank(model.DatabaseFilter.Search))
filter.Add($"tbl.name Like '%{DbQuery.FormatForLike(model.DatabaseFilter.Search)}%'");
if (!filter.Any()) filter.Add("1=1");
// Construction query.
@@ -133,6 +135,89 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
return Json(responseData);
}
//-------------------------------------------------------------------
// Populate Repository Database Indices ajax request.
//-------------------------------------------------------------------
private class AjaxResponse_RepositoryIndexPopulation : AjaxResponse_Data
{
// Construction.
public AjaxResponse_RepositoryIndexPopulation(SbmModel_Control model) : base(model) { }
// Stats.
public class StatsData
{
public int? PrimaryIndicesCreated { get; set; }
public int? IndicesCreated { get; set; }
public int? IndicesDropped { get; set; }
}
public StatsData Stats { get; } = new StatsData();
}
//-------------------------------------------------------------------
[HttpPost]
[Route("Instance/Repository/Ajax/PopulateIndices")]
public IActionResult Ajax_PopulateRepositoryDatabaseIndices(Model_RepositoryDatabase model)
{
String messageTitle = Localiser["label.database"];
AjaxResponse_RepositoryIndexPopulation responseData = new AjaxResponse_RepositoryIndexPopulation(model);
// Validate session and referrer.
if (!ValidReferer) return Forbid();
if (!ValidUserSession) return GetAjaxResult_InvalidSession(responseData);
RefreshModel(model);
// Record disposable items as they are created so all can be disposed when needed.
using (DisposableCollection<SacsDisposable> disposables = new DisposableCollection<SacsDisposable>())
{
// Validate Repository.
SessionData_Control.Profile.Filter.InstanceContext = model.DatabaseFilter.Context;
if (StringUtil.IsBlank(model.DatabaseFilter.Context))
{
SaLogger.Warn($"{SysUtil.Fn} Instance Context not supplied.");
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.system"]));
}
SbmcRepository repository = ControlInstanceMgr.GetRepositoryByContext(model.DatabaseFilter.Context);
disposables.Add(repository);
if (repository == null)
{
SaLogger.Warn($"{SysUtil.Fn} Repository does not exist. Context: {model.DatabaseFilter.Context}.");
return Json(responseData.SetMessage(messageTitle, Localiser["msg.error.system"]));
}
// Repository Console.
SbmCoreInstanceConsole_Control instanceConsole = new SbmCoreInstanceConsole_Control(SessionData_Control, repository);
disposables.Add(instanceConsole);
SbmDatabaseConsole dbConsole = new SbmDatabaseConsole(instanceConsole.Internals.SessionContext);
// Populate indices.
SaLogger.Info($"{SysUtil.Fn} Populating indices for Repository Context '{model.DatabaseFilter.Context}'.", true);
SacsDatabaseConsole.IndexStats indexStats = new SacsDatabaseConsole.IndexStats();
dbConsole.InstallDbIndices(indexStats);
if (dbConsole.HasErrorState())
return Json(responseData.SetMessage(messageTitle, $"Error encountered: {dbConsole.ErrorStateMessage.Trim('.')}."));
// Statistics.
if (indexStats.PrimaryIndicesCreated > 0)
responseData.Stats.PrimaryIndicesCreated = indexStats.PrimaryIndicesCreated;
if (indexStats.IndicesCreated > 0)
responseData.Stats.IndicesCreated = indexStats.IndicesCreated;
if (indexStats.IndicesDropped > 0)
responseData.Stats.IndicesDropped = indexStats.IndicesDropped;
List<String> statsOutput = new List<string>();
if (indexStats.PrimaryIndicesCreated > 0)
statsOutput.Add($"Primary Created: {indexStats.PrimaryIndicesCreated}.");
if (indexStats.IndicesCreated > 0)
statsOutput.Add($"Indices Created: {indexStats.IndicesCreated}.");
if (indexStats.IndicesDropped > 0)
statsOutput.Add($"Indices dropped: {indexStats.IndicesDropped}.");
responseData.SetMessage(messageTitle, $"Indices populated.\n{statsOutput.Concat("", "\n")}");
}
// Complete response.
responseData.Success = true;
return Json(responseData);
}
//-------------------------------------------------------------------
}
//=======================================================================
SaBusinessMgrCoreWebControl/Control/Controllers/Instance/RepositoryDatabaseController.cs
+1 -1
View File
@@ -36,7 +36,7 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.Instance
// Refresh model.
RefreshModel(model);
model.Filter.Context = SessionData_Control.Profile.Filter.InstanceContext;
model.DatabaseFilter.Context = SessionData_Control.Profile.Filter.InstanceContext;
// Core Database view.
return View("Views/Instance/Repository/Database/Tables.cshtml", model);
SaBusinessMgrCoreWebControl/Control/Controllers/System/SystemController-Ajax-Database.cs
+9 -1
View File
@@ -68,10 +68,18 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.System
// Record disposable items as they are created so all can be disposed when needed.
using (DisposableCollection<SacsDisposable> disposableItems = new DisposableCollection<SacsDisposable>())
{
// Database connection.
// Database instance.
Sbm.Database databaseInstance = EnumUtil.ParseEnum(StringUtil.EmptyOnNull(model.DatabaseFilter.Instance), Sbm.Database.Unknown);
if (databaseInstance <= 0)
return Json(responseData.SetMessage(messageTitle, $"Database instance must be specified."));
// Context.
if (databaseInstance == Sbm.Database.BusMgr)
{
if (StringUtil.IsBlank(model.DatabaseFilter.Context))
return Json(responseData.SetMessage(messageTitle, "BusMgr Database context must be specified"));
}
ISacsDatabase db = GetDatabase(databaseInstance, model.DatabaseFilter.Context);
if (db == null)
return Json(responseData.SetMessage(messageTitle, $"Database unavailable for instance '{databaseInstance}'."));
SaBusinessMgrCoreWebControl/Control/Controllers/System/SystemController.cs
+2 -1
View File
@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Logging;
using Sarand.BusinessMgr.Net.Core.Web.App;
using Sarand.BusinessMgr.Net.Standard.Base.App;
using Sarand.BusinessMgr.Web.Control.Components;
using Sarand.BusinessMgr.Web.Control.Models.System;
using Sarand.Net.Standard.Base.Utils;
@@ -53,7 +54,7 @@ namespace Sarand.BusinessMgr.Web.Control.Controllers.System
// Refresh model.
Model_System model = new Model_System(Localiser);
RefreshModel(model);
model.LogsFilter.Folder = StringUtil.OnBlank(SessionData_Control.System.Logs.Filter.Folder, "Control");
model.LogsFilter.Folder = StringUtil.OnBlank(SessionData_Control.System.Logs.Filter.Folder, Sbm.Config.Logging.Folder.WebControl);
model.LogsFilter.Year = StringUtil.OnBlank(SessionData_Control.System.Logs.Filter.Year, DateTime.Today.ToString("yyyy"));
model.LogsFilter.Month = StringUtil.OnBlank(SessionData_Control.System.Logs.Filter.Month, DateTime.Today.ToString("yyyyMM"));
SaBusinessMgrCoreWebControl/Control/Models/Instance/Model_RepositoryDatabase.cs
+2 -1
View File
@@ -21,7 +21,8 @@ namespace Sarand.BusinessMgr.Web.Control.Models.Instance
public String Context { get; set; }
public String Search { get; set; }
}
public FilterData Filter { get; } = new FilterData();
// Naming in line with System model so that Database views can use either.
public FilterData DatabaseFilter { get; } = new FilterData();
//-------------------------------------------------------------------
}
SaBusinessMgrCoreWebControl/Control/Models/System/Model_System.cs
+1
View File
@@ -31,6 +31,7 @@ namespace Sarand.BusinessMgr.Web.Control.Models.System
public String Context { get; set; }
public String Search { get; set; }
}
// Naming in line with Repository Database model so that Database views can use either.
public DatabaseFilterData DatabaseFilter { get; } = new DatabaseFilterData();
public class DatabaseTableData
{