Skip to content

Give EHRSecurityEscalationDomainKind a unique prefix #1022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-adam merged 4 commits into from
Sep 3, 2025
Merged

Give EHRSecurityEscalationDomainKind a unique prefix #1022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a0f61a5
Give EHRSecurityEscalationDomainKind a unique prefix
labkey-adam Aug 27, 2025
3f4a9f7
Uniquify domain namespace prefixes
labkey-adam Aug 28, 2025
b5c5676
Stricter checks on namespace prefixes
labkey-adam Aug 28, 2025
5595f61
Merge remote-tracking branch 'origin/develop' into fb_drop_indices
labkey-adam Aug 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions ehr/api-src/org/labkey/api/ehr/security/EHRSecurityEscalatorAuditProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package org.labkey.api.ehr.security;

import org.labkey.api.audit.query.AbstractAuditDomainKind;
import org.labkey.api.data.Container;
import org.labkey.api.study.security.SecurityEscalationAuditProvider;

Expand All @@ -27,8 +26,14 @@ public class EHRSecurityEscalatorAuditProvider extends SecurityEscalationAuditPr
public static String EVENT_TYPE = EHRSecurityEscalationEvent.class.getSimpleName();
public static String AUDIT_LOG_TITLE = "EHR Security Escalations";

public EHRSecurityEscalatorAuditProvider()
{
super(new EHRSecurityEscalationDomainKind());
}

@Override
public String getDescription() {
public String getDescription()
{
return "This audits all uses of the EHR Security Escalation";
}

Expand All @@ -47,11 +52,6 @@ public String getAuditLogTitle() {
return AUDIT_LOG_TITLE;
}

@Override
protected AbstractAuditDomainKind getDomainKind() {
return new EHRSecurityEscalationDomain();
}

public static class EHRSecurityEscalationEvent extends SecurityEscalationEvent
{
/** Important for reflection-based instantiation */
Expand All @@ -69,10 +69,17 @@ public String getEventType() {
}
}

public static class EHRSecurityEscalationDomain extends SecurityEscalationAuditDomainKind
public static class EHRSecurityEscalationDomainKind extends SecurityEscalationAuditDomainKind
{
public EHRSecurityEscalationDomain() {
public EHRSecurityEscalationDomainKind()
{
super(EVENT_TYPE, EHRSecurityEscalationEvent.class.getName());
}

@Override
protected String getNamespacePrefix()
{
return NAMESPACE_PREFIX + "EHRSecurityEscalationDomain";
}
}
}
11 changes: 5 additions & 6 deletions snd/src/org/labkey/snd/NarrativeAuditProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ public class NarrativeAuditProvider extends AbstractAuditTypeProvider implements
public static final String COLUMN_NAME_EVENTDATE = "EventDate";
public static final String COLUMN_NAME_QCSTATE = "QcState";

static final List<FieldKey> defaultVisibleColumns = new ArrayList<>();

static {
private static final List<FieldKey> defaultVisibleColumns = new ArrayList<>();

static
{
defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED));
defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED_BY));
defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_IMPERSONATED_BY));
Expand All @@ -57,10 +57,9 @@ public class NarrativeAuditProvider extends AbstractAuditTypeProvider implements
defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_QCSTATE));
}

@Override
protected AbstractAuditDomainKind getDomainKind()
public NarrativeAuditProvider()
{
return new org.labkey.snd.NarrativeAuditProvider.NarrativeAuditDomainKind();
super(new NarrativeAuditDomainKind());
}

@Override
Expand Down