fix: revert worklogs code (#7984) (#7985)

github-actions[bot] · abeizn · web-flow · commit e195107a9342 · 2024-08-29T13:25:56.000+08:00
Co-authored-by: abeizn &lt;zikuan.an@merico.dev&gt;
diff --git a/grafana/dashboards/WorkLogs.json b/grafana/dashboards/WorkLogs.json
@@ -18,7 +18,7 @@
   "editable": true,
   "fiscalYearStartMonth": 0,
   "graphTooltip": 0,
-  "id": 47,
+  "id": 39,
   "links": [],
   "liveNow": false,
   "panels": [
@@ -705,7 +705,6 @@
           "values": true
         },
         "tooltip": {
-          "maxHeight": 600,
           "mode": "single",
           "sort": "none"
         }
@@ -753,8 +752,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           }
@@ -825,8 +823,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           },
@@ -862,7 +859,7 @@
           "editorMode": "code",
           "format": "table",
           "rawQuery": true,
-          "rawSql": "with _accounts as (\n  select ua.account_id, ua.user_id, u.name, u.email\n    from accounts a \n    join user_accounts ua on a.id = ua.account_id\n    join users u on ua.user_id = u.id\n  where ua.user_id in ($users)\n),\n\n\n_commits as (\n  SELECT distinct DATE_FORMAT(authored_date, '%d/%m/%Y') as Date, authored_date as Time, 'Finish a commit' as Activity, concat(message, ' #', sha) as Details, a.name as Name, c.additions, c.deletions\n  FROM commits c\n  join _accounts a on c.author_id = a.email\n  where $__timeFilter(authored_date)\n)\n\nSELECT sum(additions + deletions) FROM _commits\n",
+          "rawSql": "with _accounts as (\n  select ua.account_id, ua.user_id, u.name\n    from accounts a \n    join user_accounts ua on a.id = ua.account_id\n    join users u on ua.user_id = u.id\n  where ua.user_id in ($users)\n),\n\n\n_commits as (\n  SELECT distinct DATE_FORMAT(authored_date, '%d/%m/%Y') as Date, authored_date as Time, 'Finish a commit' as Activity, concat(message, ' #', sha) as Details, a.name as Name, c.additions, c.deletions\n  FROM commits c\n  join _accounts a on c.author_id = a.account_id\n  where $__timeFilter(authored_date)\n)\n\nSELECT sum(additions + deletions) FROM _commits\n",
           "refId": "A",
           "sql": {
             "columns": [
@@ -898,8 +895,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           },
@@ -971,8 +967,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           },
@@ -1067,8 +1062,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               },
               {
                 "color": "red",
@@ -1111,7 +1105,6 @@
           "valueSize": 12
         },
         "tooltip": {
-          "maxHeight": 600,
           "mode": "single",
           "sort": "none"
         },
@@ -1197,8 +1190,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           },
@@ -1234,7 +1226,7 @@
           "editorMode": "code",
           "format": "table",
           "rawQuery": true,
-          "rawSql": "with _accounts as (\n  select ua.account_id, ua.user_id, u.name, u.email\n    from accounts a \n    join user_accounts ua on a.id = ua.account_id\n    join users u on ua.user_id = u.id\n  where ua.user_id in ($users)\n),\n\n\n_commits as (\n  SELECT distinct DATE_FORMAT(authored_date, '%d/%m/%Y') as Date, authored_date as Time, 'Finish a commit' as Activity, concat(message, ' #', sha) as Details, a.name as Name, c.additions, c.deletions, c.sha\n  FROM commits c\n  join _accounts a on c.author_id = a.email\n  where $__timeFilter(authored_date)\n),\n\n_pr_commits_data as(\n  SELECT\n    pr.id as pr_id,\n    pr.merge_commit_sha,\n    sum(c.additions)+sum(c.deletions) as loc\n  FROM \n    pull_requests pr\n    left join _commits c on pr.merge_commit_sha = c.sha\n  WHERE\n    $__timeFilter(pr.created_date)\n    and pr.status = 'MERGED'\n    group by 1,2\n)\n\nSELECT \n  avg(loc) as 'PR Merged Size'\nFROM _pr_commits_data\n",
+          "rawSql": "with _accounts as (\n  select ua.account_id, ua.user_id, u.name\n    from accounts a \n    join user_accounts ua on a.id = ua.account_id\n    join users u on ua.user_id = u.id\n  where ua.user_id in ($users)\n),\n\n\n_commits as (\n  SELECT distinct DATE_FORMAT(authored_date, '%d/%m/%Y') as Date, authored_date as Time, 'Finish a commit' as Activity, concat(message, ' #', sha) as Details, a.name as Name, c.additions, c.deletions, c.sha\n  FROM commits c\n  join _accounts a on c.author_id = a.account_id\n  where $__timeFilter(authored_date)\n),\n\n_pr_commits_data as(\n  SELECT\n    pr.id as pr_id,\n    pr.merge_commit_sha,\n    sum(c.additions)+sum(c.deletions) as loc\n  FROM \n    pull_requests pr\n    left join _commits c on pr.merge_commit_sha = c.sha\n  WHERE\n    $__timeFilter(pr.created_date)\n    and pr.status = 'MERGED'\n    group by 1,2\n)\n\nSELECT \n  avg(loc) as 'PR Merged Size'\nFROM _pr_commits_data\n",
           "refId": "A",
           "sql": {
             "columns": [
@@ -1270,8 +1262,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           },
@@ -1344,8 +1335,7 @@
             "mode": "absolute",
             "steps": [
               {
-                "color": "green",
-                "value": null
+                "color": "green"
               }
             ]
           },
