Prechádzať zdrojové kódy

Added dtos and UI for more metadata

utkarshcmu 10 rokov pred
rodič
commit
b30dcce4bc

+ 17 - 13
pkg/api/dtos/models.go

@@ -30,19 +30,23 @@ type CurrentUser struct {
 }
 
 type DashboardMeta struct {
-	IsStarred  bool      `json:"isStarred,omitempty"`
-	IsHome     bool      `json:"isHome,omitempty"`
-	IsSnapshot bool      `json:"isSnapshot,omitempty"`
-	Type       string    `json:"type,omitempty"`
-	CanSave    bool      `json:"canSave"`
-	CanEdit    bool      `json:"canEdit"`
-	CanStar    bool      `json:"canStar"`
-	Slug       string    `json:"slug"`
-	Expires    time.Time `json:"expires"`
-	Created    time.Time `json:"created"`
-	Updated    time.Time `json:"updated"`
-	UpdatedBy  string    `json:"updatedBy"`
-	CreatedBy  string    `json:"createdBy"`
+	IsStarred    bool      `json:"isStarred,omitempty"`
+	IsHome       bool      `json:"isHome,omitempty"`
+	IsSnapshot   bool      `json:"isSnapshot,omitempty"`
+	Type         string    `json:"type,omitempty"`
+	CanSave      bool      `json:"canSave"`
+	CanEdit      bool      `json:"canEdit"`
+	CanStar      bool      `json:"canStar"`
+	Slug         string    `json:"slug"`
+	Expires      time.Time `json:"expires"`
+	Created      time.Time `json:"created"`
+	Updated      time.Time `json:"updated"`
+	UpdatedBy    string    `json:"updatedBy"`
+	CreatedBy    string    `json:"createdBy"`
+  TotalRows    int64     `json:"totalRows"`
+  TotalPanels  int64     `json:"totalPanels"`
+  TotalQueries int64     `json:"totalQueries"`
+  Version      int       `json:"version"`
 }
 
 type DashboardFullWithMeta struct {

+ 56 - 10
public/app/features/dashboard/partials/settings.html

@@ -115,9 +115,9 @@
 	</div>
 
   <div ng-if="editor.index == 4">
-    <div class="editor-row">
-      <div class="tight-form-section">
-        <h5>Dashboard info</h5>
+    <div class="row">
+      <h5>Dashboard info</h5>
+      <div class="pull-left tight-form">
         <div class="tight-form">
           <ul class="tight-form-list">
             <li class="tight-form-item" style="width: 120px">
@@ -129,6 +129,17 @@
           </ul>
           <div class="clearfix"></div>
         </div>
+        <div class="tight-form">
+          <ul class="tight-form-list">
+            <li class="tight-form-item" style="width: 120px">
+              Last updated by:
+            </li>
+            <li class="tight-form-item" style="width: 180px">
+              {{dashboardMeta.updatedBy}}
+            </li>
+          </ul>
+          <div class="clearfix"></div>
+        </div> 
         <div class="tight-form">
           <ul class="tight-form-list">
             <li class="tight-form-item" style="width: 120px">
@@ -136,29 +147,64 @@
             </li>
             <li class="tight-form-item" style="width: 180px">
               {{formatDate(dashboardMeta.created)}}
-           </li>
+            </li>
           </ul>
           <div class="clearfix"></div>
         </div>
-        <div class="tight-form last">
+        <div class="tight-form">
           <ul class="tight-form-list">
             <li class="tight-form-item" style="width: 120px">
-              Last updated by:
+              Created by:
             </li>
             <li class="tight-form-item" style="width: 180px">
-              {{dashboardMeta.updatedBy}}
+              {{dashboardMeta.createdBy}}
             </li>
           </ul>
           <div class="clearfix"></div>
         </div>
+      </div>
+      <div class="pull-left tight-form">
         <div class="tight-form">
           <ul class="tight-form-list">
             <li class="tight-form-item" style="width: 120px">
-              Created by:
+              Total rows:
             </li>
             <li class="tight-form-item" style="width: 180px">
-              {{dashboardMeta.createdBy}}
-           </li>
+              {{dashboardMeta.totalRows}}
+            </li>
+          </ul>
+          <div class="clearfix"></div>
+        </div>
+        <div class="tight-form">
+          <ul class="tight-form-list">
+            <li class="tight-form-item" style="width: 120px">
+              Total panels:
+            </li>
+            <li class="tight-form-item" style="width: 180px">
+              {{dashboardMeta.totalPanels}}
+            </li>
+          </ul>
+          <div class="clearfix"></div>
+        </div>
+        <div class="tight-form">
+          <ul class="tight-form-list">
+            <li class="tight-form-item" style="width: 120px">
+              Total queries:
+            </li>
+            <li class="tight-form-item" style="width: 180px">
+              {{dashboardMeta.totalQueries}}
+            </li>
+          </ul>
+          <div class="clearfix"></div>
+        </div>
+        <div class="tight-form">
+          <ul class="tight-form-list">
+            <li class="tight-form-item" style="width: 120px">
+              Version:
+            </li>
+            <li class="tight-form-item" style="width: 180px">
+              {{dashboardMeta.version}}
+            </li>
           </ul>
           <div class="clearfix"></div>
         </div>