Skip to content

Advanced search #15

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.

Sign up for GitHub

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

Jump to bottom
Draft
wants to merge 28 commits into
base: master
Choose a base branch
from
Draft

Advanced search #15

wants to merge 28 commits into from

Conversation

jmedinaebi
Copy link

Advance search with pagination

jmedinaebi
jmedinaebi commented Mar 31, 2025
View reviewed changes
EliotRagueneau and others added 9 commits April 1, 2025 19:12
@EliotRagueneau
🐛 Avoid failing color query if too many taxids
650d578
@susiehgt
Merge pull request #16 from EBI-IntAct/fix/taxid-414
9a0f396 
🐛 Avoid failing color query if too many taxids
@susiehgt
NOT FINISHED:
264e9da 
- adding of the rulesets and the synchronisation with the query;
@susiehgt
NOT FINISHED:
e3079f2 
- synchronisation between typed in query and comboboxes; still 2 bugs to fix
@susiehgt
NOT FINISHED:
760d34b 
- "in" and "not in" better detected but duplication happens when in a ruleset
- adding of display elements ([TO] for the ranges)
@susiehgt
query to builder and builder to query OK
7047b88
@susiehgt
Implementation in Cytoscape OK;
feac79f 
Deletion of subpanels OK;
@susiehgt
Fixing of the AND and OR update from query;
f478b00 
Coloring of the text input;
Adding of tests;
@susiehgt
Bug fix: queryTextField not working when added to cytoscape;
2c92c90
jmedinaebi
jmedinaebi commented Apr 17, 2025
View reviewed changes
@susiehgt
Positive interactions selected by default (and negative by default in…
f68a599 
… case of no positives);

Fetching on dev server;
Modification of advanced search display;
jmedinaebi
jmedinaebi commented Apr 29, 2025
View reviewed changes
Copy link
Author

@jmedinaebi jmedinaebi left a comment

Choose a reason for hiding this comment

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

Just a few comments to clean up things a bit.

src/main/java/uk/ac/ebi/intact/app/internal/ui/panels/filters/ToggleFilterPanel.java
boolean isTherePositiveInteractions = ((EdgePositiveFilter) filter).areTheyPositiveInteractions();

negativeButton.setSelected(isThereNegativeInteractions && !isTherePositiveInteractions);
positiveButton.setSelected(isTherePositiveInteractions);
Copy link
Author

Choose a reason for hiding this comment

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

We don't set the bothButton here, should we?

Copy link
Author

Choose a reason for hiding this comment

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

I think I understand what's happening here. To make it more clear, we could do

// First we set all 3 buttons as not selected
positiveButton.setSelected(false);
negativeButton.setSelected(false);
bothButton.setSelected(false);

// Then, if there are positive interactions, we set the positive button as default.
// If not, and there are negative interactions, we set the negative button as default.
if (((EdgePositiveFilter) filter).areTheyPositiveInteractions()) {
    positiveButton.setSelected(true);
} else if (((EdgePositiveFilter) filter).areTheyNegativeInteractions()) {
    negativeButton.setSelected(true);
}

Copy link
Author

Choose a reason for hiding this comment

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

Actually, we do this after calling setButtonsEnabled(), so maybe it's even simpler. We can simply do

    @Override
    protected void updateFilterUI(BooleanFilter<T> filter) {
        label.setText(filter.description);
        setButtonsEnabled();

        positiveButton.setSelected(false);
        negativeButton.setSelected(false);
        bothButton.setSelected(false);

        if (positiveButton.isEnabled()) {
            positiveButton.setSelected(true);
        } else if (negativeButton.isEnabled()) {
            negativeButton.setSelected(true);
        }
    }

src/main/java/uk/ac/ebi/intact/app/internal/ui/panels/filters/ToggleFilterPanel.java Outdated
boolean shouldEnableFilter = showPositive || showNegative;
filter.setStatus(shouldEnableFilter);

positiveButton.setSelected(false);
Copy link
Author

Choose a reason for hiding this comment

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

Why do we set all 3 buttons here selected as false?

Copy link
Author

Choose a reason for hiding this comment

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

I think I understand, we set all 3 buttons as unselected, and then the button that was clicked gets set as selected as part of addActionListener. Is that right?

jmedinaebi
jmedinaebi commented May 12, 2025
View reviewed changes
src/main/java/uk/ac/ebi/intact/app/internal/io/HttpUtils.java
.uri(URI.create(url))
.POST(HttpRequest.BodyPublishers.ofString(mapper.writeValueAsString(body)))
Copy link
Author

Choose a reason for hiding this comment

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

I created a new endpoint in the GraphDB-WS, and it is deployed now. Endpoints is to replace network/data with a proper request body. It is named network/fromInteractors to be consistent with the other one.

I haven't tested this, so we should test it before this is merged.

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

@EliotRagueneau EliotRagueneau EliotRagueneau left review comments

@susiehgt susiehgt susiehgt left review comments

Assignees

@susiehgt susiehgt

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jmedinaebi @EliotRagueneau @susiehgt