aleph_analytics 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aff91fd86b2c89e2a9f4494a530e41978d1ce6f0
-  data.tar.gz: d1f6a6537ffac3f48c552f6e847d922a1ba375a7
+  metadata.gz: ba0eaef53bed7d98b1a209c8b4bdb4bd23d8b59c
+  data.tar.gz: d581fabceec434ea16c4cc5e915d8b14517cb9db
 SHA512:
-  metadata.gz: 162c1b83ddfc2617742b6ce37ab34c6c4edf7221dc80ea044de62278a500db732d5577361b1400d6aa80d1841a417849941c779f15cfafec73d0e4e0e526179d
-  data.tar.gz: 0eab26a9f59f613ad9bff947bff1881595d62a1d96e438805108c83020d8c6afc9614e23709416f0710676a249ccc9f17c2d8f7916b5e5ffee84cd70f4340c05
+  metadata.gz: eb813201164b87f46061fe0ce6743120daa8774c5bcd3260dad1d9484fe2288f00c71752aa08186ab60701596f4460dd4c9741a385d2df9e29b85a17409bf977
+  data.tar.gz: 308a0d37c2c5bbb5cd4b3a09e089cc7c189522fafa2e55469e2576c20b6b036f6a1db339b47caf87970e7c6ef7e0b70c82f039a650b538a92913c54a2c9899a6

data/CHANGELOG.md

