Merge pull request #64 from jobready/feature/NEP-5881

NEP-5881: Conditionally hide Export Results button
rdytech · Mar 19, 2018 · 57e5239 · 57e5239
2 parents e279bda + 809afac
commit 57e5239
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/dist/react-filterbar.js b/dist/react-filterbar.js
@@ -8483,7 +8483,7 @@ var FilterBar = exports.FilterBar = (function (_React$Component) {
  this.context.filterBarStore.isConfigurable() && React.createElement(ConfigurationButton, {
  filterBarStore: this.context.filterBarStore
  }),
- React.createElement(ExportResultsButton, {
+ this.context.filterBarStore.isExportable() && React.createElement(ExportResultsButton, {
  filterBarActor: this.context.filterBarActor
  }),
  React.createElement(BatchActionsList, null)
@@ -11882,6 +11882,11 @@ var FilterBarStore = exports.FilterBarStore = (function () {
  return this.getConfigurationUrl() !== undefined;
  }
  },
+ isExportable: {
+ value: function isExportable() {
+ return this.getExportResultsUrl() !== undefined;
+ }
+ },
  setSavedSearches: {
  value: function setSavedSearches(savedSearches) {
  this.savedSearches = savedSearches;

diff --git a/dist/react-filterbar.min.js b/dist/react-filterbar.min.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -92,7 +92,7 @@ gulp.task('neptune', function() {
  .transform(babelify)
  .bundle()
  .pipe(source(appDistFile))
- .pipe(gulp.dest('../neptune/vendor/assets/bower_components/react-filterbar/dist'));
+ .pipe(gulp.dest('/app/vendor/assets/bower_components/react-filterbar/dist'));
 });
 
 gulp.task('marcus', function() {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "react-filterbar",
- "version": "1.18.2",
+ "version": "1.18.3",
  "description": "",
  "main": "dist/react-filterbar.js",
  "engines": {

diff --git a/src/components/FilterBar/FilterBar.react.js b/src/components/FilterBar/FilterBar.react.js
@@ -45,9 +45,11 @@ export class FilterBar extends React.Component {
  />
  }
 
- <ExportResultsButton
- filterBarActor={this.context.filterBarActor}
- />
+ {this.context.filterBarStore.isExportable() &&
+ <ExportResultsButton
+ filterBarActor={this.context.filterBarActor}
+ />
+ }
 
  <BatchActionsList />
  </div>

diff --git a/src/stores/FilterBarStore.js b/src/stores/FilterBarStore.js
@@ -137,6 +137,10 @@ export class FilterBarStore {
  return this.getConfigurationUrl() !== undefined;
  }
 
+ isExportable() {
+ return this.getExportResultsUrl() !== undefined;
+ }
+
  setSavedSearches(savedSearches) {
  this.savedSearches = savedSearches;
  this.emitChange();