Merge remote-tracking branch 'origin/develop' into fb_sourceDIB

Author: XingY

api/src/org/labkey/api/exp/PropertyColumn.java

@@ -211,7 +211,6 @@ public void setParentIsObjectId(boolean id)
     @Override
     public SQLFragment getValueSql(String tableAlias)
     {
-        String cast = getPropertySqlCastType();
         SQLFragment sql = new SQLFragment("(SELECT ");
         if (isMvIndicatorColumn())
         {
@@ -232,6 +231,8 @@ else if (_pd.getPropertyType() == PropertyType.BOOLEAN)
         else
             sql.append(getTableAlias(tableAlias)).append(".ObjectId");
         sql.append(")");
+
+        String cast = getPropertySqlCastType();
         if (null != cast)
         {
             sql.insert(0, "CAST(");
@@ -262,23 +263,21 @@ static private String getPropertyCol(@NotNull PropertyDescriptor pd)
                 };
     }
 
-    private String getPropertySqlCastType()
+    private @Nullable String getPropertySqlCastType()
     {
         if (isMvIndicatorColumn())
             return null;
-        PropertyType pt = _pd.getPropertyType();
-        if (PropertyType.DOUBLE == pt || PropertyType.DATE_TIME == pt)
-            return null;
-        else if (PropertyType.TIME == pt)
-            return "TIME";
-        else if (PropertyType.DATE == pt)
-            return "DATE";
-        else if (PropertyType.INTEGER == pt)
-            return "INT";
-        else if (PropertyType.BOOLEAN == pt)
-            return getParentTable().getSqlDialect().getBooleanDataType();
-        else
-            return getParentTable().getSqlDialect().getSqlTypeName(JdbcType.VARCHAR) + "(" + PropertyStorageSpec.DEFAULT_SIZE + ")";
+
+        return switch (_pd.getPropertyType())
+        {
+            case DOUBLE, DATE_TIME, DECIMAL, FLOAT -> null;
+            case TIME -> "TIME";
+            case DATE -> "DATE";
+            case INTEGER -> "INT";
+            case BOOLEAN -> getParentTable().getSqlDialect().getBooleanDataType();
+            case null, default -> getParentTable().getSqlDialect().getSqlTypeName(JdbcType.VARCHAR) +
+                    "(" + PropertyStorageSpec.DEFAULT_SIZE + ")";
+        };
     }
 
     public PropertyDescriptor getPropertyDescriptor()

api/src/org/labkey/api/query/AbstractNestableDataRegion.java

@@ -38,6 +38,7 @@
 
 import static org.labkey.api.util.DOM.A;
 import static org.labkey.api.util.DOM.Attribute.align;
+import static org.labkey.api.util.DOM.Attribute.alt;
 import static org.labkey.api.util.DOM.Attribute.colspan;
 import static org.labkey.api.util.DOM.Attribute.id;
 import static org.labkey.api.util.DOM.Attribute.src;
@@ -94,7 +95,8 @@ protected void renderExtraRecordSelectorContent(RenderContext ctx, HtmlWriter ou
                 at(
                     id, getName() + "-Handle" + value,
                     valign, "middle",
-                    src, ctx.getViewContext().getContextPath() + "/_images/" + (_expanded ? "minus" : "plus") + ".gif"
+                    src, ctx.getViewContext().getContextPath() + "/_images/" + (_expanded ? "minus" : "plus") + ".gif",
+                    alt, _expanded ? "Collapse row" : "Expand row"
                 )
             )
         ).appendTo(out);

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

@@ -155,7 +155,8 @@ public Appendable appendTo(Appendable out)
                     .at(!lb.enabled, disabled, true)
                     .data(null != lb.tooltip, "tt", "tooltip")
                     .data(null != lb.tooltip, "placement","top")
-                    .data(null != lb.tooltip, "original-title", lb.tooltip),
+                    .data(null != lb.tooltip, "original-title", lb.tooltip)
+                    .at(lb.iconCls != null && lb.tooltip != null, DOM.Attribute.aria_label, lb.tooltip),
                     (lb.iconCls != null ? null : lb.html)
             ).appendTo(out);
         }

api/webapp/clientapi/ext3/PersistentToolTip.js

@@ -167,7 +167,7 @@ LABKEY.ext.CalloutTip = Ext.extend(LABKEY.ext.PersistentToolTip, {
       if (!this.targetAutoEl) {
           this.targetAutoEl =
               '<span class="labkey-callout-tip' + (this.leftPlacement ? ' labkey-callout-tip-left' : '' ) + '">' +
-              '<img src="' + LABKEY.contextPath + '/_.gif">' +
+              '<img src="' + LABKEY.contextPath + '/_.gif" alt="Show details">' +
               '</span>';
       }
 

core/package-lock.json

@@ -54,7 +54,7 @@
   },
   "dependencies": {
     "@labkey/components": "7.31.1",
-    "@labkey/themes": "1.8.0"
+    "@labkey/themes": "1.9.0"
   },
   "devDependencies": {
     "@labkey/build": "9.1.1",