Merge pull request #829 from portagenetwork/integration

Merge `integration` For Upcoming Release v4.1.2

Author: aaronskiba

CHANGELOG.md

@@ -1,6 +1,28 @@
 # Changelog
 
-## [4.1.1+portage-4.1.0] - 2024-07-08
+## [Unreleased]
+
+### Changed
+
+ - Use "id" instead of "name" for `default_funder` Org [#814](https://github.com/portagenetwork/roadmap/pull/814)
+
+ - Bump jwt from 2.7.1 to 2.8.2 [#803](https://github.com/portagenetwork/roadmap/pull/803)
+
+ - Bump cssbundling-rails from 1.3.3 to 1.4.0 [#796](https://github.com/portagenetwork/roadmap/pull/796)
+
+ - Bump devise from 4.9.3 to 4.9.4 [#822](https://github.com/portagenetwork/roadmap/pull/822)
+
+ - Bump omniauth-rails_csrf_protection from 1.0.1 to 1.0.2 [#802](https://github.com/portagenetwork/roadmap/pull/802)
+
+ - Bump pundit from 2.3.1 to 2.3.2 [#786](https://github.com/portagenetwork/roadmap/pull/786)
+
+ - Bump rollbar from 3.5.1 to 3.5.2 [#784](https://github.com/portagenetwork/roadmap/pull/784)
+
+ - Bump socket.io from 4.6.1 to 4.7.5 [#804](https://github.com/portagenetwork/roadmap/pull/804)
+
+ - Bump tinymce from 7.0.0 to 7.2.0 [#801](https://github.com/portagenetwork/roadmap/pull/801)
+
+## [4.1.1+portage-4.1.0] - 2024-07-08, [4.1.1+portage-4.1.1] - 2024-07-09
 
 ### Added
 

Gemfile.lock

@@ -98,7 +98,7 @@ GEM
       msgpack (~> 1.2)
     brakeman (6.1.2)
       racc
-    builder (3.2.4)
+    builder (3.3.0)
     bullet (7.1.6)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
@@ -124,7 +124,7 @@ GEM
       open4 (~> 1.3)
     coderay (1.1.3)
     colored2 (3.1.2)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.3)
     contact_us (1.2.0)
       rails (>= 4.2.0)
     cork (0.3.0)
@@ -133,7 +133,7 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    cssbundling-rails (1.3.3)
+    cssbundling-rails (1.4.0)
       railties (>= 6.0.0)
     danger (9.4.3)
       claide (~> 1.0)
@@ -156,7 +156,7 @@ GEM
     database_cleaner-core (2.0.1)
     date (3.3.4)
     debug_inspector (1.2.0)
-    devise (4.9.3)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -179,7 +179,7 @@ GEM
       fog-aws
     ecma-re-validator (0.4.0)
       regexp_parser (~> 2.2)
-    erubi (1.12.0)
+    erubi (1.13.0)
     excon (0.104.0)
     execjs (2.9.1)
     factory_bot (6.2.1)
@@ -263,7 +263,8 @@ GEM
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
       uri_template (~> 0.7)
-    jwt (2.7.1)
+    jwt (2.8.2)
+      base64
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -306,7 +307,7 @@ GEM
       nokogiri (~> 1)
       rake
     mini_mime (1.1.5)
-    minitest (5.23.1)
+    minitest (5.24.1)
     mocha (2.1.0)
       ruby2_keywords (>= 0.0.5)
     msgpack (1.7.2)
@@ -328,9 +329,9 @@ GEM
       net-protocol
     nio4r (2.7.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.6-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -356,7 +357,7 @@ GEM
     omniauth-orcid (2.1.1)
       omniauth-oauth2 (~> 1.3)
       ruby_dig (~> 0.0.2)
-    omniauth-rails_csrf_protection (1.0.1)
+    omniauth-rails_csrf_protection (1.0.2)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth-shibboleth (1.3.0)
@@ -381,7 +382,7 @@ GEM
     public_suffix (5.0.5)
     puma (6.4.2)
       nio4r (~> 2.0)
-    pundit (2.3.1)
+    pundit (2.3.2)
       activesupport (>= 3.0.0)
     pundit-matchers (2.0.0)
       rspec-rails (>= 3.0.0)
@@ -441,7 +442,7 @@ GEM
       railties (>= 5.2)
     rexml (3.2.8)
       strscan (>= 3.0.9)
-    rollbar (3.5.1)
+    rollbar (3.5.2)
     rouge (4.1.3)
     rspec-collection_matchers (1.2.1)
       rspec-expectations (>= 2.99.0.beta1)
@@ -564,7 +565,7 @@ GEM
     yard-tomdoc (0.7.1)
       tomparse (>= 0.4.0)
       yard
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   arm64-darwin-21

app/controllers/template_options_controller.rb

@@ -17,7 +17,7 @@ def index
     authorize Template.new, :template_options?
 
     org = org_from_params(params_in: { org_id: org_hash.to_json }) if org_hash.present?
-    funder = Org.find_by(name: Rails.application.config.default_funder_name)
+    funder = Org.find(Rails.application.config.default_funder_id)
 
     @templates = []
 

config/application.rb

@@ -108,6 +108,6 @@ class Application < Rails::Application
     # removed the option for selecting a funder. A funder is needed to show the
     # customized templates. For this reason we are specifying in the
     # documentation the funder that
-    config.default_funder_name = Rails.application.secrets.default_funder_name
+    config.default_funder_id = Rails.application.secrets.default_funder_id.to_i
   end
 end

config/secrets.yml

@@ -30,7 +30,7 @@ test:
   translation_io_api_key: <%= ENV['TRANSLATION_IO_API_KEY'] %>
   wicked_pdf_path: <%= ENV['WICKED_PDF_PATH'] %>
   wicked_pdf_proxy: <%= ENV['WICKED_PDF_PROXY'] %>
-  default_funder_name: <%= ENV['DEFAULT_FUNDER_NAME'] %>
+  default_funder_id: <%= ENV['DEFAULT_FUNDER_ID'] %>
   super_admin_password: <%= ENV["SUPER_ADMIN_PASSWORD"] %>
   test_password: <%= ENV["TEST_PASSWORD"] %>
   user_password: <%= ENV["USER_PASSWORD"] %>
@@ -61,7 +61,7 @@ development:
   translation_io_api_key: <%= ENV['TRANSLATION_IO_API_KEY'] %>
   wicked_pdf_path: <%= ENV['WICKED_PDF_PATH'] %>
   wicked_pdf_proxy: <%= ENV['WICKED_PDF_PROXY'] %>
-  default_funder_name: <%= ENV['DEFAULT_FUNDER_NAME'] %>
+  default_funder_id: <%= ENV['DEFAULT_FUNDER_ID'] %>
   super_admin_password: <%= ENV["SUPER_ADMIN_PASSWORD"] %>
   test_password: <%= ENV["TEST_PASSWORD"] %>
   user_password: <%= ENV["USER_PASSWORD"] %>
@@ -101,7 +101,7 @@ staging:
   translation_io_api_key: <%= ENV['TRANSLATION_IO_API_KEY'] %>
   wicked_pdf_path: <%= ENV['WICKED_PDF_PATH'] %>
   wicked_pdf_proxy: <%= ENV['WICKED_PDF_PROXY'] %>
-  default_funder_name: <%= ENV['DEFAULT_FUNDER_NAME'] %>
+  default_funder_id: <%= ENV['DEFAULT_FUNDER_ID'] %>
   super_admin_password: <%= ENV["SUPER_ADMIN_PASSWORD"] %>
   test_password: <%= ENV["TEST_PASSWORD"] %>
   user_password: <%= ENV["USER_PASSWORD"] %>
@@ -141,7 +141,7 @@ uat:
   translation_io_api_key: <%= ENV['TRANSLATION_IO_API_KEY'] %>
   wicked_pdf_path: <%= ENV['WICKED_PDF_PATH'] %>
   wicked_pdf_proxy: <%= ENV['WICKED_PDF_PROXY'] %>
-  default_funder_name: <%= ENV['DEFAULT_FUNDER_NAME'] %>
+  default_funder_id: <%= ENV['DEFAULT_FUNDER_ID'] %>
   super_admin_password: <%= ENV["SUPER_ADMIN_PASSWORD"] %>
   test_password: <%= ENV["TEST_PASSWORD"] %>
   user_password: <%= ENV["USER_PASSWORD"] %>
@@ -181,7 +181,7 @@ sandbox:
   translation_io_api_key: <%= ENV['TRANSLATION_IO_API_KEY'] %>
   wicked_pdf_path: <%= ENV['WICKED_PDF_PATH'] %>
   wicked_pdf_proxy: <%= ENV['WICKED_PDF_PROXY'] %>
-  default_funder_name: <%= ENV['DEFAULT_FUNDER_NAME'] %>
+  default_funder_id: <%= ENV['DEFAULT_FUNDER_ID'] %>
   super_admin_password: <%= ENV["SUPER_ADMIN_PASSWORD"] %>
   test_password: <%= ENV["TEST_PASSWORD"] %>
   user_password: <%= ENV["USER_PASSWORD"] %>
@@ -221,7 +221,7 @@ production:
   translation_io_api_key: <%= ENV['TRANSLATION_IO_API_KEY'] %>
   wicked_pdf_path: <%= ENV['WICKED_PDF_PATH'] %>
   wicked_pdf_proxy: <%= ENV['WICKED_PDF_PROXY'] %>
-  default_funder_name: <%= ENV['DEFAULT_FUNDER_NAME'] %>
+  default_funder_id: <%= ENV['DEFAULT_FUNDER_ID'] %>
   super_admin_password: <%= ENV["SUPER_ADMIN_PASSWORD"] %>
   test_password: <%= ENV["TEST_PASSWORD"] %>
   user_password: <%= ENV["USER_PASSWORD"] %>

package.json

@@ -60,7 +60,7 @@
     "regenerator-runtime": "^0.13.5",
     "sass": "^1.57.1",
     "timeago.js": "^4.0.2",
-    "tinymce": "^7.0.0",
+    "tinymce": "^7.2.0",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
   },

yarn.lock

@@ -2005,15 +2005,15 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
-engine.io-parser@~5.0.3:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.6.tgz#7811244af173e157295dec9b2718dfe42a64ef45"
-  integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==
+engine.io-parser@~5.2.1:
+  version "5.2.3"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.3.tgz#00dc5b97b1f233a23c9398d0209504cf5f94d92f"
+  integrity sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==
 
-engine.io@~6.4.1:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.4.2.tgz#ffeaf68f69b1364b0286badddf15ff633476473f"
-  integrity sha512-FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==
+engine.io@~6.5.2:
+  version "6.5.5"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.5.5.tgz#430b80d8840caab91a50e9e23cb551455195fc93"
+  integrity sha512-C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"
@@ -2023,8 +2023,8 @@ engine.io@~6.4.1:
     cookie "~0.4.1"
     cors "~2.8.5"
     debug "~4.3.1"
-    engine.io-parser "~5.0.3"
-    ws "~8.11.0"
+    engine.io-parser "~5.2.1"
+    ws "~8.17.1"
 
 enhanced-resolve@^5.10.0:
   version "5.12.0"
@@ -3694,7 +3694,7 @@ socket.io-adapter@~2.5.2:
   dependencies:
     ws "~8.11.0"
 
-socket.io-parser@~4.2.1:
+socket.io-parser@~4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83"
   integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==
@@ -3703,16 +3703,17 @@ socket.io-parser@~4.2.1:
     debug "~4.3.1"
 
 socket.io@^4.4.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.6.1.tgz#62ec117e5fce0692fa50498da9347cfb52c3bc70"
-  integrity sha512-KMcaAi4l/8+xEjkRICl6ak8ySoxsYG+gG6/XfRCPJPQ/haCRIJBTL4wIl8YCsmtaBovcAXGLOShyVWQ/FG8GZA==
+  version "4.7.5"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.7.5.tgz#56eb2d976aef9d1445f373a62d781a41c7add8f8"
+  integrity sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==
   dependencies:
     accepts "~1.3.4"
     base64id "~2.0.0"
+    cors "~2.8.5"
     debug "~4.3.2"
-    engine.io "~6.4.1"
+    engine.io "~6.5.2"
     socket.io-adapter "~2.5.2"
-    socket.io-parser "~4.2.1"
+    socket.io-parser "~4.2.4"
 
 "source-map-js@>=0.6.2 <2.0.0":
   version "1.0.2"
@@ -3871,10 +3872,10 @@ timeago.js@^4.0.2:
   resolved "https://registry.yarnpkg.com/timeago.js/-/timeago.js-4.0.2.tgz#724e8c8833e3490676c7bb0a75f5daf20e558028"
   integrity sha512-a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w==
 
-tinymce@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-7.0.0.tgz#d35441e15f8011cf549b39e58b64648798816e92"
-  integrity sha512-ggXLfTRrUALAcjeJSRrZcJDOl6MgC2tPXe/zNOEkQXvTDgcKqFypPRoPpfpK5wejexjyaI/7dwETOntJ5MPBFg==
+tinymce@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-7.2.0.tgz#c5015567e742093b43186400c3e7c8394b90cc1f"
+  integrity sha512-R460NlE4REIFuLcZd9mpHK8zRsHdOueLV2m6Wsn0JHfGhDWMcfB1IqUX2QGrSbJga93ygJbJbNMwb2sakFlE/g==
 
 tmp@^0.2.1:
   version "0.2.1"
@@ -4160,6 +4161,11 @@ ws@~8.11.0:
   resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
   integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
 
+ws@~8.17.1:
+  version "8.17.1"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.17.1.tgz#9293da530bb548febc95371d90f9c878727d919b"
+  integrity sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==
+
 y18n@^5.0.5:
   version "5.0.8"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"