Skip to content

969 bug distributeddata globalfilter #1047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kuh0005 merged 8 commits into from
Feb 24, 2026
Merged

969 bug distributeddata globalfilter #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9faad75
slelect last filter config
Feb 23, 2026
8b5a84c
align views with operon
Feb 23, 2026
5af49d6
wip
Feb 23, 2026
0645c14
Update src/data/src/AXOpen.Data.Blazor/AxoDataExchange/Query/DataExch…
PTKu Feb 23, 2026
c24b43b
fixing dynamic input
Feb 23, 2026
b248829
Merge branch '969-bug-distributeddata---globalfilter' of https://gith…
Feb 23, 2026
edc26d2
Merge branch 'dev' into 969-bug-distributeddata---globalfilter
kuh0005 Feb 23, 2026
5964f52
Merge branch 'dev' into 969-bug-distributeddata---globalfilter
kuh0005 Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 31 additions & 31 deletions src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@namespace AXOpen.Data
@namespace AXOpen.Data
@using AXOpen.Base
@using AXOpen.Data;
@using AXSharp.Connector;
Expand All @@ -23,14 +23,13 @@ else
<div data-data-exchange-view class="flex flex-wrap justify-between">
@if (Presentation.Equals("Command"))
{
<div class="flex flex-wrap mx-2 gap-2">
<div data-dataexchange-operations class="flex flex-wrap gap-2">
@if (EnableCreate)
{
<AuthorizeView Roles="@DataExchangeRoleNames.can_data_item_create">
<Authorized>
<button type="button" class="btn btn-primary items-center" @onclick='() => { _modalCreate.Toggle(); ButtonOperationName = "Create"; }'>
<Operon.Icons.HeroIcon Icon="plus" Type="Operon.Icons.IconType.Outline" Class="size-5 me-1" />
@Localizer["Create"]
<button type="button" class="btn btn-primary" @onclick='() => { _modalCreate.Toggle(); ButtonOperationName = "Create"; }'>
@Localizer["Create new"]
</button>
</Authorized>
</AuthorizeView>
Expand All @@ -39,9 +38,8 @@ else
{
<AuthorizeView Roles="@DataExchangeRoleNames.can_data_load_from_plc">
<Authorized>
<button type="button" class="btn btn-primary items-center" @onclick='() => { _modalCreate.Toggle(); ButtonOperationName = "LoadFromPlc"; }'>
<Operon.Icons.HeroIcon Icon="cloud-arrow-down" Type="Operon.Icons.IconType.Outline" Class="size-5 me-1" />
@Localizer["Create New from PLC"]
<button type="button" class="btn btn-primary" @onclick='() => { _modalCreate.Toggle(); ButtonOperationName = "LoadFromPlc"; }'>
@Localizer["Create new from PLC"]
</button>
</Authorized>
</AuthorizeView>
Expand All @@ -62,14 +60,16 @@ else
}
</div>
}
<div class="flex flex-wrap mx-2">
<div data-filtering-operations class="flex flex-wrap items-center gap-2">
@if (!AdvanceFilterConfig)
{
@if (EnableSorting)
{

<Dropdown @ref="_dropdownSort">
<DropdownButton>
<button type="button" class="btn btn-primary" @onclick="_dropdownSort.Toggle">
@Vm.DefaulSorting.MemberName
<Operon.Icons.HeroIcon Icon="chevron-down" Type="Operon.Icons.IconType.Outline" Class="@("size-5 ms-2 icon-button-rotate " + (_dropdownSort?.Open ?? false ? "rotated" : null))" />
</button>
</DropdownButton>
Expand All @@ -82,15 +82,15 @@ else
</DropdownBody>
</Dropdown>

<button type="button" class="btn btn-outline-secondary items-center" title="@(Vm.DefaulSorting.IsAscending ? "Sorting ascending" : "Sorting descending")" @onclick="() => setSortAscendingAsync()">
<Operon.Icons.HeroIcon Icon="filter" Type="Operon.Icons.IconType.Outline" Class="size-5" />
<button type="button" class="btn btn-outline-primary" @onclick="() => ToggleSortSettings()">
@(Vm.DefaulSorting.IsAscending ? Localizer["Ascending"] : Localizer["Descending"])
</button>
}

<QuerySymbolConfigurationView SymbolConfiguration="@Vm.DefaulQueryDataEntityId" HideDescripion="true"></QuerySymbolConfigurationView>

<button type="button" class="btn btn-secondary items-center" @onclick="Vm.Filter">
<Operon.Icons.HeroIcon Icon="magnifying-glass" Type="Operon.Icons.IconType.Outline" Class="size-5" />
<button type="button" class="btn btn-outline-primary mx-2" @onclick="Vm.Filter">
@Localizer["Search"]
</button>
}
@if (EnableFiltering)
Expand Down Expand Up @@ -205,17 +205,17 @@ else
{
<AuthorizeView Roles="@DataExchangeRoleNames.can_data_item_copy">
<Authorized>
<button type="button" class="btn btn-primary items-center" title="Copy" @onclick='() => { _modalCreate.Toggle(); Vm.SelectedRecord = item; ButtonOperationName = "Copy"; Vm.Locked(); }'>
<Operon.Icons.HeroIcon Icon="clipboard-document" Type="Operon.Icons.IconType.Outline" Class="size-5" />
<button type="button" class="btn btn-no-bg-primary" title="Copy" @onclick='() => { _modalCreate.Toggle(); Vm.SelectedRecord = item; ButtonOperationName = "Copy"; Vm.Locked(); }'>
<Operon.Icons.HeroIcon Icon="clipboard-document" Type="Operon.Icons.IconType.Solid" Class="size-6" />
</button>
</Authorized>
</AuthorizeView>
}

<AuthorizeView Roles="@DataExchangeRoleNames.can_data_item_edit">
<Authorized>
<button type="button" class="btn btn-primary items-center" title="Edit" @onclick="() => { _modalEdit.Toggle(); Vm.SelectedRecord = item; Vm.Locked(); }">
<Operon.Icons.HeroIcon Icon="pencil-square" Type="Operon.Icons.IconType.Outline" Class="size-5" />
<button type="button" class="btn btn-no-bg-primary" title="Edit" @onclick="() => { _modalEdit.Toggle(); Vm.SelectedRecord = item; Vm.Locked(); }">
<Operon.Icons.HeroIcon Icon="pencil-square" Type="Operon.Icons.IconType.Solid" Class="size-6" />
</button>
</Authorized>
</AuthorizeView>
Expand All @@ -224,8 +224,8 @@ else
{
<AuthorizeView Roles="@DataExchangeRoleNames.can_data_send_to_plc">
<Authorized>
<button type="button" class="btn btn-warning items-center" title="Send To Plc" @onclick='() => { _modalAckSendToPlc.Toggle(); Vm.SelectedRecord = item;}'>
<HeroIcon Icon="computer-desktop" Type="Operon.Icons.IconType.Solid" Class="size-5" />
<button type="button" class="btn btn-no-bg-warning" title="Send To Plc" @onclick='() => { _modalAckSendToPlc.Toggle(); Vm.SelectedRecord = item;}'>
<HeroIcon Icon="computer-desktop" Type="Operon.Icons.IconType.Solid" Class="size-6" />
</button>
</Authorized>
</AuthorizeView>
Expand All @@ -235,8 +235,8 @@ else
{
<AuthorizeView Roles="@DataExchangeRoleNames.can_data_item_delete">
<Authorized>
<button type="button" class="btn btn-danger items-center" title="Delete" @onclick="() => { _modalDelete.Toggle(); Vm.SelectedRecord = item; Vm.Locked(); }">
<HeroIcon Icon="trash" Type="Operon.Icons.IconType.Solid" Class="size-5" />
<button type="button" class="btn btn-no-bg-danger" title="Delete" @onclick="() => { _modalDelete.Toggle(); Vm.SelectedRecord = item; Vm.Locked(); }">
<HeroIcon Icon="trash" Type="Operon.Icons.IconType.Solid" Class="size-6" />
</button>
</Authorized>
</AuthorizeView>
Expand Down Expand Up @@ -359,7 +359,7 @@ else
@Localizer["Load from PLC into THIS repository"]
</button>
}
<button type="button" class="btn btn-outline-red" @onclick="() => { _modalCreate.CloseModal();; Vm.UnLocked(); }">@Localizer["Close"]</button>
<button type="button" class="btn btn-outline-primary" @onclick="() => { _modalCreate.CloseModal();; Vm.UnLocked(); }">@Localizer["Close"]</button>
</div>
</Modal>

Expand Down Expand Up @@ -411,7 +411,7 @@ else

}
<button type="button" class="btn btn-primary" @onclick="() => { _modalView.CloseModal(); _modalChanges.Toggle();; }">@Localizer["Changes"]</button>
<button type="button" class="btn btn-outline-red" @onclick="() => _modalView.CloseModal()">@Localizer["Close"]</button>
<button type="button" class="btn btn-outline-primary" @onclick="() => _modalView.CloseModal()">@Localizer["Close"]</button>
</div>
</Modal>

Expand Down Expand Up @@ -462,7 +462,7 @@ else

<div class="modal-footer flex justify-end gap-1">
<button type="button" class="btn btn-primary" @onclick="() => { _modalChanges.CloseModal(); _modalView.Toggle(); }">Back</button>
<button type="button" class="btn btn-outline-red" @onclick="() => _modalChanges.CloseModal()">Close modal</button>
<button type="button" class="btn btn-outline-danger" @onclick="() => _modalChanges.CloseModal()">Close modal</button>
</div>
</Modal>

Expand Down Expand Up @@ -497,7 +497,7 @@ else
</div>
}
<button type="button" class="btn btn-primary @(!Vm.IsLockedByMeOrNull() ? "disabled" : null)" @onclick="() => { _modalEdit.CloseModal(); _modalAckEditUpdate.Toggle(); }">@Localizer["Update"]</button>
<button type="button" class="btn btn-outline-red" @onclick="() => { Vm.UnLocked(); _modalEdit.CloseModal(); }">@Localizer["Close"]</button>
<button type="button" class="btn btn-outline-primary" @onclick="() => { Vm.UnLocked(); _modalEdit.CloseModal(); }">@Localizer["Close"]</button>
</div>
</Modal>

