Excluded total calculations from backend

pkg/api/dashboard.go

@@ -58,26 +58,20 @@ func GetDashboard(c *middleware.Context) {
 		creator = getUserLogin(dash.CreatedBy)
 	}
 
-	// Finding total panels and queries on the dashboard
-	totalRows, totalPanels, totalQueries := getTotalRowsPanelsAndQueries(dash.Data)
-
 	dto := dtos.DashboardFullWithMeta{
 		Dashboard: dash.Data,
 		Meta: dtos.DashboardMeta{
-			IsStarred:    isStarred,
-			Slug:         slug,
-			Type:         m.DashTypeDB,
-			CanStar:      c.IsSignedIn,
-			CanSave:      c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR,
-			CanEdit:      canEditDashboard(c.OrgRole),
-			Created:      dash.Created,
-			Updated:      dash.Updated,
-			UpdatedBy:    updater,
-			CreatedBy:    creator,
-			TotalRows:    totalRows,
-			TotalPanels:  totalPanels,
-			TotalQueries: totalQueries,
-			Version:      dash.Version,
+			IsStarred: isStarred,
+			Slug:      slug,
+			Type:      m.DashTypeDB,
+			CanStar:   c.IsSignedIn,
+			CanSave:   c.OrgRole == m.ROLE_ADMIN || c.OrgRole == m.ROLE_EDITOR,
+			CanEdit:   canEditDashboard(c.OrgRole),
+			Created:   dash.Created,
+			Updated:   dash.Updated,
+			UpdatedBy: updater,
+			CreatedBy: creator,
+			Version:   dash.Version,
 		},
 	}
 
@@ -95,26 +89,6 @@ func getUserLogin(userId int64) string {
 	}
 }
 
-func getTotalRowsPanelsAndQueries(data map[string]interface{}) (int, int, int) {
-	totalRows, totalPanels, totalQueries := 0, 0, 0
-	if rows, rowsOk := data["rows"]; rowsOk {
-		totalRows = len(rows.([]interface{}))
-		if totalRows > 0 {
-			for _, rowElement := range rows.([]interface{}) {
-				if panels, panelsOk := rowElement.(map[string]interface{})["panels"]; panelsOk {
-					totalPanels += len(panels.([]interface{}))
-					for _, panelElement := range panels.([]interface{}) {
-						if targets, targetsOk := panelElement.(map[string]interface{})["targets"]; targetsOk {
-							totalQueries += len(targets.([]interface{}))
-						}
-					}
-				}
-			}
-		}
-	}
-	return totalRows, totalPanels, totalQueries
-}
-
 func DeleteDashboard(c *middleware.Context) {
 	slug := c.Params(":slug")
 

pkg/api/dtos/models.go

@@ -30,23 +30,20 @@ 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"`
-	TotalRows    int       `json:"totalRows"`
-	TotalPanels  int       `json:"totalPanels"`
-	TotalQueries int       `json:"totalQueries"`
-	Version      int       `json:"version"`
+	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"`
+	Version    int       `json:"version"`
 }
 
 type DashboardFullWithMeta struct {

public/app/features/dashboard/partials/settings.html

@@ -167,40 +167,7 @@
         <div class="tight-form">
           <ul class="tight-form-list">
             <li class="tight-form-item" style="width: 120px">
-              Total rows:
-            </li>
-            <li class="tight-form-item" style="width: 180px">
-              {{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:
+              Current version:
             </li>
             <li class="tight-form-item" style="width: 180px">
               {{dashboardMeta.version}}