Merge pull request #248 from rashley-iqt/235-index

fix(Search): corrected bad check on configuration when flattening
fixes #235 
fixes #247

package.json

@@ -30,7 +30,7 @@
     "react-dom": "^16.8.1",
     "react-modal": "^3.5.1",
     "react-portal-tooltip": "^2.4.0",
-    "react-redux": "^6.0.0",
+    "react-redux": "^6.0.1",
     "react-scripts": "^2.1.3",
     "redux": "^4.0.0",
     "redux-actions": "^2.2.1",

src/epics/index-dataset-epic.js

@@ -1,5 +1,5 @@
 import { ofType } from 'redux-observable';
-import { isNil } from "ramda";
+import { isNil, isEmpty } from "ramda";
 import { of } from "rxjs";
 import { mergeMap, map } from 'rxjs/operators';
 
@@ -84,7 +84,9 @@ const flattenDataset = (ds, cfg) => {
 const generateIndex = (payload) => {
   const owner = payload.owner;
   const dataset = payload.dataset;
-  const configuration = payload.configuration || configurationFor(dataset);
+  const configuration = !isNil(payload.configuration) && !isEmpty(payload.configuration) 
+                        ? payload.configuration : configurationFor(dataset);
+  console.log("configuration to flatten with: %o", configuration);
   var flat = flattenDataset(dataset, configuration);
   const idx = lunr(function () {
     this.ref('id');

src/epics/index-dataset-epic.test.js.js

@@ -59,7 +59,7 @@ describe("indexDatasetEpic", () => {
 	    const action$ = buildIndex({ 'owner': owner, 'dataset': dataset, 'configuration': emptyConf });
 	    store.dispatch(action$);
 
-	    const expectedFields = []//['uid', 'role.role', 'role.confidence'];
+	    const expectedFields = ['uid', 'role.role', 'role.confidence'];
 	    const idx = getSearchIndex(store.getState(), owner)
 
 	    expect(idx.fields).to.deep.equal(expectedFields);

src/features/dataset-controls/DatasetControls.js

@@ -47,7 +47,7 @@ if (host.indexOf(':') > -1) {
 
 var POSEIDON_DATASET = {
   name: "Poseidon Network",
-  url: "http://"+hostname+":"+port+"/v1/network"
+  url: "http://"+hostname+":5000/v1/network"
 };
 
 Modal.setAppElement('#root');