Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
exclude: 'node_modules|.git'
default_stages: [pre-commit]
default_install_hook_types: [pre-commit, commit-msg]
fail_fast: false


repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
files: "eps.*"
exclude: ".*json$|.*txt$|.*csv|.*md|.*svg"
- id: check-yaml
- id: no-commit-to-branch
args: ['--branch', 'develop']
- id: check-merge-conflict
- id: check-ast
- id: check-json
Expand All @@ -19,14 +21,17 @@ repos:
- id: debug-statements

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.2.0
rev: v0.13.2
hooks:
- id: ruff
name: "Run ruff linter and apply fixes"
args: ["--fix"]
name: "Run ruff import sorter"
args: ["--select=I", "--fix"]

- id: ruff
name: "Run ruff linter"

- id: ruff-format
name: "Format Python code"
name: "Run ruff formatter"

- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.7.1
Expand Down Expand Up @@ -61,6 +66,13 @@ repos:
eps/public/js/lib/.*
)$

- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
rev: v9.22.0
hooks:
- id: commitlint
stages: [commit-msg]
additional_dependencies: ['conventional-changelog-conventionalcommits']

ci:
autoupdate_schedule: weekly
skip: []
Expand Down
4 changes: 3 additions & 1 deletion eps/eps/leaderboard.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ def get_energy_point_leaderboard(date_range, company=None, field=None, limit=Non
for user in energy_point_users:
user_id = user["name"]
user["name"] = get_fullname(user["name"])
user["formatted_name"] = f'<a href="/app/user-profile/{user_id}">{get_fullname(user_id)}</a>'
user["formatted_name"] = (
f'<a href="/app/user-profile/{user_id}">{frappe.utils.html_utils.escape_html(get_fullname(user_id))}</a>'
)

return energy_point_users