Changeset 8088 for branches/3.19-stable

Timestamp:

Oct 31, 2022, 9:57:24 AM (7 months ago)

Author:

Nicklas Nordborg

Message:

References #2286: Improve performance for multi-hop child->parent->child kolumns

Implemented functionality for allowing/not allowing doubling back when creating a related item column that has a child->parent->child specification. The default is to not allow doubling back.

Location:

branches/3.19-stable

Files:

• src/clients/web/net/sf/basedb/clients/web/extensions/list/RelatedItemColumn.java (modified) (6 diffs)
• src/clients/web/net/sf/basedb/clients/web/extensions/list/RelatedItemMultiHopColumn.java (modified) (2 diffs)
• www/common/columns/add_relateditem_column.js (modified) (5 diffs)
• www/common/columns/add_relateditem_column.jsp (modified) (3 diffs)
• www/images/child-item-doubleback.png (added)
• www/include/styles/table.css (modified) (2 diffs)

branches/3.19-stable/src/clients/web/net/sf/basedb/clients/web/extensions/list/RelatedItemColumn.java

@@ -189 +189 @@
   
   /**
+    Get the specification for this column.
+    @since 3.19.5
+  */
+  protected Specification getSpecification()
+  {
+    return spec;
+  }
+  
+  /**
     We finalize this implementation to make sure that the helper 
     implementation always get a chance to re-cycle transactions.
@@ -261 +270 @@
   {
     Set<Integer> sourceIds = Collections.singleton(item.getId());
+    helper.transformContext.resetCollected();
     if (preTransform != null)
     {
+      if (!spec.allowDoublingBack) helper.transformContext.setCollecting();
       sourceIds = preTransform.transform(helper.transformContext, sourceIds);
+      if (!spec.allowDoublingBack) helper.transformContext.setAvoiding();
     }
     Set<Integer> relatedIds = transformer.transform(helper.transformContext, sourceIds);
@@ -309 +321 @@
         baseIndex = 2;
         spec.directionRaw = tmp[1];
-        if ("CHILD".equals(spec.directionRaw)) spec.direction = SourceItemTransform.PARENT_TO_CHILD;
+        if (spec.directionRaw.endsWith("+")) spec.allowDoublingBack = true;
+        if (spec.directionRaw.startsWith("CHILD")) spec.direction = SourceItemTransform.PARENT_TO_CHILD;
       }
       spec.targetType = Item.valueOf(tmp[baseIndex]);
@@ -353 +366 @@
     String directionRaw;
     SourceItemTransform direction;
+    boolean allowDoublingBack;
     Item sourceType;
     Item targetType;
@@ -388 +402 @@
 
     /**
+      Enabled on a multi-hop path if the path down to the related child from the
+      parent item is allowed to traverse the same items as the path up from
+      the source child item to the parent.
+    */
+    public boolean isDoublingBackAllowed()
+    {
+      return allowDoublingBack;
+    }
+    
+    /**
       Get the source item type. This is not part of the expression, but
       is taken from the current list.
@@ -474 +498 @@
       result += direction == SourceItemTransform.CHILD_TO_PARENT ? "parentitem" : "childitem";
       if (multiHop) result += " multihop";
+      if (allowDoublingBack) result += " doublingback";
       result += "\">";
       result += StringUtil.coalesce(subtypeName, targetType.name());

branches/3.19-stable/src/clients/web/net/sf/basedb/clients/web/extensions/list/RelatedItemMultiHopColumn.java

@@ -18 +18 @@
 
   private final RelatedItemColumn nextHop;
+  private final Specification nextSpec;
+  
   RelatedItemMultiHopColumn(DbControl dc, int index, Specification spec, RelatedItemHelper helper, RelatedItemColumn nextHop)
   {
     super(dc, index, spec, helper);
     this.nextHop = nextHop;
+    this.nextSpec = nextHop.getSpecification();
     
     setValueType(nextHop.getValueType());
@@ -43 +46 @@
     setTitle(spec.generateTitle(nextHop.getTitle()));
     setSubtitle(nextHop.getSubtitle());
-    setTooltip(spec.generateTooltip(StringUtil.coalesce(nextHop.getTooltip(), nextHop.getTitle())));
+    setTooltip(spec.generateTooltip(StringUtil.coalesce(nextHop.getTooltip(), nextHop.getTitle())+
+      (nextSpec.allowDoublingBack ? " (doubling back allowed)" : " (no doubling back)")));
   }
 

branches/3.19-stable/www/common/columns/add_relateditem_column.js

@@ -109 +109 @@
     configure.clearList('childItemType');
     configure.clearList('childSubtype');
+    Doc.element('allowDoublingBack').disabled = true;
     
     var frm = document.forms['relatedItems'];
@@ -200 +201 @@
     configure.clearColumns();
     configure.clearList('childSubtype');
+    Doc.element('allowDoublingBack').disabled = true;
     
     var frm = document.forms['relatedItems'];
@@ -267 +269 @@
       frm.childSubtype.selectedIndex = 0;
       frm.childSubtype.disabled = currentChildSubtypes.length == 0;
+      frm.allowDoublingBack.disabled = currentChildSubtypes.length == 0;
     } 
     
@@ -371 +374 @@
     data.childItemType = frm.childItemType.value;
     data.childSubtype = frm.childSubtype.value;
+    data.allowDoublingBack = frm.allowDoublingBack.checked?1:0;
 
     if (!data.targetItemType)
@@ -396 +400 @@
     {
       data.childSubtypeName = frm.childSubtype[frm.childSubtype.selectedIndex].text;
-      propertyPrefix += '/CHILD/'+data.childItemType+'/'+data.childSubtype+'/';
+      propertyPrefix += (data.allowDoublingBack?'/CHILD+/':'/CHILD/')+data.childItemType+'/'+data.childSubtype+'/';
       titlePrefix += '.'+data.childSubtypeName;
     }

branches/3.19-stable/www/common/columns/add_relateditem_column.jsp

@@ -58 +58 @@
 {
   width: 100%;
+  position: absolute;
+  border-collapse: separate;
+}
+
+.columnstable thead
+{
+  position: sticky;
+  top: 0;
 }
 
@@ -63 +71 @@
 {
   vertical-align: top;
+}
+
+.columnstable tr.bottomborder th
+{
+  border-bottom-width: 1px;
+}
+
+.columnstable tr.topborder th
+{
+  border-top-width: 1px;
 }
 
@@ -170 +188 @@
       </td>
     </tr>
+    <tr>
+      <th class="subprompt"></th>
+      <td>
+        <label><input type="checkbox" id="showAllAnnotationTypes" 
+          name="showAllAnnotationTypes">Show annotations for all subtypes</label>
+      </td>
+      <td></td>
+      <td>
+        <label title="Normally, child items that was passed when going up to the parent are ignored when going down. Enable this option to include all child items."
+          ><input type="checkbox" id="allowDoublingBack" name="allowDoublingBack" disabled
+          >Allow doubling back</label>
+      </td>
+    </tr>
     <tr class="dynamic">
       <th></th>
-      <td></td>
-      <td></td>
-      <td></td>
+      <td colspan="3" class="columnsFrom" style="padding-top: 2px;">
+        <span id="targetPath"></span><span id="childPath" class="childitem" style="display: none;"></span>
+      </td>
     </tr>
     </table>
     </div>
     
-    <div class="absolutefull" style="top: 4em; left: 10em;">
-      <div class="columnsFrom" style="height: 1.5em; white-space: nowrap; overflow: hidden;">
-        <span id="targetPath"></span><span id="childPath" class="childitem" style="display: none;"></span>
-        <label style="font-weight: normal;"><input type="checkbox" id="showAllAnnotationTypes" 
-          name="showAllAnnotationTypes">Show annotations for all subtypes</label>
-      </div>
+    <div class="absolutefull" style="top: 6.75em; left: 10em;">   
       <table id="columnstable" class="columnstable" style="width: 100%;">
-      <thead class="bg-filled-100 topborder bottomborder">
-        <tr>
+      <thead class="">
+        <tr class="bg-filled-100 topborder bottomborder">
           <th style="width: 33%;">Columns</th>
           <th style="width: 33%;">Annotations</th>

branches/3.19-stable/www/include/styles/table.css

@@ -253 +253 @@
 }
 
-/* A column header defining a parent/child item value */
-.itemlist div.data th.relateditemcol::before
-{
-  margin-right: 2px;
-  float: left;
-}
-
 .itemlist div.data th.relateditemcol span.parentitem::before
 {
@@ -274 +267 @@
 }
 
-
-/* This will make room for the '›' without causing the header to wrap */
-.itemlist div.data th.relateditemcol > span
-{
-  display: inline-block;
-  max-width: calc(100% - 16px);
-  overflow: hidden;
-}
+.itemlist div.data th.relateditemcol span.childitem.doublingback::before
+{
+  content: url('../../images/child-item-doubleback.png');
+}
+
 
 /* A column header defining a linked item value */