aleph_analytics 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b835017996e863027ccbad3617742ffd680cfcd
-  data.tar.gz: 567308aed9dec7a7ab5c34ef296f1ee6276d4503
+  metadata.gz: 9d4c390667cb9196104ad61049e9028d01b906ca
+  data.tar.gz: 5a4d2383a969bdb45929b8b696e491f61f42867c
 SHA512:
-  metadata.gz: ee415ff8e6d34fd5275000d91564a19052156b7ea456a5af370cfbd546ef5d3a27760feeeb0e122fc1ea9251efb5fe5df7ed155beee3dcfff4c4a5e24e2db32f
-  data.tar.gz: 723ef552f7f7661ae409e4d1a6d1dc6cee7188666584a78462bdd9d893cbd17ba5c9476895cc93c9e7653fb106119bb4ab3baa8b614607c814f8a2e96cf76a2e
+  metadata.gz: e88f4a7c419aa95cff8f1ded63c50c1da317022a82e3a8242458d55f4f66789d86ffe559ae2278b1c66e47f4e1a75ef44203af9e0a40a8bc4a3fca10f7f7faa9
+  data.tar.gz: f5e2da4929c25d8831812e452566e7f1ab68aeeed4dc95dde2d2ebcef7a5a682958a68be9ba121b1d2b36e6c41e6e618f9cb50381a3f4298cf1b12c3c5dc497c

