Skip to content

Prevent showing audit count warning if module startup is still in progress #7043

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-susanh merged 3 commits into from
Sep 17, 2025
Merged

Prevent showing audit count warning if module startup is still in progress #7043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8521f6
Prevent showing audit count warning if module startup is still in pro…
labkey-susanh Sep 16, 2025
3d60471
Add comments about removal and update to proper script file name
labkey-susanh Sep 17, 2025
3e6be77
Merge remote-tracking branch 'origin/develop' into fb_noEarlyWarnings
labkey-susanh Sep 17, 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
3 changes: 2 additions & 1 deletion experiment/src/org/labkey/experiment/ExperimentUpgradeCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,8 @@ private static void ensureBigObjectIds(Selector lastValueSelector, Consumer<Long
}
}

// called from exp-25.007-25.008.sql
// called from exp-25.009-25.010.sql
// When this is removed, the ExperimentWarningProvider class can also be removed.
@SuppressWarnings("unused")
public static void upgradeAmountsAndUnits(ModuleContext context)
{
Expand Down
6 changes: 6 additions & 0 deletions experiment/src/org/labkey/experiment/ExperimentWarningProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,29 @@
import org.labkey.api.data.SQLFragment;
import org.labkey.api.data.SqlSelector;
import org.labkey.api.data.TableInfo;
import org.labkey.api.module.ModuleLoader;
import org.labkey.api.query.UserSchema;
import org.labkey.api.security.User;
import org.labkey.api.util.HtmlString;
import org.labkey.api.view.ViewContext;
import org.labkey.api.view.template.WarningProvider;
import org.labkey.api.view.template.Warnings;

// Remove this class when the exp-25.009-25.010.sql script is no longer in use.
public class ExperimentWarningProvider implements WarningProvider
{
private Long _actualRecordCount;

@Override
public void addDynamicWarnings(@NotNull Warnings warnings, @Nullable ViewContext context, boolean showAllWarnings)
{
if (!ModuleLoader.getInstance().isStartupComplete())
return;

PropertyManager.WritablePropertyMap props = PropertyManager.getWritableProperties(ExperimentModule.AMOUNT_AND_UNIT_UPGRADE_PROP, false);
if (props == null || props.isEmpty())
return;

String expectedCount = props.get(ExperimentModule.AUDIT_COUNT_PROP);
String transactionIdStr = props.get(ExperimentModule.TRANSACTION_ID_PROP);
if (StringUtils.isEmpty(expectedCount) || StringUtils.isEmpty(transactionIdStr))
Expand Down