Reshare feature branch #502
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* adds UV config to disable downloads based on Account Setting. * Update app/helpers/hyrax/iiif_helper_decorator.rb Co-authored-by: Alisha Evans <[email protected]> --------- Co-authored-by: Alisha Evans <[email protected]>
* change order of selectors and add lines between rules * remove trailing white spaces * rubocop fixes * fix rubocop issue * fix unrelated spec * fix spec * try to fix spec again * try to fix spec * try to fix spec again * try to fix spec * try to fix spec * try to fix spec * try to fix spec again * change background back * Bump sidekiq from 6.1.2 to 6.2.1 (#1755) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.1.2 to 6.2.1. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md) - [Commits](sidekiq/sidekiq@v6.1.2...v6.2.1) --- updated-dependencies: - dependency-name: sidekiq dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump puma from 4.3.8 to 4.3.9 (#1763) Bumps [puma](https://github.com/puma/puma) from 4.3.8 to 4.3.9. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](puma/puma@v4.3.8...v4.3.9) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Styles should apply to non-admin pages only (#1735) * cleanup what gets put in the docker image (#1745) * fix rake task specs which take a very long time and sometimes timeout (#1770) * fix rake task specs which take a very long time and sometimes timeout * fix clearly wrong account spec * set the default url, so UI is not blank (#1744) * set the default url, so UI is not blank * rubocop * fix setting fallback fedora url * Settings plus cross search (#1753) * draft of uncompleted implementation of cross tenant search * port settings from hyku_addons, set up settings as properties * email settings and env vars * move many settings to account or env vars, set up gtm * goodbye SETTINGS__ * working on specs * splash view fix * more spec fixes * more spec fixes * more spec fixes * rubocop fixes * fix oai and s3 buckets * always set web_host, fix mailer spec * Typo/Spelling fix * spec typo * dynamic display and edit of settings * Update .env (#1752) * Update .env * Update .env * rubocop * merge concepts of cross search with new settings, rework cross search to be many to many and use the db * rubocop * better solr nil check * add some model & system test for cross tenant search * Deleting a full_tenant from a search failed because '1' is sent back instead of 'true', hence I added typecasting * remove extra end * rubocop * rubocop fixes * make sure rdf doesnt bump to 3.2 as ldp is broken with that version * clean up specs. collection controller is moved to settings, so specs need to go * fix selenium version issue * fix elastic jobs * try to fix catalog spec for ci * mark domain names feature spec pending * trying to make circle ci happy Co-authored-by: edward <[email protected]> * small fixes for false booleans and smtp settings (#1771) * Cross search links (#1764) * add cname to indexer * create the generate_work_url helper * indexer missing file, use model link instead of default * cross search fix. change what methods gets skipped when a search tenant is created. * move generate_work_url to SharedSearchHelper and add test for it * add test AppIndexer to check account_cname_tesim is created * refactor generate_work_url helper method * refactor generate_work_url helper method * fix merge issues * rubocop * call genericworkindexer instead * nil check * no shared search setting * rubocop Co-authored-by: edward <[email protected]> Co-authored-by: Alisha Evans <[email protected]> Co-authored-by: braydonjustice <[email protected]> * single tenant seeds were broken by account validation (#1772) * single tenant seeds were broken by account validation * fix geocoder * try to fix zookeeper * Update Dockerfile * make sure fcrepo and solr are default config before cleaning * Fix typo * update to the current Hyrax docker image, get nokogiri in a safe version, fix small issue with solr reset (#1774) * Bump nokogiri from 1.11.7 to 1.12.5 (#1773) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.7 to 1.12.5. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.11.7...v1.12.5) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update the gitignore with solr_db_initialized so we do not commit it to the repository (#1775) * update-single-tenant-name-uuid (#1780) * Updates seeds so when creating a single tenant the tenant name is UUID vs 'single' * Opps need to remove this as it was experimental and note meant to commit Co-authored-by: April Rieger <[email protected]> * Bump puma from 4.3.10 to 4.3.11 (#1779) Bumps [puma](https://github.com/puma/puma) from 4.3.10 to 4.3.11. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](puma/puma@v4.3.10...v4.3.11) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump sidekiq from 6.3.1 to 6.4.0 (#1778) Bumps [sidekiq](https://github.com/mperham/sidekiq) from 6.3.1 to 6.4.0. - [Release notes](https://github.com/mperham/sidekiq/releases) - [Changelog](https://github.com/mperham/sidekiq/blob/main/Changes.md) - [Commits](sidekiq/sidekiq@v6.3.1...v6.4.0) --- updated-dependencies: - dependency-name: sidekiq dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update to the current Hyrax docker image, get nokogiri in a safe version, fix small issue with solr reset (#1776) * use safe nav for home page theme modal check * nil check in ir theme * add works that don't have an image to the conditional * add text so default thumbnail option does not say undefined * only run migrations and seeds if needed, use a health check for solr * fix dockerfile merge * Removes secondary check_volume call and adds environment under fcrepo to be under one environment label * ensure that only works with thumbnails available come up in the options for collection thumbnail dropdown * add all collection thumbnail upload functionality as well as middleware for caching * fix rubocop errors * Featured collections (#1792) * add in all work from featured collections * fix all the views for the default theme and make the homepage featured works & featured collections look the same" * fix the styling for neural theme, allow the featured collection section to render for the other 2 themes * fix layouts for cultural and institutional repos * bring back the sorting thing to fix a spec * put the table in its rightful place * remove a style that was only needed in BL, and make the buttons the right color text * fix houndCI errors * fix rubocop and some more hound CI * move the actor stack stuff to the model * refactor collection.rb and add specs for update, destroy,e tc" * fix the spacing on the feature button * fix rubocop issues * remove default_middleware_stack override as it is no longer needed * Bump puma from 4.3.11 to 4.3.12 (#1790) Bumps [puma](https://github.com/puma/puma) from 4.3.11 to 4.3.12. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](puma/puma@v4.3.11...v4.3.12) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Deploy Cleanup (#1797) * remove unused settings files * fix database adapter variable to be more uniform. should be DATABASE_ADAPTER everywhere * WIP all variables in readme * README table formatting * updated hyku environment variables (#1799) Co-authored-by: DeonFranklin <[email protected]> * consistantly use DB_ instead of DATABASE_ to match Hyrax * swap fcrepo url, more descriptions * update readme with basic description about each env variable * typos Co-authored-by: DeonFranklin <[email protected]> * replace refs to 'master' branch with main (#1795) the CONTRIBUTING docs, while they have a note on language, still refer to a 'master' branch which doesn't exist in the repo. This simply replaces 'master' with 'main' in CONTRIBUTING.md and copies that file to .github/CONTRIBUTING.md too. There is one more ref to 'master' in the main readme.md but it's for coveralls and replacing 'main' in it doesn't fix the badge so I'm not sure whether to change it * Update Rails Version (#1800) * update rails * add-pagination-to-proprietor-account-show-tables (#1798) * adds pagination to the proprietor accounts show page tables for current account administrator and users * fixes grammatical mistakes -- build locally and tested with more than 5 users for pagination * updates to add pagination Co-authored-by: April Rieger <[email protected]> * Bump jmespath from 1.4.0 to 1.6.1 (#1808) Bumps [jmespath](https://github.com/trevorrowe/jmespath.rb) from 1.4.0 to 1.6.1. - [Release notes](https://github.com/trevorrowe/jmespath.rb/releases) - [Changelog](https://github.com/jmespath/jmespath.rb/blob/main/CHANGELOG.md) - [Commits](jmespath/jmespath.rb@v1.4.0...v1.6.1) --- updated-dependencies: - dependency-name: jmespath dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rack from 2.2.3 to 2.2.3.1 (#1802) Bumps [rack](https://github.com/rack/rack) from 2.2.3 to 2.2.3.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](rack/rack@2.2.3...2.2.3.1) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump nokogiri from 1.12.5 to 1.13.6 (#1810) Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.12.5 to 1.13.6. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.12.5...v1.13.6) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix single tenant catalog links (#1801) * fix single tenant catalog links * Update app/helpers/shared_search_helper.rb Co-authored-by: Shana Moore <[email protected]> * fix failing spec * fix lint error Co-authored-by: Shana Moore <[email protected]> * Use main docker images for zookeeper and solr for development. (#1809) * Use main docker images for zookeeper and solr for development. M1 compatible images are not available by Bitnami and emulated solr is unstable. This allows development on M1 Macs without preventing development on other platforms. * Update .env fix solr password * Update .env Co-authored-by: Shana Moore <[email protected]> * Update .env Co-authored-by: Shana Moore <[email protected]> * Upgrade to Hyrax 3.4.0 (#1811) * Use main docker images for zookeeper and solr for development. M1 compatible images are not available by Bitnami and emulated solr is unstable. This allows development on M1 Macs without preventing development on other platforms. * Update .env fix solr password * update gemfile, temp disable hyrax-doi * rename migrations so hyrax wont keep trying to create duplicates, add new migrtions * UV install * add tinymce * remove Solrizer usage and mv solr/config to solr/conf * uv upgrade missing files * file by file update to 3.4.0 of app directory * rubocopin * bring doi gem back * env fix * env fix * rubocop * work through depreciations * use a m1 compatible selenium image and begin fixing feature specs * feature sync * solr config dir * Update edit.html.erb_spec.rb * Update solr_endpoint_spec.rb * update specs * Update fcrepo_endpoint.rb * Update fcrepo_endpoint_spec.rb * fix uglifier precompile check_volumes issue during docker-compose build * Update Gemfile * Update Gemfile * revert changes to config/features as they are already defined by and inherits from hyrax * fix no thumbnail and uv rendering issue * Remove stray references to uglifier Uglifier was replaced by terser. * fix helm deploy for new helm version, bump version tag to 4.1 * small typo * remove guard that prevents the search tenant from creating collection types * added required fields for User form for email and password. And removed the unnecessary hint text for password * bulkrax on by default, can still be disabled from environment variabel * work in progress: updated proprietor spec and modified required fields for global user form * removed WIP test for proprietor spec and instead created a test for the email and password validation in the user model spec * rubocop fix: replace should with is_expected.to * Accessibility changes (#1813) Adds: * ability to add alternate text for images added via Appearance admin menu. * use of alternate text for main page logo * use of alternate text via title attribute for main page banner image * missing reindex jobs (referenced when adding default images) * default logo view (pulled up from hyrax) to allow use of alt text * Add alt text for collection banner (#1814) * Add alt text for collection banner Resolves ticket https://gitlab.com/notch8/utk-hyku/-/issues/60 * Remove trailing spaces * Able to remove Current Account Administrators (#1817) * changed variable to fit convention better, fixed keep_emails array * Empty-Commit * Fix modal functionality for collection public show (#1819) `Add to collection` button is now functional. Also removes duplicated count of items under title. * update schema with bulkrax enabled (#1821) * udpate to fix the way #fetch evaluates env variables (#1820) Co-authored-by: Shana <[email protected]> Co-authored-by: Shana Moore <[email protected]> Co-authored-by: LaRita Robinson <[email protected]> Co-authored-by: selamhabteab <[email protected]> Co-authored-by: LaRita Robinson <[email protected]> Co-authored-by: Kirk Wang <[email protected]> * Fix shared search links (#1823) * Fix shared search links Fixes: * homepage `View All Collections` button * catalog Collection title links * catalog Work thumbnail links Activates: * catalog Collection thumbnail links * Fix links * Appease rubocop * Fix alignment * Use decorator instead of module_eval * Update app/helpers/blacklight/catalog_helper_behavior_decorator.rb Co-authored-by: Shana Moore <[email protected]> * WIP unblocking edit_account_params to successfully update the data_cite_endpoint_attributes * changed syntax of nested attributes to fix blocker with param permissions * revert accounts_controller.rb * snake case consistency for data_cite * Resolved mixed content error due to insecure XMLHttpRequest endpoint … (#1822) * resolved mixed content error due to insecure XMLHttpRequest endpoint by adding base_url correction in hyrax configuration, as well as adding an override file to include the search_service method in iiif_manifest_decorator.rb * add manifest_url to decorator * update comment * fix rubocop Co-authored-by: Shana <[email protected]> Co-authored-by: Rob Kaufman <[email protected]> * rename fedora_url to fcrepo_url for consistency * remove shx and re run yarn * rename env vars to match hyku/hyrax and reduce merge conflicts * Bump tzinfo from 1.2.9 to 1.2.10 (#1828) Bumps [tzinfo](https://github.com/tzinfo/tzinfo) from 1.2.9 to 1.2.10. - [Release notes](https://github.com/tzinfo/tzinfo/releases) - [Changelog](https://github.com/tzinfo/tzinfo/blob/master/CHANGES.md) - [Commits](tzinfo/tzinfo@v1.2.9...v1.2.10) --- updated-dependencies: - dependency-name: tzinfo dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * first pass at some env variables that are lingering sinc removing the settings gem * add checked option to radio button * add lonely operator incase of nil * Fix Shared Tenant Theme Urls (#1835) * Support shared search urls in homepage themes * Update links for "Masonry" view * Add omitted documentation line * Update links for Gallery view * Rubocop appeasement * Additional rubocop appeasement * Remove undefined method "to_h" * Fix to_h issue Revert prior commit which didn't fix issue. Send appropriate object into render thumbnail method for featured collections. * Standardize documentation format Replace blacklight format with our preferred format. Clarify a few messages and add missing new-lines at end of partials. * Shorten comment line length to appease linter * remove blank space * stop checking for @user.errors.details[key].first[:value] because it does not exist * Removes SOLR_ADMIN_USERNAME and replaced with correct SOLR_ADMIN_USER * This is contributed back work from the Palni Palci Hyku Upgrade. This update was a bug that didn't allow the featured works list to be saved. Ticket: https://gitlab.com/notch8/palni-palci/-/issues/541 * add-worker-script-executable-update-dockerfile-cmd * Fix shared search URLs (#1844) * Fix shared search URLs * Remove stray debugger statement and spaces * fix rubocop * add conditional to handle case when doc is a Hyrax::FileSetPresenter * refactor to set url * pull over fix from UTK Co-authored-by: Shana <[email protected]> * Move Blacklight URL Helper overrides (#1847) * Move Blacklight URL Helper overrides BlacklightHelperBehavior includes BlacklightUrlHelper, so moving them here includes them along with the other Blacklight overrides. Moving them also solves issues with UTK not including handling Blacklight overrides, and simplifies future Hyku upgrades by keeping them in synch. * Remove stray space * use same uploader for banner as other items. fix from british library (#1852) * use same uploader for banner as other items. fix from british library * spec fix * Fix typos (#1849) * add-clause-to-account-settings-for-google_analytics_id (#1845) * Adds a check for the presence of the google_analytics_id. In a staging environment, if the google_analytics_id was not available we would receive a routing error for the partials in the admin dashboard. I also saw errors in my local logs but I didn't discover them till I was looking closely. When account_settings.rb would use the method, reload_library_config, it didn't matter if google_analytics_id.present? or not, the application would need to look in the analytics.rb file which is commented out, which throws an error and doesnt allow us the ability to deploy in a staging environment without Google analytics being setup * consolidate down logic * rubocop Co-authored-by: April Rieger <[email protected]> Co-authored-by: Rob Kaufman <[email protected]> * upgrade Hyrax to v3.4.2 (#1855) Co-authored-by: Benjamin Kiah Stroud <[email protected]> * Bump nokogiri from 1.13.6 to 1.13.10 Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.6 to 1.13.10. - [Release notes](https://github.com/sparklemotion/nokogiri/releases) - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md) - [Commits](sparklemotion/nokogiri@v1.13.6...v1.13.10) --- updated-dependencies: - dependency-name: nokogiri dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Bump loofah from 2.18.0 to 2.19.1 Bumps [loofah](https://github.com/flavorjones/loofah) from 2.18.0 to 2.19.1. - [Release notes](https://github.com/flavorjones/loofah/releases) - [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md) - [Commits](flavorjones/loofah@v2.18.0...v2.19.1) --- updated-dependencies: - dependency-name: loofah dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * Moving ContentBlock methods Prior to this commit there were two very similar chunks of code regarding `ContentBlock.block_for` type logic. With this commit, those chunks of code are consolidated. Why the consolidation? There's an opportunity to more aggressively cache those values. At present, looking at the logs there are numerous singular queries of the ContentBlock structure. (See the details block below) Through this consolidation we can now more easily introduce a caching and invalidation layer. One possible caching mechanism would be on initial query to load all named blocks into an in memory array; then when we update the block we invalidate the in-memory array. The present logging does not provide insight into the cost of each of those individual queries but that is a lot of query calls (which ActiveRecord caches). <details> <summary>Content Blog Log Query</summary> ``` ContentBlock Load (0.6ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "body_font"], ["LIMIT", 1]] CACHE ContentBlock Load (0.1ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "body_font"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "body_font"], ["LIMIT", 1]] ContentBlock Load (0.3ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "headline_font"], ["LIMIT", 1]] ContentBlock Load (0.2ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "link_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "link_color"], ["LIMIT", 1]] ContentBlock Load (0.2ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "link_hover_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "link_color"], ["LIMIT", 1]] ContentBlock Load (0.2ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "footer_link_color"], ["LIMIT", 1]] ContentBlock Load (0.2ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "footer_link_hover_color"], ["LIMIT", 1]] ContentBlock Load (0.2ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "header_background_color"], ["LIMIT", 1]] ContentBlock Load (0.2ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "header_text_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "header_background_color"], ["LIMIT", 1]] ContentBlock Load (0.2ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "searchbar_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "searchbar_background_color"], ["LIMIT", 1]] ContentBlock Load (0.2ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "searchbar_text_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "searchbar_text_color"], ["LIMIT", 1]] ContentBlock Load (0.2ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "searchbar_background_hover_color"], ["LIMIT", 1]] ContentBlock Load (0.2ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "searchbar_text_hover_color"], ["LIMIT", 1]] ContentBlock Load (0.2ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "active_tabs_background_color"], ["LIMIT", 1]] ContentBlock Load (0.2ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "primary_button_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "primary_button_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "primary_button_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "primary_button_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "primary_button_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "primary_button_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "primary_button_background_color"], ["LIMIT", 1]] ContentBlock Load (0.6ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "default_button_background_color"], ["LIMIT", 1]] ContentBlock Load (0.3ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "default_button_border_color"], ["LIMIT", 1]] ContentBlock Load (0.3ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "default_button_text_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "default_button_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "default_button_border_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "default_button_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "default_button_border_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "default_button_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "default_button_border_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "default_button_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "default_button_border_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "default_button_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "default_button_border_color"], ["LIMIT", 1]] ContentBlock Load (0.3ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "facet_panel_text_color"], ["LIMIT", 1]] ContentBlock Load (0.2ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "facet_panel_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "facet_panel_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "facet_panel_background_color"], ["LIMIT", 1]] CACHE ContentBlock Load (0.0ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "facet_panel_text_color"], ["LIMIT", 1]] ContentBlock Load (0.4ms) SELECT "content_blocks".* FROM "content_blocks" WHERE "content_blocks"."name" = $1 LIMIT $2 [["name", "custom_css_block"], ["LIMIT", 1]] Rendered shared/_appearance_styles.html.erb (52.2ms) ``` </details> * Backport fix from UTK (#1861) fixes samvera/hyku#1857 * workflow actions header color * lint * more lint * moves share your work button outside of featured works partial * add favicon uploads to appearance dashboard (#313) * add favicon uploads to appearance dashboard * use allow_list * lint * run migrations, commit schema * adds libreoffice to Dockerfile * fix embargo and lease date time issue * use lease_expiration_date * fixes neutral repo home page collections * add filesets to search for collection show page * rubocop * Aligns Hyku's env variables for fcrepo to align with those in the hyrax 3.4.2 helm chart. * A lone straggler * Fix sign up link not rendering (#1880) Account#allow_signup returns a boolean, not a string. This conditional would always return false due to this data type mismatch Co-authored-by: Benjamin Kiah Stroud <[email protected]> * remove unnecessary equality check (#1881) The data type of current_account#allow_signup is boolean, so checking "true == true" in a conditional is unnecessary * Appease the coppahs * Appease the coppahs... round 2 * Adds back google analytics contributing back to hyku from Pals for hyku upgrade work * Updating after getting setup locally * more edits to README.md * Contributing back negative captcha (#1877) * Contributing back negative captcha * Appease the coppahs Co-authored-by: Rob Kaufman <[email protected]> * working on automated deployment (#1883) * working on automated deployment * just build * fix iiif deploy (#1884) * working on automated deployment * just build * fix deploy name * add conditional to account for when iiif print gem is installed * Bringing over Hyrax fix for not erroring the dashboard view if analytics isnt enabled yet, also lets comment out the env file since tests use it and google is not needed * Forgot all about the analytics.yml file * GitHub workflow - deploy work (#1885) * working on automated deployment * more deploy fixes (#1889) * Image magick and build fixes (#1900) * Update configurations - update gitignore Also bringing over changes Rob put into my working branch: - update docker build - update derivative processing * bump imagemagick version again to fix tiff offset bug Co-authored-by: LaRita Robinson <[email protected]> * Add release notes template (#1904) * borrow changelog config from Bulkrax * borrow PR label validator Action from Bulkrax * include PR label instructions in contributing guidelines * Bump globalid from 1.0.0 to 1.0.1 (#1896) Bumps [globalid](https://github.com/rails/globalid) from 1.0.0 to 1.0.1. - [Release notes](https://github.com/rails/globalid/releases) - [Commits](rails/globalid@v1.0.0...v1.0.1) --- updated-dependencies: - dependency-name: globalid dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rack from 2.2.3.1 to 2.2.6.2 (#1895) Bumps [rack](https://github.com/rack/rack) from 2.2.3.1 to 2.2.6.2. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](rack/rack@2.2.3.1...v2.2.6.2) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump rails-html-sanitizer from 1.4.3 to 1.4.4 (#1860) Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.4.3 to 1.4.4. - [Release notes](https://github.com/rails/rails-html-sanitizer/releases) - [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md) - [Commits](rails/rails-html-sanitizer@v1.4.3...v1.4.4) --- updated-dependencies: - dependency-name: rails-html-sanitizer dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Groups with Roles feature (#1859) Groups with Roles feature Introduce ability to add roles to groups. Group members inherit the permissions attached to the group's roles. Notable changes: - Several new Roles for Work, Collection, and User management - Role permission integration with Hyrax permission logic (Sipity, access controls, CanCan, etc.) - Hyku::Group replaced with already existing Hyrax::Group - Easily assign roles to individual users - Extended UI - Both pre-configured and customizable groups - Scripts to migrate existing Hyku applications - More Documentation for this feature can be found in the Hyku GitHub Wiki here: https://github.com/samvera/hyku/wiki/Groups-with-Roles-Feature This work is a joint contribution of PALNI and PALCI's Hyku for Consortia project. * upgrade to hyrax 3.5, make graph indexer on by default (#1907) * upgrade to hyrax 3.5, make graph indexer on by default * adjust importer section of readme, bump ruby/rails versions (#1906) * adjust importer section of readme, bump ruby/rails versions * Update README.md Co-authored-by: Lea Ann Bradford <[email protected]> --------- Co-authored-by: Lea Ann Bradford <[email protected]> * Yarn lock had git+ssh which doesnt work in certain situations (#1908) * Yarn lock fix (#1909) * Yarn lock had git+ssh which doesnt work in certain situations * fix yarn * refactor CollectionPresenterDecorator to use #decorate (#1913) * refactor CollectionPresenterDecorator to use #decorate Before this change, the #terms method was not actually being overwritten; #prepend does not work for class methods Also, remove resolved TODO comment * fix indentation * adds gha cool titles * adds gha cool titles * Run generator and add model config to work types * update Hyku::VERSION to 5.0.1 (#1921) * Update search and bulkrax config * bring back a production worthy docker-compose example (#1918) * replace migration files with those from i98 these migrations are already deployed to staging so we need to match them. installing iiif_print changes their time stamps and breaks staging deploy. * rubocop fix * solr build improvements * amd only again * get the name right * more build work * spin the wheel again * use the new docker image * rethink tag starategy * stop trying to copy a field that does not exist * stop words * unstick build/test by not doing autosuggest for iiif right now * update iiif_print to pull in fix for missing translations * solr build improvements (#1925) * solr build improvements * amd only again * get the name right * more build work * spin the wheel again * use the new docker image * rethink tag starategy * Update script grants admins manage access to Collections (#1927) * ensure admin group gets manage access to all Collections when running "rake hyku:roles:create_collection_accesses" If a Collection did not previously have a permission template, one would have been been created for it when running this script. Since we weren't granting admins any access before this change, admins were not able to do things like deposit works into these "broken" Collections * fix specs * add a reset task that wraps the task from bulkrax (#1840) * add a reset task that wraps the task from bulkrax to make it multitenant * upgrade hyrax docker image and remove malloc env var. (#1933) * upgrade hyrax docker image and remove malloc env var. * rubocop fixes * Extended oai (#1934) * initial implementation * updates for file urls * rubocop fixes * rubocop fixes 2 * test update * resorted to hard coding prefix setting since Settings is not available during the test * upgrade to bulkrax 5.2 * bug fixes, mapping for testing, logging for debugging * debugging * upgrade bulkrax to v5.2.1 * refactor the bulkrax config * remove no longer necessary bulkrax overrides * rubocop * revert schema version change * fix specs * iiif_av from BL * add iiif_av gem * build link for filesets * remove debugging comment * add json manifest * upgrade iiif print gem, set manifest to v3 * install pry-byebug * set enable ffmpeg to true * rubocop * remove unneeded method and corresponding spec * PR feedback changes * remove code comment * pr feedback * remove ws * add pdf to UV * update iiif-print * Bump rack from 2.2.6.2 to 2.2.7 (#1941) Bumps [rack](https://github.com/rack/rack) from 2.2.6.2 to 2.2.7. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](rack/rack@v2.2.6.2...v2.2.7) --- updated-dependencies: - dependency-name: rack dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fixes error message formatting (#1947) * update gemfile * remove release label action * update lock file * remove gitlab ci file * add missing method * rubocop * typo * remove extra include on generic work * make directory image alt text and stat slider align with Hyku * undo directory image update * ws * add missing routes back * comment xray-rails gem for sidekiq conflict * update dockerfile for fits update * fix nil error in order_already, add pdf split to models * debugging iiif print, changes from atla hyku * remove whitespace * add webdriver version back * revert gemfile changes * update build base actions version --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Summer <[email protected]> Co-authored-by: summer-cook <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Rob Kaufman <[email protected]> Co-authored-by: edward <[email protected]> Co-authored-by: Alisha Evans <[email protected]> Co-authored-by: braydonjustice <[email protected]> Co-authored-by: April Rieger <[email protected]> Co-authored-by: April Rieger <[email protected]> Co-authored-by: DeonFranklin <[email protected]> Co-authored-by: Eric Phetteplace <[email protected]> Co-authored-by: Shana Moore <[email protected]> Co-authored-by: Shana Moore <[email protected]> Co-authored-by: LaRita Robinson <[email protected]> Co-authored-by: selamhabteab <[email protected]> Co-authored-by: LaRita Robinson <[email protected]> Co-authored-by: Kirk Wang <[email protected]> Co-authored-by: Kirk Wang <[email protected]> Co-authored-by: April Rieger <[email protected]> Co-authored-by: Christian Clauss <[email protected]> Co-authored-by: Benjamin Kiah Stroud <[email protected]> Co-authored-by: Benjamin Kiah Stroud <[email protected]> Co-authored-by: Jeremy Friesen <[email protected]> Co-authored-by: April Rieger <[email protected]> Co-authored-by: Braydon Justice <[email protected]> Co-authored-by: Alisha Evans <[email protected]> Co-authored-by: Summer Cook <[email protected]>
…-palci into reshare-feature
* account for iiifprint * override whole iiifprint decorator
* remove syntax error commas, inherit the presenter from the right place, and index abstracts same as generic work * add custom field for chronology note * update catalog controller and add custom attribute_rows for cdls * needed to use iiif_viewer instead of universal_viewer method on the scholarly show page, or else an error was thrown * fix attribute rows file name and cdl presenter * add to solr document, fix attribute rows * rubocop * one more rubocop fix * feedback from PR
* wip - initial add auth_provider to dashboard * rubocop and updates * locales and icon * remove unused css file
* remove old derived code * rubocop
* use the current year * update all locales
* add basic setup for reshare show theme * add wireframe and fill out show override * update reshare theme * image was messed up somehow * render attribute rows directly in the reshare show theme, also delete unused partials * fix the admin thing
* use custom uv config for reshare theme * fig json setup * fix header panel, enable 2 page view
* each auth provider should have its own fields * bring back the right thing in the views * fix partial and controller * rollback migration * do a migration to change the table instead * add nil check
* Switches thumbnail method for gallery view partial * Allow selenium specs to run on m1 (#551) * Switches thumbnail method for gallery view partial * allow selenium specs to run on m1 * fix so we can view selenium in browser * temporary commit for docs? --------- Co-authored-by: leaannbradford <[email protected]> * Add depositor name to published tab (#577) * fix some margins in the dashboard * hide-per-tenant-analytics-on-prod (#579) * use the default analytics as a default on prod only. the per tenant analytics work was already merged to main and the defaults were hidden on staging. however, pals wants to hold off on deploying that code to production until the ga4 switch has happened so both major changes can happen at the same time. putting the analytics defaults in a conditional ensures that we can still deploy to production from main. related to: #569 * rubocop fix * default the env variables in analytics.yml to be empty strings so they do not fail when the env variable is not present (#580) * Advanced Search (#578) * initial generate command * get advanced search working! woooo! * remove facets * remove extra place where things were being added to search builder, update spec * unskip tests * fix button style and location * rubocop * fix test so advanced search params are included * add back range limit helper! * remove unnecessary comment * Advanced search rework (#581) * refactor and start adding missing properties * update so it includes all fields * add descriptionn & abstract * remove based near * rubocop * remove format- it should not be included in advanced search due to conflicts with Blacklight proper * add comments, add back format but do not include in advanced search * add advanced to the themes (#587) * 530 - Bring Back Based Near (#591) * re-enable based_near everywhere * remove location.rb since we now have a working decorator * update help text/locales * update comments * update comments * rubocop * fix comment! * more specific decorator * enable deleting, make sure location is bold (#596) * Hyrax 2.6 upgrade for GA4 and Workflow bug fixes into main branch (#611) * upgrade to hyrax 3.6 for new analytics * fix depenency upgrade issue * working on getting a version to pass specs * fix bug with workflow pagination - updates overridden hyrax files * rubocop --------- Co-authored-by: Rob Kaufman <[email protected]> * reverts change that was doing nothing (#613) * update gemfile.lock --------- Co-authored-by: Summer <[email protected]> Co-authored-by: Summer Cook <[email protected]> Co-authored-by: Alisha Evans <[email protected]> Co-authored-by: Rob Kaufman <[email protected]>
* Switches thumbnail method for gallery view partial * Allow selenium specs to run on m1 (#551) * Switches thumbnail method for gallery view partial * allow selenium specs to run on m1 * fix so we can view selenium in browser * temporary commit for docs? --------- Co-authored-by: leaannbradford <[email protected]> * Add depositor name to published tab (#577) * fix some margins in the dashboard * hide-per-tenant-analytics-on-prod (#579) * use the default analytics as a default on prod only. the per tenant analytics work was already merged to main and the defaults were hidden on staging. however, pals wants to hold off on deploying that code to production until the ga4 switch has happened so both major changes can happen at the same time. putting the analytics defaults in a conditional ensures that we can still deploy to production from main. related to: #569 * rubocop fix * default the env variables in analytics.yml to be empty strings so they do not fail when the env variable is not present (#580) * Advanced Search (#578) * initial generate command * get advanced search working! woooo! * remove facets * remove extra place where things were being added to search builder, update spec * unskip tests * fix button style and location * rubocop * fix test so advanced search params are included * add back range limit helper! * remove unnecessary comment * Advanced search rework (#581) * refactor and start adding missing properties * update so it includes all fields * add descriptionn & abstract * remove based near * rubocop * remove format- it should not be included in advanced search due to conflicts with Blacklight proper * add comments, add back format but do not include in advanced search * add advanced to the themes (#587) * 530 - Bring Back Based Near (#591) * re-enable based_near everywhere * remove location.rb since we now have a working decorator * update help text/locales * update comments * update comments * rubocop * fix comment! * more specific decorator * enable deleting, make sure location is bold (#596) * Hyrax 2.6 upgrade for GA4 and Workflow bug fixes into main branch (#611) * upgrade to hyrax 3.6 for new analytics * fix depenency upgrade issue * working on getting a version to pass specs * fix bug with workflow pagination - updates overridden hyrax files * rubocop --------- Co-authored-by: Rob Kaufman <[email protected]> * reverts change that was doing nothing (#613) * update dockerfile to be the same as main, rubocop, and fix sidekiq warning * skip remaining specs to get reshare feature merged * skip one more * rubocop * skip the 2 that i forgot to skip * fix reshare specs (#638) * fix oer_presenter_spec * fix 2 advanced search builder specs * fix auth provider spec --------- Co-authored-by: leaannbradford <[email protected]> Co-authored-by: Alisha Evans <[email protected]> Co-authored-by: Rob Kaufman <[email protected]>
summer-cook
approved these changes
Aug 1, 2023
There was a problem hiding this comment.
this file came in during the Hyku upgrade, but its most likely not supposed to be here. Will open a separate ticket to move it to the right place in Hyku, and then pull that commit over from hyku.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Story
Refs #issuenumber
Expected Behavior Before Changes
Expected Behavior After Changes
Screenshots / Video
Notes