v0.94.2 fix missing reference

This commit is contained in:
Frede Hundewadt 2023-01-04 14:32:11 +01:00
parent cb4cfce5bc
commit 972fceb948
35 changed files with 75 additions and 78 deletions

View file

@ -49,23 +49,23 @@ namespace Wonky.Client.HttpInterceptors
_authenticationService = authenticationService;
}
public void RegisterAfterSendEvent()
public void RegisterEvent()
{
_interceptor.AfterSend += InterceptorAfterSend;
_interceptor.AfterSend += AfterSend;
}
public void RegisterBeforeSendAsyncEvent()
public void RegisterBeforeSendEvent()
{
_interceptor.BeforeSendAsync += InterceptBeforeSendAsync;
_interceptor.BeforeSendAsync += InterceptBeforeSend;
}
public void DisposeEvent()
{
_interceptor.AfterSend -= InterceptorAfterSend;
_interceptor.BeforeSendAsync -= InterceptBeforeSendAsync;
_interceptor.AfterSend -= AfterSend;
_interceptor.BeforeSendAsync -= InterceptBeforeSend;
}
private async Task InterceptBeforeSendAsync(object sender, HttpClientInterceptorEventArgs e)
private async Task InterceptBeforeSend(object sender, HttpClientInterceptorEventArgs e)
{
var absolutePath = e.Request.RequestUri.AbsolutePath;
if (!absolutePath.Contains("token"))
@ -81,7 +81,7 @@ namespace Wonky.Client.HttpInterceptors
}
private void InterceptorAfterSend (object sender, HttpClientInterceptorEventArgs e)
private void AfterSend (object sender, HttpClientInterceptorEventArgs e)
{
if (e.Response == null || e.Response.IsSuccessStatusCode)
return;

View file

@ -68,10 +68,7 @@ public class AdvisorReportRepository : IAdvisorReportRepository
var result = await _client.GetAsync($"{_apiConfig.CrmReports}");
if (!result.IsSuccessStatusCode)
return new List<SalesReportListView>();
var content = await result.Content.ReadAsStringAsync();
return string.IsNullOrWhiteSpace(content)
? new List<SalesReportListView>()
: JsonSerializer.Deserialize<List<SalesReportListView>>(content, _options);
return await result.Content.ReadFromJsonAsync<List<SalesReportListView>>();
}
/// <summary>

View file

@ -40,8 +40,8 @@ public partial class AdminReportListPage : IDisposable
/// </summary>
protected override async Task OnParametersSetAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
UserInfo = await SystemUserRepo.GetAdvisorInfo(UserId);
while (string.IsNullOrWhiteSpace(UserInfo.UserId))

View file

@ -88,8 +88,8 @@ public partial class AdminReportViewPage : IDisposable
protected override async Task OnParametersSetAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
ProfileService.OnChange += ProfileServiceOnOnChange;
await ProfileService.SetWorkDate(DateTime.Parse(ReportDate));

View file

@ -15,8 +15,8 @@ public partial class AdminSalesRepListPage
protected override async Task OnInitializedAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
var AdvisorList = await SystemUserRepo.GetAdvisors();
SalesReps = AdvisorList
.Where(x => x.CountryCode.ToLower() == CountryCode && Convert.ToInt32(x.SalesRep) < 100)

View file

@ -51,8 +51,8 @@ public partial class AdvisorCatalogPage : IDisposable
_page.SearchColumn = Prefs.ItemSearch;
_page.PageSize = Convert.ToInt32(Prefs.PageSize);
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
await FetchSalesItems();
}

View file

@ -88,8 +88,8 @@ public partial class AdvisorCreateActivityPage : IDisposable
ActivityContext.OnFieldChanged += HandleFieldChanged;
ActivityContext.OnValidationStateChanged += ValidationChanged;
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
// User Preferences
UserPrefs = await Profiles.GetPreferences();
// User Info

View file

@ -79,8 +79,8 @@ namespace Wonky.Client.Pages
Company.LastVisit = $"{LastVisit:yyyy-MM-dd}";
Company.NextVisit = $"{NextVisit:yyyy-MM-dd}";
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
}

View file

@ -37,8 +37,8 @@ public partial class AdvisorCustomerActivityListPage : IDisposable
protected override async Task OnInitializedAsync()
{
_interceptor.RegisterAfterSendEvent();
_interceptor.RegisterBeforeSendAsyncEvent();
_interceptor.RegisterEvent();
_interceptor.RegisterBeforeSendEvent();
Company = await CompanyRepo.GetCompanyById(CompanyId);
await GetActivities();

View file

@ -50,8 +50,8 @@ public partial class AdvisorCustomerInventoryListPage : IDisposable
protected override async Task OnInitializedAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
Company = await CompanyRepo.GetCompanyById(CompanyId);

View file

@ -37,8 +37,8 @@ public partial class AdvisorCustomerInvoiceListPage : IDisposable
protected override async Task OnInitializedAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
Company = await CompanyRepo.GetCompanyById(_companyId);

View file

@ -46,8 +46,8 @@ namespace Wonky.Client.Pages
protected override void OnParametersSet()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
}

View file

@ -52,8 +52,8 @@ public partial class AdvisorCustomerOrderViewPage : IDisposable
protected override async Task OnInitializedAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
// fetch order from backend
_reportItem = await AdvisorActivityRepo.GetReportItem(OrderId);
Logger.LogDebug("ReportItem => \n {}", JsonSerializer.Serialize(_reportItem, _options));

View file

@ -69,8 +69,8 @@ public partial class AdvisorCustomerViewPage : IDisposable
protected override async Task OnInitializedAsync()
{
// setup interceptor
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
// initialize default contact
DefaultContact = new ContactDto { CompanyId = CompanyId, ContactId = "", FirstName = ""};

View file

@ -28,8 +28,8 @@ public partial class AdvisorQuoteListPage : IDisposable
protected override async Task OnInitializedAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
Working = true;
Quotes = await AdvisorActivityRepo.GetQuotes();
await Storage.SetItemAsync("quotes", Quotes.OrderBy(x => x.Company.Name));

View file

@ -57,8 +57,8 @@ public partial class AdvisorReportCreatePage : IDisposable
/// </summary>
protected override async Task OnInitializedAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
ReportContext = new EditContext(Report);
ReportContext.OnFieldChanged += HandleFieldChanged;

View file

@ -34,14 +34,14 @@ public partial class AdvisorReportListPage : IDisposable
protected override async Task OnInitializedAsync()
{
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendEvent();
Interceptor.RegisterEvent();
Working = true;
var reports = await AdvisorReportRepo.GetReports();
if (reports.Any())
ReportList = ReportList.OrderByDescending(x => x.ReportDate).ToList();
ReportList = reports.OrderByDescending(x => x.ReportDate).ToList();
Working = false;
}

View file

@ -42,8 +42,8 @@ public partial class AdvisorReportViewPage : IDisposable
protected override async Task OnInitializedAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
UserInfo = await Storage.GetItemAsync<UserInfoView>("_xu");

View file

@ -45,8 +45,8 @@ public partial class AdvisorTaskItemListCrmPage : IDisposable
if(!string.IsNullOrWhiteSpace(Prefs.WorkDate))
WorkDate = Prefs.WorkDate;
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
await GetTaskItems(WorkDate);
Working = false;
}

View file

@ -36,8 +36,8 @@ public partial class AdvisorTaskItemViewCrmPage : IDisposable
protected override async Task OnParametersSetAsync()
{
_interceptor.RegisterAfterSendEvent();
_interceptor.RegisterBeforeSendAsyncEvent();
_interceptor.RegisterEvent();
_interceptor.RegisterBeforeSendEvent();
_taskItem = await AdvisorTaskRepo.GetTaskItem(TaskItemId);
Console.WriteLine(JsonSerializer.Serialize(_taskItem));

View file

@ -42,8 +42,8 @@ public partial class AdvisorTodayActivityListPage : IDisposable
protected override async Task OnInitializedAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
UserPref = await UserProfileService.GetPreferences();
SelectedDate = string.IsNullOrWhiteSpace(UserPref.WorkDate) ? DateTime.Now : DateTime.Parse(UserPref.WorkDate);
ReportExist = await AdvisorReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}");

View file

@ -47,8 +47,8 @@ public partial class AdvisorViewActivityPage : IDisposable
protected override async Task OnInitializedAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
NoteContext = new EditContext(Note);
NoteContext.OnFieldChanged += HandleFieldChanged;
ReportItem = await AdvisorActivityRepo.GetReportItem(OrderId);

