Skip to content

Clean up ContainerFilter #227

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
labkey-adam merged 3 commits into from
Mar 3, 2025
Merged

Clean up ContainerFilter #227

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
f41b5f0
Clean up ContainerFilter
labkey-adam Mar 1, 2025
7f857be
Pass in user to ContainerFilter
labkey-adam Mar 1, 2025
a52d6d0
Rename EVERYTHING -> EVERYTHING_UNSAFE
labkey-adam Mar 3, 2025
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
6 changes: 3 additions & 3 deletions LDK/api-src/org/labkey/api/ldk/table/ContainerScopedTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public DataIteratorBuilder persistRows(DataIteratorBuilder data, DataIteratorCon

protected class UpdateService extends SimpleQueryUpdateService
{
private KeyManager _keyManager = new KeyManager();
private final KeyManager _keyManager = new KeyManager();

public UpdateService(SimpleUserSchema.SimpleTable<?> ti)
{
Expand Down Expand Up @@ -307,7 +307,7 @@ public Object call()

private class KeyManager
{
private Set<Object> _encounteredKeys = new HashSet<>();
private final Set<Object> _encounteredKeys = new HashSet<>();

public KeyManager()
{
Expand Down Expand Up @@ -337,7 +337,7 @@ public boolean rowExists(Container c, Object key)

Container target = c.getContainerFor(ContainerType.DataType.sharedSchemaOwner);
SimpleFilter filter = new SimpleFilter(FieldKey.fromString(_pseudoPk), key, CompareType.EQUAL);
filter.addClause(ContainerFilter.current(target).createFilterClause(_rootTable.getSchema(), getContainerFieldKey()));
filter.addClause(ContainerFilter.current(target, getUserSchema().getUser()).createFilterClause(_rootTable.getSchema(), getContainerFieldKey()));
TableSelector ts = new TableSelector(_rootTable, Collections.singleton(_pseudoPk), filter, null);

return ts.getRowCount() > 0;
Expand Down
4 changes: 2 additions & 2 deletions LDK/src/org/labkey/ldk/notification/SiteSummaryNotification.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,11 +677,11 @@ private void getAssayRunSummary(Container c, User u, final StringBuilder msg, fi
if (protocolMap == null)
protocolMap = new TreeMap<>();

ExpRunTable tiRun = AssayService.get().createRunTable(p, ap, u, p.getContainer(), ContainerFilter.EVERYTHING);
ExpRunTable tiRun = AssayService.get().createRunTable(p, ap, u, p.getContainer(), ContainerFilter.EVERYTHING_UNSAFE);
TableSelector tsRun = new TableSelector(tiRun);

AssayProtocolSchema schema = ap.createProtocolSchema(u, p.getContainer(), p, null);
TableInfo tiResult = schema.createDataTable(ContainerFilter.EVERYTHING);
TableInfo tiResult = schema.createDataTable(ContainerFilter.EVERYTHING_UNSAFE);
TableSelector tsResult = new TableSelector(tiResult);

protocolMap.put(p, new Long[]{tsRun.getRowCount(), tsResult.getRowCount()});
Expand Down
8 changes: 4 additions & 4 deletions laboratory/api-src/org/labkey/api/laboratory/QueryCountNavItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,17 +47,17 @@ public Long getRowCount(Container c, User u)
if (ti == null)
return Long.valueOf(0);

SimpleFilter filter = getFilter(c, ti);
SimpleFilter filter = getFilter(c, u, ti);
TableSelector ts = new TableSelector(ti, ti.getPkColumns(), filter, null);
return ts.getRowCount();
}

protected SimpleFilter getFilter(Container c, TableInfo ti)
protected SimpleFilter getFilter(Container c, User u, TableInfo ti)
{
SimpleFilter filter = new SimpleFilter();

if (ti.getColumn("container") != null && !(ti.supportsContainerFilter() && ContainerFilter.current(c).equals(ti.getContainerFilter())))
filter.addClause(ContainerFilter.current(c).createFilterClause(ti.getSchema(), FieldKey.fromString("container")));
if (ti.getColumn("container") != null && !(ti.supportsContainerFilter() && ContainerFilter.current(c, u).equals(ti.getContainerFilter())))
filter.addClause(ContainerFilter.current(c, u).createFilterClause(ti.getSchema(), FieldKey.fromString("container")));

if (_filter != null)
{
Expand Down
5 changes: 3 additions & 2 deletions laboratory/src/org/labkey/laboratory/SamplesCountNavItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.labkey.api.laboratory.LaboratoryService;
import org.labkey.api.laboratory.QueryCountNavItem;
import org.labkey.api.query.FieldKey;
import org.labkey.api.security.User;

/**
* User: bimber
Expand All @@ -22,9 +23,9 @@ public SamplesCountNavItem(DataProvider provider, String schema, String query, L
}

@Override
protected SimpleFilter getFilter(Container c, TableInfo ti)
protected SimpleFilter getFilter(Container c, User u, TableInfo ti)
{
SimpleFilter filter = super.getFilter(c, ti);
SimpleFilter filter = super.getFilter(c, u, ti);
filter.addCondition(FieldKey.fromString("dateremoved"), null, CompareType.ISBLANK);
return filter;
}
Expand Down
4 changes: 2 additions & 2 deletions laboratory/src/org/labkey/laboratory/query/LaboratoryTableCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@ public void customizeButtonBar(AbstractTableInfo ti)
newIncludes.addAll(Arrays.asList(includes));
}

ti.getButtonBarConfig().setScriptIncludes(newIncludes.toArray(new String[newIncludes.size()]));
ti.getButtonBarConfig().setScriptIncludes(newIncludes.toArray(new String[0]));
}
}

Expand All @@ -993,7 +993,7 @@ private void customzieSamplesTable(AbstractTableInfo ti)
{
Container c = ti.getUserSchema().getContainer();
c = c.isWorkbook() ? c.getParent() : c;
SQLFragment containerSql = ContainerFilter.current(c).getSQLFragment(LaboratorySchema.getInstance().getSchema(), new SQLFragment(ti.getContainerFieldKey().toString()));
SQLFragment containerSql = ContainerFilter.current(c, ti.getUserSchema().getUser()).getSQLFragment(LaboratorySchema.getInstance().getSchema(), new SQLFragment(ti.getContainerFieldKey().toString()));

SQLFragment sql = new SQLFragment("(SELECT count(*) as _expr FROM laboratory.samples s WHERE " +
" (s.").append(containerSql).append(")" + " AND ").
Expand Down