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

LIMS-1430: Fix bugs on prepare for data collection page #829

Conversation

ndg63276
Copy link
Collaborator

JIRA ticket: LIMS-1430

Summary:

The (VMXi) "Prepare for data collection" page needs a number of bugfixes and improvements.

Changes:

  • Allow queueing the container even if all data collections are currently hidden due to filters
  • Show/hide relevant controls so that no refresh is needed after queueing or unqueueing the container. This exposed a number of bugs:
    • Fix bug where couldn't remove sample that wasn't currently displayed in the Available Samples section
    • Fix bug where unqueueing container removed all data collections until refresh
  • Fix bug where filtering on the available samples affected the filtering of data collections
  • Fix bug where invalid data collections could be queued if they were filtered
  • Show number of added data collections next to the Queue Container button
  • Show successful messages in green not red
  • Fix typo from loose to lose

To test:

  • Go to a plate on a test proposal, eg /containers/queue/309228.
  • Try to Queue Container when there are no data collections in the Queued Samples area, check it refuses.
  • Add an "Auto" subsample from the Available Samples area, check the plus button next to it disappears.
  • Leave the parameters unfilled, try to Queue Container, check it refuses.
  • Fill in the parameters, click Queue Container, check "Container Queued Successfully" message appears in green not red.
  • Now check Unqueue button has appeared at the top, the plus buttons next to the Available Samples have disappeared, the Copy/Save/Unqueue buttons in the Queued Samples area have been replaced by a View Sample button, and the Queue Container button has disappeared.
  • Refresh the page, check the container is still queued, and the list of Queued Samples still shows the same one.
  • Unqueue the container, check the list of Queued Samples still shows the same one.
  • Add a "Manual" subsample from the Available Samples area, but leave the parameters unfilled. Click the "Auto" filter on the Queued Samples area, so that the invalid sample is hidden. Try to queue the container, check it refuses.
  • Check next to the Queued Container button it says "(2 data collections)", even if some are filtered.
  • Clear the "Auto" filter on the Queued Samples area, but turn on the "Auto" filter on the Available Samples area. Check you can Unqueue the "manual" sample and it disappears from the Queued Samples area.
  • Change the filter on the Available Samples area to "Manual", and re-add the "manual" sample. Turn on the "Auto" filter on the Queued Samples area. Press the Unqueue all button, check all the samples disappear from the Queued Samples area.

Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
@ndg63276 ndg63276 changed the base branch from master to pre-release/2024-R4.4 October 1, 2024 09:53
@ndg63276 ndg63276 merged commit edb2fca into pre-release/2024-R4.4 Oct 1, 2024
2 checks passed
ndg63276 added a commit that referenced this pull request Oct 22, 2024
* LIMS-1003: Fix searching of container inspections (#825)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-380: Fix position of autoPROC images (#831)

* LIMS-380: Fix position of autoPROC images

* LIMS-380: Just use iframe size of 98%

* Set width/height to percentage value (#838)

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>

* LIMS-1430: Fix bugs on prepare for data collection page (#829)

* LIMS-1430: Allow queuing even if no visible samples

* LIMS-1430: Show number of samples to queue

* LIMS-1430: Watch all subsamples for changes

* LIMS-1430: Remove TODO list

* LIMS-1430: Display number is of data collections, not samples

* LIMS-1430: Dont allow queueing if hidden data collections are invalid

* Update client/src/js/modules/imaging/views/queuecontainer.js

Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>

* LIMS-1390: Fix searching of data collection groups (#833)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1286: Show ERA status on calendar and visits list (#834)

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>

* LIMS-1354: Migrate from ActiveMQ to RabbitMQ (#826)

* LIMS-1354: Migrate from ActiveMQ to RabbitMQ

* Unwrap try...catch

* Add routing_key and vhost

* Add polyfill for BCMath as php-bcmath extension is not installed but required by php-amqplib for AMQP

---------

Co-authored-by: Mark Williams <mark.williams@diamond.ac.uk>
Co-authored-by: Guilherme Francisco <guilherme.de-freitas@diamond.ac.uk>
Co-authored-by: James Hall <41731916+JPHall-DLS@users.noreply.github.com>
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.

2 participants