Skip to content

Clear exception count and warnings after encrypted content is cleared #7538

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
Apr 3, 2026
Merged

Clear exception count and warnings after encrypted content is cleared #7538

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
56fc4cd
Clear warnings after encrypted content is cleared
labkey-adam Mar 31, 2026
174cfa5
Clear the exception counter as well
labkey-adam Mar 31, 2026
336f945
Suppress "Parent Type" in title if not filtered
labkey-adam Mar 31, 2026
e6ceef4
Merge remote-tracking branch 'origin/develop' into fb_clear_warnings
labkey-adam Apr 3, 2026
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
3 changes: 3 additions & 0 deletions api/src/org/labkey/api/security/Encryption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,9 @@ public static void deleteEncryptedContent(User user)
event.setChanges(changes);
AuditLogService.get().addEvent(user, event);
CacheManager.clearAllKnownCaches();
// Reset the counter and clear the warnings
DECRYPTION_EXCEPTIONS.set(0);
WarningService.get().clearStaticWarnings();
LOG.info("Finished deleting all encrypted content");
}

Expand Down
1 change: 1 addition & 0 deletions api/src/org/labkey/api/view/template/WarningService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,5 @@ static void setInstance(WarningService impl)
Warnings getWarnings(@Nullable ViewContext context);
HtmlString getWarningsHtml(Warnings warnings, ViewContext context);
void rerunSchemaCheck(); // Doesn't really fit on this service, but there's no better existing service
void clearStaticWarnings();
}
2 changes: 1 addition & 1 deletion core/src/org/labkey/core/admin/AdminController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3688,7 +3688,7 @@ public AttachmentsForTypeAction()
public void addNavTrail(NavTree root)
{
String parentType = getViewContext().getActionURL().getParameter("core.ParentType~eq");
addAdminNavTrail(root, "Documents Belonging to Parent Type" + (parentType != null ? " \"" + parentType + "\"" : ""), getClass());
addAdminNavTrail(root, parentType != null ? "Documents Belonging to Parent Type \"" + parentType + "\"" : "Documents", getClass());
}
}

Expand Down
7 changes: 4 additions & 3 deletions core/src/org/labkey/core/view/template/bootstrap/WarningServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ private static class LazyInitializer
SHOW_ALL_WARNINGS = OptionalFeatureService.get().isFeatureEnabled(EXPERIMENTAL_SHOW_ALL_WARNINGS);
OptionalFeatureService.get().addFeatureListener(EXPERIMENTAL_SHOW_ALL_WARNINGS, (feature, enabled) -> {
SHOW_ALL_WARNINGS = enabled;
clearStaticWarnings(); // Force static warnings to be re-collected since flag has changed
WarningService.get().clearStaticWarnings(); // Force static warnings to be re-collected since flag has changed
});
}
}
Expand All @@ -86,7 +86,8 @@ public void register(WarningProvider provider)
clearStaticWarnings();
}

private static void clearStaticWarnings()
@Override
public void clearStaticWarnings()
{
synchronized (STATIC_WARNING_LOCK)
{
Expand Down Expand Up @@ -194,7 +195,7 @@ private void appendMessageContent(Warnings warnings, HtmlStringBuilder html)
List<HtmlString> messages = warnings.getMessages();

if (messages.size() == 1)
html.append(messages.get(0));
html.append(messages.getFirst());
else
{
html.startTag("ul");
Expand Down
Loading