From 74d0a6eb586e0c375e802850859c4da4e6dbbd39 Mon Sep 17 00:00:00 2001
From: Joe Rafaniello <jrafanie@gmail.com>
Date: Fri, 5 Dec 2025 15:21:37 -0500
Subject: [PATCH 1/2] Allow rails 8.0, enforce 7.2.3 minimum

---
 manageiq-ui-classic.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manageiq-ui-classic.gemspec b/manageiq-ui-classic.gemspec
index 6e5e4416346..946252acf50 100644
--- a/manageiq-ui-classic.gemspec
+++ b/manageiq-ui-classic.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", ">= 7.0.8", "<8.0"
+  s.add_dependency "rails", ">= 7.2.3", "<8.1"
 
   s.add_dependency "execjs", "2.8.1" # Note: 2.8.1 requires uglifier 4.2.0 to defer uglifier asset compilation until asset compilation time: https://github.com/rails/execjs/issues/105
   s.add_dependency "high_voltage", "~> 3.0.0"

From 98cf04e93f72b92896f7df4c33a53fe2b044feea Mon Sep 17 00:00:00 2001
From: Joe Rafaniello <jrafanie@gmail.com>
Date: Mon, 8 Dec 2025 11:14:24 -0500
Subject: [PATCH 2/2] Upgrade actioncable package for rails 8

Resolves the following issue after trying to upgrade from 7.2 and logon:

"TypeError: can't access property 'received', subscription is undefined"
Occurring in notify action_cable.js:493 and message action_cable.js:347
---
 app/javascript/notifications/init.js |  2 +-
 package.json                         |  2 +-
 yarn.lock                            | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/javascript/notifications/init.js b/app/javascript/notifications/init.js
index 4f051be25dc..31d66b185ed 100644
--- a/app/javascript/notifications/init.js
+++ b/app/javascript/notifications/init.js
@@ -1,4 +1,4 @@
-import ActionCable from 'actioncable';
+import * as ActionCable from '@rails/actioncable';
 
 import { API } from '../http_api';
 import { addNotification, initNotifications } from '../miq-redux/actions/notifications-actions';
diff --git a/package.json b/package.json
index a91d668ba04..043c53b8387 100644
--- a/package.json
+++ b/package.json
@@ -42,8 +42,8 @@
     "@manageiq/ui-components": "~1.6.1",
     "@novnc/novnc": "~1.2.0",
     "@pf3/select": "~1.12.6",
+    "@rails/actioncable": "^8.0.0",
     "@tshepomgaga/aws-sfn-graph": "0.0.6",
-    "actioncable": "^5.2.4-2",
     "angular": "~1.8.3",
     "angular-animate": "~1.8.3",
     "angular-bootstrap-switch": "~0.5.2",
diff --git a/yarn.lock b/yarn.lock
index 8fc5cf9285e..0a72923cf17 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2383,6 +2383,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@rails/actioncable@npm:^8.0.0":
+  version: 8.1.100
+  resolution: "@rails/actioncable@npm:8.1.100"
+  checksum: 10/eed05106c571065d32238d7b6832a2b4e7db79c8e0d1b3dcefd484a7f89914914db13c1d1b5cae763b266e6697f358523e5ce52871d27b5fafb1dd28d63992eb
+  languageName: node
+  linkType: hard
+
 "@sinonjs/commons@npm:^1.7.0":
   version: 1.8.6
   resolution: "@sinonjs/commons@npm:1.8.6"
@@ -3590,13 +3597,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"actioncable@npm:^5.2.4-2":
-  version: 5.2.8
-  resolution: "actioncable@npm:5.2.8"
-  checksum: 10/5cdc4d60689d0244d532d37a64e0c0b186f958cc94674f1b416308afcde2bd65c84b9c34e82723004fc5c235cb5759acd6ed12456153551a6ce7cd8afff653f4
-  languageName: node
-  linkType: hard
-
 "adjust-sourcemap-loader@npm:3.0.0":
   version: 3.0.0
   resolution: "adjust-sourcemap-loader@npm:3.0.0"
@@ -12889,8 +12889,8 @@ __metadata:
     "@manageiq/ui-components": "npm:~1.6.1"
     "@novnc/novnc": "npm:~1.2.0"
     "@pf3/select": "npm:~1.12.6"
+    "@rails/actioncable": "npm:^8.0.0"
     "@tshepomgaga/aws-sfn-graph": "npm:0.0.6"
-    actioncable: "npm:^5.2.4-2"
     angular: "npm:~1.8.3"
     angular-animate: "npm:~1.8.3"
     angular-bootstrap-switch: "npm:~0.5.2"