webui: Fork information is a database detail, not some meta information

This moves the fork information into the database details data structure
and removes it from the meta data structure. The idea here is to be able
to retrieve this information if and only if it is needed.

Author: MKleusberg

common/postgresql.go

@@ -668,6 +668,12 @@ func DBDetails(DB *SQLiteDBinfo, loggedInUser, dbOwner, dbFolder, dbName, commit
 		return err
 	}
 
+	// Retrieve the "forked from" information
+	DB.Info.ForkOwner, DB.Info.ForkFolder, DB.Info.ForkDatabase, DB.Info.ForkDeleted, err = ForkedFrom(dbOwner, dbFolder, dbName)
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 

common/types.go

@@ -214,6 +214,10 @@ type DBInfo struct {
 	Discussions   int
 	Downloads     int
 	Folder        string
+	ForkDatabase  string
+	ForkDeleted   bool
+	ForkFolder    string
+	ForkOwner     string
 	Forks         int
 	FullDesc      string
 	IsLive        bool
@@ -343,13 +347,9 @@ type MergeRequestEntry struct {
 }
 
 type MetaInfo struct {
-	Database         string
-	Folder           string
-	ForkDatabase     string
-	ForkDeleted      bool
-	ForkFolder       string
-	ForkOwner        string
-	Owner            string
+	Database string
+	Folder   string
+	Owner    string
 }
 
 type ReleaseEntry struct {

webui/main.go

@@ -379,20 +379,18 @@ func checkLogin(r *http.Request) (loggedInUser string, validSession bool, err er
 	return
 }
 
-func collectPageAuth0Info() (auth0 Auth0Set) {
-	auth0.CallbackURL = "https://" + com.Conf.Web.ServerName + "/x/callback"
-	auth0.ClientID = com.Conf.Auth0.ClientID
-	auth0.Domain = com.Conf.Auth0.Domain
-	return
-}
-
 func collectPageMetaInfo(r *http.Request, pageMeta *PageMetaInfo, meta *com.MetaInfo, requireLogin bool, getOwnerAndDatabaseFromUrl bool, getOwnerAndDatabaseFromData bool) (errCode int, err error) {
 	// Auth0 info
-	pageMeta.Auth0 = collectPageAuth0Info()
+	pageMeta.Auth0.CallbackURL = "https://" + com.Conf.Web.ServerName + "/x/callback"
+	pageMeta.Auth0.ClientID = com.Conf.Auth0.ClientID
+	pageMeta.Auth0.Domain = com.Conf.Auth0.Domain
 
 	// Server name
 	pageMeta.Server = com.Conf.Web.ServerName
 
+	// Pass along the environment setting
+	pageMeta.Environment = com.Conf.Environment.Environment
+
 	// Retrieve session data (if any)
 	loggedInUser, validSession, err := checkLogin(r)
 	if err != nil {
@@ -467,17 +465,8 @@ func collectPageMetaInfo(r *http.Request, pageMeta *PageMetaInfo, meta *com.Meta
 		meta.Database = dbName
 		meta.Owner = usr.Username
 		meta.Folder = "/"
-
-		// Retrieve the "forked from" information
-		meta.ForkOwner, meta.ForkFolder, meta.ForkDatabase, meta.ForkDeleted, err = com.ForkedFrom(meta.Owner, meta.Folder, meta.Database)
-		if err != nil {
-			return http.StatusBadRequest, err
-		}
 	}
 
-	// Pass along the environment setting
-	pageMeta.Environment = com.Conf.Environment.Environment
-
 	return
 }
 

webui/templates/script_db_header.html

@@ -13,9 +13,9 @@
         licenceURL: "[[ .DB.Info.LicenceURL ]]",
         size: [[ .DB.Info.DBEntry.Size ]],
 
-        forkOwner: "[[ .Meta.ForkOwner ]]",
-        forkDatabase: "[[ .Meta.ForkDatabase ]]",
-        forkDeleted: [[ .Meta.ForkDeleted ]],
+        forkOwner: "[[ .DB.Info.ForkOwner ]]",
+        forkDatabase: "[[ .DB.Info.ForkDatabase ]]",
+        forkDeleted: [[ .DB.Info.ForkDeleted ]],
         numForks: [[ .DB.Info.Forks ]],
 
         commitID: "[[ .DB.Info.CommitID ]]",