Skip to content

Conversation

jdbocarsly
Copy link
Member

@jdbocarsly jdbocarsly commented Jan 8, 2024

This PR adds a new equipment type, which can be used for laboratory instruments or other equipment. For now, it behaves like any other item and supports all the blocks supported by samples or cells. It is envisioned that comment blocks, media blocks, and attached files can be used to store maintenace information, manuals, usage logs, etc.

In the future, some more advanced dashboard features, linking to filesystems, etc. would be nice.

  • Add equipment model
  • Add routes for equipment
  • Frontend modal to add new equipment
  • Make frontend table for equipment (traditional)
  • [ ] Make frontend table for equipment (fancy) (defer to future PR)
  • Make simple item page for equipment
  • [ ] Make it possible to link individual measurements to equipment (defer to future PR)

Space is present in the frontend for maintainers and collections to be listed, but these are currently not implemented.

In addition, this PR also contains some bug fixes and some tinymce fixes to prepare for more free-form linking #565.

@jdbocarsly jdbocarsly requested a review from ml-evs as a code owner January 8, 2024 06:17
@jdbocarsly jdbocarsly marked this pull request as draft January 8, 2024 06:17
@jdbocarsly jdbocarsly changed the title Add "equipment" item type [DRAFT] Add "equipment" item type Jan 8, 2024
Copy link

cypress bot commented Jan 8, 2024

Passing run #1401 ↗︎

0 40 0 0 Flakiness 0

Details:

Merge 770741b into b90743d...
Project: datalab Commit: 9aa4aa0262 ℹ️
Status: Passed Duration: 02:11 💡
Started: Apr 1, 2024 6:41 PM Ended: Apr 1, 2024 6:44 PM

Review all test suite changes for PR #531 ↗︎

@jdbocarsly jdbocarsly force-pushed the jdb/add-equipment branch 3 times, most recently from e82593e to c494426 Compare February 7, 2024 06:28
@ml-evs ml-evs added the enhancement New feature or request label Feb 13, 2024
Copy link
Member

@ml-evs ml-evs left a comment

Choose a reason for hiding this comment

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

Couple of minor comments

@jdbocarsly jdbocarsly force-pushed the jdb/add-equipment branch 3 times, most recently from da343ed to 86563af Compare March 25, 2024 22:44
@jdbocarsly jdbocarsly changed the title [DRAFT] Add "equipment" item type Add "equipment" item type Mar 25, 2024
@jdbocarsly jdbocarsly marked this pull request as ready for review March 25, 2024 22:54
@jdbocarsly jdbocarsly requested a review from ml-evs March 25, 2024 22:55
Copy link
Member

@ml-evs ml-evs left a comment

Choose a reason for hiding this comment

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

Code wise, this is looking great!

Dare I suggest adding some API and e2e tests? 😅

I guess the large outstanding thing to discuss is how to capture the relationships between equipment and items (and blocks) which I know has been started in #565

@jdbocarsly
Copy link
Member Author

Dare I suggest adding some API and e2e tests? 😅

How dare you

Copy link

codecov bot commented Mar 28, 2024

Codecov Report

Attention: Patch coverage is 96.15385% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 66.45%. Comparing base (b90743d) to head (770741b).

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #531      +/-   ##
==========================================
+ Coverage   66.25%   66.45%   +0.19%     
==========================================
  Files          60       61       +1     
  Lines        3586     3610      +24     
==========================================
+ Hits         2376     2399      +23     
- Misses       1210     1211       +1     
Files Coverage Δ
pydatalab/pydatalab/models/__init__.py 100.00% <100.00%> (ø)
pydatalab/pydatalab/models/equipment.py 100.00% <100.00%> (ø)
pydatalab/pydatalab/routes/v0_1/items.py 81.46% <90.90%> (+0.34%) ⬆️

@jdbocarsly jdbocarsly force-pushed the jdb/add-equipment branch 3 times, most recently from a60a11e to a65162f Compare March 29, 2024 04:03
@jdbocarsly jdbocarsly requested a review from ml-evs March 29, 2024 04:16
@jdbocarsly jdbocarsly requested a review from ml-evs April 1, 2024 18:46
Copy link
Member

@ml-evs ml-evs left a comment

Choose a reason for hiding this comment

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

🎸

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants