Skip to content

Issue 52245: Lookup on MS2's ExperimentRunLSID drops ContainerFilter #836

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-jeckels merged 1 commit into from
Feb 17, 2025
Merged

Issue 52245: Lookup on MS2's ExperimentRunLSID drops ContainerFilter #836

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
22 changes: 8 additions & 14 deletions ms2/src/org/labkey/ms2/query/RunTableInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,12 @@
package org.labkey.ms2.query;

import org.labkey.api.data.ContainerFilter;
import org.labkey.api.data.ContainerForeignKey;
import org.labkey.api.data.TableInfo;
import org.labkey.api.exp.query.ExpRunTable;
import org.labkey.api.exp.query.ExpSchema;
import org.labkey.api.query.DetailsURL;
import org.labkey.api.query.FieldKey;
import org.labkey.api.query.FilteredTable;
import org.labkey.api.query.LookupForeignKey;
import org.labkey.api.query.QueryForeignKey;
import org.labkey.api.util.ContainerContext;
import org.labkey.api.view.ActionURL;
import org.labkey.ms2.MS2Controller;
Expand All @@ -43,23 +42,18 @@ public RunTableInfo(MS2Schema schema, ContainerFilter cf)

DetailsURL url = new DetailsURL(new ActionURL(MS2Controller.ShowListAction.class, getContainer()));
url.setContainerContext(new ContainerContext.FieldKeyContext(FieldKey.fromParts("Container")));
var containerColumn = getMutableColumn("Container");
var containerColumn = getMutableColumnOrThrow("Container");
containerColumn.setURL(url);

var folderColumn = wrapColumn("Folder", getRealTable().getColumn("Container"));
folderColumn.setURL(url);
addColumn(folderColumn);

var erLSIDColumn = getMutableColumn("ExperimentRunLSID");
var erLSIDColumn = getMutableColumnOrThrow("ExperimentRunLSID");
erLSIDColumn.setLabel("Experiment Run");
erLSIDColumn.setFk(new LookupForeignKey("LSID")
{
@Override
public TableInfo getLookupTableInfo()
{
ExpSchema schema = new ExpSchema(_userSchema.getUser(), _userSchema.getContainer());
return schema.getRunsTable();
}
});
erLSIDColumn.setFk(new QueryForeignKey.Builder(_userSchema, getContainerFilter()).
Copy link
Contributor

@labkey-matthewb labkey-matthewb Feb 17, 2025

Choose a reason for hiding this comment

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

Yeah QueryForeignKey.Builder

schema(ExpSchema.SCHEMA_NAME).
table(ExpSchema.TableType.Runs.toString()).
key(ExpRunTable.Column.LSID));
}
}