diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index 08540145..842507d3 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -15,6 +15,8 @@ @using TIAMSharedUI.Shared.Components.Grids @using AyCode.Core.Enums @using AyCode.Core.Extensions +@using AyCode.Core.Consts +@using AyCode.Core @layout AdminLayout @inject IEnumerable LogWriters @inject IStringLocalizer localizer @@ -103,17 +105,17 @@ - - - @{ - Guid? idKeyField = context.Value as Guid?; - string editUri = $"mytransfers/{idKeyField}"; - - @idKeyField - } - - - + + + + @{ + var idKeyField = ((Transfer)context.DataItem).Id as Guid?; + var editUri = $"mytransfers/{idKeyField}"; + + @context.Value + } + + @@ -151,7 +153,21 @@ - + + + + + + + + + + + diff --git a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs index 868c3fd9..d159ee18 100644 --- a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs @@ -1,4 +1,5 @@ using System.ComponentModel; +using AyCode.Core; using AyCode.Core.Enums; using AyCode.Core.Extensions; using AyCode.Core.Helpers; @@ -232,6 +233,18 @@ namespace TIAMSharedUI.Shared.Components.Grids //ShowGroupPanel = true; //AllowSort = false; + TextWrapEnabled = false; + + //var columns = GetColumns(); + //var dataColumns = GetDataColumns(); + + //var idColumn = dataColumns.FirstOrDefault(x => x.FieldName == nameof(IId.Id)); + //if (idColumn != null) + //{ + // idColumn.ShowInColumnChooser = AcDomain.IsDeveloperVersion; + // idColumn.Visible = !AcDomain.IsDeveloperVersion; + //} + IsFirstInitializeParameters = true; } diff --git a/TIAMWebApp/Server/Controllers/MessageAPIController.cs b/TIAMWebApp/Server/Controllers/MessageAPIController.cs index c8a6d0db..b80cf82f 100644 --- a/TIAMWebApp/Server/Controllers/MessageAPIController.cs +++ b/TIAMWebApp/Server/Controllers/MessageAPIController.cs @@ -86,7 +86,7 @@ namespace TIAMWebApp.Server.Controllers _logger.Info($@"GetMessagessByContextId called with ownerId: {contextId}"); - var messages = _adminDal.GetEmailMessagesByContextIdAsync(contextId); + var messages = await _adminDal.GetEmailMessagesByContextIdAsync(contextId); //put Company id and name into a dictionary return messages.ToJson(); diff --git a/TIAMWebApp/Server/Program.cs b/TIAMWebApp/Server/Program.cs index 353fa1f1..757559a9 100644 --- a/TIAMWebApp/Server/Program.cs +++ b/TIAMWebApp/Server/Program.cs @@ -17,6 +17,7 @@ using TIAMWebApp.Server.Services; using Microsoft.AspNetCore.Server.Kestrel.Core; using Microsoft.AspNetCore.ResponseCompression; using System.IO.Compression; +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; var builder = WebApplication.CreateBuilder(args); @@ -154,6 +155,8 @@ builder.Services.AddResponseCompression(options => builder.Services.Configure(options => options.Level = CompressionLevel.Optimal); builder.Services.Configure(options => options.Level = CompressionLevel.Optimal); +//builder.Services.AddSingleton(sp => (sp.GetRequiredService() as IWebHostEnvironment)!); + var app = builder.Build(); // Configure the HTTP request pipeline. diff --git a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs index 289512f3..07d738f7 100644 --- a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs +++ b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs @@ -82,7 +82,7 @@ public class DevAdminSignalRHub : Hub, IAcSignalRHubServe //private readonly ServiceProviderAPIController _serviceProviderApiController; //private readonly TransferDataAPIController _transferDataApiController; - public DevAdminSignalRHub(AdminDal adminDal, ServiceProviderAPIController serviceProviderApiController, TransferDataAPIController transferDataApiController, IEnumerable logWriters, MessageAPIController messageApiController) + public DevAdminSignalRHub(AdminDal adminDal, ServiceProviderAPIController serviceProviderApiController, TransferDataAPIController transferDataApiController, MessageAPIController messageApiController, IEnumerable logWriters) { _adminDal = adminDal; //_serviceProviderApiController = serviceProviderApiController;