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

Extend search #17

Closed
wants to merge 132 commits into from
Closed
Show file tree
Hide file tree
Changes from 131 commits
Commits
Show all changes
132 commits
Select commit Hold shift + click to select a range
49ce960
Inital run
beque Oct 27, 2022
ae1333a
Add klasses.json to gitignore
beque Nov 7, 2022
b40b2aa
Fix inital run
beque Nov 7, 2022
a5214a5
Add basic search modal
beque Dec 14, 2022
d36bf68
Add basic content changing on select
beque Dec 19, 2022
cff190d
Add advanced search form fields
beque Dec 22, 2022
1c86563
Fix unique key for advanced search row
beque Dec 22, 2022
80582d3
Fix order for advanced search
beque Dec 23, 2022
04efc24
Add handle safe for advanced search and ketcher
beque Dec 23, 2022
8f6a158
Fix ketcher rails search
beque Jan 2, 2023
dc4d078
Fix advanced search with multi search fields
beque Jan 2, 2023
21d0c5d
Add toggable panel for search and result at search modal forms
beque Jan 3, 2023
63d4e01
Add search results store and simple search results
beque Jan 6, 2023
822fb07
Optimize searches and results
beque Jan 11, 2023
2e29d77
Add search result tab lists
beque Jan 13, 2023
3014709
Add search result tab content with pagination
beque Jan 13, 2023
33b10ed
Fix for automatic github actions
beque Jan 16, 2023
79d59e8
Fix comma at multiline method
beque Jan 16, 2023
d89efba
Add search by ids for search result tab pages
beque Jan 19, 2023
ec9f0b4
Fix rubocop
beque Jan 19, 2023
68a56a4
Fix rubocop errors
beque Jan 19, 2023
a09dfb7
Add handle adopt result
beque Jan 20, 2023
db9bbfa
Add minimize to search modal
beque Jan 20, 2023
8eb22bc
Add handle refind
beque Jan 20, 2023
40cacbe
Change version of rdkit_chem to main branch version
beque Jan 20, 2023
77348c3
Remove molfile for ketcher rails, square brackets for fragments
beque Jan 20, 2023
6951e4b
Optimization after code review
beque Jan 24, 2023
c22ca0e
Optimize advanced search row
beque Jan 24, 2023
7d0c24b
Change styles for panel heading and tab icons
beque Jan 25, 2023
6c52b13
Change pagination function for search results
beque Jan 26, 2023
cd6c49f
Fix pages value for pagination
beque Jan 26, 2023
225815f
Add more descriptions for readme-dev
beque Jan 27, 2023
6cdbf30
Fix rubocop and disable some cops
beque Jan 27, 2023
6a5d223
Add clear search and tab results, Set tab index for tab with results
beque Jan 30, 2023
48542fa
Fix typo in readme dev
beque Jan 31, 2023
f5dabab
Fixes for generic elements
beque Feb 2, 2023
2a76f6a
Fix base fetcher for generic elements
beque Feb 2, 2023
0948fe6
Optimize search result
beque Feb 3, 2023
12eb6fd
Simplify visibility of search modal with mobx store
beque Feb 3, 2023
709bfa5
Remove unused variable, Fix closing search modal
beque Feb 3, 2023
6644831
Clear search when clicking on collection
beque Feb 6, 2023
eb15343
Rename search store, refactoring
beque Feb 8, 2023
4d66e66
Disable cops for suggestion api
beque Feb 8, 2023
3c2cb21
Add more cops for suggestion search
beque Feb 8, 2023
54ad627
Fix cops for suggestion search
beque Feb 8, 2023
922aa09
Remove old advanced and structure search
beque Feb 9, 2023
0faa872
Fix pulldown for logical operator
beque Feb 9, 2023
73a2392
Add element list filter to search result
beque Feb 16, 2023
20d3a96
Fix rubocop
beque Feb 16, 2023
07a7d9a
Add order and group by molecule to search results
beque Mar 2, 2023
c91fb2b
Fix orders for search
beque Mar 2, 2023
3103868
Fix height of search modal and select fields
beque Mar 3, 2023
f5b4583
Add alert to remove search result
beque Mar 6, 2023
f7c2a09
Add basic element selection for advanced search
beque Mar 9, 2023
391515a
Fix gitignore and ElementsList after rebase
beque Mar 9, 2023
ff96f24
Remove search by id state at suggestion search
beque Mar 9, 2023
34f5014
Add search queries for reactions, wellplates and screens
beque Mar 13, 2023
30c7d21
Fix rubocop
beque Mar 13, 2023
8a58f8b
Fix rubocop after rebase
beque Mar 13, 2023
151f44c
Add empty research plan to search result and svg image to result
beque Mar 16, 2023
2ac45c1
Add basics for generic element search
beque Mar 23, 2023
ff5ad3a
Add hr to generic element search for testing deployment
beque Apr 4, 2023
d0eabbf
Add more search fields for reactions and screens
beque May 4, 2023
0157296
Fix js errors
beque May 4, 2023
5bafa97
Add research plan search, fix search result styles
beque May 9, 2023
3b8b6bd
Fix grouped samples in search result, rubocop
beque May 10, 2023
f6d45d4
Add temperature and duration to reaction search fields
beque May 12, 2023
9994bce
Fix rebase for ordering search requests
beque May 15, 2023
9fe0f42
Fix rubocop, autofill unit field
beque May 15, 2023
fa4229a
Add readout titles at wellplate search
beque May 15, 2023
2a737bf
Add generic element fields to advanced search, fix some styles
beque May 19, 2023
5ead6cd
Change some styles, remove generic element fields at advanced search
beque May 23, 2023
1af499a
Fix button position
beque May 24, 2023
f82bfc6
Add buttons for toggle between advanced and detail search
beque May 24, 2023
7abce37
Add basic detail search
beque Jun 13, 2023
6b8d462
Fix for rebase
beque Jun 13, 2023
99cf331
Add more fields at detail search
beque Jun 22, 2023
b2c6fd2
Fix detail search
beque Jun 23, 2023
6f9fc4f
Add generic segements
beque Jun 28, 2023
a7f6227
Change scrollable zone of search fields
beque Jun 28, 2023
a03dd21
Fix search queries, cleanup
beque Jun 29, 2023
dabde58
Add quill to plain text
beque Jun 30, 2023
df5d650
Add additional plain text field for description fields
beque Jun 30, 2023
7c5e2b4
Add description fields to search
beque Jun 30, 2023
dd7e1cb
Fix rubocop for quill to plain text
beque Jun 30, 2023
7109472
Change error message for empty structure search
beque Jul 24, 2023
e1fc4e1
Remove const search result at sample header
beque Jul 24, 2023
51a5565
Fix filter for samples
beque Jul 31, 2023
81a87ba
Fix copy to clipboard in search result modal
beque Aug 1, 2023
738b264
Remove old elements search method, with filter variable for change page
beque Aug 1, 2023
f5dc099
Add input-group fields to detail search
beque Aug 2, 2023
1de5ed2
Add formula field to detail search
beque Aug 2, 2023
8ff012f
Fix element store of deleted variable
beque Aug 3, 2023
84de2f6
Add table fields to detail search
beque Aug 8, 2023
df2f0bd
Add tabs for generic segments, dynamic tabs by collection settings
beque Aug 9, 2023
16d7ff2
Add sample inventory tab
beque Aug 10, 2023
225849c
Fix empty tabs variable
beque Aug 11, 2023
02d96f7
Add analyses tab
beque Aug 14, 2023
73e4654
Add plain text content to containers, refactore fieldsByTabs
beque Aug 14, 2023
9dd3e75
Add measurment tab
beque Aug 15, 2023
7dd4558
Add more fields to sample details
beque Aug 15, 2023
9112588
Add solvent fields to sample search
beque Aug 15, 2023
812ff3b
Add usecases for advanced search
beque Aug 18, 2023
5f5ecef
Add new switch button for toggeling between advanced and detail search
beque Aug 21, 2023
40f661f
Fix some form styles
beque Aug 22, 2023
3ee64b5
Add usecase search by ids
beque Aug 22, 2023
850f7da
Add usecase for structure search
beque Aug 22, 2023
7cdf795
Remove old generic search, cleanup
beque Aug 23, 2023
7c74344
Fix scopes for suggestion search
beque Aug 23, 2023
38df35a
Add unit tests for advanced, structure and by_ids search
beque Aug 23, 2023
e4a11db
Fix rubocops
beque Aug 24, 2023
5869b6b
Fix wrong html structure at advanced search row
beque Aug 28, 2023
f890fe1
Add cypress test and identificator for search modal
beque Aug 28, 2023
719f056
Fix content to plain text at container for tests
beque Aug 29, 2023
6155add
Fix search usecases for new labimotion gem
beque Sep 26, 2023
99d847e
Fix case insensitive, Add decoupled fields to sample
beque Sep 27, 2023
c0de2b4
Fix search queries
beque Sep 29, 2023
287b050
Try to fix treeselect with showSearch
beque Oct 2, 2023
7800ef3
Fix select fields for sample advanced search
beque Oct 9, 2023
d328881
Fix some strange things
beque Nov 8, 2023
e53a094
Fix some research plan, style bugs
beque Nov 14, 2023
66d1c28
Fix error when search conditions are empty
beque Nov 14, 2023
5cfdfaf
Fix solvent search and screen search
beque Nov 17, 2023
8a5f5e6
Add better error messages, some fixes
beque Nov 17, 2023
75f4414
Change width and height of search modal, advanced search value, multi…
beque Nov 17, 2023
c99295b
Fix prefilled name field for advanced search
beque Nov 21, 2023
82f1159
Add publication search
beque Nov 21, 2023
f1ae47b
Fix some errors and styles
beque Nov 27, 2023
1ebd88d
Fix click on pagination at reactions search result
beque Dec 1, 2023
f68b77b
Fix sorting on remove search result, search modal height
beque Dec 1, 2023
46631a7
Fix rubocop errors
beque Dec 1, 2023
c82de42
Fix rubocop error
beque Dec 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -194,3 +194,6 @@ public/sprite.png
/public/svgedit

