Merge branch 'main' into block-features-form-option-icon

Author: SebouChu

.circleci/config.yml

@@ -4,7 +4,7 @@ version: 2.1
 jobs:
   build:
     docker:
-      - image: cimg/ruby:4.0.2-node
+      - image: noesya/cimg-ruby-activestorage-preview:4.0.2
         environment:
           RAILS_ENV: test
           RACK_ENV: test
@@ -26,13 +26,6 @@ jobs:
           keys:
             - v1-dependencies-{{ checksum "Gemfile.lock" }}
 
-      # Install binaries for Active Storage Previews
-      - run:
-          name: Install binaries for Active Storage Previews
-          command: |
-            sudo apt-get update
-            sudo apt-get install ffmpeg poppler-utils libvips-dev -y
-
       # Bundler configuration
       - run:
           name: Configure Bundler

Gemfile

@@ -46,7 +46,7 @@ gem "image_processing"
 gem "invisible_captcha", "~> 2.3"
 gem "jbuilder"
 gem "jquery-rails"
-gem "jquery-ui-rails", "~> 7.0"
+gem "jquery-ui-rails", "~> 8.0"
 gem "jsbundling-rails", "~> 1.3"
 gem "kamifusen"#, path: "../kamifusen"
 gem "kaminari"

Gemfile.lock

@@ -11,10 +11,10 @@ GIT
 
 GIT
   remote: https://github.com/jaimeiniesta/metainspector.git
-  revision: d5b60b1d748d51a7dde3cfb8442b738610a6cd96
+  revision: 102ca37d4eb26af2362a0f8b199ec5d22ad983b6
   specs:
-    metainspector (5.17.0)
-      addressable (~> 2.8.4)
+    metainspector (5.17.1)
+      addressable (~> 2.9.0)
       faraday (~> 2.5)
       faraday-cookie_jar (~> 0.0)
       faraday-encoding (~> 0.0)
@@ -137,14 +137,14 @@ GEM
     add_to_calendar (0.5.1)
       tzinfo (>= 1.1, < 3)
       tzinfo-data (~> 1.2020)
-    addressable (2.8.9)
+    addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
     annotaterb (4.22.0)
       activerecord (>= 6.0.0)
       activesupport (>= 6.0.0)
     ast (2.4.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1234.0)
