Merge 26.4 to develop

Author: labkey-teamcity

api/src/org/labkey/api/module/DefaultModule.java

@@ -137,7 +137,6 @@ public abstract class DefaultModule implements Module, ApplicationContextAware
     private String _vcsRevision = null;
     private String _vcsUrl = null;
     private String _vcsBranch = "Unknown";
-    private String _vcsTag = "Unknown";
     private String _buildUser = null;
     private String _buildTime = null;
     private String _buildOS = null;
@@ -818,17 +817,10 @@ public void setVcsBranch(String vcsBranch)
         _vcsBranch = vcsBranch;
     }
 
-    @Nullable
-    @Override
-    public String getVcsTag()
-    {
-        return _vcsTag;
-    }
-
     @SuppressWarnings({"UnusedDeclaration"})
     public void setVcsTag(String vcsTag)
     {
-        _vcsTag = vcsTag;
+        // Ignored - present in module.xml but not used
     }
 
     public final String getBuildUser()
@@ -974,7 +966,6 @@ public final Map<String, String> getProperties()
         props.put("VCS URL", getVcsUrl());
         props.put("VCS Revision", getVcsRevision());
         props.put("VCS Branch", getVcsBranch());
-        props.put("VCS Tag", getVcsTag());
         props.put("Build OS", getBuildOS());
 
         props.put("Build Time", getBuildTime());
@@ -1605,7 +1596,6 @@ public void copyPropertiesFrom(DefaultModule from)
         this.setUrl(from.getUrl());
         this.setVcsBranch(from.getVcsBranch());
         this.setVcsRevision(from.getVcsRevision());
-        this.setVcsTag(from.getVcsTag());
         this.setVcsUrl(from.getVcsUrl());
         this.setZippedPath(from.getZippedPath());
     }

api/src/org/labkey/api/module/MockModule.java

@@ -331,12 +331,6 @@ public String getVcsBranch()
         return null;
     }
 
-    @Override
-    public String getVcsTag()
-    {
-        return null;
-    }
-
     @Override
     public boolean shouldManageVersion()
     {

api/src/org/labkey/api/module/Module.java

@@ -311,7 +311,6 @@ default void startBackgroundThreads()
     String getVcsRevision();
     String getVcsUrl();
     String getVcsBranch();
-    String getVcsTag();
     String getBuildNumber();
 
     default String getBuildTime()

api/src/org/labkey/api/util/UsageReportingLevel.java

@@ -327,9 +327,11 @@ public static void putModulesBuildInfo(Map<String, Map<String, Object>> allModul
             moduleBuildInfo.put("vcsUrl", module.getVcsUrl());
             moduleBuildInfo.put("vcsBranch", module.getVcsBranch());
             moduleBuildInfo.put("vcsRevision", module.getVcsRevision());
-            moduleBuildInfo.put("vcsTag", module.getVcsTag());
+            // We stopped capturing the Git tag in module metadata. The release version property serves
+            // the same purpose. Continue reporting as vcsTag for backwards compatibility with mothership reporting.
+            moduleBuildInfo.put("vcsTag", module.getReleaseVersion());
             moduleBuildInfo.put("moduleClass", module.getClass().getName());
-            moduleBuildInfo.put("version", module.getFormattedSchemaVersion()); // TODO: call this "schemaVersion"? Also send "releaseVersion"?
+            moduleBuildInfo.put("version", module.getFormattedSchemaVersion()); // TODO: call this "schemaVersion"?
 
             // Add to the module's info to be included in the submission
             moduleStats.put("buildInfo", moduleBuildInfo);

assay/package-lock.json

@@ -12,7 +12,7 @@
     "clean": "rimraf resources/web/assay/gen && rimraf resources/views/gen && rimraf resources/web/gen"
   },
   "dependencies": {
-    "@labkey/components": "7.26.4"
+    "@labkey/components": "7.26.6"
   },
   "devDependencies": {
     "@labkey/build": "9.1.0",

assay/package.json

@@ -53,7 +53,7 @@
     }
   },
   "dependencies": {
-    "@labkey/components": "7.26.4",
+    "@labkey/components": "7.26.6",
     "@labkey/themes": "1.8.0"
   },
   "devDependencies": {

core/package-lock.json

@@ -114,8 +114,8 @@
                             if (show && null != tab.getText() && !tab.getText().isEmpty())
                             {
                 %>
-                <li role="presentation" class="<%= unsafe(tab.isSelected() ? "active" : "") %>">
-                    <a href="<%=h(tab.getHref())%>" id="<%=h(tab.getText().replace(" ", ""))%>Tab">
+                <li class="<%= unsafe(tab.isSelected() ? "active" : "") %>">
+                    <a href="<%=h(tab.getHref())%>" id="<%=h(tab.getText().replace(" ", ""))%>Tab"<%= unsafe(tab.isSelected() ? " aria-current=\"page\"" : "") %>>
                         <% if (tab.isDisabled()) { %>
                         <i class="fa fa-eye-slash"></i>
                         <% } %>
@@ -141,7 +141,7 @@
                     {
                         HtmlString plus = HtmlString.unsafe("<i class=\"fa fa-plus\" style=\"font-size: 12px;\"></i>");
                 %>
-                <li role="presentation">
+                <li>
                     <%=simpleLink(plus).id("addTab").title("Add New Tab").onClick("LABKEY.Portal.addTab();")%>
                 </li>
                 <%
@@ -160,7 +160,7 @@
                                 if (tab.isSelected())
                                 {
                 %>
-                <li role="presentation" class="dropdown active">
+                <li class="dropdown active">
                     <a data-target="#" class="dropdown-toggle" data-toggle="dropdown">
                         <%=h(tab.getText())%>&nbsp;
                         <span class="fa fa-chevron-down" style="font-size: 12px;"></span>
@@ -181,7 +181,7 @@
                                 {
                         %>
                         <li>
-                            <a href="<%=h(tab.getHref())%>">
+                            <a href="<%=h(tab.getHref())%>"<%= unsafe(tab.isSelected() ? " aria-current=\"page\"" : "") %>>
                                 <% if (tab.isSelected())
                                    {
                                         %><b><%=h(tab.getText())%></b><%