Skip to content

Commit

Permalink
Merge branch 'main' into full-test-suite
Browse files Browse the repository at this point in the history
  • Loading branch information
stuzart committed Aug 19, 2024
2 parents f298d09 + f0eb3ec commit 3ba9282
Show file tree
Hide file tree
Showing 428 changed files with 10,738 additions and 2,167 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ansible-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
continue-on-error: true
strategy:
matrix:
os: [ubuntu-20.04,ubuntu-22.04]
os: [ubuntu-20.04,ubuntu-22.04,ubuntu-24.04]

services:
mysql:
Expand Down
3 changes: 3 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ Layout/LineLength:
# Don't enforce frozen string literals
Style/FrozenStringLiteralComment:
Enabled: false

Style/HashSyntax:
EnforcedShorthandSyntax: never
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ gem 'will_paginate', '~> 3.1'
gem 'yaml_db'
gem 'rails_autolink'
gem 'rfc-822'
gem 'nokogiri', '~> 1.16.5'
gem 'nokogiri', '~> 1.16'
#necessary for newer hashie dependency, original api_smith is no longer active
gem 'api_smith', git: 'https://github.com/youroute/api_smith.git', ref: '1fb428cebc17b9afab25ac9f809bde87b0ec315b'
gem 'rdf-virtuoso', '>= 0.2.0'
Expand Down
134 changes: 68 additions & 66 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -51,40 +51,40 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.3)
actioncable (6.1.7.7)
actionpack (= 6.1.7.7)
activesupport (= 6.1.7.7)
actioncable (6.1.7.8)
actionpack (= 6.1.7.8)
activesupport (= 6.1.7.8)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.1.7.7)
actionpack (= 6.1.7.7)
activejob (= 6.1.7.7)
activerecord (= 6.1.7.7)
activestorage (= 6.1.7.7)
activesupport (= 6.1.7.7)
actionmailbox (6.1.7.8)
actionpack (= 6.1.7.8)
activejob (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
mail (>= 2.7.1)
actionmailer (6.1.7.7)
actionpack (= 6.1.7.7)
actionview (= 6.1.7.7)
activejob (= 6.1.7.7)
activesupport (= 6.1.7.7)
actionmailer (6.1.7.8)
actionpack (= 6.1.7.8)
actionview (= 6.1.7.8)
activejob (= 6.1.7.8)
activesupport (= 6.1.7.8)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.1.7.7)
actionview (= 6.1.7.7)
activesupport (= 6.1.7.7)
actionpack (6.1.7.8)
actionview (= 6.1.7.8)
activesupport (= 6.1.7.8)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.1.7.7)
actionpack (= 6.1.7.7)
activerecord (= 6.1.7.7)
activestorage (= 6.1.7.7)
activesupport (= 6.1.7.7)
actiontext (6.1.7.8)
actionpack (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
nokogiri (>= 1.8.5)
actionview (6.1.7.7)
activesupport (= 6.1.7.7)
actionview (6.1.7.8)
activesupport (= 6.1.7.8)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
Expand All @@ -94,14 +94,14 @@ GEM
activemodel (>= 4.1, < 7.1)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (6.1.7.7)
activesupport (= 6.1.7.7)
activejob (6.1.7.8)
activesupport (= 6.1.7.8)
globalid (>= 0.3.6)
activemodel (6.1.7.7)
activesupport (= 6.1.7.7)
activerecord (6.1.7.7)
activemodel (= 6.1.7.7)
activesupport (= 6.1.7.7)
activemodel (6.1.7.8)
activesupport (= 6.1.7.8)
activerecord (6.1.7.8)
activemodel (= 6.1.7.8)
activesupport (= 6.1.7.8)
activerecord-import (1.3.0)
activerecord (>= 4.2)
activerecord-session_store (2.0.0)
Expand All @@ -110,14 +110,14 @@ GEM
multi_json (~> 1.11, >= 1.11.2)
rack (>= 2.0.8, < 3)
railties (>= 5.2.4.1)
activestorage (6.1.7.7)
actionpack (= 6.1.7.7)
activejob (= 6.1.7.7)
activerecord (= 6.1.7.7)
activesupport (= 6.1.7.7)
activestorage (6.1.7.8)
actionpack (= 6.1.7.8)
activejob (= 6.1.7.8)
activerecord (= 6.1.7.8)
activesupport (= 6.1.7.8)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (6.1.7.7)
activesupport (6.1.7.8)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand Down Expand Up @@ -165,7 +165,7 @@ GEM
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
builder (3.2.4)
builder (3.3.0)
case_transform (0.2)
activesupport
caxlsx (4.0.0)
Expand Down Expand Up @@ -198,7 +198,7 @@ GEM
execjs
coffee-script-source (1.12.2)
commonmarker (0.23.10)
concurrent-ruby (1.2.3)
concurrent-ruby (1.3.3)
connection_pool (2.3.0)
countries (5.2.0)
unaccent (~> 0.3)
Expand Down Expand Up @@ -241,7 +241,7 @@ GEM
encryptor (3.0.0)
equivalent-xml (0.6.0)
nokogiri (>= 1.4.3)
erubi (1.12.0)
erubi (1.13.0)
erubis (2.7.0)
exception_notification (4.5.0)
actionmailer (>= 5.2, < 8)
Expand Down Expand Up @@ -322,7 +322,7 @@ GEM
httpclient (2.8.3)
httpi (1.1.1)
rack
i18n (1.14.4)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
i18n-js (3.9.0)
i18n (>= 0.6.6)
Expand All @@ -337,7 +337,7 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
jquery-ui-rails (7.0.0)
railties (>= 3.2.16)
json (2.3.1)
json-canonicalization (0.3.0)
Expand Down Expand Up @@ -452,15 +452,15 @@ GEM
fastimage (~> 2.2)
nesty (~> 1.0)
nokogiri (~> 1.11)
method_source (1.0.0)
method_source (1.1.0)
mime-types (3.4.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2022.0105)
mimemagic (0.3.10)
nokogiri (~> 1)
rake
mini_mime (1.1.5)
mini_portile2 (2.8.6)
mini_portile2 (2.8.7)
minitest (5.20.0)
minitest-reporters (1.5.0)
ansi
Expand Down Expand Up @@ -566,8 +566,8 @@ GEM
puma (5.6.8)
nio4r (~> 2.0)
pyu-ruby-sasl (0.0.3.3)
racc (1.7.3)
rack (2.2.8.1)
racc (1.8.0)
rack (2.2.9)
rack-attack (6.6.0)
rack (>= 1.0, < 3)
rack-cors (1.1.1)
Expand All @@ -584,20 +584,20 @@ GEM
rack
rack-test (2.1.0)
rack (>= 1.3)
rails (6.1.7.7)
actioncable (= 6.1.7.7)
actionmailbox (= 6.1.7.7)
actionmailer (= 6.1.7.7)
actionpack (= 6.1.7.7)
actiontext (= 6.1.7.7)
actionview (= 6.1.7.7)
activejob (= 6.1.7.7)
activemodel (= 6.1.7.7)
activerecord (= 6.1.7.7)
activestorage (= 6.1.7.7)
activesupport (= 6.1.7.7)
rails (6.1.7.8)
actioncable (= 6.1.7.8)
actionmailbox (= 6.1.7.8)
actionmailer (= 6.1.7.8)
actionpack (= 6.1.7.8)
actiontext (= 6.1.7.8)
actionview (= 6.1.7.8)
activejob (= 6.1.7.8)
activemodel (= 6.1.7.8)
activerecord (= 6.1.7.8)
activestorage (= 6.1.7.8)
activesupport (= 6.1.7.8)
bundler (>= 1.15.0)
railties (= 6.1.7.7)
railties (= 6.1.7.8)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.5)
actionpack (>= 5.0.1.rc1)
Expand Down Expand Up @@ -625,15 +625,15 @@ GEM
json
require_all (~> 3.0)
ruby-progressbar
railties (6.1.7.7)
actionpack (= 6.1.7.7)
activesupport (= 6.1.7.7)
railties (6.1.7.8)
actionpack (= 6.1.7.8)
activesupport (= 6.1.7.8)
method_source
rake (>= 12.2)
thor (~> 1.0)
rainbow (3.1.1)
raindrops (0.20.0)
rake (13.1.0)
rake (13.2.1)
ransack (2.5.0)
activerecord (>= 5.2.4)
activesupport (>= 5.2.4)
Expand Down Expand Up @@ -728,7 +728,8 @@ GEM
netrc (~> 0.8)
reverse_markdown (2.1.1)
nokogiri
rexml (3.2.5)
rexml (3.3.3)
strscan
rfc-822 (0.4.1)
rmagick (5.3.0)
pkg-config (~> 1.4)
Expand Down Expand Up @@ -861,6 +862,7 @@ GEM
sqlite3 (1.4.2)
stackprof (0.2.25)
stringio (3.0.1.1)
strscan (3.1.0)
sunspot (2.6.0)
pr_geohash (~> 1.0)
rsolr (>= 1.1.1, < 3)
Expand Down Expand Up @@ -950,7 +952,7 @@ GEM
rails (>= 3.0)
rake (>= 0.8.7)
yard (0.9.36)
zeitwerk (2.6.13)
zeitwerk (2.6.16)
zip-container (4.0.2)
rubyzip (~> 2.0.0)

