iqvoc 4.16.0 → 4.17.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (93) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +14 -0
  3. data/Gemfile +4 -3
  4. data/app/assets/builds/.keep +0 -0
  5. data/app/assets/images/.gitkeep +0 -0
  6. data/app/assets/stylesheets/_fontawesome.scss +4 -0
  7. data/app/assets/stylesheets/_framework.scss +1 -1
  8. data/app/assets/stylesheets/application.scss +1 -0
  9. data/app/assets/stylesheets/iqvoc/_bootstrap_overrides.scss +30 -1
  10. data/app/assets/stylesheets/iqvoc/components/_components.scss +2 -2
  11. data/app/assets/stylesheets/iqvoc/components/_onebox.scss +1 -1
  12. data/app/assets/stylesheets/iqvoc/components/_simplete.scss +5 -0
  13. data/app/assets/stylesheets/iqvoc/components/_treeview.scss +4 -4
  14. data/app/assets/stylesheets/iqvoc/hacks/_hacks.scss +1 -12
  15. data/app/assets/stylesheets/iqvoc/settings/_fonts.scss +33 -33
  16. data/app/assets/stylesheets/iqvoc/settings/_mixins.scss +0 -14
  17. data/app/helpers/application_helper.rb +2 -2
  18. data/app/helpers/navigation_helper.rb +1 -1
  19. data/app/javascript/application.js +4 -0
  20. data/app/{assets/javascripts → javascript}/iqvoc/concept_mapping_manager.js +2 -2
  21. data/app/{assets/javascripts → javascript}/iqvoc/entityselect.js +4 -6
  22. data/app/{assets/javascripts → javascript}/iqvoc/federated_concept_mapper.js +3 -4
  23. data/app/{assets/javascripts → javascript/iqvoc}/framework.js +0 -1
  24. data/app/javascript/iqvoc/globals.js +13 -0
  25. data/app/javascript/iqvoc/hover_menues.js +25 -0
  26. data/app/{assets/javascripts → javascript}/iqvoc/iqvoc.js +6 -2
  27. data/app/{assets/javascripts → javascript}/iqvoc/treeview.js +11 -10
  28. data/app/javascript/manifest.js +12 -0
  29. data/app/models/concerns/versioning.rb +6 -0
  30. data/app/views/collections/alphabetical/_search_result.html.erb +1 -1
  31. data/app/views/concepts/_form.html.erb +2 -4
  32. data/app/views/concepts/alphabetical/_search_result.html.erb +1 -1
  33. data/app/views/concepts/glance.html.erb +3 -6
  34. data/app/views/dashboard/_table.html.erb +2 -2
  35. data/app/views/dashboard/glance.html.erb +3 -6
  36. data/app/views/exports/index.html.erb +5 -5
  37. data/app/views/frontpage/index.html.erb +3 -3
  38. data/app/views/imports/index.html.erb +3 -4
  39. data/app/views/instance_configuration/index.html.erb +1 -1
  40. data/app/views/layouts/_controls.html.erb +2 -2
  41. data/app/views/layouts/_navigation.html.erb +1 -1
  42. data/app/views/layouts/_sections.html.erb +1 -1
  43. data/app/views/layouts/_user_navigation.html.erb +2 -2
  44. data/app/views/layouts/application.html.erb +2 -4
  45. data/app/views/pages/components.html.erb +5 -5
  46. data/app/views/partials/labeling/skos/_edit_base.html.erb +1 -3
  47. data/app/views/partials/labeling/skos/_search_result.html.erb +1 -1
  48. data/app/views/partials/match/_edit_base.html.erb +1 -1
  49. data/app/views/partials/notation/_edit_base.html.erb +1 -1
  50. data/app/views/partials/note/_edit_base.html.erb +1 -1
  51. data/app/views/partials/note/_search_result.html.erb +1 -1
  52. data/app/views/partials/note/skos/change_note/_search_result.html.erb +1 -1
  53. data/app/views/partials/note/skos/definition/_search_result.html.erb +1 -1
  54. data/app/views/search_results/_form.html.erb +4 -4
  55. data/app/views/search_results/sections/_change_note.html.erb +5 -11
  56. data/app/views/search_results/sections/_collection.html.erb +1 -1
  57. data/app/views/search_results/sections/_datasets.html.erb +1 -1
  58. data/app/views/search_results/sections/_klass.html.erb +1 -1
  59. data/app/views/search_results/sections/_languages.html.erb +4 -3
  60. data/app/views/search_results/sections/_mode.html.erb +1 -1
  61. data/app/views/search_results/sections/_options.html.erb +1 -1
  62. data/app/views/search_results/sections/_terms.html.erb +4 -3
  63. data/app/views/search_results/sections/_type.html.erb +3 -5
  64. data/app/views/users/_form.html.erb +1 -3
  65. data/config/application.rb +0 -1
  66. data/config/engine.rb +3 -1
  67. data/config/initializers/assets.rb +8 -0
  68. data/config/initializers/iqvoc.rb +1 -1
  69. data/db/migrate/20260917120000_add_index_on_labelings_target_id.rb +5 -0
  70. data/iqvoc.gemspec +7 -5
  71. data/lib/iqvoc/configuration/instance_configuration.rb +2 -0
  72. data/lib/iqvoc/version.rb +1 -1
  73. data/lib/tasks/.gitkeep +0 -0
  74. data/lib/tasks/exporter.rake +1 -1
  75. data/test/system/.keep +0 -0
  76. metadata +60 -28
  77. data/app/assets/builds/application.css +0 -22548
  78. data/app/assets/builds/application.js +0 -18468
  79. data/app/assets/builds/application.js.map +0 -7
  80. data/app/assets/builds/manifest.js +0 -17848
  81. data/app/assets/builds/manifest.js.map +0 -7
  82. data/app/assets/javascripts/iqvoc/hover_menues.js +0 -14
  83. data/app/assets/javascripts/manifest.js +0 -2
  84. data/config/database.yml +0 -20
  85. data/db/schema.rb +0 -208
  86. /data/app/assets/stylesheets/{manifest.scss → _manifest.scss} +0 -0
  87. /data/app/{assets/javascripts → javascript}/iqvoc/autocomplete.js +0 -0
  88. /data/app/{assets/javascripts → javascript}/iqvoc/create_note.js +0 -0
  89. /data/app/{assets/javascripts → javascript}/iqvoc/debounce.js +0 -0
  90. /data/app/{assets/javascripts → javascript}/iqvoc/entityselect_qualified.js +0 -0
  91. /data/app/{assets/javascripts → javascript}/iqvoc/label_resolver.js +0 -0
  92. /data/app/{assets/javascripts → javascript}/iqvoc/langselect.js +0 -0
  93. /data/app/{assets/javascripts → javascript}/iqvoc/manifest.js +0 -0
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3a27e9eb52dbc92be01a2194a08bb1a92c3442b3313e6713f260eb1768717521
4
- data.tar.gz: d7bdcfb9a215af609f10ec61ee4a2371a31411d06c46880416a3ab9287b12c67
3
+ metadata.gz: 6f67e560f1aac50c13bd28d33a5929ac876f297bda3e023c3474f728c397bfba
4
+ data.tar.gz: '0818c7dfe12e3b7fd16fcf9098871d3fa1d50859c03f5264a4665ec8a8e840c7'
5
5
  SHA512:
