From 358adfade84bbc76db036e6e98f926174d172f46 Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 19 Aug 2025 16:53:36 -0700 Subject: [PATCH 1/4] LK R&D LKSM - Update default audit level --- packages/components/package-lock.json | 4 ++-- packages/components/package.json | 2 +- packages/components/releaseNotes/components.md | 5 +++++ packages/components/src/index.ts | 2 ++ .../src/internal/components/auditlog/constants.ts | 6 ++++++ .../src/internal/components/auditlog/utils.test.ts | 9 ++++++--- .../components/src/internal/components/auditlog/utils.ts | 6 +++++- 7 files changed, 27 insertions(+), 7 deletions(-) diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index 22b4492a37..421f82b1d2 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.58.5", + "version": "6.58.6-fb-defaultAudit.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.58.5", + "version": "6.58.6-fb-defaultAudit.1", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", diff --git a/packages/components/package.json b/packages/components/package.json index bad15f8b9f..f48247fc5d 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.58.5", + "version": "6.58.6-fb-defaultAudit.1", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index 536af3663c..2141a3ec87 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -1,6 +1,11 @@ # @labkey/components Components, models, actions, and utility functions for LabKey applications and pages +### version 6.X +*Released*: X August 2025 +- Update default audit level + - Add `Assay Result Events` audit even type + ### version 6.58.5 *Released*: 14 August 2025 - Issue 52026 and 51862: Reduce the logging for calculated expression column SQL errors diff --git a/packages/components/src/index.ts b/packages/components/src/index.ts index fb68a7a75e..79fca6f872 100644 --- a/packages/components/src/index.ts +++ b/packages/components/src/index.ts @@ -566,6 +566,7 @@ import { ItemsLegend } from './internal/components/chart/ItemsLegend'; import { AuditDetailsModel, TimelineEventModel } from './internal/components/auditlog/models'; import { ASSAY_AUDIT_QUERY, + ASSAY_RESULT_AUDIT_QUERY, AUDIT_EVENT_TYPE_PARAM, CONTAINER_AUDIT_QUERY, DATACLASS_DATA_UPDATE_AUDIT_QUERY, @@ -1153,6 +1154,7 @@ export { areUnitsCompatible, arrayEquals, ASSAY_AUDIT_QUERY, + ASSAY_RESULT_AUDIT_QUERY, ASSAY_DESIGNER_ROLE, AssayContext, AssayContextConsumer, diff --git a/packages/components/src/internal/components/auditlog/constants.ts b/packages/components/src/internal/components/auditlog/constants.ts index 118a7c50c6..1d80c3ff7d 100644 --- a/packages/components/src/internal/components/auditlog/constants.ts +++ b/packages/components/src/internal/components/auditlog/constants.ts @@ -65,6 +65,12 @@ export const ASSAY_AUDIT_QUERY: AuditQuery = { value: 'assayauditevent', label: 'Assay Events', }; +export const ASSAY_RESULT_AUDIT_QUERY: AuditQuery = { + hasDetail: true, + hasTransactionId: true, + label: 'Assay Result Events', + value: 'assayresultauditevent', +}; export const WORKFLOW_AUDIT_QUERY: AuditQuery = { hasDetail: true, label: 'Sample Workflow Events', diff --git a/packages/components/src/internal/components/auditlog/utils.test.ts b/packages/components/src/internal/components/auditlog/utils.test.ts index 10421afab5..d16becb64d 100644 --- a/packages/components/src/internal/components/auditlog/utils.test.ts +++ b/packages/components/src/internal/components/auditlog/utils.test.ts @@ -16,6 +16,7 @@ import { import { getAuditQueries, getEventDataValueDisplay, getTimelineEntityUrl } from './utils'; import { ASSAY_AUDIT_QUERY, + ASSAY_RESULT_AUDIT_QUERY, DATACLASS_DATA_UPDATE_AUDIT_QUERY, INVENTORY_AUDIT_QUERY, NOTEBOOK_AUDIT_QUERY, @@ -28,8 +29,9 @@ import { describe('getAuditQueries', () => { test('LKS starter', () => { const auditQueries = getAuditQueries(TEST_LKS_STARTER_MODULE_CONTEXT); - expect(auditQueries.length).toBe(13); + expect(auditQueries.length).toBe(14); expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); + expect(auditQueries.findIndex(entry => entry === ASSAY_RESULT_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(11); expect(auditQueries.findIndex(entry => entry === WORKFLOW_AUDIT_QUERY)).toBe(-1); expect(auditQueries.findIndex(entry => entry === SOURCE_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); @@ -40,13 +42,14 @@ describe('getAuditQueries', () => { expect(auditQueries.length).toBe(12); expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(10); expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBe(-1); + expect(auditQueries.findIndex(entry => entry === ASSAY_RESULT_AUDIT_QUERY)).toBe(-1); expect(auditQueries.findIndex(entry => entry === WORKFLOW_AUDIT_QUERY)).toBe(-1); expect(auditQueries.findIndex(entry => entry === SOURCE_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); }); test('LKSM professional', () => { const auditQueries = getAuditQueries(TEST_LKSM_PROFESSIONAL_MODULE_CONTEXT); - expect(auditQueries.length).toBe(16); + expect(auditQueries.length).toBe(17); expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(14); expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); expect(auditQueries.findIndex(entry => entry === WORKFLOW_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); @@ -69,7 +72,7 @@ describe('getAuditQueries', () => { }, }; const auditQueries = getAuditQueries(moduleContext); - expect(auditQueries.length).toBe(17); + expect(auditQueries.length).toBe(18); expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(15); expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); expect(auditQueries.findIndex(entry => entry === WORKFLOW_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); diff --git a/packages/components/src/internal/components/auditlog/utils.ts b/packages/components/src/internal/components/auditlog/utils.ts index 1a99de4cf0..3e17826437 100644 --- a/packages/components/src/internal/components/auditlog/utils.ts +++ b/packages/components/src/internal/components/auditlog/utils.ts @@ -32,13 +32,17 @@ import { SOURCE_AUDIT_QUERY, WORKFLOW_AUDIT_QUERY, REPORT_AUDIT_QUERY, + ASSAY_RESULT_AUDIT_QUERY, } from './constants'; export function getAuditQueries(ctx: ModuleContext): AuditQuery[] { const queries = [...COMMON_AUDIT_QUERIES]; if (isProductFoldersEnabled(ctx)) queries.push(CONTAINER_AUDIT_QUERY); if (isWorkflowEnabled(ctx)) queries.push(WORKFLOW_AUDIT_QUERY); - if (isAssayEnabled(ctx)) queries.push(ASSAY_AUDIT_QUERY); + if (isAssayEnabled(ctx)) { + queries.push(ASSAY_AUDIT_QUERY); + queries.push(ASSAY_RESULT_AUDIT_QUERY); + } if (isSampleManagerEnabled(ctx) && !isRegistryEnabled(ctx)) queries.push(SOURCE_AUDIT_QUERY); if (isRegistryEnabled(ctx)) { queries.push(DATACLASS_DATA_UPDATE_AUDIT_QUERY); From cd0993345d994310ed403966403d8024d98f347a Mon Sep 17 00:00:00 2001 From: XingY Date: Fri, 22 Aug 2025 15:10:37 -0700 Subject: [PATCH 2/4] Update jest --- .../src/internal/components/auditlog/utils.test.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/components/src/internal/components/auditlog/utils.test.ts b/packages/components/src/internal/components/auditlog/utils.test.ts index d16becb64d..c5ca63ecb1 100644 --- a/packages/components/src/internal/components/auditlog/utils.test.ts +++ b/packages/components/src/internal/components/auditlog/utils.test.ts @@ -32,7 +32,7 @@ describe('getAuditQueries', () => { expect(auditQueries.length).toBe(14); expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); expect(auditQueries.findIndex(entry => entry === ASSAY_RESULT_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); - expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(11); + expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(12); expect(auditQueries.findIndex(entry => entry === WORKFLOW_AUDIT_QUERY)).toBe(-1); expect(auditQueries.findIndex(entry => entry === SOURCE_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); }); @@ -50,7 +50,7 @@ describe('getAuditQueries', () => { test('LKSM professional', () => { const auditQueries = getAuditQueries(TEST_LKSM_PROFESSIONAL_MODULE_CONTEXT); expect(auditQueries.length).toBe(17); - expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(14); + expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(15); expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); expect(auditQueries.findIndex(entry => entry === WORKFLOW_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); expect(auditQueries.findIndex(entry => entry === SOURCE_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); @@ -73,8 +73,9 @@ describe('getAuditQueries', () => { }; const auditQueries = getAuditQueries(moduleContext); expect(auditQueries.length).toBe(18); - expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(15); + expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(16); expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); + expect(auditQueries.findIndex(entry => entry === ASSAY_RESULT_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); expect(auditQueries.findIndex(entry => entry === WORKFLOW_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); expect(auditQueries.findIndex(entry => entry === NOTEBOOK_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); expect(auditQueries.findIndex(entry => entry === NOTEBOOK_REVIEW_AUDIT_QUERY)).toBeGreaterThanOrEqual(0); From 977858c07f6c8143a7b9242764fe8d411a246ef2 Mon Sep 17 00:00:00 2001 From: XingY Date: Mon, 25 Aug 2025 20:07:06 -0700 Subject: [PATCH 3/4] add selenium test for ETL bulk load --- packages/components/releaseNotes/components.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index 2141a3ec87..a8bdb61dc1 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -4,7 +4,7 @@ Components, models, actions, and utility functions for LabKey applications and p ### version 6.X *Released*: X August 2025 - Update default audit level - - Add `Assay Result Events` audit even type + - Add `Assay Result Events` audit event type ### version 6.58.5 *Released*: 14 August 2025 From e22cafdd3ae73eae3655cee2ef80631053d37a2e Mon Sep 17 00:00:00 2001 From: XingY Date: Fri, 29 Aug 2025 09:32:39 -0700 Subject: [PATCH 4/4] publish --- packages/components/package-lock.json | 4 ++-- packages/components/package.json | 2 +- packages/components/releaseNotes/components.md | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/components/package-lock.json b/packages/components/package-lock.json index 342733e7ce..208e60e1fc 100644 --- a/packages/components/package-lock.json +++ b/packages/components/package-lock.json @@ -1,12 +1,12 @@ { "name": "@labkey/components", - "version": "6.58.7-fb-defaultAudit.1", + "version": "6.58.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@labkey/components", - "version": "6.58.7-fb-defaultAudit.1", + "version": "6.58.7", "license": "SEE LICENSE IN LICENSE.txt", "dependencies": { "@hello-pangea/dnd": "18.0.1", diff --git a/packages/components/package.json b/packages/components/package.json index ffac43dd1f..b19c55b9cd 100644 --- a/packages/components/package.json +++ b/packages/components/package.json @@ -1,6 +1,6 @@ { "name": "@labkey/components", - "version": "6.58.7-fb-defaultAudit.1", + "version": "6.58.7", "description": "Components, models, actions, and utility functions for LabKey applications and pages", "sideEffects": false, "files": [ diff --git a/packages/components/releaseNotes/components.md b/packages/components/releaseNotes/components.md index 9fcfb578e2..c0df6235dd 100644 --- a/packages/components/releaseNotes/components.md +++ b/packages/components/releaseNotes/components.md @@ -1,8 +1,8 @@ # @labkey/components Components, models, actions, and utility functions for LabKey applications and pages -### version 6.X -*Released*: X August 2025 +### version 6.58.7 +*Released*: 29 August 2025 - Update default audit level - Add `Assay Result Events` audit event type