+    aws-partitions (1.1238.0)
     aws-sdk-core (3.244.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
@@ -156,7 +156,7 @@ GEM
     aws-sdk-kms (1.123.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.218.0)
+    aws-sdk-s3 (1.219.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)
@@ -168,7 +168,7 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (4.1.0)
+    bigdecimal (4.1.1)
     bindex (0.8.1)
     bootsnap (1.23.0)
       msgpack (~> 1.2)
@@ -183,7 +183,7 @@ GEM
       addressable (~> 2.3, >= 2.3.0)
       json (~> 2.1, >= 2.1.0)
       typhoeus (~> 1.0, >= 1.0.1)
-    bugsnag (6.29.0)
+    bugsnag (6.30.0)
       concurrent-ruby (~> 1.0)
     builder (3.3.0)
     byebug (13.0.0)
@@ -262,7 +262,7 @@ GEM
     encryptor (3.0.0)
     enum_help (0.0.20)
       activesupport (>= 3.0.0)
-    erb (6.0.2)
+    erb (6.0.3)
     erubi (1.13.1)
     et-orbi (1.4.0)
       tzinfo
@@ -287,7 +287,7 @@ GEM
     faraday-gzip (3.1.0)
       faraday (>= 2.0, < 3)
       zlib (~> 3.0)
-    faraday-http-cache (2.6.1)
+    faraday-http-cache (2.7.0)
       faraday (>= 0.8)
     faraday-multipart (1.2.0)
       multipart-post (~> 2.0)
@@ -330,7 +330,7 @@ GEM
       terminal-table (>= 1.5.1)
     globalid (1.3.0)
       activesupport (>= 6.1)
-    good_job (4.14.1)
+    good_job (4.16.0)
       activejob (>= 6.1.0)
       activerecord (>= 6.1.0)
       concurrent-ruby (>= 1.3.1)
@@ -356,7 +356,7 @@ GEM
     hashie (5.1.0)
       logger
     htmlentities (4.4.2)
-    http-cookie (1.1.0)
+    http-cookie (1.1.4)
       domain_name (~> 0.5)
     httparty (0.24.2)
       csv
@@ -390,7 +390,7 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (7.0.0)
+    jquery-ui-rails (8.0.0)
       railties (>= 3.2.16)
     jsbundling-rails (1.3.1)
       railties (>= 6.0.0)
@@ -445,7 +445,7 @@ GEM
     mini_magick (5.3.1)
       logger
     mini_mime (1.1.5)
-    minitest (6.0.3)
+    minitest (6.0.4)
       drb (~> 2.0)
       prism (~> 1.5)
     msgpack (1.8.0)
@@ -505,11 +505,11 @@ GEM
       stringio
       time
       uri
-    opentelemetry-api (1.8.0)
+    opentelemetry-api (1.9.0)
       logger
-    opentelemetry-common (0.23.0)
+    opentelemetry-common (0.24.0)
       opentelemetry-api (~> 1.0)
-    opentelemetry-exporter-otlp-logs (0.3.0)
+    opentelemetry-exporter-otlp-logs (0.4.0)
       google-protobuf (>= 3.18)
       googleapis-common-protos-types (~> 1.3)
       opentelemetry-api (~> 1.1)
@@ -518,24 +518,25 @@ GEM
       opentelemetry-logs-sdk (~> 0.1)
       opentelemetry-sdk
       opentelemetry-semantic_conventions
-    opentelemetry-instrumentation-base (0.25.0)
+    opentelemetry-instrumentation-base (0.26.0)
       opentelemetry-api (~> 1.7)
       opentelemetry-common (~> 0.21)
       opentelemetry-registry (~> 0.1)
-    opentelemetry-logs-api (0.2.0)
+    opentelemetry-logs-api (0.3.0)
       opentelemetry-api (~> 1.0)
-    opentelemetry-logs-sdk (0.4.0)
+    opentelemetry-logs-sdk (0.5.1)
       opentelemetry-api (~> 1.2)
       opentelemetry-logs-api (~> 0.1)
       opentelemetry-sdk (~> 1.3)
-    opentelemetry-registry (0.4.0)
+    opentelemetry-registry (0.5.0)
       opentelemetry-api (~> 1.1)
-    opentelemetry-sdk (1.10.0)
+    opentelemetry-sdk (1.11.0)
+      logger
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)
       opentelemetry-semantic_conventions
-    opentelemetry-semantic_conventions (1.36.0)
+    opentelemetry-semantic_conventions (1.37.0)
       opentelemetry-api (~> 1.0)
     orm_adapter (0.5.0)
     orthotypo (2.0.0)
@@ -552,8 +553,8 @@ GEM
     pg (1.6.3-x86_64-linux)
     pg_query (6.2.2)
       google-protobuf (>= 3.25.3)
-    pghero (3.7.0)
-      activerecord (>= 7.1)
+    pghero (3.8.0)
+      activerecord (>= 7.2)
     popper_js (2.11.8)
     pp (0.6.3)
       prettyprint
@@ -563,7 +564,7 @@ GEM
       date
       stringio
     public_suffix (7.0.5)
-    puma (7.2.0)
+    puma (8.0.0)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.8.1)
@@ -574,7 +575,7 @@ GEM
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
       rack (>= 3.0.0, < 4)
-    rack-session (2.1.1)
+    rack-session (2.1.2)
       base64 (>= 0.1.0)
       rack (>= 3.0.0)
     rack-test (2.2.0)
@@ -617,7 +618,7 @@ GEM
       thor (~> 1.0, >= 1.2.2)
       tsort (>= 0.2)
       zeitwerk (~> 2.6)
-    rake (13.3.1)
+    rake (13.4.2)
     randexp (0.1.7)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
@@ -632,7 +633,7 @@ GEM
       redis-client (>= 0.22.0)
     redis-client (0.28.0)
       connection_pool
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     reline (0.6.3)
       io-console (~> 0.5)
     requests (1.0.2)
@@ -716,7 +717,7 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    set (1.1.2)
+    set (1.1.3)
     simple-navigation (4.4.1)
       activesupport (>= 2.3.2)
       ostruct
@@ -858,7 +859,7 @@ DEPENDENCIES
   invisible_captcha (~> 2.3)
   jbuilder
   jquery-rails
