Upgrade to Preview8

This commit is contained in:
Shaun Walker
2019-08-14 13:28:49 -04:00
parent 77d131637c
commit 03c7a99906
26 changed files with 32 additions and 31 deletions

View File

@ -20,7 +20,7 @@ else
private bool Installed = false; private bool Installed = false;
private PageState PageState { get; set; } private PageState PageState { get; set; }
protected override async Task OnInitAsync() protected override async Task OnInitializedAsync()
{ {
var response = await InstallationService.IsInstalled(); var response = await InstallationService.IsInstalled();
Installed = response.Success; Installed = response.Success;

View File

@ -26,7 +26,7 @@
@code { @code {
List<Page> pages; List<Page> pages;
protected override void OnInit() protected override void OnInitialized()
{ {
// display list of pages which are children of current page // display list of pages which are children of current page
pages = PageState.Pages.Where(item => item.ParentId == PageState.Page.PageId).ToList(); pages = PageState.Pages.Where(item => item.ParentId == PageState.Page.PageId).ToList();

View File

@ -34,7 +34,7 @@ else
List<ModuleDefinition> moduledefinitions; List<ModuleDefinition> moduledefinitions;
protected override async Task OnInitAsync() protected override async Task OnInitializedAsync()
{ {
moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(); moduledefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync();
} }

View File

@ -84,7 +84,7 @@
RenderFragment DynamicComponent { get; set; } RenderFragment DynamicComponent { get; set; }
object settings; object settings;
protected override async Task OnInitAsync() protected override async Task OnInitializedAsync()
{ {
title = ModuleState.Title; title = ModuleState.Title;
containers = ThemeService.GetContainerTypes(await ThemeService.GetThemesAsync()); containers = ThemeService.GetContainerTypes(await ThemeService.GetThemesAsync());

View File

@ -131,7 +131,7 @@
string viewpermissions = "All Users"; string viewpermissions = "All Users";
string editpermissions = "Administrators"; string editpermissions = "Administrators";
protected override void OnInit() protected override void OnInitialized()
{ {
themes = ThemeService.GetThemeTypes(PageState.Themes); themes = ThemeService.GetThemeTypes(PageState.Themes);
panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes); panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes);

View File

@ -132,7 +132,7 @@
string viewpermissions; string viewpermissions;
string editpermissions; string editpermissions;
protected override void OnInit() protected override void OnInitialized()
{ {
themes = ThemeService.GetThemeTypes(PageState.Themes); themes = ThemeService.GetThemeTypes(PageState.Themes);
panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes); panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes);

View File

@ -133,7 +133,7 @@
string viewpermissions; string viewpermissions;
string editpermissions; string editpermissions;
protected override void OnInit() protected override void OnInitialized()
{ {
themes = ThemeService.GetThemeTypes(PageState.Themes); themes = ThemeService.GetThemeTypes(PageState.Themes);
panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes); panelayouts = ThemeService.GetPaneLayoutTypes(PageState.Themes);

View File

@ -68,7 +68,7 @@ else
string url; string url;
string logo; string logo;
protected override async Task OnInitAsync() protected override async Task OnInitializedAsync()
{ {
tenants = await TenantService.GetTenantsAsync(); tenants = await TenantService.GetTenantsAsync();
} }

View File

@ -35,7 +35,7 @@ else
List<Site> sites; List<Site> sites;
protected override async Task OnInitAsync() protected override async Task OnInitializedAsync()
{ {
sites = await SiteService.GetSitesAsync(); sites = await SiteService.GetSitesAsync();
} }

View File

@ -33,7 +33,7 @@ else
List<Theme> Themes; List<Theme> Themes;
protected override async Task OnInitAsync() protected override async Task OnInitializedAsync()
{ {
Themes = await ThemeService.GetThemesAsync(); Themes = await ThemeService.GetThemesAsync();
} }

View File

@ -34,7 +34,7 @@ else
List<User> Users; List<User> Users;
protected override async Task OnInitAsync() protected override async Task OnInitializedAsync()
{ {
Users = await UserService.GetUsersAsync(); Users = await UserService.GetUsersAsync();
} }

View File

@ -29,7 +29,7 @@
string buttonClass = "btn btn-primary"; string buttonClass = "btn btn-primary";
bool authorized = false; bool authorized = false;
protected override void OnInit() protected override void OnInitialized()
{ {
text = Action; text = Action;
if (!String.IsNullOrEmpty(Text)) if (!String.IsNullOrEmpty(Text))

View File

@ -18,7 +18,7 @@
string type = "alert alert-success"; // optional string type = "alert alert-success"; // optional
bool authorized = false; bool authorized = false;
protected override void OnInit() protected override void OnInitialized()
{ {
if (PageState.User != null) if (PageState.User != null)
{ {

View File

@ -31,7 +31,7 @@
HtmlTextInfo htmltext; HtmlTextInfo htmltext;
string content; string content;
protected override async Task OnInitAsync() protected override async Task OnInitializedAsync()
{ {
HtmlTextService htmltextservice = new HtmlTextService(http, sitestate, UriHelper); HtmlTextService htmltextservice = new HtmlTextService(http, sitestate, UriHelper);
List<HtmlTextInfo> htmltextlist = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId); List<HtmlTextInfo> htmltextlist = await htmltextservice.GetHtmlTextAsync(ModuleState.ModuleId);

View File

@ -34,7 +34,7 @@ else
@code { @code {
WeatherForecast[] forecasts; WeatherForecast[] forecasts;
protected override async Task OnInitAsync() protected override async Task OnInitializedAsync()
{ {
WeatherForecastService forecastservice = new WeatherForecastService(); WeatherForecastService forecastservice = new WeatherForecastService();
forecasts = await forecastservice.GetForecastAsync(DateTime.Now); forecasts = await forecastservice.GetForecastAsync(DateTime.Now);

View File

@ -27,8 +27,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview6.19307.2" /> <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview8.19405.7" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview6.19307.2" PrivateAssets="all" /> <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview8.19405.7" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.0.0-preview8.19405.7" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -18,7 +18,7 @@
RenderFragment DynamicComponent { get; set; } RenderFragment DynamicComponent { get; set; }
protected override void OnInit() protected override void OnInitialized()
{ {
DynamicComponent = builder => DynamicComponent = builder =>
{ {

View File

@ -13,7 +13,7 @@
RenderFragment DynamicComponent { get; set; } RenderFragment DynamicComponent { get; set; }
protected override void OnInit() protected override void OnInitialized()
{ {
DynamicComponent = builder => DynamicComponent = builder =>
{ {

View File

@ -25,7 +25,7 @@
string paneadminborder = ""; string paneadminborder = "";
string panetitle = ""; string panetitle = "";
protected override void OnInit() protected override void OnInitialized()
{ {
if (UserService.IsAuthorized(PageState.User, PageState.Page.EditPermissions) && Name != Constants.AdminPane) if (UserService.IsAuthorized(PageState.User, PageState.Page.EditPermissions) && Name != Constants.AdminPane)
{ {

View File

@ -9,7 +9,7 @@
RenderFragment DynamicComponent { get; set; } RenderFragment DynamicComponent { get; set; }
protected override void OnInit() protected override void OnInitialized()
{ {
DynamicComponent = builder => DynamicComponent = builder =>
{ {

View File

@ -34,7 +34,7 @@
string _absoluteUri; string _absoluteUri;
bool _navigationInterceptionEnabled; bool _navigationInterceptionEnabled;
protected override void OnInit() protected override void OnInitialized()
{ {
_absoluteUri = UriHelper.GetAbsoluteUri(); _absoluteUri = UriHelper.GetAbsoluteUri();
UriHelper.OnLocationChanged += OnLocationChanged; UriHelper.OnLocationChanged += OnLocationChanged;

View File

@ -8,7 +8,7 @@
RenderFragment DynamicComponent { get; set; } RenderFragment DynamicComponent { get; set; }
protected override void OnInit() protected override void OnInitialized()
{ {
DynamicComponent = builder => DynamicComponent = builder =>
{ {

View File

@ -23,7 +23,7 @@
@code { @code {
string closeurl; string closeurl;
protected override void OnInit() protected override void OnInitialized()
{ {
closeurl = NavigateUrl(); closeurl = NavigateUrl();
} }

View File

@ -80,7 +80,7 @@
string title = ""; string title = "";
string containertype; string containertype;
protected override async Task OnInitAsync() protected override async Task OnInitializedAsync()
{ {
moduledefinitions = PageState.ModuleDefinitions; moduledefinitions = PageState.ModuleDefinitions;
containers = ThemeService.GetContainerTypes(PageState.Themes); containers = ThemeService.GetContainerTypes(PageState.Themes);

View File

@ -21,7 +21,7 @@
string display = "display: none"; string display = "display: none";
List<ActionViewModel> actions; List<ActionViewModel> actions;
protected override void OnInit() protected override void OnInitialized()
{ {
actions = new List<ActionViewModel>(); actions = new List<ActionViewModel>();
if (ModuleState.PaneModuleIndex > 0) if (ModuleState.PaneModuleIndex > 0)

View File

@ -38,11 +38,11 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="dbup" Version="4.2.0" /> <PackageReference Include="dbup" Version="4.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview6.19307.2" /> <PackageReference Include="Microsoft.AspNetCore.Blazor.Server" Version="3.0.0-preview8.19405.7" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview6.19307.2" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.0.0-preview8.19405.7" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0-preview6.19307.2" /> <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.0.0-preview8.19405.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0-preview6.19304.10" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0-preview8.19405.7" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview6.19304.10" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0-preview8.19405.7" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>