Merge pull request #113 from mozilla/revert-105-98_upstream

Revert "98 upstream merge"

client/app/components/dynamic-form.js

@@ -131,12 +131,8 @@ function DynamicForm($http, toastr, $q) {
             toastr.success('Saved.');
             $scope.dataSourceForm.$setPristine();
           },
-          (error) => {
-            if (error.status === 400 && 'message' in error.data) {
-              toastr.error(error.data.message);
-            } else {
-              toastr.error('Failed saving.');
-            }
+          () => {
+            toastr.error('Failed saving.');
           }
         );
       };

client/app/components/index.js

@@ -18,4 +18,3 @@ export { default as rdTimeAgo } from './rd-time-ago';
 export { default as overlay } from './overlay';
 export { default as routeStatus } from './route-status';
 export { default as filters } from './filters';
-export { default as sortIcon } from './sort-icon';

client/app/index.js

@@ -100,7 +100,6 @@ registerVisualizations(ngModule);
 
 ngModule.config(($routeProvider, $locationProvider, $compileProvider,
   uiSelectConfig, toastrConfig) => {
-  $compileProvider.debugInfoEnabled(false);
   $compileProvider.aHrefSanitizationWhitelist(/^\s*(https?|http|data):/);
   $locationProvider.html5Mode(true);
   uiSelectConfig.theme = 'bootstrap';

client/app/pages/alerts-list/alerts-list.html

@@ -4,20 +4,20 @@
   </page-header>
 
   <div class="container">
-    <div class="bg-white">
+    <div class="container bg-white">
       <table class="table table-condensed table-hover">
         <thead>
         <tr>
-          <th class="sortable-column" ng-click="$ctrl.alerts.orderBy('name')">Name <sort-icon column="'name'" sort-column="$ctrl.alerts.orderByField" reverse="$ctrl.alerts.orderByReverse"></sort-icon></th>
-          <th class="sortable-column" ng-click="$ctrl.alerts.orderBy('created_by')">Created By <sort-icon column="'created_by'" sort-column="$ctrl.alerts.orderByField" reverse="$ctrl.alerts.orderByReverse"></sort-icon></th>
-          <th class="sortable-column" ng-click="$ctrl.alerts.orderBy('state')">State <sort-icon column="'state'" sort-column="$ctrl.alerts.orderByField" reverse="$ctrl.alerts.orderByReverse"></sort-icon></th>
-          <th class="sortable-column" ng-click="$ctrl.alerts.orderBy('created_at')">Created By <sort-icon column="'created_at'" sort-column="$ctrl.alerts.orderByField" reverse="$ctrl.alerts.orderByReverse"></sort-icon></th>
+          <th>Name</th>
+          <th>Created By</th>
+          <th>State</th>
+          <th>Created At</th>
         </tr>
         </thead>
         <tbody>
         <tr ng-repeat="row in $ctrl.alerts.getPageRows()">
           <td><a href="alerts/{{row.id}}">{{row.name}}</a></td>
-          <td>{{row.created_by}}</td>
+          <td>{{row.user.name}}</td>
           <td><span ng-class="row.class">{{row.state | uppercase}}</span> since <span am-time-ago="row.updated_at"></span></td>
           <td><span am-time-ago="row.created_at"></span></td>
         </tr>

client/app/pages/alerts-list/index.js

@@ -1,26 +1,24 @@
 import { Paginator } from '../../utils';
 import template from './alerts-list.html';
 
-const stateClass = {
-  ok: 'label label-success',
-  triggered: 'label label-danger',
-  unknown: 'label label-warning',
-};
-
 class AlertsListCtrl {
   constructor(Events, Alert) {
     Events.record('view', 'page', 'alerts');
 
     this.alerts = new Paginator([], { itemsPerPage: 20 });
+
     Alert.query((alerts) => {
-      this.alerts.updateRows(alerts.map(alert => ({
-        name: alert.name,
-        state: alert.state,
-        class: stateClass[alert.state],
-        created_by: alert.user.name,
-        created_at: alert.created_at,
-        updated_at: alert.updated_at,
-      })));
+      const stateClass = {
+        ok: 'label label-success',
+        triggered: 'label label-danger',
+        unknown: 'label label-warning',
+      };
+
+      alerts.forEach((alert) => {
+        alert.class = stateClass[alert.state];
+      });
+
+      this.alerts.updateRows(alerts);
     });
   }
 }

client/app/pages/dashboards/dashboard.js

@@ -156,20 +156,12 @@ function DashboardCtrl($rootScope, $routeParams, $location, $timeout, $q, $uibMo
 
   this.editDashboard = () => {
     this.dashboard.existing_name = this.dashboard.name;
-    const previousFiltersState = this.dashboard.dashboard_filters_enabled;
     $uibModal.open({
       component: 'editDashboardDialog',
       resolve: {
         dashboard: () => this.dashboard,
       },
-    }).result.then((dashboard) => {
-      const shouldRenderDashboard = !previousFiltersState && dashboard.dashboard_filters_enabled;
-      this.dashboard = dashboard;
-
-      if (shouldRenderDashboard) {
-        renderDashboard(this.dashboard);
-      }
-    });
+    }).result.then((dashboard) => { this.dashboard = dashboard; });
   };
 
   this.addWidget = () => {

client/app/pages/dashboards/edit-dashboard-dialog.html

@@ -11,13 +11,6 @@ <h4 class="modal-title">Edit: {{$ctrl.dashboard.name}}</h4>
   <p ng-if="myForm.dashboardName.$invalid" class="alert alert-warning">A name is required.</p>
 
 
-  <p ng-if="$ctrl.dashboard.id">
-    <label>
-        <input name="input" type="checkbox" ng-model="$ctrl.dashboard.dashboard_filters_enabled">
-        Use Dashboard Level Filters
-    </label>
-  </p>
-
   <div gridster="$ctrl.gridsterOptions" ng-if="$ctrl.items | notEmpty">
     <ul>
       <li gridster-item="item" ng-repeat="item in $ctrl.items" class="widget panel panel-default gs-w">
@@ -28,5 +21,5 @@ <h4 class="modal-title">Edit: {{$ctrl.dashboard.name}}</h4>
 </div>
 <div class="modal-footer">
   <button type="button" class="btn btn-default" ng-disabled="$ctrl.saveInProgress" ng-click="$ctrl.closeWithoutSave()">Close</button>
-  <button type="button" class="btn btn-primary" ng-disabled="$ctrl.saveInProgress || myForm.dashboardName.$invalid || !$ctrl.isFormValid()"  ng-click="$ctrl.saveDashboard()">Save</button> 
+  <button type="button" class="btn btn-primary" ng-disabled="$ctrl.saveInProgress || myForm.dashboardName.$invalid"  ng-click="$ctrl.saveDashboard()">Save</button> 
 </div>

client/app/pages/dashboards/edit-dashboard-dialog.js

@@ -1,4 +1,4 @@
-import { isEmpty, sortBy } from 'underscore';
+import { sortBy } from 'underscore';
 import template from './edit-dashboard-dialog.html';
 
 const EditDashboardDialog = {
@@ -45,8 +45,6 @@ const EditDashboardDialog = {
       });
     }
 
-    this.isFormValid = () => !isEmpty(this.dashboard.name);
-
     this.saveDashboard = () => {
       this.saveInProgress = true;
 
@@ -67,7 +65,6 @@ const EditDashboardDialog = {
           slug: this.dashboard.id,
           name: this.dashboard.name,
           version: this.dashboard.version,
-          dashboard_filters_enabled: this.dashboard.dashboard_filters_enabled,
           layout: JSON.stringify(layout),
         };
 

client/app/pages/queries/view.js

@@ -211,12 +211,7 @@ function QueryViewCtrl($scope, Events, $route, $routeParams, $location, $window,
 
   $scope.saveName = () => {
     Events.record('edit_name', 'query', $scope.query.id);
-
-    if ($scope.query.is_draft && clientConfig.autoPublishNamedQueries && $scope.query.name !== 'New Query') {
-      $scope.query.is_draft = false;
-    }
-
-    $scope.saveQuery(undefined, { name: $scope.query.name, is_draft: $scope.query.is_draft });
+    $scope.saveQuery(undefined, { name: $scope.query.name });
   };
 
   $scope.cancelExecution = () => {

client/app/pages/queries/visualization-embed.js

@@ -37,7 +37,7 @@ export default function (ngModule) {
     return session($http, $route, Auth).then(() => {
       const queryId = $route.current.params.queryId;
       const query = $http.get(`api/queries/${queryId}`).then(response => response.data);
-      const queryResult = $http.get(`api/queries/${queryId}/results.json${location.search}`).then(response => response.data);
+      const queryResult = $http.get(`api/queries/${queryId}/results.json`).then(response => response.data);
       return $q.all([query, queryResult]);
     });
   }

client/app/services/auth.js

@@ -47,7 +47,7 @@ function AuthService($window, $location, $q, $http) {
       }
 
       this.setApiKey(null);
-      return $http.get('api/session').then((response) => {
+      return $http.get('/api/session').then((response) => {
         storeSession(response.data);
         return session;
       });

client/app/utils/paginator.js

@@ -1,12 +1,8 @@
-import { sortBy } from 'underscore';
-
 export default class Paginator {
   constructor(rows, { page = 1, itemsPerPage = 20, totalCount = undefined } = {}) {
     this.page = page;
     this.itemsPerPage = itemsPerPage;
     this.updateRows(rows, totalCount);
-    this.orderByField = undefined;
-    this.orderByReverse = false;
   }
 
   setPage(page) {
@@ -28,20 +24,4 @@ export default class Paginator {
       this.totalCount = 0;
     }
   }
-
-  orderBy(column) {
-    if (column === this.orderByField) {
-      this.orderByReverse = !this.orderByReverse;
-    } else {
-      this.orderByField = column;
-      this.orderByReverse = false;
-    }
-
-    if (this.orderByField) {
-      this.rows = sortBy(this.rows, this.orderByField);
-      if (this.orderByReverse) {
-        this.rows = this.rows.reverse();
-      }
-    }
-  }
 }