@@ -1467,10 +1457,11 @@
     "from": "now-6M",
     "to": "now"
   },
+  "timeRangeUpdatedDuringEditOrView": false,
   "timepicker": {},
   "timezone": "utc",
   "title": "Work Logs",
   "uid": "d449042e-22f0-4357-b8b7-22083f47618d",
-  "version": 1,
+  "version": 3,
   "weekStart": ""
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`"editable": true,`
`19`	`19`	`"fiscalYearStartMonth": 0,`
`20`	`20`	`"graphTooltip": 0,`
`21`		`- "id": 47,`
	`21`	`+ "id": 39,`
`22`	`22`	`"links": [],`
`23`	`23`	`"liveNow": false,`
`24`	`24`	`"panels": [`
`@@ -705,7 +705,6 @@`
`705`	`705`	`"values": true`
`706`	`706`	`},`
`707`	`707`	`"tooltip": {`
`708`		`- "maxHeight": 600,`
`709`	`708`	`"mode": "single",`
`710`	`709`	`"sort": "none"`
`711`	`710`	`}`
`@@ -753,8 +752,7 @@`
`753`	`752`	`"mode": "absolute",`
`754`	`753`	`"steps": [`
`755`	`754`	`{`
`756`		`- "color": "green",`
`757`		`- "value": null`
	`755`	`+ "color": "green"`
`758`	`756`	`}`
`759`	`757`	`]`
`760`	`758`	`}`
`@@ -825,8 +823,7 @@`
`825`	`823`	`"mode": "absolute",`
`826`	`824`	`"steps": [`
`827`	`825`	`{`
`828`		`- "color": "green",`
`829`		`- "value": null`
	`826`	`+ "color": "green"`
`830`	`827`	`}`
`831`	`828`	`]`
`832`	`829`	`},`
`@@ -862,7 +859,7 @@`
`862`	`859`	`"editorMode": "code",`
`863`	`860`	`"format": "table",`
`864`	`861`	`"rawQuery": true,`
`865`		- "rawSql": "with _accounts as (\n select ua.account_id, ua.user_id, u.name, u.email\n from accounts a \n join user_accounts ua on a.id = ua.account_id\n join users u on ua.user_id = u.id\n where ua.user_id in ($users)\n),\n\n\n_commits as (\n SELECT distinct DATE_FORMAT(authored_date, '%d/%m/%Y') as Date, authored_date as Time, 'Finish a commit' as Activity, concat(message, ' #', sha) as Details, a.name as Name, c.additions, c.deletions\n FROM commits c\n join _accounts a on c.author_id = a.email\n where $__timeFilter(authored_date)\n)\n\nSELECT sum(additions + deletions) FROM _commits\n",
	`862`	+ "rawSql": "with _accounts as (\n select ua.account_id, ua.user_id, u.name\n from accounts a \n join user_accounts ua on a.id = ua.account_id\n join users u on ua.user_id = u.id\n where ua.user_id in ($users)\n),\n\n\n_commits as (\n SELECT distinct DATE_FORMAT(authored_date, '%d/%m/%Y') as Date, authored_date as Time, 'Finish a commit' as Activity, concat(message, ' #', sha) as Details, a.name as Name, c.additions, c.deletions\n FROM commits c\n join _accounts a on c.author_id = a.account_id\n where $__timeFilter(authored_date)\n)\n\nSELECT sum(additions + deletions) FROM _commits\n",
`866`	`863`	`"refId": "A",`
`867`	`864`	`"sql": {`
`868`	`865`	`"columns": [`
`@@ -898,8 +895,7 @@`
`898`	`895`	`"mode": "absolute",`
`899`	`896`	`"steps": [`
`900`	`897`	`{`
`901`		`- "color": "green",`
`902`		`- "value": null`
	`898`	`+ "color": "green"`
`903`	`899`	`}`
`904`	`900`	`]`
`905`	`901`	`},`
`@@ -971,8 +967,7 @@`
`971`	`967`	`"mode": "absolute",`
`972`	`968`	`"steps": [`
`973`	`969`	`{`
`974`		`- "color": "green",`
`975`		`- "value": null`
	`970`	`+ "color": "green"`
`976`	`971`	`}`
`977`	`972`	`]`
`978`	`973`	`},`
`@@ -1067,8 +1062,7 @@`
`1067`	`1062`	`"mode": "absolute",`
`1068`	`1063`	`"steps": [`
`1069`	`1064`	`{`
`1070`		`- "color": "green",`
`1071`		`- "value": null`
	`1065`	`+ "color": "green"`
