kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes as a result of #4299 related to PageState.Modules

Browse Source
This commit is contained in:
sbwalker 2024-06-03 07:42:22 -04:00
parent 94f134c6a7
commit 694cda0e99
6 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Oqtane.Client/Modules/Admin/ModuleDefinitions/Edit.razor
View File

@ -307,7 +307,8 @@
} }
// get distinct pages where module exists // get distinct pages where module exists
var distinctPageIds = PageState.Modules var modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
var distinctPageIds = modules
.Where(md => md.ModuleDefinition?.ModuleDefinitionId == _moduleDefinitionId && md.IsDeleted == false) .Where(md => md.ModuleDefinition?.ModuleDefinitionId == _moduleDefinitionId && md.IsDeleted == false)
.Select(md => md.PageId) .Select(md => md.PageId)
.Distinct(); .Distinct();

5
Oqtane.Client/Modules/Admin/ModuleDefinitions/Index.razor
View File

@ -1,6 +1,7 @@
@namespace Oqtane.Modules.Admin.ModuleDefinitions @namespace Oqtane.Modules.Admin.ModuleDefinitions
@inherits ModuleBase @inherits ModuleBase
@inject NavigationManager NavigationManager @inject NavigationManager NavigationManager
@inject IModuleService ModuleService
@inject IModuleDefinitionService ModuleDefinitionService @inject IModuleDefinitionService ModuleDefinitionService
@inject IPackageService PackageService @inject IPackageService PackageService
@inject IStringLocalizer<Index> Localizer @inject IStringLocalizer<Index> Localizer
@ -70,7 +71,7 @@ else
} }
</td> </td>
<td> <td>
@if (context.AssemblyName == Constants.ClientId || PageState.Modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null) @if (context.AssemblyName == Constants.ClientId || _modules.Where(m => m.ModuleDefinition?.ModuleDefinitionId == context.ModuleDefinitionId).FirstOrDefault() != null)
{ {
<span>@SharedLocalizer["Yes"]</span> <span>@SharedLocalizer["Yes"]</span>
} }
@ -99,6 +100,7 @@ else
} }
@code { @code {
private List<Module> _modules;
private List<ModuleDefinition> _allModuleDefinitions; private List<ModuleDefinition> _allModuleDefinitions;
private List<ModuleDefinition> _moduleDefinitions; private List<ModuleDefinition> _moduleDefinitions;
private List<Package> _packages; private List<Package> _packages;
@ -111,6 +113,7 @@ else
{ {
try try
{ {
_modules = await ModuleService.GetModulesAsync(PageState.Site.SiteId);
_allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId); _allModuleDefinitions = await ModuleDefinitionService.GetModuleDefinitionsAsync(PageState.Site.SiteId);
_categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList(); _categories = _allModuleDefinitions.SelectMany(m => m.Categories.Split(',')).Distinct().ToList();
await LoadModuleDefinitions(); await LoadModuleDefinitions();

2
Oqtane.Client/Modules/Admin/Pages/Edit.razor
View File

@ -415,7 +415,7 @@
_permissions = _page.PermissionList; _permissions = _page.PermissionList;
// page modules // page modules
_pageModules = PageState.Modules.Where(m => m.PageId == _page.PageId).ToList(); _pageModules = PageState.Modules;
// audit // audit
_createdby = _page.CreatedBy; _createdby = _page.CreatedBy;

2
Oqtane.Client/Themes/Controls/Theme/ControlPanel.razor
View File

@ -73,7 +73,7 @@
} }
else else
{ {
foreach (var module in PageState.Modules.Where(item => item.PageId == PageState.Page.PageId)) foreach (var module in PageState.Modules)
{ {
if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, module.PermissionList)) if (UserSecurity.IsAuthorized(PageState.User, PermissionNames.Edit, module.PermissionList))
{ {

6
Oqtane.Client/Themes/Controls/Theme/ControlPanelInteractive.razor
View File

@ -346,13 +346,13 @@
_moduleId = "-"; _moduleId = "-";
} }
private void PageChanged(ChangeEventArgs e) private async Task PageChanged(ChangeEventArgs e)
{ {
_pageId = (string)e.Value; _pageId = (string)e.Value;
if (_pageId != "-") if (_pageId != "-")
{ {
_modules = PageState.Modules _modules = await ModuleService.GetModulesAsync(PageState.Page.SiteId);
.Where(module => module.PageId == int.Parse(_pageId) && _modules = _modules.Where(module => module.PageId == int.Parse(_pageId) &&
UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.PermissionList) && UserSecurity.IsAuthorized(PageState.User, PermissionNames.View, module.PermissionList) &&
(_moduleType == "add" || module.ModuleDefinition.IsPortable)) (_moduleType == "add" || module.ModuleDefinition.IsPortable))
.ToList(); .ToList();

2
Oqtane.Client/UI/Pane.razor
View File

@ -43,7 +43,7 @@ else
DynamicComponent = builder => DynamicComponent = builder =>
{ {
foreach (Module module in PageState.Modules.Where(item => item.PageId == PageState.Page.PageId)) foreach (Module module in PageState.Modules)
{ {
// set renderid - this allows the framework to determine which components should be rendered when PageState changes // set renderid - this allows the framework to determine which components should be rendered when PageState changes
if (module.RenderId != PageState.RenderId) if (module.RenderId != PageState.RenderId)