Skip to content
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.

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

AbDisc: Plate Set ELN Reference #1648

Merged
merged 4 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions packages/components/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@labkey/components",
"version": "5.24.0",
"version": "5.24.1",
"description": "Components, models, actions, and utility functions for LabKey applications and pages",
"sideEffects": false,
"files": [
Expand Down
4 changes: 4 additions & 0 deletions packages/components/releaseNotes/components.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
# @labkey/components
Components, models, actions, and utility functions for LabKey applications and pages

### version 5.24.1
*Released*: 26 November 2024
- Support Plate Set ELN References

### version 5.24.0
*Released*: 19 November 2024
- Issue 51645: Escape advanced search characters
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ export const SearchPanel: FC<SearchPanelProps> = memo(props => {
}
if (platesEnabled) {
categories.push(SearchCategory.Plate);
categories.push(SearchCategory.PlateSet);
}

return categories;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ export function resolveIconSrc(data: any, category: SearchCategory): string {
// else fallback to default
} else if (data.sampleSet?.name) {
iconSrc = 'samples';
} else if (data.type) {
} else if (data.type && category !== SearchCategory.PlateSet) {
RosalineP marked this conversation as resolved.
Show resolved Hide resolved
const lcType = data.type.toLowerCase();
if (lcType === 'sampleset') {
iconSrc = 'sample_set';
Expand All @@ -233,6 +233,7 @@ export function resolveIconSrc(data: any, category: SearchCategory): string {
case SearchCategory.NotebookTemplate:
iconSrc = 'notebook_blue';
break;
case SearchCategory.PlateSet:
case SearchCategory.Plate:
iconSrc = 'plates';
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ export enum SearchCategory {
Notebook = 'notebook',
NotebookTemplate = 'notebookTemplate',
Plate = 'plate',
PlateSet = 'plateSet',
StorageLocation = 'storageLocation',
TerminalStorageLocation = 'terminalStorageLocation',
WorkflowJob = 'workflowJob',
Expand Down
7 changes: 6 additions & 1 deletion packages/components/src/internal/url/URLResolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ const RESOLVE_LSID_MAPPERS = [
if (params.type) {
const type = params.type;
const lsid = params.lsid;
if (!!lsid) {
if (lsid) {
if (type?.toLowerCase() === 'data') {
const url = ['rd', 'expdata', lsid];
return AppURL.create(...url);
Expand Down Expand Up @@ -769,6 +769,11 @@ export class URLResolver {
if (plateRowId) {
return row.set('url', this.mapURL({ url, row, query: plateRowId }));
}
} else if (url.indexOf('query-queryDetailsRow') && url.indexOf('.queryName=PlateSet&')) {
const plateSetRowId = row.getIn(['data', 'rowId']);
if (plateSetRowId) {
return row.set('url', this.mapURL({ url, row, query: plateSetRowId }));
}
}
}
return row;
Expand Down