Merge branch 'master' into rails-7.2.3

Author: fbacall

.github/workflows/deployment-checks.yml

@@ -48,7 +48,14 @@ jobs:
           cp config/secrets.github.yml config/secrets.yml
           cp config/ingestion.example.yml config/ingestion.yml
           bundle exec rake db:setup
-      - run: bundle exec rake assets:precompile
-        name: Run asset compilation
-      - run: bundle exec whenever --update-crontab --set environment="$ENV"
-        name: Run whenever update
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          cache: 'yarn'
+      - name: Install JS dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: Run asset compilation
+        run: bundle exec rake assets:precompile
+      - name: Run whenever update
+        run: bundle exec whenever --update-crontab --set environment="$ENV"

.github/workflows/test.yml

@@ -53,5 +53,12 @@ jobs:
           cp config/secrets.github.yml config/secrets.yml
           cp config/ingestion.example.yml config/ingestion.yml
           bundle exec rake db:test:prepare
-      - run: bundle exec rails test
-        name: Run tests
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20.x'
+          cache: 'yarn'
+      - name: Install JS dependencies
+        run: yarn install --frozen-lockfile --non-interactive
+      - name: Run tests
+        run: bundle exec rails test

.gitignore

@@ -40,4 +40,5 @@ config/ontologies/*.cache
 
 tess.crontab
 
-app-secrets*
+app-secrets*
+node_modules/

Dockerfile

@@ -8,9 +8,11 @@ WORKDIR /code
 
 # install dependencies
 RUN apt-get update \
-    && apt-get install build-essential curl file git gnupg2 imagemagick libpq-dev libyaml-dev nodejs -y \
+    && apt-get install build-essential curl file git gnupg2 imagemagick libpq-dev libyaml-dev nodejs npm -y \
     && apt-get clean
 
+# install yarn to manage JS dependencies
+RUN npm install --global [email protected]
 
 # install supercronic - a cron alternative
 ENV SUPERCRONIC_URL=https://github.com/aptible/supercronic/releases/download/v0.1.12/supercronic-linux-amd64 \
@@ -41,6 +43,12 @@ COPY Gemfile Gemfile.lock ./
 # install gems
 RUN bundle check || bundle install
 
+# copy package file
+COPY package.json yarn.lock ./
+
+# install js dependencies
+RUN yarn install --frozen-lockfile --non-interactive
+
 # copy code
 COPY . .
 

Gemfile

@@ -6,6 +6,7 @@ gem 'rails', '7.2.3'
 
 gem 'active_model_serializers'
 gem 'activerecord-session_store'
+gem 'addressable'
 gem 'ahoy_matey'
 gem 'auto_strip_attributes'
 gem 'bootsnap', require: false
@@ -73,15 +74,6 @@ gem 'validate_url'
 gem 'whenever', require: false # Work around https://github.com/javan/whenever/issues/831
 gem 'will_paginate'
 
-source 'https://rails-assets.org' do
-  gem 'rails-assets-clipboard', '~> 1.5.12'
-  gem 'rails-assets-devbridge-autocomplete', '~> 1.4.9'
-  gem 'rails-assets-eonasdan-bootstrap-datetimepicker', '~> 4.17.42'
-  gem 'rails-assets-markdown-it', '~> 7.0.1'
-  gem 'rails-assets-moment', '~> 2.30.1'
-  gem 'rails-assets-select2', '~> 4.0.8'
-end
-
 group :development, :test do
   gem 'byebug'
   gem 'pry-byebug'

Gemfile.lock

@@ -6,20 +6,6 @@ GIT
     tess_rdf_extractors (1.1.0)
       linkeddata (~> 3.2.0)
 
-GEM
-  remote: https://rails-assets.org/
-  specs:
-    rails-assets-clipboard (1.5.16)
-    rails-assets-devbridge-autocomplete (1.4.9)
-      rails-assets-jquery (>= 1.7)
-    rails-assets-eonasdan-bootstrap-datetimepicker (4.17.49)
-      rails-assets-jquery (>= 1.8.3)
-      rails-assets-moment (>= 2.10.5)
-    rails-assets-jquery (3.7.0)
-    rails-assets-markdown-it (7.0.1)
-    rails-assets-moment (2.30.1)
-    rails-assets-select2 (4.0.8)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -831,6 +817,7 @@ PLATFORMS
 DEPENDENCIES
   active_model_serializers
   activerecord-session_store
+  addressable
   ahoy_matey
   auto_strip_attributes
   better_errors
@@ -877,12 +864,6 @@ DEPENDENCIES
   pundit
   rack-cors
   rails (= 7.2.3)
-  rails-assets-clipboard (~> 1.5.12)!
-  rails-assets-devbridge-autocomplete (~> 1.4.9)!
-  rails-assets-eonasdan-bootstrap-datetimepicker (~> 4.17.42)!
-  rails-assets-markdown-it (~> 7.0.1)!
-  rails-assets-moment (~> 2.30.1)!
-  rails-assets-select2 (~> 4.0.8)!
   rails-controller-testing
   rails-i18n
   rails_admin

app/assets/javascripts/application.js

@@ -26,8 +26,8 @@
 //= require markdown-it
 //= require URI
 //= require moment
-//= require eonasdan-bootstrap-datetimepicker
-//= require devbridge-autocomplete
+//= require bootstrap-datetimepicker
+//= require jquery.autocomplete
 //= require clipboard
 //= require ardc_vocab_widget_v2
 //= require select2

app/assets/stylesheets/application.scss

@@ -47,7 +47,7 @@
 // Vendor
 @import "cytoscape-panzoom";
 @import "jquery.simplecolorpicker";
-@import "eonasdan-bootstrap-datetimepicker";
+@import "bootstrap-datetimepicker";
 @import "ardc_vocab_widget_v2";
 @import "jquery.qtip.min";
 @import "select2";

app/controllers/callbacks_controller.rb

@@ -1,5 +1,6 @@
 # The controller for callback actions
 class CallbacksController < Devise::OmniauthCallbacksController
+  include SpaceRedirect
 
   Devise.omniauth_configs.each do |provider, config|
     define_method(provider) do
@@ -11,6 +12,9 @@ class CallbacksController < Devise::OmniauthCallbacksController
 
   def handle_callback(provider, config)
     @user = User.from_omniauth(request.env["omniauth.auth"])
+    if request.env['omniauth.params'] && request.env['omniauth.params']['space_id']
+      space = Space.find_by_id(request.env['omniauth.params']['space_id'])
+    end
 
     if @user.new_record?
       # new user
@@ -27,14 +31,15 @@ def handle_callback(provider, config)
 
         sign_in @user
         flash[:notice] = "#{I18n.t('devise.registrations.signed_up')} Please ensure your profile is correct."
-        redirect_to edit_user_path(@user)
+        redirect_to_space(edit_user_path(@user), space)
       rescue Exception => e
         flash[:notice] = "Login failed: #{e.message.to_s}"
-        redirect_to new_user_session_path
+        redirect_to_space(new_user_session_path, space)
       end
     else
-      sign_in_and_redirect @user
+      scope = Devise::Mapping.find_scope!(@user)
+      sign_in(scope, resource, {})
+      redirect_to_space(after_sign_in_path_for(@user), space)
     end
   end
-
 end

app/controllers/concerns/space_redirect.rb

@@ -0,0 +1,16 @@
+module SpaceRedirect
+  extend ActiveSupport::Concern
+
+  private
+
+  def redirect_to_space(path, space)
+    if space&.is_subdomain?
+      port_part = ''
+      port_part = ":#{request.port}" if (request.protocol == "http://" && request.port != 80) ||
+        (request.protocol == "https://" && request.port != 443)
+      redirect_to URI.join("#{request.protocol}#{space.host}#{port_part}", path).to_s, allow_other_host: true
+    else
+      redirect_to path
+    end
+  end
+end