Merge branch 'development' into fix/home-issues

Gemfile

@@ -13,10 +13,9 @@ gem 'terser' #ugilifer replacent
 # gem 'duktape'
 
 gem 'bootstrap', '~> 4.2.0'
-gem 'chart-js-rails'
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
-gem 'select2-rails'
+
 
 
 # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
@@ -118,6 +117,7 @@ group :development do
   gem 'i18n-tasks'
   gem 'deepl-rb'
   gem 'letter_opener_web', '~> 2.0'
+  gem 'haml-rails'
 end
 
 group :test, :development do

Gemfile.lock

@@ -137,8 +137,6 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    chart-js-rails (0.1.7)
-      railties (> 3.1)
     coderay (1.1.3)
     concurrent-ruby (1.2.2)
     crass (1.0.6)
@@ -148,7 +146,7 @@ GEM
     daemons (1.4.1)
     dalli (3.2.6)
     date (3.3.4)
-    debug (1.9.0)
+    debug (1.9.1)
       irb (~> 1.10)
       reline (>= 0.3.8)
     deepl-rb (2.5.3)
@@ -159,7 +157,7 @@ GEM
     erubi (1.12.0)
     erubis (2.7.0)
     eventmachine (1.2.7)
-    excon (0.108.0)
+    excon (0.109.0)
     execjs (2.9.1)
     faraday (2.0.1)
       faraday-net_http (~> 2.0)
@@ -178,14 +176,19 @@ GEM
     flamegraph (0.9.5)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    graphql (2.2.0)
+    graphql (2.2.4)
       racc (~> 1.4)
     graphql-client (0.18.0)
       activesupport (>= 3.0)
       graphql
     haml (5.2.2)
       temple (>= 0.8.0)
       tilt
+    haml-rails (2.1.0)
+      actionpack (>= 5.1)
+      activesupport (>= 5.1)
+      haml (>= 4.0.6)
+      railties (>= 5.1)
     hashie (5.0.0)
     highline (2.1.0)
     html2haml (2.3.0)
@@ -212,15 +215,15 @@ GEM
       rainbow (>= 2.2.2, < 4.0)
       terminal-table (>= 1.5.1)
     iconv (1.0.8)
-    importmap-rails (1.2.3)
+    importmap-rails (2.0.1)
       actionpack (>= 6.0.0)
       activesupport (>= 6.0.0)
       railties (>= 6.0.0)
     inline_svg (1.9.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.7.1)
-    irb (1.10.1)
+    irb (1.11.0)
       rdoc
       reline (>= 0.3.8)
     iso-639 (0.3.6)
@@ -233,9 +236,10 @@ GEM
     jsbundling-rails (1.2.1)
       railties (>= 6.0.0)
     json (2.7.1)
-    json-jwt (1.16.3)
+    json-jwt (1.16.5)
       activesupport (>= 4.2)
       aes_key_wrap
+      base64
       bindata
       faraday (~> 2.0)
       faraday-follow_redirects
@@ -278,7 +282,7 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
-    mime-types (3.5.1)
+    mime-types (3.5.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.1205)
     mini_mime (1.1.5)
@@ -287,13 +291,14 @@ GEM
     multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.3.0)
+    mutex_m (0.2.0)
     mysql2 (0.5.5)
-    net-ftp (0.2.0)
+    net-ftp (0.2.1)
       net-protocol
       time
     net-http (0.3.2)
       uri
-    net-imap (0.4.8)
+    net-imap (0.4.9)
       date
       net-protocol
     net-pop (0.1.2)
@@ -304,7 +309,7 @@ GEM
       net-ssh (>= 2.6.5, < 8.0.0)
     net-smtp (0.4.0)
       net-protocol
-    net-ssh (7.2.0)
+    net-ssh (7.2.1)
     netrc (0.11.0)
     newrelic_rpm (9.6.0)
       base64
@@ -322,7 +327,7 @@ GEM
       version_gem (~> 1.1)
     oj (3.16.3)
       bigdecimal (>= 3.0)
-    omniauth (2.1.1)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
       rack (>= 2.2.3)
       rack-protection
@@ -366,7 +371,8 @@ GEM
       rack (>= 0.4)
     rack-mini-profiler (3.3.0)
       rack (>= 1.2.0)
-    rack-protection (3.1.0)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
     rack-test (2.1.0)
       rack (>= 1.3)
@@ -470,7 +476,6 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    select2-rails (4.0.13)
     selenium-webdriver (4.9.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
@@ -497,11 +502,12 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    sshkit (1.21.6)
+    sshkit (1.21.7)
+      mutex_m
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     stackprof (0.2.25)
-    stimulus-rails (1.3.0)
+    stimulus-rails (1.3.3)
       railties (>= 6.0.0)
     temple (0.10.3)
     terminal-table (3.0.2)
@@ -568,7 +574,6 @@ DEPENDENCIES
   capistrano-rails (~> 1.4)
   capistrano-yarn
   capybara
-  chart-js-rails
   cube-ruby
   dalli
   debug
@@ -578,6 +583,7 @@ DEPENDENCIES
   flamegraph
   graphql-client
   haml (~> 5.1)
+  haml-rails
   html2haml
   i18n
   i18n-tasks
@@ -618,7 +624,6 @@ DEPENDENCIES
   rspec-rails
   rubocop
   sassc-rails
-  select2-rails
   selenium-webdriver
   simplecov
   simplecov-cobertura

app/assets/javascripts/application.js

@@ -13,21 +13,14 @@
 //= require bioportal
 //= require admin/licenses
 //= require bp_ajax_controller
-//= require bp_reviews
 //= require bp_notes
-//= require bp_ontolobridge
 //= require bp_form_complete
-//= require bp_analytics
-//= require bp_search
 //= require bp_mappings
 //= require bp_admin
 //= require bp_recommender
-//= require bp_property_tree
 //= require concepts
-//= require home
 //= require_tree ./helpers
 //= require_tree ./components
-//= require ontologies
 //= require projects
 //= require application_esbuild
 customElements.define('data-table-loader', DataTableLoader );