From 9baa3a82284d921897a478419ec9266c1b53374a Mon Sep 17 00:00:00 2001 From: Etai Shuchatowitz Date: Wed, 20 Aug 2025 11:21:35 -0400 Subject: [PATCH 1/2] added datasetids as input to data_client --- src/app/data-client.spec.ts | 5 ++++- src/app/data-client.ts | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/data-client.spec.ts b/src/app/data-client.spec.ts index 560ac251f..b851b2566 100644 --- a/src/app/data-client.spec.ts +++ b/src/app/data-client.spec.ts @@ -1344,6 +1344,7 @@ describe('DataSyncClient tests', () => { const methodName = 'testMethodName'; const fileExtension = '.png'; const tags = ['testTag1', 'testTag2']; + const datasetIds = ['dataset1', 'dataset2'] const timeRequested1 = new Date(1970, 1, 1, 1, 1, 1); const timeReceived1 = new Date(1971, 2, 2, 2, 2, 2); const dataRequestTimes1: [Date, Date] = [timeRequested1, timeReceived1]; @@ -1430,6 +1431,7 @@ describe('DataSyncClient tests', () => { metadata.type = DataType.BINARY_SENSOR; metadata.fileExtension = fileExtension; expectedRequest.metadata = metadata; + expectedRequest.metadata.datasetIds = datasetIds; const sensorData = new SensorData(); const sensorMetadata = new SensorMetadata(); sensorMetadata.timeRequested = Timestamp.fromDate(timeRequested1); @@ -1447,7 +1449,8 @@ describe('DataSyncClient tests', () => { methodName, fileExtension, dataRequestTimes1, - tags + tags, + datasetIds ); expect(capReq).toStrictEqual(expectedRequest); expect(response).toStrictEqual('fileId'); diff --git a/src/app/data-client.ts b/src/app/data-client.ts index 758cdbe1b..dee4a4976 100644 --- a/src/app/data-client.ts +++ b/src/app/data-client.ts @@ -1238,7 +1238,8 @@ export class DataClient { methodName: string, fileExtension: string, dataRequestTimes: [Date, Date], - tags?: string[] + tags?: string[], + datasetIds?: string[] ) { const metadata = new UploadMetadata({ partId, @@ -1248,6 +1249,7 @@ export class DataClient { type: DataType.BINARY_SENSOR, tags, fileExtension, + datasetIds }); const sensorData = new SensorData({ From 0bedc3e4940b682634245fcbab12ccc98096f375 Mon Sep 17 00:00:00 2001 From: Etai Shuchatowitz Date: Fri, 22 Aug 2025 12:19:25 -0400 Subject: [PATCH 2/2] lint --- src/app/data-client.spec.ts | 2 +- src/app/data-client.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/data-client.spec.ts b/src/app/data-client.spec.ts index b851b2566..10bdd17c8 100644 --- a/src/app/data-client.spec.ts +++ b/src/app/data-client.spec.ts @@ -1344,7 +1344,7 @@ describe('DataSyncClient tests', () => { const methodName = 'testMethodName'; const fileExtension = '.png'; const tags = ['testTag1', 'testTag2']; - const datasetIds = ['dataset1', 'dataset2'] + const datasetIds = ['dataset1', 'dataset2']; const timeRequested1 = new Date(1970, 1, 1, 1, 1, 1); const timeReceived1 = new Date(1971, 2, 2, 2, 2, 2); const dataRequestTimes1: [Date, Date] = [timeRequested1, timeReceived1]; diff --git a/src/app/data-client.ts b/src/app/data-client.ts index dee4a4976..f570c7696 100644 --- a/src/app/data-client.ts +++ b/src/app/data-client.ts @@ -1249,7 +1249,7 @@ export class DataClient { type: DataType.BINARY_SENSOR, tags, fileExtension, - datasetIds + datasetIds, }); const sensorData = new SensorData({