@@ -1,8 +1,17 @@
 # Change Log
 All notable changes to this project will be documented in this file using [Semantic Versioning](http://semver.org/).
 
+## [0.0.5] - 2016-09-26
+### Features
+- [Link to specific result / single result page](https://github.com/lumoslabs/aleph/issues/12)
+- [Use shift enter as hotkey to run queries in REPL](https://github.com/lumoslabs/aleph/issues/16)
+
+### Fixed
+- [Alerts searching bug](https://github.com/lumoslabs/aleph/issues/15)
+- [Alerts sorting bug](https://github.com/lumoslabs/aleph/issues/13)
+- [Query saving after REPL closes issue](https://github.com/lumoslabs/aleph/issues/14)
 
 ## [0.0.4] - 2016-07-12
 ### Fixed
-- Saving QueryRoles  bug
+- Saving QueryRoles bug
 - Streamline sign out page

data/app/assets/javascripts/angular/aleph.js.es6

@@ -8,7 +8,7 @@
       'alephServices',
       'alephFilters',
       'ngAnimate',
-      'ngClipboard',
+      'angular-clipboard',
       'ui.bootstrap',
       'infinite-scroll',
       'ngTagsInput',
@@ -27,9 +27,9 @@
     }])
 
     .value('KeyBindings', {
-      saveQuery: new KeyBinding('Save Query', {mac: 'command+shift+s', win:'ctrl+shift+s'}),
-      runQuery: new KeyBinding('Run Query', {mac: 'command+shift+k', win:'ctrl+shift+k'}),
-      detectParameters: new KeyBinding('Detect Parameters', {mac: 'command+shift+p', win:'ctrl+shift+p'})
+      saveQuery: new KeyBinding('Save Query', { mac: 'command+shift+s', win: 'ctrl+shift+s' }),
+      runQuery: new KeyBinding('Run Query', { mac: 'shift+enter', win: 'shift+enter' }),
+      detectParameters: new KeyBinding('Detect Parameters', { mac: 'command+shift+p', win: 'ctrl+shift+p' })
     })
 
     .config(['$locationProvider', $locationProvider => {
@@ -79,6 +79,11 @@
           controller: 'AlertShowController',
           controllerAs: 'alertShowCtrl'
         })
+        .when('/results/query/:queryId/query_version/:queryVersionId/result/:resultId', {
+          templateUrl: 'singleResultShow',
+          controller: 'SingleResultShowController',
+          controllerAs: 'singleResultShowCtrl'
+        })
         .when('/snippets', {
           title: 'Snippets',
           templateUrl: 'snippetIndex',

data/app/assets/javascripts/angular/controllers/alerts/alert_show_controller.js.es6

@@ -19,8 +19,8 @@
       if ($routeParams.alertId === 'new') {
         this.alert.initItem()
           .then(this.query.initItem.bind(this.query, null))
-          .then(this._openReplService.open.bind(this._openReplService, {}))
-          .then(({query, _}) => {
+          .then(this._openReplService.open.bind(this._openReplService, { skipSave: true }))
+          .then(query => {
             this.query = query;
             this.alert.item.query_title = query.item.title;
             this.query.item.tags.push('alert-query');
@@ -59,9 +59,9 @@
     editAlert() {
       this._openReplService.open({
         query: this.query
-      }).then(({query, result}) => {
+      }).then(query => {
         this.query = query;
-        return this.query.save({result_id: result.id});
+        return this.query.save();
       }).then(this.alert.save.bind(this.alert));
     }
 

data/app/assets/javascripts/angular/controllers/controllers.js.es6

@@ -10,6 +10,7 @@
       'alephControllers.alertIndexController',
       'alephControllers.alertShowController',
       'alephControllers.snippetIndexController',
+      'alephControllers.singleResultShowController',
       'alephServices',
       'ui.ace',
       'ngRoute',

data/app/assets/javascripts/angular/controllers/query/query_index_controller.js.es6

@@ -24,7 +24,7 @@
         this._roleModel = RoleModel;
         this._tagResource = TagResource;
         this._$q = $q;
-        this._openReplService = OpenReplService;
+        this._repl = OpenReplService;
 
         RoleModel.initCollection();
     }
@@ -61,10 +61,7 @@
     }
 
     openRepl() {
-      this._openReplService.open()
-        .then(({query, result}) => {
-          return query.save({ result_id: result.id });
-        })
+      this._repl.open()
         .then(this._handler.navigateToLatestVersion.bind(this._handler))
         .then(this._handler.success.bind(this._handler, 'create', true))
         .catch(this._handler.handleReplExit.bind(this._handler));

data/app/assets/javascripts/angular/controllers/query/query_repl_controller.js.es6

@@ -2,12 +2,11 @@
   'use strict';
 
   class QueryReplController {
-    constructor($uibModalInstance, getResultCsv, DefaultAceConfigurator, ResultRunner, query,
-      Results, NavigationGuard, KeyBindings, hotkeys, $scope) {
+    constructor($uibModalInstance, getResultCsv, DefaultAceConfigurator, ResultRunner, Query,
+      Results, NavigationGuard, KeyBindings, hotkeys, options, $scope) {
+        this._initQuery(options, Query);
         this._modalInstance = $uibModalInstance;
-
         this.results = new Results();
-        this.query = query;
         this.resultRunner = new ResultRunner(this.query, this.results, {
           sandbox: true,
           enablePolling: true
@@ -78,11 +77,19 @@
       this._navigationGuard.disable();
       this._setParameterDefaultValues(this.query.item.version.parameters, this.resultRunner.substitutionValues);
       let result = this.results.collection.shift();
+      if(this._options.skipSave) {
+        /* FIXME: this is for alerts where we want to pop up the repl and save later
+           We probably have to rethink the alerts UI/UX to take this hack out */
+        this._toModelAndClose(angular.copy(this.query.item));
+      } else {
+        this.query.save(_.exists(result) ? { result_id: result.item.id } : {})
+          .then(this._toModelAndClose.bind(this))
+          .catch(err => {
+            console.error('query save failed', err);
+            alert('Query save failed!');
+          });
+      }
 
-      this._modalInstance.close({
-        query: this.query,
-        result: _.exists(result) ? result.item : {},
-      });
     }
 
     exit() {
@@ -99,6 +106,12 @@
 
     // private methods
 
+    _toModelAndClose(item) {
+      let model = new this._Query();
+      model.internalize(item);
+      this._modalInstance.close(model);
+    }
+
     _queryBody() {
       return this.query.item.version.body;
     }
@@ -112,6 +125,17 @@
       });
     }
 
+    _initQuery(options, Query) {
+      this._Query = Query;
+      this._options = options;
+      this.query = new Query();
+      if(_.exists(options.query)) {
+        this.query.internalize(angular.copy(options.query.item));
+      } else {
+        this.query.initItem();
+      }
+    }
+
     _initKeyBindings(KeyBindings, hotkeys, $scope) {
       this._saveKb = KeyBindings.saveQuery.withKeyFn(() => {
         if(this.validToSave()) {
@@ -138,7 +162,7 @@
   }
 
   QueryReplController.$inject = ['$uibModalInstance', 'getResultCsv', 'DefaultAceConfigurator', 'ResultRunner',
-    'query', 'Results', 'NavigationGuard', 'KeyBindings', 'hotkeys', '$scope'];
+    'Query', 'Results', 'NavigationGuard', 'KeyBindings', 'hotkeys', 'options', '$scope'];
 
   angular
     .module('alephControllers.queryReplController', ['alephServices'])

data/app/assets/javascripts/angular/controllers/result/single_result_show_controller.js.es6

@@ -0,0 +1,26 @@
+!(angular => {
+  'use strict';
+
+  class SingleResultShowController {
+    constructor($routeParams, Query, Result, PageTitleManager) {
+      this.resultId = $routeParams.resultId;
+      this.queryId = $routeParams.queryId;
+      this.queryVersionId = $routeParams.queryVersionId;
+
+      this.query = new Query();
+      this.query.initItem(this.queryId, this.queryVersionId).then(query => {
+        this.panelTitle = 'Result id=' + this.resultId + ' for "' + query.title + '"';
+        PageTitleManager.title = this.panelTitle ;
+      });
+
+      this.result = new Result();
+      this.result.initItem(this.resultId);
+    }
+  }
+
+  SingleResultShowController.$inject = ['$routeParams', 'Query', 'Result', 'PageTitleManager'];
+
+  angular
+    .module('alephControllers.singleResultShowController', ['alephServices'])
+    .controller('SingleResultShowController', SingleResultShowController);
+}(angular));

data/app/assets/javascripts/angular/directives/query/query_details_directive.js.es6

@@ -18,7 +18,6 @@
 
     openRepl() {
       this._repl.open( { query: this.query } )
-        .then(({query, result}) => query.save({ result_id: result.id }))
         .then(this._handler.navigateToLatestVersion.bind(this._handler))
         .then(this._handler.success.bind(this._handler, 'update', false))
         .catch(this._handler.handleReplExit.bind(this._handler))

data/app/assets/javascripts/angular/directives/result/results_directive.js.es6

@@ -2,11 +2,28 @@
   'use strict';
 
   class ResultsController {
+
+    constructor(AlertFlash) {
+      this._alertFlash = AlertFlash;
+      this._hostname = angular.copy(location.host);
+    }
+
     runQuery() {
       this.resultRunner.run();
     }
+
+    generateResultLink(result) {
+      return this._hostname + '/results/query/' + this.query.item.id +
+        '/query_version/' + this.query.item.version.id + '/result/' + result.item.id;
+    }
+
+    alertCopied() {
+      this._alertFlash.emitSuccess('Result link copied to clipboard!');
+    }
   }
 
+  ResultsController.$inject = ['AlertFlash'];
+
   function resultsComponent() {
     return {
       restrict: 'E',

data/app/assets/javascripts/angular/services/lib/open_repl_service.js.es6

@@ -3,9 +3,8 @@
 
   class OpenReplService {
 
-    constructor($uibModal, Query, AceCompleters) {
+    constructor($uibModal, AceCompleters) {
       this._$modal = $uibModal;
-      this._Query = Query;
       this._AceCompleters = AceCompleters;
     }
 
@@ -21,36 +20,14 @@
         windowClass: 'query-repl-dialog',
         backdrop: 'static',
         keyboard: false,
-        resolve: {
-          query: () =>  _.exists(options.query) ? this._clone(options.query) : this._newQuery()
-        }
+        resolve: { options: () =>  options }
       });
 
-      return modalInstance.result.then(({query, result}) => {
-        return {
-          query: this._clone(query),
-          result: result
-        };
-      });
-    }
-
-    // private methods
-
-    _clone(q) {
-      let copiedItem = angular.copy(q.item);
-      let m = new this._Query();
-      m.internalize(copiedItem);
-      return m;
-    }
-
-    _newQuery() {
-      let m = new this._Query();
-      m.initItem();
-      return m;
+      return modalInstance.result;
     }
   }
 
-  OpenReplService.$inject = ['$uibModal', 'Query', 'AceCompleters'];
+  OpenReplService.$inject = ['$uibModal', 'AceCompleters'];
   angular.module('alephServices.openReplService', []).service('OpenReplService', OpenReplService);
 
 }(angular));

data/app/assets/javascripts/angular/services/query/query_handler.js.es6

@@ -12,7 +12,7 @@
       let _action =  action || 'action';
       let _schedule = _.exists(schedule) ? schedule : false;
 
-      this._alertFlash.emitSuccess('Query "' + query.title + '" ' + _action + 'd!', _schedule);
+      this._alertFlash.emitSuccess('Query "' + query.item.title + '" ' + _action + 'd!', _schedule);
       return query;
     }
 
@@ -26,7 +26,7 @@
     }
 
     navigateToLatestVersion(query) {
-      this._$location.path('/queries/' + query.id + '/query_versions/' + query.version.id);
+      this._$location.path('/queries/' + query.item.id + '/query_versions/' + query.item.version.id);
       return query;
     }
 

data/app/assets/stylesheets/shared.css.sass

@@ -148,6 +148,9 @@ a.navbar-text.active
 .no-list-style
   list-style: none
 
+.inline
+  display: inline
+
 .looks-like-clickable
   cursor: pointer
   &:hover
@@ -155,3 +158,45 @@ a.navbar-text.active
     color: tomato
   &:active
     opacity: $opacity-high
+
+// pulsating stuff
+
+// Chrome, Safari, Opera
+@-webkit-keyframes pulsate
+  from
+    opacity: 0.0
+    color: tomato
+
+  to
+    opacity: $opacity-high
+    color: $slate-blue
+
+
+// Standard syntax
+@keyframes pulsate
+  from
+    opacity: 0.0
+    color: tomato
+
+  to
+    opacity: $opacity-high
+    color: $slate-blue
+
+.pulsating
+  -webkit-animation-name: pulsate
+  -webkit-animation-duration: 3s
+  -webkit-animation-direction: alternate
+  animation-name: pulsate
+  animation-duration: 3s
+  animation-direction: alternate
+  animation-iteration-count: infinite
+
+// you know, just give them a taste
+.finite-pulsating
+  -webkit-animation-name: pulsate
+  -webkit-animation-duration: 3s
+  -webkit-animation-direction: alternate
+  animation-name: pulsate
+  animation-duration: 3s
+  animation-direction: alternate
+  animation-iteration-count: 3

data/app/assets/stylesheets/sidebar.css.sass

@@ -36,36 +36,6 @@
   .versions
     padding: 15px 0px 15px 0px
 
-  // Chrome, Safari, Opera
-  @-webkit-keyframes pulsate
-    from
-      opacity: 0.0
-      color: tomato
-
-    to
-      opacity: $opacity-high
-      color: $slate-blue
-
-
-  // Standard syntax
-  @keyframes pulsate
-    from
-      opacity: 0.0
-      color: tomato
-
-    to
-      opacity: $opacity-high
-      color: $slate-blue
-
-  .pulsating-comment
-    -webkit-animation-name: pulsate
-    -webkit-animation-duration: 3s
-    -webkit-animation-direction: alternate
-    animation-name: pulsate
-    animation-duration: 3s
-    animation-direction: alternate
-    animation-iteration-count: infinite
-
   .versions
     ul
       list-style-type: none

data/app/controllers/results_controller.rb

@@ -17,6 +17,7 @@ class ResultsController < ApplicationController
 
   def show
     respond_to do |format|
+      format.html { render :index }
       format.json { render json: @result }
     end
   end

data/app/models/alert.rb

@@ -18,7 +18,7 @@ class Alert < ActiveRecord::Base
   delegate :latest_query_version, to: :query
   delegate :user, to: :latest_query_version
 
-  scope :with_role, ->(role) { joins(:query).includes(:query_roles).where(query_roles: { role: role }) }
+  scope :with_role, ->(role) { references(:query).includes(:query_roles).where(query_roles: { role: role }) }
 
   LOCATIONS_FOR_ATTRIBUTES = {
     title:       { association: :query, column: :title, type: :text },