Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix timetracking table colums #7803

Merged
merged 6 commits into from
May 15, 2024
Merged

Conversation

MichaelBuessemeyer
Copy link
Contributor

@MichaelBuessemeyer MichaelBuessemeyer commented May 15, 2024

This PR fixes the timetracking columns not being rendered by two angles:

  1. Refactor the columns into an array of objects and pass this to the FixedExpandableTable, which is the new way of how to write columns for antd table.
  2. Fix the FixedExpandableTable to still work with columns being passed as children. In the previous version, it always had an array of empty column props which likely took precedence of the passed children column props to FixedExpandableTable and thus the children column props were ignored and 0 columns were rendered instead.

URL of deployed dev instance (used for testing):

  • https://___.webknossos.xyz

Steps to test:

  • Do some tracing
  • Open the time tracking view. It should render all expected columns

TODOs:

  • Check whether point 2. is acutally fixed by this PR.

Issues:

  • No issue exists for this

(Please delete unneeded items, merge only when none are left open)

Copy link
Contributor

@dieknolle3333 dieknolle3333 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the code looks good to me, I only have two minor comments. feel free to resolve them if you think the fixes are unnecessary. thanks for looking into this!

CHANGELOG.unreleased.md Show resolved Hide resolved
@MichaelBuessemeyer MichaelBuessemeyer merged commit 5ea9ee6 into master May 15, 2024
2 checks passed
@MichaelBuessemeyer MichaelBuessemeyer deleted the fix-timetracking-table branch May 15, 2024 11:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants