lucidworks · athana · Aug 12, 2019 · Aug 27, 2019 · Sep 3, 2019 · Sep 3, 2019
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,30 @@
+sudo: required
+dist: trusty
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
+language: node_js
+node_js:
+  - "6.10.3"
+
+before_install:
+    # setting the path for phantom.js 2.0.0
+    - export PATH=/usr/local/phantomjs-2.0.0/bin:$PATH
+    # starting a GUI to run tests, per https://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-xvfb-to-Run-Tests-That-Require-a-GUI
+    - export DISPLAY=:99.0
+    - sh -e /etc/init.d/xvfb start
+    - "npm config set spin false"
+    - "npm install -g npm@^2"
+install:
+    - mkdir travis-phantomjs
+    - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
+    - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
+    - export PATH=$PWD/travis-phantomjs:$PATH
+    - npm install -g bower
+    - npm install
+    - bower install
+script:
+    - npm run test-single-run
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # Banana
 
+![](https://travis-ci.org/aadel/banana.svg?branch=develop)
+
 The Banana project was forked from [Kibana](https://github.com/elastic/kibana), and works with all kinds of time series
 (and non-time series) data stored in [Apache Solr](https://lucene.apache.org/solr/). It uses Kibana's powerful dashboard
 configuration capabilities, ports key panels to work with Solr, and provides significant additional capabilities,
@@ -17,22 +19,19 @@ Pull the repo from the `release` branch for production deployment; version x.y.z
 `fusion` branch is used for Lucidworks Fusion release. The code base and features are the same as `develop`. The main difference
 is in the configuration. 
 
-## Banana 1.6.26
+## Banana 1.7.0
 
 This release includes the following bug fixes and improvement:
 
-1. Enhance heatmap
-    * Add axis and axis labels
-    * Add axis grid and ticks
-    * Add gradient legend and ranges
-    * Fix heatmap transpose icon
-    * Enhance positioning and padding of panel elements
-    * Fix bettermap tooltip and hint text
-1. Enhance hits panel
-    * Add panel horizontal and vertical direction option
-    * Fix metrics text and label overlap and margins
-1. Fix bettermap render issue when resized
-1. Fix jshint warnings
+1. Added new panels:
+    * Significant Terms panel
+    * Time Series panel
+    * Graph panel
+1. Adding multi-query operator with a default OR operator
+1. Added Travis CI integration
+1. Using collections API instead of cores API to populate collections list
+1. Allow users to change URL setting of banana-int collection
+1. Fixed bug when loading saved dashboards from a remote Solr server
 
 ## Older Release Notes
 

diff --git a/bower.json b/bower.json
@@ -1,5 +1,5 @@
 {
-  "name": "Banana",
+  "name": "banana",
   "description": "Banana for Solr Data Visualization",
   "homepage": "https://github.com/LucidWorks/banana/wiki",
   "license": "Apache License",
@@ -17,7 +17,9 @@
     "requirejs": "2.1.8",
     "modernizr": "2.6.1",
     "moment": "2.1.0",
-    "underscore": "1.5.1"
+    "underscore": "1.5.1",
+    "vis": "4.21.0",
+    "x2js": "abdolence/x2js#1.2.0"
   },
   "resolutions": {
     "angular": "1.0.8",

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.6.26",
+  "version": "1.7.0",
   "name": "banana-fusion",
   "description": "Banana for Solr - A Port of Kibana",
   "repository": "https://github.com/LucidWorks/banana",
@@ -10,19 +10,21 @@
     "company": "Lucidworks, Inc."
   },
   "devDependencies": {
+    "babel-cli": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
     "bower": "^1.3.1",
     "grunt": "^0.4.5",
     "grunt-angular-templates": "~0.3.12",
     "grunt-contrib": "^0.10.2",
     "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-compress": "~0.5.2",
-    "grunt-contrib-copy": "~0.4.1",
-    "grunt-contrib-cssmin": "~0.6.1",
-    "grunt-contrib-htmlmin": "~0.1.3",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-less": "~0.7.0",
+    "grunt-contrib-compress": "~0.7.0",
+    "grunt-contrib-copy": "~0.5.0",
+    "grunt-contrib-cssmin": "~0.9.0",
+    "grunt-contrib-htmlmin": "~0.2.0",
+    "grunt-contrib-jshint": "^0.9.0",
+    "grunt-contrib-less": "~0.11.0",
     "grunt-contrib-requirejs": "~0.4.1",
-    "grunt-contrib-uglify": "^0.11.0",
+    "grunt-contrib-uglify": "^0.4.0",
     "grunt-git-describe": "~2.3.2",
     "grunt-ng-annotate": "0.3.0",
     "grunt-ngmin": "0.0.3",

diff --git a/src/app/components/require.config.js b/src/app/components/require.config.js
@@ -44,6 +44,8 @@ require.config({
     elasticjs:                '../vendor/elasticjs/elastic-angular-client',
     solrjs:                   '../vendor/solrjs/solr-angular-client',
     d3:                       '../vendor/d3',
+    vis:                      '../bower_components/vis/dist/vis',
+    x2js:                     '../bower_components/abdmob/x2js/xml2json',
     'd3-sankey':              '../vendor/d3-sankey',
     'd3-array':               '../vendor/d3-array',
     'd3-collection':          '../vendor/d3-collection',

diff --git a/src/app/components/settings.js b/src/app/components/settings.js
@@ -17,7 +17,7 @@ function (_) {
       USE_ADMIN_CORES: true,
       panel_names: [],
       banana_index: "system_banana",
-      // uncomment the following line to specify the URL of banana-int
+      // Uncomment the following line to specify the URL of Solr server that will be used to store and load saved dashboards.
       // banana_server: "http://localhost:8983/solr/",
 
       // Lucidworks Fusion settings

diff --git a/src/app/panels/bar/module.js b/src/app/panels/bar/module.js
@@ -87,7 +87,7 @@ define([
         var facet = '&facet=true&facet.field=' + $scope.panel.field + '&facet.limit=' + $scope.panel.size;
 
         // Set the panel's query
-        $scope.panel.queries.query = querySrv.getORquery() + wt_json + rows_limit + fq + facet;
+        $scope.panel.queries.query = querySrv.getOPQuery() + wt_json + rows_limit + fq + facet;
 
         // Set the additional custom query
         if ($scope.panel.queries.custom != null) {

diff --git a/src/app/panels/bettermap/module.js b/src/app/panels/bettermap/module.js
@@ -168,7 +168,7 @@ function (angular, app, _, L, localRequire) {
         }
 
         // Set the panel's query
-        $scope.panel.queries.query = querySrv.getORquery() + wt_json + rows_limit + fq + sorting;
+        $scope.panel.queries.query = querySrv.getOPQuery() + wt_json + rows_limit + fq + sorting;
 
         // Set the additional custom query
         if ($scope.panel.queries.custom != null) {

diff --git a/src/app/panels/facet/module.js b/src/app/panels/facet/module.js
@@ -149,7 +149,7 @@ define([
         }
 
         // Set the panel's query
-        $scope.panel.queries.basic_query = querySrv.getORquery() + fq + facet + facet_fields;
+        $scope.panel.queries.basic_query = querySrv.getOPQuery() + fq + facet + facet_fields;
         $scope.panel.queries.query = $scope.panel.queries.basic_query + wt_json;
 
         // Set the additional custom query

diff --git a/src/app/panels/force/module.js b/src/app/panels/force/module.js
@@ -171,7 +171,7 @@ define([
         }).join("&");
 
         // f.effective_date_fiscal_facet.facet.limit=3&f.institution_facet.facet.limit=10';
-        $scope.panel.queries.query = querySrv.getORquery() + fq + wt_json + facet + facet_pivot + facet_limits + rows;
+        $scope.panel.queries.query = querySrv.getOPQuery() + fq + wt_json + facet + facet_pivot + facet_limits + rows;
         if (DEBUG) {
           console.log($scope.panel.queries.query);
         }

diff --git a/src/app/panels/fullTextSearch/module.js b/src/app/panels/fullTextSearch/module.js
@@ -284,7 +284,7 @@ define([
         // Set the panel's query
 
         //var query = $scope.panel.searchQuery == null ? querySrv.getQuery(0) : 'q=' + $scope.panel.searchQuery
-        $scope.panel.queries.basic_query = querySrv.getORquery() + fq + facet + facet_fields + sorting;
+        $scope.panel.queries.basic_query = querySrv.getOPQuery() + fq + facet + facet_fields + sorting;
         $scope.panel.queries.query = $scope.panel.queries.basic_query + wt_json + rows_limit + highlight;
 
         // Set the additional custom query

diff --git a/src/app/panels/graph/editor.html b/src/app/panels/graph/editor.html
@@ -0,0 +1,46 @@
+<div class="row-fluid">
+	<div class="span4">
+		<label class="small">Label field <tip>Label field</tip></label>
+		<input type="text" name="label_field" ng-model="panel.label_field" bs-typeahead="fields.list" />
+	</div>
+	<div class="span4">
+		<label class="small">Join field <tip>Join field between the base collection and the graph collection</tip></label>
+		<input type="text" name="join_field" ng-model="panel.join_field" bs-typeahead="fields.list" />
+	</div>
+</div>
+<div class="row-fluid">
+  <div class="span4">
+<!--     <label class="small">Root node</label>
+    <input type="text" name="root_node" ng-model="panel.root_node" ng-change="set_refresh(true)" /> -->
+    <label class="small">Root nodes <tip>Number of root nodes</tip></label>
+    <input type="text" name="root_nodes" ng-model="panel.root_nodes" ng-change="set_refresh(true)" />
+	</div>
+	<div calss="span4">
+	    <label class="small">Sort <tip>Field to sort root nodes by</tip></label>
+	    <input type="text" name="root_nodes_sort" bs-typeahead="fields.list"
+	    	ng-model="panel.root_nodes_sort" ng-change="set_refresh(true)" />
+	</div>
+	<div calss="span4">
+	    <label class="small">Order <tip>Sorting order required if sort field is specified</tip></label>
+	    <select name="root_nodes_sort_order" 
+	    	ng-options='key as value for (key , value) in {"desc": "descending", "asc": "ascending"}'
+	    	ng-model="panel.root_nodes_sort_order" ng-change="set_refresh(true)" />
+	</div>
+</div>
+<div class="row-fluid">
+	<div class="span4">
+		<label class="small">Graph collection <tip>The collection that contains the graph nodes</tip></label>
+		<input type="text" name="graph_collection" bs-typeahead="dashboard.current.solr.core_list"
+			ng-model="panel.graph_collection" />
+	</div>
+  <div class="span4">
+	    <label class="small">From field</label>
+	    <input type="text" name="from_field" bs-typeahead="fields.aux_list" ng-model="panel.from_field" ng-change="set_refresh(true)" />
+  </div>
+  <div class="span4">
+    <label class="small">To field</label>
+    <input type="text" name="to_field" bs-typeahead="fields.aux_list" ng-model="panel.to_field" ng-change="set_refresh(true)" />
+  </div>
+<!--     <label class="small">Custom expression <tip>Graph expression</tip></label>
+    <textarea class="input-xxlarge" style="height:100px;" ng-model="panel.expression" ng-change="set_refresh(true)" /> -->
+</div>
diff --git a/src/app/panels/graph/module.html b/src/app/panels/graph/module.html
@@ -0,0 +1,3 @@
+<div ng-controller='graph' ng-init="init()">
+    <graph params="{{panel}}" style="height:100%"></graph>
+</div>