Skip to content

Bug Fix: Condition should be still editable/deletable/both after editing #4

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
merged 4 commits into from
Nov 11, 2024
Merged

Bug Fix: Condition should be still editable/deletable/both after editing #4

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05bb267
The variables for saving the state of a condition if it was editable/…
lcarrasco-xdev Oct 18, 2024
2341d2e
Merge branch 'develop' into initial-condition-not-editable-after-editing
JohannesRabauer Nov 11, 2024
e904641
Fix Exception when editing item
JohannesRabauer Nov 11, 2024
caa2cf8
Update FilterComponent.java
JohannesRabauer Nov 11, 2024
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
37 changes: 20 additions & 17 deletions vaadin-simple-grid-filter/src/main/java/software/xdev/vaadin/FilterComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,19 +369,24 @@ private void onAcceptFilter()
final boolean deletable;
final boolean editable;

// Check if it's an initial condition
if(this.editingBadgeId != null && !this.editingBadgeId.equals(NO_BADGE_ID_STRING))
if(this.deletingBadgeEnabled != null && this.editingBadgeEnabled != null)
{
deletable = this.deletingBadgeEnabled;
editable = this.editingBadgeEnabled;

// Get customization rating from initial condition
customizationDegree = this.initialChipBadges
.stream()
.filter(e -> e.getBadgeId().equals(this.editingBadgeId))
.toList()
.get(0)
.getCustomizationRating();
this.deletingBadgeEnabled = null;
this.editingBadgeEnabled = null;

if(this.editingBadgeId != null)
{
// Get customization rating from initial condition
customizationDegree = this.initialChipBadges
.stream()
.filter(e -> e.getBadgeId().equals(this.editingBadgeId))
.toList()
.get(0)
.getCustomizationRating();
}
}
else
{
Expand Down Expand Up @@ -461,17 +466,15 @@ private void onAcceptFilter()
// Make the cancel button invisible
this.btnCancelFilter.setVisible(false);

// Needed to save state of the condition if it was editable/deletable before editing
this.editingBadgeEnabled = badge.isBtnEditEnabled();
this.deletingBadgeEnabled = badge.isBtnDeleteEnabled();

// Just activated when the url parameters are enabled
// Set the customization rating for the filter select and condition select
this.setUsedCustomizationDegreeForComponents(customizationDegree);

// Just activated when the url parameters are activated
if(!this.identifier.isBlank())
{
this.editingBadgeId = badge.getBadgeId();
// Needed for the acceptFilterBtn
this.editingBadgeEnabled = badge.isBtnEditEnabled();
this.deletingBadgeEnabled = badge.isBtnDeleteEnabled();
}
this.editingBadgeId = badge.getBadgeId();

// Remove filter, update grid
this.removeChipBadgeCondition(badge);
Expand Down