Преглед изворни кода

HUE-1756 [dbquery] Empty results view

Add a screen for empty results
Abraham Elmahrek пре 12 година
родитељ
комит
72c40074b7
2 измењених фајлова са 25 додато и 4 уклоњено
  1. 22 0
      apps/rdbms/src/rdbms/templates/execute.mako
  2. 3 4
      apps/rdbms/static/js/rdbms.vm.js

+ 22 - 0
apps/rdbms/src/rdbms/templates/execute.mako

@@ -145,6 +145,18 @@ ${ commonheader(_('Query'), app_name, user) | n,unicode }
         </table>
       </div>
     </div>
+
+    <div data-bind="css: {'hide': !resultsEmpty()}" class="row-fluid hide">
+      <div class="card card-small scrollable">
+        <div class="row-fluid">
+          <div class="span10 offset1 center empty-wrapper">
+            <i class="fa fa-frown-o"></i>
+            <h1>${_('The server returned no results.')}</h1>
+            <br />
+          </div>
+        </div>
+      </div>
+    </div>
   </div>
 
 </div>
@@ -267,6 +279,16 @@ ${ commonheader(_('Query'), app_name, user) | n,unicode }
   .resultTable td, .resultTable th {
     white-space: nowrap;
   }
+
+  .empty-wrapper {
+    margin-top: 50px;
+    color: #BBB;
+    line-height: 60px;
+  }
+
+  .empty-wrapper i {
+    font-size: 148px;
+  }
 </style>
 
 <script src="/static/ext/js/knockout-min.js" type="text/javascript" charset="utf-8"></script>

+ 3 - 4
apps/rdbms/static/js/rdbms.vm.js

@@ -31,10 +31,7 @@ function RdbmsViewModel() {
   });
   self.rows = ko.observableArray();
   self.columns = ko.observableArray();
-
-  self.filter = ko.observable("");
-  self.isLoading = ko.observable(false);
-  self.isReady = ko.observable(false);
+  self.resultsEmpty = ko.observable(false);
 
   self.server = ko.computed({
     'read': function() {
@@ -156,6 +153,7 @@ function RdbmsViewModel() {
           $(document).trigger('explain.query', data);
           self.updateResults(data.results);
           self.query.id(data.design);
+          self.resultsEmpty(data.results.rows.length === 0);
           $(document).trigger('explained.query', data);
         } else {
           self.query.errors.push(data.message);
@@ -224,6 +222,7 @@ function RdbmsViewModel() {
           $(document).trigger('execute.query', data);
           self.updateResults(data.results);
           self.query.id(data.design);
+          self.resultsEmpty(data.results.rows.length === 0);
           $(document).trigger('executed.query', data);
         } else {
           self.query.errors.push(data.message);