Changeset 7887

Timestamp:

Dec 4, 2020, 9:56:39 AM (11 months ago)

Author:

Nicklas Nordborg

Message:

References #2229: Synchronization filters that uses a child or parent column are not displayed correctly

Fixes an issue if the child column is from a rawbioassay. In this case, the "item type" is not a subtype, but a raw data type which means we need to check and handle this differently.

Also added a <missing> tag for indicating things that are missing since the filter was created.

Location:

branches/3.17-stable

Files:

• src/clients/web/net/sf/basedb/clients/web/util/HTML.java (modified) (1 diff)
• src/core/net/sf/basedb/util/formatter/PropertyFilterFormatter.java (modified) (4 diffs)
• www/views/itemlists/syncfilter/ajax.jsp (modified) (1 diff)
• www/views/itemlists/syncfilter/filtertext.css (modified) (1 diff)
• www/views/itemlists/view_list.jsp (modified) (1 diff)

branches/3.17-stable/src/clients/web/net/sf/basedb/clients/web/util/HTML.java

@@ -322 +322 @@
         else
         {
-          m.appendReplacement(sb, "<$2>");
+          m.appendReplacement(sb, "<$2 $3>");
         }
       }

branches/3.17-stable/src/core/net/sf/basedb/util/formatter/PropertyFilterFormatter.java

@@ -27 +27 @@
 import net.sf.basedb.core.DbControl;
 import net.sf.basedb.core.Item;
+import net.sf.basedb.core.ItemNotFoundException;
 import net.sf.basedb.core.Nameable;
 import net.sf.basedb.core.Operator;
 import net.sf.basedb.core.PropertyFilter;
+import net.sf.basedb.core.RawDataType;
+import net.sf.basedb.core.RawDataTypes;
 import net.sf.basedb.core.Type;
 import net.sf.basedb.util.Values;
@@ -96 +99 @@
       }
       
-      int subtypeId = Values.getInt(tmp[baseIndex+2]);
+      Item relatedItemType = Item.valueOf(tmp[baseIndex+1]);
       property = tmp[baseIndex+3];
       sb.append(function(parentOrChild)).append("(");
-      sb.append(value(nameOfItem(dc, Item.ITEMSUBTYPE, subtypeId, false)));
+      if (relatedItemType == Item.RAWBIOASSAY)
+      {
+        RawDataType rdt = RawDataTypes.getRawDataType(tmp[baseIndex+2]);
+        if (rdt == null)
+        {
+          sb.append(value(missing(tmp[baseIndex+2], "This raw data type doesn't exist!")));
+        }
+        else
+        {
+          sb.append(value(rdt.getName()));
+        }
+      }
+      else
+      {
+        int subtypeId = Values.getInt(tmp[baseIndex+2]);
+        sb.append(value(nameOfItem(dc, Item.ITEMSUBTYPE, subtypeId, false)));
+      }
       sb.append(")");
       if (!property.startsWith("#")) sb.append(".");
@@ -283 +302 @@
       return q+((Nameable)itemType.getById(dc, id)).getName()+q;
     }
+    catch (ItemNotFoundException ex)
+    {
+      return missing(Integer.toString(id), "This " + itemType.toString().toLowerCase() + " doesn't exist!");
+    }
     catch (RuntimeException ex)
     {
-      return Integer.toString(id);
+      return missing(Integer.toString(id), ex.getMessage());
     }
   }
@@ -321 +344 @@
     return tagElements ? "<function>"+function+"</function>" : function;
   }
+  private String missing(String missing, String title)
+  {
+    return tagElements ? "<missing title=\""+(title!=null ? title :"Missing")+"\">"+missing+"</missing>" : missing;
+  }
 
   

branches/3.17-stable/www/views/itemlists/syncfilter/ajax.jsp

@@ -89 +89 @@
     if (sourceItemType == syncFilter.getSourceItemType())
     {
-      json.put("filter", HTML.encodeTags(formatFilter(dc, syncFilter), "value|name|operator|function"));
+      json.put("filter", HTML.encodeTags(formatFilter(dc, syncFilter), "value|name|operator|function|missing"));
     }
   }

branches/3.17-stable/www/views/itemlists/syncfilter/filtertext.css

@@ -22 +22 @@
   color: #666666;
 }
-
+.filtertext missing
+{
+  text-decoration: underline dashed #d00000;
+}

branches/3.17-stable/www/views/itemlists/view_list.jsp

@@ -536 +536 @@
                   }
                   %>
-                  <pre class="filtertext" id="syncfilter.<%=filterId%>"><%=HTML.encodeTags(filterString, "value|name|operator|function")%></pre></tbl:cell>
+                  <pre class="filtertext" id="syncfilter.<%=filterId%>"><%=HTML.encodeTags(filterString, "value|name|operator|function|missing")%></pre></tbl:cell>
                 <tbl:cell column="inSync">
                   <base:icon