Upgrade to biome

Author: matthiask

.eslintrc.js

@@ -1,4 +1,4 @@
-exclude: ".yarn/|yarn.lock"
+exclude: ".yarn/|yarn.lock|workbench/static/workbench/lib"
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.5.0
@@ -28,41 +28,18 @@ repos:
     rev: 1.16.0
     hooks:
       - id: django-upgrade
-        args: [--target-version, "4.2"]
+        args: [--target-version, "5.0"]
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.3.0"
+    rev: "v0.3.5"
     hooks:
       - id: ruff
       - id: ruff-format
-  - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v8.56.0
-    hooks:
-      - id: eslint
-        args: [--fix]
-        types_or: [css, scss, javascript]
-        verbose: true
-        additional_dependencies:
-          - eslint
-          - eslint-config-prettier
-          - eslint-config-preact
-          - eslint-plugin-compat
-          - eslint-plugin-jest
-          - eslint-plugin-react
-          - eslint-plugin-react-hooks
-          - "@babel/core"
-          - "@babel/eslint-parser"
-          - "@babel/preset-env"
-          - "@babel/preset-react"
-          - "@babel/plugin-syntax-class-properties"
-          - "@babel/plugin-syntax-decorators"
-          - "@babel/plugin-syntax-jsx"
-          - jest
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.1.0
     hooks:
       - id: prettier
         args: [--list-different, --no-semi]
-        types_or: [css, scss, javascript]
+        types_or: [scss]
         exclude: "^conf/|.*\\.html$|.*\\.json$"
   - repo: https://github.com/tox-dev/pyproject-fmt
     rev: 1.7.0
@@ -72,3 +49,8 @@ repos:
     rev: v0.16
     hooks:
       - id: validate-pyproject
+  - repo: https://github.com/biomejs/pre-commit
+    rev: "v0.1.0"
+    hooks:
+    -   id: biome-check
+        additional_dependencies: ["@biomejs/biome@1.6.3"]

.pre-commit-config.yaml