Expand Down Expand Up @@ -545,7 +545,7 @@ else
@Localizer["Delete in this repository"]
</button>

<button type="button" class="btn btn-outline-red" @onclick="() => { _modalDelete.CloseModal(); Vm.UnLocked(); }">@Localizer["Close"]</button>
<button type="button" class="btn btn-outline-primary" @onclick="() => { _modalDelete.CloseModal(); Vm.UnLocked(); }">@Localizer["Close"]</button>
</div>
</Modal>

Expand Down Expand Up @@ -576,7 +576,7 @@ else
@Localizer["Send data to THIS PLC"]
</button>

<button class="btn btn-outline-red" @onclick="() => _modalAckSendToPlc.CloseModal()">@Localizer["Close"]</button>
<button class="btn btn-outline-primary" @onclick="() => _modalAckSendToPlc.CloseModal()">@Localizer["Close"]</button>
</div>
</Modal>

Expand All @@ -590,7 +590,7 @@ else
<div class="modal-footer flex justify-end gap-1">
<button type="button" class="btn btn-primary @(!Vm.IsLockedByMeOrNull() ? "disabled" : null)" @onclick="async () => { _modalAckEditUpdate.CloseModal(); await Vm.Edit(); Vm.UnLocked(); }">@Localizer["Update"]</button>

<button type="button" class="btn btn-outline-red" @onclick="() => { _modalAckEditUpdate.CloseModal(); Vm.UnLocked(); }">Close modal</button>
<button type="button" class="btn btn-outline-danger" @onclick="() => { _modalAckEditUpdate.CloseModal(); Vm.UnLocked(); }">Close modal</button>
</div>
</Modal>

Expand Down Expand Up @@ -648,7 +648,7 @@ else
<strong>@Localizer["Export"]</strong>
</button>

<button class="btn btn-outline-red" @onclick="() => { _modalExport.CloseModal(); ClearClientFiles();}">@Localizer["Close"]</button>
<button class="btn btn-outline-primary" @onclick="() => { _modalExport.CloseModal(); ClearClientFiles();}">@Localizer["Close"]</button>
</div>
</Modal>

Expand Down Expand Up @@ -702,7 +702,7 @@ else
_fileLoadingStatus = eOperationStatus.Ready;}'>
@Localizer["Import"]
</button>
<button type="button" class="btn btn-secondary" @onclick="async () => { _modalImport.CloseModal(); Vm.importStatus = eOperationStatus.Ready; await SaveCustomExportDataAsync();}">@Localizer["Close"]</button>
<button type="button" class="btn btn-outline-primary" @onclick="async () => { _modalImport.CloseModal(); Vm.importStatus = eOperationStatus.Ready; await SaveCustomExportDataAsync();}">@Localizer["Close"]</button>
</div>
</Modal>

Expand Down Expand Up @@ -788,4 +788,4 @@ else

private Dropdown _dropdownSort { get; set; }
private Dropdown _dropdownExportMode { get; set; }
}
}
6 changes: 3 additions & 3 deletions src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// axopen_data_blazor
// axopen_data_blazor
// Copyright (c) 2023 MTS spol. s r.o, and Contributors. All Rights Reserved.
// Contributors: https://github.com/inxton/axsharp/graphs/contributors
// See the LICENSE file in the repository root for more information.
Expand Down Expand Up @@ -163,7 +163,7 @@ private async Task setSortExpresionAsync(string sortExpresion)
await Vm.FillObservableRecordsAsync();
}

private async Task setSortAscendingAsync()
private async Task ToggleSortSettings()
{
Vm.DefaulSorting.IsAscending = !Vm.DefaulSorting.IsAscending;

Expand Down Expand Up @@ -277,4 +277,4 @@ public void Dispose()
if (Vm.IsLockedByMeOrNull())
Vm.DataExchange.SetLockedBy(null);
}
}
}
Loading
Loading