View file

@ -36,8 +36,8 @@ public partial class AdvisorWorkplaceListPage : IDisposable
protected override async Task OnParametersSetAsync()
{
_interceptor.RegisterAfterSendEvent();
_interceptor.RegisterBeforeSendAsyncEvent();
_interceptor.RegisterEvent();
_interceptor.RegisterBeforeSendEvent();
_company = await _companyRepo.GetCompanyById(CompanyId);
Working = false;
}

View file

@ -39,8 +39,8 @@ public partial class AdvisorWorkplaceViewPage : IDisposable
protected override async Task OnParametersSetAsync()
{
_interceptor.RegisterAfterSendEvent();
_interceptor.RegisterBeforeSendAsyncEvent();
_interceptor.RegisterEvent();
_interceptor.RegisterBeforeSendEvent();
_workplace = await WorkplaceCrmRepo.GetWorkplace(CompanyId, WorkplaceId);
Working = false;

View file

@ -53,8 +53,8 @@ public partial class BackendAdminSalesRepViewPage : IDisposable
_editContext = new EditContext(_updateInfo);
_passwdContext = new EditContext(_passwords);
_interceptor.RegisterAfterSendEvent();
_interceptor.RegisterBeforeSendAsyncEvent();
_interceptor.RegisterEvent();
_interceptor.RegisterBeforeSendEvent();
UserInfo = await SystemUserRepo.GetAdvisorInfo(UserId);

View file

@ -48,8 +48,8 @@ public partial class CountryCatalogPage : IDisposable
Paging.SearchColumn = Prefs.ItemSearch;
Paging.PageSize = Convert.ToInt32(Prefs.PageSize);
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
await FetchSalesItems();
}

View file

@ -47,8 +47,8 @@ namespace Wonky.Client.Pages
protected override async Task OnParametersSetAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
// set preferences
Prefs = await ProfileService.GetPreferences();

View file

@ -41,8 +41,8 @@ public partial class CountryPrintCatalogPage : IDisposable
protected override async Task OnParametersSetAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
UserInfo = await Storage.GetItemAsync<UserInfoView>("_xu");
Items = await Catalog.GetPriceList(CountryCode);

View file

@ -40,7 +40,7 @@ public partial class CountrySalesRepCustomerListPage : IDisposable
protected override async Task OnParametersSetAsync()
{
Interceptor.DisposeEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterBeforeSendEvent();
// set preferences
UserPref = await UserProfileService.GetPreferences();

View file

@ -40,8 +40,8 @@ public partial class PrintCatalogPage : IDisposable
protected override async Task OnInitializedAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
UserInfo = await Storage.GetItemAsync<UserInfoView>("_xu");
Items = await ItemRepo.GetPriceList();

View file

@ -20,8 +20,8 @@ public partial class WarehouseOrderListPage : IDisposable
private bool ReadyToShip { get; set; }
protected override async Task OnParametersSetAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
OrderList = await FetchOrders(Status);
}

View file

@ -39,8 +39,8 @@ public partial class WarehouseOrderViewPage : IDisposable
protected override async Task OnParametersSetAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
if (!string.IsNullOrWhiteSpace(OrderId))
Order = await WarehouseRepo.GetWarehouseOrder(OrderId);

View file

@ -37,8 +37,8 @@ public partial class InvoiceViewModal : IDisposable
protected override async Task OnParametersSetAsync()
{
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
if (!string.IsNullOrWhiteSpace(InvoiceId))
{

View file

@ -45,8 +45,8 @@ public partial class PriceListModal : IDisposable
_paging.OrderBy = _userPref.ItemSort;
_paging.SearchColumn = _userPref.ItemSearch;
_paging.PageSize = Convert.ToInt32(_userPref.PageSize);
Interceptor.RegisterAfterSendEvent();
Interceptor.RegisterBeforeSendAsyncEvent();
Interceptor.RegisterEvent();
Interceptor.RegisterBeforeSendEvent();
await GetSalesItems();
}

View file

@ -1,7 +1,7 @@
{
"appInfo": {
"name": "Wonky Client",
"version": "0.94.1",
"version": "0.94.2",
"rc": true,
"sandBox": false,
"image": "grumpy-coder.png"