Skip to content

Y24-368-392 BGE blending #2318

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

Open
wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

Conversation

andrewsparkes
Copy link
Member

Closes ##1981, #1997

Changes proposed in this pull request

Adds BGE Blending step

Copy link

codecov bot commented Apr 11, 2025

Codecov Report

Attention: Patch coverage is 94.46429% with 31 lines in your changes missing coverage. Please review.

Project coverage is 81.46%. Comparing base (cf51618) to head (5b17629).

Files with missing lines Patch % Lines
...cript/blended-tube/components/PairTubesToBlend.vue 93.07% 23 Missing ⚠️
...javascript/blended-tube/components/BlendedTube.vue 95.31% 6 Missing ⚠️
app/models/labware_creators/blended_tube.rb 95.23% 2 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #2318      +/-   ##
===========================================
+ Coverage    81.07%   81.46%   +0.38%     
===========================================
  Files          476      480       +4     
  Lines        18231    18777     +546     
  Branches       269      353      +84     
===========================================
+ Hits         14781    15296     +515     
- Misses        3448     3479      +31     
  Partials         2        2              
Flag Coverage Δ
javascript 75.09% <94.37%> (+0.86%) ⬆️
pull_request 81.46% <94.46%> (?)
push 81.46% <94.46%> (+0.38%) ⬆️
ruby 91.97% <95.45%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@andrewsparkes andrewsparkes requested a review from Copilot April 15, 2025 10:23
Copy link

@Copilot 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.

Copilot reviewed 25 out of 25 changed files in this pull request and generated 1 comment.

@@ -93,10 +94,14 @@ const elements = [
userIdRequired: true,
},
{
id: 'pool-xp-tube-submit-panel',
component: PoolXPTubeSubmitPanel,
id: 'blended-tube-page',
Copy link
Preview

Copilot AI Apr 15, 2025

Choose a reason for hiding this comment

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

Duplicate registration for element id 'blended-tube-page' detected in vue_app.js. Consider removing the duplicate to prevent potential rendering conflicts.

Copilot is powered by AI, so mistakes are possible. Review output carefully before use.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, looks like blended-tube-page is registered twice here.

Copy link
Contributor

@BenTopping BenTopping left a comment

Choose a reason for hiding this comment

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

Good piece of work, fairly massive PR so it will probably need another pass over. I haven't pulled down and tested yet.

} else {
this.$set(this, 'isPairingValid', false), this.$set(this, 'parentTubes', [])
}
this.valid
Copy link
Contributor

Choose a reason for hiding this comment

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

Can this line be removed?

this.progressMessage = 'Creating blended tube...'
this.loading = true

console.log('this.parentTubes:')
Copy link
Contributor

Choose a reason for hiding this comment

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

Can remove these console logs

},
methods: {
updateTubePair(data) {
if (data.state === 'valid') {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you can remove the use of this.$set in this method, I don't think it should be needed, e.g. can do this.isPairingValid = true should be enough for Vue here.

return sampleIds
},
validatedTubes() {
if (!this.areBothTubesScanned) {
Copy link
Contributor

Choose a reason for hiding this comment

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

This function can be simplified to return this.areBothTubesScanned && this.areBothTubesValid


const ancestors = wrapper.vm.findAncestors()

expect(ancestors).toEqual([
Copy link
Contributor

Choose a reason for hiding this comment

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

Should there be an error message check here too?

</div>
</b-row>
</b-container>
<b-card bg-variant="white" text-variant="black" :header="headerSummary" header-tag="h5">
Copy link
Contributor

Choose a reason for hiding this comment

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

I think you can change header here to header="Summary for this pairing:" and remove the function on line 217 as it doesn't need to be computed because its value should never change.

Copy link
Contributor

Choose a reason for hiding this comment

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

Nice change, definitely better to be specific 👍

@@ -93,10 +94,14 @@ const elements = [
userIdRequired: true,
},
{
id: 'pool-xp-tube-submit-panel',
component: PoolXPTubeSubmitPanel,
id: 'blended-tube-page',
Copy link
Contributor

Choose a reason for hiding this comment

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

Yes, looks like blended-tube-page is registered twice here.

@@ -133,7 +133,7 @@ def expect_specific_tube_creation
specific_tubes_attributes.map do |attrs|
{
child_purpose_uuids: [attrs[:uuid]] * attrs[:child_tubes].size,
parent_uuids: [parent_uuid],
parent_uuids: attrs[:parent_uuids],
Copy link
Contributor

Choose a reason for hiding this comment

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

Guessing this was broken before?

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