lewis.moe
Monorepo for Tangled
appview/pages: render last commit info in tree views
Signed-off-by: oppiliappan <me@oppi.li>
+9
-7
appview/pages/pages.go
+9
-7
appview/pages/pages.go
···
764
}
765
766
type RepoTreeParams struct {
767
+
LoggedInUser *oauth.MultiAccountUser
768
+
RepoInfo repoinfo.RepoInfo
769
+
Active string
770
+
BreadCrumbs [][]string
771
+
TreePath string
772
+
Raw bool
773
+
HTMLReadme template.HTML
774
+
EmailToDid map[string]string
775
+
LastCommitInfo *types.LastCommitInfo
776
types.RepoTreeResponse
777
}
778
+4
appview/pages/templates/repo/tree.html
+4
appview/pages/templates/repo/tree.html
+5
appview/repo/blob.go
+5
appview/repo/blob.go
···
101
Message: resp.LastCommit.Message,
102
When: when,
103
}
104
+
if resp.LastCommit.Author != nil {
105
+
lastCommitInfo.Author.Name = resp.LastCommit.Author.Name
106
+
lastCommitInfo.Author.Email = resp.LastCommit.Author.Email
107
+
lastCommitInfo.Author.When, _ = time.Parse(time.RFC3339, resp.LastCommit.Author.When)
108
+
}
109
}
110
111
rp.pages.RepoBlob(w, pages.RepoBlobParams{
+29
appview/repo/tree.go
+29
appview/repo/tree.go
···
8
"time"
9
10
"tangled.org/core/api/tangled"
11
"tangled.org/core/appview/pages"
12
"tangled.org/core/appview/reporesolver"
13
xrpcclient "tangled.org/core/appview/xrpcclient"
···
98
}
99
sortFiles(result.Files)
100
101
rp.pages.RepoTree(w, pages.RepoTreeParams{
102
LoggedInUser: user,
103
BreadCrumbs: breadcrumbs,
104
TreePath: treePath,
105
RepoInfo: rp.repoResolver.GetRepoInfo(r, user),
106
RepoTreeResponse: result,
107
})
108
}
···
8
"time"
9
10
"tangled.org/core/api/tangled"
11
+
"tangled.org/core/appview/db"
12
"tangled.org/core/appview/pages"
13
"tangled.org/core/appview/reporesolver"
14
xrpcclient "tangled.org/core/appview/xrpcclient"
···
99
}
100
sortFiles(result.Files)
101
102
+
// Get email to DID mapping for commit author
103
+
var emails []string
104
+
if xrpcResp.LastCommit != nil && xrpcResp.LastCommit.Author != nil {
105
+
emails = append(emails, xrpcResp.LastCommit.Author.Email)
106
+
}
107
+
emailToDidMap, err := db.GetEmailToDid(rp.db, emails, true)
108
+
if err != nil {
109
+
l.Error("failed to get email to did mapping", "err", err)
110
+
emailToDidMap = make(map[string]string)
111
+
}
112
+
113
+
var lastCommitInfo *types.LastCommitInfo
114
+
if xrpcResp.LastCommit != nil {
115
+
when, _ := time.Parse(time.RFC3339, xrpcResp.LastCommit.When)
116
+
lastCommitInfo = &types.LastCommitInfo{
117
+
Hash: plumbing.NewHash(xrpcResp.LastCommit.Hash),
118
+
Message: xrpcResp.LastCommit.Message,
119
+
When: when,
120
+
}
121
+
if xrpcResp.LastCommit.Author != nil {
122
+
lastCommitInfo.Author.Name = xrpcResp.LastCommit.Author.Name
123
+
lastCommitInfo.Author.Email = xrpcResp.LastCommit.Author.Email
124
+
lastCommitInfo.Author.When, _ = time.Parse(time.RFC3339, xrpcResp.LastCommit.Author.When)
125
+
}
126
+
}
127
+
128
rp.pages.RepoTree(w, pages.RepoTreeParams{
129
LoggedInUser: user,
130
BreadCrumbs: breadcrumbs,
131
TreePath: treePath,
132
RepoInfo: rp.repoResolver.GetRepoInfo(r, user),
133
+
EmailToDid: emailToDidMap,
134
+
LastCommitInfo: lastCommitInfo,
135
RepoTreeResponse: result,
136
})
137
}
-10
types/repo.go
-10
types/repo.go
···
106
Branch string `json:"branch,omitempty"`
107
}
108
109
-
type RepoBlobResponse struct {
110
-
Contents string `json:"contents,omitempty"`
111
-
Ref string `json:"ref,omitempty"`
112
-
Path string `json:"path,omitempty"`
113
-
IsBinary bool `json:"is_binary,omitempty"`
114
-
115
-
Lines int `json:"lines,omitempty"`
116
-
SizeHint uint64 `json:"size_hint,omitempty"`
117
-
}
118
-
119
type ForkStatus int
120
121
const (