@@ -9,9 +9,19 @@ const getRowName = (id) => `person-${id}`
 
 // prettier-ignore
 const MONTHS = [
-  "January", "February", "March", "April", "May", "June", "July", "August",
-  "September", "October", "November", "December"
-].map(m => gettext(m))
+  "January",
+  "February",
+  "March",
+  "April",
+  "May",
+  "June",
+  "July",
+  "August",
+  "September",
+  "October",
+  "November",
+  "December",
+].map((m) => gettext(m))
 
 export const Absences = ({ absencesByPerson, dateList, reasonList }) => {
   const scaleValues = useMemo(

absences/absences.js

@@ -6,7 +6,7 @@ import React from "react"
 import { Absences } from "./absences"
 
 function getDateList(start, end) {
-  let list = []
+  const list = []
   let currentDate = start
 
   while (currentDate <= end) {
@@ -22,7 +22,7 @@ function getDateList(start, end) {
 }
 
 document.addEventListener("DOMContentLoaded", () => {
-  let { absencesByPerson, reasonList, timeBoundaries } = JSON.parse(
+  const { absencesByPerson, reasonList, timeBoundaries } = JSON.parse(
     document.getElementById("absences-data").textContent,
   )
 

absences/index.js

@@ -45,9 +45,9 @@ export function getWeekNumber(d) {
   // Make Sunday's day number 7
   d.setUTCDate(d.getUTCDate() + 4 - (d.getUTCDay() || 7))
   // Get first day of year
-  let yearStart = new Date(Date.UTC(d.getUTCFullYear(), 0, 1))
+  const yearStart = new Date(Date.UTC(d.getUTCFullYear(), 0, 1))
   // Calculate full weeks to nearest Thursday
-  let weekNo = Math.ceil(((d - yearStart) / 86400000 + 1) / 7)
+  const weekNo = Math.ceil(((d - yearStart) / 86400000 + 1) / 7)
   // Return array of year and week number
   return [d.getUTCFullYear(), weekNo]
 }

absences/utils.js

@@ -0,0 +1,23 @@
+{
+  "$schema": "https://biomejs.dev/schemas/1.6.3/schema.json",
+  "organizeImports": {
+    "enabled": false
+  },
+  "formatter": {
+    "enabled": true,
+    "indentStyle": "space",
+    "indentWidth": 2,
+    "ignore": ["*/map/styles_*.json"]
+  },
+  "javascript": {
+    "formatter": {
+      "semicolons": "asNeeded"
+    }
+  },
+  "linter": {
+    "enabled": true,
+    "rules": {
+      "recommended": true
+    }
+  }
+}

biome.json

@@ -28,9 +28,7 @@ def _do_deploy(conn, folder, rsync):
     with conn.cd(folder):
         fl.run(
             conn,
-            "DOTENV=.env/{} venv/bin/python manage.py collectstatic --noinput".format(
-                fl.config.installations[0]
-            ),
+            f"DOTENV=.env/{fl.config.installations[0]} venv/bin/python manage.py collectstatic --noinput",
         )
 
 

fabfile.py

@@ -2,9 +2,6 @@
   "scripts": {
     "build-bootstrap": "webpack -p --config webpack.config.bootstrap.js"
   },
-  "eslintIgnore": [
-    "workbench/static/workbench/lib"
-  ],
   "dependencies": {
     "bootstrap": "^4.6.0",
     "fh-webpack-config": "^2.0.1",

package.json

@@ -14,7 +14,7 @@ const clamp = (min, value, max) => Math.max(Math.min(value, max), min)
 const opacityClamp = (value) => clamp(0.3, value, 1)
 const gettext = window.gettext || ((t) => t)
 const pgettext = window.pgettext || ((ctx, t) => t)
-const fixed = (s, decimalPlaces) => parseFloat(s).toFixed(decimalPlaces)
+const fixed = (s, decimalPlaces) => Number.parseFloat(s).toFixed(decimalPlaces)
 
 document.addEventListener("DOMContentLoaded", () => {
   const data = JSON.parse(document.querySelector("#planning-data").textContent)
@@ -41,7 +41,7 @@ function months(weeks) {
   const months = []
   let month = null
   for (let index = 0; index < weeks.length; ++index) {
-    let week = weeks[index]
+    const week = weeks[index]
     if (week.month !== month) {
       month = week.month
       months.push({ index, month })
@@ -69,8 +69,8 @@ function Planning({ data }) {
   const [collapse, setCollapse] = useState(getCollapse())
   const toggleCollapse = (id) => {
     const storage = window.localStorage.getItem("planningCollapse")
-    let storageData = storage ? JSON.parse(storage) : []
-    let index = storageData.indexOf(id)
+    const storageData = storage ? JSON.parse(storage) : []
+    const index = storageData.indexOf(id)
     if (index >= 0) storageData.splice(index, 1)
     else storageData.push(id)
     window.localStorage.setItem("planningCollapse", JSON.stringify(storageData))
@@ -201,7 +201,7 @@ function TotalByWeek({ by_week, title }) {
           column={FIRST_DATA_COLUMN + idx}
           className="planning--range planning--small is-total"
           style={{
-            opacity: opacityClamp(0.3 + parseFloat(hours) / 20),
+            opacity: opacityClamp(0.3 + Number.parseFloat(hours) / 20),
           }}
         >
           {fixed(hours, 0)}
@@ -374,7 +374,7 @@ function Project({
       )}
       {external_view ||
         by_week.map((hours, idx) => {
-          hours = parseFloat(hours)
+          hours = Number.parseFloat(hours)
           if (!hours) return null
 
           return (
@@ -410,7 +410,7 @@ function Project({
 function WorkedHours({ project }) {
   const ctx = useContext(RowContext)
   const row = ctx.next()
-  const sum = project.worked_hours.reduce((a, b) => a + parseFloat(b), 0)
+  const sum = project.worked_hours.reduce((a, b) => a + Number.parseFloat(b), 0)
 
   return (
     <>
@@ -422,7 +422,7 @@ function WorkedHours({ project }) {
       </Cell>
 
       {project.worked_hours.map((hours, idx) => {
-        hours = parseFloat(hours)
+        hours = Number.parseFloat(hours)
         if (!hours) return null
 
         return (
@@ -906,7 +906,7 @@ function UserAbsences({ user }) {
       {user[1].map((absences, idx) => {
         if (!absences.length) return null
 
-        const hours = absences.reduce((a, b) => a + parseFloat(b[0]), 0)
+        const hours = absences.reduce((a, b) => a + Number.parseFloat(b[0]), 0)
 
         return (
           <Cell
@@ -925,13 +925,13 @@ function UserAbsences({ user }) {
 }
 
 function findContiguousWeekRanges(hours_per_week) {
-  hours_per_week = hours_per_week.map((hours) => parseFloat(hours))
+  hours_per_week = hours_per_week.map((hours) => Number.parseFloat(hours))
 
   let rangeStart = -1
   // const ranges = [{start: 0, length: hours_per_week.length - 1}]
   // return ranges
 
-  let ranges = []
+  const ranges = []
 
   for (let i = 0; i < hours_per_week.length; ++i) {
     if (hours_per_week[i]) {

planning/index.js

@@ -51,7 +51,7 @@ extend-select = [
   # flake8-logging
   "LOG",
   # ruff
-  "RUF005", "RUF006", "RUF007", "RUF008", "RUF009", "RUF010", "RUF011",
+  "RUF005", "RUF006", "RUF007", "RUF008", "RUF009", "RUF010",
   "RUF015", "RUF016", "RUF017", "RUF100", "RUF200",
 ]
 extend-ignore = [

pyproject.toml

@@ -119,7 +119,7 @@ export async function sendLogbook(dispatch, { activity, current }) {
 }
 
 export function overwriteSeconds(dispatch, { activity, current }) {
-  const seconds = parseInt(
+  const seconds = Number.parseInt(
     prompt(gettext("Overwrite seconds"), Math.ceil(activity.seconds)),
     10,
   )

timer/actions.js

@@ -22,7 +22,7 @@ const serialize = (data) => {
 
 const deserialize = (blob) => {
   const deserializeRaw = () => {
-    let parsed = JSON.parse(blob)
+    const parsed = JSON.parse(blob)
     if (!parsed || !parsed._v) return {}
     const { _v, ...data } = parsed
     if (_v == VERSION) {
@@ -60,7 +60,7 @@ export function configureStore() {
   } catch (e) {
     /* intentionally empty */
   }
-  let store = createStore(
+  const store = createStore(
     reducer,
     initialState,
     compose(
@@ -79,7 +79,7 @@ export function configureStore() {
 
   if (module.hot) {
     module.hot.accept(() => {
-      let reducer = require("./reducers").default
+      const reducer = require("./reducers").default
       store.replaceReducer(reducer)
     })
   }

timer/store.js

@@ -52,12 +52,7 @@ class Meta:
         verbose_name_plural = _("logged actions")
 
     def __str__(self):
-        return "{} {} by {} at {}".format(
-            self.get_action_display(),
-            self.table_name,
-            self.user_name,
-            self.created_at,
-        )
+        return f"{self.get_action_display()} {self.table_name} by {self.user_name} at {self.created_at}"
 
     @cached_property
     def user_id(self):

workbench/audit/models.py

@@ -110,10 +110,7 @@ class Meta:
     def __str__(self):
         if self.date_until.year > 3000:
             return _("since %s") % local_date_format(self.date_from)
-        return "{} - {}".format(
-            local_date_format(self.date_from),
-            local_date_format(self.date_until),
-        )
+        return f"{local_date_format(self.date_from)} - {local_date_format(self.date_until)}"
 
     def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
@@ -234,10 +231,7 @@ def pretty_status(self):
 
     @property
     def pretty_period(self):
-        return "{} - {}".format(
-            local_date_format(self.starts_on),
-            local_date_format(self.ends_on or self.starts_on),
-        )
+        return f"{local_date_format(self.starts_on)} - {local_date_format(self.ends_on or self.starts_on)}"
 
 
 class VacationDaysOverride(models.Model):

workbench/awt/models.py

@@ -184,9 +184,7 @@ def test_values_and_attributes(self):
         response = self.client.get(deal.urls["update"])
         self.assertContains(
             response,
-            '<input class="form-check-input" type="radio" name="attribute_{g}" value="{a}" class="my-2" required id="id_attribute_{g}_0" checked>'.format(
-                g=attribute1_1.group_id, a=attribute1_1.id
-            ),
+            f'<input class="form-check-input" type="radio" name="attribute_{attribute1_1.group_id}" value="{attribute1_1.id}" class="my-2" required id="id_attribute_{attribute1_1.group_id}_0" checked>',
             html=True,
         )
 

workbench/deals/test_deals.py

@@ -42,11 +42,7 @@ class Meta:
         verbose_name_plural = _("expense reports")
 
     def __str__(self):
-        return "{}, {}, {}".format(
-            self.owned_by.get_full_name(),
-            local_date_format(self.created_at.date()),
-            currency(self.total),
-        )
+        return f"{self.owned_by.get_full_name()}, {local_date_format(self.created_at.date())}, {currency(self.total)}"
 
     def save(self, *args, **kwargs):
         if self.pk:

workbench/expenses/models.py

@@ -68,12 +68,7 @@ def get(self, request, *args, **kwargs):
                     (
                         "%d." % (next(counter),),
                         MarkupParagraph(
-                            "{}<br />{}: {}<br />{}<br />&nbsp;".format(
-                                local_date_format(cost.rendered_on),
-                                cost.service.project,
-                                cost.service,
-                                cost.description,
-                            ),
+                            f"{local_date_format(cost.rendered_on)}<br />{cost.service.project}: {cost.service}<br />{cost.description}<br />&nbsp;",
                             pdf.style.normal,
                         ),
                         currency(cost.third_party_costs)

workbench/expenses/views.py

@@ -43,11 +43,7 @@ def get_template_names(self):
         if self.template_name is not None:
             return [self.template_name]
         return [
-            "{}/{}{}.html".format(
-                self.model._meta.app_label,
-                self.model._meta.object_name.lower(),
-                self.template_name_suffix,
-            ),
+            f"{self.model._meta.app_label}/{self.model._meta.object_name.lower()}{self.template_name_suffix}.html",
             "generic/object%s.html" % self.template_name_suffix,
         ]
 

workbench/generic.py

@@ -750,8 +750,8 @@ def test_change_paid_invoice(self):
         self.assertContains(
             response,
             "You are attempting to set status to 'In preparation',"
-            " but the invoice has already been closed on {}."
-            " Are you sure?".format(local_date_format(dt.date.today())),
+            f" but the invoice has already been closed on {local_date_format(dt.date.today())}."
+            " Are you sure?",
         )
 
         response = self.client.post(

workbench/invoices/test_invoices.py

@@ -197,9 +197,8 @@ def test_log_and_create_service(self):
         )
         self.assertContains(
             response,
-            '<a href="{}#service{}">service title: service description' "</a>".format(
-                project.get_absolute_url(), entry.service.id
-            ),
+            f'<a href="{project.get_absolute_url()}#service{entry.service.id}">service title: service description'
+            "</a>",
         )
 
     def test_log_and_create_service_with_flat_rate(self):
@@ -361,9 +360,9 @@ def test_update_old_disabled_fields(self):
         )
         self.assertContains(
             response,
-            '<input type="date" name="modal-rendered_on" value="{}"'
+            f'<input type="date" name="modal-rendered_on" value="{hours.rendered_on.isoformat()}"'
             ' class="form-control" required disabled id="id_modal-rendered_on">'
-            "".format(hours.rendered_on.isoformat()),
+            "",
             html=True,
         )
 

workbench/logbook/test_logbook.py

@@ -44,12 +44,7 @@ class Meta:
         verbose_name_plural = _("notes")
 
     def __str__(self):
-        return "{} - {} {} - {}".format(
-            self.title,
-            self.content_type.name,
-            self.object_id,
-            self.created_by.get_short_name(),
-        )
+        return f"{self.title} - {self.content_type.name} {self.object_id} - {self.created_by.get_short_name()}"
 
     def get_absolute_url(self):
         model = self.content_type.model_class()

workbench/notes/models.py

@@ -112,10 +112,7 @@ def clean_fields(self, exclude=None):
 
     @property
     def pretty_from_until(self):
-        return "{} – {}".format(
-            local_date_format(min(self.weeks)),
-            local_date_format(max(self.weeks) + dt.timedelta(days=6)),
-        )
+        return f"{local_date_format(min(self.weeks))} – {local_date_format(max(self.weeks) + dt.timedelta(days=6))}"
 
     @property
     def ranges(self):
@@ -135,10 +132,7 @@ def _find_ranges(weeks):
             yield {
                 "from": from_,
                 "until": until_,
-                "pretty": "{} – {}".format(
-                    local_date_format(from_),
-                    local_date_format(until_ + dt.timedelta(days=6)),
-                ),
+                "pretty": f"{local_date_format(from_)} – {local_date_format(until_ + dt.timedelta(days=6))}",
             }
 
     @property

workbench/planning/models.py

@@ -39,9 +39,7 @@ def test_labor_costs(self):
         self.assertEqual(response.status_code, 200)
 
         response = self.client.get(
-            "/report/labor-costs/?cost_center={}".format(
-                factories.CostCenterFactory.create().pk
-            )
+            f"/report/labor-costs/?cost_center={factories.CostCenterFactory.create().pk}"
         )
         self.assertEqual(response.status_code, 200)
 

workbench/reporting/test_reporting.py

@@ -13,20 +13,16 @@ function doSubmit(el) {
 }
 
 $(() => {
-  const gettext =
-    window.gettext ||
-    function (t) {
-      return t
-    }
+  const gettext = window.gettext || ((t) => t)
 
   // AJAX modals
-  const dismissModals = function () {
+  const dismissModals = () => {
     // LOL, dismiss.
     $(".modal, .modal-backdrop").remove()
     $(document.body).removeClass("modal-open").removeAttr("style")
   }
 
-  const initModal = function (data) {
+  const initModal = (data) => {
     dismissModals()
 
     const $data = $(data)
@@ -48,7 +44,7 @@ $(() => {
   }
 
   window.initModal = initModal
-  window.openModalFromUrl = function (url) {
+  window.openModalFromUrl = (url) => {
     $.ajax({
       url,
       success(data) {
@@ -124,7 +120,7 @@ $(() => {
 
     const fd = new FormData(form)
     let params = new URLSearchParams()
-    for (let part of fd) {
+    for (const part of fd) {
       if (part[1]) params.append(part[0], part[1])
     }
     params.sort()
@@ -146,12 +142,11 @@ $(() => {
     // Calling debounce returns a new anonymous function
     return function () {
       // reference the context and args for the setTimeout function
-      let context = this,
-        args = arguments
+      const args = arguments
 
       // Should the function be called now? If immediate is true
       //   and not already in a timeout then the answer is: Yes
-      let callNow = immediate && !timeout
+      const callNow = immediate && !timeout
 
       // This is the basic debounce behaviour where you can call this
       //   function several times, but it will only execute once
@@ -170,12 +165,12 @@ $(() => {
           // Call the original function with apply
           // apply lets you define the 'this' object as well as the arguments
           //    (both captured before setTimeout)
-          func.apply(context, args)
+          func.apply(this, args)
         }
       }, wait)
 
       // Immediate mode and no wait timer? Execute the function..
-      if (callNow) func.apply(context, args)
+      if (callNow) func.apply(this, args)
     }
   }
 
@@ -304,17 +299,17 @@ $(() => {
   $(document.body).on("click", "[data-hours-button]", function () {
     this.blur()
     const value = prompt(this.dataset.hoursButton)
-    if (parseFloat(value)) {
+    if (Number.parseFloat(value)) {
       $("#id_modal-days")
-        .val((parseFloat(value) / 8).toFixed(2))
+        .val((Number.parseFloat(value) / 8).toFixed(2))
         .focus()
     }
   })
 
   $(document.body).on("click", "[data-multiply-cost]", function (e) {
     e.preventDefault()
-    const factor = parseFloat(this.dataset.multiplyCost),
-      tpc = parseFloat($("#id_modal-third_party_costs").val()),
+    const factor = Number.parseFloat(this.dataset.multiplyCost),
+      tpc = Number.parseFloat($("#id_modal-third_party_costs").val()),
       cost = $("#id_modal-cost")
 
     if (tpc && factor) {
@@ -467,7 +462,7 @@ function initWidgets() {
     // const form = $(this)
     //
     const read = (sel, root = document) =>
-      parseFloat(root.querySelector(sel).value) || 0
+      Number.parseFloat(root.querySelector(sel).value) || 0
     const write = (sel, value, root = document) =>
       (root.querySelector(sel).value = value.toFixed(2))
 
@@ -506,7 +501,7 @@ function initWidgets() {
 
 window.addInlineForm = function addInlineForm(slug, onComplete) {
   const totalForms = $(`#id_${slug}-TOTAL_FORMS`),
-    newId = parseInt(totalForms.val(), 10) || 0
+    newId = Number.parseInt(totalForms.val(), 10) || 0
 
   totalForms.val(newId + 1)
   const empty = $(`#${slug}-empty`),

workbench/static/workbench/workbench.js

@@ -85,8 +85,8 @@ def test_deleted(self):
         response = self.client.get(f"/history/contacts_person/id/{person.pk}/")
         self.assertContains(
             response,
-            '<a href="/history/contacts_organization/id/{}/" data-toggle="ajaxmodal">'
-            "Deleted organization instance</a>".format(pk),
+            f'<a href="/history/contacts_organization/id/{pk}/" data-toggle="ajaxmodal">'
+            "Deleted organization instance</a>",
         )
 
         response = self.client.get(f"/history/contacts_organization/id/{pk}/")
@@ -291,9 +291,7 @@ def test_deal_visibility(self):
     def test_costcenter_visibility(self):
         """Cost centers are invisible without LABOR_COSTS"""
         self.client.force_login(factories.UserFactory.create())
-        url = "/history/reporting_costcenter/id/{}/".format(
-            factories.CostCenterFactory.create().pk
-        )
+        url = f"/history/reporting_costcenter/id/{factories.CostCenterFactory.create().pk}/"
         self.assert_404_without_feature(url, feature=FEATURES.LABOR_COSTS)
 
     def test_everything(self):

workbench/test_history.py

@@ -69,8 +69,8 @@ def test_deletion(self):
         self.assertEqual(
             messages(response),
             [
-                "Cannot delete '{}' because of related objects (Any service: Bla)."
-                "".format(project)
+                f"Cannot delete '{project}' because of related objects (Any service: Bla)."
+                ""
             ],
         )
 

workbench/test_tools.py

@@ -322,11 +322,7 @@ def services_row_with_details(self, service):
                                 None,
                                 [
                                     (
-                                        "{} {} à {}/h".format(
-                                            hours(service.effort_hours),
-                                            service.effort_type,
-                                            currency(service.effort_rate),
-                                        )
+                                        f"{hours(service.effort_hours)} {service.effort_type} à {currency(service.effort_rate)}/h"
                                     )
                                     if service.effort_hours and service.effort_rate
                                     else "",

workbench/tools/pdf.py

@@ -35,9 +35,7 @@ def person_to_vcard(person):
             attr.value = vcard.Address(street=address.postal_address_override)
         else:
             attr.value = vcard.Address(
-                street="{} {}\n{}".format(
-                    address.street, address.house_number, address.address_suffix
-                ),
+                street=f"{address.street} {address.house_number}\n{address.address_suffix}",
                 code=address.postal_code,
                 city=address.city,
                 country=address.country.name,