Hide user collection tag

.github/workflows/build-test-lint.yaml

@@ -17,7 +17,7 @@ on:
 
 jobs:
   build:
-    uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.15
+    uses: scientist-softserv/actions/.github/workflows/build.yaml@webworkersunited
     secrets: inherit
     with:
       platforms: 'linux/amd64'
@@ -26,16 +26,14 @@ jobs:
 
   test:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/test.yaml@v0.0.15
+    uses: scientist-softserv/actions/.github/workflows/test.yaml@webworkersunited
     with:
       confdir: '/app/samvera/hyrax-webapp/solr/conf'
-      webTarget: hyku-web
-      workerTarget: hyku-worker
       rspec_cmd: "cd .. && gem install semaphore_test_boosters && bundle && rspec_booster --job $CI_NODE_INDEX/$CI_NODE_TOTAL"
 
   lint:
     needs: build
-    uses: scientist-softserv/actions/.github/workflows/lint.yaml@v0.0.15
+    uses: scientist-softserv/actions/.github/workflows/lint.yaml@webworkersunited
     with:
       webTarget: hyku-web
       workerTarget: hyku-worker

.gitignore

@@ -9,3 +9,4 @@ scratch.md
 .DS_Store
 
 /coverage
+file_cache/

.gitmodules

@@ -1,4 +1,3 @@
 [submodule "hyrax-webapp"]
 	path = hyrax-webapp
-	url = https://github.com/samvera/hyku.git
-	branch = adventist_dev
+	url = https://github.com/samvera/hyku.git

.rubocop.yml

@@ -1,132 +1,96 @@
-# Turn on RSpec cops
-require: rubocop-rspec
-inherit_from: .rubocop_todo.yml
-
-# With the rubocop 0.47.0 and rubocop-rspec 1.8.0 the following stderr message was sent:
-#   An error occurred while RSpec/DescribedClass cop was inspecting path/to/file
-RSpec/DescribedClass:
-  Enabled: false
+inherit_gem:
+  bixby: bixby_default.yml
 
 AllCops:
+  NewCops: disable
+  TargetRubyVersion: 3.2.2
   DisplayCopNames: true
-  TargetRubyVersion: 2.3
   Exclude:
-    - 'hyrax-webapp/**/*'
-    - 'bin/**/*'
-    - 'db/**/*'
-    - 'config/**/*'
-    - 'vendor/**/*'
-    - 'lib/dog_biscuits/**/*'
-    - 'lib/dog_biscuits.rb'
-    - '.internal_test_app/**/*'
-    - 'spec/fixtures/**/*'
-    - 'spec/internal/**/*'
-    - 'spec/test_app_templates/**/*'
-    - 'Rakefile'
-    - 'lib/tasks/rubocop.rake'
-    # disabling collections controller as most of the rubocop errors are in hyrax
-    - 'app/controllers/hyrax/dashboard/collections_controller.rb'
-
-Rails:
-  Enabled: true
-
-Rails/DynamicFindBy:
-  Whitelist:
-    - find_by_user_key
+  # NOTE: When we run knapsack's rubocop, we don't want to check the submodule
+  #       for Hyku.  We'll assume it's okay and has it's own policing policies.
+  - "hyrax-webapp/**/*"
+  - 'bin/**/*'
+  - 'db/**/*'
+  - 'config/**/*'
+  - 'vendor/**/*'
+  - 'lib/tasks/rubocop.rake'
+
+Layout/HashAlignment:
   Exclude:
-    - 'lib/importer/factory/object_factory.rb'
-
-Rails/UnknownEnv:
-  Environments:
-    - development
-    - production
-    - staging
-    - test
+  - app/forms/hyrax/forms/admin/adl_appearance_decorator.rb
 
-Metrics/LineLength:
-  Max: 120
+Metrics/BlockLength:
+  AllowedMethods: ['included', 'describe', 'it', 'context']
   Exclude:
-    - 'app/controllers/catalog_controller.rb'
-    - 'spec/controllers/curation_concerns/generic_works_controller_spec.rb'
-    - 'spec/services/iiif_collection_thumbnail_path_service_spec.rb'
-    - 'spec/services/iiif_work_thumbnail_path_service_spec.rb'
-    - 'spec/routing/proprietor/accounts_routing_spec.rb'
-
-Layout/IndentationConsistency:
-  EnforcedStyle: rails
+  - "spec/**/*.rb"
+  - app/controllers/catalog_controller_decorator.rb
 