-  jquery-ui-rails (~> 7.0)
+  jquery-ui-rails (~> 8.0)
   jsbundling-rails (~> 1.3)
   kamifusen
   kaminari

app/assets/stylesheets/public/showcase.sass

@@ -26,25 +26,24 @@
                     display: block
 
 .instances
-    @extend .list-unstyled
-    display: grid
-    gap: 0
-    padding: 0.5px
-    grid-template-columns: repeat(2, 1fr)
-    @include media-breakpoint-up(md)
-        grid-template-columns: repeat(4, 1fr)
-    @include media-breakpoint-up(lg)
-        grid-template-columns: repeat(6, 1fr)
+    margin: 0
     li
-        align-items: center
         aspect-ratio: 1
-        display: flex
-        justify-content: center
-        outline-offset: -0.5px
-        outline: 1px solid #E6E4D9
+        border: 1px solid #E6E4D9
+        margin: -0.5px
         padding: 2rem
-        position: relative
-        img
-            aspect-ratio: 1
-            object-fit: contain
-            width: 100%
+        article
+            align-items: center
+            display: flex
+            height: 100%
+            justify-content: center
+            text-align: center
+            picture
+                height: 100%
+                img
+                    aspect-ratio: 1
+                    height: 100%
+                    max-width: 100%
+                    object-fit: contain
+                    object-position: center
+                    width: 100%

app/controllers/showcase/instances_controller.rb

@@ -0,0 +1,7 @@
+class Showcase::InstancesController < Showcase::ApplicationController
+  def index
+    @instances = University.with_websites_in_production
+                           .with_attached_logo
+                           .ordered
+  end
+end

app/controllers/showcase/websites_controller.rb

@@ -18,11 +18,6 @@ def index
     end
   end
 
-  def show
-    @website = Communication::Website.find(params[:id])
-    raise_404_unless(@website.in_showcase && @website.in_production)
-  end
-
   def tag
     @tag = Communication::Website::Showcase::Tag.find_by!(slug: params[:tag])
     @websites = @tag.websites.in_showcase
@@ -40,7 +35,8 @@ def feature
     @websites = @websites.page(params[:page]).per(100)
   end
 
-  def instances
-    @instances = University.with_websites_in_production.ordered
+  def show
+    @website = Communication::Website.find(params[:id])
+    raise_404_unless(@website.in_showcase && @website.in_production)
   end
 end

app/models/communication/block.rb

@@ -7,6 +7,7 @@
 #  data                     :jsonb
 #  deleted_at               :datetime
 #  html_class               :string
+#  metadata                 :jsonb
 #  migration_identifier     :string
 #  position                 :integer          not null
 #  published                :boolean          default(TRUE)

app/models/communication/block/template/video.rb

@@ -53,7 +53,7 @@ def before_validation
   protected
 
   def video_provider
-    @video_provider ||= Video::Provider.find(url.to_s.strip)
+    @video_provider ||= Video::Provider.find(url.to_s.strip, block)
   end
 
   def check_accessibility

app/models/communication/website/permalink.rb

@@ -38,6 +38,7 @@ class Communication::Website::Permalink < ApplicationRecord
 
   validates :path, presence: true
   validates :path, uniqueness: { scope: :website_id }, unless: :is_current
+  validate :root_path_is_reserved_for_home
 
   before_validation :set_university, on: :create
   # We should not sync the about object whenever we do something with the permalink, as they can be changed during a sync.
@@ -187,4 +188,9 @@ def regenerate_website_hosting_config
     return unless website.persisted?
     website.regenerate_hosting_config!
   end
+
+  def root_path_is_reserved_for_home
+    return unless path == "/"
+    errors.add(:path, :reserved_for_home) unless about.about.is_a?(Communication::Website::Page::Home)
+  end
 end

app/models/concerns/as_localization.rb

@@ -67,13 +67,9 @@ def localize_in!(language)
   def slug_with_ancestors_slugs
     about.ancestors_and_self.map { |ancestor|
       l10n = ancestor.localization_for(language)
-      if l10n.nil? || l10n.try(:draft?)
-        # If l10n is nil or draft, no slug
-        nil
-      else
-        # otherwise (published or no publication state) we return the slug
-        l10n.slug
-      end
+      # If l10n is nil, no slug
+      # otherwise (published or not) we return the slug
+      l10n.try(:slug)
     }.compact_blank.join('/')
   end