`1072`	`1066`	`},`
`1073`	`1067`	`{`
`1074`	`1068`	`"color": "red",`
`@@ -1111,7 +1105,6 @@`
`1111`	`1105`	`"valueSize": 12`
`1112`	`1106`	`},`
`1113`	`1107`	`"tooltip": {`
`1114`		`- "maxHeight": 600,`
`1115`	`1108`	`"mode": "single",`
`1116`	`1109`	`"sort": "none"`
`1117`	`1110`	`},`
`@@ -1197,8 +1190,7 @@`
`1197`	`1190`	`"mode": "absolute",`
`1198`	`1191`	`"steps": [`
`1199`	`1192`	`{`
`1200`		`- "color": "green",`
`1201`		`- "value": null`
	`1193`	`+ "color": "green"`
`1202`	`1194`	`}`
`1203`	`1195`	`]`
`1204`	`1196`	`},`
`@@ -1234,7 +1226,7 @@`
`1234`	`1226`	`"editorMode": "code",`
`1235`	`1227`	`"format": "table",`
`1236`	`1228`	`"rawQuery": true,`
`1237`		- "rawSql": "with _accounts as (\n select ua.account_id, ua.user_id, u.name, u.email\n from accounts a \n join user_accounts ua on a.id = ua.account_id\n join users u on ua.user_id = u.id\n where ua.user_id in ($users)\n),\n\n\n_commits as (\n SELECT distinct DATE_FORMAT(authored_date, '%d/%m/%Y') as Date, authored_date as Time, 'Finish a commit' as Activity, concat(message, ' #', sha) as Details, a.name as Name, c.additions, c.deletions, c.sha\n FROM commits c\n join _accounts a on c.author_id = a.email\n where $__timeFilter(authored_date)\n),\n\n_pr_commits_data as(\n SELECT\n pr.id as pr_id,\n pr.merge_commit_sha,\n sum(c.additions)+sum(c.deletions) as loc\n FROM \n pull_requests pr\n left join _commits c on pr.merge_commit_sha = c.sha\n WHERE\n $__timeFilter(pr.created_date)\n and pr.status = 'MERGED'\n group by 1,2\n)\n\nSELECT \n avg(loc) as 'PR Merged Size'\nFROM _pr_commits_data\n",
	`1229`	+ "rawSql": "with _accounts as (\n select ua.account_id, ua.user_id, u.name\n from accounts a \n join user_accounts ua on a.id = ua.account_id\n join users u on ua.user_id = u.id\n where ua.user_id in ($users)\n),\n\n\n_commits as (\n SELECT distinct DATE_FORMAT(authored_date, '%d/%m/%Y') as Date, authored_date as Time, 'Finish a commit' as Activity, concat(message, ' #', sha) as Details, a.name as Name, c.additions, c.deletions, c.sha\n FROM commits c\n join _accounts a on c.author_id = a.account_id\n where $__timeFilter(authored_date)\n),\n\n_pr_commits_data as(\n SELECT\n pr.id as pr_id,\n pr.merge_commit_sha,\n sum(c.additions)+sum(c.deletions) as loc\n FROM \n pull_requests pr\n left join _commits c on pr.merge_commit_sha = c.sha\n WHERE\n $__timeFilter(pr.created_date)\n and pr.status = 'MERGED'\n group by 1,2\n)\n\nSELECT \n avg(loc) as 'PR Merged Size'\nFROM _pr_commits_data\n",
`1238`	`1230`	`"refId": "A",`
`1239`	`1231`	`"sql": {`
`1240`	`1232`	`"columns": [`
`@@ -1270,8 +1262,7 @@`
`1270`	`1262`	`"mode": "absolute",`
`1271`	`1263`	`"steps": [`
`1272`	`1264`	`{`
`1273`		`- "color": "green",`
`1274`		`- "value": null`
	`1265`	`+ "color": "green"`
`1275`	`1266`	`}`
`1276`	`1267`	`]`
`1277`	`1268`	`},`
`@@ -1344,8 +1335,7 @@`
`1344`	`1335`	`"mode": "absolute",`
`1345`	`1336`	`"steps": [`
`1346`	`1337`	`{`
`1347`		`- "color": "green",`
`1348`		`- "value": null`
	`1338`	`+ "color": "green"`
`1349`	`1339`	`}`
`1350`	`1340`	`]`
`1351`	`1341`	`},`
`@@ -1467,10 +1457,11 @@`
`1467`	`1457`	`"from": "now-6M",`
`1468`	`1458`	`"to": "now"`
`1469`	`1459`	`},`
	`1460`	`+ "timeRangeUpdatedDuringEditOrView": false,`
`1470`	`1461`	`"timepicker": {},`
`1471`	`1462`	`"timezone": "utc",`
`1472`	`1463`	`"title": "Work Logs",`
`1473`	`1464`	`"uid": "d449042e-22f0-4357-b8b7-22083f47618d",`
`1474`		`- "version": 1,`
	`1465`	`+ "version": 3,`
`1475`	`1466`	`"weekStart": ""`
`1476`	`1467`	`}`