Skip to content

Commit 358adfa

Browse files
committed
LK R&D LKSM - Update default audit level
1 parent 94e3dfd commit 358adfa

7 files changed

Lines changed: 27 additions & 7 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.58.5",
3+
"version": "6.58.6-fb-defaultAudit.1",
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.X
5+
*Released*: X August 2025
6+
- Update default audit level
7+
- Add `Assay Result Events` audit even type
8+
49
### version 6.58.5
510
*Released*: 14 August 2025
611
- Issue 52026 and 51862: Reduce the logging for calculated expression column SQL errors

packages/components/src/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,7 @@ import { ItemsLegend } from './internal/components/chart/ItemsLegend';
566566
import { AuditDetailsModel, TimelineEventModel } from './internal/components/auditlog/models';
567567
import {
568568
ASSAY_AUDIT_QUERY,
569+
ASSAY_RESULT_AUDIT_QUERY,
569570
AUDIT_EVENT_TYPE_PARAM,
570571
CONTAINER_AUDIT_QUERY,
571572
DATACLASS_DATA_UPDATE_AUDIT_QUERY,
@@ -1153,6 +1154,7 @@ export {
11531154
areUnitsCompatible,
11541155
arrayEquals,
11551156
ASSAY_AUDIT_QUERY,
1157+
ASSAY_RESULT_AUDIT_QUERY,
11561158
ASSAY_DESIGNER_ROLE,
11571159
AssayContext,
11581160
AssayContextConsumer,

packages/components/src/internal/components/auditlog/constants.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ export const ASSAY_AUDIT_QUERY: AuditQuery = {
6565
value: 'assayauditevent',
6666
label: 'Assay Events',
6767
};
68+
export const ASSAY_RESULT_AUDIT_QUERY: AuditQuery = {
69+
hasDetail: true,
70+
hasTransactionId: true,
71+
label: 'Assay Result Events',
72+
value: 'assayresultauditevent',
73+
};
6874
export const WORKFLOW_AUDIT_QUERY: AuditQuery = {
6975
hasDetail: true,
7076
label: 'Sample Workflow Events',

packages/components/src/internal/components/auditlog/utils.test.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
import { getAuditQueries, getEventDataValueDisplay, getTimelineEntityUrl } from './utils';
1717
import {
1818
ASSAY_AUDIT_QUERY,
19+
ASSAY_RESULT_AUDIT_QUERY,
1920
DATACLASS_DATA_UPDATE_AUDIT_QUERY,
2021
INVENTORY_AUDIT_QUERY,
2122
NOTEBOOK_AUDIT_QUERY,
@@ -28,8 +29,9 @@ import {
2829
describe('getAuditQueries', () => {
2930
test('LKS starter', () => {
3031
const auditQueries = getAuditQueries(TEST_LKS_STARTER_MODULE_CONTEXT);
31-
expect(auditQueries.length).toBe(13);
32+
expect(auditQueries.length).toBe(14);
3233
expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);
34+
expect(auditQueries.findIndex(entry => entry === ASSAY_RESULT_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);
3335
expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(11);
3436
expect(auditQueries.findIndex(entry => entry === WORKFLOW_AUDIT_QUERY)).toBe(-1);
3537
expect(auditQueries.findIndex(entry => entry === SOURCE_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);
@@ -40,13 +42,14 @@ describe('getAuditQueries', () => {
4042
expect(auditQueries.length).toBe(12);
4143
expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(10);
4244
expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBe(-1);
45+
expect(auditQueries.findIndex(entry => entry === ASSAY_RESULT_AUDIT_QUERY)).toBe(-1);
4346
expect(auditQueries.findIndex(entry => entry === WORKFLOW_AUDIT_QUERY)).toBe(-1);
4447
expect(auditQueries.findIndex(entry => entry === SOURCE_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);
4548
});
4649

4750
test('LKSM professional', () => {
4851
const auditQueries = getAuditQueries(TEST_LKSM_PROFESSIONAL_MODULE_CONTEXT);
49-
expect(auditQueries.length).toBe(16);
52+
expect(auditQueries.length).toBe(17);
5053
expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(14);
5154
expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);
5255
expect(auditQueries.findIndex(entry => entry === WORKFLOW_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);
@@ -69,7 +72,7 @@ describe('getAuditQueries', () => {
6972
},
7073
};
7174
const auditQueries = getAuditQueries(moduleContext);
72-
expect(auditQueries.length).toBe(17);
75+
expect(auditQueries.length).toBe(18);
7376
expect(auditQueries.findIndex(entry => entry === INVENTORY_AUDIT_QUERY)).toBe(15);
7477
expect(auditQueries.findIndex(entry => entry === ASSAY_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);
7578
expect(auditQueries.findIndex(entry => entry === WORKFLOW_AUDIT_QUERY)).toBeGreaterThanOrEqual(0);

packages/components/src/internal/components/auditlog/utils.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,17 @@ import {
3232
SOURCE_AUDIT_QUERY,
3333
WORKFLOW_AUDIT_QUERY,
3434
REPORT_AUDIT_QUERY,
35+
ASSAY_RESULT_AUDIT_QUERY,
3536
} from './constants';
3637

3738
export function getAuditQueries(ctx: ModuleContext): AuditQuery[] {
3839
const queries = [...COMMON_AUDIT_QUERIES];
3940
if (isProductFoldersEnabled(ctx)) queries.push(CONTAINER_AUDIT_QUERY);
4041
if (isWorkflowEnabled(ctx)) queries.push(WORKFLOW_AUDIT_QUERY);
41-
if (isAssayEnabled(ctx)) queries.push(ASSAY_AUDIT_QUERY);
42+
if (isAssayEnabled(ctx)) {
43+
queries.push(ASSAY_AUDIT_QUERY);
44+
queries.push(ASSAY_RESULT_AUDIT_QUERY);
45+
}
4246
if (isSampleManagerEnabled(ctx) && !isRegistryEnabled(ctx)) queries.push(SOURCE_AUDIT_QUERY);
4347
if (isRegistryEnabled(ctx)) {
4448
queries.push(DATACLASS_DATA_UPDATE_AUDIT_QUERY);

0 commit comments

Comments
 (0)