webui: Fix a91ed9f

This fixes some issues introduced in a previous commit for deduplicating
code for live databases. The issue here was that the common database
header now relies on an information whether the current database is a
live database. For mose pages this information was not yet provided.
Instead of providing this information for all pages by adding more code,
this commit moves the deduplication forward by updating the existing
functions to include this information.

Author: MKleusberg

common/postgresql.go

@@ -596,7 +596,7 @@ func DBDetails(DB *SQLiteDBinfo, loggedInUser, dbOwner, dbFolder, dbName, commit
 			SELECT db.date_created, db.last_modified, db.watchers, db.stars, db.discussions, db.merge_requests,
 				$4::text AS commit_id, db.commit_list->$4::text->'tree'->'entries'->0 AS db_entry,
 				db.branches, db.release_count, db.contributors, db.one_line_description, db.full_description,
-				db.default_table, db.public, db.source_url, db.tags, db.default_branch
+				db.default_table, db.public, db.source_url, db.tags, coalesce(db.default_branch, ''), db.live_db
 			FROM sqlite_databases AS db
 			WHERE db.user_id = (
 					SELECT user_id
@@ -614,7 +614,7 @@ func DBDetails(DB *SQLiteDBinfo, loggedInUser, dbOwner, dbFolder, dbName, commit
 		&DB.Info.CommitID,
 		&DB.Info.DBEntry,
 		&DB.Info.Branches, &DB.Info.Releases, &DB.Info.Contributors, &oneLineDesc, &fullDesc, &defTable,
-		&DB.Info.Public, &sourceURL, &DB.Info.Tags, &DB.Info.DefaultBranch)
+		&DB.Info.Public, &sourceURL, &DB.Info.Tags, &DB.Info.DefaultBranch, &DB.Info.IsLive)
 
 	if err != nil {
 		log.Printf("Error when retrieving database details: %v\n", err.Error())

common/types.go

@@ -222,6 +222,7 @@ type DBInfo struct {
 	Folder        string
 	Forks         int
 	FullDesc      string
+	IsLive        bool
 	LastModified  time.Time
 	Licence       string
 	LicenceURL    string

webui/pages.go

@@ -819,7 +819,6 @@ func databasePage(w http.ResponseWriter, r *http.Request, dbOwner string, dbFold
 		MyStar  bool
 		MyWatch bool
 		Config  com.TomlConfig // FIXME: This seems silly to include here, when we just need to provide the server/port info
-		IsLive  bool
 	}
 
 	pageData.Meta.PageSection = "db_data"
@@ -948,16 +947,15 @@ func databasePage(w http.ResponseWriter, r *http.Request, dbOwner string, dbFold
 	}
 
 	// Check if this is a live database
-	var liveNode string
-	pageData.IsLive, liveNode, err = com.CheckDBLive(dbOwner, dbFolder, dbName)
+	isLive, liveNode, err := com.CheckDBLive(dbOwner, dbFolder, dbName)
 	if err != nil {
 		errorPage(w, r, http.StatusInternalServerError, err.Error())
 		return
 	}
 
 	// Only standard databases have commits, branches, tags (etC)
 	branchHeads := make(map[string]com.BranchEntry)
-	if !pageData.IsLive {
+	if !isLive {
 		// If a specific commit was requested, make sure it exists in the database commit history
 		if commitID != "" {
 			commitList, err := com.GetCommitList(dbOwner, dbFolder, dbName)
@@ -1030,52 +1028,13 @@ func databasePage(w http.ResponseWriter, r *http.Request, dbOwner string, dbFold
 				return
 			}
 		}
+	}
 
-		// Retrieve the database details
-		err = com.DBDetails(&pageData.DB, pageData.Meta.LoggedInUser, dbOwner, dbFolder, dbName, commitID)
-		if err != nil {
-			errorPage(w, r, http.StatusBadRequest, err.Error())
-			return
-		}
-	} else {
-		// FIXME: We need an equivalent of com.DBDetails() for live databases
-		pageData.DB = com.SQLiteDBinfo{
-			Info: com.DBInfo{
-				Branch:        "",
-				Branches:      0,
-				BranchList:    nil,
-				Commits:       0,
-				CommitID:      "",
-				Contributors:  1, // 1 makes sense here, as we don't yet support sharing live databases
-				Database:      dbName,
-				DateCreated:   time.Time{},
-				DBEntry:       com.DBTreeEntry{},
-				DefaultBranch: "",
-				DefaultTable:  "",
-				Discussions:   0,
-				Downloads:     0,
-				Folder:        "",
-				Forks:         0,
-				FullDesc:      "",
-				LastModified:  time.Time{},
-				Licence:       "",
-				LicenceURL:    "",
-				MRs:           0,
-				OneLineDesc:   "",
-				Public:        false,
-				RepoModified:  time.Time{},
-				Releases:      0,
-				SHA256:        "",
-				Size:          0,
-				SourceURL:     "",
-				Stars:         0,
-				Tables:        nil,
-				Tags:          0,
-				Views:         0,
-				Watchers:      0,
-			},
-			MaxRows: 0,
-		}
+	// Retrieve the database details
+	err = com.DBDetails(&pageData.DB, pageData.Meta.LoggedInUser, dbOwner, dbFolder, dbName, commitID)
+	if err != nil {
+		errorPage(w, r, http.StatusBadRequest, err.Error())
+		return
 	}
 
 	// Get the latest discussion and merge request count directly from PG, skipping the ones (incorrectly) stored in memcache
@@ -1125,7 +1084,7 @@ func databasePage(w http.ResponseWriter, r *http.Request, dbOwner string, dbFold
 	}
 
 	// If it's a standard database then we query it directly, otherwise we query it via our AMQP backend
-	if !pageData.IsLive {
+	if !isLive {
 		bucket := pageData.DB.Info.DBEntry.Sha256[:com.MinioFolderChars]
 		id := pageData.DB.Info.DBEntry.Sha256[com.MinioFolderChars:]
 		pageData.DB.Info.Tables, pageData.DB.Info.DefaultTable, pageData.Data, _, err =
@@ -1235,7 +1194,7 @@ func databasePage(w http.ResponseWriter, r *http.Request, dbOwner string, dbFold
 	pageData.DB.Info.MRs = currentMRs
 
 	// If this is a standard database, then cache the table row data
-	if !pageData.IsLive {
+	if !isLive {
 		rowCacheKey := com.TableRowsCacheKey(fmt.Sprintf("tablejson/%s/%s/%d", sortCol, sortDir, rowOffset),
 			pageData.Meta.LoggedInUser, dbOwner, dbFolder, dbName, commitID, dbTable, pageData.DB.MaxRows)
 		err = com.CacheData(rowCacheKey, pageData.Data, com.Conf.Memcache.DefaultCacheTime)

webui/templates/database.html

@@ -32,7 +32,7 @@
             </div>
         </div>
     [[ end ]]
-    [[ if eq .IsLive false ]]
+    [[ if eq .DB.Info.IsLive false ]]
         <div class="row">
             <div class="col-md-12">
                 <div style="border: 1px solid #DDD; border-radius: 7px; margin-bottom: 10px;">
@@ -85,7 +85,7 @@
                             </li>
                         </ul>
                     </div>
-                    [[ if eq .IsLive false ]]
+                    [[ if eq .DB.Info.IsLive false ]]
                         <div class="btn-group" uib-dropdown keyboard-nav="true">
                             <button id="viewbranch" type="button" class="btn" data-cy="branchname"><span style="font-weight: bold">Branch:</span> {{ meta.Branch }}</button>
 
@@ -99,14 +99,14 @@
                             </ul>
                         </div>
                     [[ end ]]
-                    [[ if and (.Meta.LoggedInUser) (eq .IsLive false) ]]
+                    [[ if and (.Meta.LoggedInUser) (eq .DB.Info.IsLive false) ]]
                         <a href="/compare/[[ .Meta.Owner ]]/[[ .Meta.Database ]]" class="btn btn-primary" data-cy="newmrbtn">New Merge Request</a>
                         <button class="btn btn-primary" ng-click="uploadForm()" data-cy="uploadbtn">Upload database</button>
                     [[ end ]]
                 </div>
             </span>
         </div>
-        [[ if eq .IsLive false ]]
+        [[ if eq .DB.Info.IsLive false ]]
             <div class="col-md-4">
                 <span class="pull-right">
                     <div class="btn-group" uib-dropdown keyboard-nav="true">

webui/templates/script_db_header.html

@@ -5,7 +5,7 @@
         pageSection: "[[ .Meta.PageSection ]]",
         owner: "[[ .Meta.Owner ]]",
         database: "[[ .Meta.Database ]]",
-        isLive: [[ .IsLive ]],
+        isLive: [[ .DB.Info.IsLive ]],
 
         publicDb: [[ .DB.Info.Public ]],
         repoModified: [[ .DB.Info.RepoModified ]],

webui/vis.go

@@ -324,8 +324,8 @@ func visualisePage(w http.ResponseWriter, r *http.Request) {
 
 	// Update database star and watch status for the logged in user
 	// FIXME: Add Cypress tests for this, to ensure moving the code above isn't screwing anything up (especially cacheing)
-//pageData.MyStar = myStar
-//pageData.MyWatch = myWatch
+	//pageData.MyStar = myStar
+	//pageData.MyWatch = myWatch
 
 	// Render the visualisation page
 	pageData.Meta.PageSection = "db_vis"