iqvoc 4.13.0 → 4.13.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (272) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +11 -1
  3. data/Gemfile +9 -10
  4. data/Gemfile.lock +206 -167
  5. data/README.md +7 -6
  6. data/app/assets/javascripts/framework.js +3 -3
  7. data/app/assets/javascripts/iqvoc/hover_menues.js +14 -0
  8. data/app/assets/javascripts/iqvoc/iqvoc.js +46 -41
  9. data/app/assets/javascripts/iqvoc/manifest.js +2 -1
  10. data/app/assets/javascripts/iqvoc/treeview.js +2 -1
  11. data/app/assets/stylesheets/iqvoc/components/_entity_select.scss +5 -8
  12. data/app/assets/stylesheets/iqvoc/components/_simplete.scss +2 -1
  13. data/app/assets/stylesheets/iqvoc/components/_treeview.scss +1 -0
  14. data/app/assets/stylesheets/iqvoc/hacks/_hacks.scss +1 -1
  15. data/app/controllers/collections/versions_controller.rb +1 -1
  16. data/app/controllers/collections_controller.rb +1 -1
  17. data/app/controllers/concepts/alphabetical_controller.rb +1 -1
  18. data/app/controllers/concepts/scheme_controller.rb +2 -1
  19. data/app/controllers/concepts/versions_controller.rb +1 -1
  20. data/app/controllers/concepts_controller.rb +9 -3
  21. data/app/controllers/hierarchy_controller.rb +1 -1
  22. data/app/controllers/search_results_controller.rb +3 -0
  23. data/app/controllers/triplestore_sync_controller.rb +2 -2
  24. data/app/controllers/users_controller.rb +1 -1
  25. data/app/helpers/application_helper.rb +6 -3
  26. data/app/helpers/concepts_helper.rb +3 -3
  27. data/app/helpers/link_helper.rb +7 -7
  28. data/app/helpers/navigation_helper.rb +24 -13
  29. data/app/models/abstract_user.rb +1 -1
  30. data/app/models/concept/base.rb +10 -1
  31. data/app/models/concept/skos/base.rb +0 -10
  32. data/app/models/concept/validations.rb +6 -4
  33. data/app/models/concerns/versioning.rb +1 -1
  34. data/app/models/dataset/adaptors/iqvoc/http_adaptor.rb +1 -1
  35. data/app/models/dataset/adaptors/iqvoc/label_adaptor.rb +1 -1
  36. data/app/models/dataset/adaptors/iqvoc/search_adaptor.rb +1 -1
  37. data/app/models/labeling/skos/base.rb +14 -10
  38. data/app/models/user_session.rb +0 -3
  39. data/app/services/rdf_sync_service.rb +3 -3
  40. data/app/views/concepts/alphabetical/_search_result.html.erb +3 -1
  41. data/app/views/concepts/hierarchical/_treeview.html.erb +4 -1
  42. data/app/views/concepts/scheme/show.html.erb +1 -3
  43. data/app/views/errors/server_error.html.erb +1 -2
  44. data/app/views/partials/collection/_member.html.erb +1 -1
  45. data/app/views/partials/concept/relation/_base.html.erb +4 -4
  46. data/app/views/partials/concept/relation/skos/_narrower.html.erb +1 -1
  47. data/app/views/partials/concept/relation/skos/broader/_mono.html.erb +2 -2
  48. data/app/views/partials/concept/relation/skos/broader/_poly.html.erb +2 -2
  49. data/app/views/partials/labeling/skos/_base.html.erb +1 -1
  50. data/app/views/partials/labeling/skos/_edit_base.html.erb +2 -1
  51. data/app/views/partials/labeling/skos/_search_result.html.erb +3 -0
  52. data/app/views/partials/match/_panel.html.erb +2 -2
  53. data/app/views/partials/notation/_base.html.erb +1 -1
  54. data/app/views/search_results/sections/_options.html.erb +10 -0
  55. data/app/views/search_results/sections/_terms.html.erb +1 -1
  56. data/app/views/search_results/sections/_type.html.erb +1 -1
  57. data/bin/bundle +3 -0
  58. data/bin/delayed_job +5 -0
  59. data/bin/rails +4 -0
  60. data/bin/rake +4 -0
  61. data/bin/setup +36 -0
  62. data/bin/update +31 -0
  63. data/bin/yarn +17 -0
  64. data/config/application.rb +15 -10
  65. data/config/boot.rb +2 -2
  66. data/config/cable.yml +1 -1
  67. data/config/database.yml +14 -19
  68. data/config/engine.rb +0 -1
  69. data/config/environment.rb +1 -1
  70. data/config/initializers/backtrace_silencers.rb +4 -3
  71. data/config/initializers/content_security_policy.rb +5 -0
  72. data/config/initializers/filter_parameter_logging.rb +3 -1
  73. data/config/initializers/permissions_policy.rb +11 -0
  74. data/config/initializers/wrap_parameters.rb +3 -3
  75. data/config/initializers/zeitwerk.rb +6 -0
  76. data/config/locales/activerecord.de.yml +2 -2
  77. data/config/locales/de.yml +7 -3
  78. data/config/locales/en.yml +5 -1
  79. data/config/puma.rb +10 -4
  80. data/db/migrate/20220107114201_add_fk_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb +10 -0
  81. data/db/schema.rb +6 -6
  82. data/iqvoc.gemspec +10 -11
  83. data/lib/iqvoc/configuration/core.rb +9 -2
  84. data/lib/iqvoc/configuration/instance_configuration.rb +1 -1
  85. data/lib/iqvoc/environments/development.rb +18 -7
  86. data/lib/iqvoc/environments/production.rb +35 -12
  87. data/lib/iqvoc/environments/test.rb +14 -7
  88. data/lib/iqvoc/version.rb +1 -1
  89. data/lib/tasks/sync.rake +1 -1
  90. data/test/authentication.rb +1 -1
  91. data/test/controllers/hierarchy_test.rb +4 -4
  92. data/test/integration/client_edit_concept_test.rb +1 -1
  93. data/test/integration/concept_collection_assignment_test.rb +6 -6
  94. data/test/integration/search_test.rb +3 -3
  95. data/test/integration_test_helper.rb +2 -2
  96. data/test/models/rdf_sync_test.rb +3 -3
  97. data/test/models/zeitwerk_compliance_test.rb +7 -0
  98. metadata +83 -250
  99. data/config/initializers/new_framework_defaults_5_1.rb +0 -14
  100. data/config/initializers/sqlite3_booleans.rb +0 -1
  101. data/public/422.html +0 -58
  102. data/public/assets/fonts/FiraMono-Regular-0b6138c5b386dc9125473fd851926f29.ttf +0 -0
  103. data/public/assets/fonts/FiraMono-Regular-690950e8d89c92cba41eeeb13f1de93e.woff +0 -0
  104. data/public/assets/fonts/FiraMono-Regular-98f97ed2dbf9d94d4fa5df048434b88d.eot +0 -0
  105. data/public/assets/fonts/FiraMono-Regular.eot +0 -0
  106. data/public/assets/fonts/FiraMono-Regular.ttf +0 -0
  107. data/public/assets/fonts/FiraMono-Regular.woff +0 -0
  108. data/public/assets/fonts/FiraSans-Bold-0de5f536bd0dc370449c0c67a49a6fe7.eot +0 -0
  109. data/public/assets/fonts/FiraSans-Bold-25037ef8d155e38b5df0c242a4c6cf2d.ttf +0 -0
  110. data/public/assets/fonts/FiraSans-Bold-494219a9639084eb9528ff47f79fcda1.woff +0 -0
  111. data/public/assets/fonts/FiraSans-Bold.eot +0 -0
  112. data/public/assets/fonts/FiraSans-Bold.ttf +0 -0
  113. data/public/assets/fonts/FiraSans-Bold.woff +0 -0
  114. data/public/assets/fonts/FiraSans-BoldItalic-5b3b812df9e1cb2b1f34baad65a2bdfb.ttf +0 -0
  115. data/public/assets/fonts/FiraSans-BoldItalic-90b8087c48feff2e828f658c49de5399.eot +0 -0
  116. data/public/assets/fonts/FiraSans-BoldItalic-b10e46158d50bf9b78968112acf87310.woff +0 -0
  117. data/public/assets/fonts/FiraSans-BoldItalic.eot +0 -0
  118. data/public/assets/fonts/FiraSans-BoldItalic.ttf +0 -0
  119. data/public/assets/fonts/FiraSans-BoldItalic.woff +0 -0
  120. data/public/assets/fonts/FiraSans-Book-659d252627051e785260ba445da8930f.woff +0 -0
  121. data/public/assets/fonts/FiraSans-Book-abc65ceb7bfaed729bff7a9d1367b7d4.eot +0 -0
  122. data/public/assets/fonts/FiraSans-Book-f0410501d5ecc5fe66bcdbc02b482c81.ttf +0 -0
  123. data/public/assets/fonts/FiraSans-Book.eot +0 -0
  124. data/public/assets/fonts/FiraSans-Book.ttf +0 -0
  125. data/public/assets/fonts/FiraSans-Book.woff +0 -0
  126. data/public/assets/fonts/FiraSans-ExtraLight-140f15ee97cb2099ff01c2b57dcd1a24.woff +0 -0
  127. data/public/assets/fonts/FiraSans-ExtraLight-28e5c2679df66406ebd117fbdded6753.eot +0 -0
  128. data/public/assets/fonts/FiraSans-ExtraLight-c15de70ebceffce178cbd2e82aa2c373.ttf +0 -0
  129. data/public/assets/fonts/FiraSans-ExtraLight.eot +0 -0
  130. data/public/assets/fonts/FiraSans-ExtraLight.ttf +0 -0
  131. data/public/assets/fonts/FiraSans-ExtraLight.woff +0 -0
  132. data/public/assets/fonts/FiraSans-Italic-ac4cb18fe14a7c90f29cdd2ce499ba59.woff +0 -0
  133. data/public/assets/fonts/FiraSans-Italic-bdea00fee0da5ca9176061e00c26a0da.eot +0 -0
  134. data/public/assets/fonts/FiraSans-Italic-e7e76a0ee170fd29b5d8100753eff569.ttf +0 -0
  135. data/public/assets/fonts/FiraSans-Italic.eot +0 -0
  136. data/public/assets/fonts/FiraSans-Italic.ttf +0 -0
  137. data/public/assets/fonts/FiraSans-Italic.woff +0 -0
  138. data/public/assets/fonts/FiraSans-Light-20adaf630b690c3e3184daaeae585f22.woff +0 -0
  139. data/public/assets/fonts/FiraSans-Light-3689e18b38d335ec0c43823adb6a2984.eot +0 -0
  140. data/public/assets/fonts/FiraSans-Light-55b04531e7a9ecdf58090d70b94b68e2.ttf +0 -0
  141. data/public/assets/fonts/FiraSans-Light-SC-098407a72b7ad46f7c2480d7ac11baf2.eot +0 -0
  142. data/public/assets/fonts/FiraSans-Light-SC-82763fe2ce9e6b897556c6f3c2aceb29.woff2 +0 -0
  143. data/public/assets/fonts/FiraSans-Light-SC-c73985985f0501c1845a5185b180fe6b.woff +0 -0
  144. data/public/assets/fonts/FiraSans-Light-SC-c9563f48d9cccd91f07e46801c27130f.ttf +0 -0
  145. data/public/assets/fonts/FiraSans-Light-SC.eot +0 -0
  146. data/public/assets/fonts/FiraSans-Light-SC.ttf +0 -0
  147. data/public/assets/fonts/FiraSans-Light-SC.woff +0 -0
  148. data/public/assets/fonts/FiraSans-Light-SC.woff2 +0 -0
  149. data/public/assets/fonts/FiraSans-Light.eot +0 -0
  150. data/public/assets/fonts/FiraSans-Light.ttf +0 -0
  151. data/public/assets/fonts/FiraSans-Light.woff +0 -0
  152. data/public/assets/fonts/FiraSans-Medium-082fab59048189168006bf2e914ba8b7.woff +0 -0
  153. data/public/assets/fonts/FiraSans-Medium-11706edfe8651c355b413bd24b4b5e10.eot +0 -0
  154. data/public/assets/fonts/FiraSans-Medium-3a0dacdeaba1b4c054f2d6cb5061965d.ttf +0 -0
  155. data/public/assets/fonts/FiraSans-Medium.eot +0 -0
  156. data/public/assets/fonts/FiraSans-Medium.ttf +0 -0
  157. data/public/assets/fonts/FiraSans-Medium.woff +0 -0
  158. data/public/assets/fonts/FiraSans-MediumItalic-6c8a2646d72641226527d574a8485b66.woff +0 -0
  159. data/public/assets/fonts/FiraSans-MediumItalic-b81e92794a6878b6c578d97b3ad5e6d7.ttf +0 -0
  160. data/public/assets/fonts/FiraSans-MediumItalic-eae7f4a3c4db9fe83025909ebfae5ad9.eot +0 -0
  161. data/public/assets/fonts/FiraSans-MediumItalic.eot +0 -0
  162. data/public/assets/fonts/FiraSans-MediumItalic.ttf +0 -0
  163. data/public/assets/fonts/FiraSans-MediumItalic.woff +0 -0
  164. data/public/assets/fonts/FiraSans-Regular-537188a19aeebdd74a92e114af7a02cb.ttf +0 -0
  165. data/public/assets/fonts/FiraSans-Regular-5d6a923de9be80ff5c2995cc03d93127.woff +0 -0
  166. data/public/assets/fonts/FiraSans-Regular-db689e5fea21ed4b7890811151968dc6.eot +0 -0
  167. data/public/assets/fonts/FiraSans-Regular.eot +0 -0
  168. data/public/assets/fonts/FiraSans-Regular.ttf +0 -0
  169. data/public/assets/fonts/FiraSans-Regular.woff +0 -0
  170. data/public/assets/fonts/FiraSans-UltraLight-3baefce4c224a0f0b26cdafe37dfa55d.eot +0 -0
  171. data/public/assets/fonts/FiraSans-UltraLight-e3909a352b87f853bb464836adfd602a.ttf +0 -0
  172. data/public/assets/fonts/FiraSans-UltraLight-f7289beeaa2353caf487553ee8b8ef03.woff +0 -0
  173. data/public/assets/fonts/FiraSans-UltraLight.eot +0 -0
  174. data/public/assets/fonts/FiraSans-UltraLight.ttf +0 -0
  175. data/public/assets/fonts/FiraSans-UltraLight.woff +0 -0
  176. data/public/assets/fonts/FontAwesome.otf +0 -0
  177. data/public/assets/fonts/fontawesome-webfont.eot +0 -0
  178. data/public/assets/fonts/fontawesome-webfont.svg +0 -2671
  179. data/public/assets/fonts/fontawesome-webfont.ttf +0 -0
  180. data/public/assets/fonts/fontawesome-webfont.woff +0 -0
  181. data/public/assets/fonts/fontawesome-webfont.woff2 +0 -0
  182. data/public/assets/images/ajax-loader-30d8e72bfdae694b1938658e1b087df0.gif +0 -0
  183. data/public/assets/images/ajax-loader.gif +0 -0
  184. data/public/assets/images/iqvoc_logo-165f17a46cf0a1bf9464db9d136fb843.svg +0 -41
  185. data/public/assets/images/iqvoc_logo.svg +0 -41
  186. data/public/assets/images/treeview-default-line-5e3c0e0c48f48c23c45aef7b72c739c0.gif +0 -0
  187. data/public/assets/images/treeview-default-line.gif +0 -0
  188. data/public/assets/javascripts/bootstrap.bundle.min-68b3c2f1c1f636f947fff1229d3ffbf5.js +0 -7
  189. data/public/assets/javascripts/bootstrap.bundle.min.js +0 -42
  190. data/public/assets/javascripts/jquery-17e41799d7fba03a313ca6b67d8a0954.js +0 -26
  191. data/public/assets/javascripts/jquery-d52dc3a9171f1fc89dd0f8e35e42c9d2.js +0 -26
  192. data/public/assets/javascripts/jquery.js +0 -10875
  193. data/public/assets/javascripts/manifest-7708201f7c24d5186cd075c3317f9b70.js +0 -7311
  194. data/public/assets/javascripts/manifest-89894d9f630fa57378a0c28e2a3d9ea9.js +0 -7325
  195. data/public/assets/javascripts/manifest.js +0 -5660
  196. data/public/assets/manifest.json +0 -1
  197. data/public/assets/stylesheets/manifest-893c7de3dee9ed1295bc1b5b4c1f0c34.css +0 -13
  198. data/public/assets/stylesheets/manifest-94b7be92a9b1cfeafea4ea71af910324.css +0 -13
  199. data/public/assets/stylesheets/manifest-e576edf92efaaad86b15b565fa473d0b.css +0 -7
  200. data/public/assets/stylesheets/manifest.css +0 -14314
  201. data/public/export/12750.nt +0 -28
  202. data/public/export/17385303752427181100115432751692126521.nt +0 -28
  203. data/public/export/181196830007276319343907883650755121680.nt +0 -28
  204. data/public/export/194669028845730209313058462140064732442.nt +0 -28
  205. data/public/export/21988.nt +0 -28
  206. data/public/export/230655012044692637365356891394989635995.nt +0 -28
  207. data/public/export/233590502327750705645106563554497694497.nt +0 -28
  208. data/public/export/245884359537367641918690456207690070316.nt +0 -28
  209. data/public/export/250386066048669747259363837063223215204.nt +0 -28
  210. data/public/export/256041066575224861739818511470898486442.nt +0 -28
  211. data/public/export/287138383024694264939471429022965897163.nt +0 -28
  212. data/public/export/31892.nt +0 -28
  213. data/public/export/333774437366008328346740356666975078086.nt +0 -28
  214. data/public/export/34639390376251419382098415225771775708.nt +0 -28
  215. data/public/export/4098.nt +0 -28
  216. data/public/export/47070.nt +0 -28
  217. data/public/export/49947.nt +0 -28
  218. data/public/export/5793.nt +0 -28
  219. data/public/export/64089124325772410079516909502763866955.nt +0 -28
  220. data/public/export/64718.nt +0 -28
  221. data/public/export/71200590939430584664474292378126383577.nt +0 -28
  222. data/public/export/81965533953024918329855744567916239964.nt +0 -28
  223. data/public/favicon.ico +0 -0
  224. data/public/robots.txt +0 -5
  225. data/public/uploads/import/213b73161661ebbad4e5ee3f543ae617.nt +0 -259
  226. data/public/uploads/import/22ad4d7419b7914c7319c46a66839f77.nt +0 -259
  227. data/public/uploads/import/22b78e01b9b5876851578cf9a8373c07.nt +0 -259
  228. data/public/uploads/import/2ab75781f8141010699dd272f681b245.nt +0 -259
  229. data/public/uploads/import/4c7fe47a2c21a681fd8f0eb3af0ebf19.nt +0 -259
  230. data/public/uploads/import/5265d7cb194f017c592a68914ecf8d9f.nt +0 -259
  231. data/public/uploads/import/5cb5414a66e4ae5dbe05eb763c367bd1.nt +0 -259
  232. data/public/uploads/import/6b042e00c2e2abf9241d2ece3e67ed27.nt +0 -259
  233. data/public/uploads/import/749edd3918db157202b00f89418b87d1.nt +0 -259
  234. data/public/uploads/import/7aeb9d76b78ba67674caa53a96e1caa0.nt +0 -259
  235. data/public/uploads/import/7b7fc425b8926e586ca10d0f1385aa4e.nt +0 -259
  236. data/public/uploads/import/8319d34702375718b20e72a6af71c503.nt +0 -259
  237. data/public/uploads/import/9ec48f5aaece8d2a8770439e34199b19.nt +0 -259
  238. data/public/uploads/import/a22750632c35587057285920142c2db8.nt +0 -259
  239. data/public/uploads/import/a6d9eeb5e76ce0032614c8142a33c90b.nt +0 -259
  240. data/public/uploads/import/a7ec826e32e80d1fc61f5e89f7442199.nt +0 -259
  241. data/public/uploads/import/af2ac8cb84a194da9871ea701f915a25.nt +0 -259
  242. data/public/uploads/import/b50c67ef8cb51fa12812ac2601faaa75.nt +0 -259
  243. data/public/uploads/import/b66560ac9cc4aecd50f82d4fcec8bde4.nt +0 -259
  244. data/public/uploads/import/c1a12245a41d9105585fb48a0b5244ab.nt +0 -259
  245. data/public/uploads/import/c4b23750b9f72a7f93bcd979a9afded3.nt +0 -259
  246. data/public/uploads/import/d1edac76626a35a6e72a592c98e97b1a.nt +0 -259
  247. data/public/uploads/import/eca92dbeff4aec30e3072103bb5f565f.nt +0 -259
  248. data/public/uploads/import/f7996f8826062cd8dcfc8fac70e830b9.nt +0 -259
  249. data/public/uploads/tmp/1609926599-187261935008931-0002-5418/hobbies.nt +0 -259
  250. data/public/uploads/tmp/1610450700-516890595554445-0002-2685/hobbies.nt +0 -259
  251. data/public/uploads/tmp/1610450844-597126333235543-0001-0714/hobbies.nt +0 -259
  252. data/public/uploads/tmp/1611054155-443031323634581-0001-9192/hobbies.nt +0 -259
  253. data/public/uploads/tmp/1611225485-767301590714814-0002-6904/hobbies.nt +0 -259
  254. data/public/uploads/tmp/1611225661-919900076415463-0002-0657/hobbies.nt +0 -259
  255. data/public/uploads/tmp/1611227389-36557097935032-0002-4613/hobbies.nt +0 -259
  256. data/public/uploads/tmp/1611585376-822293462114758-0001-9752/hobbies.nt +0 -259
  257. data/public/uploads/tmp/1611585431-703460698560673-0002-7522/hobbies.nt +0 -259
  258. data/public/uploads/tmp/1611586554-483369300394995-0002-0872/hobbies.nt +0 -259
  259. data/public/uploads/tmp/1619777137-609890333749067-0002-0264/hobbies.nt +0 -259
  260. data/public/uploads/tmp/1627291050-163284787457980-0001-2701/hobbies.nt +0 -259
  261. data/public/uploads/tmp/1627291589-952446089963663-0002-3171/hobbies.nt +0 -259
  262. data/public/uploads/tmp/1627291819-788250283200541-0002-2503/hobbies.nt +0 -259
  263. data/public/uploads/tmp/1627292534-103362378955855-0001-7089/hobbies.nt +0 -259
  264. data/public/uploads/tmp/1627293799-506613299368066-0002-1247/hobbies.nt +0 -259
  265. data/public/uploads/tmp/1627293863-868842521367397-0001-4656/hobbies.nt +0 -259
  266. data/public/uploads/tmp/1636993960-338364327912413-0002-8049/hobbies.nt +0 -259
  267. data/public/uploads/tmp/1641550181-434480636271400-0002-7928/hobbies.nt +0 -259
  268. data/public/uploads/tmp/1641550416-6444469569098-0002-2156/hobbies.nt +0 -259
  269. data/public/uploads/tmp/1641550691-848542458162760-0002-6815/hobbies.nt +0 -259
  270. data/public/uploads/tmp/1641550716-647719127292471-0002-9954/hobbies.nt +0 -259
  271. data/public/uploads/tmp/1641551058-78248622355227-0002-3663/hobbies.nt +0 -259
  272. data/public/uploads/tmp/1641551220-744894908610606-0001-3879/hobbies.nt +0 -259
@@ -3,11 +3,14 @@
3
3
  <ul class="hybrid-treeview" data-url="<%= hcpath %>"
4
4
  data-dragabble="true"
5
5
  data-polyhierarchy-support="<%= Iqvoc::Concept.root_class.instance.poly_hierarchy? %>"
6
+ data-concept-modal-preview-enabled="<%= Iqvoc.concept_modal_preview_enabled? %>"
6
7
  data-save-label="<%= t('txt.common.move') %>"
7
8
  data-copy-label="<%= t('txt.common.copy') %>"
8
9
  data-undo-label="<%= t('txt.common.reset') %>">
9
10
  <% else %>
10
- <ul class="hybrid-treeview" data-url="<%= hcpath %>">
11
+ <ul class="hybrid-treeview"
12
+ data-url="<%= hcpath %>"
13
+ data-concept-modal-preview-enabled="<%= Iqvoc.concept_modal_preview_enabled? %>">
11
14
  <% end %>
12
15
  <% concepts.select { |c| can? :read, c }.each do |concept| %>
13
16
  <% if params[:published] == '0' %>
@@ -8,9 +8,7 @@
8
8
  <% end %>
9
9
 
10
10
  <% Iqvoc::Concept.labeling_classes.each do |labeling_class, languages| %>
11
- <% (languages || Iqvoc.available_languages).each do |lang| %>
12
- <%= render labeling_class.partial_name(@scheme), klass: labeling_class, concept: @scheme, available_languages: languages || Iqvoc.available_languages %>
13
- <% end %>
11
+ <%= render labeling_class.partial_name(@scheme), klass: labeling_class, concept: @scheme, available_languages: languages || Iqvoc.available_languages %>
14
12
  <% end %>