-Layout/DotPosition:
-  EnforcedStyle: leading
+Metrics/ModuleLength:
+  Exclude:
+  - lib/dog_biscuits.rb
+  - app/models/solr_document_decorator.rb
 
-Style/Documentation:
+Style/AsciiComments:
   Enabled: false
 
-Style/StringLiterals:
+# rubocop suggests !thing.nil? instead, but that is NOT equivalent
+Style/DoubleNegation:
   Enabled: false
 
-Style/WordArray:
+Style/CollectionMethods:
+  PreferredMethods:
+    collect: 'map'
+    collect!: 'map!'
+    inject: 'reduce'
+    detect: 'find'
+    find_all: 'select'
+
+Style/SymbolArray:
   Enabled: false
 
-Metrics/ClassLength:
-  Exclude:
-    - 'app/controllers/catalog_controller.rb'
+Style/ClassAndModuleChildren:
+  Enabled: false
 
-Metrics/ModuleLength:
-  Max: 200
+Style/SingleLineBlockParams:
+  Enabled: false
 
-Rails/HasAndBelongsToMany:
-  Exclude:
-    - 'app/models/role.rb'
+Rails/ApplicationJob:
+  Enabled: false
 
-RSpec/AnyInstance:
+Rails/ApplicationMailer:
   Enabled: false
 
-RSpec/InstanceVariable:
-  Exclude:
-    - 'spec/controllers/hyku/registrations_controller_spec.rb'
+Rails/ApplicationRecord:
+  Enabled: false
 
-RSpec/NamedSubject:
+Rails/RakeEnvironment:
   Enabled: false
 
-RSpec/DescribeClass:
-  Exclude:
-    - 'spec/requests/**/*'
-    - 'spec/features/**/*'
-    - 'spec/views/**/*'
-    - 'spec/routing/**/*'
-    - 'spec/tasks/**/*'
+# We define custom methods like `find_by_user_key`,
+# `find_by_created_date`, etc
+Rails/DynamicFindBy:
+  Enabled: false
 
-Rails/FilePath:
-  Exclude:
-    - 'spec/routing/**/*'
+# # By default RSpec/MessageSpies has the following:
+# #   Prefer have_received for setting message expectations. Setup form as a spy using allow or instance_spy.
+# # The default assumes EnforcedStyle is 'have_received'. Most of our specs are 'receive'
+RSpec/MessageSpies:
+  Enabled: false
 
 RSpec/ExpectActual:
-  Exclude:
-    - 'spec/routing/**/*'
+  Enabled: false
 
-RSpec/VerifiedDoubles:
+RSpec/LetSetup:
   Enabled: false
 
 RSpec/MessageExpectation:
   Enabled: false
 
-# By default RSpec/MessageSpies has the following:
-#   Prefer have_received for setting message expectations. Setup form as a spy using allow or instance_spy.
-RSpec/MessageSpies:
-  Enabled: true
-  EnforcedStyle: receive
-
-RSpec/ExampleLength:
-  Max: 20
-
 RSpec/NestedGroups:
-  Max: 4
+  Enabled: false
 
-RSpec/MultipleExpectations:
+RSpec/LeadingSubject:
   Enabled: false
 
-Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*.rb'
-    - 'lib/tasks/*.rake'
-    - 'app/controllers/catalog_controller.rb'
+RSpec/ExampleLength:
+  Max: 16

.rubocop_todo.yml

@@ -27,7 +27,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 14
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
+Layout/LineLength:
   Max: 161
 
 # Offense count: 24

Dockerfile

@@ -1,7 +1,8 @@
-FROM ghcr.io/samvera/hyku/base:d6ef0431 as hyku-knap-base
+FROM ghcr.io/samvera/hyku/base:20b8c56e as hyku-knap-base
 
 # This is specifically NOT $APP_PATH but the parent directory
 COPY --chown=1001:101 . /app/samvera
+RUN ln -s /app/samvera/bundler.d /app/.bundler.d
 ENV BUNDLE_LOCAL__HYKU_KNAPSACK=/app/samvera
 ENV BUNDLE_DISABLE_LOCAL_BRANCH_CHECK=true