Merge branch 'release' into chore/add-host-for-pg-isready

appsmithorg · Oct 24, 2024 · 298da9c · 298da9c
2 parents c252b4e + 1702304
commit 298da9c
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/app/client/src/entities/Engine/AppEditorEngine.ts b/app/client/src/entities/Engine/AppEditorEngine.ts
@@ -192,6 +192,13 @@ export default class AppEditorEngine extends AppEngine {
     yield call(waitForFetchEnvironments);
     endSpan(waitForFetchEnvironmentsSpan);
 
+    yield call(
+      this.loadPluginsAndDatasources,
+      allResponses,
+      rootSpan,
+      applicationId,
+    );
+
     yield put(fetchAllPageEntityCompletion([executePageLoadActions()]));
     endSpan(loadPageThemesAndActionsSpan);
   }
@@ -265,12 +272,6 @@ export default class AppEditorEngine extends AppEngine {
       allResponses,
       rootSpan,
     );
-    yield call(
-      this.loadPluginsAndDatasources,
-      allResponses,
-      rootSpan,
-      applicationId,
-    );
   }
 
   public *completeChore(rootSpan: Span) {