Skip to content

Commit 7065171

Browse files
committed
File import warnings for cross type sample import case
1 parent fdd3aa2 commit 7065171

3 files changed

Lines changed: 17 additions & 1 deletion

File tree

packages/components/releaseNotes/components.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# @labkey/components
22
Components, models, actions, and utility functions for LabKey applications and pages
33

4+
### version TBD
5+
*Released*: TBD
6+
- File import warnings for cross type sample import case
7+
- InferDomain API call and response to include distinctValues for specified column keys
8+
- EntityIdCreationModel.getSchemaQuery to include optional targetQueryName param
9+
410
### version 7.13.0
511
*Released*: 20 January 2026
612
- Multi value text choices

packages/components/src/internal/components/files/FilePreviewGrid.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export class FilePreviewGrid extends React.Component<Props, any> {
3636
<>
3737
<strong>{header}</strong>
3838
{(warningMsg || previewData?.warningMsg) && (
39-
<Alert bsStyle="warning" className="margin-top">
39+
<Alert bsStyle="warning" className="margin-top file-preview-grid__warning">
4040
{warningMsg}
4141
{previewData?.warningMsg}
4242
</Alert>

packages/components/src/theme/fileupload.scss

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,13 @@
151151
.file-upload__file-entry-listing.well {
152152
background-color: #f5f5f5;
153153
}
154+
155+
.file-preview-grid__warning {
156+
// since <p> tags have default margin, override it here for the warning "row"s
157+
.row :last-child {
158+
margin-bottom: 0;
159+
}
160+
.row:not(:last-child) {
161+
margin-bottom: 10px;
162+
}
163+
}

0 commit comments

Comments
 (0)