Skip to content

feature/combine pd and 2de - super awesome PR #40

Merged
ShreyesGadwalkar merged 25 commits into
mainfrom
feature/combine-pd-and-2de
Mar 20, 2026
Merged

feature/combine pd and 2de - super awesome PR #40
ShreyesGadwalkar merged 25 commits into
mainfrom
feature/combine-pd-and-2de

Conversation

@ShreyesGadwalkar
Copy link
Copy Markdown
Collaborator

Combined 2DE and proteolytic digestion. Changed architecture for 2DE into different files.

Copy link
Copy Markdown
Collaborator Author

@ShreyesGadwalkar ShreyesGadwalkar left a comment

Choose a reason for hiding this comment

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

env.ts changes - need opinion on this.

Comment thread frontend/jbio-app/src/config/env.ts
Comment thread frontend/jbio-app/src/config/env.ts Outdated
Comment thread frontend/jbio-app/src/pages/PeptideRetention.tsx Outdated
Comment thread frontend/jbio-app/src/pages/PeptideRetention.tsx Outdated
Copy link
Copy Markdown
Collaborator Author

@ShreyesGadwalkar ShreyesGadwalkar left a comment

Choose a reason for hiding this comment

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

done

@ZythiQ ZythiQ added the enhancement New feature or request label Mar 19, 2026
@ZythiQ ZythiQ self-requested a review March 19, 2026 20:42
ZythiQ
ZythiQ previously approved these changes Mar 19, 2026
Copy link
Copy Markdown
Collaborator

@ZythiQ ZythiQ left a comment

Choose a reason for hiding this comment

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

LGTM - Seems like Luke's requested changes were made - thanks for catching that.

@ZythiQ ZythiQ dismissed ldk7811’s stale review March 19, 2026 20:43

The changes were reverted - LGTM and we're short on time.

@ldk7811
Copy link
Copy Markdown
Collaborator

ldk7811 commented Mar 19, 2026

This still regresses the peptide retention, I cannot approve it.

ldk7811
ldk7811 previously approved these changes Mar 20, 2026
Copy link
Copy Markdown
Collaborator

@ldk7811 ldk7811 left a comment

Choose a reason for hiding this comment

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

I added back in basic zoom in and out for this PR, but this is not complete.

@ShreyesGadwalkar
Copy link
Copy Markdown
Collaborator Author

I added back in basic zoom in and out for this PR, but this is not complete.

I'm gonna copy and paste the peptide retention from the main branch

Copy link
Copy Markdown
Collaborator

@ldk7811 ldk7811 left a comment

Choose a reason for hiding this comment

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

Revert the copy commit. This breaks importing the data from 2de. We can always point the next team to a working commit of the zoom.

@ShreyesGadwalkar
Copy link
Copy Markdown
Collaborator Author

ShreyesGadwalkar commented Mar 20, 2026

Revert the copy commit. This breaks importing the data from 2de. We can always point the next team to a working commit of the zoom.

hold on one second, I'm getting confused. What do I do? Do I revert peptide retention to what it was? I don't know what the copy commit you're referring to is.

@ldk7811
Copy link
Copy Markdown
Collaborator

ldk7811 commented Mar 20, 2026

you free to hop on a call for a sec?

@ZythiQ
Copy link
Copy Markdown
Collaborator

ZythiQ commented Mar 20, 2026

@ldk7811 It is identical to main. Yesterday you told me it was fine on production, so this should not be functionally different
image

ZythiQ
ZythiQ previously approved these changes Mar 20, 2026
Copy link
Copy Markdown
Collaborator

@ZythiQ ZythiQ left a comment

Choose a reason for hiding this comment

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

I see no functional differences to peptide retention (if there was a reversion, it was not in this PR).

@ShreyesGadwalkar ShreyesGadwalkar removed the request for review from ldk7811 March 20, 2026 16:27
@ShreyesGadwalkar ShreyesGadwalkar dismissed ldk7811’s stale review March 20, 2026 16:27

Done - file has no changes from main

@ShreyesGadwalkar ShreyesGadwalkar merged commit 37af5cd into main Mar 20, 2026
6 checks passed
@ShreyesGadwalkar ShreyesGadwalkar deleted the feature/combine-pd-and-2de branch March 20, 2026 16:30
@ldk7811
Copy link
Copy Markdown
Collaborator

ldk7811 commented Mar 20, 2026

I said it was fine prior to copying data over from main. By copying the peptide retention from main, we now no longer have features specifically from this branch. Namely, you can no longer export proteins to proteolytic digestion. Had it been merged, I would have been annoyed, but zoom could be added back in with relative ease.

Please test next time before approving. The feature does not work.

@ShreyesGadwalkar
Copy link
Copy Markdown
Collaborator Author

ShreyesGadwalkar commented Mar 20, 2026

I said it was fine prior to copying data over from main. By copying the peptide retention from main, we now no longer have features specifically from this branch. Namely, you can no longer export proteins to proteolytic digestion. Had it been merged, I would have been annoyed, but zoom could be added back in with relative ease.

Please test next time before approving. The feature does not work.

okay here's what im gonna do next. I'll just have the peptide retention I had in this branch over and open another PR. I was confused by the back and forth.

SabrePenguin pushed a commit that referenced this pull request Apr 2, 2026
* changed acrylamide slider to be a dropdown

* transition added

* button sizing fixed

* added prteolyic Digetion to 2de

* starting to integrate jacobs stuff

* started pde on this branch

* popup UI for pd now works

* integrated digestion

* font color for grid changed to white

* done till next wednesday

* added photo

* pushed env mistake and removed magic nums

* loader added

* Re-add basic zoom

* pulled peptide retention from main

* whitespace push

* No changes.

* No changes 2x.

* final

---------

Co-authored-by: jacob-fay <71296174+jacob-fay@users.noreply.github.com>
Co-authored-by: Zach Van Horn <zvanhorn10@gmail.com>
Co-authored-by: Luke Knofczynski <ldk7811@rit.edu>
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.

7 participants