Mccalluc/merge facets

refinery/ui/source/js/user-file-browser/services/factory.js

@@ -20,7 +20,11 @@
       createColumnDefs: createColumnDefs,
       createData: createData,
       createFilters: createFilters,
-      getUserFiles: getUserFiles
+      getUserFiles: getUserFiles,
+      _mergeAndAddObject: _mergeAndAddObject,
+      _objectToNameValue: _objectToNameValue,
+      _nameValueToObject: _nameValueToObject,
+      _mergeAndAddNameValues: _mergeAndAddNameValues
     };
     var URL = 'url';
     return service;
@@ -72,6 +76,8 @@
         var internalNames = Object.keys(node);
         internalNames.forEach(function (internalName) {
           var display = mapInternalToDisplay(internalName);
+          // TODO: Name collisions might happen here:
+          // organism_Characteristics vs organism_Factor_Value
           row[display] = node[internalName];
         });
         row[URL] = row.name;
@@ -80,19 +86,64 @@
       return data;
     }
 
+    function _mergeAndAddObject (target, extra) {
+      Object.keys(extra).forEach(function (key) {
+        if (typeof target[key] === 'undefined') {
+          target[key] = extra[key];
+        } else {
+          target[key] += extra[key];
+        }
+      });
+    }
+
+    function _objectToNameValue (object) {
+      var nv = [];
+      Object.keys(object).forEach(function (key) {
+        nv.push({
+          name: key,
+          value: object[key]
+        });
+      });
+      return nv;
+    }
+
+    function _nameValueToObject (nameValue) {
+      var obj = {};
+      nameValue.forEach(function (nv) {
+        obj[nv.name] = nv.value;
+      });
+      return obj;
+    }
+
+    function _mergeAndAddNameValues (targetNV, extraNV) {
+      var targetObj = _nameValueToObject(targetNV);
+      var extraObj = _nameValueToObject(extraNV);
+      _mergeAndAddObject(targetObj, extraObj);
+      var newTargetNV = _objectToNameValue(targetObj);
+      targetNV.length = 0;
+      newTargetNV.forEach(function (nv) {
+        targetNV.push(nv);
+      });
+    }
+
     function createFilters (solrFacetCounts) {
       var filters = {};
       Object.keys(solrFacetCounts).forEach(function (key) {
         if (solrFacetCounts[key].length > 0) {
-          // TODO: can't use AttributeOrder (it's per dataset), but this is bad.
           var facetObj = solrFacetCounts[key];
           var lowerCaseNames = facetObj.map(function (nameCount) {
             return nameCount.name.toLowerCase();
           }).join(' ');
-          filters[mapInternalToDisplay(key)] = {
-            facetObj: facetObj,
-            lowerCaseNames: lowerCaseNames
-          };
+          // "foo_Characteristic" and "foo_Factor_Value" both map to "foo".
+          var display = mapInternalToDisplay(key);
+          if (!angular.isDefined(filters[display])) {
+            filters[display] = {
+              facetObj: [],
+              lowerCaseNames: ''
+            };
+          }
+          filters[display].lowerCaseNames += ' ' + lowerCaseNames;
+          _mergeAndAddNameValues(filters[display].facetObj, facetObj);
         }
       });
       return filters;

refinery/ui/source/js/user-file-browser/services/factory.spec.js

@@ -19,6 +19,92 @@
       expect(factory).toBeDefined();
     });
 
+    describe('createData', function () {
+      it('handles empty', function () {
+        expect(factory.createData([]))
+        .toEqual([]);
+      });
+
+      it('handles matching duplicates', function () {
+        expect(factory.createData([{
+          name: 'http://example.com/foo.bar',
+          organism_Characteristics_generic_s: 'dog',
+          organism_Factor_Value_generic_s: 'dog'
+        }]))
+        .toEqual([{
+          url: 'http://example.com/foo.bar',
+          name: 'http://example.com/foo.bar', // TODO: This could be removed?
+          organism: 'dog'
+        }]);
+
+        // TODO: and what if they don't match?
+      });
+    });
+
+    describe('createFilters', function () {
+      describe('utils', function () {
+        it('_mergeAndAddObject', function () {
+          var a = { a: 1 };
+          var b = { a: 2, b: 3 };
+          factory._mergeAndAddObject(a, b);
+          expect(a).toEqual({
+            a: 3,
+            b: 3
+          });
+        });
+        it('_objectToNameValue', function () {
+          expect(factory._objectToNameValue({
+            a: 1
+          })).toEqual([{
+            name: 'a',
+            value: 1
+          }]);
+        });
+        it('_nameValueToObject', function () {
+          expect(factory._nameValueToObject([{
+            name: 'a',
+            value: 1
+          }])).toEqual({
+            a: 1
+          });
+        });
+        it('_mergeAndAddNameValues', function () {
+          var a = [{ name: 'a', value: 1 }];
+          var b = [{ name: 'a', value: 2 }, { name: 'b', value: 3 }];
+          factory._mergeAndAddNameValues(a, b);
+          expect(a).toEqual([
+            { name: 'a', value: 3 },
+            { name: 'b', value: 3 }
+          ]);
+        });
+      });
+      it('handles duplicates', function () {
+        expect(factory.createFilters(
+          {
+            organism_Characteristics_generic_s: [
+              { name: 'mouse', value: 1 },
+              { name: 'cat', value: 2 }
+            ],
+            organism_Factor_Value_generic_s: [
+              { name: 'mouse', value: 3 },
+              { name: 'dog', value: 4 }
+            ]
+          }
+        )).toEqual(
+          {
+            organism: {
+              facetObj: [
+                { name: 'mouse', value: 4 },
+                { name: 'cat', value: 2 },
+                { name: 'dog', value: 4 }
+              ],
+              lowerCaseNames: ' mouse cat mouse dog' // This is ok: Just used for substring search.
+            }
+          }
+        );
+      });
+    });
+
     describe('getUserFiles', function () {
       var userFiles;
 
@@ -29,54 +115,18 @@
       ) {
         userFiles = {
           nodes: [
-            {
-              REFINERY_ANALYSIS_UUID_6_3_s: 'N/A',
-              Author_Characteristics_6_3_s: 'McConnell',
-              REFINERY_WORKFLOW_OUTPUT_6_3_s: 'N/A'
-            },
-            {
-              REFINERY_ANALYSIS_UUID_6_3_s: 'fbc78aaa-1050-403b-858c-a1504a40ef54',
-              Author_Characteristics_6_3_s: 'McConnell',
-              REFINERY_WORKFLOW_OUTPUT_6_3_s: '1_test_01'
-            },
-            {
-              REFINERY_ANALYSIS_UUID_6_3_s: '547ac4a0-7d5a-48a9-8859-8620ad94c7a2',
-              Author_Characteristics_6_3_s: 'McConnell',
-              REFINERY_WORKFLOW_OUTPUT_6_3_s: '1_test tool out'
-            }],
+            { field: 'value' }
+          ],
           attributes: [{
-            attribute_type: 'Internal',
-            file_ext: 's',
-            display_name: 'Output Type',
-            internal_name: 'REFINERY_WORKFLOW_OUTPUT_6_3_s'
-          }, {
-            attribute_type: 'Internal',
+            field: 'Internal',
             file_ext: 's',
-            display_name: 'Analysis',
-            internal_name: 'REFINERY_ANALYSIS_UUID_6_3_s'
-          }, {
-            attribute_type: 'Characteristics',
-            file_ext: 's',
-            display_name: 'Author',
-            internal_name: 'Author_Characteristics_6_3_s'
+            display_name: 'foo bar',
+            internal_name: 'REFINERY_foo_bar'
           }],
           facet_field_counts: {
-            REFINERY_WORKFLOW_OUTPUT_6_3_s: {
-              '1_test_04': 2,
-              '1_test_02': 2
-            },
-            REFINERY_ANALYSIS_UUID_6_3_s: {
-              '5d2311d1-6d8c-4857-bc57-2f25563aee91': 4
-            },
-            Author_Characteristics_6_3_s: {
-              Vezza: 1,
-              'Harslem/Heafner': 1,
-              McConnell: 6,
-              'Crocker + McConnell': 4,
-              Crocker: 4,
-              'Postel/Cerf': 1,
-              Cotton: 1
-            }
+            field: [
+              { name: 'name', count: 42 }
+            ]
           }
         };
         spyOn(userFileService, 'query').and.callFake(function () {