15
13
 
16
14
  <div class="relation panel">
@@ -18,8 +18,7 @@
18
18
 
19
19
  </div>
20
20
 
21
- <% if can? :see, :exception %>
22
- <%# only show error details for known, persisted users %>
21
+ <% if can?(:see, :exception) || Rails.env.development? %>
23
22
  <div class="card">
24
23
  <h5 class="card-header">
25
24
  <%= t("txt.views.errors.common.error_message") %>
@@ -1,4 +1,4 @@
1
- <div class="relation panel" id="assigned_collections">
1
+ <div class="relation panel" id="<%= klass.name.to_relation_name %>">
2
2
  <h2><%= klass.model_name.human(:count => 2) %></h2>
3
3
  <div class="relation-body">
4
4
  <%- if concept.collections.any? -%>
@@ -1,12 +1,12 @@
1
1
  <div class="relation panel" id="<%= klass.model_name.to_s.to_relation_name %>">
2
2
  <h2><%= klass.model_name.human(:count => 2) %></h2>
3
3
  <div class="relation-body">
4
- <%-
4
+ <%
5
5
  items = concept.related_concepts_for_relation_class(klass, params[:published] != "0")
6
6
  items = items.select { |item| can?(:read, item) }
7
7
  -%>
8
- <%= item_listing(items) do |c|
9
- link_to(c.pref_label, concept_path(:id => c))
10
- end %>
8
+ <%= item_listing(items) do |concept| %>
9
+ <%= render(concept.class.inline_partial_name, concept: concept) %>
10
+ <% end %>
11
11
  </div>
