Skip to content

Commit 00061d8

Browse files
SolidProgrammingSolidProgramming
committed
[~] Fix RSB Pagesize
1 parent 3742fbb commit 00061d8

File tree

3 files changed

+51
-48
lines changed

3 files changed

+51
-48
lines changed

‎roles/ui/files/FWO.UI/Shared/ObjectGroup.razor‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
@if(NetworkObjectExtractor != null)
4545
{
4646
<Collapse Title="@(userConfig.GetText("network_objects"))" StartToggled="StartCollapsed" OnOpen="() => HandleUncollapse(ObjCategory.nobj)" RSBLocation=@($"{GetIDPrefix(ObjCategory.nobj)}")>
47-
<Table style="font-size:small" class="table table-bordered table-sm th-bg-secondary table-responsive" TableItem="NetworkObject"
47+
<Table PageSize="PageSize" style="font-size:small" class="table table-bordered table-sm th-bg-secondary table-responsive" TableItem="NetworkObject"
4848
Items="@NetworkObjectExtractor(Content)" ColumnReorder="true">
4949
<Column TableItem="NetworkObject" Title="@(userConfig.GetText("name"))" Field="@(x => x.Name)" Class="word-break">
5050
<Template>
@@ -114,7 +114,7 @@
114114
@if(NetworkServiceExtractor != null)
115115
{
116116
<Collapse Title="@(userConfig.GetText("services"))" StartToggled="StartCollapsed" OnOpen="() => HandleUncollapse(ObjCategory.nsrv)" RSBLocation=@($"{GetIDPrefix(ObjCategory.nsrv)}")>
117-
<Table style="font-size:small" class="table table-bordered table-sm th-bg-secondary table-responsive" TableItem="NetworkService"
117+
<Table PageSize="PageSize" style="font-size:small" class="table table-bordered table-sm th-bg-secondary table-responsive" TableItem="NetworkService"
118118
Items="@NetworkServiceExtractor(Content)" ColumnReorder="true">
119119
<Column TableItem="NetworkService" Title="@(userConfig.GetText("name"))" Field="@(x => x.Name)" Class="word-break">
120120
<Template>
@@ -192,7 +192,7 @@
192192
@if(NetworkUserExtractor != null)
193193
{
194194
<Collapse Title="@(userConfig.GetText("users"))" StartToggled="StartCollapsed" OnOpen="() => HandleUncollapse(ObjCategory.user)" RSBLocation=@($"{GetIDPrefix(ObjCategory.user)}")>
195-
<Table style="font-size:small" class="table table-bordered table-sm th-bg-secondary table-responsive"
195+
<Table PageSize="PageSize" style="font-size:small" class="table table-bordered table-sm th-bg-secondary table-responsive"
196196
TableItem="NetworkUser" Items="@NetworkUserExtractor(Content)" ColumnReorder="true">
197197
<Column TableItem="NetworkUser" Title="@(userConfig.GetText("name"))" Field="@(x => x.Name)" Class="word-break">
198198
<Template>
@@ -263,6 +263,7 @@
263263
[Parameter]
264264
public RsbTab Tab { get; set; }
265265

266+
[EditorRequired]
266267
[Parameter]
267268
public int PageSize { get; set; }
268269

‎roles/ui/files/FWO.UI/Shared/ObjectGroupCollection.razor‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{
99
@foreach (InputDataType obj in Data)
1010
{
11-
<ObjectGroup FetchObjects="FetchObjects" Recert="Recert" Tab="Tab" StartCollapsed="StartCollapsed" StartContentDetailed="StartContentDetailed"
11+
<ObjectGroup PageSize="PageSize" FetchObjects="FetchObjects" Recert="Recert" Tab="Tab" StartCollapsed="StartCollapsed" StartContentDetailed="StartContentDetailed"
1212
InputDataType="InputDataType" InitialContent="obj" NameExtractor="NameExtractor" NetworkObjectExtractor="NetworkObjectExtractor"
1313
NetworkServiceExtractor="NetworkServiceExtractor" NetworkUserExtractor="NetworkUserExtractor" Reload="Reload"/>
1414
<div class="mb-1"></div>
@@ -26,6 +26,7 @@
2626
[Parameter]
2727
public RsbTab Tab { get; set; }
2828

29+
[EditorRequired]
2930
[Parameter]
3031
public int PageSize { get; set; }
3132

‎roles/ui/files/FWO.UI/Shared/RightSidebar.razor‎

Lines changed: 45 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -16,36 +16,36 @@
1616
<div class="p-3 mt-2">
1717
<h5 class="text-center">@(userConfig.GetText("objects"))</h5>
1818
<TabSet @ref="tabset" DarkMode="true" KeepPanelsAlive="true" RsbStyle="true">
19-
<AnchorNavToRSB @ref="anchorNavToRSB" TabSet="tabset" CollapseState="collapseInRSB" />
19+
<AnchorNavToRSB @ref="anchorNavToRSB" TabSet="tabset" CollapseState="collapseInRSB" />
2020
<CascadingValue Value="collapseInRSB">
2121
<CascadingValue Value="anchorNavToRSB">
22-
@if(SelectedReportType.IsDeviceRelatedReport() && AllTabVisible)
22+
@if (SelectedReportType.IsDeviceRelatedReport() && AllTabVisible)
2323
{
2424
<Tab Title="@(userConfig.GetText("all"))" Position=0>
2525
<div class="d-md-flex justify-content-md-end sticky-marker-45">
2626
<div class="btn btn-secondary btn-sm w-50" @onclick="@(() => collapseInRSB.Collapse("all"))">@(userConfig.GetText("collapse_all"))</div>
2727
</div>
2828
<div class="mt-2">
29-
<ObjectGroupCollection FetchObjects="FetchContent" Recert="Recert" Tab="RsbTab.all" InputDataType="ManagementReport" Data="managementsAllObjects"
30-
NameExtractor="man => man.Name" NetworkObjectExtractor="man => man.Objects"
31-
NetworkServiceExtractor="man => man.Services" NetworkUserExtractor="man => man.Users" />
29+
<ObjectGroupCollection PageSize="PageSize" FetchObjects="FetchContent" Recert="Recert" Tab="RsbTab.all" InputDataType="ManagementReport" Data="managementsAllObjects"
30+
NameExtractor="man => man.Name" NetworkObjectExtractor="man => man.Objects"
31+
NetworkServiceExtractor="man => man.Services" NetworkUserExtractor="man => man.Users" />
3232
</div>
3333
</Tab>
3434
}
35-
@if(CurrentReport?.ReportData.ManagementData.Count > 0 && (CurrentReport?.ReportType.IsRuleReport() ?? false))
35+
@if (CurrentReport?.ReportData.ManagementData.Count > 0 && (CurrentReport?.ReportType.IsRuleReport() ?? false))
3636
{
3737
<Tab Title="@(userConfig.GetText("report"))">
3838
<div class="d-md-flex justify-content-md-end sticky-marker-45">
3939
<div class="btn btn-secondary btn-sm w-50" @onclick="@(() => collapseInRSB.Collapse("report"))">@(userConfig.GetText("collapse_all"))</div>
4040
</div>
4141
<div class="mt-2">
42-
<ObjectGroupCollection FetchObjects="FetchContent" Recert="Recert" Tab="RsbTab.report" InputDataType="ManagementReport"
43-
Data="CurrentReport.ReportData.ManagementData.Where(m => (m.Devices.Where(d => d.Rules != null && d.Rules.Count() > 0).Count() > 0))"
44-
NameExtractor="man => man.Name"
45-
NetworkObjectExtractor="man => man.ReportObjects"
46-
NetworkServiceExtractor="man => man.ReportServices"
47-
NetworkUserExtractor="man => man.ReportUsers"
48-
Reload="CurrentReport.ReportType.IsModellingReport()"/>
42+
<ObjectGroupCollection PageSize="PageSize" FetchObjects="FetchContent" Recert="Recert" Tab="RsbTab.report" InputDataType="ManagementReport"
43+
Data="CurrentReport.ReportData.ManagementData.Where(m => (m.Devices.Where(d => d.Rules != null && d.Rules.Count() > 0).Count() > 0))"
44+
NameExtractor="man => man.Name"
45+
NetworkObjectExtractor="man => man.ReportObjects"
46+
NetworkServiceExtractor="man => man.ReportServices"
47+
NetworkUserExtractor="man => man.ReportUsers"
48+
Reload="CurrentReport.ReportType.IsModellingReport()" />
4949
</div>
5050
</Tab>
5151
<Tab Title="@(userConfig.GetText("rule"))">
@@ -54,37 +54,37 @@
5454
<div class="btn btn-secondary btn-sm w-50" @onclick="@(() => collapseInRSB.Collapse("rule"))">@(userConfig.GetText("collapse_all"))</div>
5555
</div>
5656
<div class="mt-2">
57-
<ObjectGroupCollection FetchObjects="FetchContent" Recert="Recert" Tab="RsbTab.rule" StartContentDetailed="true" StartCollapsed="false" InputDataType="Rule" Data="SelectedRules"
58-
NameExtractor=@(rule => $"{rule.DeviceName} - Rule {rule.Id} {rule.Name}")
59-
NetworkObjectExtractor="rule => rule.Froms.Select(nl => nl.Object)
57+
<ObjectGroupCollection PageSize="PageSize" FetchObjects="FetchContent" Recert="Recert" Tab="RsbTab.rule" StartContentDetailed="true" StartCollapsed="false" InputDataType="Rule" Data="SelectedRules"
58+
NameExtractor=@(rule => $"{rule.DeviceName} - Rule {rule.Id} {rule.Name}")
59+
NetworkObjectExtractor="rule => rule.Froms.Select(nl => nl.Object)
6060
.Union(rule.Tos.Select(nl => nl.Object))
6161
.Union(rule.NatData.TranslatedFroms.Select(nl => nl.Object))
6262
.Union(rule.NatData.TranslatedTos.Select(nl => nl.Object)).OrderBy(o => o.Name).ToArray()"
63-
NetworkServiceExtractor="rule => rule.Services.Select(sw => sw.Content)
63+
NetworkServiceExtractor="rule => rule.Services.Select(sw => sw.Content)
6464
.Union(rule.NatData.TranslatedServices.Select(sw => sw.Content)).OrderBy(s => s.Name).ToArray()"
65-
NetworkUserExtractor="rule => rule.Froms.Select(nl => nl.User).Distinct().Where(u => u != null).OrderBy(u => u.Name).ToArray()" />
65+
NetworkUserExtractor="rule => rule.Froms.Select(nl => nl.User).Distinct().Where(u => u != null).OrderBy(u => u.Name).ToArray()" />
6666
</div>
6767
</Tab>
6868
}
69-
@if(CurrentReport?.ReportData.OwnerData.Count > 0 && CurrentReport?.ReportType == ReportType.Connections)
69+
@if (CurrentReport?.ReportData.OwnerData.Count > 0 && CurrentReport?.ReportType == ReportType.Connections)
7070
{
7171
<Tab Title="@(userConfig.GetText("used_objects"))">
7272
<div class="d-md-flex justify-content-md-end sticky-marker-45">
7373
<div class="btn btn-secondary btn-sm w-50" @onclick="@(() => collapseInRSB.Collapse("report"))">@(userConfig.GetText("collapse_all"))</div>
7474
</div>
7575
<div class="mt-2">
76-
<ObjectGroupCollection FetchObjects="FetchContent" Recert="Recert" Tab="RsbTab.usedObj" StartCollapsed="false" InputDataType="OwnerReport"
77-
Data="CurrentReport.ReportData.OwnerData"
78-
NameExtractor="own => own.Name"
79-
NetworkObjectExtractor="own => own.GetAllNetworkObjects(true)"
80-
NetworkServiceExtractor="own => own.GetAllServices(true)"
81-
Reload="true"/>
82-
<ObjectGroupCollection FetchObjects="FetchContent" Recert="Recert" Tab="RsbTab.usedObj" StartCollapsed="false" InputDataType="GlobalCommonSvcReport"
83-
Data="CurrentReport.ReportData.GlobalComSvc"
84-
NameExtractor="glbComSvc => glbComSvc.Name"
85-
NetworkObjectExtractor="glbComSvc => glbComSvc.GetAllNetworkObjects(true)"
86-
NetworkServiceExtractor="glbComSvc => glbComSvc.GetAllServices(true)"
87-
Reload="true"/>
76+
<ObjectGroupCollection PageSize="PageSize" FetchObjects="FetchContent" Recert="Recert" Tab="RsbTab.usedObj" StartCollapsed="false" InputDataType="OwnerReport"
77+
Data="CurrentReport.ReportData.OwnerData"
78+
NameExtractor="own => own.Name"
79+
NetworkObjectExtractor="own => own.GetAllNetworkObjects(true)"
80+
NetworkServiceExtractor="own => own.GetAllServices(true)"
81+
Reload="true" />
82+
<ObjectGroupCollection PageSize="PageSize" FetchObjects="FetchContent" Recert="Recert" Tab="RsbTab.usedObj" StartCollapsed="false" InputDataType="GlobalCommonSvcReport"
83+
Data="CurrentReport.ReportData.GlobalComSvc"
84+
NameExtractor="glbComSvc => glbComSvc.Name"
85+
NetworkObjectExtractor="glbComSvc => glbComSvc.GetAllNetworkObjects(true)"
86+
NetworkServiceExtractor="glbComSvc => glbComSvc.GetAllServices(true)"
87+
Reload="true" />
8888
</div>
8989
</Tab>
9090
}
@@ -119,26 +119,27 @@
119119
public bool AllTabVisible { get; set; } = true;
120120

121121
[Parameter]
122-
public ReportType SelectedReportType { get; set; } = ReportType.Rules;
122+
public ReportType SelectedReportType { get; set; } = ReportType.Rules;
123123

124124
[Parameter]
125125
public bool Recert { get; set; } = false;
126-
127-
private FWO.Ui.Shared.TabSet tabset = new ();
128-
private FWO.Ui.Shared.AnchorNavToRSB anchorNavToRSB = new ();
129-
private CollapseState collapseInRSB = new ();
130-
private List<ManagementReport> managementsAllObjects = new ();
131126

132-
private int intWidth { get { return Width; } set { Width = value; WidthChanged.InvokeAsync(Width);}}
127+
private FWO.Ui.Shared.TabSet tabset = new();
128+
private FWO.Ui.Shared.AnchorNavToRSB anchorNavToRSB = new();
129+
private CollapseState collapseInRSB = new();
130+
private List<ManagementReport> managementsAllObjects = new();
133131

132+
private int intWidth { get { return Width; } set { Width = value; WidthChanged.InvokeAsync(Width); } }
133+
134+
private readonly int PageSize = 0;
134135

135136
protected override void OnInitialized()
136137
{
137138
Task.Run(async () =>
138139
{
139140
try
140141
{
141-
if(AllTabVisible)
142+
if (AllTabVisible)
142143
{
143144
PaginationVariables paginationVariables = new PaginationVariables() { Limit = 0, Offset = 0 };
144145
managementsAllObjects = await apiConnection.SendQueryAsync<List<ManagementReport>>(ObjectQueries.getAllObjectDetails, paginationVariables);
@@ -159,7 +160,7 @@
159160
try
160161
{
161162
string query = "";
162-
Dictionary<String, object> queryVars = new ()
163+
Dictionary<String, object> queryVars = new()
163164
{
164165
{ "limit", userConfig.ElementsPerFetch },
165166
{ "offset", 0 }
@@ -169,7 +170,7 @@
169170
switch (rsbTab)
170171
{
171172
case RsbTab.all:
172-
queryVars.Add("management_id", (int) id);
173+
queryVars.Add("management_id", (int)id);
173174
switch (objType)
174175
{
175176
case ObjCategory.all:
@@ -188,10 +189,10 @@
188189
await FetchObjects(query, queryVars, callback);
189190
break;
190191
case RsbTab.report:
191-
queryVars.Add("mgmIds", (int) id);
192+
queryVars.Add("mgmIds", (int)id);
192193
if (CurrentReport != null)
193194
{
194-
gotAllObjects = await CurrentReport.GetObjectsForManagementInReport(queryVars, objType,
195+
gotAllObjects = await CurrentReport.GetObjectsForManagementInReport(queryVars, objType,
195196
userConfig.AutoFillRightSidebar ? int.MaxValue : userConfig.MaxInitialFetchesRightSidebar, apiConnection, callback);
196197
}
197198
if (!gotAllObjects)
@@ -200,7 +201,7 @@
200201
}
201202
break;
202203
case RsbTab.rule:
203-
if(objType == ObjCategory.all)
204+
if (objType == ObjCategory.all)
204205
{
205206
queryVars.Add("rule_id", id);
206207
query = nat ? RuleQueries.getNatRuleDetails : RuleQueries.getRuleDetails;

0 commit comments

Comments
 (0)