data/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log
 All notable changes to this project will be documented in this file using [Semantic Versioning](http://semver.org/).
 
+## [0.3.0] - 2010-02-26
+### Features
+- [Scheduled Query Execution](https://github.com/lumoslabs/aleph/issues/42)
+- Fixed s3 location for latest result (useful for GoogleSheet integration)
+
+### Fixed
+- Fix roles and tag dirty aware comparators on the Query model
+
 ## [0.2.0] - 2017-09-12
 ### Features
 - [Surface Running Queries](https://github.com/lumoslabs/aleph/issues/45)

data/README.md

@@ -134,6 +134,7 @@ You can manage your env variables in a .env file
 
 ## Links
 
+- [Feature Notes](docs/FEATURES.md)
 - [Rubygem](https://rubygems.org/gems/aleph_analytics)
 - [aleph-user group](https://groups.google.com/forum/#!forum/aleph-user)
 

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

@@ -42,13 +42,20 @@
       function ($scope, $rootScope) {
         $scope.alerts = [];
 
+        function addAlert(alert) {
+          var latest = _.last($scope.alerts);
+          if ($scope.alerts.length == 0 || latest.message != alert.message || latest.type != alert.type) {
+            $scope.alerts.push(alert);
+          }
+        }
+
         $scope.dismiss = function dismiss() {
           $scope.alerts.length = 0;
         };
 
         $rootScope.$on('$routeChangeSuccess', () => {
           if ($scope.scheduledAlert) {
-            $scope.alerts.push($scope.scheduledAlert);
+            addAlert($scope.scheduledAlert);
             $scope.scheduledAlert = null;
           } else {
             $scope.dismiss();
@@ -60,7 +67,7 @@
         });
 
         $rootScope.$on('setAlert', (event, alert) => {
-          $scope.alerts.push(alert);
+          addAlert(alert);
         });
       }
     ]);

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

@@ -14,7 +14,7 @@
         this._Query = Query;
 
         RoleModel.initCollection();
-        this._closeCommentDialog();
+        this._closeDialogBoxes();
     }
 
     openRepl() {
@@ -25,11 +25,34 @@
         .finally(this._closeCommentDialog.bind(this));
     }
 
-    updateQuery() {
-      this.query.save()
-        .then(this._setPristine.bind(this))
-        .then(this._handler.success.bind(this._handler, 'update', false))
-        .finally(this._closeCommentDialog.bind(this));
+    updateTitle() {
+      if(this.query.isDirty()) {
+        this._updateQuery()
+          .then(this._setPristine.bind(this))
+          .finally(this._closeDialogBoxes.bind(this));
+      }
+    }
+
+    updateTagsAndRoles() {
+      if(this.query.isDirty()) {
+        this._updateQuery().finally(this._closeDialogBoxes.bind(this));
+      }
+    }
+
+    updateCommentDialogAndClose() {
+      if(this.query.isDirty()) {
+        this._updateQuery().finally(this._closeCommentDialog.bind(this));
+      } else {
+        this._closeCommentDialog();
+      }
+    }
+
+    updateScheduleDialogAndClose() {
+      if(this.query.isDirty()) {
+        this._updateQuery().finally(this._closeScheduleDialog.bind(this));
+      } else {
+        this._closeScheduleDialog();
+      }
     }
 
     runQuery() {
@@ -59,13 +82,38 @@
 
     toggleCommentDialog() {
       this.commentDialogOpen = !this.commentDialogOpen;
+      if(this.commentDialogOpen == true) {
+        this._closeScheduleDialog();
+      }
+    }
+
+    toggleScheduleDialog() {
+      this.scheduleDialogOpen = !this.scheduleDialogOpen;
+      if(this.scheduleDialogOpen == true) {
+        this._closeCommentDialog();
+      }
     }
 
     // private methods
+    _updateQuery() {
+      return this.query.save()
+      .then(this._internalizeQueryItem.bind(this))
+      .then(this._handler.success.bind(this._handler, 'update', false));
+    }
+
+    _closeDialogBoxes() {
+      this._closeScheduleDialog();
+      this._closeCommentDialog();
+    }
+
     _closeCommentDialog() {
       this.commentDialogOpen = false;
     }
 
+    _closeScheduleDialog() {
+      this.scheduleDialogOpen = false;
+    }
+
     _setPristine(query) {
       this.form.$setPristine();
       return query;

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

@@ -28,6 +28,14 @@
       }
     }
 
+    queryIsPersistedAsScheduled() {
+      return (this.query.isPristine() && this.query.item.scheduled_flag) || (this.query.isDirty() && !this.query.item.scheduled_flag);
+    }
+
+    alertResultLinkCopied() {
+      this._alertFlash.emitSuccess('S3 URL copied to clipboard!');
+    }
+
     loadQueryByVersion(queryVersionId) {
       this._$location.path('/queries/' + this.query.item.id + '/query_versions/' + queryVersionId);
     }

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

@@ -1,7 +1,7 @@
 !(angular => {
   'use strict';
 
-  function QueryModelImports(QueryResource, ParameterMethods, StandardModel, $q) {
+  function QueryModelImports(QueryResource, ParameterMethods, StandardModel, TagsAndRolesComparator, $q) {
 
     return class Query extends StandardModel {
 
@@ -12,17 +12,28 @@
           {
             title: '',
             tags: [],
+            roles: [],
             version: {
               body: '',
+              comment: '',
               parameters: []
-            }
+            },
+            scheduled_flag: false,
+            email: ''
           },
           [
             'title',
             'version.body',
+            'version.comment',
             'roles',
-            'tags'
-          ]
+            'tags',
+            'scheduled_flag',
+            'email'
+          ],
+          {
+            tags: ((l, r) => TagsAndRolesComparator.compare(l, r)),
+            roles: ((l, r) => TagsAndRolesComparator.compare(l, r))
+          }
         );
       }
 
@@ -49,7 +60,7 @@
     };
   }
 
-  QueryModelImports.$inject = ['QueryResource', 'ParameterMethods', 'StandardModel', '$q'];
+  QueryModelImports.$inject = ['QueryResource', 'ParameterMethods', 'StandardModel', 'TagsAndRolesComparator', '$q'];
   angular.module('alephServices.query', []).service('Query', QueryModelImports);
 
 }(angular));

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

@@ -2,7 +2,7 @@
   'use strict';
 
   function QueryRequestTransformers() {
-    const saveFields =  ['id', 'title', 'body', 'tags', 'result_id', 'version', 'roles'];
+    const saveFields =  ['id', 'title', 'body', 'tags', 'result_id', 'version', 'roles', 'email', 'scheduled_flag'];
 
     // see https://github.com/mbenford/ngTagsInput
     function transformNgTagsInput(fieldName, query) {

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

@@ -0,0 +1,32 @@
+!(angular => {
+  'use strict';
+
+  class TagsAndRolesComparator {
+    compare(left, right) {
+      if(left === undefined && right === undefined) {
+        return true;
+      } else if(left === undefined) {
+        return false;
+      } else if(right === undefined) {
+        return false;
+      }
+
+      if(left.length != right.length) {
+        return false;
+      }
+
+      var unwrappedLeft = _.map(left, value => {
+        return _.isObject(value) ? value['text'] : value;
+      });
+
+      var unwrappedRight = _.map(right, value => {
+        return _.isObject(value) ? value['text'] : value;
+      });
+
+      return _.difference(unwrappedLeft, unwrappedRight).length == 0;
+    }
+  }
+
+  angular.module('alephServices.tagsAndRolesComparator', []).service('TagsAndRolesComparator', TagsAndRolesComparator);
+
+}(angular));

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

@@ -13,6 +13,7 @@
       'alephServices.queryTab',
       'alephServices.query',
       'alephServices.queryLoader',
+      'alephServices.tagsAndRolesComparator',
 
       // visualzations
       'alephServices.visualizationService',

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

@@ -4,10 +4,10 @@
 
   .alert-fade-out
     -webkit-animation-name: fade-out
-    -webkit-animation-duration: 10s
+    -webkit-animation-duration: 6s
     animation-name: fade-out
-    animation-duration: 10s
+    animation-duration: 6s
     animation-timing-function: ease-in
     margin: 0px
     padding: 0px
-    border-radius: 0px 0px 15px 0px
+    border-radius: 0px 0px 0px 0px

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

@@ -25,6 +25,7 @@
 @import 'visualizations'
 @import 'sidebar'
 @import 'comments'
+@import 'scheduled'
 @import 'shared'
 @import 'sort_bar'
 @import 'index_components'

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

@@ -5,3 +5,7 @@
     height: 150px
     font-size: small
 
+  .control-btn
+    font-size: x-small
+    padding-right: 5px
+    padding-bottom: 10px

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

@@ -24,6 +24,12 @@
   pre
     border-radius: 0px
 
+  .query-title-form
+    border: none
+    width: 100%
+    font-size: 2em
+    font-weight: bold
+
   .query-title-form.ng-dirty
     background-color: $gray-lighter
 
@@ -95,19 +101,16 @@ tags-input .tags .tag-item
       border: none
       box-shadow: none
 
-#query_title
-  width: 100%
-  font-size: 2em
-  font-weight: bold
 
-#query-btns
-  margin: 0 0 0
-
-#clone-btn
-  margin-right: 15px 
+.white-btns
+  margin-left: 10px
+  color: $dark-slate-blue
 
 .white-background
   background-color: #FFFFFF
 
 .result-panel
   margin-bottom: 0px
+
+.column-spacer
+  display: table-cell

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

@@ -21,5 +21,3 @@ result
 
   .high-row-count
     min-height: 300px
-
-

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

@@ -0,0 +1,39 @@
+.scheduled
+  $schedule-box-width: 275px
+
+  .well-sized
+    min-width: 400px
+
+  .toggle-center
+    margin: auto
+    width: 60px
+
+  .pad1
+    padding: 1px
+
+  .control-btn
+    font-size: x-small
+    padding-right: 5px
+
+  .control-bar
+    width: $schedule-box-width
+    padding-top: 0px
+
+  .toggle-bar
+    width: $schedule-box-width
+    padding-top: 5px
+
+  .email-bar
+    width: $schedule-box-width
+    padding-top: 15px
+    padding-bottom: 20px
+
+  .email-label
+    padding: 2px
+
+  .email-label[disabled]
+    color: grey
+
+  .email-input-col
+    padding-left: 7px
+    padding-right: 6px

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

@@ -48,6 +48,9 @@ body
 .small-font
   font-size: small
 
+.x-small-font
+  font-size: x-small
+
 .info-box
   background-color: $gray-lighter
   border: 1px solid $gray-light
@@ -159,6 +162,12 @@ a.navbar-text.active
   &:active
     opacity: $opacity-high
 
+.subdued-clickable
+  color: $dark-slate-blue
+  cursor: pointer
+  &:hover
+    color: black
+
 // pulsating stuff
 
 // Chrome, Safari, Opera
@@ -200,3 +209,61 @@ a.navbar-text.active
   animation-duration: 3s
   animation-direction: alternate
   animation-iteration-count: 3
+
+
+/* css for slider toggle switch */
+.switch
+  position: relative
+  display: inline-block
+  width: 28px
+  height: 18px
+
+$slider-checked: lighten($slate-blue, 5%) !default
+$slider-bg: lighten(#ccc, 5%) !default
+
+/* Hide default HTML checkbox */
+.switch input
+  opacity: 0
+  width: 0
+  height: 0
+
+/* The slider */
+.slider
+  position: absolute
+  cursor: pointer
+  top: 0
+  left: 0
+  right: 0
+  bottom: 0
+  background-color: $slider-bg
+  -webkit-transition: .4s
+  transition: .4s
+
+.slider:before
+  position: absolute
+  content: ""
+  height: 14px
+  width: 14px
+  left: 2px
+  bottom: 2px
+  background-color: white
+  -webkit-transition: .4s
+  transition: .4s
+
+input:checked + .slider
+  background-color: $slider-checked
+
+input:focus + .slider
+  box-shadow: 0 0 0px $slider-checked
+
+input:checked + .slider:before
+  -webkit-transform: translateX(10px)
+  -ms-transform: translateX(10px)
+  transform: translateX(10px)
+
+/* Rounded sliders */
+.slider.round
+  border-radius: 5px
+
+.slider.round:before
+  border-radius: 25%