hyrax 5.1.0.pre.beta1 → 5.2.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.
- checksums.yaml +4 -4
- data/.dassie/.env +4 -0
- data/.dassie/Gemfile +12 -7
- data/.dassie/app/controllers/application_controller.rb +4 -0
- data/.dassie/app/helpers/hyrax_helper.rb +4 -0
- data/.dassie/app/models/ability.rb +4 -0
- data/.dassie/app/models/user.rb +11 -0
- data/.dassie/app/views/shared/_footer.html.erb +17 -0
- data/.dassie/config/application.rb +1 -1
- data/.dassie/config/database.yml +18 -0
- data/.dassie/config/environments/production.rb +1 -1
- data/.dassie/config/fedora.yml +6 -6
- data/.dassie/config/initializers/devise.rb +1 -0
- data/.dassie/config/initializers/profiler.rb +5 -0
- data/.dassie/config/locales/hyrax.en.yml +1 -1
- data/.dassie/config/puma.rb +55 -5
- data/.dassie/config/routes.rb +2 -0
- data/.dassie/db/migrate/20250328100249_user_roles.rb +20 -0
- data/.dassie/db/schema.rb +123 -109
- data/.github/workflows/lint-build-test.yml +34 -5
- data/.koppie/.env +1 -1
- data/.koppie/Gemfile +10 -6
- data/.koppie/app/controllers/application_controller.rb +4 -0
- data/.koppie/app/helpers/hyrax_helper.rb +4 -0
- data/.koppie/app/models/ability.rb +4 -0
- data/.koppie/app/models/user.rb +10 -0
- data/.koppie/app/views/shared/_footer.html.erb +17 -0
- data/.koppie/config/database.yml +2 -9
- data/.koppie/config/environments/development.rb +9 -0
- data/.koppie/config/environments/production.rb +1 -1
- data/.koppie/config/initializers/1_valkyrie.rb +5 -5
- data/.koppie/config/initializers/devise.rb +1 -1
- data/.koppie/config/initializers/profiler.rb +5 -0
- data/.koppie/config/locales/hyrax.en.yml +2 -2
- data/.koppie/config/puma.rb +26 -7
- data/.koppie/config/routes.rb +2 -0
- data/.koppie/db/schema.rb +109 -110
- data/CONTAINERS.md +10 -10
- data/Dockerfile +108 -50
- data/Gemfile +2 -1
- data/app/controllers/concerns/hyrax/valkyrie_downloads_controller_behavior.rb +1 -0
- data/app/controllers/concerns/hyrax/works_controller_behavior.rb +2 -1
- data/app/controllers/hyrax/admin/analytics/work_reports_controller.rb +4 -4
- data/app/controllers/hyrax/file_sets_controller.rb +11 -0
- data/app/helpers/hyrax/hyrax_helper_behavior.rb +2 -2
- data/app/helpers/hyrax/trophy_helper.rb +1 -1
- data/app/jobs/concerns/hyrax/queued_job_behavior.rb +22 -0
- data/app/jobs/hyrax/propagate_change_depositor_job.rb +1 -1
- data/app/jobs/hyrax/queued_delete_job.rb +11 -0
- data/app/jobs/hyrax/queued_indexing_job.rb +11 -0
- data/app/jobs/migrate_files_to_valkyrie_job.rb +33 -21
- data/app/jobs/migrate_sipity_entity_job.rb +21 -0
- data/app/models/concerns/hyrax/ability.rb +4 -2
- data/app/models/concerns/hyrax/solr_document_behavior.rb +5 -2
- data/app/models/hyrax/file_metadata.rb +22 -7
- data/app/services/hyrax/analytics/ga4/base.rb +1 -1
- data/app/services/hyrax/analytics/ga4.rb +5 -1
- data/app/services/hyrax/change_depositor_service.rb +1 -1
- data/app/services/hyrax/characterization/valkyrie_characterization_service.rb +21 -13
- data/app/services/hyrax/custom_queries/find_ids_by_model.rb +31 -6
- data/app/services/hyrax/edit_permissions_service.rb +9 -8
- data/app/services/hyrax/workflow/workflow_factory.rb +3 -3
- data/app/services/migrate_resource_service.rb +1 -1
- data/app/views/_user_util_links.html.erb +2 -1
- data/app/views/hyrax/admin/analytics/collection_reports/_top_collections.html.erb +3 -7
- data/app/views/hyrax/admin/analytics/work_reports/_top_file_set_downloads.html.erb +3 -6
- data/app/views/hyrax/admin/analytics/work_reports/_top_works.html.erb +2 -3
- data/app/views/hyrax/admin/analytics/work_reports/_work_files.html.erb +1 -6
- data/app/views/hyrax/base/_social_media.html.erb +2 -0
- data/app/views/hyrax/base/iiif_viewers/_universal_viewer.html.erb +1 -1
- data/app/views/hyrax/dashboard/collections/_show_document_list_menu.html.erb +13 -12
- data/app/views/hyrax/my/_admin_set_action_menu.html.erb +31 -27
- data/app/views/hyrax/my/_collection_action_menu.html.erb +40 -35
- data/app/views/hyrax/my/_work_action_menu.html.erb +23 -22
- data/bin/db-migrate-seed.sh +1 -1
- data/bin/dev-entrypoint.sh +3 -0
- data/config/features.rb +50 -40
- data/config/initializers/indexing_adapter_initializer.rb +4 -0
- data/config/initializers/new_framework_defaults_7_2.rb +6 -4
- data/config/initializers/reform_rails_6_1_monkey_patch.rb +29 -0
- data/config/metadata/core_metadata.yaml +1 -0
- data/docker-compose-dassie.yml +6 -6
- data/docker-compose-koppie.yml +2 -2
- data/docker-compose-sirenia.yml +2 -2
- data/documentation/developing-your-hyrax-based-app.md +2 -2
- data/hyrax.gemspec +3 -3
- data/lib/freyja/persister.rb +11 -4
- data/lib/generators/hyrax/install_generator.rb +0 -5
- data/lib/generators/hyrax/templates/.env +1 -1
- data/lib/generators/hyrax/templates/config/initializers/1_valkyrie.rb +21 -19
- data/lib/generators/hyrax/templates/db/migrate/20170131142607_add_permission_template_to_sipity_workflow.rb.erb +1 -1
- data/lib/generators/hyrax/templates/db/migrate/20170810190549_update_collection_type_column_options.rb.erb +1 -1
- data/lib/generators/hyrax/templates/db/migrate/20230821153635_add_fields_to_counter_metric.rb.erb +1 -1
- data/lib/hyrax/configuration.rb +22 -7
- data/lib/hyrax/controlled_vocabulary/importer/language.rb +5 -1
- data/lib/hyrax/transactions/steps/add_file_sets.rb +2 -1
- data/lib/hyrax/version.rb +1 -1
- data/lib/hyrax.rb +1 -0
- data/lib/tasks/workflow.rake +1 -2
- data/lib/valkyrie/indexing/redis_queue/indexing_adapter.rb +144 -0
- data/lib/wings/valkyrie/query_service.rb +3 -4
- data/template.rb +1 -1
- metadata +28 -14
- data/.github/workflows/main.yml +0 -17
data/.koppie/db/schema.rb
CHANGED
@@ -10,8 +10,7 @@
|
|
10
10
|
#
|
11
11
|
# It's strongly recommended that you check this file into your version control system.
|
12
12
|
|
13
|
-
ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
14
|
-
|
13
|
+
ActiveRecord::Schema[7.2].define(version: 2023_08_03_165135) do
|
15
14
|
# These are extensions that must be enabled in order to support this database
|
16
15
|
enable_extension "plpgsql"
|
17
16
|
enable_extension "uuid-ossp"
|
@@ -22,8 +21,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
22
21
|
t.string "document_id"
|
23
22
|
t.string "document_type"
|
24
23
|
t.binary "title"
|
25
|
-
t.datetime "created_at", null: false
|
26
|
-
t.datetime "updated_at", null: false
|
24
|
+
t.datetime "created_at", precision: nil, null: false
|
25
|
+
t.datetime "updated_at", precision: nil, null: false
|
27
26
|
t.index ["document_id"], name: "index_bookmarks_on_document_id"
|
28
27
|
t.index ["user_id"], name: "index_bookmarks_on_user_id"
|
29
28
|
end
|
@@ -34,8 +33,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
34
33
|
t.string "checked_uri"
|
35
34
|
t.string "expected_result"
|
36
35
|
t.string "actual_result"
|
37
|
-
t.datetime "created_at", null: false
|
38
|
-
t.datetime "updated_at", null: false
|
36
|
+
t.datetime "created_at", precision: nil, null: false
|
37
|
+
t.datetime "updated_at", precision: nil, null: false
|
39
38
|
t.boolean "passed"
|
40
39
|
t.index ["checked_uri"], name: "index_checksum_audit_logs_on_checked_uri"
|
41
40
|
t.index ["file_set_id", "file_id"], name: "by_file_set_id_and_file_id"
|
@@ -49,8 +48,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
49
48
|
t.string "target_url"
|
50
49
|
t.integer "height"
|
51
50
|
t.integer "width"
|
52
|
-
t.datetime "created_at", null: false
|
53
|
-
t.datetime "updated_at", null: false
|
51
|
+
t.datetime "created_at", precision: nil, null: false
|
52
|
+
t.datetime "updated_at", precision: nil, null: false
|
54
53
|
end
|
55
54
|
|
56
55
|
create_table "collection_type_participants", force: :cascade do |t|
|
@@ -58,16 +57,16 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
58
57
|
t.string "agent_type"
|
59
58
|
t.string "agent_id"
|
60
59
|
t.string "access"
|
61
|
-
t.datetime "created_at", null: false
|
62
|
-
t.datetime "updated_at", null: false
|
60
|
+
t.datetime "created_at", precision: nil, null: false
|
61
|
+
t.datetime "updated_at", precision: nil, null: false
|
63
62
|
t.index ["hyrax_collection_type_id"], name: "hyrax_collection_type_id"
|
64
63
|
end
|
65
64
|
|
66
65
|
create_table "content_blocks", force: :cascade do |t|
|
67
66
|
t.string "name"
|
68
67
|
t.text "value"
|
69
|
-
t.datetime "created_at", null: false
|
70
|
-
t.datetime "updated_at", null: false
|
68
|
+
t.datetime "created_at", precision: nil, null: false
|
69
|
+
t.datetime "updated_at", precision: nil, null: false
|
71
70
|
t.string "external_key"
|
72
71
|
end
|
73
72
|
|
@@ -84,8 +83,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
84
83
|
t.integer "rgt", null: false
|
85
84
|
t.integer "depth", default: 0, null: false
|
86
85
|
t.integer "children_count", default: 0, null: false
|
87
|
-
t.datetime "created_at", null: false
|
88
|
-
t.datetime "updated_at", null: false
|
86
|
+
t.datetime "created_at", precision: nil, null: false
|
87
|
+
t.datetime "updated_at", precision: nil, null: false
|
89
88
|
t.index ["lft"], name: "index_curation_concerns_operations_on_lft"
|
90
89
|
t.index ["parent_id"], name: "index_curation_concerns_operations_on_parent_id"
|
91
90
|
t.index ["rgt"], name: "index_curation_concerns_operations_on_rgt"
|
@@ -95,29 +94,29 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
95
94
|
create_table "featured_works", force: :cascade do |t|
|
96
95
|
t.integer "order", default: 5
|
97
96
|
t.string "work_id"
|
98
|
-
t.datetime "created_at", null: false
|
99
|
-
t.datetime "updated_at", null: false
|
97
|
+
t.datetime "created_at", precision: nil, null: false
|
98
|
+
t.datetime "updated_at", precision: nil, null: false
|
100
99
|
t.index ["order"], name: "index_featured_works_on_order"
|
101
100
|
t.index ["work_id"], name: "index_featured_works_on_work_id"
|
102
101
|
end
|
103
102
|
|
104
103
|
create_table "file_download_stats", force: :cascade do |t|
|
105
|
-
t.datetime "date"
|
104
|
+
t.datetime "date", precision: nil
|
106
105
|
t.integer "downloads"
|
107
106
|
t.string "file_id"
|
108
|
-
t.datetime "created_at", null: false
|
109
|
-
t.datetime "updated_at", null: false
|
107
|
+
t.datetime "created_at", precision: nil, null: false
|
108
|
+
t.datetime "updated_at", precision: nil, null: false
|
110
109
|
t.integer "user_id"
|
111
110
|
t.index ["file_id"], name: "index_file_download_stats_on_file_id"
|
112
111
|
t.index ["user_id"], name: "index_file_download_stats_on_user_id"
|
113
112
|
end
|
114
113
|
|
115
114
|
create_table "file_view_stats", force: :cascade do |t|
|
116
|
-
t.datetime "date"
|
115
|
+
t.datetime "date", precision: nil
|
117
116
|
t.integer "views"
|
118
117
|
t.string "file_id"
|
119
|
-
t.datetime "created_at", null: false
|
120
|
-
t.datetime "updated_at", null: false
|
118
|
+
t.datetime "created_at", precision: nil, null: false
|
119
|
+
t.datetime "updated_at", precision: nil, null: false
|
121
120
|
t.integer "user_id"
|
122
121
|
t.index ["file_id"], name: "index_file_view_stats_on_file_id"
|
123
122
|
t.index ["user_id"], name: "index_file_view_stats_on_user_id"
|
@@ -147,21 +146,21 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
147
146
|
t.date "date"
|
148
147
|
t.integer "total_item_investigations"
|
149
148
|
t.integer "total_item_requests"
|
150
|
-
t.datetime "created_at",
|
151
|
-
t.datetime "updated_at",
|
149
|
+
t.datetime "created_at", null: false
|
150
|
+
t.datetime "updated_at", null: false
|
152
151
|
end
|
153
152
|
|
154
153
|
create_table "hyrax_default_administrative_set", force: :cascade do |t|
|
155
154
|
t.string "default_admin_set_id", null: false
|
156
|
-
t.datetime "created_at", null: false
|
157
|
-
t.datetime "updated_at", null: false
|
155
|
+
t.datetime "created_at", precision: nil, null: false
|
156
|
+
t.datetime "updated_at", precision: nil, null: false
|
158
157
|
end
|
159
158
|
|
160
159
|
create_table "hyrax_features", force: :cascade do |t|
|
161
160
|
t.string "key", null: false
|
162
161
|
t.boolean "enabled", default: false, null: false
|
163
|
-
t.datetime "created_at", null: false
|
164
|
-
t.datetime "updated_at", null: false
|
162
|
+
t.datetime "created_at", precision: nil, null: false
|
163
|
+
t.datetime "updated_at", precision: nil, null: false
|
165
164
|
end
|
166
165
|
|
167
166
|
create_table "job_io_wrappers", force: :cascade do |t|
|
@@ -172,8 +171,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
172
171
|
t.string "original_name"
|
173
172
|
t.string "path"
|
174
173
|
t.string "relation"
|
175
|
-
t.datetime "created_at", null: false
|
176
|
-
t.datetime "updated_at", null: false
|
174
|
+
t.datetime "created_at", precision: nil, null: false
|
175
|
+
t.datetime "updated_at", precision: nil, null: false
|
177
176
|
t.index ["uploaded_file_id"], name: "index_job_io_wrappers_on_uploaded_file_id"
|
178
177
|
t.index ["user_id"], name: "index_job_io_wrappers_on_user_id"
|
179
178
|
end
|
@@ -188,8 +187,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
188
187
|
|
189
188
|
create_table "mailboxer_conversations", id: :serial, force: :cascade do |t|
|
190
189
|
t.string "subject", default: ""
|
191
|
-
t.datetime "created_at", null: false
|
192
|
-
t.datetime "updated_at", null: false
|
190
|
+
t.datetime "created_at", precision: nil, null: false
|
191
|
+
t.datetime "updated_at", precision: nil, null: false
|
193
192
|
end
|
194
193
|
|
195
194
|
create_table "mailboxer_notifications", id: :serial, force: :cascade do |t|
|
@@ -204,10 +203,10 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
204
203
|
t.string "notified_object_type"
|
205
204
|
t.integer "notified_object_id"
|
206
205
|
t.string "attachment"
|
207
|
-
t.datetime "updated_at", null: false
|
208
|
-
t.datetime "created_at", null: false
|
206
|
+
t.datetime "updated_at", precision: nil, null: false
|
207
|
+
t.datetime "created_at", precision: nil, null: false
|
209
208
|
t.boolean "global", default: false
|
210
|
-
t.datetime "expires"
|
209
|
+
t.datetime "expires", precision: nil
|
211
210
|
t.index ["conversation_id"], name: "index_mailboxer_notifications_on_conversation_id"
|
212
211
|
t.index ["notified_object_id", "notified_object_type"], name: "index_mailboxer_notifications_on_notified_object_id_and_type"
|
213
212
|
t.index ["notified_object_type", "notified_object_id"], name: "mailboxer_notifications_notified_object"
|
@@ -223,8 +222,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
223
222
|
t.boolean "trashed", default: false
|
224
223
|
t.boolean "deleted", default: false
|
225
224
|
t.string "mailbox_type", limit: 25
|
226
|
-
t.datetime "created_at", null: false
|
227
|
-
t.datetime "updated_at", null: false
|
225
|
+
t.datetime "created_at", precision: nil, null: false
|
226
|
+
t.datetime "updated_at", precision: nil, null: false
|
228
227
|
t.boolean "is_delivered", default: false
|
229
228
|
t.string "delivery_method"
|
230
229
|
t.string "message_id"
|
@@ -238,15 +237,15 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
238
237
|
t.text "counters"
|
239
238
|
t.bigint "seq", default: 0
|
240
239
|
t.binary "rand"
|
241
|
-
t.datetime "created_at", null: false
|
242
|
-
t.datetime "updated_at", null: false
|
240
|
+
t.datetime "created_at", precision: nil, null: false
|
241
|
+
t.datetime "updated_at", precision: nil, null: false
|
243
242
|
t.index ["namespace"], name: "index_minter_states_on_namespace", unique: true
|
244
243
|
end
|
245
244
|
|
246
245
|
create_table "orm_resources", id: :uuid, default: -> { "uuid_generate_v4()" }, force: :cascade do |t|
|
247
246
|
t.jsonb "metadata", default: {}, null: false
|
248
|
-
t.datetime "created_at", null: false
|
249
|
-
t.datetime "updated_at", null: false
|
247
|
+
t.datetime "created_at", precision: nil, null: false
|
248
|
+
t.datetime "updated_at", precision: nil, null: false
|
250
249
|
t.string "internal_resource"
|
251
250
|
t.integer "lock_version"
|
252
251
|
t.index ["internal_resource"], name: "index_orm_resources_on_internal_resource"
|
@@ -260,8 +259,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
260
259
|
t.string "agent_type"
|
261
260
|
t.string "agent_id"
|
262
261
|
t.string "access"
|
263
|
-
t.datetime "created_at", null: false
|
264
|
-
t.datetime "updated_at", null: false
|
262
|
+
t.datetime "created_at", precision: nil, null: false
|
263
|
+
t.datetime "updated_at", precision: nil, null: false
|
265
264
|
t.index ["permission_template_id", "agent_id", "agent_type", "access"], name: "uk_permission_template_accesses", unique: true
|
266
265
|
t.index ["permission_template_id"], name: "index_permission_template_accesses_on_permission_template_id"
|
267
266
|
end
|
@@ -269,8 +268,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
269
268
|
create_table "permission_templates", force: :cascade do |t|
|
270
269
|
t.string "source_id"
|
271
270
|
t.string "visibility"
|
272
|
-
t.datetime "created_at", null: false
|
273
|
-
t.datetime "updated_at", null: false
|
271
|
+
t.datetime "created_at", precision: nil, null: false
|
272
|
+
t.datetime "updated_at", precision: nil, null: false
|
274
273
|
t.date "release_date"
|
275
274
|
t.string "release_period"
|
276
275
|
t.index ["source_id"], name: "index_permission_templates_on_source_id", unique: true
|
@@ -280,12 +279,12 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
280
279
|
t.string "work_id", null: false
|
281
280
|
t.bigint "sending_user_id", null: false
|
282
281
|
t.bigint "receiving_user_id", null: false
|
283
|
-
t.datetime "fulfillment_date"
|
282
|
+
t.datetime "fulfillment_date", precision: nil
|
284
283
|
t.string "status", default: "pending", null: false
|
285
284
|
t.text "sender_comment"
|
286
285
|
t.text "receiver_comment"
|
287
|
-
t.datetime "created_at", null: false
|
288
|
-
t.datetime "updated_at", null: false
|
286
|
+
t.datetime "created_at", precision: nil, null: false
|
287
|
+
t.datetime "updated_at", precision: nil, null: false
|
289
288
|
t.index ["receiving_user_id"], name: "index_proxy_deposit_requests_on_receiving_user_id"
|
290
289
|
t.index ["sending_user_id"], name: "index_proxy_deposit_requests_on_sending_user_id"
|
291
290
|
end
|
@@ -293,16 +292,16 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
293
292
|
create_table "proxy_deposit_rights", force: :cascade do |t|
|
294
293
|
t.bigint "grantor_id"
|
295
294
|
t.bigint "grantee_id"
|
296
|
-
t.datetime "created_at", null: false
|
297
|
-
t.datetime "updated_at", null: false
|
295
|
+
t.datetime "created_at", precision: nil, null: false
|
296
|
+
t.datetime "updated_at", precision: nil, null: false
|
298
297
|
t.index ["grantee_id"], name: "index_proxy_deposit_rights_on_grantee_id"
|
299
298
|
t.index ["grantor_id"], name: "index_proxy_deposit_rights_on_grantor_id"
|
300
299
|
end
|
301
300
|
|
302
301
|
create_table "qa_local_authorities", force: :cascade do |t|
|
303
302
|
t.string "name"
|
304
|
-
t.datetime "created_at", null: false
|
305
|
-
t.datetime "updated_at", null: false
|
303
|
+
t.datetime "created_at", precision: nil, null: false
|
304
|
+
t.datetime "updated_at", precision: nil, null: false
|
306
305
|
t.index ["name"], name: "index_qa_local_authorities_on_name", unique: true
|
307
306
|
end
|
308
307
|
|
@@ -310,8 +309,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
310
309
|
t.bigint "local_authority_id"
|
311
310
|
t.string "label"
|
312
311
|
t.string "uri"
|
313
|
-
t.datetime "created_at", null: false
|
314
|
-
t.datetime "updated_at", null: false
|
312
|
+
t.datetime "created_at", precision: nil, null: false
|
313
|
+
t.datetime "updated_at", precision: nil, null: false
|
315
314
|
t.index ["local_authority_id"], name: "index_qa_local_authority_entries_on_local_authority_id"
|
316
315
|
t.index ["uri"], name: "index_qa_local_authority_entries_on_uri", unique: true
|
317
316
|
end
|
@@ -333,8 +332,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
333
332
|
t.binary "query_params"
|
334
333
|
t.integer "user_id"
|
335
334
|
t.string "user_type"
|
336
|
-
t.datetime "created_at", null: false
|
337
|
-
t.datetime "updated_at", null: false
|
335
|
+
t.datetime "created_at", precision: nil, null: false
|
336
|
+
t.datetime "updated_at", precision: nil, null: false
|
338
337
|
t.index ["user_id"], name: "index_searches_on_user_id"
|
339
338
|
end
|
340
339
|
|
@@ -342,16 +341,16 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
342
341
|
t.string "download_key"
|
343
342
|
t.string "path"
|
344
343
|
t.string "item_id"
|
345
|
-
t.datetime "expires"
|
346
|
-
t.datetime "created_at", null: false
|
347
|
-
t.datetime "updated_at", null: false
|
344
|
+
t.datetime "expires", precision: nil
|
345
|
+
t.datetime "created_at", precision: nil, null: false
|
346
|
+
t.datetime "updated_at", precision: nil, null: false
|
348
347
|
end
|
349
348
|
|
350
349
|
create_table "sipity_agents", force: :cascade do |t|
|
351
350
|
t.string "proxy_for_id", null: false
|
352
351
|
t.string "proxy_for_type", null: false
|
353
|
-
t.datetime "created_at", null: false
|
354
|
-
t.datetime "updated_at", null: false
|
352
|
+
t.datetime "created_at", precision: nil, null: false
|
353
|
+
t.datetime "updated_at", precision: nil, null: false
|
355
354
|
t.index ["proxy_for_id", "proxy_for_type"], name: "sipity_agents_proxy_for", unique: true
|
356
355
|
end
|
357
356
|
|
@@ -359,8 +358,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
359
358
|
t.integer "entity_id", null: false
|
360
359
|
t.integer "agent_id", null: false
|
361
360
|
t.text "comment"
|
362
|
-
t.datetime "created_at", null: false
|
363
|
-
t.datetime "updated_at", null: false
|
361
|
+
t.datetime "created_at", precision: nil, null: false
|
362
|
+
t.datetime "updated_at", precision: nil, null: false
|
364
363
|
t.index ["agent_id"], name: "index_sipity_comments_on_agent_id"
|
365
364
|
t.index ["created_at"], name: "index_sipity_comments_on_created_at"
|
366
365
|
t.index ["entity_id"], name: "index_sipity_comments_on_entity_id"
|
@@ -370,8 +369,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
370
369
|
t.string "proxy_for_global_id", null: false
|
371
370
|
t.integer "workflow_id", null: false
|
372
371
|
t.integer "workflow_state_id"
|
373
|
-
t.datetime "created_at", null: false
|
374
|
-
t.datetime "updated_at", null: false
|
372
|
+
t.datetime "created_at", precision: nil, null: false
|
373
|
+
t.datetime "updated_at", precision: nil, null: false
|
375
374
|
t.index ["proxy_for_global_id"], name: "sipity_entities_proxy_for_global_id", unique: true
|
376
375
|
t.index ["workflow_id"], name: "index_sipity_entities_on_workflow_id"
|
377
376
|
t.index ["workflow_state_id"], name: "index_sipity_entities_on_workflow_state_id"
|
@@ -381,8 +380,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
381
380
|
t.integer "workflow_role_id", null: false
|
382
381
|
t.integer "entity_id", null: false
|
383
382
|
t.integer "agent_id", null: false
|
384
|
-
t.datetime "created_at", null: false
|
385
|
-
t.datetime "updated_at", null: false
|
383
|
+
t.datetime "created_at", precision: nil, null: false
|
384
|
+
t.datetime "updated_at", precision: nil, null: false
|
386
385
|
t.index ["agent_id"], name: "sipity_entity_specific_responsibilities_agent"
|
387
386
|
t.index ["entity_id"], name: "sipity_entity_specific_responsibilities_entity"
|
388
387
|
t.index ["workflow_role_id", "entity_id", "agent_id"], name: "sipity_entity_specific_responsibilities_aggregate", unique: true
|
@@ -394,8 +393,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
394
393
|
t.string "scope_for_notification_type", null: false
|
395
394
|
t.string "reason_for_notification", null: false
|
396
395
|
t.integer "notification_id", null: false
|
397
|
-
t.datetime "created_at", null: false
|
398
|
-
t.datetime "updated_at", null: false
|
396
|
+
t.datetime "created_at", precision: nil, null: false
|
397
|
+
t.datetime "updated_at", precision: nil, null: false
|
399
398
|
t.index ["notification_id"], name: "sipity_notifiable_contexts_notification_id"
|
400
399
|
t.index ["scope_for_notification_id", "scope_for_notification_type", "reason_for_notification", "notification_id"], name: "sipity_notifiable_contexts_concern_surrogate", unique: true
|
401
400
|
t.index ["scope_for_notification_id", "scope_for_notification_type", "reason_for_notification"], name: "sipity_notifiable_contexts_concern_context"
|
@@ -406,8 +405,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
406
405
|
t.integer "notification_id", null: false
|
407
406
|
t.integer "role_id", null: false
|
408
407
|
t.string "recipient_strategy", null: false
|
409
|
-
t.datetime "created_at", null: false
|
410
|
-
t.datetime "updated_at", null: false
|
408
|
+
t.datetime "created_at", precision: nil, null: false
|
409
|
+
t.datetime "updated_at", precision: nil, null: false
|
411
410
|
t.index ["notification_id", "role_id", "recipient_strategy"], name: "sipity_notifications_recipients_surrogate"
|
412
411
|
t.index ["notification_id"], name: "sipity_notification_recipients_notification"
|
413
412
|
t.index ["recipient_strategy"], name: "sipity_notification_recipients_recipient_strategy"
|
@@ -417,8 +416,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
417
416
|
create_table "sipity_notifications", force: :cascade do |t|
|
418
417
|
t.string "name", null: false
|
419
418
|
t.string "notification_type", null: false
|
420
|
-
t.datetime "created_at", null: false
|
421
|
-
t.datetime "updated_at", null: false
|
419
|
+
t.datetime "created_at", precision: nil, null: false
|
420
|
+
t.datetime "updated_at", precision: nil, null: false
|
422
421
|
t.index ["name"], name: "index_sipity_notifications_on_name", unique: true
|
423
422
|
t.index ["notification_type"], name: "index_sipity_notifications_on_notification_type"
|
424
423
|
end
|
@@ -426,8 +425,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
426
425
|
create_table "sipity_roles", force: :cascade do |t|
|
427
426
|
t.string "name", null: false
|
428
427
|
t.text "description"
|
429
|
-
t.datetime "created_at", null: false
|
430
|
-
t.datetime "updated_at", null: false
|
428
|
+
t.datetime "created_at", precision: nil, null: false
|
429
|
+
t.datetime "updated_at", precision: nil, null: false
|
431
430
|
t.index ["name"], name: "index_sipity_roles_on_name", unique: true
|
432
431
|
end
|
433
432
|
|
@@ -435,8 +434,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
435
434
|
t.integer "workflow_id", null: false
|
436
435
|
t.integer "resulting_workflow_state_id"
|
437
436
|
t.string "name", null: false
|
438
|
-
t.datetime "created_at", null: false
|
439
|
-
t.datetime "updated_at", null: false
|
437
|
+
t.datetime "created_at", precision: nil, null: false
|
438
|
+
t.datetime "updated_at", precision: nil, null: false
|
440
439
|
t.index ["resulting_workflow_state_id"], name: "sipity_workflow_actions_resulting_workflow_state"
|
441
440
|
t.index ["workflow_id", "name"], name: "sipity_workflow_actions_aggregate", unique: true
|
442
441
|
t.index ["workflow_id"], name: "sipity_workflow_actions_workflow"
|
@@ -446,48 +445,48 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
446
445
|
t.string "service_name", null: false
|
447
446
|
t.integer "weight", null: false
|
448
447
|
t.integer "workflow_action_id", null: false
|
449
|
-
t.datetime "created_at", null: false
|
450
|
-
t.datetime "updated_at", null: false
|
448
|
+
t.datetime "created_at", precision: nil, null: false
|
449
|
+
t.datetime "updated_at", precision: nil, null: false
|
451
450
|
t.index ["workflow_action_id"], name: "index_sipity_workflow_methods_on_workflow_action_id"
|
452
451
|
end
|
453
452
|
|
454
453
|
create_table "sipity_workflow_responsibilities", force: :cascade do |t|
|
455
454
|
t.integer "agent_id", null: false
|
456
455
|
t.integer "workflow_role_id", null: false
|
457
|
-
t.datetime "created_at", null: false
|
458
|
-
t.datetime "updated_at", null: false
|
456
|
+
t.datetime "created_at", precision: nil, null: false
|
457
|
+
t.datetime "updated_at", precision: nil, null: false
|
459
458
|
t.index ["agent_id", "workflow_role_id"], name: "sipity_workflow_responsibilities_aggregate", unique: true
|
460
459
|
end
|
461
460
|
|
462
461
|
create_table "sipity_workflow_roles", force: :cascade do |t|
|
463
462
|
t.integer "workflow_id", null: false
|
464
463
|
t.integer "role_id", null: false
|
465
|
-
t.datetime "created_at", null: false
|
466
|
-
t.datetime "updated_at", null: false
|
464
|
+
t.datetime "created_at", precision: nil, null: false
|
465
|
+
t.datetime "updated_at", precision: nil, null: false
|
467
466
|
t.index ["workflow_id", "role_id"], name: "sipity_workflow_roles_aggregate", unique: true
|
468
467
|
end
|
469
468
|
|
470
469
|
create_table "sipity_workflow_state_action_permissions", force: :cascade do |t|
|
471
470
|
t.integer "workflow_role_id", null: false
|
472
471
|
t.integer "workflow_state_action_id", null: false
|
473
|
-
t.datetime "created_at", null: false
|
474
|
-
t.datetime "updated_at", null: false
|
472
|
+
t.datetime "created_at", precision: nil, null: false
|
473
|
+
t.datetime "updated_at", precision: nil, null: false
|
475
474
|
t.index ["workflow_role_id", "workflow_state_action_id"], name: "sipity_workflow_state_action_permissions_aggregate", unique: true
|
476
475
|
end
|
477
476
|
|
478
477
|
create_table "sipity_workflow_state_actions", force: :cascade do |t|
|
479
478
|
t.integer "originating_workflow_state_id", null: false
|
480
479
|
t.integer "workflow_action_id", null: false
|
481
|
-
t.datetime "created_at", null: false
|
482
|
-
t.datetime "updated_at", null: false
|
480
|
+
t.datetime "created_at", precision: nil, null: false
|
481
|
+
t.datetime "updated_at", precision: nil, null: false
|
483
482
|
t.index ["originating_workflow_state_id", "workflow_action_id"], name: "sipity_workflow_state_actions_aggregate", unique: true
|
484
483
|
end
|
485
484
|
|
486
485
|
create_table "sipity_workflow_states", force: :cascade do |t|
|
487
486
|
t.integer "workflow_id", null: false
|
488
487
|
t.string "name", null: false
|
489
|
-
t.datetime "created_at", null: false
|
490
|
-
t.datetime "updated_at", null: false
|
488
|
+
t.datetime "created_at", precision: nil, null: false
|
489
|
+
t.datetime "updated_at", precision: nil, null: false
|
491
490
|
t.index ["name"], name: "index_sipity_workflow_states_on_name"
|
492
491
|
t.index ["workflow_id", "name"], name: "sipity_type_state_aggregate", unique: true
|
493
492
|
end
|
@@ -496,8 +495,8 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
496
495
|
t.string "name", null: false
|
497
496
|
t.string "label"
|
498
497
|
t.text "description"
|
499
|
-
t.datetime "created_at", null: false
|
500
|
-
t.datetime "updated_at", null: false
|
498
|
+
t.datetime "created_at", precision: nil, null: false
|
499
|
+
t.datetime "updated_at", precision: nil, null: false
|
501
500
|
t.integer "permission_template_id"
|
502
501
|
t.boolean "active"
|
503
502
|
t.boolean "allows_access_grant"
|
@@ -506,34 +505,34 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
506
505
|
|
507
506
|
create_table "tinymce_assets", force: :cascade do |t|
|
508
507
|
t.string "file"
|
509
|
-
t.datetime "created_at", null: false
|
510
|
-
t.datetime "updated_at", null: false
|
508
|
+
t.datetime "created_at", precision: nil, null: false
|
509
|
+
t.datetime "updated_at", precision: nil, null: false
|
511
510
|
end
|
512
511
|
|
513
512
|
create_table "trophies", force: :cascade do |t|
|
514
513
|
t.integer "user_id"
|
515
514
|
t.string "work_id"
|
516
|
-
t.datetime "created_at", null: false
|
517
|
-
t.datetime "updated_at", null: false
|
515
|
+
t.datetime "created_at", precision: nil, null: false
|
516
|
+
t.datetime "updated_at", precision: nil, null: false
|
518
517
|
end
|
519
518
|
|
520
519
|
create_table "uploaded_files", force: :cascade do |t|
|
521
520
|
t.string "file"
|
522
521
|
t.bigint "user_id"
|
523
522
|
t.string "file_set_uri"
|
524
|
-
t.datetime "created_at", null: false
|
525
|
-
t.datetime "updated_at", null: false
|
523
|
+
t.datetime "created_at", precision: nil, null: false
|
524
|
+
t.datetime "updated_at", precision: nil, null: false
|
526
525
|
t.index ["file_set_uri"], name: "index_uploaded_files_on_file_set_uri"
|
527
526
|
t.index ["user_id"], name: "index_uploaded_files_on_user_id"
|
528
527
|
end
|
529
528
|
|
530
529
|
create_table "user_stats", force: :cascade do |t|
|
531
530
|
t.integer "user_id"
|
532
|
-
t.datetime "date"
|
531
|
+
t.datetime "date", precision: nil
|
533
532
|
t.integer "file_views"
|
534
533
|
t.integer "file_downloads"
|
535
|
-
t.datetime "created_at", null: false
|
536
|
-
t.datetime "updated_at", null: false
|
534
|
+
t.datetime "created_at", precision: nil, null: false
|
535
|
+
t.datetime "updated_at", precision: nil, null: false
|
537
536
|
t.integer "work_views"
|
538
537
|
t.index ["user_id"], name: "index_user_stats_on_user_id"
|
539
538
|
end
|
@@ -542,10 +541,10 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
542
541
|
t.string "email", default: "", null: false
|
543
542
|
t.string "encrypted_password", default: "", null: false
|
544
543
|
t.string "reset_password_token"
|
545
|
-
t.datetime "reset_password_sent_at"
|
546
|
-
t.datetime "remember_created_at"
|
547
|
-
t.datetime "created_at", null: false
|
548
|
-
t.datetime "updated_at", null: false
|
544
|
+
t.datetime "reset_password_sent_at", precision: nil
|
545
|
+
t.datetime "remember_created_at", precision: nil
|
546
|
+
t.datetime "created_at", precision: nil, null: false
|
547
|
+
t.datetime "updated_at", precision: nil, null: false
|
549
548
|
t.boolean "guest", default: false
|
550
549
|
t.string "facebook_handle"
|
551
550
|
t.string "twitter_handle"
|
@@ -563,7 +562,7 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
563
562
|
t.string "avatar_file_name"
|
564
563
|
t.string "avatar_content_type"
|
565
564
|
t.integer "avatar_file_size"
|
566
|
-
t.datetime "avatar_updated_at"
|
565
|
+
t.datetime "avatar_updated_at", precision: nil
|
567
566
|
t.string "linkedin_handle"
|
568
567
|
t.string "orcid"
|
569
568
|
t.string "arkivo_token"
|
@@ -580,16 +579,16 @@ ActiveRecord::Schema.define(version: 2023_08_03_165135) do
|
|
580
579
|
t.string "datastream_id"
|
581
580
|
t.string "version_id"
|
582
581
|
t.string "committer_login"
|
583
|
-
t.datetime "created_at", null: false
|
584
|
-
t.datetime "updated_at", null: false
|
582
|
+
t.datetime "created_at", precision: nil, null: false
|
583
|
+
t.datetime "updated_at", precision: nil, null: false
|
585
584
|
end
|
586
585
|
|
587
586
|
create_table "work_view_stats", force: :cascade do |t|
|
588
|
-
t.datetime "date"
|
587
|
+
t.datetime "date", precision: nil
|
589
588
|
t.integer "work_views"
|
590
589
|
t.string "work_id"
|
591
|
-
t.datetime "created_at", null: false
|
592
|
-
t.datetime "updated_at", null: false
|
590
|
+
t.datetime "created_at", precision: nil, null: false
|
591
|
+
t.datetime "updated_at", precision: nil, null: false
|
593
592
|
t.integer "user_id"
|
594
593
|
t.index ["user_id"], name: "index_work_view_stats_on_user_id"
|
595
594
|
t.index ["work_id"], name: "index_work_view_stats_on_work_id"
|
data/CONTAINERS.md
CHANGED
@@ -53,7 +53,7 @@ With `docker compose up` running, any changes you make to your cloned Hyrax code
|
|
53
53
|
Any changes you make to Hyrax should be tested. You can run the full test suite using the following command:
|
54
54
|
|
55
55
|
```sh
|
56
|
-
docker compose exec -w /app/samvera/hyrax-engine
|
56
|
+
docker compose exec -w /app/samvera/hyrax-engine web sh -c "bundle exec rspec"
|
57
57
|
```
|
58
58
|
|
59
59
|
Let's break down the above command:
|
@@ -63,8 +63,8 @@ Let's break down the above command:
|
|
63
63
|
<dd>Tell docker to run the following:</dd>
|
64
64
|
<dt><code>-w /app/samvera/hyrax-engine</code></dt>
|
65
65
|
<dd>In the working directory "/app/samvera/hyrax-engine" (e.g. your cloned Hyrax repository)</dd>
|
66
|
-
<dt><code>
|
67
|
-
<dd>of the container named "
|
66
|
+
<dt><code>web</code></dt>
|
67
|
+
<dd>of the container named "web"</dd>
|
68
68
|
<dt><code>sh -c</code>
|
69
69
|
<dd>run the following shell script</dd>
|
70
70
|
<dt><code>"bundle exec rspec"</code></dt>
|
@@ -73,26 +73,26 @@ Let's break down the above command:
|
|
73
73
|
|
74
74
|
_**Note:**_ The `bundle exec rspec` portion of the command runs the whole test suite. See the [rspec command documentation](https://github.com/rspec/rspec-core#the-rspec-command) for how to refine your test runs.
|
75
75
|
|
76
|
-
#### The Docker Container Named "
|
76
|
+
#### The Docker Container Named "web"
|
77
77
|
|
78
78
|
As a developer, you may need to run commands against the Hyrax-based application and/or the Hyrax engine. Examples
|
79
79
|
of those commands are `rails db:migrate` and `rspec`. You would run `rails db:migrate` on the Hyrax-based
|
80
80
|
application, and `rspec` on the Hyrax engine.
|
81
81
|
|
82
|
-
In the engine development `
|
82
|
+
In the engine development `web` container, the `.dassie` test Hyrax-based application is setup as a docker
|
83
83
|
bind mount to `/app/samvera/hyrax-webapp`, and your local development copy of Hyrax (eg. the clone [samvera/hyrax](https://github.com/samvera/hyrax)) is bound to
|
84
84
|
`/app/samvera/hyrax-engine`. Those directories are defined as part of the [Dockerfile](Dockerfile) configuration.
|
85
85
|
.
|
86
86
|
What does this structure mean? Let's look at an example. The following command will list the rake tasks for the Hyrax-based application running in Docker:
|
87
87
|
|
88
88
|
```sh
|
89
|
-
docker compose exec -w /app/samvera/hyrax-webapp
|
89
|
+
docker compose exec -w /app/samvera/hyrax-webapp web sh -c "bundle exec rake -T"
|
90
90
|
```
|
91
91
|
|
92
92
|
And this command lists the rake tasks for the Hyrax engine that is in Docker:
|
93
93
|
|
94
94
|
```sh
|
95
|
-
docker compose exec -w /app/samvera/hyrax-engine
|
95
|
+
docker compose exec -w /app/samvera/hyrax-engine web sh -c "bundle exec rake -T"
|
96
96
|
```
|
97
97
|
|
98
98
|
In the two examples, note the difference in the `-w` switch. In the first case, it's referencing the Hyrax-based application. In the latter case, it's referencing the Hyrax engine.
|
@@ -165,13 +165,13 @@ Currently Koppie should not be used for running specs. See [Code Changes and Tes
|
|
165
165
|
|
166
166
|
```sh
|
167
167
|
docker compose -f docker-compose-koppie.yml up
|
168
|
-
docker compose -f docker-compose-koppie.yml exec
|
168
|
+
docker compose -f docker-compose-koppie.yml exec web bundle exec rails c
|
169
169
|
```
|
170
170
|
#### Troubleshooting Koppie
|
171
171
|
|
172
172
|
If the postgres service logs show permissions errors, there may be old data from alternate versions of the postgres image. The old data volumes can deleted by using `docker compose -f docker-compose-koppie.yml down -v`
|
173
173
|
|
174
|
-
Errors such as `exec /app/samvera/hyrax-entrypoint.sh: no such file or directory` in the
|
174
|
+
Errors such as `exec /app/samvera/hyrax-entrypoint.sh: no such file or directory` in the web, sidekiq and db_migrate services may indicate an outdated cached hyrax-base image layer was used to build the koppie image. Try `docker compose -f docker-compose-koppie.yml build --no-cache` to rebuild all the image layers.
|
175
175
|
|
176
176
|
It was also seen on a Windows 10 host and was resolved by using the git `--core.autocrlf` option when cloning the repo.
|
177
177
|
|
@@ -217,7 +217,7 @@ Currently Sirenia should not be used for running specs. See [Code Changes and Te
|
|
217
217
|
|
218
218
|
```sh
|
219
219
|
docker compose -f docker-compose-sirenia.yml up
|
220
|
-
docker compose -f docker-compose-sirenia.yml exec
|
220
|
+
docker compose -f docker-compose-sirenia.yml exec web bundle exec rails c
|
221
221
|
```
|
222
222
|
|
223
223
|
### Maintaining
|