6
- metadata.gz: 1341cc25b7788bab29de5a9a5d9516c5e178111cbe59b3f431fdba8068a9efb931763b41c37369eb864a6fbaf47e428ae01f0b475967d098410d5dd0e07ccea2
7
- data.tar.gz: e6c0a6e1015024ce4dd3b6650dbe31198a17012cc1015049750f186d2e7b017d18c0914ba52c33457e8538f892ddebc2b0776fc1083f64c33c3f69d90b554a92
6
+ metadata.gz: c5d7c4b4a4a3c79a9add3e8e350cdb021ff72bdeb620fa31622dca5c1848c963a94f75cce7547df16076de497a0bde490d07db348cec3ba198b8e24740fd1e7d
7
+ data.tar.gz: 990188563110861ce3ad6a80095e772f003502e64bacf81a78c044ba4f7ac4a45648929ac01cc47e37b1372636bc2afbbaabb67069954939477293713fb577f5
data/CHANGELOG.md CHANGED
@@ -1,3 +1,17 @@
1
+ ## [4.17.0]
2
+
3
+ * upgrade to Bootstrap v5 (and `bootstrap_form` v5)
4
+ * replace faucet-pipeline with Propshaft, `jsbundling-rails` (esbuild) and
5
+ `cssbundling-rails` (Sass); JavaScript moved to `app/javascript`
6
+ * upgrade to Font Awesome v7, replace `jquery-ujs` with `@rails/ujs`
7
+ * `bin/dev` now starts all processes from `Procfile.dev` via foreman
8
+ * add a `draft` relation to the `Versioning` concern
9
+ * add an index on `labelings.target_id` (requires migration)
10
+ * rename SKOS dumps to `<export_file_prefix>-<timestamp>.<type>` and default
11
+ `Iqvoc.export_file_prefix` to `iqvoc-data`
12
+ * drop some inline styles
13
+ * test against Ruby 4 on CI
14
+
1
15
  ## [4.16.0]
2
16
 
3
17
  * export SKOS as a ZIP archive, via `rake iqvoc:export ZIP=true` and the web interface
data/Gemfile CHANGED
@@ -37,7 +37,7 @@ gem 'nokogiri'
37
37
  gem 'linkeddata'
