feat(search): Charts navigate to file tab filtered

Closes #776
NCI-GDC · May 25, 2015 · da5e187 · da5e187
1 parent 1b51d82
commit da5e187
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 7 deletions.
diff --git a/app/scripts/components/charts/chart.directives.ts b/app/scripts/components/charts/chart.directives.ts
@@ -249,7 +249,7 @@ module ngApp.components.charts {
           gPath.attr("d", arc)
               .style("fill", function(d, i) { return color(i); })
               .attr("state", function(d) {
-                return config.state && config.state[d.data.key] ? "true" : "false";
+                return config.state ? "true" : "false";
               })
               .on("click", goToState)
               .on("mouseover.text", function(d) {
@@ -304,13 +304,24 @@ module ngApp.components.charts {
         }
 
         function goToState(d) {
-          if (!config.state || !config.state[d.data.key]) {
+          if (!config.state || (!config.state[d.data.key] &&
+              !config.state["default"])) {
             return;
           }
 
-          var state = config.state[d.data.key];
+          if (config.state[d.data.key]) {
+            var state = config.state[d.data.key];
 
-          $state.go(state.name, state.params, {inherit: false});
+            $state.go(state.name, state.params, {inherit: false});
+            return;
+          }
+
+          var state = config.state["default"],
+              params = {
+                filters: state.params.filters(d.data.key)
+              };
+
+          $state.go(state.name, params, {inherit: false});
         }
 
         function arcTween(outerRadius, delay) {

diff --git a/app/scripts/search/search.controllers.ts b/app/scripts/search/search.controllers.ts
@@ -54,6 +54,7 @@ module ngApp.search.controllers {
                 private LocationService: ILocationService,
                 private UserService: IUserService,
                 public CoreService: ICoreService,
+                $filter: ng.IFilterService,
                 private SearchTableFilesModel: TableiciousConfig,
                 private SearchTableParticipantsModel: TableiciousConfig,
                 public FacetService) {
@@ -82,7 +83,24 @@ module ngApp.search.controllers {
         textFilter: "size",
         label: "file",
         sortKey: "doc_count",
-        defaultText: "project"
+        defaultText: "project",
+        state: {
+          "default": {
+            name: "search.files",
+            params: {
+              filters: function(value) {
+                return $filter("makeFilter")([
+                  {
+                    name: "participants.project.project_id",
+                    value: [
+                      value
+                    ]
+                  }
+                ], true);
+              }
+            }
+          }
+        }
       };
 
       this.primarySiteChartConfig = {
@@ -91,7 +109,24 @@ module ngApp.search.controllers {
         textFilter: "size",
         label: "file",
         sortKey: "doc_count",
-        defaultText: "primary site"
+        defaultText: "primary site",
+        state: {
+          "default": {
+            name: "search.files",
+            params: {
+              filters: function(value) {
+                return $filter("makeFilter")([
+                  {
+                    name: "participants.project.primary_site",
+                    value: [
+                      value
+                    ]
+                  }
+                ], true);
+              }
+            }
+          }
+        }
       };
     }
 

diff --git a/gulpfile.js b/gulpfile.js
@@ -28,7 +28,7 @@ var AUTOPREFIXER_BROWSERS = [
   'bb >= 10'
 ];
 
-var production = false; // process.env.NODE_ENV === "production";
+var production = process.env.NODE_ENV === "production";
 $.util.log('Environment', $.util.colors.blue(production ? 'Production' : 'Development'));
 
 // <paths>