Skip to content

Commit

Permalink
Feature: Update search page design (#412)
Browse files Browse the repository at this point in the history
* search page new icons

* search page new input style

* search page new input and advanced options html

* search page js controller

* Make search result component and add it to search page

* add search result subcomponent

* Add search page logic

* show results id correctly in search page

* display ontology name and acronym correctly in search page

* make search elements links work in search page

* fix api query param error in search page

* show search results definition correctly

* make search page ui take all width

* add empty state to search page

* add search result component js

* Filter Perflabs to take the most close to the search input in search page

* use turbo rails in search page

* get all the results from the search api in one page in search page

* make search page filters work

* Add ontology reuses logic

* make details and visualize buttons work in seach page

* add class reuses to search result component in search page

* add reuses to result structure in search page

* add reuse decendents in search page

* Make search result component and add it to search page

* add search result subcomponent

* Add search page logic

* show results id correctly in search page

* display ontology name and acronym correctly in search page

* make search elements links work in search page

* fix api query param error in search page

* show search results definition correctly

* make search page ui take all width

* add empty state to search page

* add search result component js

* Filter Perflabs to take the most close to the search input in search page

* use turbo rails in search page

* get all the results from the search api in one page in search page

* make search page filters work

* Add ontology reuses logic

* make details and visualize buttons work in seach page

* add class reuses to search result component in search page

* add reuses to result structure in search page

* add reuse decendents in search page

* fix bugsnag gem configuration

* simplify search result component by inferring some arguments

* use d-flex bootstrap call instead options in the search result component

* simplify the search parameters key naming to avoid duplication

* convert all the functions the bp_search.js to  search_aggregator.rb

* extract details and vizualize buttons to functions, in search result component

* fix ontologies filter and remove categories filter in search page

* Clean search result component stimulus controller code

* remove categories translation on search page

* extract reveal ontologies buttons to a function in search result component

* remove duplicated annotator_recommender_form function from home controller

* make a generic stimulus controller for reveal by id

* make a stimulus controller for reveal with double button

* extent reveal component controller to combine all reveal controllers

* remove stimulus reveal package
  • Loading branch information
Bilelkihal authored and syphax-bouazzouni committed Jan 5, 2024
1 parent 5e49913 commit cc64185
Show file tree
Hide file tree
Showing 41 changed files with 757 additions and 1,404 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,5 @@ gem "net-ftp", "~> 0.2.0", require: false
gem "net-http", "~> 0.3.2"



gem "bugsnag", "~> 6.26"
19 changes: 13 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ GEM
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
brakeman (5.4.1)
bugsnag (6.26.0)
concurrent-ruby (~> 1.0)
builder (3.2.4)
capistrano (3.18.0)
airbrussh (>= 1.0.0)
Expand Down Expand Up @@ -316,12 +318,13 @@ GEM
racc (~> 1.4)
nokogiri (1.15.5-x86_64-linux)
racc (~> 1.4)
oauth2 (1.4.11)
oauth2 (2.0.9)
faraday (>= 0.17.3, < 3.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 4)
snaky_hash (~> 2.0)
version_gem (~> 1.1)
oj (3.16.3)
bigdecimal (>= 3.0)
omniauth (2.1.2)
Expand All @@ -331,11 +334,10 @@ GEM
omniauth-github (2.0.0)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.7.1)
omniauth-google-oauth2 (1.0.1)
omniauth-google-oauth2 (0.8.0)
jwt (>= 2.0)
oauth2 (~> 1.1)
omniauth (~> 2.0)
omniauth-oauth2 (~> 1.7.1)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.6)
omniauth-keycloak (1.5.1)
faraday
json-jwt (> 1.13.0)
Expand Down Expand Up @@ -489,6 +491,9 @@ GEM
simplecov-html (0.12.3)
simplecov_json_formatter (0.1.4)
smart_properties (1.17.0)
snaky_hash (2.0.1)
hashie
version_gem (~> 1.1, >= 1.1.1)
spawnling (2.1.5)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -531,6 +536,7 @@ GEM
concurrent-ruby (~> 1.0)
unicode-display_width (2.5.0)
uri (0.13.0)
version_gem (1.1.3)
view_component (2.82.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -559,6 +565,7 @@ DEPENDENCIES
bootsnap
bootstrap (~> 4.2.0)
brakeman
bugsnag (~> 6.26)
capistrano (~> 3.11)
capistrano-bundler
capistrano-locally
Expand Down
3 changes: 3 additions & 0 deletions app/assets/images/icons/arrow-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/images/icons/details.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/assets/images/icons/hide.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/images/icons/reuses.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/images/icons/search.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions app/assets/images/icons/settings.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/assets/images/icons/visualize.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
//= require bp_ajax_controller
//= require bp_notes
//= require bp_form_complete
//= require bp_search
//= require bp_mappings
//= require bp_admin
//= require bp_recommender
Expand Down
4 changes: 4 additions & 0 deletions app/assets/javascripts/bp_admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,10 @@ AjaxAction.prototype.ajaxCall = function() {
}
};

function determineHTTPS(url) {
return url.replace("http:", ('https:' == document.location.protocol ? 'https:' : 'http:'));
}

AjaxAction.prototype.onSuccessAction = function(data, ontology, deferredObj) {
var self = this;
if (!self.isLongOperation) {
Expand Down
Loading

0 comments on commit cc64185

Please sign in to comment.