Skip to content

Move ExtJS 3.x options to Deprecated Features page #7712

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 1 commit into from
Jun 2, 2026
Merged

Move ExtJS 3.x options to Deprecated Features page #7712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 19 additions & 0 deletions api/src/org/labkey/api/ApiModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,9 @@ public class ApiModule extends CodeOnlyModule
private static final String CORS_PREFIX = "cors.";
private static final String CORS_FILTER_NAME = "CorsFilter";

public static final String EXTJS_3_REQUIRED = "ExtJs3Required";
public static final String EXTJS_3_API_REQUIRED = "ExtJs3ApiRequired";

@Override
protected void init()
{
Expand Down Expand Up @@ -245,6 +248,22 @@ protected void init()
false,
OptionalFeatureService.FeatureType.Optional
));
OptionalFeatureService.get().addFeatureFlag(new OptionalFeatureFlag(
EXTJS_3_REQUIRED,
"Require that ExtJS v3.4.1 is loaded on every page",
"This option will be removed in LabKey Server 26.11",
false,
false,
FeatureType.Deprecated
));
OptionalFeatureService.get().addFeatureFlag(new OptionalFeatureFlag(
EXTJS_3_API_REQUIRED,
"Require that ExtJS v3.x-based Client API is loaded on every page",
"This option will be removed in LabKey Server 26.11",
false,
false,
FeatureType.Deprecated
));
}

@NotNull
Expand Down
2 changes: 1 addition & 1 deletion api/src/org/labkey/api/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public static double getEarliestUpgradeVersion()
*/
public static String getDocumentationVersion()
{
return "26.3";
return "26.7";
}