Expand Down Expand Up @@ -1028,7 +1030,7 @@ DEPENDENCIES
my_responds_to_parent!
mysql2
net-ftp
nokogiri (~> 1.16.5)
nokogiri (~> 1.16)
omniauth (~> 2.1.0)
omniauth-github
omniauth-rails_csrf_protection
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/javascripts/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
//= require DataTables-1.11.3/buttons.html5
//= require DataTables-1.11.3/autoFill.bootstrap
//= require samples
//= require datafiles
//= require jstree
//= require clipboard
//= require openbis
Expand Down
41 changes: 41 additions & 0 deletions app/assets/javascripts/datafiles.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
var Datafiles = {};

Datafiles.initTable = function (selector, opts) {
var table;
opts = opts || {};

$j('table tfoot th', selector).each( function () {
var title = $j(this).data().searchTitle;
$j(this).html('<input type="text" class="form-control" placeholder="Search '+title+'" />');
});

var options = $j.extend({}, opts, {
"lengthMenu": [ 5, 10, 25, 50, 75, 100 ],
"pageLength": 10,
dom: '<"row"<"col-sm-10"lr>><"datafiles-table-container"t>ip' // Needed to place the buttons
});

table = $j('table', selector).DataTable(options);

// DataTable
table.columns().every(function () {
var column = this;

$j('input', this.footer()).on('keyup change', function () {
if (column.search() !== this.value)
column.search(this.value).draw();
}).on('keydown', function (event) { // Stop enter key submitting form
if(event.keyCode == 13) {
event.preventDefault();
return false;
}
});
});

$j('table tbody td.datafile-field-error div', selector).popover({
html: true,
placement: 'top',
trigger: 'hover'
});
return table;
};
Loading

0 comments on commit 3ba9282

Please sign in to comment.