38
38
  gem 'rdf-vocab'
39
39
  gem "deep_cloneable"
40
- gem "bootstrap_form", "~> 4.0"
40
+ gem "bootstrap_form", "~> 5.0"
41
41
  gem 'apipie-rails'
42
42
  gem 'maruku', require: false # needed for apipie documentation
43
43
  gem 'database_cleaner'
@@ -45,7 +45,9 @@ gem 'delayed_job_active_record'
45
45
  gem 'rubyzip'
46
46
  gem 'carrierwave'
47
47
  gem 'carrierwave-i18n'
48
- gem 'faucet_pipeline_rails'
48
+ gem 'propshaft'
49
+ gem 'cssbundling-rails'
50
+ gem 'jsbundling-rails'
49
51
  gem 'bootsnap', require: false
50
52
 
51
53
  # database adapters
@@ -58,7 +60,6 @@ gem 'rack-mini-profiler'
58
60
 
59
61
  group :development do
60
62
  gem 'web-console', '>= 4.1.0'
61
- gem 'listen', '~> 3.3'
62
63
  end
63
64
 
64
65
  group :development, :test do
File without changes
File without changes
@@ -0,0 +1,4 @@
1
+ @use '@fortawesome/fontawesome-free/scss/variables' with ($font-path: '');
2
+ @use '@fortawesome/fontawesome-free/scss/fontawesome';
3
+ @use '@fortawesome/fontawesome-free/scss/solid';
4
+ @use '@fortawesome/fontawesome-free/scss/regular';
@@ -1,4 +1,4 @@
1
1
  @import 'bootstrap/scss/bootstrap';
2
2
 
3
- @import 'font-awesome/scss/font-awesome';
3
+ @import 'fontawesome';
4
4
  @import 'bootstrap-datepicker/dist/css/bootstrap-datepicker3.standalone';
@@ -0,0 +1 @@
1
+ @import 'manifest';
@@ -1,7 +1,36 @@
1
+ // These placeholders live here (rather than in settings/_mixins.scss, which
2
+ // is imported before Bootstrap) so that Sass's @extend emits their merged
3
+ // selector at this position in the cascade. Bootstrap 5's own .btn rule
4
+ // sets font-family explicitly, so if the merged selector compiled in
5
+ // earlier (pre-Bootstrap), Bootstrap's later same-specificity rule would
6
+ // win and silently override it.
7
+ %font-interaction {
8
+ font-family: 'Fira Sans Light SC';
9
+ text-transform: lowercase;
10
+ }
11
+
12
+ %font-bold {
13
+ font-family: 'Fira Sans Bold';
14
+ font-weight: 700;
15
+ }
16
+
17
+ %font-light {
18
+ font-family: 'Fira Sans Light';
19
+ }
20
+
1
21
  body > .container {
2
22
  padding-top: 5rem;
3
23
  }
4
24
 
25
+ // Bootstrap 5 floats <legend> (float: left; width: 100%) to work around a
26
+ // Firefox fieldset/flex bug, clearing it only on the very next sibling
27
+ // (`legend + *`). Fieldsets with more than one element after the legend
28
+ // (like ours) leave the float uncleared, which can squeeze later siblings
29
+ // to zero width. We don't need the Firefox fix here, so disable the float.
30
+ legend {
31
+ float: none;
32
+ }
33
+
5
34
  form#search {
