Merge pull request #216 from mozilla/revert-213-182_rebase_for_m9

Revert "182 rebase for m9"

Author: alison985

CHANGELOG.md

@@ -1,8 +1,6 @@
 # Change Log
 
-## v3.0.0 - UNRELEASED
-
-## v2.0.0 - 2017-08-08
+## v2.0.0 - UNRELEASED
 
 ### Added
 
@@ -20,19 +18,6 @@
 - Add: option to hide pivot table controls. @deecay
 - Retry reload of query results if it had an error.
 - [Data Sources] Add: MemSQL query runner. @alexanderlz
-- "Dumb" recents option (see #1779 for details)
-- Athena: direct query runner using the instead of JDBC proxy. @laughingman7743
-- Optionally support parameters in embeds. @ziahamza
-- Sorting ability in alerts view.
-- Option to change default encoding of CSV writer. @yamamanx
-- Ability to set dashboard level filters from UI.
-- CLI command to open IPython shell.
-- Add link to query page from admin view. @miketheman
-- Add the option to write logs to STDOUT instead of STDERR. @eyalzek
-- Add limit parameter to tasks API. @alexpekurovsky
-- Add SQLAlchemy pool settings.
-- Support for category type y axis.
-- Add 12 & 24 hours refresh rate option to dashboards.
 
 ### Changed
 
@@ -59,20 +44,6 @@
 - Split refresh schemas into separate tasks and add a timeout.
 - Execute scheduled queries with parameters using their default value.
 - Keep track of last query execution (including failed ones) for scheduling purposes.
-- Same view for input on search result page as in header. @44px
-- Metrics: report endpoints without dots for metrics.
-- Redirect to / when org not found.
-- Improve parameters label placement. @44px
-- Auto-publish queries when they are named (with option to disable; #1830).
-- Show friendly error message in case of duplicate data source name.
-- Don't allow saving dashboard with empty name.
-- Enable strict checking for Angular DI.
-- Disable Angular debug info (should improve performance).
-- Update to Webpack 2. @44px
-- Remove /forgot endpoint if REDASH_PASSWORD_LOGIN_ENABLED is false. @amarjayr
-- Docker: make Gunicorn worker count configurable. @unixwitch
-- Snowflake support is no longer enabled by default.
-- Enable memory optimization for Excel exporter.
 
 ### Fixed
 
@@ -82,24 +53,6 @@
 - [SQLite] better handle utf-8 error messages.
 - Fix: don't remove locks for queries with task status of PENDING.
 - Only split columns with __/:: that end with filter/MultiFilter.
-- Alert notifications fail (sometime) with a SQLAlchemy error.
-- Safeguard against empty query results when checking alert status. @danielerapati
-- Delete data source doesn't work when query results referenced by queries.
-- Fix redirect to /setup on the last setup step. @44px
-- Cassandra: use port setting in connection options. @yershalom
-- Metrics: table name wasn't found for count queries.
-- BigQuery wasn't loading due to bad import.
-- DynamicForm component was inserting empty values.
-- Clear null values from data source options dictionary.
-- /api/session API call wasn't working when multi tenancy enabled
-- If column had no type it would use previous column's type.
-- Alert destination details were not updating.
-- When setting rearm on a new alert, it wasn't persisted.
-- Salesforce: sandbox parameter should be optional. @msnider
-- Alert page wasn't properly linked from alerts list. @alison985
-- PostgreSQL passwords with spaces were not supported. (#1056)
-- PivotTable wasn't updating after first save.
-
 
 ## v1.0.3 - 2017-04-18
 

bin/upgrade

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
-import argparse
 import os
+import argparse
 import subprocess
 import sys
 from collections import namedtuple
@@ -111,10 +111,7 @@ def restart_services():
     # otherwise it won't notice that /opt/redash/current pointing at a different
     # directory.
     green("Restarting...")
-    try:
-        run('sudo /etc/init.d/redash_supervisord restart')
-    except subprocess.CalledProcessError as e:
-        run('sudo service supervisor restart')
+    run('sudo /etc/init.d/redash_supervisord restart')
 
 
 def update_requirements(version_name):

client/app/pages/dashboards/dashboard.js

@@ -17,8 +17,6 @@ function DashboardCtrl($rootScope, $routeParams, $location, $timeout, $q, $uibMo
     { name: '10 minutes', rate: 60 * 10 },
     { name: '30 minutes', rate: 60 * 30 },
     { name: '1 hour', rate: 60 * 60 },
-    { name: '12 hour', rate: 12 * 60 * 60 },
-    { name: '24 hour', rate: 24 * 60 * 60 },
   ];
 
   this.setRefreshRate = (rate) => {

client/app/pages/dashboards/widget.js

@@ -85,8 +85,8 @@ function DashboardWidgetCtrl($location, $uibModal, $window, Events, currentUser)
   };
 
   if (this.widget.visualization) {
-    Events.record('view', 'query', this.widget.visualization.query.id, { dashboard: true });
-    Events.record('view', 'visualization', this.widget.visualization.id, { dashboard: true });
+    Events.record('view', 'query', this.widget.visualization.query.id);
+    Events.record('view', 'visualization', this.widget.visualization.id);
 
     this.query = this.widget.getQuery();
     this.reload(false);

client/app/pages/queries/query.html

@@ -106,6 +106,7 @@ <h3>
               <a ng-if="dataSource.options.doc_url != '' && dataSource.options.doc_url" ng-href={{dataSource.options.doc_url}}>{{dataSource.type_name}} documentation</a>
               <span ng-if="dataSource.options.doc_url == '' || !dataSource.options.doc_url">{{ dataSource.type_name }} documentation</span>
               <get-data-source-version id='data-source-version'></get-data-source-version>
+
               <div class="pull-right">
                 <button class="btn btn-s btn-default" ng-click="togglePublished()" ng-if="query.is_draft && query.id != undefined && (isQueryOwner || currentUser.hasPermission('admin'))">
                   <span class="fa fa-paper-plane"></span> Publish

client/app/visualizations/chart/index.js

@@ -77,7 +77,7 @@ function ChartEditor(ColorPalette, clientConfig) {
       }
 
       scope.xAxisScales = ['datetime', 'linear', 'logarithmic', 'category'];
-      scope.yAxisScales = ['linear', 'logarithmic', 'datetime', 'category'];
+      scope.yAxisScales = ['linear', 'logarithmic', 'datetime'];
 
       scope.chartTypeChanged = () => {
         keys(scope.options.seriesOptions).forEach((key) => {

client/app/visualizations/chart/plotly.js

@@ -300,17 +300,12 @@ const PlotlyChart = () => {
           const seriesOptions = scope.options.seriesOptions[series.name] ||
             { type: scope.options.globalSeriesType };
 
-          const seriesColor = seriesOptions.color ? seriesOptions.color : getColor(index);
-
           const plotlySeries = {
             x: [],
             y: [],
-            error_y: {
-              array: [],
-              color: seriesColor,
-            },
+            error_y: { array: [] },
             name: seriesOptions.name || series.name,
-            marker: { color: seriesColor },
+            marker: { color: seriesOptions.color ? seriesOptions.color : getColor(index) },
           };
 
           if (seriesOptions.yAxis === 1 && (scope.options.series.stacking === null || seriesOptions.type === 'line')) {

client/app/visualizations/pivot/index.js

@@ -16,20 +16,6 @@ function pivotTableRenderer() {
     template: '',
     replace: false,
     link($scope, element) {
-      function removeControls() {
-        const hideControls =
-          $scope.visualization.options.controls &&
-          $scope.visualization.options.controls.enabled;
-
-        document.querySelectorAll('.pvtAxisContainer, .pvtRenderer, .pvtVals').forEach((control) => {
-          if (hideControls) {
-            control.style.display = 'none';
-          } else {
-            control.style.display = '';
-          }
-        });
-      }
-
       function updatePivot() {
         $scope.$watch('queryResult && queryResult.getData()', (data) => {
           if (!data) {
@@ -61,15 +47,17 @@ function pivotTableRenderer() {
             if ($scope.visualization) {
               Object.assign(options, $scope.visualization.options);
             }
-
             $(element).pivotUI(data, options, true);
-            removeControls();
+            if (options.controls && options.controls.enabled) {
+              const controls = $('.pvtAxisContainer, .pvtRenderer, .pvtVals');
+              for (let i = 0; i < controls.length; i += 1) { controls[i].style.display = 'none'; }
+            }
           }
         });
       }
 
       $scope.$watch('queryResult && queryResult.getData()', updatePivot);
-      $scope.$watch('visualization.options.controls.enabled', removeControls);
+      $scope.$watch('visualization.options.controls.enabled', updatePivot);
     },
   };
 }

client/app/visualizations/pivot/pivottable-editor.html

@@ -1,10 +1,8 @@
 <div class="form-horizontal">
   <div class="form-group">
     <div class="col-lg-6">
-      <label>
-        <input type="checkbox" ng-model="visualization.options.controls.enabled">
-        Hide Pivot Controls
-      </label>
+      <input type="checkbox" ng-model="visualization.options.controls.enabled">
+      <i class="input-helper"></i> Hide Controls
     </div>
   </div>
 </div>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redash-client",
-  "version": "3.0.0",
+  "version": "2.0.0",
   "description": "The frontend part of Redash.",
   "main": "index.js",
   "scripts": {
@@ -59,7 +59,6 @@
   "devDependencies": {
     "babel-core": "^6.18.0",
     "babel-loader": "^6.2.7",
-    "babel-plugin-angularjs-annotate": "^0.7.0",
     "babel-plugin-transform-object-assign": "^6.22.0",
     "babel-preset-es2015": "^6.18.0",
     "babel-preset-stage-2": "^6.18.0",