Skip to content

Commit 43e0e90

Browse files
Issue 53326: Don't filter QuerySelect in PrintLabelsModal (#1817)
1 parent 249bfdd commit 43e0e90

6 files changed

Lines changed: 13 additions & 10 deletions

File tree

packages/components/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/components/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@labkey/components",
3-
"version": "6.52.1",
3+
"version": "6.52.2",
44
"description": "Components, models, actions, and utility functions for LabKey applications and pages",
55
"sideEffects": false,
66
"files": [

packages/components/releaseNotes/components.md

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

4+
### version 6.52.2
5+
*Released*: 27 June 2025
6+
- Issue 53326: Don't filter `QuerySelect` in `PrintLabelsModal`
7+
- Issue 53213: Defensive check for view `sorts` array
8+
49
### version 6.52.1
510
*Released*: 25 June 2025
611
- Issue 53120: remove processRequest, use getCallbackWrapper

packages/components/src/internal/ViewInfo.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,13 @@ export class ViewInfo {
113113
const name_ = isDefault || name === undefined || name === '' ? ViewInfo.DEFAULT_NAME : name;
114114

115115
return new ViewInfo({
116+
...rest,
116117
columns: columns !== undefined ? [...columns] : [],
117118
filters: getFiltersFromView(filter),
118119
isDefault,
119120
label: label_,
120121
name: name_,
121122
sorts: getSortsFromView(sort),
122-
...rest,
123123
});
124124
}
125125

packages/components/src/internal/components/labelPrinting/PrintLabelsModal.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React, { PureComponent, ReactNode } from 'react';
2-
import { List } from 'immutable';
32

43
import { Modal } from '../../Modal';
54
import { ComponentsAPIWrapper, getDefaultAPIWrapper } from '../../APIWrapper';
@@ -223,7 +222,7 @@ export class PrintLabelsModalImpl extends PureComponent<PrintModalProps & Inject
223222
<>
224223
<div className="bottom-padding">{message}</div>
225224
<div>
226-
<strong>Number of copies</strong>
225+
<label>Number of copies</label>
227226
<input
228227
className="form-control label-printing--copies"
229228
min={1}
@@ -234,7 +233,7 @@ export class PrintLabelsModalImpl extends PureComponent<PrintModalProps & Inject
234233
/>
235234
{showSelection && (
236235
<div className="top-padding">
237-
<strong>Selected samples to print</strong>
236+
<label>Selected samples to print</label>
238237
<QuerySelect
239238
formsy={false}
240239
fireQSChangeOnInit={true}
@@ -247,15 +246,14 @@ export class PrintLabelsModalImpl extends PureComponent<PrintModalProps & Inject
247246
placeholder="Select or type to search..."
248247
required={false}
249248
schemaQuery={model.schemaQuery}
250-
queryFilters={List(model.filters)}
251249
displayColumn={displayColumn}
252250
valueColumn={valueColumn}
253251
value={this.props.sampleIds?.join(',')}
254252
/>
255253
</div>
256254
)}
257255
<div className="top-padding">
258-
<strong>Label template</strong>
256+
<label>Label template</label>
259257
<QuerySelect
260258
formsy={false}
261259
fireQSChangeOnInit

packages/components/src/internal/components/labelPrinting/models.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export class BarTenderConfiguration implements BarTenderConfigurationModel {
2020
static create(config?: { defaultLabel: string; serviceURL: string }): BarTenderConfiguration {
2121
return new BarTenderConfiguration({
2222
serviceURL: config.serviceURL,
23-
defaultLabel: parseInt(config.defaultLabel, 10),
23+
defaultLabel: config.defaultLabel ? parseInt(config.defaultLabel, 10) : undefined,
2424
});
2525
}
2626

0 commit comments

Comments
 (0)