12
12
  </div>
@@ -1,4 +1,4 @@
1
- <div class="relation panel">
1
+ <div class="relation panel" id="<%= Iqvoc::Concept.broader_relation_class.narrower_class.name.to_relation_name %>">
2
2
  <h2><%= Iqvoc::Concept.broader_relation_class.narrower_class.model_name.human(:count => 2) %></h2>
3
3
  <div class="relation-body">
4
4
  <% if concept.narrower_relations.any? %>
@@ -1,8 +1,8 @@
1
- <div class="relation <%= Iqvoc::Concept.broader_relation_class.name.to_relation_name %> panel">
1
+ <div class="relation panel" id="<%= Iqvoc::Concept.broader_relation_class.name.to_relation_name %>">
2
2
  <h2><%= Iqvoc::Concept.broader_relation_class.model_name.human(:count => 2) %></h2>
3
3
  <div class="relation-body">
4
4
  <% if concept.top_term? %>
5
- <strong><%= concept.class.human_attribute_name("top_term") %></strong>
5
+ <%= concept.class.human_attribute_name("top_term") %>
6
6
  <% end %>
7
7
 
8
8
  <%-
@@ -1,8 +1,8 @@
1
- <div class="relation panel">
1
+ <div class="relation panel" id="<%= Iqvoc::Concept.broader_relation_class.name.to_relation_name %>">
2
2
  <h2><%= Iqvoc::Concept.broader_relation_class.model_name.human(:count => 2) %></h2>
3
3
  <div class="relation-body block">
4
4
  <% if concept.top_term? %>
5
- <strong><%= concept.class.human_attribute_name("top_term") %></strong>
5
+ <%= concept.class.human_attribute_name("top_term") %>
6
6
  <% end %>
7
7
 
8
8
  <% if concept.related_concepts_for_relation_class(
@@ -1,4 +1,4 @@
1
- <%= content_tag :div, :class => "relation translation panel" do %>
1
+ <%= content_tag :div, class: "relation translation panel", id: klass.name.to_relation_name do %>
2
2
  <% if defined?(concept) %>
3
3
  <h2><%= klass.model_name.human(:count => 2) %></h2>
4
4
  <div class="relation-body">
@@ -4,7 +4,8 @@
4
4
  <div class="input-group-prepend">
5
5
  <span class="input-group-text"><%= language %></span>
6
6
  </div>
7
- <%= text_field_tag "concept[labelings_by_text][#{klass.name.to_relation_name}][#{language}]", concept.labelings_by_text(klass.name.to_relation_name, language), :class => 'form-control' %>
7
+ <%= text_field_tag "concept[labelings_by_text][#{klass.name.to_relation_name}][#{language}]", concept.labelings_by_text(klass.name.to_relation_name, language),
8
+ class: 'form-control', autocomplete: 'off' %>
8
9
  </div>
9
10
  <% end %>
10
11
  <% end %>
@@ -4,6 +4,9 @@
4
4
  <% if owner.additional_info.present? %>
5
5
  <span class="additional_info">(<%= owner.additional_info %>)</span>
6
6
  <% end %>
7
+ <% if owner.expired? %>
8
+ <span class="badge badge-info"><%= t('txt.views.concepts.expired_at', date: l(owner.expired_at, format: :long)) %></span>
9
+ <% end %>
7
10
  <dl class="search-result-meta">
8
11
  <dt class="search-result-key"><%= t('txt.views.search_results.type') %></dt>
9
12
  <dd class="search-result-value" data-key="<%= t('txt.views.search_results.type') %>"><%= result.model_name.human %></dd>
@@ -1,5 +1,5 @@
1
- <div class="relation panel">
2
- <h2 class=""><%= t('txt.views.layouts.sections.matches') %></h2>
1
+ <div class="relation panel" id="<%= klass.model_name.to_s.to_relation_name %>">
2
+ <h2><%= klass.model_name.human(:count => 2) %></h2>
3
3
  <div class="panel-body match">
4
4
  <%= body.html_safe %>
5
5
  </div>
@@ -1,4 +1,4 @@
1
- <div class="relation panel">
1
+ <div class="relation panel" id="<%= klass.model_name.to_s.to_relation_name %>">
2
2
  <h2><%= klass.model_name.human(:count => 2) %></h2>
3
3
  <div class="relation-body">
4
4
  <%= item_listing(concept.notations_for_class(klass)) do |notation|
@@ -0,0 +1,10 @@
1
+ <div class="form-group row result_type_filter">
2
+ <div class="col-sm-8 offset-sm-2">
3
+ <div class="form-check form-check-inline">
4
+ <label for="include_expired" class="form-check-label">
5
+ <%= check_box_tag :include_expired, true, params[:include_expired] == true, class: 'form-check-input' %>
6
+ <%= t('txt.views.search_results.expired') %>
7
+ </label>
8
+ </div>
9
+ </div>
10
+ </div>
@@ -5,7 +5,7 @@
5
5
  <% if Iqvoc.searchable_class_names.key(params[:t]).constantize.supports_multi_query? %>
6
6
  <%= text_area_tag :q, params[:query], :class => 'form-control', autofocus: true %>
7
7
  <% else %>
8
- <%= text_field_tag :q, params[:query], :class => 'form-control', autofocus: true %>
8
+ <%= text_field_tag :q, params[:query], :class => 'form-control', autofocus: true, autocomplete: 'off' %>
9
9
  <% end %>
10
10
  </div>
11
11
  </div>
@@ -1,5 +1,5 @@
1
1
  <div class="form-group result_type_filter row">
2
- <%= label_tag nil, t('txt.views.search_results.for'), :class => 'col-sm-2 col-form-label' %>
2
+ <%= label_tag nil, t('txt.views.search_results.in'), :class => 'col-sm-2 col-form-label' %>
3
3
  <div class="col-sm-4">
4
4
  <div class="form-check">
5
5
  <%= radio_button_tag 'for', 'concept', params[:for] == "concept", class: 'form-check-input' %>
data/bin/bundle ADDED
@@ -0,0 +1,3 @@
1
+ #!/usr/bin/env ruby
2
+ ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
3
+ load Gem.bin_path('bundler', 'bundle')
data/bin/delayed_job ADDED
@@ -0,0 +1,5 @@
1
+ #!/usr/bin/env ruby
2
+
3
+ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'config', 'environment'))
4
+ require 'delayed/command'
5
+ Delayed::Command.new(ARGV).daemonize
data/bin/rails ADDED
@@ -0,0 +1,4 @@
1
+ #!/usr/bin/env ruby
2
+ APP_PATH = File.expand_path('../config/application', __dir__)
3
+ require_relative "../config/boot"
4
+ require "rails/commands"
data/bin/rake ADDED
@@ -0,0 +1,4 @@
1
+ #!/usr/bin/env ruby
2
+ require_relative "../config/boot"
3
+ require "rake"
4
+ Rake.application.run
data/bin/setup ADDED
@@ -0,0 +1,36 @@
1
+ #!/usr/bin/env ruby
2
+ require "fileutils"
3
+
4
+ # path to your application root.
5
+ APP_ROOT = File.expand_path('..', __dir__)
6
+
7
+ def system!(*args)
8
+ system(*args) || abort("\n== Command #{args} failed ==")
9
+ end
10
+
11
+ FileUtils.chdir APP_ROOT do
12
+ # This script is a way to set up or update your development environment automatically.
13
+ # This script is idempotent, so that you can run it at any time and get an expectable outcome.
14
+ # Add necessary setup steps to this file.
15
+
16
+ puts '== Installing dependencies =='
17
+ system! 'gem install bundler --conservative'
18
+ system('bundle check') || system!('bundle install')
19
+
20
+ # Install JavaScript dependencies
21
+ system! 'bin/yarn'
22
+
23
+ # puts "\n== Copying sample files =="
24
+ # unless File.exist?('config/database.yml')
25
+ # FileUtils.cp 'config/database.yml.sample', 'config/database.yml'
26
+ # end
27
+
28
+ puts "\n== Preparing database =="
29
+ system! 'bin/rails db:prepare'
30
+
31
+ puts "\n== Removing old logs and tempfiles =="
32
+ system! 'bin/rails log:clear tmp:clear'
33
+
34
+ puts "\n== Restarting application server =="
35
+ system! 'bin/rails restart'
36
+ end
data/bin/update ADDED
@@ -0,0 +1,31 @@
1
+ #!/usr/bin/env ruby
2
+ require 'fileutils'
3
+ include FileUtils
4
+
5
+ # path to your application root.
6
+ APP_ROOT = File.expand_path('..', __dir__)
7
+
8
+ def system!(*args)
9
+ system(*args) || abort("\n== Command #{args} failed ==")
10
+ end
11
+
12
+ chdir APP_ROOT do
13
+ # This script is a way to update your development environment automatically.
14
+ # Add necessary update steps to this file.
15
+
16
+ puts '== Installing dependencies =='
17
+ system! 'gem install bundler --conservative'
18
+ system('bundle check') || system!('bundle install')
19
+
20
+ # Install JavaScript dependencies if using Yarn
21
+ # system('bin/yarn')
22
+
23
+ puts "\n== Updating database =="
24
+ system! 'bin/rails db:migrate'
25
+
26
+ puts "\n== Removing old logs and tempfiles =="
27
+ system! 'bin/rails log:clear tmp:clear'
28
+
29
+ puts "\n== Restarting application server =="
30
+ system! 'bin/rails restart'
31
+ end
data/bin/yarn ADDED
@@ -0,0 +1,17 @@
1
+ #!/usr/bin/env ruby
2
+ APP_ROOT = File.expand_path('..', __dir__)
3
+ Dir.chdir(APP_ROOT) do
4
+ yarn = ENV["PATH"].split(File::PATH_SEPARATOR).
5
+ select { |dir| File.expand_path(dir) != __dir__ }.
6
+ product(["yarn", "yarn.cmd", "yarn.ps1"]).
7
+ map { |dir, file| File.expand_path(file, dir) }.
8
+ find { |file| File.executable?(file) }
9
+
10
+ if yarn
11
+ exec yarn, *ARGV
12
+ else
13
+ $stderr.puts "Yarn executable was not detected in the system."
14
+ $stderr.puts "Download Yarn at https://yarnpkg.com/en/docs/install"
15
+ exit 1
16
+ end
17
+ end
@@ -1,16 +1,18 @@
1
- require_relative 'boot'
1
+ require_relative "boot"
2
2
 
