Fix issue with onEnter for package

rancher · Apr 14, 2024 · 749c736 · 749c736
1 parent b5adf74
commit 749c736
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/shell/middleware/authenticated.js b/shell/middleware/authenticated.js
@@ -297,14 +297,6 @@ export default async function({
     if (pkg && (oldPkg !== pkg || from.fullPath === route.fullPath)) {
       // Execute mandatory store actions
       await Promise.all(always);
-
-      // Execute anything optional the plugin wants to
-      await newPkgPlugin.onEnter(store, {
-        clusterId,
-        product,
-        oldProduct,
-        oldIsExt: !!oldPkg
-      });
     }
 
     if (!route.matched?.length) {
@@ -355,6 +347,17 @@ export default async function({
       })
     ]);
 
+    // Init the package only after we have loaded the cluster store
+    if (pkg && (oldPkg !== pkg || from.fullPath === route.fullPath)) {
+      // Execute anything optional the plugin wants to
+      await newPkgPlugin.onEnter(store, {
+        clusterId,
+        product,
+        oldProduct,
+        oldIsExt: !!oldPkg
+      });
+    }
+
     if (localCheckResource) {
       const redirected = invalidResource(store, route, redirect);