Skip to content

Features/cgu/25.2/organize columns 454064 #2129

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

Open
cguglielmo wants to merge 3 commits into
base: releases/25.2
Choose a base branch
from
Open

Features/cgu/25.2/organize columns 454064 #2129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
075b079
OrganizeColumnsForm: column order may be wrong when loading a config
cguglielmo Apr 2, 2026
1dc21d4
Column: improve warning when setting a column with a wrong index
cguglielmo Apr 2, 2026
542ed29
ShowInvisibleColumnsForm: ensure selected columns are stored
cguglielmo Apr 7, 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
5 changes: 1 addition & 4 deletions ....scout.rt.client/src/main/java/org/eclipse/scout/rt/client/ui/basic/table/HeaderCell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2023 BSI Business Systems Integration AG
* Copyright (c) 2010, 2026 BSI Business Systems Integration AG
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -35,9 +35,6 @@ public void setColumnIndexInternal(int index) {
if (currentColIndex < 0) {
doSetColumnIndex(index);
}
else {
LOG.warn(null, new IllegalAccessException("do not use this internal method"));
}
}

protected void doSetColumnIndex(int index) {
Expand Down
5 changes: 5 additions & 0 deletions ...ient/src/main/java/org/eclipse/scout/rt/client/ui/basic/table/columns/AbstractColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1502,6 +1502,11 @@ public boolean isEmpty() {
}

public void setColumnIndexInternal(int index) {
int currentColIndex = getColumnIndex();
if (currentColIndex >= 0) {
LOG.warn("Unexpected column index {} for column {}", currentColIndex, this, new Exception("Stacktrace"));
return;
}
m_headerCell.setColumnIndexInternal(index);
}

Expand Down
5 changes: 4 additions & 1 deletion ...c/main/java/org/eclipse/scout/rt/client/ui/basic/table/organizer/OrganizeColumnsForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2025 BSI Business Systems Integration AG
* Copyright (c) 2010, 2026 BSI Business Systems Integration AG
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -1111,6 +1111,9 @@ public void applyConfig(String configName) {
m_organizedTable.getReloadHandler().reload(IReloadReason.ORGANIZE_COLUMNS);
}
getColumnsTableField().reloadTableData();
// After reloading, the columnsTableField now contains the expected columns in the correct order
// -> ensure the order of columns is correctly applied to the table
updateColumnVisibilityAndOrder();
}

protected void applyConfigImpl(String configName) {
Expand Down
15 changes: 11 additions & 4 deletions ...n/java/org/eclipse/scout/rt/client/ui/basic/table/organizer/ShowInvisibleColumnsForm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2024 BSI Business Systems Integration AG
* Copyright (c) 2010, 2026 BSI Business Systems Integration AG
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -264,10 +264,17 @@ protected void execStore() {
newCols.add(col);
col.setVisible(true);
}
if (m_insertAfterColumn == null || newCols.isEmpty()) {
if (newCols.isEmpty()) {
return;
}
ColumnSet colSet = newCols.get(0).getTable().getColumnSet();

ITable table = newCols.getFirst().getTable();
if (m_insertAfterColumn == null) {
ClientUIPreferences.getInstance().setAllTableColumnPreferences(table);
return;
}

ColumnSet colSet = table.getColumnSet();
List<IColumn<?>> newOrder = new ArrayList<>();
List<IColumn<?>> visibleColumns = colSet.getVisibleColumns();
int position = 0;
Expand Down Expand Up @@ -305,7 +312,7 @@ else if (newPosFirst != -1 && posInsertAfter == -1) {
i++;
}
colSet.setVisibleColumns(newOrder);
ClientUIPreferences.getInstance().setAllTableColumnPreferences(newCols.get(0).getTable());
ClientUIPreferences.getInstance().setAllTableColumnPreferences(table);
}

@Override
Expand Down