3
3
  # Pick the frameworks you want:
4
+ require "active_model/railtie"
5
+ require "active_job/railtie"
4
6
  require "active_record/railtie"
5
7
  require "active_storage/engine"
6
8
  require "action_controller/railtie"
7
- require "action_view/railtie"
8
9
  require "action_mailer/railtie"
9
- require "active_job/railtie"
10
+ require "action_mailbox/engine"
11
+ require "action_text/engine"
12
+ require "action_view/railtie"
10
13
  require "action_cable/engine"
11
- require "rails/test_unit/railtie"
12
14
  # require "sprockets/railtie" # Disable sprockets in favor of faucet
13
- require "active_model/railtie"
15
+ require "rails/test_unit/railtie"
14
16
 
15
17
  # Require the gems listed in Gemfile, including any gems
16
18
  # you've limited to :test, :development, or :production.
@@ -19,11 +21,14 @@ Bundler.require(*Rails.groups)
19
21
  module Iqvoc
20
22
  class Application < Rails::Application
21
23
  # Initialize configuration defaults for originally generated Rails version.
22
- config.load_defaults 5.2
24
+ config.load_defaults 6.1
23
25
 
24
- # Settings in config/environments/* take precedence over those specified here.
25
- # Application configuration can go into files in config/initializers
26
- # -- all .rb files in that directory are automatically loaded after loading
27
- # the framework and any gems in your application.
26
+ # Configuration for the application, engines, and railties goes here.
27
+ #
28
+ # These settings can be overridden in specific environments using the files
29
+ # in config/environments, which are processed later.
30
+ #
31
+ # config.time_zone = "Central Time (US & Canada)"
32
+ # config.eager_load_paths << Rails.root.join("extras")
28
33
  end
29
34
  end
data/config/boot.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
2
2
 
3
- require 'bundler/setup' # Set up gems listed in the Gemfile.
4
- require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
3
+ require "bundler/setup" # Set up gems listed in the Gemfile.
4
+ require "bootsnap/setup" # Speed up boot time by caching expensive operations.
data/config/cable.yml CHANGED
@@ -2,7 +2,7 @@ development:
2
2
  adapter: async
3
3
 
4
4
  test:
5
- adapter: async
5
+ adapter: test
6
6
 
7
7
  production:
8
8
  adapter: redis
data/config/database.yml CHANGED
@@ -1,25 +1,20 @@
1
- development:
1
+ default: &default
2
2
  adapter: postgresql
3
- host: 127.0.0.1
4
3
  encoding: utf8
5
- username: mjansing
6
- password:
7
- database: iqvoc_development
4
+ host: <%= ENV['DB_HOST'] || 'localhost' %>
5
+ username: <%= ENV['DB_USERNAME'] || 'mjansing' %>
6
+ password: <%= ENV['DB_PASSWORD'] || '' %>
7
+ port: 5432
8
+ pool: <%= ENV["DB_POOL"] || ENV['RAILS_MAX_THREADS'] || 5 %>
9
+
10
+ development:
11
+ <<: *default
12
+ database: <%= ENV['DB_NAME'].presence || 'iqvoc_development' %>
8
13
 
9
14
  test:
10
- adapter: postgresql
11
- encoding: utf8
12
- reconnect: false
13
- database: iqvoc_test
14
- pool: 5
15
- username: mjansing
16
- password:
17
- host: 127.0.0.1
15
+ <<: *default
16
+ database: <%= ENV['DB_NAME'].presence || 'iqvoc_test' %>
18
17
 
19
18
  production:
20
- adapter: postgresql
21
- host: 127.0.0.1
22
- encoding: utf8
23
- username: mjansing
24
- password:
25
- database: iqvoc_development
19
+ <<: *default
20
+ database: <%= ENV['DB_NAME'].presence || 'iqvoc_development' %>
data/config/engine.rb CHANGED
@@ -11,7 +11,6 @@ require 'deep_cloneable'
11
11
  require 'json'
12
12
  require 'rails_autolink'
13
13
  require 'bootstrap_form'
14
- require 'uglifier'
15
14
  require 'apipie-rails'
16
15
  require 'database_cleaner'
17
16
  require 'delayed_job_active_record'
@@ -1,5 +1,5 @@
1
1
  # Load the Rails application.
2
- require_relative 'application'
2
+ require_relative "application"
3
3
 
4
4
  # Initialize the Rails application.
5
5
  Rails.application.initialize!
@@ -1,7 +1,8 @@
1
1
  # Be sure to restart your server when you modify this file.
2
2
 
3
3
  # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
4
- # Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
4
+ # Rails.backtrace_cleaner.add_silencer { |line| /my_noisy_library/.match?(line) }
5
5
 
6
- # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
7
- # Rails.backtrace_cleaner.remove_silencers!
6
+ # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code
7
+ # by setting BACKTRACE=1 before calling your invocation, like "BACKTRACE=1 ./bin/rails runner 'MyClass.perform'".
8
+ Rails.backtrace_cleaner.remove_silencers! if ENV["BACKTRACE"]
@@ -11,6 +11,8 @@
11
11
  # policy.object_src :none
12
12
  # policy.script_src :self, :https
13
13
  # policy.style_src :self, :https
14
+ # # If you are using webpack-dev-server then specify webpack-dev-server host
15
+ # policy.connect_src :self, :https, "http://localhost:3035", "ws://localhost:3035" if Rails.env.development?
14
16
 
15
17
  # # Specify URI for violation reports
16
18
  # # policy.report_uri "/csp-violation-report-endpoint"
@@ -19,6 +21,9 @@
19
21
  # If you are using UJS then enable automatic nonce generation
20
22
  # Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
21
23
 
24
+ # Set the nonce only to specific directives
25
+ # Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
26
+
22
27
  # Report CSP violations to a specified URI
23
28
  # For further information see the following documentation:
24
29
  # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
@@ -1,4 +1,6 @@
1
1
  # Be sure to restart your server when you modify this file.
2
2
 
3
3
  # Configure sensitive parameters which will be filtered from the log file.
4
- Rails.application.config.filter_parameters += [:password]
4
+ Rails.application.config.filter_parameters += [
5
+ :password, :passw, :secret, :token, :_key, :crypt, :salt, :certificate, :otp, :ssn
6
+ ]
@@ -0,0 +1,11 @@
1
+ # Define an application-wide HTTP permissions policy. For further
2
+ # information see https://developers.google.com/web/updates/2018/06/feature-policy
3
+ #
4
+ # Rails.application.config.permissions_policy do |f|
5
+ # f.camera :none
6
+ # f.gyroscope :none
7
+ # f.microphone :none
8
+ # f.usb :none
9
+ # f.fullscreen :self
10
+ # f.payment :self, "https://secure.example.com"
11
+ # end
@@ -4,9 +4,9 @@
4
4
  # is enabled by default.
5
5
 
6
6
  # Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
