diff --git a/.yarn/cache/xlsx-https-15979b9f23-c08ac699e6.zip b/.yarn/cache/xlsx-https-15979b9f23-c08ac699e6.zip new file mode 100644 index 000000000..f4c9ad68c Binary files /dev/null and b/.yarn/cache/xlsx-https-15979b9f23-c08ac699e6.zip differ diff --git a/packages/core-ui/command-surface/src/views/control.tsx b/packages/core-ui/command-surface/src/views/control.tsx index 6b343b799..788d571fd 100644 --- a/packages/core-ui/command-surface/src/views/control.tsx +++ b/packages/core-ui/command-surface/src/views/control.tsx @@ -110,7 +110,7 @@ export const ControlView = () => { id: '', // ...activeProgram?.interface, ...hmi, - nodes: fullHMIElements + nodes: fullHMIElements //.map((x) => ({...x, draggable: false})) }, tags, types diff --git a/packages/lambdas/compile-report/package.json b/packages/lambdas/compile-report/package.json index 370255d6e..2794075fd 100644 --- a/packages/lambdas/compile-report/package.json +++ b/packages/lambdas/compile-report/package.json @@ -21,7 +21,7 @@ "mathjs": "^12.4.1", "moment": "^2.30.1", "nanoid": "3.x", - "xlsx": "^0.18.5" + "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz" }, "devDependencies": { "ts-node": "^10.9.2", diff --git a/packages/lambdas/compile-report/src/compile.ts b/packages/lambdas/compile-report/src/compile.ts index a55fae6bc..cd38070dc 100644 --- a/packages/lambdas/compile-report/src/compile.ts +++ b/packages/lambdas/compile-report/src/compile.ts @@ -46,7 +46,6 @@ export const compileReport = async ( AND "lastUpdated" <= ${endDate} `; -console.log({startRecord, endRecord}) const result : any[] = await prisma.$queryRaw` SELECT placeholder, @@ -58,8 +57,8 @@ console.log({startRecord, endRecord}) "deviceId" = ${deviceId} AND placeholder=${field.device?.name} ${field.key ? Prisma.sql` AND key=${field.key?.name}` : Prisma.empty} - AND "lastUpdated" >= ${startRecord?.[0] ? moment(startRecord?.[0]?.date).toDate() : startDate} - AND "lastUpdated" <= ${endRecord?.[0] ? moment(endRecord?.[0]?.date).toDate() : endDate} + AND "lastUpdated" >= ${startRecord?.[0]?.date ? moment(startRecord?.[0]?.date).toDate() : startDate} + AND "lastUpdated" <= ${endRecord?.[0]?.date ? moment(endRecord?.[0]?.date).toDate() : endDate} GROUP BY placeholder, key, time ORDER BY time ASC ` @@ -86,7 +85,7 @@ console.log({startRecord, endRecord}) const xlsxPath = path.join(__dirname, `${id}.xlsx`); - xlsx.writeFile(workbook, xlsxPath); + xlsx.writeFile(workbook, xlsxPath, {bookSST: true, compression: true}); return {path: xlsxPath, id}; diff --git a/yarn.lock b/yarn.lock index cdf469653..1236052da 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16873,7 +16873,7 @@ __metadata: nanoid: 3.x ts-node: ^10.9.2 typescript: 4.9.5 - xlsx: ^0.18.5 + xlsx: "https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz" languageName: unknown linkType: soft @@ -39357,6 +39357,15 @@ __metadata: languageName: node linkType: hard +"xlsx@https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz": + version: 0.20.3 + resolution: "xlsx@https://cdn.sheetjs.com/xlsx-0.20.3/xlsx-0.20.3.tgz" + bin: + xlsx: ./bin/xlsx.njs + checksum: c08ac699e6d31222404871240aa2c2804cb8bae59f0bea08d3293e99756cf0d3122fd34739189edaae1d9b0b493bbb8eb95d021950ee7b5cba9d55ecd6fcb4e4 + languageName: node + linkType: hard + "xlsx@npm:^0.18.5": version: 0.18.5 resolution: "xlsx@npm:0.18.5"