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.

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

LHS search by substring match to shortcode, compound ID and/or alias #1563

Open
Tracked by #1371
mwinokan opened this issue Nov 6, 2024 · 12 comments
Open
Tracked by #1371

LHS search by substring match to shortcode, compound ID and/or alias #1563

mwinokan opened this issue Nov 6, 2024 · 12 comments
Assignees
@boriskovar-m2ms
Labels
2024-06-14 mint Data dissemination 2 frontend

Comments

@mwinokan
Copy link
Collaborator

mwinokan commented Nov 6, 2024

Spin out from #1371

Daren and Jenke have requested to be able to filter LHS observations by (sub)string match to:

  • observation shortcode
  • alias(es)
  • compound ID

@boriskovar-m2ms what's the minimal path to achieving this? More ambitious search functions will still be covered in #1371
@mwinokan mwinokan added frontend 2024-06-14 mint Data dissemination 2 labels Nov 6, 2024
@github-project-automation github-project-automation bot moved this to Backlog in Fragalysis Nov 6, 2024
@mwinokan mwinokan mentioned this issue Nov 6, 2024
Open
5 tasks
@mwinokan mwinokan moved this from Backlog to mint in Fragalysis Nov 6, 2024
@mwinokan mwinokan mentioned this issue Nov 20, 2024
Open
4 tasks
@mwinokan
Copy link
Collaborator Author

mwinokan commented Dec 3, 2024

@matej-vavrek's work in #1540 will not affect this ticket as all aliases should be substring matched and not just the preferred

@mwinokan mwinokan moved this from mint to In Progress (DEV) in Fragalysis Dec 3, 2024
@mwinokan
Copy link
Collaborator Author

mwinokan commented Dec 5, 2024 •
edited
Loading

@boriskovar-m2ms will need to wait on @matej-vavrek's #1540 to be finished to start on this (latest backend needs to be supported)

@matej-vavrek please ping @boriskovar-m2ms when he can start working on it

Test data is A71EV2A_xca_staging_20241104_fake_aliases.tar.gz in the shared folder

boriskovar-m2ms added a commit that referenced this issue Dec 6, 2024
@boriskovar-m2ms
- #1563 - all the UI and infrastructure and search by shortcode and c…
32c837d 
…ompound id is done
boriskovar-m2ms added a commit that referenced this issue Dec 10, 2024
@boriskovar-m2ms
- #1563 - all the UI and infrastructure and search by shortcode and c…
4579a9d 
…ompound id is done
boriskovar-m2ms added a commit that referenced this issue Dec 10, 2024
@boriskovar-m2ms
Merge branch '#1563-LHS-search' of https://github.com/m2ms/fragalysis…
4b7d699 
…-frontend into #1563-LHS-search
boriskovar-m2ms added a commit that referenced this issue Dec 12, 2024
@boriskovar-m2ms
- #1563 - all the UI and infrastructure and search by shortcode and c…
6631373 
…ompound id is done
boriskovar-m2ms added a commit that referenced this issue Dec 12, 2024
@boriskovar-m2ms
Merge branch '#1563-LHS-search' of https://github.com/m2ms/fragalysis…
cbf95f1 
…-frontend into #1563-LHS-search
@boriskovar-m2ms boriskovar-m2ms moved this from In Progress (DEV) to Dev Done - Do review (DEV) in Fragalysis Dec 16, 2024
@boriskovar-m2ms
Copy link
Collaborator

Search implemented and deployed to tibor's stack. When you click on the magnifier icon in the search field it will open the search settings window which has three checkboxes which are interpreted as an OR filter.

@mwinokan
Copy link
Collaborator Author

Thanks @boriskovar-m2ms. The compound alias substring searching works well, but nothing happens when I click the magnifier icon.

@boriskovar-m2ms
Copy link
Collaborator

this might explain why the deploy to tibor's stack was so fast. Second deploy also deployed something completely different i.e. not the image I built few moments ago.

@boriskovar-m2ms
Copy link
Collaborator

Oh I see. All my variables from the template are gone.... :/. Now there is a default template and I need to reconfigure it to use images. Not sure I remember all the changes I did to this stack before so if I knew this would happen I would archive/stash my settings somewhere...

@boriskovar-m2ms
Copy link
Collaborator

@mwinokan now my image is now deployed (previously it would just deploy latest image from staging)

@mwinokan
Copy link
Collaborator Author

Thanks @boriskovar-m2ms. The search settings UI looks good, but please could you change the text to clarify:

  • "Observation shortcode"
  • "Compound aliases"
  • "Compound ID"

Otherwise it's ready for staging

@boriskovar-m2ms
Copy link
Collaborator

OK. Will push it to staging together with fix for Jasmin's issue (will finish it soon) reported last Friday.

boriskovar-m2ms added a commit that referenced this issue Dec 16, 2024
@boriskovar-m2ms
Squashed commit of the following:
3b607e9 
commit 2fd529e
Author: Boris Kovar <[email protected]>
Date:   Mon Dec 16 10:44:15 2024 +0100

    - changes labels in searchSettingsDialog

commit 12499a9
Author: Boris Kovar <[email protected]>
Date:   Mon Dec 16 09:47:05 2024 +0100

    -small fix

commit cbf95f1
Merge: 5bd7756 900d851
Author: Boris Kovar <[email protected]>
Date:   Thu Dec 12 13:34:14 2024 +0100

    Merge branch '#1563-LHS-search' of https://github.com/m2ms/fragalysis-frontend into #1563-LHS-search

commit 5bd7756
Author: Boris Kovar <[email protected]>
Date:   Thu Dec 12 13:30:00 2024 +0100

    - search aliases

commit 3e7540f
Author: Boris Kovar <[email protected]>
Date:   Tue Dec 10 12:12:03 2024 +0100

    - checkpoint

commit 6631373
Author: Boris Kovar <[email protected]>
Date:   Fri Dec 6 10:05:51 2024 +0100

    - #1563 - all the UI and infrastructure and search by shortcode and compound id is done

commit 900d851
Author: Boris Kovar <[email protected]>
Date:   Thu Dec 12 13:30:00 2024 +0100

    - search aliases

commit a72f427
Author: Boris Kovar <[email protected]>
Date:   Tue Dec 10 12:12:03 2024 +0100

    - checkpoint

commit 4b7d699
Merge: 4579a9d 32c837d
Author: Boris Kovar <[email protected]>
Date:   Tue Dec 10 10:26:34 2024 +0100

    Merge branch '#1563-LHS-search' of https://github.com/m2ms/fragalysis-frontend into #1563-LHS-search

commit 4579a9d
Author: Boris Kovar <[email protected]>
Date:   Fri Dec 6 10:05:51 2024 +0100

    - #1563 - all the UI and infrastructure and search by shortcode and compound id is done

commit 32c837d
Author: Boris Kovar <[email protected]>
Date:   Fri Dec 6 10:05:51 2024 +0100

    - #1563 - all the UI and infrastructure and search by shortcode and compound id is done
@boriskovar-m2ms boriskovar-m2ms moved this from Dev Done - Do review (DEV) to In staging - assess function vs spec in Fragalysis Dec 16, 2024
@mwinokan
Copy link
Collaborator Author

mwinokan commented Dec 17, 2024 •
edited by phraenquex
Loading

@mwinokan to check with Daren and any other users (Ed? Jenke? Nate?)

@mwinokan
Copy link
Collaborator Author

Thanks @boriskovar-m2ms. The behaviour works well in staging. Could you please change the default search settings to all be on?

Screenshot 2024-12-19 at 10 48 44

@mwinokan mwinokan moved this from In staging - assess function vs spec to In Progress (DEV) in Fragalysis Dec 19, 2024
@mwinokan
Copy link
Collaborator Author

@boriskovar-m2ms will address the defaults in a PR today

@boriskovar-m2ms boriskovar-m2ms moved this from In Progress (DEV) to In staging - assess function vs spec in Fragalysis Dec 19, 2024
@mwinokan mwinokan moved this from In staging - assess function vs spec to Approved in staging - push to production in Fragalysis Jan 14, 2025
matej-vavrek added a commit that referenced this issue Jan 16, 2025
@boriskovar-m2ms @matej-vavrek
#1563 - LHS search settings (#469)
df73b81 
* removed SGC column from target list

* #1540 added preferred alias functionality

* #1540 added edit column to target list and use target settings modal

* #1540 updated "Open" label and read only version of display name

* Squashed commit of the following:

commit c5bba58
Author: Boris Kovar <[email protected]>
Date:   Tue Dec 10 08:13:00 2024 +0100

    #1603 - fixes

* Squashed commit of the following:

commit 9d9bf8c
Author: Boris Kovar <[email protected]>
Date:   Wed Dec 11 15:20:54 2024 +0100

    fixed frontend part of the ticket. Now properly resolves target based on the target name and target access string

* - fixed issue when the template protein is missing

* Squashed commit of the following:

commit 2fd529e
Author: Boris Kovar <[email protected]>
Date:   Mon Dec 16 10:44:15 2024 +0100

    - changes labels in searchSettingsDialog

commit 12499a9
Author: Boris Kovar <[email protected]>
Date:   Mon Dec 16 09:47:05 2024 +0100

    -small fix

commit cbf95f1
Merge: 5bd7756 900d851
Author: Boris Kovar <[email protected]>
Date:   Thu Dec 12 13:34:14 2024 +0100

    Merge branch '#1563-LHS-search' of https://github.com/m2ms/fragalysis-frontend into #1563-LHS-search

commit 5bd7756
Author: Boris Kovar <[email protected]>
Date:   Thu Dec 12 13:30:00 2024 +0100

    - search aliases

commit 3e7540f
Author: Boris Kovar <[email protected]>
Date:   Tue Dec 10 12:12:03 2024 +0100

    - checkpoint

commit 6631373
Author: Boris Kovar <[email protected]>
Date:   Fri Dec 6 10:05:51 2024 +0100

    - #1563 - all the UI and infrastructure and search by shortcode and compound id is done

commit 900d851
Author: Boris Kovar <[email protected]>
Date:   Thu Dec 12 13:30:00 2024 +0100

    - search aliases

