LP1904036 Grid wildcard column support

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid-column.component.ts b/Open-ILS/src/eg2/src/app/share/grid/grid-column.component.ts
index 9df9355..3eda216 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid-column.component.ts
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid-column.component.ts
@@ -53,6 +53,9 @@ export class GridColumnComponent implements OnInit {
     // queries regardless of whether they are visible in the display.
     @Input() required = false;
 
+    // IDL class of the object which contains this field.
+    @Input() idlClass: string;
+
     // get a reference to our container grid.
     constructor(@Host() private grid: GridComponent) {}
 
@@ -85,6 +88,7 @@ export class GridColumnComponent implements OnInit {
         col.ternaryBool = this.ternaryBool;
         col.timezoneContextOrg = this.timezoneContextOrg;
         col.dateOnlyIntervalField = this.dateOnlyIntervalField;
+        col.idlClass = this.idlClass;
         col.isAuto = false;
         this.grid.context.columnSet.add(col);
 

diff --git a/Open-ILS/src/eg2/src/app/share/grid/grid.ts b/Open-ILS/src/eg2/src/app/share/grid/grid.ts
index bc72130..13e7167 100644 (file)
--- a/Open-ILS/src/eg2/src/app/share/grid/grid.ts
+++ b/Open-ILS/src/eg2/src/app/share/grid/grid.ts
@@ -76,6 +76,34 @@ export class GridColumn {
         this.filterIncludeOrgAncestors = false;
         this.filterIncludeOrgDescendants = false;
     }
+
+    clone(): GridColumn {
+        const col = new GridColumn();
+
+        col.name = this.name;
+        col.path = this.path;
+        col.label = this.label;
+        col.flex = this.flex;
+        col.required = this.required;
+        col.hidden = this.hidden;
+        col.asyncSupportsEmptyTermClick = this.asyncSupportsEmptyTermClick;
+        col.isIndex = this.isIndex;
+        col.cellTemplate = this.cellTemplate;
+        col.cellContext = this.cellContext;
+        col.disableTooltip = this.disableTooltip;
+        col.isSortable = this.isSortable;
+        col.isFilterable = this.isFilterable;
+        col.isMultiSortable = this.isMultiSortable;
+        col.datatype = this.datatype;
+        col.datePlusTime = this.datePlusTime;
+        col.ternaryBool = this.ternaryBool;
+        col.timezoneContextOrg = this.timezoneContextOrg;
+        col.idlClass = this.idlClass;
+        col.isAuto = this.isAuto;
+
+        return col;
+    }
+
 }
 
 export class GridColumnSet {
@@ -99,6 +127,10 @@ export class GridColumnSet {
 
     add(col: GridColumn) {
 
+        if (col.path && col.path.match(/\*$/)) {
+            return this.generateWildcardColumns(col);
+        }
+
         this.applyColumnDefaults(col);
 
         if (!this.insertColumn(col)) {
@@ -117,6 +149,72 @@ export class GridColumnSet {
         this.applyColumnFilterability(col);
     }
 
+    generateWildcardColumns(col: GridColumn) {
+
+        const dotpath = col.path.replace(/\.?\*$/, '');
+        let classObj, idlField;
+
+        if (col.idlClass) {
+            classObj = this.idl.classes[col.idlClass];
+        } else {
+            classObj = this.idl.classes[this.idlClass];
+        }
+
+        if (!classObj) { return; }
+
+        const pathParts = dotpath.split(/\./);
+        let oldField;
+        let oldFieldLabel = '';
+
+        // find the IDL class definition for the last element in the
+        // path before the .*
+        // An empty pathParts means expand the root class
+        pathParts.forEach((part, pathIdx) => {
+            oldField = idlField;
+            idlField = classObj.field_map[part];
+
+            // unless we're at the end of the list, this field should
+            // link to another class.
+            if (idlField && idlField['class'] && (
+                idlField.datatype === 'link' || idlField.datatype === 'org_unit')) {
+
+                if (oldFieldLabel) { oldFieldLabel += ' : '; }
+
+                oldFieldLabel += idlField.label;
+                classObj = this.idl.classes[idlField['class']];
+
+            } else {
+                if (pathIdx < (pathParts.length - 1)) {
+                    // we ran out of classes to hop through before
+                    // we ran out of path components
+                    console.warn('Grid: invalid IDL path: ' + dotpath);
+                }
+            }
+        });
+
+        if (!classObj) {
+            console.warn(
+                'Grid: wildcard path does not resolve to an object:' + dotpath);
+            return;
+        }
+
+        classObj.fields.forEach(field => {
+
+            // Only show wildcard fields where we have data to show
+            // Virtual and un-fleshed links will not have any data.
+            if (field.virtual ||
+                field.datatype === 'link' || field.datatype === 'org_unit') {
+                return;
+            }
+
+            const newCol = col.clone();
+            newCol.isAuto = true;
+            newCol.path = dotpath ? dotpath + '.' + field.name : field.name;
+            newCol.label = dotpath ? classObj.label + ': ' + field.label : field.label;
+
+            this.add(newCol);
+        });
+    }
 
     // Returns true if the new column was inserted, false otherwise.
     // Declared columns take precedence over auto-generated columns