Merge branch 'master' into ingestion_filters

Author: eilmiv

.github/workflows/codeql-analysis.yml

@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

.github/workflows/deployment-checks.yml

@@ -12,17 +12,32 @@ jobs:
       DB_PASSWORD: password
       SECRET_BASE_KEY: test_key
       RAILS_ENV: production
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_DB: ${{ env.DB_NAME }}
+          POSTGRES_USER: ${{ env.DB_USER }}
+          POSTGRES_PASSWORD: ${{ env.DB_PASSWORD }}
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd "pg_isready"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
     steps:
-      - uses: harmon758/postgresql-action@v1
-        with:
-          postgresql db: ${DB_NAME}
-          postgresql user: ${DB_USER}
-          postgresql password: ${DB_PASSWORD}
-        name: Set up database
-
       - uses: actions/checkout@v4
         name: Set up Ruby
-
       - uses: ruby/setup-ruby@v1
         with:
           bundler-cache: true

.github/workflows/test.yml

@@ -12,23 +12,35 @@ jobs:
       DB_PASSWORD: password
       SECRET_BASE_KEY: test_key
       RAILS_ENV: test
-      REDIS_TEST_URL: redis://localhost:6456/0
+      REDIS_TEST_URL: redis://localhost:6379/0
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_DB: ${{ env.DB_NAME }}
+          POSTGRES_USER: ${{ env.DB_USER }}
+          POSTGRES_PASSWORD: ${{ env.DB_PASSWORD }}
+        ports:
+          - 5432:5432
+        options: >-
+          --health-cmd "pg_isready"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 6379:6379
     steps:
       - name: Install system dependencies
         run: |
           sudo apt-get update
           sudo apt-get install imagemagick
-      - name: Set up database
-        uses: harmon758/postgresql-action@v1
-        with:
-          postgresql db: ${DB_NAME}
-          postgresql user: ${DB_USER}
-          postgresql password: ${DB_PASSWORD}
-      - name: Set up Redis
-        uses: supercharge/redis-github-action@1.5.0
-        with:
-          redis-version: 6
-          redis-port: 6456
       - name: Check out code
         uses: actions/checkout@v4
       - name: Install Ruby & gems

Gemfile.lock

@@ -233,7 +233,8 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
-    httparty (0.21.0)
+    httparty (0.24.0)
+      csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     i18n (1.14.7)
@@ -376,7 +377,8 @@ GEM
       railties (>= 3.0)
     msgpack (1.7.2)
     multi_json (1.17.0)
-    multi_xml (0.6.0)
+    multi_xml (0.8.0)
+      bigdecimal (>= 3.1, < 5)
     multipart-post (2.4.1)
     nested_form (0.3.2)
     net-http (0.6.0)
@@ -778,7 +780,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (2.4.2)
     unicode-types (1.10.0)
-    uri (1.0.3)
+    uri (1.0.4)
     useragent (0.16.11)
     validate_email (0.1.6)
       activemodel (>= 3.0)

app/assets/stylesheets/application.scss

@@ -18,7 +18,32 @@
 @import "font-awesome-sprockets";
 @import "font-awesome";
 @import "mixins/mixins";
-@import "*";
+
+// Local
+@import "about";
+@import "account";
+@import "activities";
+@import "autocomplete";
+@import "bootstrap-tweaks";
+@import "collaborations";
+@import "collection";
+@import "curators";
+@import "events";
+@import "external-resources";
+@import "footer";
+@import "forms";
+@import "headers";
+@import "helpers";
+@import "home";
+@import "icons";
+@import "learning-paths";
+@import "masonry";
+@import "nodes";
+@import "showcase";
+@import "toggle";
+@import "workflows";
+
+// Vendor
 @import "cytoscape-panzoom";
 @import "jquery.simplecolorpicker";
 @import "eonasdan-bootstrap-datetimepicker";
@@ -1047,4 +1072,30 @@ td.day .calendar-text {
       top: 0;
     }
   }
-}
+}
+
+.theme-selector {
+  display: flex;
+  gap: 10px;
+}
+
+.theme-select-option {
+  flex-grow: 1;
+  label {
+    border: 5px solid;
+    padding: 10px 20px;
+    border-radius: 5px;
+    display: block;
+
+    hr {
+      border-width: 10px;
+    }
+  }
+}
+.btn-oidc-only {
+  font-size: 36px;
+  padding: 4px;
+  margin: 12px 10px;
+  display: flex;
+  justify-content: center;
+}

app/assets/stylesheets/learning-paths.scss

@@ -38,7 +38,7 @@
   }
 }
 
-.learning-path-item {
+.block-item {
   text-align: center;
   border-image-slice: 80;
   border-image-width: 80px;

app/controllers/collections_controller.rb

@@ -114,7 +114,7 @@ def destroy
     @collection.create_activity :destroy, owner: current_user
     @collection.destroy
     respond_to do |format|
-      format.html { redirect_to collections_url, notice: 'Collection was successfully destroyed.' }
+      format.html { redirect_to collections_path, notice: 'Collection was successfully destroyed.' }
       format.json { head :no_content }
     end
   end

app/controllers/content_providers_controller.rb

@@ -86,7 +86,7 @@ def destroy
     @content_provider.create_activity :destroy, owner: current_user
     @content_provider.destroy
     respond_to do |format|
-      format.html { redirect_to content_providers_url, notice: 'Content Provider was successfully destroyed.' }
+      format.html { redirect_to content_providers_path, notice: 'Content Provider was successfully destroyed.' }
       format.json { head :no_content }
     end
   end

app/controllers/events_controller.rb

@@ -187,7 +187,7 @@ def destroy
     @event.create_activity :destroy, owner: current_user
     @event.destroy
     respond_to do |format|
-      format.html { redirect_to events_url, notice: 'Event was successfully destroyed.' }
+      format.html { redirect_to events_path, notice: 'Event was successfully destroyed.' }
       format.json { head :no_content }
     end
   end

app/controllers/learning_path_topics_controller.rb

@@ -68,7 +68,7 @@ def destroy
     @learning_path_topic.create_activity :destroy, owner: current_user
     @learning_path_topic.destroy
     respond_to do |format|
-      format.html { redirect_to learning_path_topics_url, notice: 'Topic was successfully destroyed.' }
+      format.html { redirect_to learning_path_topics_path, notice: 'Topic was successfully destroyed.' }
       # format.json { head :no_content }
     end
   end