!spec/fixtures/import/sample_import_template.xlsx

# generic elements
data/klasses.json
beque marked this conversation as resolved.
Show resolved Hide resolved
22 changes: 22 additions & 0 deletions README-DEV.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
## Prepare installation

**in config/ create**
- datacollectors.yml
- database.yml
- storage.yml

**write temporary in run-ruby-dev.sh**
beque marked this conversation as resolved.
Show resolved Hide resolved
- rake db:create
- rake db:schema:load

## Installation

docker-compose -f docker-compose.dev.yml up
beque marked this conversation as resolved.
Show resolved Hide resolved

OR

docker-compose -f docker-compose.dev.yml up postgres app webpacker

## Working inside app container

docker exec -it chemotion_eln-app-1 /bin/bash
25 changes: 21 additions & 4 deletions app/api/api.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# frozen_string_literal: true

# rubocop:disable Metrics/ClassLength

# module API
require 'grape-entity'
require 'grape-swagger'
Expand Down Expand Up @@ -121,11 +123,26 @@ def to_json_camel_case(val)

# desc: whitelisted tables and columns for advanced_search
WL_TABLES = {
'samples' => %w(name short_label external_label xref),
}
'samples' => %w[
name short_label external_label xref content is_top_secret decoupled
stereo boiling_point melting_point density molarity_value target_amount_value
description location purity solvent inventory_sample sum_formula molecular_mass
dry_solvent
],
'reactions' => %w[
name short_label status conditions rxno content temperature duration
role purification tlc_solvents tlc_description rf_value dangerous_products
plain_text_description plain_text_observation
],
'wellplates' => %w[name short_label readout_titles content plain_text_description],
'screens' => %w[name collaborator requirements conditions result content plain_text_description],
'research_plans' => %w[name body content],
'elements' => %w[name short_label],
}.freeze

TARGET = Rails.env.production? ? 'https://www.chemotion-repository.net/' : 'http://localhost:3000/'

ELEMENTS = %w[research_plan screen wellplate reaction sample]
ELEMENTS = %w[research_plan screen wellplate reaction sample].freeze

TEXT_TEMPLATE = %w[SampleTextTemplate ReactionTextTemplate WellplateTextTemplate ScreenTextTemplate
ResearchPlanTextTemplate ReactionDescriptionTextTemplate ElementTextTemplate]
Expand Down Expand Up @@ -191,4 +208,4 @@ def to_json_camel_case(val)
})
end
end
# rubocop: enable Metrics/BlockLength
# rubocop:enable Metrics/ClassLength
Loading