Skip to content

merge stage into main#113

Merged
aditya-arcot merged 7 commits intomainfrom
stage
Mar 28, 2026
Merged

merge stage into main#113
aditya-arcot merged 7 commits intomainfrom
stage

Conversation

@aditya-arcot
Copy link
Copy Markdown
Member

No description provided.

@github-advanced-security
Copy link
Copy Markdown

You are seeing this message because GitHub Code Scanning has recently been set up for this repository, or this pull request contains the workflow file for the Code Scanning tool.

What Enabling Code Scanning Means:

  • The 'Security' tab will display more code scanning analysis results (e.g., for the default branch).
  • Depending on your configuration and choice of analysis tool, future pull requests will be annotated with code scanning analysis results.
  • You will be able to see the analysis results for the pull request's branch on this overview once the scans have completed and the checks have passed.

For more information about GitHub Code Scanning, check out the documentation.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR merges changes from stage into main, primarily updating exercise behavior across the backend (DB + services + tests) and frontend (table + dialog) while improving search indexing correctness.

Changes:

  • Make exercises.name case-insensitive at the DB level (Postgres CITEXT) and update conflict tests accordingly.
  • Adjust exercise querying/ordering and ensure updated_at changes when only muscle groups are modified.
  • Add “view” mode for system exercises in the client and extend the shared DataTable column meta to support responsive header/cell classes; ensure Meilisearch settings updates complete before document indexing.

Reviewed changes

Copilot reviewed 16 out of 16 changed files in this pull request and generated 3 comments.

Show a summary per file
File Description
server/app/tests/services/search/test_reindex.py Update search reindex test fakes to match task-id return values.
server/app/tests/services/exercise/test_update_exercise.py Add coverage for muscle-group-only updates; update name-conflict case-insensitive expectation.
server/app/tests/services/exercise/test_get_exercises.py Update ordering expectations to “custom first, then system” ordering.
server/app/tests/services/exercise/test_create_exercise.py Update name-conflict test to validate case-insensitive uniqueness.
server/app/tests/services/_utilities/queries/test_query_exercises.py Update ordering test to include system + user exercises and verify ordering grouping.
server/app/tests/api/exercise/test_update_exercise.py Update API name-conflict test to validate case-insensitive uniqueness.
server/app/tests/api/exercise/test_create_exercise.py Update API name-conflict test and document the case-insensitive expectation.
server/app/services/utilities/queries.py Change exercise ordering to prioritize custom exercises before system exercises.
server/app/services/search.py Wait for Meilisearch settings tasks to complete before adding documents.
server/app/services/exercise.py Manually bump updated_at when only muscle group relationships change.
server/app/models/database/exercise.py Change Exercise.name column type to CITEXT for case-insensitive behavior.
server/app/migrations/versions/2026_03_27_2337-e87490ac7ad5_change_exercise_name_to_case_insensitive.py Add Alembic migration to create citext extension and alter the name column type.
client/src/components/exercises/ExercisesTable.tsx Add system-exercise “view” action; adjust column rendering and responsive behavior.
client/src/components/exercises/ExerciseFormDialog.tsx Add “view” mode with read-only rendering and move “Last Updated” display into the dialog.
client/src/components/data-table/DataTableViewOptions.tsx Export DataTableColumnMeta and add header/cell class hooks.
client/src/components/data-table/DataTable.tsx Apply headerClassName/cellClassName from column meta when rendering.

@aditya-arcot aditya-arcot merged commit e8cd004 into main Mar 28, 2026
19 of 20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants