Skip to content

Commit 96e88e2

Browse files
committed
merge from develop
2 parents b3430f2 + e114558 commit 96e88e2

4 files changed

Lines changed: 12 additions & 8 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
### 1.43.1 - 2025-X
22
- Command and QueryRequestOptions: add auditDetails parameter
33

4+
### 1.43.1 - 2025-10-31
5+
- Issue 53449: resolve lineage items from container path
6+
47
### 1.43.0 - 2025-08-29
58
- Support `File` values directly in `Assay.importRun()` for `batchProperties` and (run) `properties`
69
- Can only be run with corresponding server-side changes in LabKey v25.09

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.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@labkey/api",
3-
"version": "1.43.1-fb-transactionAuditDetails.6",
3+
"version": "1.43.2-fb-transactionAuditDetails.1",
44
"description": "JavaScript client API for LabKey Server",
55
"scripts": {
66
"build": "npm run build:dist && npm run build:docs",

src/labkey/Experiment.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ export interface LineagePKFilter {
181181
export interface LineageItemBase {
182182
comment?: string;
183183
container: string;
184+
containerPath: string;
184185
cpasType?: string;
185186
created: string;
186187
createdBy: string;
@@ -211,7 +212,7 @@ export interface LineageRunStepBase {
211212
protocol: LineageItemBase;
212213
}
213214

214-
export type LineageRunStep = LineageItemBase & LineageIOConfig & LineageRunStepBase;
215+
export type LineageRunStep = LineageIOConfig & LineageItemBase & LineageRunStepBase;
215216

216217
export interface LineageNodeBase {
217218
absolutePath: string;
@@ -227,11 +228,11 @@ export interface LineageNodeBase {
227228
}
228229

229230
/** The shape of a LineageNode is determined by the options specified on the lineage API. */
230-
export type LineageNode = LineageItemBase & LineageIOConfig & LineageNodeBase;
231+
export type LineageNode = LineageIOConfig & LineageItemBase & LineageNodeBase;
231232

232233
export interface LineageResponse {
233234
/** Object containing all lineage nodes in this lineage result. Keyed by node LSID. */
234-
nodes: { [lsid: string]: LineageNode };
235+
nodes: Record<string, LineageNode>;
235236
/**
236237
* When request is made with "lsid" option the response will include a singular "seed".
237238
* @deprecated since 19.3. Use "seeds" instead.
@@ -471,7 +472,7 @@ export function resolve(options: ResolveOptions): XMLHttpRequest {
471472

472473
// formerly, _saveBatches
473474
function requestSaveBatches<SuccessPayload>(
474-
rawOptions: SaveBatchOptions & SaveBatchesOptions,
475+
rawOptions: SaveBatchesOptions & SaveBatchOptions,
475476
payloadProcessor: (json: any) => SuccessPayload
476477
): XMLHttpRequest {
477478
return request({
@@ -599,7 +600,7 @@ export function saveRuns(options: SaveRunsOptions): XMLHttpRequest {
599600

600601
export interface EntitySequenceActionsOptions extends RequestCallbackOptions {
601602
containerPath?: string;
602-
kindName?: 'SampleSet' | 'DataClass';
603+
kindName?: 'DataClass' | 'SampleSet';
603604
newValue?: number;
604605
rowId?: number;
605606
seqType: 'genId' | 'rootSampleCount' | 'sampleCount';

0 commit comments

Comments
 (0)