Show load status in dashboard.

getredash · Jun 8, 2016 · 72266fe · 72266fe
1 parent a34a9d6
commit 72266fe
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/rd_ui/app/views/dashboard.html b/rd_ui/app/views/dashboard.html
@@ -28,9 +28,9 @@
   <div class="col-lg-12 p-5 m-b-10 bg-orange c-white" ng-if="dashboard.is_archived">
     This dashboard is archived and won't appear in the dashboards list or search results.
   </div>
-  
+
     <filters ng-if="dashboard.dashboard_filters_enabled"></filters>
-    
+
     <div ng-repeat="row in dashboard.widgets" class="row">
         <div ng-repeat="widget in row" class="col-lg-{{widget.width | colWidth}}" ng-controller='WidgetCtrl'>
             <div class="tile" ng-if="type=='visualization'">
@@ -61,7 +61,17 @@
 
                 <parameters parameters="widget.query.getParametersDefs()"></parameters>
 
-                <visualization-renderer visualization="widget.visualization" query-result="queryResult" class="t-body"></visualization-renderer>
+                <div ng-switch="queryResult.getStatus()">
+                  <div ng-switch-when="failed">
+                    <div class="alert alert-danger m-5" ng-show="queryResult.getError()">Error running query: <strong>{{queryResult.getError()}}</strong></div>
+                  </div>
+                  <div ng-switch-when="done">
+                      <visualization-renderer visualization="widget.visualization" query-result="queryResult" class="t-body"></visualization-renderer>
+                  </div>
+                  <div ng-switch-default class="text-center">
+                    <i class="zmdi zmdi-refresh zmdi-hc-spin zmdi-hc-5x"></i>
+                  </div>
+                </div>
 
                 <div class="p-5 clearfix">
                     <span class="small hidden-print">Updated: <span am-time-ago="queryResult.getUpdatedAt()"></span></span>

diff --git a/rd_ui/app/views/destinations/edit.html b/rd_ui/app/views/destinations/edit.html
@@ -4,8 +4,6 @@
       <dynamic-form target="destination" type="destinations">
         <button class="btn btn-danger" ng-if="destination.id" ng-click="delete()">Delete</button>
       </dynamic-form>
-
     </div>
   </div>
-
 </settings-screen>