AP-281: Upgrade Geoblacklight to 4.4.2

this takes commits 454f840..4c275f6 and squashes them down to clear up a complex branch history.

install yarn and node.js, setup

add javascript entrypoints but not work

test

rebuilding

configure local

vite build segment error

rm log file

rm .npm

docker and compose file

update installtion

clean up

update artifact action from v3 to v4

DP-1469: upgrade postgres image to v16.4

Upgrade github actions

Adding container image and root user in the test job

Adding container image and root user in the test job

rm init in test job

GHA: Run tests with user=root

Allow starting solr as root

remove: Allow starting solr as root

matching puma version with rackup version to fix puma issue on running rake commands

update a spec file

git ignore yarn folder

clr Dockfile

calnet login page test

Update some localize strings

clr gitignore file

clean up spec test

2. rubocop correction

3. added package clean up in Docker file; clean up Gemfile

4. Remove old build.yml

5. clean up spec_helper.rb, devise.rb

Co-authored-by: Daniel Schmidt <dcschmidt@berkeley.edu>

Author: 2 people

.gitignore

@@ -1,17 +1,3 @@
-*.rbc
-capybara-*.html
-.bash*
-.rspec
-/db/*.sqlite3
-/db/*.sqlite3-journal
-/db/*.sqlite3-[0-9]*
-/public/system
-/coverage/
-/spec/tmp
-*.orig
-rerun.txt
-pickle-email-*.html
-
 # Ignore all logfiles and tempfiles.
 /log/*
 /tmp/*
@@ -29,6 +15,8 @@ config/master.key
 # TODO Comment out this rule if environment variables can be committed
 .env
 
+.bash*
+
 ## Environment normalization:
 /.bundle
 /vendor/bundle
@@ -38,22 +26,10 @@ config/master.key
 # these should all be checked in to normalize the environment:
 # Gemfile.lock, .ruby-version, .ruby-gemset
 
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-
-# if using bower-rails ignore default bower_components path bower.json files
-/vendor/assets/bower_components
-*.bowerrc
-bower.json
-
-# Ignore pow environment settings
-.powenv
-
-# Ignore Byebug command history file.
+# Ignore command history file.
 .byebug_history
+.irb_history
 
-# Ignore Bash history file.
-.bash_history
 
 # Ignore node_modules
 node_modules/
@@ -65,17 +41,23 @@ node_modules/
 
 # Ignore yarn files
 /yarn-error.log
+/.yarnrc
 yarn-debug.log*
+yarn.lock
+.yarn
 .yarn-integrity
 
-# Ignore uploaded files in development
-/storage/*
-!/storage/.keep
+# Ignore .npm files
+/.npm
 
 # Build/test artifacts
 /artifacts/
 
 # Ignore solr files
 solr/*/data/*
 
-.irb_history
+# Vite Ruby
+/public/vite*
+# Vite uses dotenv and suggests to ignore local-only env files. See
+# https://vitejs.dev/guide/env-and-mode.html#env-files
+*.local

Dockerfile

@@ -25,33 +25,40 @@ RUN apt-get update -qq
 
 # Install standard packages from the Debian repository
 RUN apt-get install -y --no-install-recommends \
-     bash \
-     curl \
-     default-jre \
-     ca-certificates \
-     nodejs \
-     libpq-dev \
-     libvips42 \
-     yarn\
-&&  rm -rf /var/cache/apk/*
+    bash \
+    curl \
+    default-jre \
+    ca-certificates \ 
+    libpq-dev \
+    libvips42 \
+    &&  rm -rf /var/cache/apk/*
+
+# Install Node.js (using NodeSource to get the latest LTS version, e.g., 20.x)
+RUN curl -fsSL https://deb.nodesource.com/setup_20.x| bash - \
+    && apt-get install -y --no-install-recommends nodejs \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Install Yarn (using the official Yarn repository)
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+    && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
+    && apt-get update && apt-get install -y --no-install-recommends yarn \
+    && apt-get clean && rm -rf /var/lib/apt/lists/* 
 
 # By default, run as the geodata user
-USER geodata
+USER $APP_USER
 
 # All subsequent commands run relative to the app directory.
 WORKDIR /opt/app
 
 # Add binstubs to the path.
 ENV PATH="/opt/app/bin:$PATH"
 
-
 # If run with no other arguments, the image will start the rails server by
 # default. Note that we must bind to all interfaces (0.0.0.0) because when
 # running in a docker container, the actual public interface is created
 # dynamically at runtime (we don't know its address in advance).
 CMD ["rails", "server", "-b", "0.0.0.0", "--pid", "/tmp/puma.pid"]
 
-
 # ============================================================================
 # Target: development
 # Installs all dependencies, requiring the (large) build-base package. Build
@@ -68,7 +75,7 @@ RUN apt-get install -y --no-install-recommends \
     make
 
 # Drop back to the GeoData user
-USER geodata
+USER $APP_USER
 
 # Copy over only the files which are needed to perform a bundle install.
 COPY --chown=geodata .ruby-version Gemfile* ./
@@ -79,8 +86,7 @@ COPY --chown=geodata . .
 
 # Create cache/pids/etc directories.
 RUN bundle exec -- rails log:clear tmp:create \
-&&  rails assets:precompile
-RUN mkdir tmp/cache/downloads
+    &&  rails assets:precompile
 
 # ============================================================================
 # Target: production
@@ -93,7 +99,6 @@ FROM base AS production
 COPY --from=development --chown=geodata /opt/app /opt/app
 COPY --from=development --chown=geodata /usr/local/bundle /usr/local/bundle
 
-
 # Sanity-check that the bundle is correctly installed, that the Gemfile
 # and Gemfile.lock are synced, and that assets are able to be compiled.
 # no need to run bundle install
@@ -116,4 +121,4 @@ ENV BUILD_URL="${BUILD_URL}"
 ENV DOCKER_TAG="${DOCKER_TAG}"
 ENV GIT_REF_NAME="${GIT_REF_NAME}"
 ENV GIT_SHA="${GIT_SHA}"
-ENV GIT_REPOSITORY_URL="${GIT_REPOSITORY_URL}"
+ENV GIT_REPOSITORY_URL="${GIT_REPOSITORY_URL}"

Gemfile

@@ -9,7 +9,7 @@ gem 'bootsnap', require: false
 gem 'bootstrap', '~> 4.0'
 gem 'devise'
 gem 'devise-guests', '~> 0.8'
-gem 'geoblacklight', '~> 4.1.1'
+gem 'geoblacklight', '~> 4.4.2'
 gem 'importmap-rails'
 gem 'jbuilder'
 gem 'jquery-rails'
@@ -19,7 +19,7 @@ gem 'omniauth-rails_csrf_protection', '~> 1.0'
 gem 'pg', '~> 1.4.6'
 gem 'puma', '~> 6.4.1'
 gem 'rack-timeout', '~> 0.6.3'
-gem 'rails', '~> 7.0.8'
+gem 'rails', '~> 7.1.5'
 gem 'rsolr', '>= 1.0', '< 3'
 gem 'sassc-rails', '~> 2.1'
 gem 'sprockets', '< 4.0'
@@ -28,17 +28,16 @@ gem 'stimulus-rails'
 gem 'turbo-rails'
 gem 'twitter-typeahead-rails', '0.11.1.pre.corejavascript'
 gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]
+gem 'vite_rails', '~> 3.0'
 
 group :development, :test do
-  # gem 'colorize'
   gem 'brakeman'
   gem 'debug', platforms: %i[mri mingw x64_mingw]
   gem 'rspec-rails'
   gem 'rubocop', require: false
   gem 'rubocop-rails', '~> 2.19', '>= 2.19.1', require: false
   gem 'rubocop-rspec', '~> 2.20', require: false
   gem 'solr_wrapper', '>= 0.3'
-  # gem 'factory_bot_rails'
 end
 
 group :development do