Skip to content

Issue 52878: Attachment thumbnails from ancestor columns not rendered in Sample Type grid#1863

Merged
XingY merged 16 commits intodevelopfrom
fb_issue52878
Oct 10, 2025
Merged

Issue 52878: Attachment thumbnails from ancestor columns not rendered in Sample Type grid#1863
XingY merged 16 commits intodevelopfrom
fb_issue52878

Conversation

@XingY
Copy link
Contributor

@XingY XingY commented Oct 7, 2025

XingY added 4 commits October 7, 2025 15:22
# Conflicts:
#	packages/components/package-lock.json
#	packages/components/package.json
#	packages/components/releaseNotes/components.md
# Conflicts:
#	packages/components/package-lock.json
#	packages/components/package.json
#	packages/components/releaseNotes/components.md
XingY added 2 commits October 8, 2025 10:02
# Conflicts:
#	biologics/package-lock.json
#	biologics/package.json
#	inventory/package-lock.json
#	inventory/package.json
#	sampleManagement/package-lock.json
#	sampleManagement/package.json

Merge branch 'develop' into fb_issue52878

# Conflicts:
#	packages/components/package-lock.json
#	packages/components/package.json
#	packages/components/releaseNotes/components.md
@XingY XingY requested a review from cnathe October 9, 2025 17:17
}
}

if (!style && (col?.type?.toLowerCase() === 'file' || col?.inputType?.toLowerCase() === 'file'))
Copy link
Contributor

Choose a reason for hiding this comment

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

seems odd to have this !style check here. so if the column has conditional formatting we won't use the FileColumnRenderer?

Seems like this check should be above the else here as a separate else if case.

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, the QueryColumn has a isFileInput helper, can that be used here? or extended to support this case / check?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This has to do with user avatar column on user's column. I guess it's ok for us to user file renderer there as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Change made so q/core/SiteUsers/1004 also use File renderer for consistency, instead of link.

if (
List.isList(data) &&
data.size === 1 &&
(col?.type?.toLowerCase() === 'file' || col?.inputType?.toLowerCase() === 'file')
Copy link
Contributor

Choose a reason for hiding this comment

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

same comment here about using the QueryColumn helper for isFileInput

XingY added 3 commits October 10, 2025 09:02
# Conflicts:
#	packages/components/package-lock.json
#	packages/components/package.json
#	packages/components/releaseNotes/components.md

Merge branch 'develop' into fb_issue52878

# Conflicts:
#	package-lock.json
#	package.json

Merge branch 'develop' into fb_issue52878

# Conflicts:
#	biologics/package-lock.json
#	biologics/package.json
#	inventory/package-lock.json
#	inventory/package.json
#	sampleManagement/package-lock.json
#	sampleManagement/package.json
#	sampleManagement/test/src/org/labkey/test/tests/samplemanagement/SMBaseTest.java
@XingY XingY requested a review from cnathe October 10, 2025 16:51
XingY added 2 commits October 10, 2025 10:58
# Conflicts:
#	biologics/package-lock.json
#	biologics/package.json
#	inventory/package-lock.json
#	inventory/package.json
#	sampleManagement/package-lock.json
#	sampleManagement/package.json
XingY and others added 2 commits October 10, 2025 12:05
@XingY XingY merged commit b6a9bc0 into develop Oct 10, 2025
3 checks passed
@XingY XingY deleted the fb_issue52878 branch October 10, 2025 22:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants