This is an automated email from the ASF dual-hosted git repository.
abeizn pushed a commit to branch release-v1.0
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/release-v1.0 by this push:
new e195107a9 fix: revert worklogs code (#7984) (#7985)
e195107a9 is described below
commit e195107a93424a19538895e6b2a62dcf4469808b
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Aug 29 13:25:56 2024 +0800
fix: revert worklogs code (#7984) (#7985)
Co-authored-by: abeizn <zikuan...@merico.dev>
---
grafana/dashboards/WorkLogs.json | 35 +++++++++++++----------------------
1 file changed, 13 insertions(+), 22 deletions(-)
diff --git a/grafana/dashboards/WorkLogs.json b/grafana/dashboards/WorkLogs.json
index d546f01c2..ba2da4761 100644
--- 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 _acc [...]
+ "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 o [...]
"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 jo [...]
+ "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 _accou [...]
"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": ""
}
\ No newline at end of file