6
35
  .btn-group {
7
36
  margin-top: 10px;
@@ -48,7 +77,7 @@ small {
48
77
  margin-bottom: -0.5em;
49
78
  }
50
79
 
51
- > .close {
80
+ > .btn-close {
52
81
  font-size: $h3-font-size;
53
82
  }
54
83
  }
@@ -1,9 +1,9 @@
1
1
  .indicator {
2
- .fa {
2
+ .fa-solid {
3
3
  visibility: hidden;
4
4
  }
5
5
 
6
- &.active .fa {
6
+ &.active .fa-solid {
7
7
  visibility: visible;
8
8
  }
9
9
  }
@@ -3,7 +3,7 @@
3
3
  justify-content: center;
4
4
  padding-top: 80px;
5
5
  margin-top: 2em;
6
- background: asset-url("iqvoc_logo.svg") top center no-repeat;
6
+ background: url("/iqvoc_logo.svg") top center no-repeat;
7
7
 
8
8
  .logo {
9
9
  margin: 2em 0 1em 0;
@@ -1,3 +1,8 @@
1
+ simplete-form {
2
+ position: relative;
3
+ display: block;
4
+ }
5
+
1
6
  simplete-form #loading,
2
7
  simplete-suggestions #loading {
3
8
  opacity: 0;
@@ -7,7 +7,7 @@ ul.jqtree-tree {
7
7
  margin-left: 0;
8
8
 
9
9
  li {
10
- background: asset-url('treeview-default-line.gif') no-repeat;
10
+ background: url('/treeview-default-line.gif') no-repeat;
11
11
  background-position: 2px 0px;
12
12
  line-height: 1.8em;
13
13
  padding-left: 18px;
@@ -75,7 +75,7 @@ ul.jqtree-tree {
75
75
  border-bottom: 0;
76
76
  color: #333;
77
77
  cursor: pointer;
78
- margin-left: -14px;
78
+ margin-left: -18px;
79
79
  margin-right: .5em;
80
80
  text-decoration: none;
81
81
 
@@ -96,10 +96,10 @@ ul.jqtree-tree {
96
96
  }
97
97
  }
98
98
 
99
- .fa-arrows { cursor: move;}
99
+ .drag { cursor: move;}
100
100
 
101
101
  .jqtree-loading > div.jqtree-element.jqtree_common:after {
102
- content: asset-url('ajax-loader.gif');
102
+ content: url('/ajax-loader.gif');
103
103
  margin-left: 8px;
104
104
  }
105
105
 
@@ -1,12 +1 @@
1
- legend {
2
- margin-bottom: 0;
3
- }
4
-
5
- fieldset > div:first-of-type, ol:first-of-type {
6
- -webkit-margin-top-collapse: separate;
7
- margin-top: 27px;
8
- }
9
-
10
- .fa {
11
- font-family: FontAwesome;
12
- }
1
+ // Hacks - single place of shame
@@ -1,79 +1,79 @@
1
1
  @font-face {
2
2
  font-family: 'Fira Sans Light SC';
3
- src: asset-url('FiraSans-Light-SC.eot');
4
- src: asset-url('FiraSans-Light-SC.eot') format('embedded-opentype'),
5
- asset-url('FiraSans-Light-SC.woff2') format('woff2'),
6
- asset-url('FiraSans-Light-SC.woff') format('woff'),
7
- asset-url('FiraSans-Light-SC.ttf') format('truetype');
3
+ src: url('/FiraSans-Light-SC.eot');
4
+ src: url('/FiraSans-Light-SC.eot') format('embedded-opentype'),
5
+ url('/FiraSans-Light-SC.woff2') format('woff2'),
6
+ url('/FiraSans-Light-SC.woff') format('woff'),
7
+ url('/FiraSans-Light-SC.ttf') format('truetype');
8
8
  font-style: normal;
9
9
  }
10
10
 
11
11
  @font-face {
12
12
  font-family: 'Fira Sans ExtraLight';
13
- src: asset-url('FiraSans-ExtraLight.eot');
14
- src: asset-url('FiraSans-ExtraLight.eot') format('embedded-opentype'),
15
- asset-url('FiraSans-ExtraLight.woff') format('woff'),
16
- asset-url('FiraSans-ExtraLight.ttf') format('truetype');
13
+ src: url('/FiraSans-ExtraLight.eot');
14
+ src: url('/FiraSans-ExtraLight.eot') format('embedded-opentype'),
15
+ url('/FiraSans-ExtraLight.woff') format('woff'),
16
+ url('/FiraSans-ExtraLight.ttf') format('truetype');
17
17
  font-style: normal;
18
18
  }
19
19
 
20
20
  @font-face {
21
21
  font-family: 'Fira Sans Regular';
22
- src: asset-url('FiraSans-Regular.eot');
23
- src: asset-url('FiraSans-Regular.eot') format('embedded-opentype'),
24
- asset-url('FiraSans-Regular.woff') format('woff'),
25
- asset-url('FiraSans-Regular.ttf') format('truetype');
22
+ src: url('/FiraSans-Regular.eot');
23
+ src: url('/FiraSans-Regular.eot') format('embedded-opentype'),
24
+ url('/FiraSans-Regular.woff') format('woff'),
25
+ url('/FiraSans-Regular.ttf') format('truetype');
26
26
  font-weight: 400;
27
27
  font-style: normal;
28
28
  }
29
29
 
30
30
  @font-face {
31
31
  font-family: 'Fira Sans Regular Italic';
32
- src: asset-url('FiraSans-Italic.eot');
33
- src: asset-url('FiraSans-Italic.eot') format('embedded-opentype'),
34
- asset-url('FiraSans-Italic.woff') format('woff'),
35
- asset-url('FiraSans-Italic.ttf') format('truetype');
32
+ src: url('/FiraSans-Italic.eot');
33
+ src: url('/FiraSans-Italic.eot') format('embedded-opentype'),
34
+ url('/FiraSans-Italic.woff') format('woff'),
35
+ url('/FiraSans-Italic.ttf') format('truetype');
36
36
  font-weight: 400;
37
37
  font-style: italic;
38
38
  }
39
39
 
40
40
  @font-face {
41
41
  font-family: 'Fira Sans Bold';
42
- src: asset-url('FiraSans-Bold.eot');
43
- src: asset-url('FiraSans-Bold.eot') format('embedded-opentype'),
44
- asset-url('FiraSans-Bold.woff') format('woff'),
45
- asset-url('FiraSans-Bold.ttf') format('truetype');
42
+ src: url('/FiraSans-Bold.eot');
43
+ src: url('/FiraSans-Bold.eot') format('embedded-opentype'),
44
+ url('/FiraSans-Bold.woff') format('woff'),
45
+ url('/FiraSans-Bold.ttf') format('truetype');
46
46
  font-weight: 700;
47
47
  font-style: normal;
48
48
  }
49
49
 
50
50
  @font-face {
51
51
  font-family: 'Fira Sans Bold Italic';
52
- src: asset-url('FiraSans-BoldItalic.eot');
53
- src: asset-url('FiraSans-BoldItalic.eot') format('embedded-opentype'),
54
- asset-url('FiraSans-BoldItalic.woff') format('woff'),
55
- asset-url('FiraSans-BoldItalic.ttf') format('truetype');
52
+ src: url('/FiraSans-BoldItalic.eot');
53
+ src: url('/FiraSans-BoldItalic.eot') format('embedded-opentype'),
54
+ url('/FiraSans-BoldItalic.woff') format('woff'),
55
+ url('/FiraSans-BoldItalic.ttf') format('truetype');
56
56
  font-weight: 700;
57
57
  font-style: italic;
58
58
  }
59
59
 
60
60
  @font-face {
61
61
  font-family: 'Fira Mono Regular';
62
- src: asset-url('FiraMono-Regular.eot');
63
- src: asset-url('FiraMono-Regular.eot') format('embedded-opentype'),
64
- asset-url('FiraMono-Regular.woff') format('woff'),
65
- asset-url('FiraMono-Regular.ttf') format('truetype');
62
+ src: url('/FiraMono-Regular.eot');
63
+ src: url('/FiraMono-Regular.eot') format('embedded-opentype'),
64
+ url('/FiraMono-Regular.woff') format('woff'),
65
+ url('/FiraMono-Regular.ttf') format('truetype');
66
66
  font-weight: 400;
67
67
  font-style: normal;
68
68
  }
69
69
 
70
70
  @font-face {
71
71
  font-family: 'Fira Sans Light';
72
- src: asset-url('FiraSans-Light.eot');
72
+ src: url('/FiraSans-Light.eot');
73
73
  src: local('Fira Sans Light'),
74
- asset-url('FiraSans-Light.eot') format('embedded-opentype'),
75
- asset-url('FiraSans-Light.woff') format('woff'),
76
- asset-url('FiraSans-Light.ttf') format('truetype');
74
+ url('/FiraSans-Light.eot') format('embedded-opentype'),
75
+ url('/FiraSans-Light.woff') format('woff'),
76
+ url('/FiraSans-Light.ttf') format('truetype');
77
77
  font-weight: 300;
78
78
  font-style: normal;
79
79
  }
@@ -1,17 +1,3 @@
1
- %font-interaction {
2
- font-family: 'Fira Sans Light SC';
3
- text-transform: lowercase;
4
- }
5
-
6
- %font-bold {
7
- font-family: 'Fira Sans Bold';
8
- font-weight: 700;
9
- }
10
-
11
- %font-light {
12
- font-family: 'Fira Sans Light';
13
- }
14
-
15
1
  @mixin transitional($property: all, $duration: .25s) {
16
2
  transition: $property $duration ease-in-out;
17
3
  }
@@ -86,7 +86,7 @@ module ApplicationHelper
86
86
  end
87
87
 
88
88
  def icon(name, additional_css = '')
89
- css_classes = %W(fa fa-#{name})
89
+ css_classes = %W(fa-solid fa-#{name})
90
90
  if additional_css.respond_to?(:split)
91
91
  css_classes << additional_css.split(' ')
92
92
  end
@@ -111,7 +111,7 @@ module ApplicationHelper
111
111
  end
112
112
 
113
113
  def loading_indicator(label)
114
- "<i class=\"fa fa-spin fa-spinner\"></i> #{label}"
114
+ "<i class=\"fa-solid fa-spin fa-spinner\"></i> #{label}"
115
115
  end
116
116
 
117
117
  end
@@ -53,7 +53,7 @@ module NavigationHelper
53
53
  end
54
54
 
55
55
  def sidebar_header(text)
56
- content_tag :h3, text, class: 'sidebar-header'
56
+ content_tag :h2, text, class: 'sidebar-header'
57
57
  end
58
58
 
59
59
  def sidebar_item(opts = {}, &block)
@@ -0,0 +1,4 @@
1
+ import Rails from '@rails/ujs'
2
+ Rails.start()
3
+
4
+ import './manifest'
@@ -63,7 +63,7 @@
63
63
  dataset = $('<span class="concept-mapping-dataset" />').text(dataset.name);
64
64
  if(this.editable) {
65
65
  var self = this;
66
- var btn = $("<i class='fa fa-times concept-mapping-remove' />").click(function(ev) {
66
+ var btn = $("<i class='fa-solid fa-xmark concept-mapping-remove' />").click(function(ev) {
67
67
  // inject instance
68
68
  var args = Array.prototype.slice.apply(arguments);
69
69
  args.push(self);
@@ -116,7 +116,7 @@
116
116
  });
117
117
 
118
118
  urisByLabel[label] = { el: el, values: values };
119
- }).closest("div:has(label)").hide(); // XXX: does not belong here
119
+ }).closest("div:has(label)").addClass("d-none"); // XXX: does not belong here
120
120
 
121
121
  return urisByLabel;
122
122
  };
@@ -11,9 +11,8 @@ var EntitySelector = function(node) {
11
11
  }
12
12
  this.el = $(node).hide(); // XXX: rename
13
13
  this.container = $('<div class="entity_select" />').data("widget", this);
14
- this.indicator = $('<div class="indicator input-group-append" />')
15
- .append($('<span class="input-group-text" />')
16
- .append('<i class="fa fa-refresh fa-spin" />'));
14
+ this.indicator = $('<span class="indicator input-group-text" />')
15
+ .append('<i class="fa-solid fa-arrows-rotate fa-spin" />');
17
16
  this.delimiter = ",";
18
17
  this.singular = this.el.data("singular") || false;
19
18
  this.entities = this.getSelection();
@@ -35,10 +34,9 @@ var EntitySelector = function(node) {
35
34
  // XXX: does not belong here -- XXX: obsolete?
36
35
  var lang = this.el.data("language");
37
36
  if(lang) {
38
- $('<div class="input-group-prepend" />')
39
- .append($('<span class="input-group-text" />')
37
+ $('<span class="input-group-text" />')
40
38
  .append(lang)
41
- ).prependTo(this.inputGroup);
39
+ .prependTo(this.inputGroup);
42
40
  }
43
41
 
44
42
  IQVOC.autocomplete(input, $.proxy(this, "onInput"), {
@@ -22,14 +22,14 @@
22
22
  this.container = $("<div />").addClass("concept-mapper control-group");
23
23
 
24
24
  this.bootstrapInputGroup = $('<div class="input-group" />');
25
- this.indicator = $('<div class="indicator input-group-append" />');
25
+ this.indicator = $('<span class="indicator input-group-text" />');
26
26
 
27
27
  this.input = this.bootstrapInputGroup
28
28
  .append($("<input />").attr("type", "text").addClass("form-control"))
29
29
  .append(this.indicator)
30
30
  .prependTo(this.container);
31
31
 
32
- $("<button />").addClass("btn btn-outline-secondary fa fa-plus").
32
+ $("<button />").addClass("btn btn-outline-secondary fa-solid fa-plus").
33
33
  insertAfter(this.input).click($.proxy(this, "onConfirm"));
34
34
 
35
35
  this.matchType = $("<select />").addClass("form-control")
@@ -86,8 +86,7 @@
86
86
  this.source = $("<select />").addClass("form-control").append(sources).
87
87
  insertBefore(this.input);
88
88
 
89
- this.indicator.append($('<span class="input-group-text" />')
90
- .append('<i class="fa fa-refresh fa-spin" />'));
89
+ this.indicator.append('<i class="fa-solid fa-arrows-rotate fa-spin" />');
91
90
 
92
91
  var self = this;
93
92
  var input = this.input.find("input")
@@ -1,5 +1,4 @@
1
1
  import 'document-register-element/build/document-register-element.js';
2
- import 'jquery-ujs/src/rails';
3
2
  import 'bootstrap-datepicker/js/bootstrap-datepicker';
4
3
  import 'bootstrap-datepicker/js/locales/bootstrap-datepicker.de.js';
5
4
  import 'simplete/simplete';
@@ -0,0 +1,13 @@
1
+ // Exposes jQuery as a global for the legacy jQuery plugins that expect it
2
+ // on `window` (bootstrap-datepicker, typeahead.js, jqtree) rather than
3
+ // importing it themselves.
4
+ //
5
+ // This must be the first thing manifest.js imports: ES module imports
6
+ // fully evaluate (module + top-level body) in declaration order before the
7
+ // importing module's own body runs, so as long as this module is imported
8
+ // before typeahead/bootstrap-datepicker/etc., `window.jQuery` is guaranteed
9
+ // to be set by the time their own top-level code (which attaches to it
10
+ // eagerly, not inside a deferred callback) executes.
11
+ import $ from 'jquery'
12
+
13
+ window.jQuery = window.$ = $
@@ -0,0 +1,25 @@
1
+ const navbarToggler = document.querySelector('.navbar-toggler');
2
+ const isNavbarCollapsed = () => !!navbarToggler && getComputedStyle(navbarToggler).display !== 'none';
3
+
4
+ document.querySelectorAll('ul.navbar-nav li.dropdown').forEach((dropdown) => {
5
+ const menu = dropdown.querySelector('.dropdown-menu');
6
+ const navLink = dropdown.querySelector(':scope > .nav-link');
7
+ let timer;
8
+
9
+ const schedule = (fn) => {
10
+ clearTimeout(timer);
11
+ timer = setTimeout(fn, 100);
12
+ };
13
+
14
+ dropdown.addEventListener('mouseenter', () => schedule(() => {
15
+ if (isNavbarCollapsed()) return;
16
+ if (menu) menu.style.display = 'block';
17
+ if (navLink) navLink.classList.add('hover');
18
+ }));
19
+
20
+ dropdown.addEventListener('mouseleave', () => schedule(() => {
21
+ if (isNavbarCollapsed()) return;
22
+ if (menu) menu.style.display = '';
23
+ if (navLink) navLink.classList.remove('hover');
24
+ }));
25
+ });
@@ -1,6 +1,8 @@
1
1
  /*jslint vars: true, unparam: true, browser: true, white: true */
2
2
  /*global jQuery */
3
3
 
4
+ import * as bootstrap from 'bootstrap'
5
+
4
6
  window.IQVOC = {};
5
7
 
6
8
  jQuery(document).ready(function($) {
@@ -104,7 +106,7 @@ jQuery(document).ready(function($) {
104
106
 
105
107
  $.get(target, function(data) {
106
108
  modal.html(data);
107
- modal.modal();
109
+ bootstrap.Modal.getOrCreateInstance(modal[0]).show();
108
110
  });
109
111
  });
110
112
 
@@ -112,6 +114,8 @@ jQuery(document).ready(function($) {
112
114
  $(".tab-panels").addClass("tab-content"); // the latter is for Bootstrap Tabs
113
115
 
114
116
  $(function () {
115
- $('[data-toggle="tooltip"]').tooltip()
117
+ $('[data-bs-toggle="tooltip"]').each(function() {
118
+ new bootstrap.Tooltip(this);
119
+ });
116
120
  })
117
121
  });
@@ -1,4 +1,5 @@
1
1
  import 'jqtree/tree.jquery.js';
2
+ import * as bootstrap from 'bootstrap'
2
3
 
3
4
  /*jslint vars: true, browser: true, white: true */
4
5
  /*global jQuery, IQVOC */
@@ -42,8 +43,8 @@ import 'jqtree/tree.jquery.js';
42
43
  autoEscape: false,
43
44
  selectable: false,
44
45
  useContextMenu: false,
45
- closedIcon: $('<i class="fa fa-plus-square-o"></i>'),
46
- openedIcon: $('<i class="fa fa-minus-square-o"></i>'),
46
+ closedIcon: $('<i class="fa-regular fa-square-plus"></i>'),
47
+ openedIcon: $('<i class="fa-regular fa-square-minus"></i>'),
47
48
  data: data,
48
49
  dataUrl: function(node) {
49
50
  var uri = new URL(url, window.location.origin);
@@ -76,13 +77,13 @@ import 'jqtree/tree.jquery.js';
76
77
  if (node && node.locked) {
77
78
  // add icon only to the first element of the collection.
78
79
  // the second one could be a nodelist for parents nodes.
79
- $li.find('.jqtree-element').append(' <i class="fa fa-lock"/>');
80
+ $li.find('.jqtree-element').append(' <i class="fa-solid fa-lock"/>');
80
81
  }
81
82
 
82
83
  if (node && !node.locked) {
83
84
  // add icon only to the first element of the collection.
84
85
  // the second one could be a nodelist for parents nodes.
85
- $li.find('.jqtree-element').append(' <i class="fa fa-arrows"/>');
86
+ $li.find('.jqtree-element').append(' <i class="drag fa-solid fa-arrows-up-down-left-right"/>');
86
87
  }
87
88
  }
88
89
 
@@ -96,9 +97,9 @@ import 'jqtree/tree.jquery.js';
96
97
  'glance-url': node.glance_url
97
98
  });
98
99
 
99
- var saveButton = $('<button type="button" class="btn btn-primary btn-sm node-btn" data-tree-action="move"><i class="fa fa-save"></i> ' + saveLabel + '</button>');
100
- var copyButton = $('<button type="button" class="btn btn-primary btn-sm node-btn" data-tree-action="copy"><i class="fa fa-copy"></i> ' + copyLabel + '</button>');
101
- var undoButton = $('<button type="button" class="btn btn-primary btn-sm reset-node-btn"><i class="fa fa-undo"></i> ' + undoLabel + '</button>');
100
+ var saveButton = $('<button type="button" class="btn btn-primary btn-sm node-btn" data-tree-action="move"><i class="fa-solid fa-floppy-disk"></i> ' + saveLabel + '</button>');
101
+ var copyButton = $('<button type="button" class="btn btn-primary btn-sm node-btn" data-tree-action="copy"><i class="fa-solid fa-copy"></i> ' + copyLabel + '</button>');
102
+ var undoButton = $('<button type="button" class="btn btn-primary btn-sm reset-node-btn"><i class="fa-solid fa-arrow-rotate-left"></i> ' + undoLabel + '</button>');
102
103
 
103
104
  // add icon only to the first element of the collection.
104
105
  // the second one could be a nodelist for parents nodes.
@@ -111,7 +112,7 @@ import 'jqtree/tree.jquery.js';
111
112
  },
112
113
  onIsMoveHandle: function($element) {
113
114
  // dom element which acts as move handle
114
- return ($element.is('.fa-arrows'));
115
+ return ($element.is('.fa-arrows-up-down-left-right'));
115
116
  },
116
117
  onCanMoveTo: function(moved_node, target_node, position){
117
118
  // prevent node movement inside parent node
@@ -246,7 +247,7 @@ import 'jqtree/tree.jquery.js';
246
247
 
247
248
  teaserLink.addClass('tree-element-teaser-link')
248
249
  .attr('href', node.glance_url)
249
- .append($('<i class="fa fa-search-plus" aria-hidden="true" />'))
250
+ .append($('<i class="fa-solid fa-magnifying-glass-plus" aria-hidden="true" />'))
250
251
 
251
252
  teaserLink.on('click', function(ev) {
252
253
  ev.preventDefault();
@@ -256,7 +257,7 @@ import 'jqtree/tree.jquery.js';
256
257
 
257
258
  $.get(target, function(data) {
258
259
  modal.html(data);
259
- modal.modal();
260
+ bootstrap.Modal.getOrCreateInstance(modal[0]).show();
260
261
  });
261
262
  });
262
263
 
@@ -0,0 +1,12 @@
1
+ // Central export of iqvoc's own JavaScript, for other apps/gems to import
2
+ // (via `import 'iqvoc'`, resolved through package.json's "main"). Does not
3
+ // start Rails/UJS - see application.js for that - so it's safe to import
4
+ // from a library context without triggering app-level bootstrapping.
5
+ //
6
+ // Import order matters here: ./iqvoc/globals must run first so that
7
+ // window.jQuery is set before framework/manifest's legacy jQuery plugins,
8
+ // which attach to window.jQuery eagerly at import time rather than inside
9
+ // a deferred callback.
10
+ import './iqvoc/globals'
11
+ import './iqvoc/framework'
12
+ import './iqvoc/manifest'
@@ -25,6 +25,12 @@ module Versioning
25
25
  class_name: name,
26
26
  optional: true
27
27
 
28
+ # the unpublished record being edited on top of this one
29
+ has_one :draft,
30
+ foreign_key: 'published_version_id',
31
+ class_name: name,
32
+ inverse_of: :published_version
33
+
28
34
  after_initialize do
29
35
  disable_validations_for_publishing
30
36
  end
@@ -3,7 +3,7 @@
3
3
  <%= link_to result.label.to_s, rdf_path(result.concept, lang: nil, format: nil),
4
4
  alt: result.concept.origin, data: { 'resource-path': result.path, 'resource-url': rdf_url(result.concept, lang: nil, format: nil) }, class: 'concept-item-link' %>
5
5
  <% if Iqvoc.concept_modal_preview_enabled? %>
6
- <a href="<%= glance_concept_url(result.concept, format: :html) %>" class="dashboard-glance-link"><i class="fa fa-search-plus"></i></a>
6
+ <a href="<%= glance_concept_url(result.concept, format: :html) %>" class="dashboard-glance-link"><i class="fa-solid fa-magnifying-glass-plus"></i></a>
7
7
  <% end %>
8
8
 
9
9
  <% if result.concept.additional_info.present? %>
@@ -40,10 +40,8 @@
40
40
  :concept => concept, :klass => Iqvoc::Concept.broader_relation_class.narrower_class, :f => f %>
41
41
  <%- end -%>
42
42
 
43
- <%= f.form_group :top_term do %>
44
- <%= f.check_box :top_term,
45
- :class => ("exclusive" if Iqvoc::Concept.broader_relation_class.singular?) %>
46
- <% end %>
43
+ <%= f.check_box :top_term,
44
+ :class => ("exclusive" if Iqvoc::Concept.broader_relation_class.singular?) %>
47
45
 
48
46
  <%= render Iqvoc::Concept.broader_relation_class.edit_partial_name(concept),
49
47
  :concept => concept, :klass => Iqvoc::Concept.broader_relation_class, :f => f %>