Skip to content

fix(ui): select a predictable first table on startup #118

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
valters wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(ui): select a predictable first table on startup #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 14 additions & 0 deletions src/main/engine/net/sf/jailer/datamodel/DataModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,13 @@
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Optional;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.TreeSet;

import org.apache.commons.collections4.MapUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down Expand Up @@ -304,6 +306,18 @@ public Collection<Table> getTables() {
return tables.values();
}

/**
* When starting UI we need to pick a table to get selected at first, in a stable way.
* Alphabetically first table sounds good and deterministic.
*/
public Optional<Table> firstTable() {
if (MapUtils.isEmpty(tables)) {
return Optional.empty();
}

return tables.keySet().stream().sorted().findFirst().map(tables::get);
}

/**
* Reads in <code>table.csv</code> and <code>association.csv</code>
* and builds the relational data model.
Expand Down
2 changes: 1 addition & 1 deletion src/main/engine/net/sf/jailer/extractionmodel/ExtractionModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public boolean equals(Object obj) {
public ExtractionModel(DataModel dataModel, ExecutionContext executionContext) {
this.dataModel = dataModel;
this.version = null;
subject = dataModel.getTables().iterator().hasNext()? dataModel.getTables().iterator().next() : null;
Copy link
Author

@valters valters Mar 19, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HashMap.values().iterator() happens to select some entry that happens to have first hash value: I think it's not great that on startup the focus table is essentially randomly selected.

subject = dataModel.firstTable().orElse(null);
condition = "";
dataModel.setRestrictionModel(new RestrictionModel(dataModel, executionContext));
dataModel.deriveFilters();
Expand Down