7
- # ActiveSupport.on_load(:action_controller) do
8
- # wrap_parameters format: [:json]
9
- # end
7
+ ActiveSupport.on_load(:action_controller) do
8
+ wrap_parameters format: [:json]
9
+ end
10
10
 
11
11
  # To enable root element in JSON for ActiveRecord objects.
12
12
  # ActiveSupport.on_load(:active_record) do
@@ -0,0 +1,6 @@
1
+ # FIXME: custom auto loading inflections due class naming inconsistencies with acronyms
2
+ Rails.autoloaders.main.inflector.inflect(
3
+ 'skos' => 'SKOS',
4
+ 'rdfs' => 'RDFS',
5
+ 'rdfapi' => 'RDFAPI'
6
+ )
@@ -65,8 +65,8 @@ de:
65
65
  one: "Match"
66
66
  other: "Matches"
67
67
  match/skos/base:
68
- one: "Match"
69
- other: "Matches"
68
+ one: "Link zu anderem Vokabular"
69
+ other: "Links zu anderen Vokabularen"
70
70
  match/skos/broad_match:
71
71
  one: "Broader Match"
72
72
  other: "Broader Matches"
@@ -113,6 +113,7 @@ de:
113
113
  sources: Föderation
114
114
  settings:
115
115
  title: Titel
116
+ concept_modal_preview: Konzept Kurzansicht aktivieren
116
117
  available_languages: verfügbare Sprachen
117
118
  languages_pref_labeling: Sprachen für bevorzugte Labels
118
119
  languages_notes: Sprachen für Notes
@@ -124,6 +125,7 @@ de:
124
125
  triplestore_password: Passwort für Triplestore
125
126
  triplestore_autosync: automatische Synchronisation mit Triplestore
126
127
  sources_iqvoc: Quellen (iQvoc)
128
+ sources_create_reverse_matches: Links zu anderen Vokabularen automatisch erstellen
127
129
  alphabetical_concepts:
128
130
  untranslated_concepts:
129
131
  caption: "Fehlende Übersetzungen"
@@ -214,7 +216,7 @@ de:
214
216
  begins_with: "beginnt mit"
215
217
  exact: "exakte Übereinstimmung"
216
218
  regexp: "regulärer Ausdruck (fortgeschritten)"
217
- search_term: "Suchbegriff(e)"
219
+ search_term: "Suchbegriff"
218
220
  note: mit Anmerkung
219
221
  search_term_in_results: "Suchbegriff"
220
222
  no_results: "Keine Ergebnisse"
@@ -228,10 +230,12 @@ de:
228
230
  submit: "Suche"
229
231
  type: "Typ"
230
232
  used_as: "benutzt als"
233
+ expired: "stillgelegte einbeziehen?"
231
234
  language: "Sprache"
232
235
  all: "alle"
233
236
  none: "keine"
234
- for: "In"
237
+ in: "In"
238
+ for: "Nach"
235
239
  mode: "Modus"
236
240
  datasets: "Externe Quellen"
237
241
  change_note:
@@ -279,7 +283,7 @@ de:
279
283
  server_error:
280
284
  message: Entschuldigung da ist bei uns etwas schief gegangen.
281
285
  versioning:
282
- edit_mode: "Weiterbearbeiten"
286
+ edit_mode: "Bearbeiten"
283
287
  to_edit_mode: "In Bearbeitung versetzen"
284
288
  publishing: "Veröffentlichen"
285
289
  delete: "Löschen"
@@ -113,6 +113,7 @@ en:
113
113
  sources: Federation
114
114
  settings:
115
115
  title: Site title
116
+ concept_modal_preview: Enable concept modal preview
116
117
  available_languages: available languages
117
118
  languages_pref_labeling: Languages for preferred labels
118
119
  languages_notes: Languages for notes
@@ -124,6 +125,7 @@ en:
124
125
  triplestore_password: Password for triplestore
125
126
  triplestore_autosync: Automatic triplestore synchronization
126
127
  sources_iqvoc: Sources (iQvoc)
128
+ sources_create_reverse_matches: Create reverse matches for concept mappings
127
129
  alphabetical_concepts:
128
130
  untranslated_concepts:
129
131
  caption: "Missing Translations"
@@ -236,10 +238,12 @@ en:
236
238
  submit: "Search"
237
239
  type: "type"
238
240
  used_as: "used as"
241
+ expired: "include expired?"
239
242
  language: "language"
240
243
  all: "all"
241
244
  none: "none"
242
- for: "In"
245
+ in: "In"
246
+ for: "For"
243
247
  mode: "Mode"
244
248
  datasets: "External sources"
245
249
  change_note:
data/config/puma.rb CHANGED
@@ -4,12 +4,18 @@
4
4
  # the maximum value specified for Puma. Default is set to 5 threads for minimum
5
5
  # and maximum; this matches the default thread size of Active Record.
6
6
  #
7
- threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
8
- threads threads_count, threads_count
7
+ max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
8
+ min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
9
+ threads min_threads_count, max_threads_count
10
+
11
+ # Specifies the `worker_timeout` threshold that Puma will use to wait before
12
+ # terminating a worker in development environments.
13
+ #
14
+ worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
9
15
 
10
16
  # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
11
17
  #
12
- port ENV.fetch("PORT") { 3000 }
18
+ port ENV.fetch("PORT") { 3000 }
13
19
 
14
20
  # Specifies the `environment` that Puma will run in.
15
21
  #
@@ -19,7 +25,7 @@ environment ENV.fetch("RAILS_ENV") { "development" }
19
25
  pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
20
26
 
21
27
  # Specifies the number of `workers` to boot in clustered mode.
22
- # Workers are forked webserver processes. If using threads and workers together
28
+ # Workers are forked web server processes. If using threads and workers together
23
29
  # the concurrency of the application would be max `threads` * `workers`.
24
30
  # Workers do not work on JRuby or Windows (both of which do not support
25
31
  # processes).
@@ -0,0 +1,10 @@
1
+ # This migration comes from active_storage (originally 20180723000244)
2
+ class AddFkConstraintToActiveStorageAttachmentsForBlobId < ActiveRecord::Migration[6.0]
3
+ def up
4
+ return if foreign_key_exists?(:active_storage_attachments, column: :blob_id)
5
+
6
+ if table_exists?(:active_storage_blobs)
7
+ add_foreign_key :active_storage_attachments, :active_storage_blobs, column: :blob_id
8
+ end
9
+ end
10
+ end