commit a72f427
Author: Boris Kovar <[email protected]>
Date:   Tue Dec 10 12:12:03 2024 +0100

    - checkpoint

commit 4b7d699
Merge: 4579a9d 32c837d
Author: Boris Kovar <[email protected]>
Date:   Tue Dec 10 10:26:34 2024 +0100

    Merge branch '#1563-LHS-search' of https://github.com/m2ms/fragalysis-frontend into #1563-LHS-search

commit 4579a9d
Author: Boris Kovar <[email protected]>
Date:   Fri Dec 6 10:05:51 2024 +0100

    - #1563 - all the UI and infrastructure and search by shortcode and compound id is done

commit 32c837d
Author: Boris Kovar <[email protected]>
Date:   Fri Dec 6 10:05:51 2024 +0100

    - #1563 - all the UI and infrastructure and search by shortcode and compound id is done

---------

Co-authored-by: matej <[email protected]>
matej-vavrek added a commit that referenced this issue Jan 16, 2025
@boriskovar-m2ms @matej-vavrek
implements issues #1533, #1622 (#472)
2beca6b 
* removed SGC column from target list

* #1540 added preferred alias functionality

* #1540 added edit column to target list and use target settings modal

* #1540 updated "Open" label and read only version of display name

* Squashed commit of the following:

commit c5bba58
Author: Boris Kovar <[email protected]>
Date:   Tue Dec 10 08:13:00 2024 +0100

    #1603 - fixes

* Squashed commit of the following:

commit 9d9bf8c
Author: Boris Kovar <[email protected]>
Date:   Wed Dec 11 15:20:54 2024 +0100

    fixed frontend part of the ticket. Now properly resolves target based on the target name and target access string

* - fixed issue when the template protein is missing

* Squashed commit of the following:

commit 2fd529e
Author: Boris Kovar <[email protected]>
Date:   Mon Dec 16 10:44:15 2024 +0100

    - changes labels in searchSettingsDialog

commit 12499a9
Author: Boris Kovar <[email protected]>
Date:   Mon Dec 16 09:47:05 2024 +0100

    -small fix

commit cbf95f1
Merge: 5bd7756 900d851
Author: Boris Kovar <[email protected]>
Date:   Thu Dec 12 13:34:14 2024 +0100

    Merge branch '#1563-LHS-search' of https://github.com/m2ms/fragalysis-frontend into #1563-LHS-search

commit 5bd7756
Author: Boris Kovar <[email protected]>
Date:   Thu Dec 12 13:30:00 2024 +0100

    - search aliases

commit 3e7540f
Author: Boris Kovar <[email protected]>
Date:   Tue Dec 10 12:12:03 2024 +0100

    - checkpoint

commit 6631373
Author: Boris Kovar <[email protected]>
Date:   Fri Dec 6 10:05:51 2024 +0100

    - #1563 - all the UI and infrastructure and search by shortcode and compound id is done

commit 900d851
Author: Boris Kovar <[email protected]>
Date:   Thu Dec 12 13:30:00 2024 +0100

    - search aliases

commit a72f427
Author: Boris Kovar <[email protected]>
Date:   Tue Dec 10 12:12:03 2024 +0100

    - checkpoint

commit 4b7d699
Merge: 4579a9d 32c837d
Author: Boris Kovar <[email protected]>
Date:   Tue Dec 10 10:26:34 2024 +0100

    Merge branch '#1563-LHS-search' of https://github.com/m2ms/fragalysis-frontend into #1563-LHS-search

commit 4579a9d
Author: Boris Kovar <[email protected]>
Date:   Fri Dec 6 10:05:51 2024 +0100

    - #1563 - all the UI and infrastructure and search by shortcode and compound id is done

commit 32c837d
Author: Boris Kovar <[email protected]>
Date:   Fri Dec 6 10:05:51 2024 +0100

    - #1563 - all the UI and infrastructure and search by shortcode and compound id is done

* - fixes #1622 and changes defaults for search settings

* Squashed commit of the following:

commit 021d6f2
Merge: a5fb901 182a10a
Author: boriskovar-m2ms <[email protected]>
Date:   Thu Dec 19 13:49:43 2024 +0100

    Merge branch '#1533-direct-links' of https://github.com/m2ms/fragalysis-frontend into #1533-direct-links

commit a5fb901
Author: Boris Kovar <[email protected]>
Date:   Tue Dec 17 16:56:49 2024 +0100

    - implements #1533

commit 182a10a
Author: Boris Kovar <[email protected]>
Date:   Tue Dec 17 16:56:49 2024 +0100

    - implements #1533

---------

Co-authored-by: matej <[email protected]>
This was referenced Jan 28, 2025
Merged
Merged
@mwinokan mwinokan moved this from Approved in staging - push to production to In production (Done) in Fragalysis Jan 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@boriskovar-m2ms boriskovar-m2ms

Labels
2024-06-14 mint Data dissemination 2 frontend
Projects
Fragalysis
Status: In production (Done)
Milestone
No milestone
Development

No branches or pull requests
2 participants
@boriskovar-m2ms @mwinokan