/**
Expand Down
4 changes: 0 additions & 4 deletions api/src/org/labkey/api/settings/AppProps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,6 @@ static WriteableAppProps getWriteableInstance()

int getMaxBLOBSize();

boolean isExt3Required();

boolean isExt3APIRequired();

ExceptionReportingLevel getExceptionReportingLevel();

/**
Expand Down
12 changes: 0 additions & 12 deletions api/src/org/labkey/api/settings/AppPropsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,18 +327,6 @@ public int getMaxBLOBSize()
return lookupIntValue(maxBLOBSize, 50_000_000);
}

@Override
public boolean isExt3Required()
{
return lookupBooleanValue(ext3Required, false);
}

@Override
public boolean isExt3APIRequired()
{
return lookupBooleanValue(ext3APIRequired, false);
}

@Override
public boolean isSelfReportExceptions()
{
Expand Down
16 changes: 0 additions & 16 deletions api/src/org/labkey/api/settings/SiteSettingsProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,22 +98,6 @@ public void setValue(WriteableAppProps writeable, String value)
writeable.setMaxBLOBSize(Integer.parseInt(value));
}
},
ext3Required("Require ExtJS v3.4.1 be loaded on each page (DEPRECATED)")
{
@Override
public void setValue(WriteableAppProps writeable, String value)
{
writeable.setExt3Required(Boolean.parseBoolean(value));
}
},
ext3APIRequired("Require ExtJS v3.x based Client API be loaded on each page (DEPRECATED)")
{
@Override
public void setValue(WriteableAppProps writeable, String value)
{
writeable.setExt3APIRequired(Boolean.parseBoolean(value));
}
},
sslRequired("Require SSL connections (users must connect via SSL)")
{
@Override
Expand Down
10 changes: 0 additions & 10 deletions api/src/org/labkey/api/settings/WriteableAppProps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,16 +106,6 @@ public void setSelfReportExceptions(boolean selfReport)
storeBooleanValue(selfReportExceptions, selfReport);
}

public void setExt3Required(boolean required)
{
storeBooleanValue(ext3Required, required);
}

public void setExt3APIRequired(boolean required)
{
storeBooleanValue(ext3APIRequired, required);
}

public void setBLASTServerBaseURL(String blastServerBaseURL)
{
storeStringValue(BLASTBaseURL, blastServerBaseURL);
Expand Down
6 changes: 4 additions & 2 deletions api/src/org/labkey/api/util/PageFlowUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import org.json.JSONObject;
import org.junit.Assert;
import org.junit.Test;
import org.labkey.api.ApiModule;
import org.labkey.api.action.UrlProvider;
import org.labkey.api.action.UrlProviderOverrideHandler;
import org.labkey.api.action.UrlProviderService;
Expand Down Expand Up @@ -67,6 +68,7 @@
import org.labkey.api.settings.AppProps;
import org.labkey.api.settings.CustomLabelService;
import org.labkey.api.settings.LookAndFeelProperties;
import org.labkey.api.settings.OptionalFeatureService;
import org.labkey.api.settings.ResourceURL;
import org.labkey.api.settings.TemplateResourceHandler;
import org.labkey.api.settings.Theme;
Expand Down Expand Up @@ -1661,9 +1663,9 @@ private static SafeToRender _getStandardIncludes(ViewContext context, @Nullable
if (includeDefaultResources)
{
// Respect App Properties regarding Ext3 configuration
if (AppProps.getInstance().isExt3APIRequired())
if (OptionalFeatureService.get().isFeatureEnabled(ApiModule.EXTJS_3_API_REQUIRED))
resources.add(ClientDependency.fromPath("clientapi/ext3"));
else if (AppProps.getInstance().isExt3Required())
else if (OptionalFeatureService.get().isFeatureEnabled(ApiModule.EXTJS_3_REQUIRED))
resources.add(ClientDependency.fromPath("Ext3"));

// TODO: Turn this into a lib.xml
Expand Down
24 changes: 0 additions & 24 deletions 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 @@ -1410,8 +1410,6 @@ public boolean handlePost(SiteSettingsForm form, BindException errors) throws Ex
props.setMemoryUsageDumpInterval(form.getMemoryUsageDumpInterval());
props.setReadOnlyHttpRequestTimeout(form.getReadOnlyHttpRequestTimeout());
props.setMaxBLOBSize(form.getMaxBLOBSize());
props.setExt3Required(form.isExt3Required());
props.setExt3APIRequired(form.isExt3APIRequired());
props.setSelfReportExceptions(form.isSelfReportExceptions());

props.setAdminOnlyMessage(form.getAdminOnlyMessage());
Expand Down Expand Up @@ -2348,8 +2346,6 @@ public static class SiteSettingsForm
private boolean _sslRequired;
private boolean _adminOnlyMode;
private boolean _showRibbonMessage;
private boolean _ext3Required;
private boolean _ext3APIRequired;
private boolean _selfReportExceptions;
private String _adminOnlyMessage;
private String _ribbonMessage;
Expand Down Expand Up @@ -2401,26 +2397,6 @@ public void setSslRequired(boolean sslRequired)
_sslRequired = sslRequired;
}

public boolean isExt3Required()
{
return _ext3Required;
}

public void setExt3Required(boolean ext3Required)
{
_ext3Required = ext3Required;
}

public boolean isExt3APIRequired()
{
return _ext3APIRequired;
}

public void setExt3APIRequired(boolean ext3APIRequired)
{
_ext3APIRequired = ext3APIRequired;
}

public int getSslPort()
{
return _sslPort;
Expand Down
10 changes: 1 addition & 9 deletions core/src/org/labkey/core/admin/customizeSite.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,21 +308,13 @@ Click the Save button at any time to accept the current settings and continue.</
</tr>
<tr>
<td class="labkey-form-label"><label for="<%=readOnlyHttpRequestTimeout%>">Timeout for read-only HTTP requests, in seconds<%=helpPopup("Read-only HTTP request timeout",
"After the timeout, resources like database connections and spawned processes will be killed to abort processing the request. Set to 0 to disable the timeout.")%></label></td>
"After the timeout, resources like database connections and spawned processes will be killed to abort processing the request. Set to 0 to disable the timeout.")%></label></td>
<td><input type="text" name="<%=readOnlyHttpRequestTimeout%>" id="<%=readOnlyHttpRequestTimeout%>" size="4" value="<%=appProps.getReadOnlyHttpRequestTimeout()%>"></td>
</tr>
<tr>
<td class="labkey-form-label"><label for="<%=maxBLOBSize%>">Maximum file size, in bytes, to allow in database BLOBs</label></td>
<td><input type="text" name="<%=maxBLOBSize%>" id="<%=maxBLOBSize%>" size="10" value="<%=appProps.getMaxBLOBSize()%>"></td>
</tr>
<tr>
<td class="labkey-form-label"><label for="<%=ext3Required%>">Require ExtJS v3.4.1 be loaded on each page</label></td>
<td><input type="checkbox" name="<%=ext3Required%>" id="<%=ext3Required%>"<%=checked(appProps.isExt3Required())%>></td>
</tr>
<tr>
<td class="labkey-form-label"><label for="<%=ext3APIRequired%>">Require ExtJS v3.x based Client API be loaded on each page</label></td>
<td><input type="checkbox" name="<%=ext3APIRequired%>" id="<%=ext3APIRequired%>"<%=checked(appProps.isExt3APIRequired())%>></td>
</tr>
<tr>
<td>&nbsp;</td>
</tr>
Expand Down