User action heatmap

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -193,6 +193,7 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
 - `RECAPTCHA_SECRET`: **""**: Go to https://www.google.com/recaptcha/admin to get a secret for recaptcha.
 - `RECAPTCHA_SITEKEY`: **""**: Go to https://www.google.com/recaptcha/admin to get a sitekey for recaptcha.
 - `DEFAULT_ENABLE_DEPENDENCIES`: **true** Enable this to have dependencies enabled by default.
+- `ENABLE_USER_HEATMAP`: **true** Enable this to enable the heatmap on users profiles.
 
 ## Webhook (`webhook`)
 

models/fixtures/action.yml

@@ -5,6 +5,7 @@
   act_user_id: 2
   repo_id: 2
   is_private: true
+  created_unix: 1540139562
 
 -
   id: 2

models/unit_tests.go

@@ -48,6 +48,7 @@ func MainTest(m *testing.M, pathToGiteaRoot string) {
 	setting.RunUser = "runuser"
 	setting.SSH.Port = 3000
 	setting.SSH.Domain = "try.gitea.io"
+	setting.UseSQLite3 = true
 	setting.RepoRootPath, err = ioutil.TempDir(os.TempDir(), "repos")
 	if err != nil {
 		fatalTestError("TempDir: %v\n", err)

models/user_heatmap.go

@@ -0,0 +1,38 @@
+package models
+
+import (
+	"code.gitea.io/gitea/modules/setting"
+	"code.gitea.io/gitea/modules/util"
+)
+
+// UserHeatmapData represents the data needed to create a heatmap
+type UserHeatmapData struct {
+	Timestamp     util.TimeStamp `json:"timestamp"`
+	Contributions int64          `json:"contributions"`
+}
+
+// GetUserHeatmapDataByUser returns an array of UserHeatmapData
+func GetUserHeatmapDataByUser(user *User) (hdata []*UserHeatmapData, err error) {
+
+	var groupBy string
+	switch {
+	case setting.UseSQLite3:
+		groupBy = "strftime('%Y-%m-%d', created_unix, 'unixepoch')"
+	case setting.UseTiDB:
+	case setting.UseMySQL:
+		groupBy = "DATE_FORMAT(FROM_UNIXTIME(created_unix), '%Y%m%d')"
+	case setting.UsePostgreSQL:
+		groupBy = "date_trunc('day', created_unix)"
+	case setting.UseMSSQL:
+		groupBy = "dateadd(DAY,0, datediff(day,0, dateadd(s, created_unix, '19700101')))"
+	}
+
+	err = x.Select("created_unix as timestamp, count(user_id) as contributions").
+		Table("action").
+		Where("user_id = ?", user.ID).
+		And("created_unix > ?", (util.TimeStampNow() - 31536000)).
+		GroupBy(groupBy).
+		OrderBy("created_unix").
+		Find(&hdata)
+	return
+}

models/user_heatmap_test.go

@@ -0,0 +1,29 @@
+package models
+
+import (
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestGetUserHeatmapDataByUser(t *testing.T) {
+	// Prepare
+	assert.NoError(t, PrepareTestDatabase())
+
+	// Insert some action
+	user := AssertExistsAndLoadBean(t, &User{ID: 2}).(*User)
+
+	// get the action for comparison
+	actions, err := GetFeeds(GetFeedsOptions{
+		RequestedUser:    user,
+		RequestingUserID: user.ID,
+		IncludePrivate:   true,
+		OnlyPerformedBy:  false,
+		IncludeDeleted:   true,
+	})
+	assert.NoError(t, err)
+
+	// Get the heatmap and compare
+	heatmap, err := GetUserHeatmapDataByUser(user)
+	assert.NoError(t, err)
+	assert.Equal(t, len(actions), len(heatmap))
+}

modules/setting/setting.go

@@ -1218,6 +1218,7 @@ var Service struct {
 	DefaultEnableDependencies               bool
 	DefaultAllowOnlyContributorsToTrackTime bool
 	NoReplyAddress                          string
+	EnableUserHeatmap                       bool
 
 	// OpenID settings
 	EnableOpenIDSignIn bool
@@ -1249,6 +1250,7 @@ func newService() {
 	Service.DefaultEnableDependencies = sec.Key("DEFAULT_ENABLE_DEPENDENCIES").MustBool(true)
 	Service.DefaultAllowOnlyContributorsToTrackTime = sec.Key("DEFAULT_ALLOW_ONLY_CONTRIBUTORS_TO_TRACK_TIME").MustBool(true)
 	Service.NoReplyAddress = sec.Key("NO_REPLY_ADDRESS").MustString("noreply.example.org")
+	Service.EnableUserHeatmap = sec.Key("ENABLE_USER_HEATMAP").MustBool(true)
 
 	sec = Cfg.Section("openid")
 	Service.EnableOpenIDSignIn = sec.Key("ENABLE_OPENID_SIGNIN").MustBool(!InstallLock)

options/locale/locale_en-US.ini

@@ -320,6 +320,7 @@ starred = Starred Repositories
 following = Following
 follow = Follow
 unfollow = Unfollow
+heatmap.loading = Loading Heatmap…
 
 form.name_reserved = The username '%s' is reserved.
 form.name_pattern_not_allowed = The pattern '%s' is not allowed in a username.

public/less/_user.less

@@ -58,6 +58,18 @@
         .ui.repository.list {
             margin-top: 25px;
         }
+
+        #loading-heatmap{
+            margin-bottom: 1em;
+        }
+
+        #user-heatmap{
+            width: 107%; // Fixes newest contributions not showing
+
+            svg:not(:root) {
+                overflow: inherit;
+            }
+        }
     }
 
     &.followers {

public/vendor/VERSIONS

@@ -58,3 +58,12 @@ Version: 4.3.0
 
 File(s): /vendor/assets/swagger-ui/
 Version: 3.0.4
+
+File(s): /vendor/plugins/d3/
+Version: 4.13.0
+
+File(s): /vendor/plugins/calendar-heatmap/
+Version: 337b431
+
+File(s): /vendor/plugins/moment/
+Version: 2.12.0

public/vendor/plugins/calendar-heatmap/calendar-heatmap.css

@@ -0,0 +1,27 @@
+text.month-name,
+text.calendar-heatmap-legend-text,
+text.day-initial {
+  font-size: 10px;
+  fill: inherit;
+  font-family: Helvetica, arial, 'Open Sans', sans-serif;
+}
+rect.day-cell:hover {
+  stroke: #555555;
+  stroke-width: 1px;
+}
+.day-cell-tooltip {
+  position: absolute;
+  z-index: 9999;
+  padding: 5px 9px;
+  color: #bbbbbb;
+  font-size: 12px;
+  background: rgba(0, 0, 0, 0.85);
+  border-radius: 3px;
+  text-align: center;
+}
+.day-cell-tooltip > span {
+  font-family: Helvetica, arial, 'Open Sans', sans-serif
+}
+.calendar-heatmap {
+  box-sizing: initial;
+}